From 1b169830f939fc6ee2bd07ecdeb57b20ee928881 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Mon, 6 Jan 2025 09:38:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E8=B4=A6=E8=AF=86=E5=88=AB=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/device/pq/utils/DeviceUtil.java  |  2 +-
 .../service/impl/TerminalBaseServiceImpl.java | 36 ++++++++++++-------
 2 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java
index de81e5904..baa87862a 100644
--- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java
+++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java
@@ -23,7 +23,7 @@ public class DeviceUtil {
     public static String decoderString(Integer cd,String content){
         String seriesTmp = null;
         if (cd == 0) {
-            seriesTmp = Base64.decodeBase64(content).toString();
+            seriesTmp = new String(Base64.decodeBase64(content));
         } else if (cd == 1) {
             seriesTmp = ThreeDesUtil.decryptThreeDes(content);
         } else if (cd == 2) {
diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
index 34a2c78ac..e68eeb42a 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java
@@ -274,7 +274,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         deviceDetail.setUpdateTime(LocalDateTime.now());
 
                         //处理装置识别码秘钥
-                        coderM3d(deviceDetail);
+                        coderM3d(deviceDetail,false);
                         deviceMapper.insert(deviceDetail);
                         //装置功能
                         List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData();
@@ -633,7 +633,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     Device deviceDetail = new Device();
                     BeanUtils.copyProperties(updateDeviceParam, deviceDetail);
                     deviceDetail.setId(updateDeviceParam.getDevIndex());
-                    coderM3d(deviceDetail);
+                    coderM3d(deviceDetail,true);
                     this.updateById(device);
                     deviceMapper.updateById(deviceDetail);
                 }
@@ -813,13 +813,25 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         return true;
     }
 
-    private void coderM3d(Device deviceDetail){
-        if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
-            deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
-        }
-        if(StrUtil.isNotBlank(deviceDetail.getSeries())){
-            deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
+    private void coderM3d(Device deviceDetail,Boolean updateFlag){
+        if(updateFlag){
+            Device deviceRes = deviceMapper.selectById(deviceDetail.getId());
+            if(StrUtil.isNotBlank(deviceDetail.getDevKey()) && !deviceRes.getSeries().equals(deviceDetail.getDevKey())){
+                deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
+            }
+
+            if(StrUtil.isNotBlank(deviceDetail.getSeries()) && !deviceRes.getSeries().equals(deviceDetail.getSeries())){
+                deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
+            }
+        }else {
+            if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
+                deviceDetail.setDevKey(DeviceUtil.encodeString(devCD,deviceDetail.getDevKey()));
+            }
+            if(StrUtil.isNotBlank(deviceDetail.getSeries())){
+                deviceDetail.setSeries(DeviceUtil.encodeString(devCD,deviceDetail.getSeries()));
+            }
         }
+
     }
     private void decoderM3d(Device deviceDetail){
         if(StrUtil.isNotBlank(deviceDetail.getDevKey())){
@@ -951,7 +963,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
                     Device deviceDetail = deviceMapper.selectById(device.getId());
                     //解密
-                    decoderM3d(deviceDetail);
+                    //decoderM3d(deviceDetail);
                     BeanUtils.copyProperties(deviceDetail, deviceVO);
                     deviceVO.setDevIndex(device.getId());
                     //母线
@@ -1011,7 +1023,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
             Device deviceDetail = deviceMapper.selectById(obj.getId());
             //解密
-            decoderM3d(deviceDetail);
+            //decoderM3d(deviceDetail);
             BeanUtils.copyProperties(deviceDetail, deviceVO);
             deviceVO.setDevIndex(obj.getId());
 
@@ -1107,7 +1119,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                 deviceVO.setSort(device.getSort());
                 Device deviceDetail = deviceMapper.selectById(device.getId());
                 //解密
-                decoderM3d(deviceDetail);
+                //decoderM3d(deviceDetail);
                 BeanUtils.copyProperties(deviceDetail, deviceVO);
                 deviceVO.setDevIndex(device.getId());
 
@@ -1158,7 +1170,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
                         Device deviceDetail = deviceMapper.selectById(device.getId());
                         //解密
-                        decoderM3d(deviceDetail);
+                        //decoderM3d(deviceDetail);
                         BeanUtils.copyProperties(deviceDetail, deviceVO);
                         deviceVO.setDevIndex(device.getId());