.

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

@@ -30,6 +30,8 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.InetAddress;
 import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.net.UnknownHostException;
 import java.text.DecimalFormat;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -64,11 +66,14 @@ public class ProgramController {
                                              @RequestParam(required = false, defaultValue = "1") Integer current,
                                              @RequestParam(required = false, defaultValue = "10") Integer size)
             throws IOException {
-        String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, current, size);
+        Page<Map<String, String>> page = new Page<>();
+        page.setCurrent(current).setSize(size);
+        String mac = getMacAddress();
+        if (StrUtil.isBlank(mac)) return R.success(page.setTotal(0).setRecords(Collections.emptyList()));
+        String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, mac, current, size);
         JSONObject rsp = JSONUtil.parseObj(HttpUtil.get(url));
         if (ObjectUtil.notEqual(rsp.getInt("code"), 0)) return R.error(rsp.getStr("msg"));
-        Page<Map<String, String>> page = new Page<>();
-        page.setCurrent(current).setSize(size).setTotal(rsp.getLong("total"));
+        page.setTotal(rsp.getLong("total"));
         JSONArray rows = rsp.getJSONArray("rows");
         if (CollUtil.isEmpty(rows)) return R.success(page.setRecords(Collections.emptyList()));
         if (programList == null) loadProgramListJob();
@@ -185,15 +190,19 @@ public class ProgramController {
     @Scheduled(fixedDelay = 60000)
     protected void addProgram2Platform() throws IOException {
         if (programList == null) loadProgramListJob();
-        NetworkIF networkIF = new NetworkIF();
-        networkIF.setNetworkInterface(NetworkInterface.getByInetAddress(InetAddress.getLocalHost()));
-        String mac = networkIF.getMacaddr();
-        List<String> programNames = programList.stream().map(p -> p.get("name")).collect(Collectors.toList());
+        String mac = getMacAddress();
         if (StrUtil.isBlank(mac)) {
             log.warn("未获取到MAC地址");
             return;
         }
+        List<String> programNames = programList.stream().map(p -> p.get("name")).collect(Collectors.toList());
         HttpUtil.post(gateway + addProgramUrl,
                 JSONUtil.createObj().set("macAddress", mac).set("programList", programNames).toString());
     }
+
+    private String getMacAddress() throws UnknownHostException, SocketException {
+        NetworkIF networkIF = new NetworkIF();
+        networkIF.setNetworkInterface(NetworkInterface.getByInetAddress(InetAddress.getLocalHost()));
+        return networkIF.getMacaddr();
+    }
 }

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

@@ -41,6 +41,6 @@ core:
 apq:
   iot-gateway: 192.168.124.19:7002
   url:
-    install: /ops/install/getList?pageNum={}&pageSize={}
-    upgrade: /ops/upgrade/getList?pageNum={}&pageSize={}
+    install: /ops/install/getList?macAddress={}&pageNum={}&pageSize={}
+    upgrade: /ops/upgrade/getList?macAddress={}&pageNum={}&pageSize={}
     add-program: /ops/program/addFacProgram