Merge remote-tracking branch 'origin/main'

# Conflicts:
#	src/main/java/com/mudu/quartz/AcheckTaskQuartz.java
#	src/main/resources/application.yml

src/main/java/com/mudu/mapper/ASafeXcrwMapper.java

@@ -16,8 +16,8 @@ public interface ASafeXcrwMapper extends BaseMapper<ASafeXcrw> {
     /**
      * 查询巡查任务主表2个月内是否有记录就不推
      */
-   @Select("select count(*) from a_safe_xcrw where rksj  BETWEEN DATE_SUB( CURDATE(), INTERVAL 2 MONTH ) AND CURDATE()")
+    @Select("select count(*) from a_safe_xcrw where rksj  BETWEEN DATE_SUB( CURDATE(), INTERVAL 2 MONTH ) AND CURDATE() and qybh=#{enterPriseId} ")
-    Integer xcrwNum();
+    Integer xcrwNum(String enterPriseId);
 
 }
 

src/main/java/com/mudu/mapper/ASafeZcrwMapper.java

@@ -17,8 +17,8 @@ public interface ASafeZcrwMapper extends BaseMapper<ASafeZcrw> {
      * 查询自查任务主表1个月内是否有记录就不推
      */
 
-    @Select("select count(*) from a_safe_zcrw where rksj  BETWEEN DATE_SUB( CURDATE(), INTERVAL 1 MONTH ) AND CURDATE() ")
+    @Select("select count(*) from a_safe_zcrw where rksj  BETWEEN DATE_SUB( CURDATE(), INTERVAL 1 MONTH ) AND CURDATE() and qybh =#{enterPriseId} ")
-    Integer zcrwNum();
+    Integer zcrwNum(String enterPriseId);
 
 
 }

src/main/java/com/mudu/quartz/AcheckTaskQuartz.java

@@ -163,18 +163,15 @@ public class AcheckTaskQuartz {
      *
      * @Param qymc 企业名称
      */
-//    @Scheduled(cron = "0 0 4 * * ? ")
+    @Scheduled(cron = "0 0 4 * * ? ")
 //    @Scheduled(cron = "0 0/5 * * * ?")
 //    @PostMapping("/insert")
 //    @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据")
     public void selectAll() throws ParseException {
+
         // 获取token
         getToken();
-        // todo 查询巡查任务主表2月是否有记录就不推
+
-        Integer xcrwNum = aSafeXcrwService.xcrwNum();
-        if (xcrwNum > 0) {
-            return;
-        }
         //巡查任务周期id
         RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getXcUuid();
         String rwzqUuid = rwzqUuidResponse.getXxbh();
@@ -194,7 +191,18 @@ public class AcheckTaskQuartz {
         for (ACheckQuatzRequest a : list) {
             //获取企业编号
             ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getEntCode());
-            String enterPriseId = aSafeQyjcxx.getXxbh();
+            String enterPriseId = "";
+            if (aSafeQyjcxx == null) {
+                continue;
+            } else {
+                enterPriseId = aSafeQyjcxx.getXxbh();
+            }
+
+            // todo 查询巡查任务主表2月是否有记录就不推
+            Integer xcrwNum = aSafeXcrwService.xcrwNum(enterPriseId);
+            if (xcrwNum > 0) {
+                return;
+            }
             // todo 来自新表查询 根据企业xxbh 以及周期编号
             JSONObject xcjsonObject = new JSONObject();
             xcjsonObject.put("qybh", aSafeQyjcxx.getXxbh());
@@ -308,7 +316,11 @@ public class AcheckTaskQuartz {
         //周期编号
         aSafeYhzgxx.setZqbh(rwzqUuid);
         //企业风险点编号 对应a_safe_fxd的信息编号
+        if (b.getFxdxxbh() == null) {
+            aSafeYhzgxx.setQyfxdbh("03_20240617093239130405");
+        } else {
             aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh());
+        }
         //隐患来源
         aSafeYhzgxx.setYhly("1");
         //检查时间
@@ -435,7 +447,12 @@ public class AcheckTaskQuartz {
         aSafeXcrwjcx.setRwbh(xcrwuuid);
         //企业风险点编号 对应a_safe_fxd的信息编号
         //todo
+        if (b.getFxdxxbh() == null) {
+            aSafeXcrwjcx.setQyfxdbh("03_20240617093239130405");
+        } else {
             aSafeXcrwjcx.setQyfxdbh(b.getFxdxxbh());
+        }
+
         //周期编号
         aSafeXcrwjcx.setZqbh(rwzqUuid);
         //完成状态
@@ -650,11 +667,7 @@ public class AcheckTaskQuartz {
 //    @PostMapping("/zicha")
 //    @ApiOperation(value = "自查")
     public void zicha() throws ParseException {
-        // todo 查询自查任务主表本月是否有记录 有就不推
+
-        Integer zcrwNum = aSafeZcrwService.zcrwNum();
-        if (zcrwNum > 0) {
-            return;
-        }
         //自己查任务周期id
         RwzqUuidResponse rwzqUuidResponse = aSafeRwzqService.getZcUuid();
         String rwzqUuid = rwzqUuidResponse.getXxbh();
@@ -672,6 +685,14 @@ public class AcheckTaskQuartz {
             return;
         }
         for (ACheckQuatzZichaRequest a : list) {
+            // todo 查询自查任务主表本月是否有记录 有就不推
+            Integer zcrwNum = aSafeZcrwService.zcrwNum(a.getEnterpriseID());
+            if (zcrwNum > 0) {
+                return;
+            }
+            if (a.getEnterpriseID() == null) {
+                continue;
+            }
             JSONObject zcjsonObject = new JSONObject();
             zcjsonObject.put("qybh", a.getEnterpriseID());
             zcjsonObject.put("zqbh", rwzqUuid);
@@ -800,7 +821,11 @@ public class AcheckTaskQuartz {
         //任务编号
         aSafeZcrwjl.setRwbh(zcrwUuid);
         //企业风险点编号
+        if (b.getFxdxxbh() == null) {
+            aSafeZcrwjl.setQyfxdbh("03_20240617093239130405");
+        } else {
             aSafeZcrwjl.setQyfxdbh(b.getFxdxxbh());
+        }
         //企业风险点位置编号
         aSafeZcrwjl.setQyfxdwzbh(b.getFxbh());
         //是否发现隐患
@@ -986,7 +1011,11 @@ public class AcheckTaskQuartz {
         //周期编号
         aSafeYhzgxx.setZqbh(rwzqUuid);
         //企业风险点编号 对应a_safe_fxd的信息编号
+        if (b.getFxdxxbh() == null) {
+            aSafeYhzgxx.setQyfxdbh("03_20240617093239130405");
+        } else {
             aSafeYhzgxx.setQyfxdbh(b.getFxdxxbh());
+        }
         //隐患来源
         aSafeYhzgxx.setYhly("2");
         //检查时间

src/main/java/com/mudu/service/ASafeXcrwService.java

@@ -16,7 +16,7 @@ public interface ASafeXcrwService extends IService<ASafeXcrw> {
      * 查询巡查任务主表2个月内是否有记录就不推
      */
 
-    Integer xcrwNum();
+    Integer xcrwNum(String enterPriseId);
 
 }
 

src/main/java/com/mudu/service/ASafeZcrwService.java

@@ -15,7 +15,7 @@ public interface ASafeZcrwService extends IService<ASafeZcrw> {
      * 查询自查任务主表1个月内是否有记录就不推
      */
 
-    Integer zcrwNum();
+    Integer zcrwNum(String enterPriseId);
 
 }
 

src/main/java/com/mudu/service/impl/ASafeXcrwServiceImpl.java

@@ -19,9 +19,10 @@ public class ASafeXcrwServiceImpl extends ServiceImpl<ASafeXcrwMapper, ASafeXcrw
 
     @Resource
     private  ASafeXcrwMapper aSafeXcrwMapper;
+
     @Override
-    public Integer xcrwNum() {
+    public Integer xcrwNum(String enterPriseId) {
-        return aSafeXcrwMapper.xcrwNum();
+        return aSafeXcrwMapper.xcrwNum(enterPriseId);
     }
 }
 

src/main/java/com/mudu/service/impl/ASafeZcrwServiceImpl.java

@@ -21,8 +21,8 @@ public class ASafeZcrwServiceImpl extends ServiceImpl<ASafeZcrwMapper, ASafeZcrw
     private ASafeZcrwMapper aSafeZcrwMapper;
 
     @Override
-    public Integer zcrwNum() {
+    public Integer zcrwNum(String enterPriseId) {
-        return aSafeZcrwMapper.zcrwNum();
+        return aSafeZcrwMapper.zcrwNum(enterPriseId);
     }
 }
 

src/main/resources/application.yml

@@ -5,3 +5,10 @@ spring:
     active: prod
 #获取token
 getToken: http://221.229.220.83:9028/loginnocaptcha
+
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: info
+    org.springframework: info