1.app远程接口添加

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

@@ -480,7 +480,11 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                         new LambdaQueryWrapper<PowerDistributionarea>()
                                 .select(PowerDistributionarea::getId,
                                         PowerDistributionarea::getState,
-                                        PowerDistributionarea::getVoltageLevel,PowerDistributionarea::getOrgId)
+                                        PowerDistributionarea::getVoltageLevel,
+                                        PowerDistributionarea::getOrgId,
+                                        PowerDistributionarea::getPowerStationId,
+                                        PowerDistributionarea::getLineId
+                                        )
                                 .last(true, "limit " + page+ ",10000"));
 
                 List<DistributionMonitor> poList= new ArrayList<>();
@@ -494,6 +498,8 @@ public class DistributionMonitorServiceImpl extends MppServiceImpl<DistributionM
                     distributionMonitor.setVoltageLevel(powerDistributionarea.getVoltageLevel());
                     distributionMonitor.setCreatedDate(LocalDateTime.now());
                     distributionMonitor.setIfPowerUser(0);
+                    distributionMonitor.setPowerStationId(powerDistributionarea.getPowerStationId());
+                    distributionMonitor.setLineId(powerDistributionarea.getLineId());
                     poList.add(distributionMonitor);
 
                 }

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

@@ -147,10 +147,10 @@ public interface GeneralDeviceInfoClient {
     HttpResult<List<DevDetail>> getDevInfoByIds(@RequestBody List<String> devIds);
 
     /**
-     * @Description: 根据topIds集合获取终端信息
+     * @Description: 根据id集合获取终端消息信息
      * @Author: wr
      * @Date: 2023/11/9 13:55
      */
     @PostMapping("/getTopMsgInfoByIds")
-    HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(@RequestBody List<String> topIds);
+    HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(@RequestBody OnlineRateParam param);
 }

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

@@ -114,7 +114,7 @@ public class GeneralDeviceInfoClientFallbackFactory implements FallbackFactory<G
             }
 
             @Override
-            public HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(List<String> topIds) {
+            public HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(OnlineRateParam param) {
                 log.error("{}异常，降级处理，异常为：{}", "根据topIds集合获取终端信息", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }

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

@@ -25,4 +25,6 @@ public class OnlineRateParam {
     @ApiModelProperty(name = "endTime", value = "结束时间")
     private String endTime;
 
+    @ApiModelProperty(name = "type", value = "区分类型0：topid搜索 1：devid搜索")
+    private Integer type;
 }

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

@@ -322,11 +322,10 @@ public class GeneralDeviceInfoController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getTopMsgInfoByIds")
-    @ApiOperation("根据终端id集合获取终端信息")
+    @ApiOperation("根据id集合获取终端消息信息")
-    @ApiImplicitParam(name = "topIds", value = "单位部门索引", required = true)
+    public HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(@RequestBody OnlineRateParam param) {
-    public HttpResult<List<TopMsgPO>> getTopMsgInfoByIds(@RequestBody List<String> topIds) {
         String methodDescribe = getMethodDescribe("getTopMsgInfoByIds");
-        List<TopMsgPO> runLineIds = generalDeviceService.getTopMsgInfoByIds(topIds);
+        List<TopMsgPO> runLineIds = generalDeviceService.getTopMsgInfoByIds(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,runLineIds,methodDescribe);
     }
 }

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

@@ -3,6 +3,7 @@ package com.njcn.device.pq.mapper;
 
 import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.po.TopMsgPO;
 import com.njcn.device.pq.pojo.vo.LineFlowMealDetailVO;
 import org.apache.ibatis.annotations.Param;
@@ -13,5 +14,5 @@ public interface TopMsgMapper {
    Page<TopMsgPO> dailyDeviceAbnormalStatistics(Page<TopMsgPO> page,@Param("lineGrade") String lineGrade, @Param("startTime") DateTime startTime, @Param("endTime") DateTime endTime);
 
    List<TopMsgPO> dailyDeviceAbnormal(@Param("lineGrade") String lineGrade,@Param("startTime") DateTime startTime);
-   List<TopMsgPO> selectByIds(@Param("ids") List<String> ids);
+   List<TopMsgPO> selectByIds(@Param("param") OnlineRateParam param);
 }

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

@@ -80,12 +80,28 @@
         INNER JOIN pqs_top_msg ptm ON ptm.Dev_Id = dev.Id
         INNER JOIN pq_device device ON dev.id = device.Id
         <where>
-            <if test="ids!=null and ids.size()!=0">
+            <if test="param.type == 0">
+                <if test="param.ids!=null and param.ids.size()!=0">
                     ptm.Top_Id IN
-                <foreach collection="ids" item="item" open="(" close=")" separator=",">
+                    <foreach collection="param.ids" item="item" open="(" close=")" separator=",">
                         #{item}
                     </foreach>
                 </if>
+            </if>
+            <if test="param.type == 1">
+                <if test="param.ids!=null and param.ids.size()!=0">
+                    dev.Id IN
+                    <foreach collection="param.ids" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+            </if>
+            <if test=" param.startTime != null and param.startTime !=''">
+                AND  ptm.Time_Id >= #{param.startTime}
+            </if>
+            <if test="param.endTime != null and param.endTime != ''">
+                AND  ptm.Time_Id &lt;= #{param.endTime}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -16,6 +16,7 @@ import com.njcn.device.pq.pojo.bo.BaseLineInfo;
 import com.njcn.device.pq.pojo.bo.DeviceType;
 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.*;
 import com.njcn.device.pq.pojo.vo.DeptDeviceDetailVO;
 import com.njcn.device.pq.pojo.vo.DeptSubstationDetailVO;
@@ -780,7 +781,7 @@ public class GeneralDeviceService {
         return devDetails;
     }
 
-    public List<TopMsgPO> getTopMsgInfoByIds(List<String> topIds) {
+    public List<TopMsgPO> getTopMsgInfoByIds(OnlineRateParam param) {
-        return topMsgMapper.selectByIds(topIds);
+        return topMsgMapper.selectByIds(param);
     }
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/HarmDataFeignClient.java

@@ -4,11 +4,15 @@ import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.harmonic.api.fallback.HarmDataFeignClientFallbackFactory;
 import com.njcn.harmonic.pojo.param.HistoryHarmParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.influx.pojo.dto.HarmHistoryDataDTO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
+import java.util.List;
+
 @FeignClient(
         value = ServerInfo.HARMONIC,
         path = "/harmonic",
@@ -25,4 +29,19 @@ public interface HarmDataFeignClient {
     @PostMapping("/getHistoryHarmData")
     HttpResult<HarmHistoryDataDTO> getHistoryHarmData(@RequestBody HistoryHarmParam historyHarmParam);
 
+    /**
+     * 获取越线监测点
+     * @param param
+     * @return
+     */
+    @PostMapping("/getLinesTarget")
+    HttpResult<List<String>> getLinesTarget(@RequestBody StatSubstationBizBaseParam param);
+
+    /**
+     * 获取越线监测点越线次数
+     * @param param
+     * @return
+     */
+    @PostMapping("/getLinesRate")
+    HttpResult<List<RStatLimitRateDPO>> getLinesRate(@RequestBody StatSubstationBizBaseParam param);
 }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/api/fallback/HarmDataFeignClientFallbackFactory.java

@@ -6,11 +6,15 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.device.biz.utils.DeviceEnumUtil;
 import com.njcn.harmonic.api.HarmDataFeignClient;
 import com.njcn.harmonic.pojo.param.HistoryHarmParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.influx.pojo.dto.HarmHistoryDataDTO;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * @author hongawen
  * @version 1.0.0
@@ -34,6 +38,18 @@ public class HarmDataFeignClientFallbackFactory implements FallbackFactory<HarmD
                 log.error("{}异常，降级处理，异常为：{}", "获取谐波历史数据", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<String>> getLinesTarget(StatSubstationBizBaseParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取越线监测点", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<RStatLimitRateDPO>> getLinesRate(StatSubstationBizBaseParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "获取越线监测点越线次数", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/HistoryResultController.java

@@ -1,5 +1,6 @@
 package com.njcn.harmonic.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -9,9 +10,13 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.harmonic.pojo.param.HistoryHarmParam;
 import com.njcn.harmonic.pojo.param.HistoryParam;
 import com.njcn.harmonic.pojo.param.NormHistoryParam;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
 import com.njcn.harmonic.pojo.vo.HistoryDataResultVO;
 import com.njcn.harmonic.pojo.vo.StatHarmonicOrgVO;
 import com.njcn.harmonic.service.HistoryResultService;
+import com.njcn.harmonic.service.IRStatLimitRateDService;
+import com.njcn.harmonic.service.IRStatLimitTargetDService;
 import com.njcn.influx.pojo.dto.HarmHistoryDataDTO;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
@@ -41,6 +46,8 @@ import java.util.List;
 public class HistoryResultController extends BaseController {
 
     private final HistoryResultService historyResultService;
+    private final IRStatLimitTargetDService limitTargetDService;
+    private final IRStatLimitRateDService limitRateDService;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getHistoryResult")
@@ -82,4 +89,29 @@ public class HistoryResultController extends BaseController {
         HarmHistoryDataDTO harmHistoryDataDTO = historyResultService.getHistoryHarmData(historyHarmParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, harmHistoryDataDTO, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLinesTarget")
+    @ApiOperation("获取越线监测点")
+    @ApiImplicitParam(name = "param", value = "越线监测点请求参数", required = true)
+    public HttpResult<List<String>> getLinesTarget(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getLinesTarget");
+        List<String> linesTarget = limitTargetDService.getLinesTarget(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, linesTarget, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLinesRate")
+    @ApiOperation("获取越线监测点越线次数")
+    @ApiImplicitParam(name = "param", value = "获取越线监测点越线次数请求参数", required = true)
+    public HttpResult<List<RStatLimitRateDPO>> getLinesRate(@RequestBody StatSubstationBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getLinesTarget");
+        List<RStatLimitRateDPO> list = limitRateDService.list(new LambdaQueryWrapper<RStatLimitRateDPO>()
+                .in(RStatLimitRateDPO::getLineId, param.getIds())
+                .in(RStatLimitRateDPO::getTime, param.getStartTime())
+                .in(RStatLimitRateDPO::getTime, param.getEndTime())
+
+        );
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/RStatLimitTargetDMapper.java

@@ -47,4 +47,13 @@ public interface RStatLimitTargetDMapper extends BaseMapper<RStatLimitTargetDPO>
     Integer getSumAddI(@Param("ids") List<String> list,
                                       @Param("startTime") String startTime,
                                       @Param("endTime") String endTime);
+
+    /**
+     * 获取越线监测点
+     * @return
+     */
+    List<String> getLinesTarget(@Param("ids") List<String> ids,
+                                   @Param("startTime") String startTime,
+                                   @Param("endTime") String endTime);
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/mapping/RStatLimitTargetDMapper.xml

@@ -231,4 +231,28 @@
             </if>
         </where>
     </select>
+    <select id="getLinesTarget" resultType="java.lang.String">
+        SELECT
+            my_index
+        FROM
+            r_stat_limit_target_d
+        <where>
+            <if test=" ids != null and ids.size > 0">
+                AND my_index IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
+            <if test=" startTime != null and startTime !=''">
+                AND  time_id >= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND  time_id &lt;= #{endTime}
+            </if>
+        </where>
+        GROUP BY
+            my_index
+        HAVING
+            allCount >0
+    </select>
 </mapper>

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

@@ -1,8 +1,11 @@
 package com.njcn.harmonic.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 
+import java.util.List;
+
 /**
  * <p>
  * 合格率统计日表(是否越限) 服务类
@@ -13,4 +16,10 @@ import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
  */
 public interface IRStatLimitTargetDService extends IService<RStatLimitTargetDPO> {
 
+    /**
+     * 获取越线监测点
+     * @param param
+     * @return
+     */
+    List<String> getLinesTarget(StatSubstationBizBaseParam param);
 }

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

@@ -2,10 +2,13 @@ package com.njcn.harmonic.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.harmonic.mapper.RStatLimitTargetDMapper;
+import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 import com.njcn.harmonic.service.IRStatLimitTargetDService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 合格率统计日表(是否越限) 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class RStatLimitTargetDServiceImpl extends ServiceImpl<RStatLimitTargetDMapper, RStatLimitTargetDPO> implements IRStatLimitTargetDService {
 
+    @Override
+    public List<String> getLinesTarget(StatSubstationBizBaseParam param) {
+        return this.baseMapper.getLinesTarget(param.getIds(),param.getStartTime(),param.getEndTime());
+    }
 }

pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java

@@ -1,6 +1,7 @@
 package com.njcn.user.controller;
 
 
+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;
@@ -416,7 +417,9 @@ public class UserController extends BaseController {
     @ApiImplicitParam(name = "ids", value = "用户id集合", required = true)
     public HttpResult<List<User>> getUserByIdList(@RequestBody  List<String> ids) {
         String methodDescribe = getMethodDescribe("getUserByIdList");
-        List<User> users = userService.listByIds(ids);
+        List<User> users = userService.list((new LambdaQueryWrapper<User>()
+                .in(CollUtil.isNotEmpty(ids),User::getId,ids)
+        ));
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, users, methodDescribe);
     }