代码重新提交

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsLedgerStaticDTO.java

@@ -35,7 +35,7 @@ public class PmsLedgerStaticDTO implements Serializable {
     private List<List<PmsSimpleDTO.PmsSimpleOrg>> monitorStatisticsByDept;
 
     /**
-     * 根据单位统计终端数量
+     *根据单位统计终端数量
      */
     private List<List<PmsSimpleDTO.PmsSimpleOrg>> terminalStatisticsByDept;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsMonitorBaseDTO.java

@@ -38,7 +38,7 @@ public class PmsMonitorBaseDTO implements Serializable {
     private String powerrId;
 
     /***
-     * 终端ID
+     *终端ID
      */
     private String terminalId;
 

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/dto/PmsSimpleDTO.java

@@ -31,7 +31,7 @@ public class PmsSimpleDTO implements Serializable {
     @Data
     public static class PmsSimpleOrg extends PmsSimpleDTO{
 
-        @ApiModelProperty(name = "OrgName", value = "部门名称")
+        @ApiModelProperty(name = "orgName", value = "部门名称")
-        private String OrgName;
+        private String orgName;
     }
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/SubstationExpendController.java

@@ -8,8 +8,6 @@ import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.dto.PmsLedgerStaticDTO;
-import com.njcn.device.pms.pojo.param.PmsBaseParam;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.po.SubstationExpend;
 import com.njcn.device.pms.service.ISubstationExpendService;
 import com.njcn.device.pq.pojo.param.CommunicateParam;
@@ -26,8 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;
 
-import java.math.BigDecimal;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -71,7 +67,7 @@ public class SubstationExpendController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPVCommunicationStatus")
-    @ApiOperation("冀北主网监测点通讯状态统计")
+    @ApiOperation("冀北主网监测点pms:通讯状态统计")
     @ApiImplicitParam(name = "param", value = "冀北主网监测点台账统计参数", required = true)
     public HttpResult<List<CommunicateVO.PVCommunicateVO>> getPVCommunicationStatus(@RequestBody CommunicateParam param) {
         String methodDescribe = getMethodDescribe("getPVCommunicationStatus");

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/DistributionMonitorMapper.xml

@@ -206,8 +206,8 @@
     </select>
     <select id="statisticTerminal" resultType="com.njcn.device.pms.pojo.dto.PmsSimpleDTO">
         SELECT
-            COUNT(t.Terminal_Id) statistics,
+            COUNT(t.Terminal_Id) as statistics,
-            t.Voltage_Level name
+            t.Voltage_Level as name
             FROM
             (   SELECT
                     DISTINCT pm.Terminal_Id,

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml

@@ -5,16 +5,16 @@
     <!--根据组织ID以及其查询条件筛选出台账信息-->
     <select id="getMonitorByCondition" resultType="com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO">
         SELECT
-        pms_monitor.id monitorId,
+            pms_monitor.id monitorId,
-        pms_monitor.Operation_Id,
+            pms_monitor.Operation_Id,
-        pms_monitor.Powerr_id,
+            pms_monitor.Powerr_id,
-        pms_monitor.Terminal_Id,
+            pms_monitor.Terminal_Id,
-        pms_monitor.line_Name,
+            pms_monitor.line_Name,
-        pms_monitor.line_Id
+            pms_monitor.line_Id
         FROM
-        pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id
+            pms_monitor pms_monitor LEFT JOIN pms_terminal pms_terminal ON pms_monitor.Terminal_Id = pms_terminal.id
         WHERE
-        pms_monitor.Org_Id IN
+            pms_monitor.Org_Id IN
         <foreach collection="orgIdList" item="orgId" open="(" close=")" separator=",">
             #{orgId}
         </foreach>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ISubstationExpendService.java

@@ -4,7 +4,6 @@ package com.njcn.device.pms.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pms.pojo.dto.PmsLedgerStaticDTO;
-import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pms.pojo.po.SubstationExpend;
 import com.njcn.device.pq.pojo.param.CommunicateParam;
 import com.njcn.device.pq.pojo.vo.CommunicateVO;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/impl/SubstationExpendServiceImpl.java

@@ -9,8 +9,6 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
-import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient;
-import com.njcn.device.pms.controller.ledgerManger.PmsGeneralDeviceController;
 import com.njcn.device.pms.mapper.SubstationExpendMapper;
 import com.njcn.device.pms.mapper.majornetwork.DistributionMonitorMapper;
 import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITerminalService.java

@@ -6,7 +6,6 @@ import com.njcn.device.pms.pojo.param.PmsBaseParam;
 import com.njcn.device.pms.pojo.param.PmsTerminalParam;
 import com.njcn.device.pms.pojo.param.TerminalQueryParam;
 import com.njcn.device.pms.pojo.po.PmsTerminal;
-import com.njcn.web.pojo.param.BaseParam;
 
 import java.util.List;
 

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TerminalServiceImpl.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.device.pms.enums.PmsDeviceResponseEnum;
-import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper;
 import com.njcn.device.pms.mapper.majornetwork.TerminalMapper;
 import com.njcn.device.pms.pojo.param.PmsBaseParam;
 import com.njcn.device.pms.pojo.param.PmsTerminalParam;
@@ -25,13 +24,11 @@ import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.factory.PageFactory;
-import com.njcn.web.pojo.param.BaseParam;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/CommunicateParam.java

@@ -13,7 +13,7 @@ import lombok.Data;
 public class CommunicateParam extends StatisticsBizBaseParam {
 
     /**
-     * 查询条数
+     * (查询条数)
      */
     @ApiModelProperty("查询条数")
     private Integer limit;

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceInfoParam.java

@@ -173,7 +173,7 @@ public class DeviceInfoParam implements Serializable {
     public static class CompareLimitParam extends BusinessParam{
 
         @ApiModelProperty("查询条数")
-        @NotNull(message = "查询条数查询条数不能为空")
+        @NotNull(message = " 查询条数查询条数不能为空")
         private Integer limit;
 
     }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Communicate.java

@@ -25,7 +25,9 @@ public class Communicate {
      */
     @Column(name = "time")
     private Instant updateTime;
-
+    /**
+     * 监测点id
+     */
     @Column(name = "line_id")
     private String id;
     /**

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/CommunicateVO.java

@@ -4,7 +4,6 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.njcn.common.utils.serializer.InstantDateSerializer;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.influxdb.annotation.Column;
 
 import java.io.Serializable;
 import java.time.Instant;
@@ -51,7 +50,7 @@ public class CommunicateVO implements Serializable {
         @ApiModelProperty("描述")
         private String remark;
 
-        @ApiModelProperty("终端ip(终端名称_ip)")
+        @ApiModelProperty("终端ip：(终端名称_ip)")
         private String devIp;
     }
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/SubstationExpendController.java

@@ -38,7 +38,7 @@ public class SubstationExpendController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getPVCommunicationStatus")
-    @ApiOperation("冀北主网监测点通讯状态统计")
+    @ApiOperation("冀北主网监测点pq:通讯状态统计")
     @ApiImplicitParam(name = "param", value = "冀北主网监测点台账统计参数", required = true)
     public HttpResult<List<CommunicateVO.PVCommunicateVO>> getPVCommunicationStatus(@RequestBody DeviceInfoParam.CompareLimitParam param) {
         String methodDescribe = getMethodDescribe("getPVCommunicationStatus");

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -211,8 +211,7 @@
 
     <select id="getDeviceByIdOnOrOff" resultType="com.njcn.device.pq.pojo.vo.TerminalBaseVO">
         SELECT
-        t1.id devId,
+        t1.id devId,t1.name devName,t2.ip,t2.dev_type,t2.update_time,sub.name subName,gd.name gdName
-        t1.name devName,t2.ip,t2.dev_type,t2.update_time,sub.name subName,gd.name gdName
         FROM
         pq_line t1,
         pq_device t2,

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/ISubstationExpendService.java

@@ -1,7 +1,6 @@
 package com.njcn.device.pq.service;
 
 
-import com.njcn.device.pq.pojo.param.CommunicateParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.CommunicateVO;
 
@@ -12,7 +11,7 @@ import java.util.List;
  *  服务类
  * </p>
  *
- * @author zhuxinyu
+ * @author wr
  * @since 2023-05-08
  */
 public interface ISubstationExpendService  {

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/SubstationExpendServiceImpl.java

@@ -3,30 +3,17 @@ package com.njcn.device.pq.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
-import com.njcn.common.pojo.dto.SimpleDTO;
-import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
-import com.njcn.device.pq.pojo.param.CommunicateParam;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.po.Communicate;
-import com.njcn.device.pq.pojo.po.Device;
 import com.njcn.device.pq.pojo.vo.CommunicateVO;
 import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
-import com.njcn.device.pq.service.IDeviceService;
 import com.njcn.device.pq.service.ISubstationExpendService;
 import com.njcn.device.pq.service.TerminalBaseService;
 import com.njcn.influxdb.param.InfluxDBPublicParam;
 import com.njcn.influxdb.utils.InfluxDbUtils;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.enums.DicDataTypeEnum;
-import com.njcn.system.pojo.po.DictData;
-import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.dto.DeptDTO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.influxdb.dto.QueryResult;
@@ -42,7 +29,7 @@ import java.util.stream.Stream;
  *  服务实现类
  * </p>
  *
- * @author zhuxinyu
+ * @author wr
  * @since 2023-05-08
  */
 @Slf4j
@@ -52,7 +39,6 @@ public class SubstationExpendServiceImpl  implements ISubstationExpendService {
 
     private final GeneralDeviceService generalDeviceService;
     private final InfluxDbUtils influxDbUtils;
-    private final IDeviceService deviceService;
    private final TerminalBaseService terminalBaseService;
 
     @Override

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/WaveTypeParam.java

@@ -41,9 +41,6 @@ public class WaveTypeParam extends DeviceInfoParam.BusinessParam {
     )
     private Integer comFlag = 1;
 
-    @ApiModelProperty(
+    @ApiModelProperty(name = "type", value = "区分 0.pq 1.pms")
-            name = "type",
-            value = "区分 0.pq 1.pms"
-    )
     private Integer type = 0;
 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java

@@ -55,8 +55,6 @@ import com.njcn.event.service.majornetwork.ReportService;
 import com.njcn.event.utils.EchartsUtil;
 import com.njcn.event.utils.FreemarkerUtil;
 import com.njcn.event.utils.WordUtils;
-import com.njcn.harmonic.pojo.vo.ComAssessVO;
-import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
 import com.njcn.influxdb.utils.InfluxDBCommUtils;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import com.njcn.poi.util.PoiUtil;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/TerminalServiceImpl.java

@@ -7,7 +7,6 @@ import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.param.OnlineRateParam;
-import com.njcn.device.pq.pojo.po.OnlineRate;
 import com.njcn.device.pq.pojo.vo.RStatOnlinerateVO;
 import com.njcn.harmonic.mapper.TerminalDataMapper;
 import com.njcn.harmonic.pojo.dto.PublicDTO;
@@ -15,10 +14,8 @@ import com.njcn.harmonic.pojo.vo.TerminalCensusVO;
 import com.njcn.harmonic.pojo.vo.TerminalVO;
 import com.njcn.harmonic.service.TerminalService;
 import com.njcn.harmonic.utils.PubUtils;
-import com.njcn.influxdb.param.InfluxDBPublicParam;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import lombok.AllArgsConstructor;
-import org.influxdb.dto.QueryResult;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
@@ -28,7 +25,6 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-import static com.njcn.influxdb.param.InfluxDBPublicParam.*;
 
 /**
  * @author: chenchao