设备台账实时数据问题修改

@@ -43,6 +43,7 @@ public class EmergencyCommandLiaison {
 	/**所属厂区*/
 	/**所属厂区*/
 	@Excel(name = "所属厂区", width = 15)
 	@Excel(name = "所属厂区", width = 15)
 	@ApiModelProperty(value = "所属厂区")
 	@ApiModelProperty(value = "所属厂区")
+	@Dict(dictTable = "sys_depart", dicCode="id", dicText = "depart_name")
 	private String departId;
 	private String departId;
 	/**版块类型:1-河道,2-污水厂,3-排水管网*/
 	/**版块类型:1-河道,2-污水厂,3-排水管网*/
 	@Excel(name = "版块类型:1-河道,2-污水厂,3-排水管网", width = 15)
 	@Excel(name = "版块类型:1-河道,2-污水厂,3-排水管网", width = 15)

@@ -518,9 +518,7 @@ public class EquipmentController {
     @ApiOperation(value = "设备-采集实时数据", notes = "设备-采集实时数据")
     @ApiOperation(value = "设备-采集实时数据", notes = "设备-采集实时数据")
     @GetMapping(value = "/realTimeData")
     @GetMapping(value = "/realTimeData")
     public Result<List<Map<String,Object>>> equipRealTimeDataCtrl(@RequestParam(value = "infoId") String infoId,
     public Result<List<Map<String,Object>>> equipRealTimeDataCtrl(@RequestParam(value = "infoId") String infoId,
-                                                             @RequestParam(value = "departId") String departId,
-                                                             @RequestParam(value = "startTime") String startTime,
-                                                             @RequestParam(value = "endTime") String endTime) {
+                                                             @RequestParam(value = "departId") String departId) {
         Result<List<Map<String,Object>>> result = new Result<>();
         Result<List<Map<String,Object>>> result = new Result<>();
         QueryWrapper<SysMonitorMetricInfo> queryWrapper = new QueryWrapper<>();
         QueryWrapper<SysMonitorMetricInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("equipment_code", infoId)
         queryWrapper.eq("equipment_code", infoId)
@@ -533,31 +531,11 @@ public class EquipmentController {
         //获取实时指标
         //获取实时指标
         String fields = "";
         String fields = "";
         for(SysMonitorMetricInfo monitorInfo : list) {
         for(SysMonitorMetricInfo monitorInfo : list) {
-        	//
-//        	if("1".equals(monitorInfo.getMetricType())) {
-//        		//数字量判断表达式
-//        		String express1 = monitorInfo.getMetricExpress1();
-//            	String express2 = monitorInfo.getMetricExpress1();
-//            	String express3 = monitorInfo.getMetricExpress1();
-//            	if(!StringUtils.isEmpty(express1)) {
-//            		fields = fields+","+express1;
-//            	}
-//            	if(!StringUtils.isEmpty(express2)) {
-//            		fields = fields+","+express2;
-//            	}
-//            	if(!StringUtils.isEmpty(express3)) {
-//            		fields = fields+","+express3;
-//            	}
-//        	}else {
-//        		fields = fields+","+monitorInfo.getId();
-//        	}
         	fields = fields+","+monitorInfo.getId();
         	fields = fields+","+monitorInfo.getId();
         }
         }
         if(!StringUtils.isEmpty(fields)) {
         if(!StringUtils.isEmpty(fields)) {
         	fields = fields.substring(1);
         	fields = fields.substring(1);
         }
         }
-        List<SysMetricDict> sysMetricDicts = sysMetricDictService.list();
-        Map<String, String> dictMap = sysMetricDicts.stream().collect(Collectors.toMap(o1 -> o1.getId(), o2 -> o2.getMetricUnit()));
         //List<Map<String, Object>> pgDataList = iFactoryInfoService.queryFactoryInfos(departId, fields, startTime, endTime, "0");
         //List<Map<String, Object>> pgDataList = iFactoryInfoService.queryFactoryInfos(departId, fields, startTime, endTime, "0");
         List<Map<String, Object>> pgDataList = pgQueryService.queryFactoryMonitorFromRealTimeData(departId, fields);
         List<Map<String, Object>> pgDataList = pgQueryService.queryFactoryMonitorFromRealTimeData(departId, fields);
         Map<String, Object> dataMap = new HashMap<String,Object>();
         Map<String, Object> dataMap = new HashMap<String,Object>();
@@ -565,15 +543,13 @@ public class EquipmentController {
         	dataMap = pgDataList.get(0);
         	dataMap = pgDataList.get(0);
         }
         }
         List<Map<String,Object>> resultList = new ArrayList<Map<String,Object>>();
         List<Map<String,Object>> resultList = new ArrayList<Map<String,Object>>();
-
         for(SysMonitorMetricInfo monitorInfo : list) {
         for(SysMonitorMetricInfo monitorInfo : list) {
         	Map<String,Object> tempMap = new HashMap<String,Object>();
         	Map<String,Object> tempMap = new HashMap<String,Object>();
         	tempMap.put("time", DateUtils.formatTime(Long.parseLong(dataMap.get("time") + "000")));
         	tempMap.put("time", DateUtils.formatTime(Long.parseLong(dataMap.get("time") + "000")));
         	tempMap.put("indexName", monitorInfo.getMetricName());
         	tempMap.put("indexName", monitorInfo.getMetricName());
             tempMap.put("indexCode", monitorInfo.getId());
             tempMap.put("indexCode", monitorInfo.getId());
         	tempMap.put("indexValue", dataMap.get(monitorInfo.getId()));
         	tempMap.put("indexValue", dataMap.get(monitorInfo.getId()));
-            String metricUidTag = monitorInfo.getMetricUidTag();
-        	tempMap.put("indexUnit",StringUtils.isBlank(dictMap.get(metricUidTag) )?monitorInfo.getMetricUnit():"");
+            tempMap.put("indexUnit",StringUtils.isNotBlank(monitorInfo.getMetricUnit()) ? monitorInfo.getMetricUnit():"");
         	tempMap.put("indexType", monitorInfo.getMetricType());
         	tempMap.put("indexType", monitorInfo.getMetricType());
         	resultList.add(tempMap);
         	resultList.add(tempMap);
         }
         }