修改

license/src/main/java/iot/sixiang/license/operate/OperateManager.java

@@ -61,12 +61,19 @@ public class OperateManager {
         for (Server server : servers) {
             String serverIp = server.getServerIp();
             allServers.put(serverIp, server);
+
+            SamMonitor samMonitor = new SamMonitor();
+            samMonitor.setServerIp(serverIp);
+            samMonitor.setOnlineCount(0);
+            samMonitor.setSamCount(0);
+            this.putSamMonitorMap(serverIp, samMonitor);
         }
 
 //        createProxyClient();
 //        test();
     }
 
+
     public void createProxyClient() {
         Iterator<Map.Entry<String, Server>> iterator = allServers.entrySet().iterator();
         while (iterator.hasNext()) {

license/src/main/java/iot/sixiang/license/service/impl/ServerServiceImpl.java

@@ -29,6 +29,7 @@ public class ServerServiceImpl extends ServiceImpl<ServerMapper, Server> impleme
 
     @Override
     public List<Server> getServerList(int pageNo, int pageSize) {
+
         Page<Server> page = new Page<>(pageNo, pageSize);
         baseMapper.selectPage(page, null);
         List<Server> records = page.getRecords();

license/src/main/resources/mapper/UserMapper.xml

@@ -15,10 +15,7 @@
     </update>
 
     <select id="getUserList" resultType="iot.sixiang.license.model.vo.UserVo">
-        SELECT user.user_id, user_name, PASSWORD, company, user.create_time,
-        user.update_time,apply.app_id,
-        (SELECT COUNT(sn) FROM device WHERE apply.`app_id` = device.`app_id`) deviceCount
-        FROM USER LEFT JOIN apply ON user.user_id = apply.user_id
+        SELECT user.user_id, user_name, PASSWORD, company, user.create_time, user.update_time ,COUNT(device.`device_id`) deviceCount FROM USER LEFT JOIN apply ON user.user_id = apply.user_id LEFT JOIN device ON apply.app_id = device.app_id
             where 1=1
         <if test="null != userName and '' != userName">
             and user_name like concat('%',#{userName},'%')