任务周期修改

src/main/java/com/mudu/entity/dto/response/RwzqUuidResponse.java

@@ -0,0 +1,20 @@
+package com.mudu.entity.dto.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author dong
+ * @since 2024/5/22 17:07
+ */
+@Data
+@ApiModel("巡查任务检查项xxbh")
+public class RwzqUuidResponse {
+
+    /**
+     * xxbh
+     */
+    @ApiModelProperty("xxbh")
+    private  String xxbh;
+}

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

@@ -2,6 +2,7 @@ package com.mudu.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.mudu.entity.ASafeRwzq;
+import com.mudu.entity.dto.response.RwzqUuidResponse;
 
 /**
  * (ASafeRwzq)表数据库访问层
@@ -10,6 +11,20 @@ import com.mudu.entity.ASafeRwzq;
  * @since 2024-03-18 16:58:08
  */
 public interface ASafeRwzqMapper extends BaseMapper<ASafeRwzq> {
+    /**
+     * 获取巡查任务周期的最新一条id
+     *
+     * @return
+     */
+    RwzqUuidResponse getXcUuid();
 
+
+
+    /**
+     * 获取自查任务周期的最新一条id
+     *
+     * @return
+     */
+    RwzqUuidResponse getZcUuid();
 }
 

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

@@ -10,6 +10,7 @@ import com.mudu.entity.*;
 import com.mudu.entity.dto.request.ACheckQuatzRequest;
 import com.mudu.entity.dto.request.ACheckQuatzZichaRequest;
 import com.mudu.entity.dto.response.ACheckXcTpResponse;
+import com.mudu.entity.dto.response.RwzqUuidResponse;
 import com.mudu.service.*;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
@@ -113,6 +114,9 @@ public class AcheckTaskQuartz {
 //    @PostMapping("/insert")
 //    @ApiOperation(value = "新增创建时间为昨天且处于审批通过的工单数据")
     public AjaxResult selectAll() throws ParseException {
+        //巡查任务周期id
+        RwzqUuidResponse rwzqUuidResponse=aSafeRwzqService.getXcUuid();
+        String rwzqUuid=rwzqUuidResponse.getXxbh();
         String responseList = HttpRequest.post(imUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body();
         JSONObject jsonResponseList = JSON.parseObject(responseList);
         String dataList = jsonResponseList.getString("data");
@@ -124,9 +128,7 @@ public class AcheckTaskQuartz {
             return null;
         }
         for (ACheckQuatzRequest a : list) {
-            String rwzqUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
             String xcrwuuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
-
             //获取企业编号
             ASafeQyjcxx aSafeQyjcxx = aSafeQyjcxxService.findOneByqymcOrXybm(a.getName(), a.getEntCode());
             String enterPriseId = aSafeQyjcxx.getXxbh();
@@ -162,10 +164,10 @@ public class AcheckTaskQuartz {
                 svaeZghTp(zgh, xcrwuuid, xxsx);
             }
 
-            /**
+//            /**
-             *新增任务周期a_safe_rwzq
+//             *新增任务周期a_safe_rwzq
-             */
+//             */
-            saveRwzq(a, rwzqUuid);
+//            saveRwzq(a, rwzqUuid);
             /**
              *  新增巡查信息表 a_safe_xcrw
              */
@@ -343,7 +345,7 @@ public class AcheckTaskQuartz {
      * @param xcrwuuid     巡查任务id
      * @param rwzqUuid     任务周期id
      */
-    private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwwzUuid, String yhzgxxUuid, String xcrwjcxUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) {
+    private void saveXcrwJcx(ACheckQuatzEntity b, String xcrwjcxUuid, String yhzgxxUuid, String xcrwwzUuid, String enterPriseId, String xcrwuuid, String rwzqUuid) {
         ASafeXcrwjcx aSafeXcrwjcx = new ASafeXcrwjcx();
         //信息编号
         aSafeXcrwjcx.setXxbh(xcrwjcxUuid);
@@ -566,6 +568,9 @@ public class AcheckTaskQuartz {
 //    @PostMapping("/zicha")
 //    @ApiOperation(value = "自查")
     public AjaxResult zicha() throws ParseException {
+        //自己查任务周期id
+        RwzqUuidResponse rwzqUuidResponse=aSafeRwzqService.getZcUuid();
+        String rwzqUuid=rwzqUuidResponse.getXxbh();
         String responseList = HttpRequest.post(zcXxUrl).contentType("application/x-www-form-urlencoded;charset=UTF-8").execute().body();
         JSONObject jsonResponseList = JSON.parseObject(responseList);
         String dataList = jsonResponseList.getString("data");
@@ -577,7 +582,6 @@ public class AcheckTaskQuartz {
             return null;
         }
         for (ACheckQuatzZichaRequest a : list) {
-            String rwzqUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
             String zcrwUuid = UUID.randomUUID().toString().replace("-", "").toLowerCase();
             /**
              *新增任务周期a_safe_rwzq

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

@@ -2,6 +2,7 @@ package com.mudu.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.mudu.entity.ASafeRwzq;
+import com.mudu.entity.dto.response.RwzqUuidResponse;
 
 /**
  * (ASafeRwzq)表服务接口
@@ -11,5 +12,22 @@ import com.mudu.entity.ASafeRwzq;
  */
 public interface ASafeRwzqService extends IService<ASafeRwzq> {
 
+
+    /**
+     * 获取巡查任务周期的最新一条id
+     *
+     * @return
+     */
+    RwzqUuidResponse getXcUuid();
+
+
+
+
+    /**
+     * 获取自查任务周期的最新一条id
+     *
+     * @return
+     */
+    RwzqUuidResponse getZcUuid();
 }
 

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

@@ -1,11 +1,14 @@
 package com.mudu.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mudu.entity.dto.response.RwzqUuidResponse;
 import com.mudu.mapper.ASafeRwzqMapper;
 import com.mudu.entity.ASafeRwzq;
 import com.mudu.service.ASafeRwzqService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+
 /**
  * (ASafeRwzq)表服务实现类
  *
@@ -15,5 +18,16 @@ import org.springframework.stereotype.Service;
 @Service("aSafeRwzqService")
 public class ASafeRwzqServiceImpl extends ServiceImpl<ASafeRwzqMapper, ASafeRwzq> implements ASafeRwzqService {
 
+    @Resource
+    private  ASafeRwzqMapper aSafeRwzqMapper;
+    @Override
+    public RwzqUuidResponse getXcUuid() {
+        return aSafeRwzqMapper.getXcUuid();
+    }
+
+    @Override
+    public RwzqUuidResponse getZcUuid() {
+        return aSafeRwzqMapper.getZcUuid();
+    }
 }
 

src/main/resources/mapper/mudu/ASafeRwzqMapper.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mudu.mapper.ASafeRwzqMapper">
+
+
+    <select id="getXcUuid" resultType="com.mudu.entity.dto.response.RwzqUuidResponse">
+        SELECT xxbh
+        FROM `a_safe_rwzq`
+        where RWLX = 'WGXC'
+        ORDER BY ZQJSSJ desc limit 1
+    </select>
+    <select id="getZcUuid" resultType="com.mudu.entity.dto.response.RwzqUuidResponse">
+
+        SELECT xxbh
+        FROM `a_safe_rwzq`
+        where RWLX = 'QYZC'
+        ORDER BY ZQJSSJ desc limit 1
+    </select>
+</mapper>