接口调整

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/controller/EquipmentController.java

@@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -57,8 +56,8 @@ public class EquipmentController extends AbstractController {
 	@ApiOperation(value="获取每个设备最新的参数值", notes="获取每个设备最新的参数值")
 	@GetMapping("/getListParam")
 	public R getListParam() {
-		List<Map<String,Object>> list = equipmentService.getList();
-		return R.ok().put("list", list);
+		Map<String,Object> list = equipmentService.getList();
+		return R.ok().put("bean", list);
 	}
 
 	/**

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/EquipmentService.java

 package com.devplatform.admin.modules.eq.service;
 
-import java.util.List;
 import java.util.Map;
 
 /**
@@ -9,5 +8,5 @@ import java.util.Map;
  */
 public interface EquipmentService {
 
-    List<Map<String, Object>> getList();
+    Map<String, Object> getList();
 }

microservice-admin/src/main/java/com/devplatform/admin/modules/eq/service/impl/EquipmentServiceImpl.java

@@ -4,7 +4,6 @@ import com.devplatform.admin.modules.eq.service.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -37,10 +36,10 @@ public class EquipmentServiceImpl implements EquipmentService {
     private SwqxzInfoService swqxzInfoService;
 
     @Override
-    public List<Map<String, Object>> getList() {
+    public Map<String, Object> getList() {
         Map<String,Object> map = new HashMap<String,Object>(16);
 
-        List<Map<String,Object>> list = new ArrayList<>();
+//        List<Map<String,Object>> list = new ArrayList<>();
 
         //多联室内机
         List<Map<String,Object>> dlsnjList = dlsnjInfoService.getList();
@@ -63,6 +62,17 @@ public class EquipmentServiceImpl implements EquipmentService {
         //室外气象站
         List<Map<String,Object>> swqxzList = swqxzInfoService.getList();
 
+        map.put("dlsnjList",dlsnjList);
+        map.put("dlswjList",dlswjList);
+        map.put("flrbList",flrbList);
+        map.put("jfktgList",jfktgList);
+        map.put("jfktpList",jfktpList);
+        map.put("pfjList",pfjList);
+        map.put("sbList",sbList);
+        map.put("sljfgList",sljfgList);
+        map.put("snqxzList",snqxzList);
+        map.put("swqxzList",swqxzList);
+
 //        list.addAll(dlsnjList);
 //        list.addAll(flrbList);
 //        list.addAll(jfktgList);
@@ -72,6 +82,6 @@ public class EquipmentServiceImpl implements EquipmentService {
 //        list.addAll(sljfgList);
 //        list.addAll(snqxzList);
 //        list.addAll(swqxzList);
-        return list;
+        return map;
     }
 }

microservice-admin/src/main/resources/mapper/eq/DlsnjInfoMapper.xml

@@ -55,7 +55,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM dlsnj_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/DlswjInfoMapper.xml

@@ -76,7 +76,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM dlswj_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/FlrbInfoMapper.xml

@@ -101,7 +101,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM flrb_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktgInfoMapper.xml

@@ -75,7 +75,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM jfktg_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/JfktpInfoMapper.xml

@@ -59,7 +59,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM jfktp_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/PfjInfoMapper.xml

@@ -79,7 +79,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM pfj_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SbInfoMapper.xml

@@ -51,7 +51,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM sb_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SljfgInfoMapper.xml

@@ -79,7 +79,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM sljfg_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SnqxzInfoMapper.xml

@@ -55,7 +55,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM snqxz_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>

microservice-admin/src/main/resources/mapper/eq/SwqxzInfoMapper.xml

@@ -65,7 +65,7 @@
 		(SELECT t2.resource_id, MAX(t2.create_time) AS maxdate
 		FROM swqxz_info AS t2
 		GROUP BY t2.resource_id) AS t3 ON t1.resource_id = t3.resource_id AND t1.create_time = t3.maxdate
-		left join li_resource li on li.id = resource_id
+		left join li_resource li on li.id = t1.resource_id
 	</select>
 
 </mapper>