From d78537bd281d7c2f200059f6bef3b07da3f03382 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Sun, 8 Oct 2023 09:23:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E7=AD=91=E5=B7=A5=E5=AE=9E=E5=90=8D?=
 =?UTF-8?q?=E5=88=B6=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../QualityInspectionRecordController.java    |  1 +
 .../xml/QualityInspectionRecordMapper.xml     | 16 +++++++++++++
 src/main/java/com/zhgd/xmgl/task/JzgTask.java | 23 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
index 010d445a0..40f5270ee 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/controller/QualityInspectionRecordController.java
@@ -72,6 +72,7 @@ public class QualityInspectionRecordController {
             @ApiImplicitParam(name = "operatorId", value = "操作人（整改、复查、核验：changeId、reviewId、verifyManId）", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "inspectStartTime", value = "检查开始时间", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "inspectEndTime", value = "检查结束时间", paramType = "query", required = false, dataType = "String"),
+            @ApiImplicitParam(name = "search", value = "搜索（检查部位、问题分类、问题描述、补充说明、整改要求）", paramType = "query", required = false, dataType = "String"),
             @ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
     })
diff --git a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
index df78ccfa1..078ccbed2 100644
--- a/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/quality/mapper/xml/QualityInspectionRecordMapper.xml
@@ -126,6 +126,14 @@
         <if test="param.recordStatus == '7'.toString()">
             and a.status = 4
         </if>
+        <if test="param.search != null and param.search != ''">
+            and (
+            a.region_name like concat('%',#{param.search},'%')
+            or a.danger_item_content like concat('%',#{param.search},'%')
+            or a.danger_desc like concat('%',#{param.search},'%')
+            or a.remark like concat('%',#{param.search},'%')
+            )
+        </if>
         order by a.inspect_time desc
     </select>
     <select id="selectQualityInspectionRecordPageTotal"
@@ -204,6 +212,14 @@
         <if test="regionId != null and regionId != ''">
             and a.region_id = #{regionId}
         </if>
+        <if test="search != null and search != ''">
+            and (
+            a.region_name like concat('%',#{search},'%')
+            or a.danger_item_content like concat('%',#{search},'%')
+            or a.danger_desc like concat('%',#{search},'%')
+            or a.remark like concat('%',#{search},'%')
+            )
+        </if>
         ) tp
     </select>
     <select id="selectQualityInspectionRecordCountByDay" resultType="java.util.Map" parameterType="java.util.Map">
diff --git a/src/main/java/com/zhgd/xmgl/task/JzgTask.java b/src/main/java/com/zhgd/xmgl/task/JzgTask.java
index ff072ba4b..17cc79f78 100644
--- a/src/main/java/com/zhgd/xmgl/task/JzgTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/JzgTask.java
@@ -2,6 +2,7 @@ package com.zhgd.xmgl.task;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
@@ -30,6 +31,7 @@ import net.javacrumbs.shedlock.core.SchedulerLock;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.collections.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -38,6 +40,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.crypto.Mac;
 import javax.crypto.SecretKey;
 import javax.crypto.spec.SecretKeySpec;
+import java.io.File;
 import java.nio.charset.StandardCharsets;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -55,6 +58,8 @@ import static com.zhgd.xmgl.util.EncryptUtils.decryptAes;
 @RequestMapping("/xmgl/jzg")
 @RestController
 public class JzgTask {
+    @Value("${basePath}")
+    private String path;
     @Autowired
     private ProjectEnterpriseMapper projectEnterpriseMapper;
     @Autowired
@@ -98,7 +103,7 @@ public class JzgTask {
      * 实名制同步
      */
     @SchedulerLock(name = "realNameSystem", lockAtMostFor = 1000 * 60 * 60, lockAtLeastFor = 1000 * 60 * 5)
-    @Scheduled(cron = "0 0 0/12 * * ?")
+    @Scheduled(cron = "0 0 0/1 * * ?")
     @RequestMapping("/sync")
     public void realNameSystem() {
         List<Project> projects = projectMapper.selectList(null);
@@ -270,15 +275,31 @@ public class JzgTask {
         wi.setSex(Integer.valueOf(jzg.getGender()));
         wi.setNation(getNation(jzg.getNation()));
         if (StrUtil.isNotBlank(jzg.getIssueCardPicUrl())) {
+            String file = owi.getFieldAcquisitionUrl();
+            if (StrUtil.isNotBlank(file)) {
+                FileUtil.del(new File(path, file));
+            }
             wi.setFieldAcquisitionUrl(uploadFileService.uploadUrlResourceRtName(jzg.getIssueCardPicUrl()));
         }
         if (StrUtil.isNotBlank(jzg.getHeadImageUrl())) {
+            String file = owi.getIdCardBigPhotoUrl();
+            if (StrUtil.isNotBlank(file)) {
+                FileUtil.del(new File(path, file));
+            }
             wi.setIdCardBigPhotoUrl(uploadFileService.uploadUrlResourceRtName(jzg.getHeadImageUrl()));
         }
         if (StrUtil.isNotBlank(jzg.getPositiveIdCardImageUrl())) {
+            String file = owi.getIdCardUpPhotoUrl();
+            if (StrUtil.isNotBlank(file)) {
+                FileUtil.del(new File(path, file));
+            }
             wi.setIdCardUpPhotoUrl(uploadFileService.uploadUrlResourceRtName(jzg.getPositiveIdCardImageUrl()));
         }
         if (StrUtil.isNotBlank(jzg.getNegativeIdCardImageUrl())) {
+            String file = owi.getIdCardDownPhotoUrl();
+            if (StrUtil.isNotBlank(file)) {
+                FileUtil.del(new File(path, file));
+            }
             wi.setIdCardDownPhotoUrl(uploadFileService.uploadUrlResourceRtName(jzg.getNegativeIdCardImageUrl()));
         }
         wi.setPhoneNumber(jzg.getCellPhone());