diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java index 22da6d3..8770cf4 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/ledger/CsLedgerController.java @@ -65,7 +65,7 @@ public class CsLedgerController extends BaseController { @PostMapping("/AppLineTree") @ApiOperation("app端监测点树") public HttpResult> appLineTree(){ - String methodDescribe = getMethodDescribe("AppLineTree"); + String methodDescribe = getMethodDescribe("appLineTree"); List list = csLedgerService.appLineTree(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java index 8790f95..6dc9478 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java @@ -46,6 +46,7 @@ import com.njcn.csdevice.service.*; import com.njcn.csdevice.util.QRCodeUtil; import com.njcn.csdevice.utils.ExcelStyleUtil; import com.njcn.csdevice.utils.StringUtil; +import com.njcn.csharmonic.api.CsHarmonicPlanLineFeignClient; import com.njcn.csharmonic.api.EventUserFeignClient; import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventPO; @@ -128,6 +129,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl appLineTopologyDiagramPOQueryWrapper = new QueryWrapper<>(); appLineTopologyDiagramPOQueryWrapper.clear(); 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 25e8a2e..0ef2131 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 @@ -10,7 +10,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.PubUtils; @@ -24,7 +23,11 @@ import com.njcn.csdevice.pojo.vo.PqSensitiveUserLineVO; import com.njcn.csdevice.service.CsDevModelService; import com.njcn.csdevice.service.CsLinePOService; import com.njcn.csdevice.service.ICsDataSetService; +import com.njcn.csharmonic.api.CsHarmonicPlanFeignClient; +import com.njcn.csharmonic.api.CsHarmonicPlanLineFeignClient; import com.njcn.csharmonic.api.PqSensitiveUserFeignClient; +import com.njcn.csharmonic.param.CsHarmonicPlanLineParam; +import com.njcn.csharmonic.pojo.po.CsHarmonicPlan; import com.njcn.device.biz.pojo.po.PqSensitiveUser; import com.njcn.oss.constant.OssPath; import com.njcn.oss.utils.FileStorageUtil; @@ -64,7 +67,6 @@ public class CsLinePOServiceImpl extends ServiceImpl i private final ICsDataSetService csDataSetService; private final DicDataFeignClient dicDataFeignClient; private final CsTerminalLogsMapper csTerminalLogsMapper; - private final CsLineLatestDataFeignClient csLineLatestDataFeignClient; private final PqSensitiveUserFeignClient pqSensitiveUserFeignClient; private final FileStorageUtil fileStorageUtil; @@ -72,6 +74,8 @@ public class CsLinePOServiceImpl extends ServiceImpl i private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper; private final CsDeviceUserPOMapper csDeviceUserPOMapper; private final DictTreeFeignClient dictTreeFeignClient; + private final CsHarmonicPlanFeignClient csHarmonicPlanFeignClient; + private final CsHarmonicPlanLineFeignClient csHarmonicPlanLineFeignClient; @Override @@ -171,6 +175,17 @@ public class CsLinePOServiceImpl extends ServiceImpl i csLedger.setState(1); csLedger.setSort(0); csLedgerMapper.insert(csLedger); + + //3.新增稳态事件指标配置 + csHarmonicPlanLineFeignClient.deleteByLineIds(Collections.singletonList(lineId)); + List planList = csHarmonicPlanFeignClient.getByName("通用方案").getData(); + if (CollectionUtil.isNotEmpty(planList)) { + CsHarmonicPlan plan = planList.get(0); + CsHarmonicPlanLineParam param1 = new CsHarmonicPlanLineParam(); + param1.setId(plan.getId()); + param1.setLineIds(Collections.singletonList(lineId)); + csHarmonicPlanLineFeignClient.savePlanLines(param1); + } return po; } @@ -234,6 +249,8 @@ public class CsLinePOServiceImpl extends ServiceImpl i this.removeById(id); csLedgerMapper.deleteById(id); + //删除稳态事件指标配置 + csHarmonicPlanLineFeignClient.deleteByLineIds(Collections.singletonList(id)); //新增台账日志 CsTerminalLogs csTerminalLogs = new CsTerminalLogs(); diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanFeignClient.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanFeignClient.java index f6500c9..f6bfc5c 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanFeignClient.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanFeignClient.java @@ -9,6 +9,8 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @author xy */ @@ -19,4 +21,8 @@ public interface CsHarmonicPlanFeignClient { @ApiOperation("根据ID查询稳态指标方案") HttpResult getById(@RequestParam("id") String id); + @GetMapping("/getByName") + @ApiOperation("根据名称查询稳态指标方案") + HttpResult> getByName(@RequestParam("name") String name); + } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanLineFeignClient.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanLineFeignClient.java index e4abeeb..19d4ae5 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanLineFeignClient.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/CsHarmonicPlanLineFeignClient.java @@ -3,11 +3,17 @@ package com.njcn.csharmonic.api; import com.njcn.common.pojo.constant.ServerInfo; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csharmonic.api.fallback.CsHarmonicPlanLineFeignClientFallbackFactory; +import com.njcn.csharmonic.param.CsHarmonicPlanLineParam; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * @author xy */ @@ -18,4 +24,12 @@ public interface CsHarmonicPlanLineFeignClient { @ApiOperation("根据监测点ID查询方案ID") HttpResult getPlanIdByLineId(@RequestParam("lineId") String lineId); + @PostMapping("/savePlanLines") + @ApiOperation("新增方案与监测点关联") + HttpResult savePlanLines(@RequestBody @Validated CsHarmonicPlanLineParam param); + + @PostMapping("/deleteByLineIds") + @ApiOperation("根据监测点ID集合删除关联") + HttpResult deleteByLineIds(@RequestBody List lineIds); + } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanFeignClientFallbackFactory.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanFeignClientFallbackFactory.java index ebf4e5c..5e65a66 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanFeignClientFallbackFactory.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanFeignClientFallbackFactory.java @@ -3,9 +3,7 @@ package com.njcn.csharmonic.api.fallback; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; -import com.njcn.csharmonic.api.CsHarmonicFeignClient; import com.njcn.csharmonic.api.CsHarmonicPlanFeignClient; -import com.njcn.csharmonic.pojo.po.CsHarmonic; import com.njcn.csharmonic.pojo.po.CsHarmonicPlan; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; @@ -34,6 +32,12 @@ public class CsHarmonicPlanFeignClientFallbackFactory implements FallbackFactory log.error("{}异常，降级处理，异常为：{}","根据ID查询稳态指标方案异常",cause.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public HttpResult> getByName(String name) { + log.error("{}异常，降级处理，异常为：{}","根据名称查询稳态指标方案异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanLineFeignClientFallbackFactory.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanLineFeignClientFallbackFactory.java index c96000d..dd255a2 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanLineFeignClientFallbackFactory.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/api/fallback/CsHarmonicPlanLineFeignClientFallbackFactory.java @@ -4,10 +4,13 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.response.HttpResult; import com.njcn.csharmonic.api.CsHarmonicPlanLineFeignClient; +import com.njcn.csharmonic.param.CsHarmonicPlanLineParam; import feign.hystrix.FallbackFactory; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.util.List; + /** * @author xy */ @@ -28,6 +31,18 @@ public class CsHarmonicPlanLineFeignClientFallbackFactory implements FallbackFac log.error("{}异常，降级处理，异常为：{}","根据监测点ID查询方案ID异常",cause.toString()); throw new BusinessException(finalExceptionEnum); } + + @Override + public HttpResult savePlanLines(CsHarmonicPlanLineParam param) { + log.error("{}异常，降级处理，异常为：{}","新增方案与监测点关联异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } + + @Override + public HttpResult deleteByLineIds(List lineIds) { + log.error("{}异常，降级处理，异常为：{}","根据监测点ID集合删除关联异常",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicPlanController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicPlanController.java index d27d531..a53b835 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicPlanController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsHarmonicPlanController.java @@ -112,4 +112,17 @@ public class CsHarmonicPlanController extends BaseController { List list = csHarmonicPlanService.listAllOrderBySort(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } + + /** + * 根据ID查询稳态指标方案(包含监测点列表) + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getByName") + @ApiOperation("根据名称查询稳态指标方案") + @ApiImplicitParam(name = "name", value = "name", required = true) + public HttpResult> getByName(@RequestParam("name") String name) { + String methodDescribe = getMethodDescribe("getByName"); + List plan = csHarmonicPlanService.getByName(name); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, plan, methodDescribe); + } } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicPlanService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicPlanService.java index 604f93a..ed8dd54 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicPlanService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/ICsHarmonicPlanService.java @@ -60,4 +60,6 @@ public interface ICsHarmonicPlanService extends IService { * @return 方案详情 */ CsHarmonicPlan getByIdWithLines(String id); + + List getByName(String name); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicPlanServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicPlanServiceImpl.java index e686421..c4821aa 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicPlanServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsHarmonicPlanServiceImpl.java @@ -131,4 +131,11 @@ public class CsHarmonicPlanServiceImpl extends ServiceImpl getByName(String name) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CsHarmonicPlan::getName, name); + return this.list(wrapper); + } }