Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
7705c933 由 张雷
选项

实时数据问题修改

1 个父辈 671b4a1c
内嵌 并排
正在显示 2 个修改的文件 包含 17 行增加 和 13 行删除
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -87,15 +87,16 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -87,15 +87,16 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
87 if(!StringUtils.isEmpty(fields)) { 87 if(!StringUtils.isEmpty(fields)) {
88 fields = fields.substring(1); 88 fields = fields.substring(1);
89 } 89 }
90 //根据厂区分别查询实时数据
91 int sort = 0;//序号
92 String[] departIdArr = departId.split(",");
93 for (String depart : departIdArr) {
94 List<WaterQualityMonitoringDetailVO> realTimelist = new ArrayList<>();
90 //获取实时数据 95 //获取实时数据
91 List<Map<String, Object>> pgDataList = pgQueryService.queryFactoryMonitorFromRealTimeData(departId, fields); 96 List<Map<String, Object>> pgDataList = pgQueryService.queryFactoryMonitorFromRealTimeData(depart, fields);
92 Map<String, Object> dataMap = new HashMap<String,Object>(); 97 Map<String, Object> dataMap = new HashMap<String,Object>();
93 if(pgDataList!=null&&pgDataList.size()>0) { 98 if(pgDataList!=null&&pgDataList.size()>0) {
94 dataMap = pgDataList.get(0); 99 dataMap = pgDataList.get(0);
95 }
96 String[] departArray = departId.split(",");
97 int sort = 0;//序号
98 for(String depart : departArray) {
99 Map<String,Object> limitMap = new HashMap<>(); 100 Map<String,Object> limitMap = new HashMap<>();
100 if(levelMap.get(depart)!=null){ 101 if(levelMap.get(depart)!=null){
101 List<Map<String,String>> limitList = (List<Map<String,String>>)levelMap.get(depart); 102 List<Map<String,String>> limitList = (List<Map<String,String>>)levelMap.get(depart);
...@@ -106,23 +107,26 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -106,23 +107,26 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
106 if(parmType != null){ 107 if(parmType != null){
107 if("in".equals(parmType)){ 108 if("in".equals(parmType)){
108 sort++; 109 sort++;
109 list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 110 realTimelist = putInWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
110 }else if("out".equals(parmType)){ 111 }else if("out".equals(parmType)){
111 sort++; 112 sort++;
112 list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 113 realTimelist = putOutWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
113 }else{ 114 }else{
114 sort++; 115 sort++;
115 list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 116 realTimelist = putInWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
116 sort++; 117 sort++;
117 list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 118 realTimelist = putOutWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
118 } 119 }
119 }else{ 120 }else{
120 sort++; 121 sort++;
121 list = putInWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 122 realTimelist = putInWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
122 sort++; 123 sort++;
123 list = putOutWaterDataInList(sort,list,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap); 124 realTimelist = putOutWaterDataInList(sort,realTimelist,dataMap,monitorTagMap,depart,departMap,departParentMap,limitMap);
124 } 125 }
126 list.addAll(realTimelist);
125 } 127 }
128 }
129
126 return list; 130 return list;
127 } 131 }
128 132
......
sk-module-system/src/main/java/com/skua/modules/system/controller/SysFactoryInfoController.java
...@@ -483,12 +483,12 @@ public class SysFactoryInfoController { ...@@ -483,12 +483,12 @@ public class SysFactoryInfoController {
483 public Result queryByDepartId(@RequestParam(name = "departId", required = true) String departId) { 483 public Result queryByDepartId(@RequestParam(name = "departId", required = true) String departId) {
484 Result result = new Result(); 484 Result result = new Result();
485 SysFactoryInfoVO sysFactoryInfo = sysFactoryInfoService.getByDepartId(departId); 485 SysFactoryInfoVO sysFactoryInfo = sysFactoryInfoService.getByDepartId(departId);
486 JSONObject jsonObject = sysDictService.translateTDictValue(sysFactoryInfo); 486 JSONObject jsonObject = new JSONObject();
487 if (sysFactoryInfo == null) { 487 if (sysFactoryInfo == null) {
488 departId = getDepart(BaseContextHandler.getRealDepartId()); 488 departId = getDepart(BaseContextHandler.getRealDepartId());
489 sysFactoryInfo = sysFactoryInfoService.getByDepartId(departId); 489 sysFactoryInfo = sysFactoryInfoService.getByDepartId(departId);
490 jsonObject = sysDictService.translateTDictValue(sysFactoryInfo);
491 } 490 }
491 jsonObject = sysDictService.translateTDictValue(sysFactoryInfo);
492 result.setResult(jsonObject); 492 result.setResult(jsonObject);
493 result.setSuccess(true); 493 result.setSuccess(true);
494 return result; 494 return result;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!