Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
1f18fd20 由 康伟
选项

Merge remote-tracking branch 'origin/master'

2 个父辈 87d75531 2df9ad46
内嵌 并排
正在显示 6 个修改的文件 包含 114 行增加 和 33 行删除
sk-base-common/src/main/java/com/skua/modules/system/datestandard/mapper/xml/SysMonitorMetricInfoMapper.xml
...@@ -255,8 +255,8 @@ ...@@ -255,8 +255,8 @@
255 sys_monitor_metric_info m 255 sys_monitor_metric_info m
256 WHERE 256 WHERE
257 m.metric_uid_tag IN ( 257 m.metric_uid_tag IN (
258 'CSAD','CSCOD','CSLJLL','CSLL','CSPH','CSSS','CSTN','CSZL', 258 'CSNH3N','CSCOD','CSLJLL','CSLL','CSPH','CSSS','CSTN','CSTP',
259 'JSAD','JSCOD','JSLJLL','JSLL','JSPH','JSSS','JSZD','JSZL' 259 'JSNH3N','JSCOD','JSLJLL','JSLL','JSPH','JSSS','JSTN','JSTP'
260 ) 260 )
261 </select> 261 </select>
262 </mapper> 262 </mapper>
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/controller/FactoryCenterController.java
...@@ -2,6 +2,7 @@ package com.skua.modules.dataAnalysis.controller; ...@@ -2,6 +2,7 @@ package com.skua.modules.dataAnalysis.controller;
2 2
3 import com.skua.core.api.vo.Result; 3 import com.skua.core.api.vo.Result;
4 import com.skua.core.context.BaseContextHandler; 4 import com.skua.core.context.BaseContextHandler;
5 import com.skua.core.util.ConvertUtils;
5 import com.skua.modules.common.service.ICommonSqlService; 6 import com.skua.modules.common.service.ICommonSqlService;
6 import com.skua.modules.dataAnalysis.service.IFactoryCenterService; 7 import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
7 import com.skua.modules.dataAnalysis.vo.StatisticsParam; 8 import com.skua.modules.dataAnalysis.vo.StatisticsParam;
...@@ -194,7 +195,7 @@ public class FactoryCenterController { ...@@ -194,7 +195,7 @@ public class FactoryCenterController {
194 List<WaterQualityMonitoringDetailVO> list = new ArrayList<>(); 195 List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
195 WaterQualityMonitoringVO res = new WaterQualityMonitoringVO(); 196 WaterQualityMonitoringVO res = new WaterQualityMonitoringVO();
196 String departIds = ""; 197 String departIds = "";
197 if(waterQualityParams.getDepartId()!=null){ 198 if(ConvertUtils.isNotEmpty(waterQualityParams.getDepartId())){
198 departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId()); 199 departIds = commonSqlService.getChildFactorys(waterQualityParams.getDepartId());
199 }else{ 200 }else{
200 departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId()); 201 departIds = commonSqlService.getChildFactorys(BaseContextHandler.getRealDepartId());
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/service/impl/FactoryCenterServiceImpl.java
...@@ -226,12 +226,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -226,12 +226,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
226 inVO.setPhUpper(phMap.getOrDefault("upper","0")); 226 inVO.setPhUpper(phMap.getOrDefault("upper","0"));
227 inVO.setPhLower(phMap.getOrDefault("lower","0")); 227 inVO.setPhLower(phMap.getOrDefault("lower","0"));
228 inVO.setPhAbnormal("0"); 228 inVO.setPhAbnormal("0");
229 if(ConvertUtils.isNotEmpty(dataMap.get("time"))){
230 Date date = new Date(Long.parseLong(dataMap.get("time").toString()) * 1000);
231 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
232 inVO.setMonitorTime(formatter.format(date));
233 }
234 inVO.setFlowAbnormal("0");
229 inVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSCOD")); 235 inVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSCOD"));
230 inVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSNH3N")); 236 inVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSNH3N"));
231 inVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTP")); 237 inVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTP"));
232 inVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTN")); 238 inVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSTN"));
233 inVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSPH")); 239 inVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSPH"));
234 inVO.setSsllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLL")); 240 inVO.setFlowVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLL"));
235 inVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLJLL")); 241 inVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSLJLL"));
236 inVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSSS")); 242 inVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"JSSS"));
237 inVO = updateDataStatus(inVO); 243 inVO = updateDataStatus(inVO);
...@@ -282,12 +288,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -282,12 +288,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
282 outVO.setPhUpper(phMap.getOrDefault("upper","0")); 288 outVO.setPhUpper(phMap.getOrDefault("upper","0"));
283 outVO.setPhLower(phMap.getOrDefault("lower","0")); 289 outVO.setPhLower(phMap.getOrDefault("lower","0"));
284 outVO.setPhAbnormal("0"); 290 outVO.setPhAbnormal("0");
291 if(ConvertUtils.isNotEmpty(dataMap.get("time"))){
292 Date date = new Date(Long.parseLong(dataMap.get("time").toString()) * 1000);
293 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
294 outVO.setMonitorTime(formatter.format(date));
295 }
296 outVO.setFlowAbnormal("0");
285 outVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSCOD")); 297 outVO.setCodVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSCOD"));
286 outVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSNH3N")); 298 outVO.setNh3Val(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSNH3N"));
287 outVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTP")); 299 outVO.setTpVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTP"));
288 outVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTN")); 300 outVO.setTnVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSTN"));
289 outVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSPH")); 301 outVO.setPhVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSPH"));
290 outVO.setSsllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLL")); 302 outVO.setFlowVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLL"));
291 outVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLJLL")); 303 outVO.setLjllVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSLJLL"));
292 outVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSSS")); 304 outVO.setZdVal(getValueFromDataMap(dataMap,monitorTagMap,depart,"CSSS"));
293 outVO = updateDataStatus(outVO); 305 outVO = updateDataStatus(outVO);
...@@ -296,25 +308,35 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -296,25 +308,35 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
296 } 308 }
297 309
298 private WaterQualityMonitoringDetailVO updateDataStatus(WaterQualityMonitoringDetailVO waterQualityMonitoringDetailVO) { 310 private WaterQualityMonitoringDetailVO updateDataStatus(WaterQualityMonitoringDetailVO waterQualityMonitoringDetailVO) {
299 if(Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getCodUpper())|| 311 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getCodLower())){
300 Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getCodLower())){ 312 if(Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getCodUpper())||
301 waterQualityMonitoringDetailVO.setCodAbnormal("1"); 313 Double.parseDouble(waterQualityMonitoringDetailVO.getCodVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getCodLower())){
314 waterQualityMonitoringDetailVO.setCodAbnormal("1");
315 }
302 } 316 }
303 if(Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) > Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Upper())|| 317 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Upper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getNh3Lower())){
304 Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) < Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Lower())){ 318 if(Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) > Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Upper())||
305 waterQualityMonitoringDetailVO.setNh3Abnormal("1"); 319 Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Val()) < Double.parseDouble(waterQualityMonitoringDetailVO.getNh3Lower())){
320 waterQualityMonitoringDetailVO.setNh3Abnormal("1");
321 }
306 } 322 }
307 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTnUpper())|| 323 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTnLower())){
308 Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTnLower())){ 324 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTnUpper())||
309 waterQualityMonitoringDetailVO.setTnAbnormal("1"); 325 Double.parseDouble(waterQualityMonitoringDetailVO.getTnVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTnLower())){
326 waterQualityMonitoringDetailVO.setTnAbnormal("1");
327 }
310 } 328 }
311 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTpUpper())|| 329 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getTpLower())){
312 Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTpLower())){ 330 if(Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getTpUpper())||
313 waterQualityMonitoringDetailVO.setTpAbnormal("1"); 331 Double.parseDouble(waterQualityMonitoringDetailVO.getTpVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getTpLower())){
332 waterQualityMonitoringDetailVO.setTpAbnormal("1");
333 }
314 } 334 }
315 if(Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getPhUpper())|| 335 if(ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhUpper())&&ConvertUtils.isNotEmpty(waterQualityMonitoringDetailVO.getPhLower())){
316 Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getPhLower())){ 336 if(Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) > Double.parseDouble(waterQualityMonitoringDetailVO.getPhUpper())||
317 waterQualityMonitoringDetailVO.setPhAbnormal("1"); 337 Double.parseDouble(waterQualityMonitoringDetailVO.getPhVal()) < Double.parseDouble(waterQualityMonitoringDetailVO.getPhLower())){
338 waterQualityMonitoringDetailVO.setPhAbnormal("1");
339 }
318 } 340 }
319 return waterQualityMonitoringDetailVO; 341 return waterQualityMonitoringDetailVO;
320 } 342 }
...@@ -576,6 +598,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -576,6 +598,7 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
576 @Override 598 @Override
577 public Map<String, Object> getHourWaterData(StatisticsParam statisticsParam) { 599 public Map<String, Object> getHourWaterData(StatisticsParam statisticsParam) {
578 SimpleDateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 600 SimpleDateFormat datetimeFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
601 String tag = "CSPH,CSCOD,CSNH3N,CSTN,CSTP,CSLL,JSCOD,JSNH3N,JSPH,JSTN,JSTP,JSLL";
579 Map<String, Object> map = new HashMap<>(); 602 Map<String, Object> map = new HashMap<>();
580 Map<String, Object> dataMap = new HashMap<>(); 603 Map<String, Object> dataMap = new HashMap<>();
581 Map<String, Object> chartsMap = new HashMap<>(); 604 Map<String, Object> chartsMap = new HashMap<>();
...@@ -585,16 +608,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -585,16 +608,18 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
585 List<Object> jstnList = new ArrayList<>(); 608 List<Object> jstnList = new ArrayList<>();
586 List<Object> jstpList = new ArrayList<>(); 609 List<Object> jstpList = new ArrayList<>();
587 List<Object> jsphList = new ArrayList<>(); 610 List<Object> jsphList = new ArrayList<>();
611 List<Object> jsllList = new ArrayList<>();
588 List<Object> cscodList = new ArrayList<>(); 612 List<Object> cscodList = new ArrayList<>();
589 List<Object> csadList = new ArrayList<>(); 613 List<Object> csadList = new ArrayList<>();
590 List<Object> cstnList = new ArrayList<>(); 614 List<Object> cstnList = new ArrayList<>();
591 List<Object> cstpList = new ArrayList<>(); 615 List<Object> cstpList = new ArrayList<>();
592 List<Object> csphList = new ArrayList<>(); 616 List<Object> csphList = new ArrayList<>();
617 List<Object> csllList = new ArrayList<>();
593 map.put("number",new HashMap<>()); 618 map.put("number",new HashMap<>());
594 map.put("realTime",new HashMap<>()); 619 map.put("realTime",new HashMap<>());
595 QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>(); 620 QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>();
596 // 使用 split() 将字符串分割成数组并传递给 in() 方法 621 // 使用 split() 将字符串分割成数组并传递给 in() 方法
597 qw.in("metric_uid_tag", "CSPH,CSCOD,CSNH3N,CSTN,CSTP,JSCOD,JSNH3N,JSPH,JSTN,JSTP".split(",")); 622 qw.in("metric_uid_tag", tag.split(","));
598 // 进行等值匹配 623 // 进行等值匹配
599 qw.eq("depart_id", statisticsParam.getDepartId()); 624 qw.eq("depart_id", statisticsParam.getDepartId());
600 // 使用 groupBy 进行分组 625 // 使用 groupBy 进行分组
...@@ -603,14 +628,35 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -603,14 +628,35 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
603 List<SysMonitorMetricInfo> metricInfos = sysMonitorMetricInfoService.list(qw); 628 List<SysMonitorMetricInfo> metricInfos = sysMonitorMetricInfoService.list(qw);
604 if (!CollectionUtils.isEmpty(metricInfos)){ 629 if (!CollectionUtils.isEmpty(metricInfos)){
605 String fields = metricInfos.stream().map(SysMonitorMetricInfo::getId).collect(Collectors.joining(",")); 630 String fields = metricInfos.stream().map(SysMonitorMetricInfo::getId).collect(Collectors.joining(","));
606
607 Map<String, String> fieldsMap = metricInfos.stream().collect(Collectors.toMap(SysMonitorMetricInfo::getMetricUidTag, SysMonitorMetricInfo::getId)); 631 Map<String, String> fieldsMap = metricInfos.stream().collect(Collectors.toMap(SysMonitorMetricInfo::getMetricUidTag, SysMonitorMetricInfo::getId));
608 632 List<Map<String, Object>> list1 = new ArrayList<>();
609 List<Map<String, Object>> list1 = factoryInfoService.queryFactoryInfos(statisticsParam.getDepartId(),fields, 633 if(ConvertUtils.isNotEmpty(statisticsParam.getStatics())){
610 statisticsParam.getStartDate(),statisticsParam.getEndDate(),"1"); 634 if("hour".equals(statisticsParam.getStatics())){
635 list1 = factoryInfoService.queryFactoryInfos(statisticsParam.getDepartId(),fields,
636 statisticsParam.getStartDate(),statisticsParam.getEndDate(),"1");
637 }else if("day".equals(statisticsParam.getStatics())){
638 list1 = factoryInfoService.queryReportData(statisticsParam.getDepartId(),fields,
639 statisticsParam.getStartDate()+" 00:00:00",statisticsParam.getEndDate()+" 23:59:59","day");
640 }else if("month".equals(statisticsParam.getStatics())){
641 list1 = factoryInfoService.queryReportData(statisticsParam.getDepartId(),fields,
642 statisticsParam.getStartDate(),statisticsParam.getEndDate(),"month");
643 }else{
644 list1 = factoryInfoService.queryFactoryInfos(statisticsParam.getDepartId(),fields,
645 statisticsParam.getStartDate(),statisticsParam.getEndDate(),"1");
646 }
647 }
611 if (!CollectionUtils.isEmpty(list1)) { 648 if (!CollectionUtils.isEmpty(list1)) {
612 for (Map<String, Object> map1 : list1) { 649 for (Map<String, Object> map1 : list1) {
613 String time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat); 650 String time = "";
651 if("hour".equals(statisticsParam.getStatics())){
652 time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
653 }else if("day".equals(statisticsParam.getStatics())){
654 time = map1.get("time").toString();
655 }else if("month".equals(statisticsParam.getStatics())){
656 time = map1.get("time").toString();
657 }else{
658 time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), datetimeFormat);
659 }
614 xlist.add(time); 660 xlist.add(time);
615 String jscod; 661 String jscod;
616 if (!StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) { 662 if (!StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) {
...@@ -654,6 +700,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -654,6 +700,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
654 } 700 }
655 } 701 }
656 702
703 String jsll;
704 if (!StringUtils.isEmpty(jsll = fieldsMap.get("JSLL"))) {
705 if(map1.get(jsll)!=null){
706 jsllList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsll).toString()),2));
707 }else{
708 jsllList.add(0.00);
709 }
710 }
711
657 String cscod; 712 String cscod;
658 if (!StringUtils.isEmpty(cscod = fieldsMap.get("CSCOD"))) { 713 if (!StringUtils.isEmpty(cscod = fieldsMap.get("CSCOD"))) {
659 if(map1.get(cscod)!=null){ 714 if(map1.get(cscod)!=null){
...@@ -698,6 +753,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -698,6 +753,15 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
698 csphList.add(0.00); 753 csphList.add(0.00);
699 } 754 }
700 } 755 }
756
757 String csll;
758 if (!StringUtils.isEmpty(csll = fieldsMap.get("CSLL"))) {
759 if(map1.get(csll)!=null){
760 csllList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csll).toString()),2));
761 }else{
762 csllList.add(0.00);
763 }
764 }
701 } 765 }
702 } 766 }
703 } 767 }
...@@ -707,11 +771,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService { ...@@ -707,11 +771,13 @@ public class FactoryCenterServiceImpl implements IFactoryCenterService {
707 dataMap.put("jstn",jstnList); 771 dataMap.put("jstn",jstnList);
708 dataMap.put("jstp",jstpList); 772 dataMap.put("jstp",jstpList);
709 dataMap.put("jsph",jsphList); 773 dataMap.put("jsph",jsphList);
774 dataMap.put("jsll",csllList);
710 dataMap.put("cscod",cscodList); 775 dataMap.put("cscod",cscodList);
711 dataMap.put("csad",csadList); 776 dataMap.put("csad",csadList);
712 dataMap.put("cstn",cstnList); 777 dataMap.put("cstn",cstnList);
713 dataMap.put("cstp",cstpList); 778 dataMap.put("cstp",cstpList);
714 dataMap.put("csph",csphList); 779 dataMap.put("csph",csphList);
780 dataMap.put("csll",csllList);
715 chartsMap.put("dataMap",dataMap); 781 chartsMap.put("dataMap",dataMap);
716 chartsMap.put("xline",xlist); 782 chartsMap.put("xline",xlist);
717 map.put("charts",chartsMap); 783 map.put("charts",chartsMap);
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/StatisticsParam.java
...@@ -20,4 +20,14 @@ public class StatisticsParam { ...@@ -20,4 +20,14 @@ public class StatisticsParam {
20 /**结束时间*/ 20 /**结束时间*/
21 @ApiModelProperty(value = "结束时间") 21 @ApiModelProperty(value = "结束时间")
22 private String endDate; 22 private String endDate;
23 /**进出水类型*/
24 @ApiModelProperty(value = "进出水类型")
25 private String parmType;
26 /**数据类型*/
27 @ApiModelProperty(value = "数据类型")
28 private String statics;
29 /**数据标签*/
30 @ApiModelProperty(value = "数据标签")
31 private String tag;
32
23 } 33 }
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityMonitoringDetailVO.java
...@@ -42,11 +42,11 @@ public class WaterQualityMonitoringDetailVO { ...@@ -42,11 +42,11 @@ public class WaterQualityMonitoringDetailVO {
42 @ApiModelProperty(value = "监测时间") 42 @ApiModelProperty(value = "监测时间")
43 private String monitorTime; 43 private String monitorTime;
44 44
45 // @ApiModelProperty(value = "流量") 45 @ApiModelProperty(value = "流量")
46 // private String flowVal; 46 private String flowVal;
47 // private String flowUpper; 47 private String flowUpper;
48 // private String flowLower; 48 private String flowLower;
49 // private String flowAbnormal; 49 private String flowAbnormal;
50 50
51 @ApiModelProperty(value = "cod") 51 @ApiModelProperty(value = "cod")
52 private String codVal; 52 private String codVal;
...@@ -90,8 +90,8 @@ public class WaterQualityMonitoringDetailVO { ...@@ -90,8 +90,8 @@ public class WaterQualityMonitoringDetailVO {
90 @ApiModelProperty(value = "浊度") 90 @ApiModelProperty(value = "浊度")
91 private String zdVal; 91 private String zdVal;
92 92
93 @ApiModelProperty(value = "瞬时流量") 93 // @ApiModelProperty(value = "瞬时流量")
94 private String ssllVal; 94 // private String ssllVal;
95 @ApiModelProperty(value = "累计流量") 95 @ApiModelProperty(value = "累计流量")
96 private String ljllVal; 96 private String ljllVal;
97 97
......
sk-module-datafill/src/main/java/com/skua/modules/dataAnalysis/vo/WaterQualityParams.java
...@@ -19,4 +19,8 @@ public class WaterQualityParams { ...@@ -19,4 +19,8 @@ public class WaterQualityParams {
19 @ApiModelProperty(value = "进出水类型") 19 @ApiModelProperty(value = "进出水类型")
20 private String parmType; 20 private String parmType;
21 21
22 //数据类型
23 @ApiModelProperty(value = "数据类型 all/access/online/normal/abnormal")
24 private String dataType;
25
22 } 26 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!