模块迁移

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/PQOverlimitController.java

@@ -0,0 +1,104 @@
+package com.njcn.csdevice.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;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.csdevice.pojo.po.Overlimit;
+import com.njcn.csdevice.pojo.vo.LineOverLimitVO;
+import com.njcn.csdevice.service.IOverLimitService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+import java.util.Map;
+
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "监测点限值信息查询")
+public class PQOverlimitController extends BaseController {
+
+    private final IOverLimitService overLimitService;
+
+    // --------  3个重复的代码！！！！ ----------
+    /**
+     * 来源于CommTerminalController的getOverLimitData
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/commTerminal/getOverLimitData")
+    @ApiOperation("根据监测点id获取越限数值")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<Overlimit> getOverLimitDataTerminal(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getOverLimitData");
+        Overlimit result = overLimitService.getOverLimitDataById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/line/getOverLimitData")
+    @ApiOperation("根据监测点id获取越限数值")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<Overlimit> getOverLimitData(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getOverLimitData");
+        Overlimit result = overLimitService.getOverLimitDataById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/line/getLineOverLimitData")
+    @ApiOperation("根据监测点id获取越限详情")
+    @ApiImplicitParam(name = "id", value = "监测点id", required = true)
+    public HttpResult<LineOverLimitVO> getLineOverLimitData(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getLineOverLimitData");
+        LineOverLimitVO result = overLimitService.getLineOverLimitDataById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/overLimit/getOverLimitByLineIds")
+    @ApiOperation("监测点集合获取限值")
+    @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
+    @ApiIgnore
+    public HttpResult<List<Overlimit>> getOverLimitByLineIds(@RequestBody List<String> lineIds){
+        String methodDescribe = getMethodDescribe("getOverLimitByLineIds");
+        List<Overlimit> overLimitList= overLimitService.list(new LambdaQueryWrapper<Overlimit>().in(Overlimit::getId,lineIds));
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/commTerminal/getOverLimitDataByIds")
+    @ApiOperation("根据监测点id集合获取越限数值")
+    @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true)
+    public HttpResult<List<Overlimit>> getOverLimitDataByIds(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("getOverLimitDataByIds");
+        List<Overlimit> result = overLimitService.listByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/overLimit/getLimitMapsByLineIds")
+    @ApiOperation("监测点集合获取限值")
+    @ApiImplicitParam(name = "lineIds", value = "监测点ids", required = true)
+    @ApiIgnore
+    public HttpResult<List<Map<String, Object>>> getLimitMapsByLineIds(@RequestBody List<String> lineIds){
+        String methodDescribe = getMethodDescribe("getLimitMapsByLineIds");
+        List<Map<String, Object>> overLimitList= overLimitService.listMaps(new LambdaQueryWrapper<Overlimit>().in(Overlimit::getId,lineIds));
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, overLimitList, methodDescribe);
+    }
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -11,10 +11,10 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.mapper.OverlimitMapper;
 import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.po.Overlimit;
 import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO;
 import com.njcn.csdevice.service.CsLinePOService;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.biz.utils.COverlimitUtil;
+import com.njcn.csdevice.utils.COverlimitUtil;
 import com.njcn.web.controller.BaseController;
 import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.*;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java

@@ -3,7 +3,7 @@ package com.njcn.csdevice.mapper;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.csdevice.pojo.po.Overlimit;
 import org.apache.ibatis.annotations.Mapper;
 
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/OverlimitMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.overlimit.mapper.OverlimitMapper">
+
+    <select id="getAllLineOverLimit" resultType="com.njcn.device.biz.pojo.po.Overlimit">
+        select f.* from pq_line a
+        inner join pq_line_detail b on a.id = b.id
+        inner join pq_line c on a.pid = c.id
+        inner join pq_line d on c.pid = d.id
+        inner join pq_device e on d.id = e.id
+        inner join pq_overlimit f on a.id=f.id
+        where e.dev_data_type in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        and e.run_flag = 0
+        and e.dev_model = 1
+    </select>
+
+</mapper>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IOverLimitService.java

@@ -0,0 +1,28 @@
+package com.njcn.csdevice.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.csdevice.pojo.po.Overlimit;
+import com.njcn.csdevice.pojo.vo.LineOverLimitVO;
+
+/**
+ * <p>
+ * 越限表实体
+ * </p>
+ *
+ * @author hongawen
+ * @since 2023-03-28
+ */
+public interface IOverLimitService extends IService<Overlimit> {
+
+
+    Overlimit getOverLimitDataById(String id);
+
+    /**
+     * 获取监测点越限详情
+     * @param id 监测点id
+     * @return 结果
+     */
+    LineOverLimitVO getLineOverLimitDataById(String id);
+
+  }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/OverlimitServiceImpl.java

@@ -1,21 +0,0 @@
-package com.njcn.csdevice.service;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.csdevice.mapper.OverlimitMapper;
-import com.njcn.csdevice.service.impl.OverlimitService;
-/**
- * 
- * Description:
- * Date: 2024/10/22  14:14【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-@Service
-@DS("sjzx")
-public class OverlimitServiceImpl extends ServiceImpl<OverlimitMapper, Overlimit> implements OverlimitService{
-
-}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -37,7 +37,6 @@ import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.*;
 import com.njcn.csharmonic.pojo.vo.ThdDataTdVO;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
-import com.njcn.device.biz.pojo.po.Overlimit;
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.dto.EventDataSetDTO;
 import com.njcn.influx.pojo.dto.StatisticalDataDTO;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java

@@ -22,10 +22,9 @@ import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CldLedgerVo;
 import com.njcn.csdevice.pojo.vo.DeviceInfo;
 import com.njcn.csdevice.service.*;
+import com.njcn.csdevice.utils.COverlimitUtil;
 import com.njcn.csharmonic.api.EventFeignClient;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.mq.message.BZEventMessage;
 import com.njcn.mq.template.BZEventMessageTemplate;
 import com.njcn.redis.pojo.enums.AppRedisKey;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverLimitServiceImpl.java

@@ -0,0 +1,42 @@
+package com.njcn.csdevice.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.csdevice.mapper.OverlimitMapper;
+import com.njcn.csdevice.pojo.po.Overlimit;
+import com.njcn.csdevice.pojo.vo.LineOverLimitVO;
+import com.njcn.csdevice.service.IOverLimitService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+/**
+ * pqs
+ *
+ * @author cdf
+ * @date 2023/6/7
+ */
+@Service
+@RequiredArgsConstructor
+public class OverLimitServiceImpl extends ServiceImpl<OverlimitMapper, Overlimit> implements IOverLimitService {
+
+
+    @Override
+    public Overlimit getOverLimitDataById(String id) {
+        return this.baseMapper.selectById(id);
+    }
+
+    @Override
+    public LineOverLimitVO getLineOverLimitDataById(String id) {
+        //根据监测点id查询所在监测点的限值表数据
+        Overlimit overlimit = this.baseMapper.selectById(id);
+        LineOverLimitVO lineOverLimitVO = new LineOverLimitVO();
+        BeanUtil.copyProperties(overlimit, lineOverLimitVO);
+        lineOverLimitVO.setOddHarm(overlimit.getUharm3());
+        lineOverLimitVO.setEvenHarm(overlimit.getUharm2());
+        lineOverLimitVO.setInUharm(overlimit.getInuharm1());
+        lineOverLimitVO.setInUharm16(overlimit.getInuharm16());
+        return lineOverLimitVO;
+    }
+
+}
+

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverlimitService.java

@@ -1,17 +0,0 @@
-package com.njcn.csdevice.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.device.biz.pojo.po.Overlimit;
-
-/**
- * 
- * Description:
- * Date: 2024/10/22  14:14【需求编号】
- *
- * @author clam
- * @version V1.0.0
- */
-public interface OverlimitService extends IService<Overlimit>{
-
-
-}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java

@@ -18,27 +18,24 @@ import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.LineBaseEnum;
 import com.njcn.csdevice.mapper.CsDataSetMapper;
-import com.njcn.csdevice.mapper.CsEquipmentDeliveryMapper;
-import com.njcn.csdevice.mapper.CsLinePOMapper;
 import com.njcn.csdevice.mapper.WlRecordMapper;
 import com.njcn.csdevice.param.WlRecordPageParam;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.po.Overlimit;
 import com.njcn.csdevice.pojo.po.WlRecord;
 import com.njcn.csdevice.pojo.vo.RecordAllDevTreeVo;
 import com.njcn.csdevice.pojo.vo.RecordTreeVo;
 import com.njcn.csdevice.pojo.vo.RecordVo;
+import com.njcn.csdevice.service.IOverLimitService;
 import com.njcn.csdevice.service.IWlRecordService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
-import com.njcn.csdevice.utils.DataChangeUtil;
+import com.njcn.csdevice.utils.COverlimitUtil;
 import com.njcn.csdevice.utils.StringUtil;
-import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
-import com.njcn.device.biz.pojo.po.Overlimit;
-import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.influx.imapper.CommonMapper;
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
@@ -62,7 +59,6 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -93,10 +89,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
 
     private final InfluxDbParamUtil influxDbParamUtil;
 
-    private final CsLinePOMapper csLinePOMapper;
-
-    private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
-    private final OverlimitService overlimitService;
+    private final IOverLimitService overlimitService;
     private final DicDataFeignClient dicDataFeignClient;
 
     private final DecimalFormat df = new DecimalFormat(DataParam.DecimalFormatStr);