解决文件冲突代码

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

@@ -32,11 +32,11 @@ public class PmsLedgerStaticDTO implements Serializable {
     /**
      * 根据单位统计监测点数量
      */
-    private HashMap<String,List<PmsSimpleDTO>> monitorStatisticsByDept;
+    private List<List<PmsSimpleDTO.PmsSimpleOrg>> monitorStatisticsByDept;
 
     /**
-     *根据单位统计终端数量
+     * 根据单位统计终端数量
      */
-    private HashMap<String,List<PmsSimpleDTO>> terminalStatisticsByDept;
+    private List<List<PmsSimpleDTO.PmsSimpleOrg>> terminalStatisticsByDept;
 
 }

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

@@ -4,7 +4,10 @@ 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;
 
 import java.util.List;
 import java.util.Map;
@@ -23,5 +26,7 @@ public interface ISubstationExpendService extends IService<SubstationExpend> {
     Map<String, List<SubstationExpend>> getSubstationExpendInfo(StatisticsBizBaseParam param);
 
 
-    PmsLedgerStaticDTO getLedgerStatistics(PmsDeviceInfoParam param);
+    PmsLedgerStaticDTO getLedgerStatistics(StatisticsBizBaseParam param);
+
+    List<CommunicateVO.PVCommunicateVO> getCommunicationStatus(CommunicateParam param);
 }

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

@@ -6,6 +6,7 @@ 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;
 
@@ -32,7 +33,12 @@ public interface ITerminalService extends IService<PmsTerminal> {
      */
     List<PmsTerminal> getTerminalSelectList(PmsBaseParam pmsBaseParam);
 
-
+    /**
+     * 根据终端id集合新查询终端信息
+     * @param ids
+     * @return
+     */
+    List<PmsTerminal> getTerminalSelectByIds(List<String> ids);
 
     /**
      * 根据id查询

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

@@ -1,11 +1,13 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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;
@@ -23,11 +25,13 @@ 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;
 
@@ -93,6 +97,14 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
         return this.list(lambdaQueryWrapper);
     }
 
+    @Override
+    public List<PmsTerminal> getTerminalSelectByIds(List<String> ids) {
+        return this.list(new LambdaQueryWrapper<PmsTerminal>()
+                .in(CollUtil.isNotEmpty(ids),PmsTerminal::getId,ids)
+                .eq(PmsTerminal::getStatus,DataStateEnum.ENABLE.getCode())
+        );
+    }
+
     /**
      * 根据id查询
      * @author hany

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

@@ -20,9 +20,6 @@ public class Communicate {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 终端Id
-     */
     /**
      * 更新时间
      */
@@ -33,7 +30,11 @@ public class Communicate {
      */
     @Column(name = "line_id")
     private String id;
-
+    /**
+     * 终端Id
+     */
+    @Column(name = "dev_id")
+    private String devId;
 
     /**
      * 事件类型(0：中断；1：正常；2：退出)