从个体污水厂总览信息分出2个接口

1.进出口指标信息(总览和单个污水厂都满足)
2.设备状态

src/main/java/com/tofly/nb/sew/controller/EquipmentStatusController.java

@@ -0,0 +1,57 @@
+package com.tofly.nb.sew.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.tofly.nb.sew.common.CommonRest;
+import com.tofly.nb.sew.model.po.SsYywsclcGczb;
+import com.tofly.nb.sew.model.vo.OperatingStatusEquipmentInfoVo;
+import com.tofly.nb.sew.service.ISsYywsclcGczbService;
+import com.tofly.nb.sew.util.Rest;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 运营污水处理厂  污水进出口指标 前端控制器
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-24
+ */
+@RestController
+@RequestMapping("/equipmentStatus")
+@Api(tags = "设备运行状态接口")
+public class EquipmentStatusController {
+    @Autowired
+    private ISsYywsclcGczbService iSsYywsclcGczbService;
+
+    @GetMapping("/getEquipmentStatus")
+    @ApiOperation(value = "获取设备运行状态")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ssclcbh", value = "污水厂编号", required = true, dataType = "Long")
+    })
+    public Rest<List<OperatingStatusEquipmentInfoVo>> getEquipmentStatus(@RequestParam(value = "ssclcbh") Long ssclcbh) {
+        Rest<List<OperatingStatusEquipmentInfoVo>> rest = new Rest<>();
+        try {
+            // 设备运行状态
+            List<SsYywsclcGczb> equipmentOperationInfo = iSsYywsclcGczbService.getEquipmentOperationInfo(ssclcbh);
+            List<OperatingStatusEquipmentInfoVo> operatingStatusEquipmentInfoVos = JSON.parseArray(JSON.toJSONString(equipmentOperationInfo), OperatingStatusEquipmentInfoVo.class);
+            rest.setData(operatingStatusEquipmentInfoVos);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rest.setSuccess(false);
+            rest.setErrCode(CommonRest.QUERY_FAILD_CODE);
+            rest.setMessage(CommonRest.QUERY_FAILD);
+        }
+
+        return rest;
+    }
+}

src/main/java/com/tofly/nb/sew/controller/StpImportExportIndexInfoController.java

@@ -0,0 +1,48 @@
+package com.tofly.nb.sew.controller;
+
+import com.tofly.nb.sew.common.CommonRest;
+import com.tofly.nb.sew.model.vo.StpImportExportIndexInfoVo;
+import com.tofly.nb.sew.service.IStpImportExportIndexInfoService;
+import com.tofly.nb.sew.util.Rest;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 运营污水处理厂  污水进出口指标 前端控制器
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-24
+ */
+@RestController
+@RequestMapping("/stpImportExportIndexInfo")
+@Api(tags = "运营污水厂污水进出口指标信息接口")
+public class StpImportExportIndexInfoController {
+    @Autowired
+    private IStpImportExportIndexInfoService iStpImportExportIndexInfoService;
+
+    @GetMapping("/getStpImportExportIndexInfo")
+    @ApiOperation(value = "获取运营污水厂污水进出口指标信息接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "ssclcbh", value = "污水厂编号(传入则获取单个污水厂进出口指标数据,不传默认为实时所有污水厂指标数据)", required = false, dataType = "Long")
+    })
+    public Rest<StpImportExportIndexInfoVo> getStpImportExportIndexInfo(@RequestParam(value = "ssclcbh",defaultValue="0") Long ssclcbh) {
+        Rest<StpImportExportIndexInfoVo> rest = new Rest<>();
+        try {
+            StpImportExportIndexInfoVo info = iStpImportExportIndexInfoService.getStpImportExportIndexInfo(ssclcbh);
+            rest.setData(info);
+        } catch (Exception e) {
+            e.printStackTrace();
+            rest.setSuccess(false);
+            rest.setErrCode(CommonRest.QUERY_FAILD_CODE);
+            rest.setMessage(CommonRest.QUERY_FAILD);
+        }
+
+        return rest;
+    }
+}

src/main/java/com/tofly/nb/sew/mapper/SsYywsclcCczbMapper.java

@@ -3,6 +3,10 @@ package com.tofly.nb.sew.mapper;
 import com.tofly.nb.sew.model.po.SsYywsclcCczb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,6 +18,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 
 public interface SsYywsclcCczbMapper extends BaseMapper<SsYywsclcCczb> {
-
-
+    /**
+     * 根据污水处理厂编号查询年记录历史出厂指标表记录
+     * @param tableName 表名
+     * @param ssclcbh 污水处理厂编号
+     * @return 历史出厂指标表记录
+     */
+    @Select("SELECT * FROM ${tableName} WHERE SSCLCBH = #{ssclcbh}")
+    List<SsYywsclcCczb> getSsYywsclcCczbHisList(@Param("tableName") String tableName,@Param("ssclcbh") Long ssclcbh);
 }

src/main/java/com/tofly/nb/sew/mapper/SsYywsclcJczbMapper.java

@@ -1,8 +1,12 @@
 package com.tofly.nb.sew.mapper;
 
+import com.tofly.nb.sew.model.po.SsYywsclcCczb;
 import com.tofly.nb.sew.model.po.SsYywsclcJczb;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
 
 /**
  * <p>
@@ -14,5 +18,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 
 public interface SsYywsclcJczbMapper extends BaseMapper<SsYywsclcJczb> {
-
+    /**
+     * 根据污水处理厂编号查询年记录历史进厂指标表记录
+     * @param tableName 表名
+     * @param ssclcbh 污水处理厂编号
+     * @return 历史进厂指标表记录
+     */
+    @Select("SELECT * FROM ${tableName} WHERE SSCLCBH = #{ssclcbh}")
+    List<SsYywsclcJczb> getSsSsYywsclcJczbHisList(@Param("tableName") String tableName, @Param("ssclcbh") Long ssclcbh);
 }

src/main/java/com/tofly/nb/sew/model/po/SsYywsclcCczb.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,7 +73,7 @@ public class SsYywsclcCczb implements Serializable {
 
     @ApiModelProperty(value = "更新时间")
     @TableField("UTIME")
-    private String utime;
+    private Date utime;
 
     @ApiModelProperty(value = "状态（0=正常，1=异常，2=报警）")
     @TableField("USFL")

src/main/java/com/tofly/nb/sew/model/po/SsYywsclcJczb.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import java.util.Date;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -71,7 +73,7 @@ public class SsYywsclcJczb implements Serializable {
 
     @ApiModelProperty(value = "更新时间")
     @TableField("UTIME")
-    private String utime;
+    private Date utime;
 
     @ApiModelProperty(value = "状态（0=正常，1=异常，2=报警）")
     @TableField("USFL")

src/main/java/com/tofly/nb/sew/model/vo/OperatingStatusEquipmentInfoVo.java

@@ -1,6 +1,8 @@
 package com.tofly.nb.sew.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -22,18 +24,23 @@ public class OperatingStatusEquipmentInfoVo implements Serializable {
     /**
      * 所属处理厂编号
      */
+    @ApiModelProperty(value = "所属处理厂编号")
     private Long ssclcbh;
 
     /**
      * 显示名称
      */
+    @ApiModelProperty(value = "设备名称")
     private String sname;
     /**
      * 状态（0=正常或运行，1=停止或异常，2=故障或报警，3=通讯异常）
      */
+    @ApiModelProperty(value = "状态（0=正常或运行，1=停止或异常，2=故障或报警，3=通讯异常）")
     private String usfl;
     /**
      * 更新时间
      */
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date utime;
 }

src/main/java/com/tofly/nb/sew/model/vo/ResultStpStatisticalInfoVo.java

@@ -17,19 +17,9 @@ import java.util.List;
  * @since 2020-12-16
  */
 @Data
-@ApiModel(value="单个运营污水处理厂总览信息封装父类", description="单个运营污水处理厂信息")
+@ApiModel(value = "单个运营污水处理厂总览信息封装父类", description = "单个运营污水处理厂信息")
 public class ResultStpStatisticalInfoVo implements Serializable {
     private static final long serialVersionUID = 1L;
-    /**
-     * 单个污水厂出口指标
-     */
-    @ApiModelProperty(value = "单个污水厂出口指标")
-    private List<StpExportIndexInfoVo> stpExportIndexInfoVos;
-    /**
-     * 单个污水厂进口指标
-     */
-    @ApiModelProperty(value = "单个污水厂进口指标")
-    private List<StpImportIndicatorsInfoVo> stpImportIndicatorsInfoVos;
     /**
      * 视频监控配置信息
      */
@@ -40,11 +30,6 @@ public class ResultStpStatisticalInfoVo implements Serializable {
      */
     @ApiModelProperty(value = "监控设备信息")
     private List<PlantSecurityMonitoringInfoVo> plantSecurityMonitoringInfoVos;
-    /**
-     * 设备运行状态
-     */
-    @ApiModelProperty(value = "设备运行状态")
-    private List<OperatingStatusEquipmentInfoVo> operatingStatusEquipmentInfoVos;
     /**
      * 单个污水产总览信息
      */

src/main/java/com/tofly/nb/sew/model/vo/StpExportIndexInfoVo.java

@@ -1,5 +1,6 @@
 package com.tofly.nb.sew.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,6 +65,7 @@ public class StpExportIndexInfoVo implements Serializable {
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date utime;
     /**
      * 状态（0=正常，1=异常，2=报警）

src/main/java/com/tofly/nb/sew/model/vo/StpImportExportIndexInfoVo.java

@@ -0,0 +1,36 @@
+package com.tofly.nb.sew.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * <p>
+ * 运营污水处理厂  进出口指标 前端返回对象
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-24
+ */
+@Data
+@ApiModel(value="进出口指标", description="运营污水处理厂进出口指标信息")
+public class StpImportExportIndexInfoVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 运营污水处理厂  入口指标列表
+     */
+    @ApiModelProperty(value = "入口指标列表")
+    private List<StpImportIndicatorsInfoVo> stpImportIndicatorsInfoVos;
+
+    /**
+     * 运营污水处理厂  出口指标列表
+     */
+    @ApiModelProperty(value = "出口指标列表")
+    private List<StpExportIndexInfoVo> stpExportIndexInfoVos;
+
+
+}

src/main/java/com/tofly/nb/sew/model/vo/StpImportIndicatorsInfoVo.java

@@ -1,5 +1,6 @@
 package com.tofly.nb.sew.model.vo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -64,6 +65,7 @@ public class StpImportIndicatorsInfoVo implements Serializable {
      * 更新时间
      */
     @ApiModelProperty(value = "更新时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date utime;
     /**
      * 状态（0=正常，1=异常，2=报警）

src/main/java/com/tofly/nb/sew/service/ISsYywsclcCczbService.java

@@ -15,9 +15,17 @@ import java.util.List;
  */
 public interface ISsYywsclcCczbService extends IService<SsYywsclcCczb> {
     /**
-     * 污水厂进口指标
-     * @param ssclcbh 五十处理厂编号
-     * @return 污水厂进口指标列表
+     * 污水厂出口指标
+     * @param ssclcbh 污水处理厂编号
+     * @return 污水厂出口指标列表
      */
-    List<SsYywsclcCczb> stpImportIndicators(Long ssclcbh);
+    List<SsYywsclcCczb> getStpExportIndicators(Long ssclcbh);
+
+    /**
+     * 根据历史数据表获取单个污水厂进口数据
+     * @param tableName 历史表名
+     * @param ssclcbh 污水处理厂编号
+     * @return 污水厂进口指标历史列表
+     */
+    List<SsYywsclcCczb> getSsYywsclcCczbHisList(String tableName, Long ssclcbh);
 }

src/main/java/com/tofly/nb/sew/service/ISsYywsclcJczbService.java

@@ -1,6 +1,7 @@
 package com.tofly.nb.sew.service;
 
 import com.tofly.nb.sew.model.dto.StpOverviewInformationDto;
+import com.tofly.nb.sew.model.po.SsYywsclcCczb;
 import com.tofly.nb.sew.model.po.SsYywsclcJczb;
 import com.baomidou.mybatisplus.extension.service.IService;
 
@@ -20,7 +21,15 @@ public interface ISsYywsclcJczbService extends IService<SsYywsclcJczb> {
      * @param ssclcbh 污水处理厂编号
      * @return 污水厂进口指标列表
      */
-    List<SsYywsclcJczb> getStpExportIndex(Long ssclcbh);
+    List<SsYywsclcJczb> getStpImportIndex(Long ssclcbh);
+
+    /**
+     * 根据历史数据表获取单个污水厂进口数据
+     * @param tableName 历史表名
+     * @param ssclcbh 污水处理厂编号
+     * @return 污水厂进口指标历史列表
+     */
+    List<SsYywsclcJczb> getSsSsYywsclcJczbHisList(String tableName, Long ssclcbh);
 
     /**
      * 单个污水处理厂的总览信息

src/main/java/com/tofly/nb/sew/service/IStpImportExportIndexInfoService.java

@@ -0,0 +1,20 @@
+package com.tofly.nb.sew.service;
+
+import com.tofly.nb.sew.model.vo.StpImportExportIndexInfoVo;
+
+/**
+ * <p>
+ * 运营污水处理厂  污水进出口指标 服务类
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-24
+ */
+public interface IStpImportExportIndexInfoService {
+    /**
+     * 运营污水处理厂  污水进出口指标
+     * @param ssclcbh 污水厂编号
+     * @return 污水进出口指标列表
+     */
+    StpImportExportIndexInfoVo getStpImportExportIndexInfo(Long ssclcbh);
+}

src/main/java/com/tofly/nb/sew/service/impl/SsYywsclcCczbServiceImpl.java

@@ -26,10 +26,19 @@ public class SsYywsclcCczbServiceImpl extends ServiceImpl<SsYywsclcCczbMapper, S
 
 
     @Override
-    public List<SsYywsclcCczb> stpImportIndicators(Long ssclcbh){
-        // 污水厂进口指标列表信息
+    public List<SsYywsclcCczb> getStpExportIndicators(Long ssclcbh){
+        // 污水厂出口指标列表信息
         QueryWrapper<SsYywsclcCczb> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("SSCLCBH",ssclcbh);
+        if(null != ssclcbh){
+            queryWrapper.eq("SSCLCBH",ssclcbh);
+        }
+
         return ssYywsclcCczbMapper.selectList(queryWrapper);
     }
+
+    @Override
+    public List<SsYywsclcCczb> getSsYywsclcCczbHisList(String tableName, Long ssclcbh){
+        // 根据历史数据表获取单个污水厂进口数据
+        return ssYywsclcCczbMapper.getSsYywsclcCczbHisList(tableName,ssclcbh);
+    }
 }

src/main/java/com/tofly/nb/sew/service/impl/SsYywsclcJczbServiceImpl.java

@@ -43,13 +43,21 @@ public class SsYywsclcJczbServiceImpl extends ServiceImpl<SsYywsclcJczbMapper, S
 
 
     @Override
-    public List<SsYywsclcJczb> getStpExportIndex(Long ssclcbh){
+    public List<SsYywsclcJczb> getStpImportIndex(Long ssclcbh){
         // 污水厂进口指标列表信息
         QueryWrapper<SsYywsclcJczb> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("SSCLCBH",ssclcbh);
+        if(null != ssclcbh){
+            queryWrapper.eq("SSCLCBH",ssclcbh);
+        }
         return ssYywsclcJczbMapper.selectList(queryWrapper);
     }
 
+    @Override
+    public List<SsYywsclcJczb> getSsSsYywsclcJczbHisList(String tableName, Long ssclcbh) {
+        // 根据历史数据表获取单个污水厂进口数据
+        return ssYywsclcJczbMapper.getSsSsYywsclcJczbHisList(tableName,ssclcbh);
+    }
+
 
     private  List<SsBbMonth> getStpYearDetail(Long ssclcbh){
         List<SsBbMonth> yearDetail = iSsBbMonthService.getYearDetail();

src/main/java/com/tofly/nb/sew/service/impl/StpImportExportIndexInfoServiceImpl.java

@@ -0,0 +1,87 @@
+package com.tofly.nb.sew.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.tofly.nb.sew.model.po.SsYywsclcCczb;
+import com.tofly.nb.sew.model.po.SsYywsclcJczb;
+import com.tofly.nb.sew.model.vo.StpExportIndexInfoVo;
+import com.tofly.nb.sew.model.vo.StpImportExportIndexInfoVo;
+import com.tofly.nb.sew.model.vo.StpImportIndicatorsInfoVo;
+import com.tofly.nb.sew.service.ISsYywsclcCczbService;
+import com.tofly.nb.sew.service.ISsYywsclcJczbService;
+import com.tofly.nb.sew.service.IStpImportExportIndexInfoService;
+import com.tofly.nb.sew.util.DateTimeUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 运营污水处理厂  污水进出口指标 实现类
+ * </p>
+ *
+ * @author Zev
+ * @since 2020-12-24
+ */
+@Service
+public class StpImportExportIndexInfoServiceImpl implements IStpImportExportIndexInfoService {
+
+    @Autowired
+    private ISsYywsclcJczbService iSsYywsclcJczbService;
+
+    @Autowired
+    private ISsYywsclcCczbService iSsYywsclcCczbService;
+
+    @Override
+    public StpImportExportIndexInfoVo getStpImportExportIndexInfo(Long ssclcbh) {
+        StpImportExportIndexInfoVo result = new StpImportExportIndexInfoVo();
+        List<SsYywsclcJczb> imports = new LinkedList<>();
+        List<SsYywsclcCczb> exports = new LinkedList<>();
+
+        if (ssclcbh == 0) {
+            // 查全部数据
+            ssclcbh = null;
+            // 80条数据左右 按照更新时间排序
+
+            // 所有污水厂实时污水厂出口指标
+            exports = iSsYywsclcCczbService.getStpExportIndicators(ssclcbh).stream().sorted(Comparator.comparing(SsYywsclcCczb::getUtime).reversed()).limit(70).collect(Collectors.toList());
+            // 所有污水厂实时污水厂进口指标
+            imports = iSsYywsclcJczbService.getStpImportIndex(ssclcbh).stream().sorted(Comparator.comparing(SsYywsclcJczb::getUtime).reversed()).limit(70).collect(Collectors.toList());
+
+
+        } else {
+            LocalDateTime now = LocalDateTime.now();
+            String localDateTime = DateTimeUtil.getLocalDateTime(now, DateTimeUtil.DAY_FORMAT);
+            assert localDateTime != null;
+            String substring = localDateTime.substring(0, 4);
+            String exportTableName = "ss_yywsclc_cczb_ls_" + substring;
+            String importTableName = "ss_yywsclc_jczb_ls_" + substring;
+            // 2个小时内的数据 按照更新时间排序
+            long nowTime = DateTimeUtil.convertLDTToDate(now).getTime();
+            long time = DateTimeUtil.convertLDTToDate(now.minusHours(2)).getTime();
+
+            // 单个历史数据污水厂出口指标
+            exports = iSsYywsclcCczbService.getSsYywsclcCczbHisList(exportTableName, ssclcbh).
+                    stream().
+                    filter(dto -> dto.getUtime().getTime() >= time && dto.getUtime().getTime() <= nowTime).
+                    sorted(Comparator.comparing(SsYywsclcCczb::getUtime).reversed()).collect(Collectors.toList());
+
+            // 单个历史数据污水厂进口指标
+            imports = iSsYywsclcJczbService.getSsSsYywsclcJczbHisList(importTableName, ssclcbh).
+                    stream().
+                    filter(dto -> dto.getUtime().getTime() >= time && dto.getUtime().getTime() <= nowTime).
+                    sorted(Comparator.comparing(SsYywsclcJczb::getUtime).reversed()).collect(Collectors.toList());
+
+        }
+
+        List<StpExportIndexInfoVo> stpExportIndexInfoVos = JSON.parseArray(JSON.toJSONString(exports), StpExportIndexInfoVo.class);
+        List<StpImportIndicatorsInfoVo> stpImportIndicatorsInfoVos = JSON.parseArray(JSON.toJSONString(imports), StpImportIndicatorsInfoVo.class);
+
+
+        result.setStpExportIndexInfoVos(stpExportIndexInfoVos);
+        result.setStpImportIndicatorsInfoVos(stpImportIndicatorsInfoVos);
+        return result;
+    }
+}

src/main/java/com/tofly/nb/sew/service/impl/StpStatisticalInfoServiceImpl.java

@@ -24,26 +24,15 @@ public class StpStatisticalInfoServiceImpl implements IStpStatisticalInfoService
     @Autowired
     private ISsYywsclcJczbService iSsYywsclcJczbService;
 
-    @Autowired
-    private ISsYywsclcCczbService iSsYywsclcCczbService;
-
     @Autowired
     private ISsVideoConfigService iSsVideoConfigService;
 
     @Autowired
     private ISsSpjkdwService iSsSpjkdwService;
 
-    @Autowired
-    private ISsYywsclcGczbService iSsYywsclcGczbService;
-
     @Override
     public ResultStpStatisticalInfoVo getStpStatisticalInfo(Long ssclcbh) {
         ResultStpStatisticalInfoVo result = new ResultStpStatisticalInfoVo();
-        // 单个污水厂出口指标
-        List<SsYywsclcJczb> stpExportIndex = iSsYywsclcJczbService.getStpExportIndex(ssclcbh);
-
-        // 单个污水厂进口指标
-        List<SsYywsclcCczb> ssYywsclcCczbs = iSsYywsclcCczbService.stpImportIndicators(ssclcbh);
 
         // 单个污水产总览信息
         List<StpOverviewInformationDto> stpOverviewInformation = iSsYywsclcJczbService.getStpOverviewInformation(ssclcbh);
@@ -54,21 +43,12 @@ public class StpStatisticalInfoServiceImpl implements IStpStatisticalInfoService
         // 厂区安防监控
         List<SsSpjkdw> defaultSecurityMonitoring = iSsSpjkdwService.getDefaultSecurityMonitoring(ssclcbh);
 
-        // 设备运行状态
-        List<SsYywsclcGczb> equipmentOperationInfo = iSsYywsclcGczbService.getEquipmentOperationInfo(ssclcbh);
-
-        List<StpExportIndexInfoVo> stpExportIndexInfoVos = JSON.parseArray(JSON.toJSONString(stpExportIndex), StpExportIndexInfoVo.class);
-        List<StpImportIndicatorsInfoVo> stpImportIndicatorsInfoVos = JSON.parseArray(JSON.toJSONString(ssYywsclcCczbs), StpImportIndicatorsInfoVo.class);
         List<VideoConfigInfoVo> videoConfigInfoVos = JSON.parseArray(JSON.toJSONString(videoConfigInfo), VideoConfigInfoVo.class);
         List<PlantSecurityMonitoringInfoVo> plantSecurityMonitoringInfoVos = JSON.parseArray(JSON.toJSONString(defaultSecurityMonitoring), PlantSecurityMonitoringInfoVo.class);
-        List<OperatingStatusEquipmentInfoVo> operatingStatusEquipmentInfoVos = JSON.parseArray(JSON.toJSONString(equipmentOperationInfo), OperatingStatusEquipmentInfoVo.class);
 
-        result.setStpExportIndexInfoVos(stpExportIndexInfoVos);
-        result.setStpImportIndicatorsInfoVos(stpImportIndicatorsInfoVos);
         result.setStpOverviewInformation(stpOverviewInformation);
         result.setVideoConfigInfoVos(videoConfigInfoVos);
         result.setPlantSecurityMonitoringInfoVos(plantSecurityMonitoringInfoVos);
-        result.setOperatingStatusEquipmentInfoVos(operatingStatusEquipmentInfoVos);
 
         return result;
     }

src/main/resources/application.yml

@@ -12,3 +12,6 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 
+#mybatis-plus:
+#  configuration:
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl