1.台账模块新增字段迁移微服务

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalBaseServiceImpl.java

@@ -12,6 +12,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -107,6 +108,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     private final FileStorageUtil fileStorageUtil;
 
+    private final GeneralInfo generalInfo;
+
 
     /**
      * 终端新增操作
@@ -254,6 +257,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                         deviceDetail.setNextTimeCheck(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
                         deviceDetail.setLoginTime(PubUtils.localDateFormat(deviceParam.getNextTimeCheck()));
                         deviceDetail.setUpdateTime(LocalDateTime.now());
+
+                        //处理装置识别码秘钥
+
                         deviceMapper.insert(deviceDetail);
                         //装置功能
                         List<DictData> funList = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_FUN.getName()).getData();

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/utils/DeviceUtil.java

@@ -1,5 +1,9 @@
 package com.njcn.device.pq.utils;
 
+import com.njcn.common.utils.sm.Sm4Utils;
+import com.njcn.common.utils.sm.ThreeDesUtil;
+import org.apache.commons.codec.binary.Base64;
+
 /**
  * pqs
  *
@@ -8,35 +12,51 @@ package com.njcn.device.pq.utils;
  */
 public class DeviceUtil {
 
+
     /**
-     * 根据电压大小获取基准容量
-     *
+     * cd 系统配置的解密方式
+     * content 需要解密的内容
+     * 解密对应内容
      * @author cdf
-     * @date 2021/7/19
+     * @date 2021/10/12
      */
-    public static Float getJCAPByScale(String sacleName) {
-        if (sacleName.equals("6kV") || sacleName.equals("10kV")) {
-            return 100f;
-        } else if (sacleName.equals("20kV")) {
-            return 200f;
-        } else if (sacleName.equals("35kV")) {
-            return 250f;
-        } else if (sacleName.equals("66kV")) {
-            return 500f;
-        } else if (sacleName.equals("110kV")) {
-            return 750f;
-        } else if (sacleName.equals("220kV")) {
-            return 2000f;
-        } else if (sacleName.equals("330kV")) {
-            return 3000f;
-        } else if (sacleName.equals("500kV")) {
-            return 4500f;
-        } else if (sacleName.equals("750kV")) {
-            return 7000f;
-        } else if (sacleName.equals("1000kV")) {
-            return 9000f;
-        } else {
-            return 10f;
+    public static String decoderString(Integer cd,String content){
+        String seriesTmp = null;
+        if (cd == 0) {
+            seriesTmp = Base64.decodeBase64(content).toString();
+        } else if (cd == 1) {
+            seriesTmp = ThreeDesUtil.decryptThreeDes(content);
+        } else if (cd == 2) {
+            //SM4加密密码
+            String secretkey = Sm4Utils.globalSecretKey;
+            Sm4Utils sm4 = new Sm4Utils(secretkey);
+            seriesTmp = sm4.decryptData_ECB(content);
         }
+        return seriesTmp;
     }
+
+    /**
+     *
+     * cd 系统配置的加密方式
+     * content 需要加密的内容
+     * 加密对应内容
+     * @author cdf
+     * @date 2021/10/12
+     */
+    public static String encodeString(Integer cd,String content){
+        String key = null;
+        if (cd == 0) {
+            key = Base64.encodeBase64String(content.getBytes());
+        } else if (cd == 1) {
+            key = ThreeDesUtil.encryptThreeDes(content);
+        } else if (cd == 2) {
+            //SM4加密密码
+            String secretkey = Sm4Utils.globalSecretKey;
+            Sm4Utils sm4 = new Sm4Utils(secretkey);
+            key = sm4.encryptData_ECB(content);
+        }
+        return key;
+    }
+
+
 }