Merge remote-tracking branch 'origin/master'

src/main/java/com/biutag/supervision/controller/datav/PoliceComment.java

@@ -0,0 +1,23 @@
+package com.biutag.supervision.controller.datav;
+
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Auther: sh
+ * @Date: 2024/11/17 11:04
+ * @Description:
+ */
+
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("DSJ/GetDCQK")
+@Tag(name = "现场督察相关")
+public class PoliceComment {
+}
+

src/main/java/com/biutag/supervision/service/DataCaseVerifService.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.biutag.supervision.constants.enums.DataUpdateMethodEnum;
-import com.biutag.supervision.constants.enums.DistributionStateEnum;
-import com.biutag.supervision.constants.enums.HostLevelEnums;
-import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
+import com.biutag.supervision.constants.enums.*;
 import com.biutag.supervision.mapper.DataCaseVerifMapper;
 import com.biutag.supervision.pojo.dto.DataCaseVerifImportDto;
 import com.biutag.supervision.pojo.dto.DataCaseVerifDistribute;
@@ -72,6 +69,8 @@ public class DataCaseVerifService extends ServiceImpl<DataCaseVerifMapper, DataC
             negativeDto.setProblemSources(ProblemSourcesEnum.A12389.getLabel());
 //            negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW);
 //            negativeDto.setBusinessTypeName();
+            negativeDto.setBusinessTypeCode(BusinessTypeEnum.getByLabel(item.getBusinessTypeName()).getValue());
+            negativeDto.setBusinessTypeName(item.getBusinessTypeName());
             negativeDto.setResponderName(item.getResponderName());   // 投诉人
             negativeDto.setContactPhone(item.getResponderPhone());
             negativeDto.setThingDesc(item.getThingDesc()); // 投诉详情

src/main/java/com/biutag/supervision/service/DataPetition12337Service.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.biutag.supervision.constants.enums.BusinessTypeEnum;
 import com.biutag.supervision.constants.enums.DistributionStateEnum;
 import com.biutag.supervision.constants.enums.HostLevelEnums;
 import com.biutag.supervision.constants.enums.ProblemSourcesEnum;
@@ -68,6 +69,7 @@ public class DataPetition12337Service extends ServiceImpl<DataPetition12337Mappe
             negativeDto.setDiscoveryTime(item.getDiscoverTime());
             negativeDto.setProblemSourcesCode("24");
             negativeDto.setProblemSources("12337信访");
+
 //            negativeDto.setBusinessTypeCode(BusinessTypeEnum.ABWW);
 //            negativeDto.setBusinessTypeName();
             negativeDto.setResponderName(item.getName());

src/main/java/com/biutag/supervision/service/ModelClueService.java

@@ -239,7 +239,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
         } else if (modelId == 25) { // 25号模型：重点人员管控人数过多
             getModelCluesForModel25(sql, modelClues);
             return modelClues;
-        } else if (modelId == 103) { // 103号模型：接处警速度超过30分钟的异常数据
+        } else if (modelId == 103) { // 103号模型：接处警不及时的异常数据
             getModelCluesForModel103(sql, modelClues);
             return modelClues;
         } else if (modelId == 104) { // 模型104：大量变更接警性质的预警模型
@@ -1021,22 +1021,22 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
             return;
         }
         for (Map<String, Object> map : sqlList) {
-            String newSql = "SELECT a.*, b.fkrbh, b.fkrxm FROM dwd_asj_zhtx_jjd a left join dwd_asj_zhtx_fkd b on a.jjdbh = b.jjdbh " + "WHERE a.jjdbh = '" + map.get("jjdbh") + "';";
+            String newSql = "SELECT a.*, b.fkrbh, b.fkrxm FROM dwd_asj_zhtx_jjd a left join dwd_asj_zhtx_fkd b on a.jjdbh = b.jjdbh " + "WHERE a.jjdbh = '" + map.get("uniqueKey") + "';";
             System.out.println("模型103开始再次查询数据库");
             List<Map<String, Object>> allData = modelClueDataMapper.selectByUniqueKeys(newSql);
-            System.out.println("模型103完成再次查询数据库");
+            System.out.println("模型103完成再次查询数据库，结果数量：" + allData.size());
             if (allData.isEmpty() || allData.get(0) == null || allData.get(0).get("jjdbh") == null) {
                 continue;
             }
             Map<String, Object> newMap = allData.get(0);
             ModelClue newModelClue = new ModelClue();
-            newModelClue.setUniqueKey((String) map.get("jjdbh"));
-            newModelClue.setNegativeIdEx((String) map.get("jjdbh"));
-            newModelClue.setInvolveDepartName((String) newMap.get("gxdwmc"));
+            newModelClue.setUniqueKey((String) map.get("uniqueKey"));
+            newModelClue.setNegativeIdEx((String) map.get("negative_id_ex"));
+            newModelClue.setInvolveDepartName((String) map.get("involve_depart_name"));
+            newModelClue.setInvolveDepartId((String) map.get("involve_depart_id"));
             SupExternalDepart supExternalDepart = supExternalDepartMapper.selectOne(new LambdaQueryWrapper<SupExternalDepart>().eq(SupExternalDepart::getExternalId, newMap.get("gxdwdm")).last("LIMIT 1"));
             if (supExternalDepart != null) {
                 if (supExternalDepart.getInternalId() != null) {
-                    newModelClue.setInvolveDepartId(supExternalDepart.getInternalId());
                     StatisticsDepart statisticsDepart = statisticsDepartMapper.selectOne(new QueryWrapper<StatisticsDepart>().eq("departId", supExternalDepart.getInternalId()).last("LIMIT 1"));
                     if (statisticsDepart != null && statisticsDepart.getGroupId() != null && statisticsDepart.getGroupId() == 11L) {
                         continue;
@@ -1047,9 +1047,8 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
             newModelClue.setDistributionState("0");
             setPerson(103, newModelClue, newMap);
             newModelClue.setThingDesc(
-                    "发现警情（接警单编号：" + map.get("jjdbh") + "），警情签收时间为" + getDateMinuteString(map.get("start_time"))
-                            + "，现场到达拍照签到时间为" + getDateMinuteString(map.get("end_time"))
-                            + "，现场签到时间晚于签收时间30分钟以上，存在接处警不及时的问题。");
+                    "发现警情（接警单编号：" + map.get("uniqueKey")
+                            + "），存在接处警不及时的问题。");
             modelClues.add(newModelClue);
         }
     }

src/main/java/com/biutag/supervision/service/NegativeService.java

@@ -201,7 +201,7 @@ public class NegativeService extends ServiceImpl<NegativeMapper, Negative> {
                 .setCreateTime(now);
         workService.save(work);  // 添加一条 negative_work 数据  工作状态
 
-        // 下发
+
         FirstDistributeData firstDistributeData = new FirstDistributeData();
         BeanUtil.copyProperties(negativeDto, firstDistributeData);
         ActionDto actionDto = new ActionDto()