新增核酸校验模式

sp-core/src/main/java/com/pj/current/mybatis/MyBatisPlusMetaObjectHandler.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import com.pj.current.satoken.StpUserUtil;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import java.util.Date;
 import java.util.Objects;
@@ -31,6 +33,10 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
      */
     @Override
     public void insertFill(MetaObject metaObject) {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (servletRequestAttributes==null){
+            return;
+        }
         String createBy = "";
         if (StpUtil.isLogin()) {
             createBy = StpUserUtil.getAdminName();
@@ -57,6 +63,10 @@ public class MyBatisPlusMetaObjectHandler implements MetaObjectHandler {
      */
     @Override
     public void updateFill(MetaObject metaObject) {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (servletRequestAttributes==null){
+            return;
+        }
         if (metaObject.hasGetter(UPDATE_BY)) {
             strictUpdateFill(metaObject, UPDATE_BY, String.class, StpUserUtil.getAdminName());
         }

sp-core/src/main/java/com/pj/project/tb_person_filing/ImportPersonListener.java

@@ -8,6 +8,7 @@ import com.alibaba.excel.context.AnalysisContext;
 import com.alibaba.excel.event.AnalysisEventListener;
 
 import com.pj.current.global.BusinessException;
+import com.pj.current.satoken.StpUserUtil;
 import com.pj.project.tb_dept.TbDept;
 import com.pj.project.tb_dept.TbDeptService;
 import com.pj.utils.sg.AjaxError;
@@ -63,7 +64,7 @@ public class ImportPersonListener extends AnalysisEventListener<ImportPersonBO>
             TbPersonFiling tbPersonFiling = tbPersonFilingService.findByIdCard(idCard);
             if (tbPersonFiling == null) {
                 tbPersonFiling = new TbPersonFiling();
-                tbPersonFiling.setCreateTime(new Date()).setUpdateTime(new Date());
+                tbPersonFiling.setCreateTime(new Date()).setCreateBy(StpUserUtil.getAdminName()).setUpdateTime(new Date());
             }
             if (TbDept.NeedJudgeEnum.AUTO_JUDGE.getType().equals(tbDept.getNeedJudge())) {
                 tbPersonFiling.setJudgeState(1)

sp-core/src/main/java/com/pj/project/tb_person_filing/TbPersonFilingService.java

@@ -108,6 +108,7 @@ public class TbPersonFilingService extends ServiceImpl<TbPersonFilingMapper, TbP
         if (TbDept.NeedJudgeEnum.AUTO_JUDGE.getType().equals(tbDept.getNeedJudge())) {
             t.setJudgeState(1).setJudgeTime(new Date()).setJudgeBy("系统自动审核");
         }
+        t.setCreateTime(new Date()).setCreateBy(StpUserUtil.getAdminName());
         this.save(t);
         issued(t);
     }

sp-core/src/main/java/com/pj/project/tb_terminal/TbTerminalService.java

@@ -336,10 +336,11 @@ public class TbTerminalService extends ServiceImpl<TbTerminalMapper, TbTerminal>
         int acidLimit = SpCfgUtil.getAcidLimit();
         //行程是否必须
         int tourLimit = SpCfgUtil.getTourLimit();
+        int verifyMode = SpCfgUtil.getVerifyMode();
         String now = DateUtil.now();
         String idCard = checkBO.getIdentity_number();
         CheckDataDTO checkDataDTO = new CheckDataDTO();
-        checkDataDTO.setNucleic_restrict(acidLimit)
+        checkDataDTO.setNucleic_restrict(acidLimit).setVerify_mode(verifyMode)
                 .setTrip_restrict(tourLimit).setIs_pass(0);
         //是否备案、备案是否通过审核
         TbPersonFiling tbPersonFiling = tbPersonFilingService.findByIdCard(idCard);

sp-core/src/main/java/com/pj/project/tb_terminal/bo/CheckDataDTO.java

@@ -16,6 +16,10 @@ public class CheckDataDTO implements Serializable {
      */
     private int nucleic_restrict;
     /**
+     * 核酸校验模式
+     */
+    private int verify_mode;
+    /**
      * 行程卡限制
      */
     private int trip_restrict;

sp-core/src/main/java/com/pj/project4sp/spcfg/SpCfgUtil.java

@@ -72,7 +72,6 @@ public class SpCfgUtil {
     }
 
 
-
     // 获取配置信息：行程卡限制
     public static boolean tourLimit() {
         return StrUtil.equals(SpCfgUtil.getServerCfg("tourLimit", "1"), "1");
@@ -93,11 +92,18 @@ public class SpCfgUtil {
         return Integer.valueOf(SpCfgUtil.getServerCfg("acidLimit", "24"));
     }
 
-  // 获取短信签名
+    // 获取短信签名
     public static String getSmsSign() {
         return SpCfgUtil.getServerCfg("smsSign", "钦州码头智慧湾卡口智能防疫系统");
     }
 
+    /**
+     * 获取核酸校验模式
+     * @return
+     */
+    public static int getVerifyMode() {
+        return Integer.parseInt(SpCfgUtil.getServerCfg("verifyMode", "0"));
+    }
 
 
     // 获取配置信息：备案审核 1审核 2不审核

sp-start/src/main/resources/application-dev.yml

@@ -47,8 +47,8 @@ spring:
     myconfig:
         # 本项目部署到的服务器域名（文件上传等等模块  要用到）
         domain: http://127.0.0.1:8099/pro
-        ip: 192.168.3.27
-        net-ip: 192.168.3.27
+        ip: 192.168.88.119
+        net-ip: 192.168.88.119
         heart-port: 9999
         command-port: 8888
         command-prefix: "command:"