From 66fd63951e27a39fc4b2094067b95b5cb6340548 Mon Sep 17 00:00:00 2001
From: luyya <luya0519>
Date: Thu, 23 Oct 2025 16:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=BF=E5=B7=9E=E8=AE=B0=E5=BD=95=E4=BB=AA?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=AD=E7=A7=91=E8=A7=86=E5=9B=BEparentId?=
 =?UTF-8?q?=E5=8C=B9=E9=85=8D=E5=88=86=E5=B1=80=E6=9C=BA=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TDeviceServiceImpl.java      |  7 ++++
 .../websocket/schedule/DeviceSchedule.java    | 36 +++++++++++++++++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
index 856ddca2..e5f89a58 100644
--- a/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
+++ b/stwzhj-modules/wzhj-system/src/main/java/org/dromara/system/service/impl/TDeviceServiceImpl.java
@@ -299,7 +299,14 @@ public class TDeviceServiceImpl implements ITDeviceService {
         // 找到需要插入的记录
         List<TDevice> toInsert = new ArrayList<>();
         for (TDevice entity : list) {
+            /*TDevice device = baseMapper.selectOne(new LambdaQueryWrapper<TDevice>()
+                .eq(TDevice::getValid,"1")
+                .eq(TDevice::getDeviceCode,entity.getDeviceCode())
+                .eq(TDevice::getZzjgdm,"341300000000")
+                .last("limit 1"));
+            if (null != device){
 
+            }*/
             baseMapper.insertOrUpdateByCodeAndType(entity);
             /*for (TDevice existingEntity : existingEntities) {
                 if (entity.getDeviceCode().equals(existingEntity.getDeviceCode()) && entity.getDeviceType().equals(existingEntity.getDeviceType())) {
diff --git a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
index deea0f9b..27a788ee 100644
--- a/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
+++ b/stwzhj-modules/wzhj-websocket/src/main/java/org/dromara/websocket/schedule/DeviceSchedule.java
@@ -20,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
@@ -84,9 +85,17 @@ public class DeviceSchedule {
                 newDevice.setPoliceName(originDevice.getNickname());
                 Timestamp updateTime = originDevice.getUpdateTime();
 //                DateTime dateTime = DateUtil.offsetHour(updateTime, 13);
-                newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime) );
-                newDevice.setZzjgdm("341300000000");
-                newDevice.setZzjgmc("宿州市公安局");
+                newDevice.setUpdateTime(DateUtil.formatDateTime(updateTime));
+                String dept = getZfjlyDept(originDevice.getParentId());
+                if (null != dept && !"".equals(dept)){
+                    String[] dstr = dept.split(";");
+                    newDevice.setZzjgdm(dstr[1]);
+                    newDevice.setZzjgmc(dstr[0]);
+                }else {
+                    newDevice.setZzjgdm("341300000000");
+                    newDevice.setZzjgmc("宿州市公安局");
+                }
+
 //                setZzjgdm(newDevice,originDevice);
 
             }
@@ -145,6 +154,27 @@ public class DeviceSchedule {
 //        reSetPoliceName(newDevice,civilCode);
     }
 
+    public String getZfjlyDept(String zzjgdm){
+        HashMap<String,String> deptMap = new HashMap<>();
+        deptMap.put("34137101","埇桥分局;341302000000");
+        deptMap.put("34137102","宿马分局;341392000000");
+        deptMap.put("34137103","经开分局;341391000000");
+        deptMap.put("34137104","高新分局;341393000000");
+        deptMap.put("34137105","灵璧县公安局;341323000000");
+        deptMap.put("34137106","砀山县公安局;341321000000");
+        deptMap.put("34137107","特警支队;341300260000");
+        deptMap.put("34137108","宿州市公安局;341300000000");
+        deptMap.put("34137109","宿州市公安局;341300000000");
+        deptMap.put("34137111","萧县公安局;341322000000");
+        deptMap.put("34137112","市看守所;341300350000");
+        deptMap.put("34137117","交警支队;341300250000");
+        deptMap.put("34137114","交警支队;341300250000");
+        deptMap.put("34137116","宿州市拘留所;341300280000");
+        deptMap.put("34137115","泗县公安局;341324000000");
+        deptMap.put("34137113","宿州市公安局;341300000000");
+        return deptMap.get(zzjgdm);
+    }
+
     private void resetPoliceName(RemoteDeviceBo newDevice,String shortName) {
         String zzjgmc = shortName;
         String preName = zzjgmc;