1.添加pms国网上送定时接口调整

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorParam.java

@@ -176,6 +176,10 @@ public class MonitorParam {
      */
     private String objType;
 
+    /**
+     * 101 电网侧，102 用户侧
+     */
+    private String powerFlag;
 
     /**
      * 监测对象编号

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Monitor.java

@@ -154,7 +154,10 @@ public class Monitor extends BaseEntity {
      */
     private String objType;
 
-
+    /**
+     * 101 电网侧，102 用户侧
+     */
+    private String powerFlag;
 
     /**
      * 监测对象编号

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

@@ -57,7 +57,7 @@
             or b.name like concat('%',#{baseParam.searchValue},'%')
             )
         </if>
-        order by a.Power_Name asc
+        order by a.org_name,a.Power_Name asc
     </select>
 
 </mapper>

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

@@ -173,7 +173,7 @@ public class GwMonitorPushServiceImpl implements GwMonitorPushService {
                 SysDicTreePO sysDicTreeParent = dictTreeFeignClient.queryById(sysDicTreePO.getPid()).getData();
                 pushMonitorDTO.setObjTypePrePre(sysDicTreeParent.getCode());
             }
-            pushMonitorDTO.setObjectType("0");
+            pushMonitorDTO.setObjectType(item.getPowerFlag());
 
             if (statusMap.containsKey(item.getMonitorState())) {
                 pushMonitorDTO.setStatus(statusMap.get(item.getMonitorState()).getValue());

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

@@ -35,6 +35,7 @@ import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import com.njcn.device.pms.service.majornetwork.IMonitorService;
+import com.njcn.device.pms.service.majornetwork.ITractionStationService;
 import com.njcn.device.pq.pojo.bo.excel.OracleTerminalExcel;
 import com.njcn.device.pq.pojo.po.LineBak;
 import com.njcn.poi.excel.ExcelUtil;
@@ -104,6 +105,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
     private final DictTreeFeignClient dictTreeFeignClient;
 
 
+
     @Override
     public List<PmsMonitorBaseDTO> getMonitorByCondition(List<String> deptIdList, PmsDeviceInfoParam pmsDeviceInfoParam) {
         return this.baseMapper.getMonitorByCondition(deptIdList, pmsDeviceInfoParam);
@@ -206,7 +208,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                         .or()
                         .like(Monitor::getOrgName, baseParam.getSearchValue()))
                 .eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode())
-                .orderByDesc(Monitor::getCreateTime);
+                .orderByAsc(Monitor::getOrgName,Monitor::getPowerrName);
         Page<Monitor> page = this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
 
         List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
@@ -226,6 +228,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
             Map<String, GeneratrixWire> mapBus = generatrixWireList.stream().collect(Collectors.toMap(GeneratrixWire::getId, Function.identity()));
 
 
+
             temList = temList.stream().peek(item -> {
                 if (mapTerminal.containsKey(item.getTerminalId())) {
                     item.setTerminalCode(mapTerminal.get(item.getTerminalId()).getTerminalCode());
@@ -882,13 +885,15 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                     terminalMapper.updateById(pmsTerminalPO);
                     devId = pmsTerminal.getId();
                 } else if (Objects.isNull(pmsTerminal)) {
-
                     terminalMapper.deleteById(deviceBak.getId());
                     pmsTerminalPO.setId(deviceBak.getId());
                     terminalMapper.insert(pmsTerminalPO);
                     devId = pmsTerminalPO.getId();
                 } else {
                     devId = pmsTerminal.getId();
+                    pmsTerminalPO.setId(devId);
+                    terminalMapper.updateById(pmsTerminalPO);
+
                 }
 
             }
@@ -1042,13 +1047,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
             }
 
             //行业类型
-            if (businessDicMap.containsKey(oracleTerminalExcel.getBusinessType())) {
+           /* if (businessDicMap.containsKey(oracleTerminalExcel.getBusinessType())) {
                 String busTypeId = businessDicMap.get(oracleTerminalExcel.getBusinessType()).getId();
                 monitorPO.setTradeCode(busTypeId);
             } else {
                 oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, oracleTerminalExcel.getBusinessType()+"字典行业类型不存在，请确认后重试"));
                 continue;
-            }
+            }*/
 
             //TODO 监测点对象名称
 
@@ -1074,7 +1079,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                 oracleTerminalExcelMsg.add(assembleMsg(oracleTerminalExcel, "字典接线方式不存在，请确认后重试"));
                 continue;
             }
-            monitorPO.setIsUpToGrid(0);
+
             monitorPO.setStatus(DataStateEnum.ENABLE.getCode());
             monitorPO.setIsSpecialMonitor(0);
             monitorPO.setPt1(oracleTerminalExcel.getPt1());
@@ -1083,9 +1088,21 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
             monitorPO.setCt2(oracleTerminalExcel.getCt2());
 
 
+            if(oracleTerminalExcel.getLoadType().equals("光伏电站") || oracleTerminalExcel.getLoadType().equals("风电场")){
+                monitorPO.setFieldStation("01");
+            }
+
+            if(oracleTerminalExcel.getPowerFlag() == 0){
+                monitorPO.setPowerFlag("101");
+            }else if(oracleTerminalExcel.getPowerFlag() == 1){
+                monitorPO.setPowerFlag("102");
+            }
+
+
 
 
             if (Objects.isNull(lineBak) && Objects.isNull(monitor)) {
+                monitorPO.setIsUpToGrid(0);
                 monitorMapper.insert(monitorPO);
                 Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0);
                 overlimit.setId(monitorPO.getId());
@@ -1108,15 +1125,13 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
                     lineBakMapper.insert(lineBakPO);
                     monitorMapper.updateById(monitorPO);
                 } else if (Objects.isNull(monitor)) {
+                    monitorPO.setIsUpToGrid(0);
                     monitorMapper.deleteById(lineBak.getId());
-                    overlimitMapper.deleteById(lineBak.getId());
                     monitorPO.setId(lineBak.getId());
                     monitorMapper.insert(monitorPO);
                 } else {
-                    monitorMapper.deleteById(monitor.getId());
-                    overlimitMapper.deleteById(monitor.getId());
                     monitorPO.setId(lineBak.getId());
-                    monitorMapper.insert(monitorPO);
+                    monitorMapper.updateById(monitorPO);
                 }
 
                 Overlimit overlimit = COverlimitUtil.globalAssemble(Float.parseFloat(scale.getValue()), oracleTerminalExcel.getDealCapacity(), oracleTerminalExcel.getDevCapacity(), oracleTerminalExcel.getShortCapacity(), 0, 0);

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

@@ -70,7 +70,7 @@ public class TerminalServiceImpl extends ServiceImpl<TerminalMapper, PmsTerminal
                             .or()
                             .like(PmsTerminal::getPowerrName, baseParam.getSearchValue()));
                 }
-        lambdaQueryWrapper.orderByDesc(PmsTerminal::getCreateTime);
+        lambdaQueryWrapper.orderByAsc(PmsTerminal::getOrgName,PmsTerminal::getName);
         //初始化分页数据
         return this.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), lambdaQueryWrapper);
     }