厂区驾驶舱接口开发

@@ -83,7 +83,6 @@
     <select id="getYhylqs" resultType="java.util.HashMap">
         SELECT
             LEFT( v3.time, 7 ) time,
-            ( v3.time, 7 ) time,
             (SUM( v3.NACLO ) + SUM( v3.PFS ) + SUM( v3.FHTY ) + SUM( v3.RYXNJ ) + SUM( v3.YWL ) + SUM( v3.GXCLJ ) + SUM( v3.CH3COONA )
                 + SUM( v3.HXT ) + SUM( v3.FECL3 ) + SUM( v3.SH ) + SUM( v3.CH3COOH ) + SUM( v3.FESO4G ) + SUM( v3.FESO4Y ) + SUM( v3.H2O2 ) ) AS zyl,
             v2.clsl,

@@ -133,9 +133,9 @@ skua:
   web-url: http://103.85.171.27:8096
   path:
     #文件上传根目录 设置
-    upload: ../file
+    upload: /home/skboot/file
     #webapp文件路径
-    webapp: ../file
+    webapp: /home/skboot/file
     # 断点续传路径
     chunk: /home/skboot/file/files
   #创蓝短信秘钥

+package com.skua.modules.dataAnalysis.controller;
+
+import com.skua.core.api.vo.Result;
+import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
+import com.skua.modules.dataAnalysis.vo.StatisticsParam;
+import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
+import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Slf4j
+@Api(tags = "厂区驾驶舱")
+@RestController
+@RequestMapping("/v1/factoryCenter")
+public class FactoryCenterController {
+
+    @Autowired
+    private IFactoryCenterService factoryCenterService;
+
+    @ApiOperation(value="厂区驾驶舱实时数据查询", notes="厂区驾驶舱实时数据查询")
+    @GetMapping(value = "/getRealTimeData")
+    public Result<List<WaterQualityMonitoringDetailVO>> getRealTimeData(String departId) {
+        Result<List<WaterQualityMonitoringDetailVO>> result = new Result<List<WaterQualityMonitoringDetailVO>>();
+        List<WaterQualityMonitoringDetailVO> list = factoryCenterService.queryMonitoringData(departId);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    @ApiOperation(value="厂区驾驶舱统计数据", notes="厂区驾驶舱统计数据")
+    @GetMapping(value = "/getData")
+    public Result<Map<String,Object>> getData(String departId,String month) {
+        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+        Map<String,Object> map = factoryCenterService.getData(departId,month);
+        result.setSuccess(true);
+        result.setResult(map);
+        return result;
+    }
+
+    @ApiOperation(value="厂区驾驶舱产泥量统计", notes="厂区驾驶舱产泥量统计")
+    @GetMapping(value = "/getCnltj")
+    public Result<List<Map<String, Object>>> getCnltj(StatisticsParam statisticsParam) {
+        Result<List<Map<String, Object>>> result = new Result<List<Map<String, Object>>>();
+        List<Map<String, Object>> list = factoryCenterService.getCnltj(statisticsParam);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    @ApiOperation(value="厂区驾驶舱耗电量统计", notes="厂区驾驶舱耗电量统计")
+    @GetMapping(value = "/getHdltj")
+    public Result<List<Map<String, Object>>> getHdltj(StatisticsParam statisticsParam) {
+        Result<List<Map<String, Object>>> result = new Result<List<Map<String, Object>>>();
+        List<Map<String, Object>> list = factoryCenterService.getHdltj(statisticsParam);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    //污水处理水量统计
+    @ApiOperation(value="厂区驾驶舱污水处理水量统计", notes="厂区驾驶舱污水处理水量统计")
+    @GetMapping(value = "/getWssltj")
+    public Result<List<Map<String, Object>>> getWssltj(StatisticsParam statisticsParam) {
+        Result<List<Map<String, Object>>> result = new Result<List<Map<String, Object>>>();
+        List<Map<String, Object>> list = factoryCenterService.getWssltj(statisticsParam);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    //厂区驾驶舱药耗统计
+    @ApiOperation(value="厂区驾驶舱药耗统计", notes="厂区驾驶舱药耗统计")
+    @GetMapping(value = "/getYhtj")
+    public Result<List<Map<String, Object>>> getYhtj(StatisticsParam statisticsParam) {
+        Result<List<Map<String, Object>>> result = new Result<List<Map<String, Object>>>();
+        List<Map<String, Object>> list = factoryCenterService.getYhtj(statisticsParam);
+        result.setSuccess(true);
+        result.setResult(list);
+        return result;
+    }
+
+    /**
+     * <pre>
+     * <获取指定厂站报警阈值
+     * </pre>
+     * @return
+     */
+    @ApiOperation(value="获取指定厂站报警阈值", notes="获取指定厂站报警阈值")
+    @GetMapping(value = "/getMonitorThreshold")
+    public Result<Map<String,Object>> getMonitorThreshold(String departId) {
+        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+        Map<String, Object> map = factoryCenterService.getMonitorThreshold(departId);
+        result.setSuccess(true);
+        result.setResult(map);
+        return result;
+    }
+
+    @ApiOperation(value="获取水质变化趋势", notes="获取水质变化趋势")
+    @GetMapping(value = "/getHourWaterData")
+    public Result<Map<String,Object>> getHourWaterData(StatisticsParam statisticsParam) {
+        Result<Map<String,Object>> result = new Result<Map<String,Object>>();
+        Map<String,Object> map = new HashMap<>();
+        map = factoryCenterService.getHourWaterData(statisticsParam);
+        result.setSuccess(true);
+        result.setResult(map);
+        return result;
+    }
+}

+package com.skua.modules.dataAnalysis.mapper;
+
+import com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface FactoryCenterMapper {
+
+    List<SysMonitorMetricInfo> getMonitorListByDepart(@Param("departId") String departId);
+
+    List<Map<String, Object>> getHourWaterData(@Param("departId") String departId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+}

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper">
+
+    <select id="getMonitorListByDepart" resultType="com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo">
+        SELECT
+            *
+        FROM
+            sys_monitor_metric_info
+        WHERE
+            depart_id = #{departId}
+            AND metric_uid_tag IN ( 'JSTP', 'JSTN', 'JSPH', 'JSNH3N', 'JSCOD', 'CSTP', 'CSTN', 'CSPH', 'CSNH3N', 'CSCOD' )
+    </select>
+    <select id="getHourWaterData" resultType="java.util.HashMap">
+        select * from sys_monitor_metric_info
+    </select>
+
+</mapper>

+package com.skua.modules.dataAnalysis.service;
+
+import com.skua.modules.dataAnalysis.vo.StatisticsParam;
+import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
+
+import java.util.List;
+import java.util.Map;
+
+public interface IFactoryCenterService {
+
+    /**
+     * 获取水质监测数据
+     * @param departId
+     * @return
+     */
+    List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId);
+
+    Map<String, Object> getData(String departId,String month);
+
+    List<Map<String, Object>> getCnltj(StatisticsParam statisticsParam);
+
+    List<Map<String, Object>> getHdltj(StatisticsParam statisticsParam);
+
+    List<Map<String, Object>> getWssltj(StatisticsParam statisticsParam);
+
+    List<Map<String, Object>> getYhtj(StatisticsParam statisticsParam);
+
+    Map<String, Object> getMonitorThreshold(String departId);
+
+    Map<String, Object> getHourWaterData(StatisticsParam statisticsParam);
+}
+

+package com.skua.modules.dataAnalysis.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.skua.core.context.SpringContextUtils;
+import com.skua.core.service.IPgQueryService;
+import com.skua.core.util.ConvertUtils;
+import com.skua.core.util.DateUtils;
+import com.skua.core.util.DoubleOperaUtils;
+import com.skua.modules.dataAnalysis.mapper.FactoryCenterMapper;
+import com.skua.modules.dataAnalysis.service.IFactoryCenterService;
+import com.skua.modules.dataAnalysis.vo.StatisticsParam;
+import com.skua.modules.dataAnalysis.vo.WaterQualityMonitoringDetailVO;
+import com.skua.modules.system.datestandard.entity.SysMonitorMetricInfo;
+import com.skua.modules.system.datestandard.service.ISysMonitorMetricInfoService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.YearMonth;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class FactoryCenterServiceImpl implements IFactoryCenterService {
+
+    @Resource
+    private FactoryCenterMapper factoryCenterMapper;
+    @Autowired
+    private IPgQueryService pgQueryService;
+    @Autowired
+    private ISysMonitorMetricInfoService sysMonitorMetricInfoService;
+
+    @Override
+    public List<WaterQualityMonitoringDetailVO> queryMonitoringData(String departId) {
+        List<WaterQualityMonitoringDetailVO> list = new ArrayList<>();
+        Map<String, Object> monitorTagMap = new HashMap<String,Object>();
+        monitorTagMap.put("CSCOD","BXWSCLC_PLC1_Tag386");
+        monitorTagMap.put("CSNH3N","BXWSCLC_PLC1_Tag387");
+        monitorTagMap.put("CSPH","BXWSCLC_PLC1_Tag385");
+        monitorTagMap.put("CSTN","BXWSCLC_PLC1_Tag392");
+        monitorTagMap.put("CSTP","BXWSCLC_PLC1_Tag388");
+        monitorTagMap.put("JSCOD","BXWSCLC_PLC1_Tag381");
+        monitorTagMap.put("JSNH3N","BXWSCLC_PLC1_Tag382");
+        monitorTagMap.put("JSPH","BXWSCLC_PLC1_Tag1");
+        monitorTagMap.put("JSTN","BXWSCLC_PLC1_Tag3");
+        monitorTagMap.put("JSTP","BXWSCLC_PLC1_Tag2");
+//        List<SysMonitorMetricInfo> monitorList = factoryCenterMapper.getMonitorListByDepart(departId);
+        //获取实时指标
+        String fields = "";
+//        for(SysMonitorMetricInfo monitorInfo : monitorList) {
+//            fields = fields+","+monitorInfo.getId();
+//        }
+//        if(!StringUtils.isEmpty(fields)) {
+//            fields = fields.substring(1);
+//        }
+        fields = "BXWSCLC_PLC1_Tag386,BXWSCLC_PLC1_Tag387,BXWSCLC_PLC1_Tag385,BXWSCLC_PLC1_Tag392,BXWSCLC_PLC1_Tag388," +
+                "BXWSCLC_PLC1_Tag381,BXWSCLC_PLC1_Tag382,BXWSCLC_PLC1_Tag1,BXWSCLC_PLC1_Tag3,BXWSCLC_PLC1_Tag2,";
+        //获取实时数据
+        List<Map<String, Object>> pgDataList = pgQueryService.queryFactoryMonitorFromRealTimeData(departId, fields);
+        Map<String, Object> dataMap = new HashMap<String,Object>();
+        if(pgDataList!=null&&pgDataList.size()>0) {
+            dataMap = pgDataList.get(0);
+        }
+        WaterQualityMonitoringDetailVO inVO = new WaterQualityMonitoringDetailVO();
+        inVO.setParmType("in");
+        inVO.setNum(1);
+        inVO.setDepartId(departId);
+        inVO.setCodUpper("150");
+        inVO.setCodLower("0");
+        inVO.setNh3Upper("35");
+        inVO.setNh3Lower("0");
+        inVO.setTpUpper("4");
+        inVO.setTpLower("0");
+        inVO.setTnUpper("20");
+        inVO.setTnLower("0");
+        inVO.setPhUpper("14");
+        inVO.setPhLower("0");
+        if(monitorTagMap.get("JSCOD")!=null){
+            if(dataMap.get(monitorTagMap.get("JSCOD").toString())!=null){
+                inVO.setCodVal(dataMap.get(monitorTagMap.get("JSCOD").toString()).toString());
+            }else{
+                inVO.setCodVal("0");
+            }
+        }else{
+            inVO.setCodVal("0");
+        }
+        if(monitorTagMap.get("JSNH3N")!=null){
+            if(dataMap.get(monitorTagMap.get("JSNH3N").toString())!=null){
+                inVO.setNh3Val(dataMap.get(monitorTagMap.get("JSNH3N").toString()).toString());
+            }else{
+                inVO.setNh3Val("0");
+            }
+        }else{
+            inVO.setNh3Val("0");
+        }
+        if(monitorTagMap.get("JSTP")!=null){
+            if(dataMap.get(monitorTagMap.get("JSTP").toString())!=null){
+                inVO.setTpVal(dataMap.get(monitorTagMap.get("JSTP").toString()).toString());
+            }else{
+                inVO.setTpVal("0");
+            }
+        }else{
+            inVO.setTpVal("0");
+        }
+        if(monitorTagMap.get("JSTN")!=null){
+            if(dataMap.get(monitorTagMap.get("JSTN").toString())!=null){
+                inVO.setTnVal(dataMap.get(monitorTagMap.get("JSTN").toString()).toString());
+            }else{
+                inVO.setTnVal("0");
+            }
+        }else{
+            inVO.setTnVal("0");
+        }
+        if(monitorTagMap.get("JSPH")!=null){
+            if(dataMap.get(monitorTagMap.get("JSPH").toString())!=null){
+                inVO.setPhVal(dataMap.get(monitorTagMap.get("JSPH").toString()).toString());
+            }else{
+                inVO.setPhVal("0");
+            }
+        }else{
+            inVO.setPhVal("0");
+        }
+        list.add(inVO);
+        WaterQualityMonitoringDetailVO outVO = new WaterQualityMonitoringDetailVO();
+        outVO.setParmType("out");
+        outVO.setNum(2);
+        outVO.setDepartId(departId);
+        outVO.setCodUpper("30");
+        outVO.setCodLower("0");
+        outVO.setNh3Upper("1.5");
+        outVO.setNh3Lower("0");
+        outVO.setTpUpper("0.3");
+        outVO.setTpLower("0");
+        outVO.setTnUpper("10");
+        outVO.setTnLower("0");
+        outVO.setPhUpper("9");
+        outVO.setPhLower("6");
+        if(monitorTagMap.get("CSCOD")!=null){
+            if(dataMap.get(monitorTagMap.get("CSCOD").toString())!=null){
+                outVO.setCodVal(dataMap.get(monitorTagMap.get("CSCOD").toString()).toString());
+            }else{
+                outVO.setCodVal("0");
+            }
+        }else{
+            outVO.setCodVal("0");
+        }
+        if(monitorTagMap.get("CSNH3N")!=null){
+            if(dataMap.get(monitorTagMap.get("CSNH3N").toString())!=null){
+                outVO.setNh3Val(dataMap.get(monitorTagMap.get("CSNH3N").toString()).toString());
+            }else{
+                outVO.setNh3Val("0");
+            }
+        }else{
+            outVO.setNh3Val("0");
+        }
+        if(monitorTagMap.get("CSTP")!=null){
+            if(dataMap.get(monitorTagMap.get("CSTP").toString())!=null){
+                outVO.setTpVal(dataMap.get(monitorTagMap.get("CSTP").toString()).toString());
+            }else{
+                outVO.setTpVal("0");
+            }
+        }else{
+            outVO.setTpVal("0");
+        }
+        if(monitorTagMap.get("CSTN")!=null){
+            if(dataMap.get(monitorTagMap.get("CSTN").toString())!=null){
+                outVO.setTnVal(dataMap.get(monitorTagMap.get("CSTN").toString()).toString());
+            }else{
+                outVO.setTnVal("0");
+            }
+        }else{
+            outVO.setTnVal("0");
+        }
+        if(monitorTagMap.get("CSPH")!=null){
+            if(dataMap.get(monitorTagMap.get("CSPH").toString())!=null){
+                outVO.setPhVal(dataMap.get(monitorTagMap.get("CSPH").toString()).toString());
+            }else{
+                outVO.setPhVal("0");
+            }
+        }else{
+            outVO.setPhVal("0");
+        }
+        list.add(outVO);
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> getData(String departId,String month) {
+        Map<String, Object> map = new HashMap<>();
+        map.put("yclsl",new HashMap<>());
+        Map<String, Object> yclslMap = new HashMap<>();
+        yclslMap.put("value","0");
+        yclslMap.put("valueTb","0");
+        yclslMap.put("valueHb","0");
+        map.put("rjclsl",new HashMap<>());
+        Map<String, Object> rjclslMap = new HashMap<>();
+        rjclslMap.put("value","0");
+        rjclslMap.put("valueTb","0");
+        rjclslMap.put("valueHb","0");
+        map.put("yzdl",new HashMap<>());
+        Map<String, Object> yzdlMap = new HashMap<>();
+        yzdlMap.put("value","0");
+        yzdlMap.put("valueTb","0");
+        yzdlMap.put("valueHb","0");
+        map.put("dsdh",new HashMap<>());
+        Map<String, Object> dsdhMap = new HashMap<>();
+        dsdhMap.put("value","0");
+        dsdhMap.put("valueTb","-");
+        dsdhMap.put("valueHb","0");
+        map.put("yzcnl",new HashMap<>());
+        Map<String, Object> yzcnlMap = new HashMap<>();
+        yzcnlMap.put("value","0");
+        yzcnlMap.put("valueTb","-");
+        yzcnlMap.put("valueHb","0");
+        map.put("wdscnl",new HashMap<>());
+        Map<String, Object> wdscnlMap = new HashMap<>();
+        wdscnlMap.put("value","0");
+        wdscnlMap.put("valueTb","-");
+        wdscnlMap.put("valueHb","0");
+        return map;
+    }
+
+    @Override
+    public List<Map<String, Object>> getCnltj(StatisticsParam statisticsParam) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        String startDate = statisticsParam.getStartDate();
+        String endDate = statisticsParam.getEndDate();
+        List<String> monthList = getMonthsBetween(startDate,endDate);
+        for ( String month : monthList ) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("time",month);
+            map.put("cnl","0");
+            map.put("wdscnl","0");
+            map.put("cnl_tb","0");
+            map.put("wdscnl_tb","0");
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> getHdltj(StatisticsParam statisticsParam) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        String startDate = statisticsParam.getStartDate();
+        String endDate = statisticsParam.getEndDate();
+        List<String> monthList = getMonthsBetween(startDate,endDate);
+        for ( String month : monthList ) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("time",month);
+            map.put("hdl","0");
+            map.put("dsdh","0");
+            map.put("hdl_tb","0");
+            map.put("dsdh_tb","0");
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> getWssltj(StatisticsParam statisticsParam) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        String startDate = statisticsParam.getStartDate();
+        String endDate = statisticsParam.getEndDate();
+        List<String> monthList = getMonthsBetween(startDate,endDate);
+        for ( String month : monthList ) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("time",month);
+            map.put("clsl","0");
+            map.put("clsl_tb","0");
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public List<Map<String, Object>> getYhtj(StatisticsParam statisticsParam) {
+        List<Map<String, Object>> list = new ArrayList<>();
+        String startDate = statisticsParam.getStartDate();
+        String endDate = statisticsParam.getEndDate();
+        List<String> monthList = getMonthsBetween(startDate,endDate);
+        for ( String month : monthList ) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("time",month);
+            map.put("clyj","0");
+            map.put("tyyj","0");
+            list.add(map);
+        }
+        return list;
+    }
+
+    @Override
+    public Map<String, Object> getMonitorThreshold(String departId) {
+        JdbcTemplate masterDB = (JdbcTemplate) SpringContextUtils.getBean("master");
+        Map<String,Object> resultMap = new HashMap<String,Object>();
+        //获取进出水报警阈值
+        String alarmSql = "SELECT * FROM " +
+                " ( " +
+                " SELECT " +
+                "   a.depart_id," +
+                "   a.out_level," +
+                "   b.alarm_param_code AS index_code," +
+                "   b.alarm_param_upper_limit AS upper" +
+                " FROM " +
+                "   sys_factory_info a " +
+                " LEFT JOIN alarm_param_standard_config b ON a.out_level = b.alarm_level_standard_id " +
+                "   WHERE depart_id = '"+departId+"'" +
+                " UNION ALL " +
+                " SELECT " +
+                "   DISTINCT depart_id, " +
+                "   '' as out_level, " +
+                "   index_code, " +
+                "   upper " +
+                " FROM " +
+                "   water_quality_in_level " +
+                " WHERE depart_id = '"+departId+"'" +
+                " ) aa ";
+        List<Map<String,Object>> alarmList = masterDB.queryForList(alarmSql);
+        for(Map<String,Object> map : alarmList) {
+            resultMap.put(ConvertUtils.getString(map.get("index_code")), ConvertUtils.getString(map.get("upper")));
+        }
+        return resultMap;
+    }
+
+    @Override
+    public Map<String, Object> getHourWaterData(StatisticsParam statisticsParam) {
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> dataMap = new HashMap<>();
+        Map<String, Object> chartsMap = new HashMap<>();
+        List<Object> xlist = new ArrayList<>();
+        List<Object> jscodList = new ArrayList<>();
+        List<Object> jsadList = new ArrayList<>();
+        List<Object> jstnList = new ArrayList<>();
+        List<Object> jstpList = new ArrayList<>();
+        List<Object> jsphList = new ArrayList<>();
+        List<Object> cscodList = new ArrayList<>();
+        List<Object> csadList = new ArrayList<>();
+        List<Object> cstnList = new ArrayList<>();
+        List<Object> cstpList = new ArrayList<>();
+        List<Object> csphList = new ArrayList<>();
+        map.put("number",new HashMap<>());
+        map.put("realTime",new HashMap<>());
+//        List<Map<String, Object>> list = factoryCenterMapper.getHourWaterData(statisticsParam.getDepartId(),
+//                statisticsParam.getStartDate(), statisticsParam.getEndDate());
+//        for (Map<String, Object> newMap: list) {
+//            xlist.add(newMap.get("dataTime"));
+//            jscodList.add(newMap.get("jscod"));
+//            jsadList.add(newMap.get("jsad"));
+//            jstnList.add(newMap.get("jstn"));
+//            jstpList.add(newMap.get("jstp"));
+//            jsphList.add(newMap.get("jsph"));
+//            cscodList.add(newMap.get("cscod"));
+//            csadList.add(newMap.get("csad"));
+//            cstnList.add(newMap.get("cstn"));
+//            cstpList.add(newMap.get("cstp"));
+//            csphList.add(newMap.get("csph"));
+//        }
+        //追加实时数据
+        /******************************/
+        QueryWrapper<SysMonitorMetricInfo> qw = new QueryWrapper<>();
+        qw.in("metric_uid_tag", "CSPH,CSCOD,CSNH3N,CSTN,CSTP,JSCOD,JSNH3N,JSPH,JSTN,JSTP".split(","));
+        qw.eq("depart_id",statisticsParam.getDepartId());
+        qw.groupBy("depart_id","metric_uid_tag");
+        List<SysMonitorMetricInfo> metricInfos = sysMonitorMetricInfoService.list(qw);
+        if (!CollectionUtils.isEmpty(metricInfos)){
+            String fields = metricInfos.stream().map(SysMonitorMetricInfo::getId).collect(Collectors.joining(","));
+
+            Map<String, String> fieldsMap = metricInfos.stream().collect(Collectors.toMap(SysMonitorMetricInfo::getMetricUidTag, SysMonitorMetricInfo::getId));
+
+            List<Map<String, Object>> list1 = pgQueryService.queryFactoryMonitorFromRealTimeData(statisticsParam.getDepartId(), fields);
+
+            if (!CollectionUtils.isEmpty(list1)) {
+                Map<String, Object> map1 = list1.get(0);
+                String time = DateUtils.date2Str(new Date(Long.parseLong(map1.get("time").toString()) * 1000), DateUtils.datetimeFormat);
+                xlist.add(time);
+
+                String jscod;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(jscod = fieldsMap.get("JSCOD"))) {
+                    jscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jscod).toString()),2));
+
+                }
+                String jsnh3n;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(jsnh3n = fieldsMap.get("JSNH3N"))) {
+                    jsadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsnh3n).toString()),2));
+                }
+                String jstn;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(jstn = fieldsMap.get("JSTN"))) {
+                    jstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstn).toString()),2));
+                }
+                String jstp;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(jstp = fieldsMap.get("JSTP"))) {
+                    jstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jstp).toString()),2));
+                }
+
+                String jsph;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(jsph = fieldsMap.get("JSPH"))) {
+                    jsphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(jsph).toString()),2));
+                }
+
+                String cscod;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(cscod = fieldsMap.get("CSCOD"))) {
+                    cscodList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cscod).toString()),2));
+                }
+
+                String csnh3n;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(csnh3n = fieldsMap.get("CSNH3N"))) {
+                    csadList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csnh3n).toString()),2));
+                }
+
+                String cstn;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(cstn = fieldsMap.get("CSTN"))) {
+                    cstnList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstn).toString()),2));
+                }
+
+                String cstp;
+                if (!org.apache.commons.lang3.StringUtils.isEmpty(cstp = fieldsMap.get("CSTP"))) {
+                    cstpList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(cstp).toString()),2));
+                }
+
+                String csph;
+                if (!StringUtils.isEmpty(csph = fieldsMap.get("CSPH"))) {
+                    csphList.add(DoubleOperaUtils.bigDecimalRound(Double.parseDouble(map1.get(csph).toString()),2));
+                }
+            }
+        }
+        /******************************/
+        dataMap.put("jscod",jscodList);
+        dataMap.put("jsad",jsadList);
+        dataMap.put("jstn",jstnList);
+        dataMap.put("jstp",jstpList);
+        dataMap.put("jsph",jsphList);
+        dataMap.put("cscod",cscodList);
+        dataMap.put("csad",csadList);
+        dataMap.put("cstn",cstnList);
+        dataMap.put("cstp",cstpList);
+        dataMap.put("csph",csphList);
+        chartsMap.put("dataMap",dataMap);
+        chartsMap.put("xline",xlist);
+        map.put("charts",chartsMap);
+        return map;
+    }
+
+    /**
+     * 获取时间之间的月份
+     * @param start
+     * @param end
+     * @return
+     */
+    public static List<String> getMonthsBetween(String start, String end) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+        // 解析日期
+        LocalDate startDate = LocalDate.parse(start, formatter);
+        LocalDate endDate = LocalDate.parse(end, formatter);
+        List<String> months = new ArrayList<>();
+        // 获取起始和结束月份
+        YearMonth startMonth = YearMonth.from(startDate);
+        YearMonth endMonth = YearMonth.from(endDate);
+        // 遍历月份并添加到列表
+        YearMonth currentMonth = startMonth;
+        while (!currentMonth.isAfter(endMonth)) {
+            months.add(currentMonth.toString()); // 格式化为 yyyy-MM
+            currentMonth = currentMonth.plusMonths(1);
+        }
+        return months;
+    }
+}

+package com.skua.modules.dataAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 统计功能配置表
+ */
+@Data
+@ApiModel(value="大屏接口参数", description="大屏接口参数")
+public class StatisticsParam {
+
+	/**厂区*/
+	@ApiModelProperty(value = "厂区")
+	private String departId;
+	/**开始时间*/
+	@ApiModelProperty(value = "开始时间")
+	private String startDate;
+	/**结束时间*/
+	@ApiModelProperty(value = "结束时间")
+	private String endDate;
+}

+package com.skua.modules.dataAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 调度中心vo对象
+ *
+ */
+@Data
+@ApiModel(value="调度中心vo对象", description="调度中心vo对象")
+public class WaterQualityMonitorVO {
+
+    /**
+     * 片区id
+     */
+	@ApiModelProperty(value = "所属片区")
+    private String areaId;
+    /**
+     * 厂id
+     */
+	@ApiModelProperty(value = "所属厂区")
+    private String factoryId;
+	private String factoryName;
+    /**
+     * 流量
+     */
+	@ApiModelProperty(value = "流量")
+    private String inFlow;
+	private String outFlow;
+    private String inFlowState;
+    private String outFlowState;
+    /**
+     * cod
+     */
+	@ApiModelProperty(value = "cod")
+    private String inCod;
+	private String outCod;
+    private String inCodState;
+    private String outCodState;
+    /**
+     * 氨氮
+     */
+	@ApiModelProperty(value = "氨氮")
+    private String inNh3;
+	private String outNh3;
+    private String inNh3State;
+    private String outNh3State;
+
+    /**
+     * 总磷
+     */
+	@ApiModelProperty(value = "总磷")
+    private String inTp;
+	private String outTp;
+    private String inTpState;
+    private String outTpState;
+    /**
+     * 总氮
+     */
+	@ApiModelProperty(value = "总氮")
+    private String inTn;
+	private String outTn;
+    private String inTnState;
+    private String outTnState;
+    /**
+     * ph
+     */
+	@ApiModelProperty(value = "ph")
+    private String inPh;
+	private String outPh;
+    private String inPhState;
+    private String outPhState;
+
+    private List<Map<String,Object>> equipList;
+
+}

+package com.skua.modules.dataAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 水质监测明细vo对象
+ * @author liyy
+ *
+ */
+@Data
+@ApiModel(value="水质监控明细对象", description="封装水质监控明细数据")
+public class WaterQualityMonitoringDetailVO {
+
+	@ApiModelProperty(value = "进出水类型")
+	private Integer num;
+	/**
+	 * 	进出水类型
+	 */
+	@ApiModelProperty(value = "进出水类型")
+	private String parmType;
+    /**
+     * 厂id
+     */
+	@ApiModelProperty(value = "厂id")
+    private String departId;
+    /**
+     * 厂站名称
+     */
+	@ApiModelProperty(value = "厂站名称")
+    private String departName;
+	@ApiModelProperty(value = "厂区排序")
+	private int departOrder;
+
+	@ApiModelProperty(value = "厂区负责人")
+    private String proPerson;
+
+	@ApiModelProperty(value = "厂区负责人电话")
+    private String proPhone;
+    /**
+     * 监测时间
+     */
+	@ApiModelProperty(value = "监测时间")
+    private String monitorTime;
+    /**
+     * 流量
+     */
+	@ApiModelProperty(value = "流量")
+    private String flowVal;
+	private String flowUpper;
+	private String flowLower;
+	private String flowAbnormal;
+    /**
+     * cod
+     */
+	@ApiModelProperty(value = "cod")
+    private String codVal;
+	private String codUpper;
+	private String codLower;
+	private String codAbnormal;
+	private String codWarnMessage;//预警
+    /**
+     * 氨氮
+     */
+	@ApiModelProperty(value = "氨氮")
+    private String nh3Val;
+	private String nh3Upper;
+	private String nh3Lower;
+	private String nh3Abnormal;
+	private String nh3WarnMessage;
+    /**
+     * 总磷
+     */
+	@ApiModelProperty(value = "总磷")
+    private String tpVal;
+	private String tpUpper;
+	private String tpLower;
+	private String tpAbnormal;
+	private String tpWarnMessage;
+    /**
+     * 总氮
+     */
+	@ApiModelProperty(value = "总氮")
+    private String tnVal;
+	private String tnUpper;
+	private String tnLower;
+	private String tnAbnormal;
+	private String tnWarnMessage;
+    /**
+     * 温度
+     */
+	@ApiModelProperty(value = "温度")
+    private String temperatureVal;
+	private String temperatureWarnMessage;
+    /**
+     * ph
+     */
+	@ApiModelProperty(value = "ph")
+    private String phVal;
+	private String phUpper;
+	private String phLower;
+	private String phAbnormal;
+    /**
+     * 摄像头
+     */
+	@ApiModelProperty(value = "摄像头")
+    private String cameraVal;
+	/**
+	 * 出水标准
+	 */
+	@ApiModelProperty(value = "出水标准")
+	private String outLevel;
+
+	/**
+	 * 是否水质正常
+	 */
+	private String isHaveNormal;
+	/**
+	 * 是否水质超标
+	 */
+	private String isHaveAbnormal;
+	/**
+	 * 超标指标个数
+	 */
+	private int abnormalCount;
+	/**
+	 * 指标未配置
+	 */
+	private int notConfiguredCount;
+	/**
+	 * 厂站指标没有配置标记
+	 */
+	private String isNotHaveConfigured;
+	/**
+	 * 是否含有0值
+	 */
+	private String isHaveZero;
+	/**
+	 * 是否脱机
+	 */
+	private String isHaveOffline;
+	/**
+	 * 是否预警
+	 */
+	private String isHaveWarn;
+	/**
+	 * 	预警个数
+	 */
+	private int abWarnCount;
+
+	private int offLineCount;
+}

+package com.skua.modules.dataAnalysis.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+@ApiModel(value="水质监控对象", description="封装水质监控数据")
+public class WaterQualityMonitoringVO {
+	@ApiModelProperty(value = "总数")
+	private String all;//全部
+	@ApiModelProperty(value = "在线")
+	private String normal;//正常
+	@ApiModelProperty(value = "异常")
+	private String abnormal;//异常
+	@ApiModelProperty(value = "脱机")
+	private String offline;//脱机
+	@ApiModelProperty(value = "零值")
+	private String zeroVal;//零值
+	@ApiModelProperty(value = "预警")
+	private String warnVal;//零值
+	@ApiModelProperty(value = "水质监控明细")
+	private List<WaterQualityMonitoringDetailVO> list;//明细
+}