From 5ef232a485fe91ff71929c3094463219cda5806b Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 9 Oct 2024 14:57:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=80=82=E9=85=8D=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/njcn/csdevice/api/CsLineFeignClient.java | 4 ++++ .../api/fallback/CsLineClientFallbackFactory.java | 6 ++++++ .../com/njcn/csdevice/pojo/param/CsLineParam.java | 10 ++++++++++ .../csdevice/controller/line/CslineController.java | 11 +++++++++++ .../csdevice/mapper/mapping/CsDataArrayMapper.xml | 1 + .../com/njcn/csdevice/service/CsLinePOService.java | 6 ++++++ .../csdevice/service/impl/CsLinePOServiceImpl.java | 10 ++++++++++ 7 files changed, 48 insertions(+) diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java index 92326a7..0d65192 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java @@ -6,6 +6,7 @@ import com.njcn.csdevice.api.fallback.CsLineClientFallbackFactory; import com.njcn.csdevice.pojo.param.CsLineParam; import com.njcn.csdevice.pojo.po.CsLinePO; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -36,4 +37,7 @@ public interface CsLineFeignClient { @PostMapping("/updateLine") HttpResult updateLine(@RequestBody CsLineParam csLineParam); + + @PostMapping("/updateIds") + HttpResult updateIds(@RequestBody @Validated CsLineParam csLineParam); } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java index 07a7465..0d22e37 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java @@ -63,6 +63,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory updateIds(CsLineParam csLineParam) { + log.error("{}异常，降级处理，异常为：{}","修改监测点模板id和数据集id",cause.toString()); + throw new BusinessException(finalExceptionEnum); + } }; } } diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java index 6bb4a0e..9538db5 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java @@ -38,4 +38,14 @@ public class CsLineParam extends BaseEntity { */ private Integer conType; + /** + * 模板id + */ + private String modelId; + + /** + * 数据集id + */ + private String dataSetId; + } \ No newline at end of file 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 def7774..29f6456 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 @@ -121,4 +121,15 @@ public class CslineController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); } + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/updateIds") + @ApiOperation("修改监测点模板id和数据集id") + @ApiImplicitParam(name = "csLineParam", value = "监测点信息", required = true) + @ApiIgnore + public HttpResult updateIds(@RequestBody @Validated CsLineParam csLineParam) { + String methodDescribe = getMethodDescribe("updateIds"); + csLinePOService.updateIds(csLineParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); + } + } diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml index bdf5a6a..1c48727 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml @@ -105,6 +105,7 @@ t0.ndid = #{param.id} and t1.did = #{param.did} and t3.cl_dev = #{param.cldId} + and (t3.data_type = 'Stat' or t3.data_type is NULL) and t4.stat_method = #{param.statMethod} order by t4.sort diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java index 5b1b786..e824fd8 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java @@ -40,4 +40,10 @@ public interface CsLinePOService extends IService{ */ void updateLine(CsLineParam csLineParam); + /** + * 修改监测点的数据集id和模板id + * @param csLineParam + */ + void updateIds(CsLineParam csLineParam); + } 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 9969905..d9dfba6 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 @@ -71,6 +71,16 @@ public class CsLinePOServiceImpl extends ServiceImpl i this.update(lambdaUpdateWrapper); } + @Override + public void updateIds(CsLineParam csLineParam) { + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper<>(); + lambdaUpdateWrapper.eq(CsLinePO::getLineId,csLineParam.getLineId()) + .eq(CsLinePO::getStatus,1) + .set(CsLinePO::getDataSetId,csLineParam.getDataSetId()) + .set(CsLinePO::getDataModelId,csLineParam.getModelId()); + this.update(lambdaUpdateWrapper); + } + // /** // * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template) // *