问题修改

apq-pc-client/src/main/java/com/priusis/client/service/core/MqttServiceImpl.java

@@ -425,12 +425,7 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
                 realDataMonitor = true;
                 log.info("数据上报频率请求接受!!! params: {}", mqttRpcDataMessage.getParams());
 
-                try {
-                    realDataMonitorScheduler(mqttRpcDataMessage);
-                } finally {
-                    realDataMonitor = false;
-                }
-
+                realDataMonitorScheduler(mqttRpcDataMessage);
             }
             if ("facility_scan".equals(mqttRpcDataMessage.getMethod())) {
                 log.info("收到平台扫描软件请求");
@@ -473,6 +468,7 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
             public void run() {
                 try {
                     if (i >= durationSeconds) {
+                        realDataMonitor = false;
                         realDataMonitorSchedulerFuture.cancel(false);
                     }
 

apq-pc-client/src/main/java/com/priusis/controller/ProgramController.java

@@ -26,6 +26,7 @@ import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -405,7 +406,7 @@ public class ProgramController {
         System.out.println(11);
     }
 
-    //    @Scheduled(fixedDelay = 360000)
+    @Scheduled(fixedDelay = 360000)
     protected void autoUpgradeJob() {
         try {
             log.info("执行自动安装文件 ==============1");

apq-pc-client/src/main/resources/application-aprod.yml

@@ -2,7 +2,7 @@ apq:
   iot-gateway: 39.98.116.19:80/api
   webrtc_path: https://ceshi.priusis.com:8443
   client:
-    productId: 286
+    productId: 294
     tenantId: 138
   job:
     type: all

apq-pc-client/src/main/resources/application.yml

@@ -45,7 +45,7 @@ apq:
   client:
     productId: 210
     tenantId: 156
-    version: V1.3.3
+    version: V1.3.36
   url:
     device_info_g: /facility/facility/getByMacAddress?macAddress={}
     voiceCall: /facility/facility/voiceCall

apq-pc-common/src/main/java/com/priusis/job/ApqControlJob.java

@@ -176,7 +176,7 @@ public class ApqControlJob {
                             for (Integer hwDeviceId : hwDeviceIds) {
                                 int perm = (doType == 1 ? 2 : 1);
                                 if (perm == 2) {
-                                    // limitType 1读写 2只读 3拷入 4拷出 5不限速 6限速
+                                    // limitType 1读写 2只读 3拷入 4拷出 5不限速 6限速存在硬件接口扫描告警
                                     perm = (limitType == 1 ? 3 : limitType == 2 ? 4 : limitType == 3 ? 5 : limitType == 4 ? 6 : 3);
                                 }
 

apq-pc-common/src/main/java/com/priusis/job/ApqRegister4BackListJob.java

@@ -116,7 +116,10 @@ public class ApqRegister4BackListJob {
 
     public static void main(String[] args) {
         try {
-            WinExecuteUtils.killProc("Xshell.exe");
+//            WinExecuteUtils.killProc("Xshell.exe");
+//            WinExecuteUtils.killProc("阿普奇检测客户端.exe");
+//            WinExecuteUtils.killProc("火绒文件粉碎机_v5.0.0.1单文件完整功能版.exe");
+            WinExecuteUtils.killProc("火绒文件粉碎机_5.0.0.1单文件版.exe");
         } catch (IOException e) {
             log.error("杀进程异常", e);
         }

apq-pc-common/src/main/java/com/priusis/utils/WinExecuteUtils.java

@@ -120,7 +120,7 @@ public class WinExecuteUtils {
         log.info("Execute command : " + command);
         Runtime runtime = Runtime.getRuntime();
         Process process = runtime.exec("cmd /c " + command);
-        BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream(), "UTF-8"));
+        BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream(), "GBk"));
         String line = null;
         StringBuilder build = new StringBuilder();
         while ((line = br.readLine()) != null) {
@@ -185,7 +185,7 @@ public class WinExecuteUtils {
 //        WinExecuteUtils.executeExe("C:\\windows\\notepad.exe D:\\info.log");
 //        WinExecuteUtils.executeExe("D:\\360\\360sd\\360sd.exe C:\\WINDOWS");
 //        WinExecuteUtils.startProcAsUser("C:\\windows\\notepad.exe D:\\info.log");
-         WinExecuteUtils.startProcAsUser("D:\\360\\360sd\\360sd.exe C:\\WINDOWS");
+        WinExecuteUtils.startProcAsUser("D:\\360\\360sd\\360sd.exe C:\\WINDOWS");
 //         WinExecuteUtils.startProcAsUser("D:\\360\\360sd\\360sd.exe");
 
         /*String procName = "Postman.exe";

doc/告警预警规则.js

@@ -6,6 +6,14 @@
 
 return Number(msg['C盘'].split('%')[0]) >= 10
 
+======================================================
+
+硬盘传输速度预警：
+上报数据举例: {"readss":"0.0 KB/s","writess":"111.6 KB/s"}
+
+var data = JSON.parse(msg);
+return Number(data.readss.split(' KB/s')[0]) >= 10
+
 ======================================================
 硬盘异常：
 {"type":"hard_disk","PHYSICALDRIVE1":{"name":"PHYSICALDRIVE1","type":"Add","value":"Samsung Flash Drive USB Device(AA00000000000489)"}} 

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.32"               
+#define MyAppVersion "V1.3.36"               
 #define MyAppPublisher "阿普奇"           
 #define MyAppURL "https://www.apq.com/"        
 #define MyAppDirName "apq-client"        

tools/install-package/sign/apq-sign.bat

 "D:\tools\signtool.exe" sign /v  /f "D:\tools\apq.pfx" /p apq0011 /t http://timestamp.verisign.com/scripts/timestamp.dll D:\work\priusis\priusis-iot\apq-iot\apq-client\tools\install-package\boot\dist\ͻ.exe
 
+"D:\tools\signtool.exe" sign /v  /f "D:\tools\apq.pfx" /p apq0011 /t http://timestamp.verisign.com/scripts/timestamp.dll D:\work\priusis\priusis-iot\apq-iot\apq-client\tools\install-package\core\smartctl.exe
+
 "D:\tools\signtool.exe" sign /v  /f "D:\tools\apq.pfx" /p apq0011 /t http://timestamp.verisign.com/scripts/timestamp.dll D:\work\priusis\priusis-iot\apq-iot\apq-client\tools\install-package\client\x64\client-soft\apq.exe
 
 "D:\tools\signtool.exe" sign /v  /f "D:\tools\apq.pfx" /p apq0011 /t http://timestamp.verisign.com/scripts/timestamp.dll D:\work\priusis\priusis-iot\apq-iot\apq-client\tools\install-package\client\x32\client-soft\apq.exe