1.解决监测点超标问题

2.解决监测点终端md3加密显示
3.解决全景技术监督问题数量问题

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/bo/excel/OracleTerminalExcel.java

@@ -225,6 +225,9 @@ public class OracleTerminalExcel implements Serializable {
     @Excel(name = "监测点对象名称", width = 15)
     private String objName;
 
+    @Excel(name = "电网侧变电站", width = 15)
+    private String powerSubstationName;
+
     @Excel(name = "人为干预统计", replace = {"不参与统计_0", "参与统计_1"}, width = 15)
     @NotNull(message = "统计标志不为空")
     private Integer statFlag;

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

@@ -0,0 +1,62 @@
+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
+ *
+ * @author cdf
+ * @date 2022/1/6
+ */
+public class DeviceUtil {
+
+
+    /**
+     * cd 系统配置的解密方式
+     * content 需要解密的内容
+     * 解密对应内容
+     * @author cdf
+     * @date 2021/10/12
+     */
+    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;
+    }
+
+
+}