Merge branch 'master' of http://gitea.biutag.com/supervision/supervision-boot

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

@@ -249,7 +249,7 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
         List<String> uniqueKeys = modelClues.stream().map(ModelClue::getUniqueKey).filter(k -> k != null && !k.isEmpty()).toList();
         List<String> oldUniqueKeys = new ArrayList<>();
         // 无需更新状态的模型
-        if (modelId != 19 && modelId != 26 && modelId != 27 && modelId != 28 && modelId != 30) {
+        if (modelId != 19 && modelId != 26 && modelId != 27 && modelId != 28 && modelId != 30 && modelId != 100) {
             oldUniqueKeys = this.listObjs(new LambdaQueryWrapper<ModelClue>().select(ModelClue::getUniqueKey).ne(ModelClue::getDistributionState, "2").eq(ModelClue::getModelId, modelId), String::valueOf);
             List<String> changeStatusIds = oldUniqueKeys.stream().filter(item -> !uniqueKeys.contains(item)).toList();
             if (!changeStatusIds.isEmpty()) {
@@ -556,6 +556,14 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                     "发现" + modelClue.getInvolveDepartName() + "受理的“" + data.get("AJMC")
                             + "”（【" + data.get("AJBZmc") + "】编号：" + getAjbh(data)
                             + "），未扣押任何财物，存在疑似涉案财物未按要求录入的问题。");
+        } else if (modelId == 100) { // 100号模型：散油实时预警
+            modelClue.setInvolvePoliceName((String) data.get("gmrxm"));
+            modelClue.setThingDesc(
+                    "发现" + data.get("gmrxm") + "（身份证号：" + data.get("zjhm") + "）于"
+                            + getDateMinuteString(data.get("gmsj")) + "在"
+                            + data.get("fjmc") + modelClue.getInvolveDepartName() + "管辖的" + data.get("dwmc")
+                            + "购买了" + data.get("gmsl") + "升" + data.get("jplx") + data.get("gmyt")
+                            + "，产生了" + data.get("yjlx") + "，请予以重点关注。");
         }
     }
 
@@ -1112,7 +1120,18 @@ public class ModelClueService extends ServiceImpl<ModelClueMapper, ModelClue> {
                         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分");
                         return formatter.format(localDateTime);
                     } catch (Exception exx) {
-                        log.info("日期转换异常{}", time, ex);
+                        try {
+                            time = String.valueOf(param);
+                            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                            Date parse = sdf.parse(time);
+                            Instant instant = parse.toInstant();
+                            ZoneId zoneId = ZoneId.systemDefault();
+                            LocalDateTime localDateTime = instant.atZone(zoneId).toLocalDateTime();
+                            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy年MM月dd日HH时mm分");
+                            return formatter.format(localDateTime);
+                        } catch (Exception exxx) {
+                            log.info("日期转换异常{}", time, ex);
+                        }
                     }
                 }
             }