From 736b0a6e6061a988f7614ca48190a282afbdee88 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 19 Jan 2026 14:01:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4overLimitMapper=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E5=85=AC=E5=85=B1=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/line/CslineController.java | 22 +++++++++---------- .../njcn/csdevice/mapper/OverlimitMapper.java | 22 ------------------- .../service/impl/CsGroupServiceImpl.java | 8 +++---- .../service/impl/CsLinePOServiceImpl.java | 13 +++++------ .../csdevice/service/impl/IcdServiceImpl.java | 13 +++++------ .../service/impl/OverLimitServiceImpl.java | 4 ++-- .../service/impl/CsEventPOServiceImpl.java | 3 --- 7 files changed, 27 insertions(+), 58 deletions(-) delete mode 100644 cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java index d0d4a52..d6f8e9d 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java @@ -12,7 +12,7 @@ import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.pojo.vo.LineDetailDataVO; import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO; import com.njcn.csdevice.service.CsLinePOService; -import com.njcn.device.biz.mapper.OverlimitMapper; +import com.njcn.device.biz.mapper.OverLimitWlMapper; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.web.controller.BaseController; @@ -44,7 +44,7 @@ import java.util.Map; public class CslineController extends BaseController { private final CsLinePOService csLinePOService; - private final OverlimitMapper overlimitMapper; + private final OverLimitWlMapper overLimitWlMapper; @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/queryLineById") @@ -87,8 +87,8 @@ public class CslineController extends BaseController { for(CsLinePO csLinePO: list){ Overlimit overlimit = COverlimitUtil.globalAssemble(csLinePO.getVolGrade().floatValue(),10f,10f,10f,0,1); overlimit.setId(csLinePO.getLineId()); - overlimitMapper.deleteById(csLinePO.getLineId()); - overlimitMapper.insert(overlimit); + overLimitWlMapper.deleteById(csLinePO.getLineId()); + overLimitWlMapper.insert(overlimit); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -155,7 +155,7 @@ public class CslineController extends BaseController { @ApiImplicitParam(name = "ids", value = "监测点id集合", required = true) public HttpResult> getOverLimitData(@RequestBody List ids) { String methodDescribe = getMethodDescribe("getOverLimitDataByIds"); - List result = overlimitMapper.selectBatchIds(ids); + List result = overLimitWlMapper.selectBatchIds(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -165,7 +165,7 @@ public class CslineController extends BaseController { @ApiImplicitParam(name = "id", value = "监测点id", required = true) public HttpResult getOverLimitData(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("getOverLimitData"); - Overlimit result = overlimitMapper.selectById(id); + Overlimit result = overLimitWlMapper.selectById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } @@ -199,8 +199,8 @@ public class CslineController extends BaseController { //新增监测点限值 Overlimit overlimit = COverlimitUtil.globalAssemble(param.getVolGrade().floatValue(),param.getProtocolCapacity().floatValue(),param.getDevCapacity().floatValue(),param.getShortCircuitCapacity().floatValue(),0,0); overlimit.setId(param.getLineId()); - overlimitMapper.deleteById(param.getLineId()); - overlimitMapper.insert(overlimit); + overLimitWlMapper.deleteById(param.getLineId()); + overLimitWlMapper.insert(overlimit); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -214,8 +214,8 @@ public class CslineController extends BaseController { //修改监测点限值 Overlimit overlimit = COverlimitUtil.globalAssemble(param.getVolGrade().floatValue(),param.getProtocolCapacity().floatValue(),param.getDevCapacity().floatValue(),param.getShortCircuitCapacity().floatValue(),0,0); overlimit.setId(param.getLineId()); - overlimitMapper.deleteById(param.getLineId()); - overlimitMapper.insert(overlimit); + overLimitWlMapper.deleteById(param.getLineId()); + overLimitWlMapper.insert(overlimit); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } @@ -226,7 +226,7 @@ public class CslineController extends BaseController { public HttpResult> delCldLine(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("delCldLine"); csLinePOService.deleteCldLine(id); - overlimitMapper.deleteById(id); + overLimitWlMapper.deleteById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java deleted file mode 100644 index 8408620..0000000 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/OverlimitMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -//package com.njcn.csdevice.mapper; -// -// -//import com.baomidou.dynamic.datasource.annotation.DS; -//import com.baomidou.mybatisplus.core.mapper.BaseMapper; -//import com.njcn.csdevice.pojo.po.Overlimit; -//import org.apache.ibatis.annotations.Mapper; -// -// -///** -// *

-// * Mapper 接口 -// *

-// * -// * @author cdf -// * @since 2022-01-04 -// */ -//@DS("sjzx") -//@Mapper -//public interface OverlimitMapper extends BaseMapper { -// -//} diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java index 09c5b05..35c1e31 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java @@ -38,7 +38,7 @@ 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.mapper.OverlimitMapper; +import com.njcn.device.biz.mapper.OverLimitWlMapper; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.influx.pojo.bo.CommonQueryParam; import com.njcn.influx.pojo.dto.EventDataSetDTO; @@ -93,7 +93,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl private final EvtDataService evtDataService; private final DecimalFormat df = new DecimalFormat("#0.00"); private final EleEvtFeignClient eleEvtFeignClient; - private final OverlimitMapper overlimitMapper; + private final OverLimitWlMapper overLimitWlMapper; private final CsDataSetMapper csDataSetMapper; private final EventFeignClient eventFeignClient; private final InfluxDbParamUtil influxDbParamUtil; @@ -582,7 +582,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl @Override public List getDeviceTrendData(String devId, String lineId,String groupId) { List data = new ArrayList(); - List overlimits = overlimitMapper.selectBatchIds(Arrays.asList(lineId)); + List overlimits = overLimitWlMapper.selectBatchIds(Arrays.asList(lineId)); List finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(lineId)).getData(); List data1 = equipmentFeignClient.queryDeviceById(Stream.of(devId).collect(Collectors.toList())).getData(); //便携式设备-稳态指标-实时数据-指标 @@ -949,7 +949,7 @@ public class CsGroupServiceImpl extends ServiceImpl impl Double ct = finalCsLinePO.getCtRatio(); Double pt = finalCsLinePO.getPtRatio(); // String position = finalCsLinePO.getPosition(); - Overlimit overlimit = overlimitMapper.selectById(finalCsLinePO.getLineId()); + Overlimit overlimit = overLimitWlMapper.selectById(finalCsLinePO.getLineId()); if (Objects.isNull(overlimit)) { throw new BusinessException("当前测点限值信息缺失，请联系管理员排查"); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index b72c88e..7a4bebf 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.access.api.CsLineLatestDataFeignClient; -import com.njcn.access.pojo.po.CsLineLatestData; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; @@ -42,7 +41,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -449,25 +447,24 @@ public class CsLinePOServiceImpl extends ServiceImpl i @Override public List getLineList(CsLinePO param) { - List result = new ArrayList<>(); List keywordsLineIds = new ArrayList<>(); List poList = getSimpleLine(); if (CollUtil.isNotEmpty(poList)) { keywordsLineIds = poList.stream().map(CsLinePO::getLineId).collect(Collectors.toList()); } - List list = this.list(new LambdaQueryWrapper() + List result = this.list(new LambdaQueryWrapper() .eq(CsLinePO::getStatus, 1) .eq(StrUtil.isNotBlank(param.getPosition()), CsLinePO::getPosition, param.getPosition()) .in(CsLinePO::getLineId, keywordsLineIds) .orderByAsc(CsLinePO::getName)); //根据监测点id查询设备信息 - if (CollectionUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(result)) { //获取设备信息集合 - List devList = list.stream().map(CsLinePO::getDevId).collect(Collectors.toList()); + List devList = result.stream().map(CsLinePO::getDeviceId).collect(Collectors.toList()); List equipmentDeliveryList = csEquipmentDeliveryMapper.selectBatchIds(devList); Map runStatusMap = equipmentDeliveryList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId,CsEquipmentDeliveryPO::getRunStatus)); - list.forEach(item->{ - item.setRunStatus(runStatusMap.get(item.getDevId())); + result.forEach(item->{ + item.setRunStatus(runStatusMap.get(item.getDeviceId())); }); } return result; diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java index de8d458..77b8e21 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/IcdServiceImpl.java @@ -8,6 +8,7 @@ import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.csp.sentinel.util.StringUtil; +import com.baomidou.dynamic.datasource.annotation.DSTransactional; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.njcn.access.utils.ChannelObjectUtil; import com.njcn.common.pojo.exception.BusinessException; @@ -23,7 +24,7 @@ import com.njcn.csdevice.pojo.vo.DeviceInfo; import com.njcn.csdevice.service.*; import com.njcn.csharmonic.api.EventFeignClient; import com.njcn.csharmonic.pojo.po.CsEventPO; -import com.njcn.device.biz.mapper.OverlimitMapper; +import com.njcn.device.biz.mapper.OverLimitWlMapper; import com.njcn.device.biz.pojo.po.Overlimit; import com.njcn.device.biz.utils.COverlimitUtil; import com.njcn.mq.message.BZEventMessage; @@ -61,7 +62,7 @@ class IcdServiceImpl implements IcdService { private final EventFeignClient eventFeignClient; private final ICsTerminalLogsService csTerminalLogsService; private final ICsTerminalReplyService csTerminalReplyService; - private final OverlimitMapper overlimitMapper; + private final OverLimitWlMapper overLimitWlMapper; private final DateTimeFormatter microsecondFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS"); @Override @@ -127,6 +128,7 @@ class IcdServiceImpl implements IcdService { } @Override + @DSTransactional public void addLedgerInfo(IcdLedgerParam param) { // 第一种：全流程创建 if (isAllIndicesNull(param)) { @@ -582,7 +584,6 @@ class IcdServiceImpl implements IcdService { && ObjectUtil.isNull(param.getDevIndex()); } - @Transactional(rollbackFor = Exception.class) public void handleFullProcessCreation(@NotNull IcdLedgerParam param) { if (ObjectUtil.isNotNull(param.getEngineering())) { CsEngineeringPO po1 = csEngineeringService.addEngineering(param.getEngineering()); @@ -591,17 +592,14 @@ class IcdServiceImpl implements IcdService { } } - @Transactional(rollbackFor = Exception.class) public void handleFromEngineeringCreation(IcdLedgerParam param) { createProjectAndDevices(param); } - @Transactional(rollbackFor = Exception.class) public void handleFromProjectCreation(IcdLedgerParam param) { saveDevicesAndLines(param); } - @Transactional(rollbackFor = Exception.class) public void handleFromDeviceCreation(IcdLedgerParam param) { saveLines(param); } @@ -635,7 +633,6 @@ class IcdServiceImpl implements IcdService { saveLines(param); } - @Transactional(rollbackFor = Exception.class) public void saveLines(IcdLedgerParam param) { List lineList = param.getLine(); if (CollectionUtil.isNotEmpty(lineList)) { @@ -661,7 +658,7 @@ class IcdServiceImpl implements IcdService { //新增监测点限值 Overlimit overlimit = COverlimitUtil.globalAssemble(line.getVolGrade().floatValue(), line.getProtocolCapacity().floatValue(),line.getDevCapacity().floatValue(),line.getShortCircuitCapacity().floatValue(),0,0); overlimit.setId(po.getLineId()); - overlimitMapper.insert(overlimit); + overLimitWlMapper.insert(overlimit); } //新增台账日志 diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverLimitServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverLimitServiceImpl.java index f7570ed..cbf1d09 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverLimitServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/OverLimitServiceImpl.java @@ -5,7 +5,7 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.csdevice.pojo.vo.LineOverLimitVO; import com.njcn.csdevice.service.IOverLimitService; -import com.njcn.device.biz.mapper.OverlimitMapper; +import com.njcn.device.biz.mapper.OverLimitWlMapper; import com.njcn.device.biz.pojo.po.Overlimit; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -19,7 +19,7 @@ import org.springframework.stereotype.Service; @DS("sjzx") @Service @RequiredArgsConstructor -public class OverLimitServiceImpl extends ServiceImpl implements IOverLimitService { +public class OverLimitServiceImpl extends ServiceImpl implements IOverLimitService { @Override diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java index 58cb3e7..8b9ea5a 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java @@ -376,10 +376,8 @@ public class CsEventPOServiceImpl extends ServiceImpl