From 3889ce14146f1387652f95486d962f18591c0fc8 Mon Sep 17 00:00:00 2001 From: huababa1 <2037205722@qq.com> Date: Mon, 20 Oct 2025 06:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=E8=AF=95?= =?UTF-8?q?=E5=8D=B7=E4=BB=BB=E5=8A=A1=E7=99=BD=E5=90=8D=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/app/AppCheckController.java | 13 +++--- .../paper/EducationPaperParamController.java | 18 ++++++++ .../paper/EducationPaperTaskController.java | 6 +++ .../paper/dto/ExamWhiteListSaveReqDTO.java | 16 +++++++ .../dal/dataobject/EducationPaperParam.java | 8 ++-- .../exam/dal/dataobject/ExamWhiteListDO.java | 19 ++++++++ .../dal/mysql/paper/ExamWhiteListMapper.java | 19 ++++++++ .../service/monitor/MonitorServiceImpl.java | 8 +++- .../paper/EducationPaperParamServiceImpl.java | 44 ++++++++++++++++++- .../paper/EducationPaperTaskServiceImpl.java | 19 ++++++++ .../service/paper/ExamWhiteListService.java | 7 +++ .../paper/ExamWhiteListServiceImpl.java | 12 +++++ .../paper/IEducationPaperParamService.java | 2 + .../mapper/exam/ExamWhiteListMapper.xml | 31 +++++++++++++ .../utils/wps_excel/xlsx4j/cell/CellIng.java | 2 +- .../src/main/resources/application.yaml | 2 + 16 files changed, 215 insertions(+), 11 deletions(-) create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/dto/ExamWhiteListSaveReqDTO.java create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamWhiteListDO.java create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/ExamWhiteListMapper.java create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListService.java create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListServiceImpl.java create mode 100644 exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamWhiteListMapper.xml diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/app/AppCheckController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/app/AppCheckController.java index dfe62434..61ef956c 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/app/AppCheckController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/app/AppCheckController.java @@ -64,7 +64,7 @@ public class AppCheckController { // 根据taskId查询下面有多少题型，然后查找对应的软件环境，在新增 @GetMapping("/getAppCheckListByTaskId/{taskId}") public CommonResult getAppCheckListByTaskId(@PathVariable("taskId") String taskId){ - List appCheckDOList = new ArrayList<>(); + List appCheckDOList = appCheckService.getAppList(taskId); // 根据试卷方案ID查询下面试卷的试题的组成部分 List list = educationPaperSchemeService.getInfoDataByTaskId(taskId); for (EducationPaperScheme educationPaperScheme : list) { @@ -80,16 +80,19 @@ public class AppCheckController { // 判断是否在数组中存在 boolean exists = appCheckDOList.stream() .anyMatch(a -> exams.getRoles().equals(a.getAppName())); // 根据 appName 判断 + if (!exists) { - appCheckDOList.add(appCheckDO); +// appCheckDOList.add(appCheckDO); + // 添加 + appCheckService.insertAppCheck(appCheckDO); } } } } // 添加 - for (AppCheckDO appCheckDO : appCheckDOList) { - appCheckService.insertAppCheck(appCheckDO); - } +// for (AppCheckDO appCheckDO : appCheckDOList) { +// appCheckService.insertAppCheck(appCheckDO); +// } return success(true); } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperParamController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperParamController.java index 36c9a5ec..251a038d 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperParamController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperParamController.java @@ -3,13 +3,20 @@ package pc.exam.pp.module.exam.controller.admin.paper; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.annotation.security.PermitAll; import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import pc.exam.pp.framework.common.pojo.CommonResult; +import pc.exam.pp.framework.tenant.core.aop.TenantIgnore; import pc.exam.pp.module.exam.dal.dataobject.EducationPaperParam; +import pc.exam.pp.module.exam.dal.dataobject.ExamWhiteListDO; +import pc.exam.pp.module.exam.dal.dataobject.app.AppCheckDO; import pc.exam.pp.module.exam.service.paper.IEducationPaperParamService; +import java.util.List; + +import static pc.exam.pp.framework.common.pojo.CommonResult.success; import static pc.exam.pp.module.infra.enums.ErrorCodeConstants.DEMO03_PAPER_SESSION_EXISTS; /** @@ -102,5 +109,16 @@ public class EducationPaperParamController { } return CommonResult.success("200"); } + + @GetMapping("/getAppWhiteList/{taskId}") + @PermitAll + @TenantIgnore + @Operation(summary = "查看白名单列表", description = "查看白名单列表") + public CommonResult> getAppWhiteList(@PathVariable("taskId") String taskId){ + // 使用传入的IP，进行ping，查看是否存在连接，并返回信号的强度 + System.out.println(educationPaperParamService.getAppWhiteList(taskId)); + + return success(educationPaperParamService.getAppWhiteList(taskId)); + } } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java index 6a941f11..7decf614 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/EducationPaperTaskController.java @@ -22,6 +22,7 @@ import pc.exam.pp.module.exam.service.paper.IEducationPaperTaskService; import static pc.exam.pp.framework.common.exception.enums.GlobalErrorCodeConstants.INTERNAL_SERVER_ERROR; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -72,6 +73,11 @@ public class EducationPaperTaskController { @GetMapping("/stulist") public CommonResult>> stulist(PaperTaskPageVo educationPaperTask) { PageResult pageResult = educationPaperTaskService.selectEducationPaperTaskListByStu(educationPaperTask); + // ✅ 防止 pageResult 或其 list 为空 + if (pageResult == null || pageResult.getList() == null) { + PageResult> emptyPage = new PageResult<>(Collections.emptyList(), 0L); + return CommonResult.success(emptyPage); + } List> newList = pageResult.getList().stream() .map(task -> { Map map = BeanUtil.beanToMap(task, false, true); diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/dto/ExamWhiteListSaveReqDTO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/dto/ExamWhiteListSaveReqDTO.java new file mode 100644 index 00000000..6b018518 --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/controller/admin/paper/dto/ExamWhiteListSaveReqDTO.java @@ -0,0 +1,16 @@ +package pc.exam.pp.module.exam.controller.admin.paper.dto; + +import lombok.Data; + +import java.util.List; + +@Data +public class ExamWhiteListSaveReqDTO { + private Long examId; + private List whiteList; + + @Data + public static class WhiteApp { + private String name; + } +} \ No newline at end of file diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java index c1ebfc59..a8c01fef 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/EducationPaperParam.java @@ -1,14 +1,14 @@ package pc.exam.pp.module.exam.dal.dataobject; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; import lombok.experimental.Accessors; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.sql.Time; +import java.util.List; /** * 通用参数对象 education_paper_param @@ -93,5 +93,7 @@ public class EducationPaperParam private String isScoreDetail; // 是否删除考生文件 private String isDelete; - + // 白名单 + @TableField(exist = false) + private List whiteList; } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamWhiteListDO.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamWhiteListDO.java new file mode 100644 index 00000000..0c37cb0e --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/dataobject/ExamWhiteListDO.java @@ -0,0 +1,19 @@ +package pc.exam.pp.module.exam.dal.dataobject; + +import com.baomidou.mybatisplus.annotation.KeySequence; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.*; + +@TableName("exam_white_list") +@Data +@ToString(callSuper = true) +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ExamWhiteListDO { + @TableId + private Long id; + private String taskId; + private String name; +} diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/ExamWhiteListMapper.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/ExamWhiteListMapper.java new file mode 100644 index 00000000..21c2b18b --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/dal/mysql/paper/ExamWhiteListMapper.java @@ -0,0 +1,19 @@ +package pc.exam.pp.module.exam.dal.mysql.paper; + +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import pc.exam.pp.framework.mybatis.core.mapper.BaseMapperX; +import pc.exam.pp.module.exam.dal.dataobject.EducationPaperTask; +import pc.exam.pp.module.exam.dal.dataobject.ExamWhiteListDO; + +import java.util.List; +@Mapper +public interface ExamWhiteListMapper extends BaseMapperX { + + List selectByTaskId(String taskId); + + void deleteByTaskId(String taskId); + + List selectNameByTaskId(String taskId); +} diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java index 1fdec7b8..3d0dac31 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/monitor/MonitorServiceImpl.java @@ -480,7 +480,13 @@ public class MonitorServiceImpl implements MonitorService { // redis_key String key = "userCache:" + taskId + ":" + stuId; // 获取缓存数据 - MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key), MonitorDO.class); +// MonitorDO info = JsonUtils.parseObject(stringRedisTemplate.opsForValue().get(key), MonitorDO.class); + MonitorDO info =monitorMapper.selectOne( + new QueryWrapper() + .eq("task_id", taskId) + .eq("stu_id", stuId) + ); + // 如果考试状态存在，更新考试状态 if (status != null) { if (info != null) { diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperParamServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperParamServiceImpl.java index d26358f5..cac7003a 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperParamServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperParamServiceImpl.java @@ -3,10 +3,13 @@ package pc.exam.pp.module.exam.service.paper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import pc.exam.pp.module.exam.dal.dataobject.ExamWhiteListDO; import pc.exam.pp.module.exam.dal.dataobject.EducationPaperParam; import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperParamMapper; import pc.exam.pp.module.exam.dal.mysql.paper.EducationPaperTaskMapper; +import pc.exam.pp.module.exam.dal.mysql.paper.ExamWhiteListMapper; +import java.util.ArrayList; import java.util.List; /** @@ -22,6 +25,9 @@ public class EducationPaperParamServiceImpl implements IEducationPaperParamServi private EducationPaperParamMapper educationPaperParamMapper; @Autowired private EducationPaperTaskMapper educationPaperTaskMapper; + @Autowired + private ExamWhiteListMapper examWhiteListMapper; + /** * 查询通用参数 * @@ -55,6 +61,16 @@ public class EducationPaperParamServiceImpl implements IEducationPaperParamServi @Override public int insertEducationPaperParam(EducationPaperParam educationPaperParam) { + List whiteList = educationPaperParam.getWhiteList(); + String taskId = educationPaperParam.getTaskId(); + // ✅ 统一赋值 + if (whiteList != null && !whiteList.isEmpty()) { + for (ExamWhiteListDO examWhiteListDO : whiteList) { + examWhiteListDO.setTaskId(taskId); + examWhiteListDO.setName(examWhiteListDO.getName()); + } + examWhiteListMapper.insertBatch(whiteList); + } return educationPaperParamMapper.insertEducationPaperParam(educationPaperParam); } @@ -67,6 +83,20 @@ public class EducationPaperParamServiceImpl implements IEducationPaperParamServi @Override public int updateEducationPaperParam(EducationPaperParam educationPaperParam) { + List whiteList = educationPaperParam.getWhiteList(); + String taskId = educationPaperParam.getTaskId(); + if (taskId!=null){ + //删除旧白名单 + examWhiteListMapper.deleteByTaskId(taskId); + //插入新白名单 + if (whiteList != null && !whiteList.isEmpty()) { + for (ExamWhiteListDO examWhiteListDO : whiteList) { + examWhiteListDO.setTaskId(taskId); + examWhiteListDO.setName(examWhiteListDO.getName()); + } + examWhiteListMapper.insertBatch(whiteList); + } + } return educationPaperParamMapper.updateEducationPaperParam(educationPaperParam); } @@ -96,7 +126,19 @@ public class EducationPaperParamServiceImpl implements IEducationPaperParamServi @Override public EducationPaperParam selectEducationPaperParamByTaskId(String taskId) { - return educationPaperParamMapper.selectEducationPaperParamByTaskId(taskId); + List whiteList = examWhiteListMapper.selectByTaskId(taskId); + EducationPaperParam educationPaperParam = educationPaperParamMapper.selectEducationPaperParamByTaskId(taskId); + if (whiteList != null && !whiteList.isEmpty()) { + educationPaperParam.setWhiteList(whiteList); + } + return educationPaperParam; + } + + + + @Override + public List getAppWhiteList(String taskId) { + return examWhiteListMapper.selectNameByTaskId(taskId); } } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java index 067202a5..357052dd 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/EducationPaperTaskServiceImpl.java @@ -81,6 +81,8 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService private ExamQuestionMapper examQuestionMapper; @Resource AppCheckMapper appCheckMapper; + @Autowired + private ExamWhiteListMapper examWhiteListMapper; /** * 查询试卷任务 @@ -190,6 +192,15 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService } else { educationPaperTask.setIsOne("1"); } + List whiteList = new ArrayList<>(); + ExamWhiteListDO examWhiteListDO=new ExamWhiteListDO(); + examWhiteListDO.setTaskId(uuid); + examWhiteListDO.setName("ExamStudent"); + whiteList.add(examWhiteListDO); + examWhiteListMapper.insertBatch(whiteList); + + + // 新增任务参数 educationPaperParamMapper.insertEducationPaperParam(educationPaperParam); // 新增任务 @@ -539,6 +550,14 @@ public class EducationPaperTaskServiceImpl implements IEducationPaperTaskService educationPaperTask.setTaskName(educationPaperTask.getTaskName() + timeString); educationPaperTask.setCreateTime(now); educationPaperTask.setIsTemplate(1); + //白名单 + List whiteList = examWhiteListMapper.selectByTaskId(taskId); + if (whiteList != null && !whiteList.isEmpty()) { + for (ExamWhiteListDO examWhiteListDO : whiteList) { + examWhiteListDO.setTaskId(newtaskId); + } + examWhiteListMapper.insertBatch(whiteList); + } educationPaperTaskMapper.insertEducationPaperTask(educationPaperTask); if (options.contains("1")) { diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListService.java new file mode 100644 index 00000000..2a9e58e1 --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListService.java @@ -0,0 +1,7 @@ +package pc.exam.pp.module.exam.service.paper; + +public interface ExamWhiteListService { + + + +} diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListServiceImpl.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListServiceImpl.java new file mode 100644 index 00000000..86b8b2fb --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/ExamWhiteListServiceImpl.java @@ -0,0 +1,12 @@ +package pc.exam.pp.module.exam.service.paper; + +import jakarta.annotation.Resource; +import pc.exam.pp.module.exam.dal.mysql.paper.ExamWhiteListMapper; + +public class ExamWhiteListServiceImpl implements ExamWhiteListService { + @Resource + ExamWhiteListMapper examWhiteListMapper; + + + +} diff --git a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperParamService.java b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperParamService.java index 33775697..b3fb3ceb 100644 --- a/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperParamService.java +++ b/exam-module-exam/exam-module-exam-biz/src/main/java/pc/exam/pp/module/exam/service/paper/IEducationPaperParamService.java @@ -2,6 +2,7 @@ package pc.exam.pp.module.exam.service.paper; import pc.exam.pp.module.exam.dal.dataobject.EducationPaperParam; +import pc.exam.pp.module.exam.dal.dataobject.ExamWhiteListDO; import java.util.List; @@ -63,5 +64,6 @@ public interface IEducationPaperParamService EducationPaperParam selectEducationPaperParamByTaskId(String taskId); + List getAppWhiteList(String taskId); } diff --git a/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamWhiteListMapper.xml b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamWhiteListMapper.xml new file mode 100644 index 00000000..ac28b61c --- /dev/null +++ b/exam-module-exam/exam-module-exam-biz/src/main/resources/mapper/exam/ExamWhiteListMapper.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + INSERT INTO exam_white_list (name,task_id) + VALUES + + (#{item.name}, #{item.taskId}) + + + + DELETE FROM exam_white_list WHERE task_id = #{taskId} + + + + + + \ No newline at end of file diff --git a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_excel/xlsx4j/cell/CellIng.java b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_excel/xlsx4j/cell/CellIng.java index a53316e0..452f26c6 100644 --- a/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_excel/xlsx4j/cell/CellIng.java +++ b/exam-module-judgement/exam-module-judgement-biz/src/main/java/pc/exam/pp/module/judgement/utils/wps_excel/xlsx4j/cell/CellIng.java @@ -118,7 +118,7 @@ public class CellIng { String formula = cell.getCellFormula(); // 转为小写再比较 if (formula.toLowerCase().contains(keyWords.toLowerCase())) { - return formula; // 包含关键字时返回公式内容 + return keyWords; // 包含关键字时返回公式内容 } else { return "否"; // 不包含关键字 } diff --git a/exam-server/src/main/resources/application.yaml b/exam-server/src/main/resources/application.yaml index e1702ddb..c5932993 100644 --- a/exam-server/src/main/resources/application.yaml +++ b/exam-server/src/main/resources/application.yaml @@ -293,6 +293,7 @@ exam: - /jmreport/* # 积木报表，无法携带租户编号 - /admin-api/mp/open/** # 微信公众号开放平台，微信回调接口，无法携带租户编号 - /admin-api/exam/app/getAppCheckList/* # 学生端环境监测 + - /admin-api/exam/param/getAppWhiteList/* # 学生端环境监测 - /admin-api/system/auth/login_config # 学生端判断学生的登录方式 - /admin-api/system/auth/refreshLogout # 登出用户 ignore-tables: @@ -303,6 +304,7 @@ exam: - exam_knowledge_points - exam_specialty - exam_app_check + - exam_white_list - system_tenant - system_tenant_package - system_dict_data -- 2.49.1