问题修改运维平台-剩余BUG跟踪与新增（10-19）

a7923a63 · wangqiang · 81117241 · a7923a63 · a7923a63 · a7923a63
--- a/apq-pc-client/src/main/java/com/priusis/client/service/core/MqttServiceImpl.java
+++ b/apq-pc-client/src/main/java/com/priusis/client/service/core/MqttServiceImpl.java
@@ -412,9 +412,30 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
                    "real_data_monitor", "facility_scan", "remote_rtc", "control_allow", "controll",
                    "control_port_allow", "BlackList_allow", "WhiteList_allow").contains(mqttRpcDataMessage.getMethod())) {
                persistentFileService.flushRpcDataToFile(mqttRpcDataMessage);
+
+                ObjectNode paramsNode = newNode();
+                paramsNode.put("code", "1");
+                paramsNode.put("msg", "success");
+                paramsNode.put("status", "success");
+                byte[] msgData = toBytes(newNode().put("requestId", bizRequestId).put("method", mqttRpcDataMessage.getMethod())
+                        .put("resTime", System.currentTimeMillis()).put("response", paramsNode.toString()));
+                persistMessage(DEVICE_RPC_RES_TOPIC + "/" + requestId, msgIdSeq.incrementAndGet(), msgData, null,
+                        error ->
+                                log.warn("Could not publish realDataMonitorSca res", error));
+
            }
        } catch (IOException e) {
            log.error("Failed to process flushRpcDataToFile : {}", message, e);
+
+            ObjectNode paramsNode = newNode();
+            paramsNode.put("code", "0");
+            paramsNode.put("msg", "fail");
+            paramsNode.put("status", "fail");
+            byte[] msgData = toBytes(newNode().put("requestId", bizRequestId).put("method", mqttRpcDataMessage.getMethod())
+                    .put("resTime", System.currentTimeMillis()).put("response", paramsNode.toString()));
+            persistMessage(DEVICE_RPC_RES_TOPIC + "/" + requestId, msgIdSeq.incrementAndGet(), msgData, null,
+                    error ->
+                            log.warn("Could not publish power res", error));
        }
    }

@@ -653,7 +674,11 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
                            }
                        } else if (Objects.equals(deviceHardwareEnum.getHwGroup(), "NET")) {   // 设置网络设备权限
                            for (Integer hwDeviceId : hwDeviceIds) {
-                                int result32 = IHwPortController.instanceDll.APQ_HWPORT_set_net_device_permit(hwDeviceId, 3, 0, null);
+                                int perm = 2;
+                                if(hwDeviceId == 0) {
+                                    perm = 3;
+                                }
+                                int result32 = IHwPortController.instanceDll.APQ_HWPORT_set_net_device_permit(hwDeviceId, perm, 0, null);
                                log.info("APQ_HWPORT_set_net_device_permit hwDeviceId:{}, name;{}, ret:{}", hwDeviceId, hwDeviceName, result32);
                            }
                        }
@@ -818,7 +843,7 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
    private void resetBackWhiteListHandler(String message, int requestId, String bizRequestId, MqttRpcDataMessage
            mqttRpcDataMessage) {
        String method = mqttRpcDataMessage.getMethod();
-        if (!"BlackList_allow".equals(method) || !"WhiteList_allow".equals(method)) {
+        if (!"BlackList_allow".equals(method) && !"WhiteList_allow".equals(method)) {
            return;
        }
        String resetMethod = "BlackList";

--- a/apq-pc-client/src/main/resources/application.yml
+++ b/apq-pc-client/src/main/resources/application.yml
@@ -45,7 +45,7 @@ apq:
  client:
    productId: 210
    tenantId: 156
-    version: V1.3.36
+    version: V1.3.37
  url:
    device_info_g: /facility/facility/getByMacAddress?macAddress={}
    voiceCall: /facility/facility/voiceCall

--- a/apq-pc-common/src/main/java/com/priusis/job/ApqRegister4BackListJob.java
+++ b/apq-pc-common/src/main/java/com/priusis/job/ApqRegister4BackListJob.java
@@ -56,6 +56,9 @@ public class ApqRegister4BackListJob {
        }
        if (null != forEntity) {
            MqttRpcDataMessage body = forEntity.getBody();
+            if(null == body) {
+                return;
+            }
            String params = body.getParams();

            if (StrUtil.isNotBlank(params)) {

--- a/apq-pc-common/src/main/java/com/priusis/job/ApqRegister4WhiteListJob.java
+++ b/apq-pc-common/src/main/java/com/priusis/job/ApqRegister4WhiteListJob.java
@@ -89,6 +89,9 @@ public class ApqRegister4WhiteListJob {
        }
        if (null != forEntity) {
            MqttRpcDataMessage body = forEntity.getBody();
+            if(null == body) {
+                return;
+            }
            String params = body.getParams();

            if (StrUtil.isNotBlank(params)) {

--- a/apq-pc-common/src/main/java/com/priusis/service/control/DeviceChangeCallbackImpl.java
+++ b/apq-pc-common/src/main/java/com/priusis/service/control/DeviceChangeCallbackImpl.java
@@ -58,7 +58,7 @@ public class DeviceChangeCallbackImpl implements IDeviceChangeCallback {
            } else if (StrUtil.equalsIgnoreCase("class=Ports", classData)) {
                changeDataDesc = "串口";
                deviceClass = "SERIAL_PORT";
-            } else if (StrUtil.equalsIgnoreCase("class=USB", classData)) {
+            } else if (StrUtil.equalsIgnoreCase("class=USB", classData) || StrUtil.equalsIgnoreCase("class=DISKDRIVE", classData)) {
                changeDataDesc = "U盘/移动硬盘";
                deviceClass = "USB_DRIVE";
                List<String> addUSBs = USBCheck.getAddUSB();

--- a/apq-pc-common/src/main/java/com/priusis/utils/IHwPortController.java
+++ b/apq-pc-common/src/main/java/com/priusis/utils/IHwPortController.java
@@ -313,9 +313,9 @@ public interface IHwPortController extends Library {
     */
    enum HwportNetDevidEnum {
        APQ_HWPORT_NET_DEVID_ETH_CARD(0),                // 网口
-        //APQ_HWPORT_NET_DEVID_WIFI(1),					// WiFi <==> 网口
-        //APQ_HWPORT_NET_DEVID_CELLULAR(2),				// 4G + 5G <==> 网口
-        //APQ_HWPORT_NET_DEVID_USB(3),				// usb 转网口
+        APQ_HWPORT_NET_DEVID_WIFI(1),					// WiFi <==> 网口
+        APQ_HWPORT_NET_DEVID_CELLULAR(2),				// 4G + 5G <==> 网口
+        APQ_HWPORT_NET_DEVID_USB(3),				// usb 转网口

        APQ_HWPORT_NET_DEVID_MAX(-1)    /* 不使用 */;


--- a/apq-pc-common/src/main/java/com/priusis/utils/ProcessExtensionsApqUtil.java
+++ b/apq-pc-common/src/main/java/com/priusis/utils/ProcessExtensionsApqUtil.java
 package com.priusis.utils;

-import cn.hutool.system.oshi.OshiUtil;
 import com.sun.jna.Library;
 import com.sun.jna.Memory;
 import com.sun.jna.Native;
@@ -18,7 +17,7 @@ public class ProcessExtensionsApqUtil {
    static ProcessExtensionsApq CP_API_INSTANCE = Native.loadLibrary(CP_DLL_NAME, ProcessExtensionsApq.class);

    /**
-     * 获取gpu温度
+     * 执行
     *
     * @return
     */

--- a/doc/sigar.md
+++ b/doc/sigar.md
+1、官网下载sigar（https://sourceforge.net/projects/sigar/download#!/sigar/1.6/hyperic-sigar-1.6.4.zip）
+2、解压文件，把文件sigar.jar提取出来，放入到你自己的系统中
+3、把sigar-amd64-winnt.dll、sigar-x86-winnt.dll、sigar-x86-winnt.lib文件放入你的jdk文件夹的bin目录下（或放入你的path环境变量里配置的任何一个地址下）
+4、完成
--- a/tools/install-package/boot/apq-client/apq-client-x32.iss
+++ b/tools/install-package/boot/apq-client/apq-client-x32.iss
@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
                 
 #define MyAppName "阿普奇检测客户端"   
-#define MyAppVersion "V1.3.36"               
+#define MyAppVersion "V1.3.37"               
 #define MyAppPublisher "阿普奇"           
 #define MyAppURL "https://www.apq.com/"        
 #define MyAppDirName "apq-client"               
@@ -243,34 +243,35 @@ begin
  CheckProcessRunning( 'apq-register.exe', 'apq客户端插件' )
  CheckProcessRunning( 'apq.exe', 'apq客户端桌面' )

-  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86', 'Version', CurVer);
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x862', 'Version', CurVer);
  CurVerStr := Copy(CurVer,2,2);
 
-  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x86', 'Version', CurVer);
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\12.0\VC\Runtimes\x862', 'Version', CurVer);
  CurVerStrTwo := Copy(CurVer,2,2);

-  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\x86', 'Version', CurVer);
+  RegQueryStringValue(HKLM, 'SOFTWARE\Microsoft\VisualStudio\11.0\VC\Runtimes\x862', 'Version', CurVer);
  CurVerStrThree := Copy(CurVer,2,2);    

+
  if CurVerStr = '14' then
  begin
      vc9SP1Missing := false;
  end 
  else begin
      if CurVerStrTwo = '12' then
-      begin
-          if CurVerStrTwo = '11' then
      begin
          vc9SP1Missing := false;
      end 
      else begin
-              vc9SP1Missing := true;
-          end;
+          if CurVerStrThree = '11' then
+          begin
+              vc9SP1Missing := false;
          end 
          else begin
              vc9SP1Missing := true;
          end;
      end;
+  end;

  Result := not ( CheckProcessRunning( 'apq-client.exe', 'apq-client客户端' ));
 end;
\ No newline at end of file