Commit d7a89ecc authored by zengtianlai3's avatar zengtianlai3

修改

parent 48c9ac05
...@@ -61,12 +61,19 @@ public class OperateManager { ...@@ -61,12 +61,19 @@ public class OperateManager {
for (Server server : servers) { for (Server server : servers) {
String serverIp = server.getServerIp(); String serverIp = server.getServerIp();
allServers.put(serverIp, server); allServers.put(serverIp, server);
SamMonitor samMonitor = new SamMonitor();
samMonitor.setServerIp(serverIp);
samMonitor.setOnlineCount(0);
samMonitor.setSamCount(0);
this.putSamMonitorMap(serverIp, samMonitor);
} }
// createProxyClient(); // createProxyClient();
// test(); // test();
} }
public void createProxyClient() { public void createProxyClient() {
Iterator<Map.Entry<String, Server>> iterator = allServers.entrySet().iterator(); Iterator<Map.Entry<String, Server>> iterator = allServers.entrySet().iterator();
while (iterator.hasNext()) { while (iterator.hasNext()) {
......
...@@ -29,6 +29,7 @@ public class ServerServiceImpl extends ServiceImpl<ServerMapper, Server> impleme ...@@ -29,6 +29,7 @@ public class ServerServiceImpl extends ServiceImpl<ServerMapper, Server> impleme
@Override @Override
public List<Server> getServerList(int pageNo, int pageSize) { public List<Server> getServerList(int pageNo, int pageSize) {
Page<Server> page = new Page<>(pageNo, pageSize); Page<Server> page = new Page<>(pageNo, pageSize);
baseMapper.selectPage(page, null); baseMapper.selectPage(page, null);
List<Server> records = page.getRecords(); List<Server> records = page.getRecords();
......
...@@ -15,11 +15,8 @@ ...@@ -15,11 +15,8 @@
</update> </update>
<select id="getUserList" resultType="iot.sixiang.license.model.vo.UserVo"> <select id="getUserList" resultType="iot.sixiang.license.model.vo.UserVo">
SELECT user.user_id, user_name, PASSWORD, company, user.create_time, 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
user.update_time,apply.app_id, where 1=1
(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
where 1=1
<if test="null != userName and '' != userName"> <if test="null != userName and '' != userName">
and user_name like concat('%',#{userName},'%') and user_name like concat('%',#{userName},'%')
</if> </if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment