数据中心台账修改

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java

@@ -34,13 +34,5 @@ public interface TerminalBaseClient {
     HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list);
 
 
-    /**
-     * 获取监测点限值
-     *
-     * @param list 设备id集合
-     * @return 监测点限值信息
-     */
-    @PostMapping("getDevInfoByIds")
-    HttpResult<List<TerminalBaseVO>> getDeviceByIdOnOrOff(@RequestBody List<String> list);
 
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java

@@ -38,11 +38,6 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory<Termin
                 throw new BusinessException(finalExceptionEnum);
             }
 
-            @Override
-            public HttpResult<List<TerminalBaseVO>> getDeviceByIdOnOrOff(List<String> list) {
-                log.error("{}异常，降级处理，异常为：{}", "根据设备ids获取设备详情", throwable.toString());
-                throw new BusinessException(finalExceptionEnum);
-            }
         };
 
 

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

@@ -46,6 +46,9 @@ public class TerminalBaseVO {
     @ApiModelProperty("装置ip")
     private String ip;
 
+    @ApiModelProperty("装置型号")
+    private String devType;
+
     @ApiModelProperty("数据更新时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private String updateTime;

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

@@ -19,6 +19,7 @@ import com.njcn.device.pq.mapper.OverlimitMapper;
 import com.njcn.device.pq.mapper.VoltageMapper;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
@@ -27,16 +28,19 @@ import com.njcn.device.pq.pojo.po.Voltage;
 import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
 import com.njcn.device.pq.pojo.vo.TerminalVO;
 import com.njcn.device.pq.service.TerminalBaseService;
+import com.njcn.device.pq.service.impl.GeneralDeviceService;
 import com.njcn.poi.util.PoiUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.pojo.po.DictData;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
@@ -48,6 +52,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * pqs
@@ -80,6 +85,8 @@ public class TerminalBaseController extends BaseController {
 
     private final VoltageMapper voltageMapper;
 
+    private final GeneralDeviceService generalDeviceService;
+
 
     /**
      * 终端新增操作
@@ -228,6 +235,23 @@ public class TerminalBaseController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, devList, methodDescribe);
     }
 
+    /**
+     * 获取区域中断设备
+     * @author cdf
+     * @date 2022/6/29
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAreaOffDev")
+    @ApiOperation("获取区域中断设备")
+    @ApiImplicitParam(name = "deviceInfoParam", value = "参数体", required = true)
+    public HttpResult<List<TerminalBaseVO>> getAreaOffDev(@RequestBody @Validated DeviceInfoParam.BusinessParam deviceInfoParam) {
+        String methodDescribe = getMethodDescribe("getAreaOffDev");
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList()));
+        List<String> devIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getDeviceIndexes().stream()).collect(Collectors.toList());
+        List<TerminalBaseVO> res = terminalBaseService.getDeviceByIdOnOrOff(devIds, new DeviceType(), 0);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
+    }
+
     /**
      * 批量导入oracle中的原始数据
      *

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

@@ -120,6 +120,11 @@ public interface LineMapper extends BaseMapper<Line> {
     List<Line> getDeviceById(@Param("devIds") List<String> devIds, @Param("deviceType") DeviceType deviceType);
 
 
+    /**
+     * 获取离线装置
+     * @author cdf
+     * @date 2023/4/3
+     */
     List<TerminalBaseVO> getDeviceByIdOnOrOff(@Param("devIds") List<String> devIds, @Param("deviceType") DeviceType deviceType, @Param("comFlag") Integer comFlag);
 
 

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

@@ -209,9 +209,9 @@
     </select>
 
 
-    <select id="getDeviceByIdOnOrOff" resultType="TerminalBaseVO">
+    <select id="getDeviceByIdOnOrOff" resultType="com.njcn.device.pq.pojo.vo.TerminalBaseVO">
         SELECT
-        t1.name devName,t2.ip,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/TerminalBaseService.java

@@ -99,6 +99,9 @@ public interface TerminalBaseService {
      */
     List<TerminalBaseVO> getDeviceByIdOnOrOff(List<String> devIds, DeviceType deviceType, Integer comFlag);
 
+
+
+
     /**
      * 功能描述: 根据id查询变电站信息
      *

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

@@ -466,7 +466,7 @@ public class GeneralDeviceService {
         }
         //如果电压等级集合为空，则查询所有的电压等级
         if (CollectionUtil.isEmpty(scales)) {
-            List<DictData> scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE.getName()).getData();
+            List<DictData> scaleDictData = dicDataFeignClient.getDicDataByTypeName(DicDataTypeEnum.DEV_VOLTAGE_STAND.getName()).getData();
             scales = scaleDictData.stream().map(dictData -> {
                 SimpleDTO simpleDTO = new SimpleDTO();
                 BeanUtil.copyProperties(dictData,simpleDTO);

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

@@ -27,6 +27,7 @@ import com.njcn.device.pq.pojo.bo.excel.NodeExcel;
 import com.njcn.device.pq.pojo.bo.excel.OracleTerminalExcel;
 import com.njcn.device.pq.pojo.bo.excel.OverLimitExcel;
 import com.njcn.device.pq.pojo.bo.excel.TerminalBaseExcel;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.*;
 import com.njcn.device.pq.pojo.po.*;
 import com.njcn.device.pq.pojo.vo.*;
@@ -96,6 +97,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
 
     private final DeviceBakService deviceBakService;
 
+
+
     /**
      * 终端新增操作
      *
@@ -1323,6 +1326,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         return this.baseMapper.getDeviceByIdOnOrOff(devIds, deviceType, comFlag);
     }
 
+
     @Override
     public List<Line> getSubstationById(List<String> list) {
         return this.lambdaQuery().in(Line::getId, list).list();

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/area/AreaInfoController.java

@@ -49,20 +49,7 @@ public class AreaInfoController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
     }
 
-    /**
+
-     * 获取区域中断设备
-     * @author cdf
-     * @date 2022/6/29
-     */
-    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-    @PostMapping("/getAreaOffDev")
-    @ApiOperation("获取区域中断设备")
-    @ApiImplicitParam(name = "deviceInfoParam", value = "参数体", required = true)
-    public HttpResult<List<TerminalBaseVO>> getAreaOffDev(@RequestBody @Validated DeviceInfoParam.BusinessParam deviceInfoParam) {
-        String methodDescribe = getMethodDescribe("getAreaOffDev");
-        List<TerminalBaseVO> res = areaInfoService.getAreaOffDev(deviceInfoParam);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe);
-    }
 
     /**
      * 未处理暂降事件列表

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

@@ -23,12 +23,7 @@ public interface AreaInfoService {
     List<AreaSubLineVO> getAreaLineInfo(DeviceInfoParam.BusinessParam deviceInfoParam);
 
 
-    /**
+
-     * 获取区域监测点地理信息
-     * @author cdf
-     * @date 2022/6/29
-     */
-    List<TerminalBaseVO> getAreaOffDev(DeviceInfoParam.BusinessParam deviceInfoParam);
 
     /**
      * 获取区域监测点地理信息

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

@@ -4,28 +4,21 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.njcn.device.pms.pojo.po.RStatAreaAlarmCountM;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.TerminalBaseClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
-import com.njcn.event.pojo.constant.Param;
 import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.AreaSubLineVO;
 import com.njcn.event.service.majornetwork.AreaInfoService;
 import com.njcn.event.service.majornetwork.EventDetailService;
-import com.njcn.influxdb.mapper.InfluxDBResultMapperCn;
-import com.njcn.influxdb.param.InfluxDBPublicParam;
-import com.njcn.influxdb.utils.InfluxDBCommUtils;
 import com.njcn.influxdb.utils.InfluxDbUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
-import org.influxdb.dto.QueryResult;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -109,16 +102,7 @@ public class AreaInfoServiceImpl implements AreaInfoService {
         return resultVOList;
     }
 
-    @Override
+
-    public List<TerminalBaseVO> getAreaOffDev(DeviceInfoParam.BusinessParam deviceInfoParam) {
-        List<TerminalBaseVO> res = new ArrayList<>();
-        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
-        List<String> devIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getDeviceIndexes().stream()).collect(Collectors.toList());
-        if (CollectionUtil.isNotEmpty(devIds)) {
-            res = terminalBaseClient.getDeviceByIdOnOrOff(devIds).getData();
-        }
-        return res;
-    }
 
     @Override
     public List<EventDetailNew> getNoDealEvents(DeviceInfoParam deviceInfoParam) {
@@ -150,8 +134,6 @@ public class AreaInfoServiceImpl implements AreaInfoService {
                     resList.add(eventDetailNew);
                 }
             }
-
-
         }
         return resList;
     }