From aa77916f5fe1b17b24776b9457d2b4f327ce3355 Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Thu, 16 Mar 2023 17:57:27 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/QcAmmeterDeviceServiceImpl.java      |  6 ++++--
 .../device/ammeter/util/AmmeterUtils.java     | 21 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/device/ammeter/service/impl/QcAmmeterDeviceServiceImpl.java b/src/main/java/com/zhgd/xmgl/device/ammeter/service/impl/QcAmmeterDeviceServiceImpl.java
index 166f1b8dc..11f87d417 100644
--- a/src/main/java/com/zhgd/xmgl/device/ammeter/service/impl/QcAmmeterDeviceServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/device/ammeter/service/impl/QcAmmeterDeviceServiceImpl.java
@@ -1,12 +1,14 @@
 package com.zhgd.xmgl.device.ammeter.service.impl;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.device.ammeter.service.IAmmeterDeviceService;
 import com.zhgd.xmgl.device.ammeter.util.AmmeterUtils;
-import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.modules.ammeter.entity.Ammeter;
 import com.zhgd.xmgl.modules.ammeter.entity.AmmeterSupplierRecord;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.text.SimpleDateFormat;
@@ -27,7 +29,7 @@ public class QcAmmeterDeviceServiceImpl implements IAmmeterDeviceService {
         String s = AmmeterUtils.addDevice(ammeter.getAmmeterNo(), ammeter.getAmmeterNo(), "admin", 0, ammeterSupplierRecord.getSupplierProductId(), ammeterSupplierRecord.getMasterKey(), ammeterSupplierRecord.getAppKey(), ammeterSupplierRecord.getAppSecret());
         if (StringUtils.isNotEmpty(s)) {
             JSONObject jsonObject = JSON.parseObject(s);
-            if (jsonObject.getInteger("code") == 0) {
+            if (ObjectUtil.equal(jsonObject.getInteger("code"), 0)) {
                 JSONObject result = JSON.parseObject(jsonObject.getString("result"));
                 ammeter.setDeviceId(result.getString("deviceId"));
                 ammeter.setDeviceStatus(result.getInteger("deviceStatus"));
diff --git a/src/main/java/com/zhgd/xmgl/device/ammeter/util/AmmeterUtils.java b/src/main/java/com/zhgd/xmgl/device/ammeter/util/AmmeterUtils.java
index 8bbabbeb2..80359dd71 100644
--- a/src/main/java/com/zhgd/xmgl/device/ammeter/util/AmmeterUtils.java
+++ b/src/main/java/com/zhgd/xmgl/device/ammeter/util/AmmeterUtils.java
@@ -60,7 +60,7 @@ public class AmmeterUtils {
 //            log.info("=====添加设备接口返回信息resultStr:" + resultStr);
 //            return null;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("err：", e);
         }
         return null;
     }
@@ -628,14 +628,17 @@ public class AmmeterUtils {
         log.info("Sign string: " + string);
         // hmac-sha1编码
         byte[] bytes = null;
-        SecretKey secretKey = new SecretKeySpec(secret.getBytes("utf-8"), "HmacSha1");
-        Mac mac = Mac.getInstance(secretKey.getAlgorithm());
-        mac.init(secretKey);
-        bytes = mac.doFinal(string.getBytes("utf-8"));
-        // base64编码
-        String encryptedString = new String(Base64.encodeBase64(bytes));
-        // 得到需要提交的signature签名数据
-        return encryptedString;
+        if (secret != null) {
+            SecretKey secretKey = new SecretKeySpec(secret.getBytes("utf-8"), "HmacSha1");
+            Mac mac = Mac.getInstance(secretKey.getAlgorithm());
+            mac.init(secretKey);
+            bytes = mac.doFinal(string.getBytes("utf-8"));
+            // base64编码
+            String encryptedString = new String(Base64.encodeBase64(bytes));
+            // 得到需要提交的signature签名数据
+            return encryptedString;
+        }
+        return null;
     }
 
     /**