《取水口控制器及测控数据关系》文档修改。

liurunyu

2024-01-17 ea058e1343bfbc3093eb2e6b8e0148a335cb511c

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java

@@ -81,7 +81,7 @@

    /**
     * 根据控制器编号获取控制器列表
     * @param controllerCode 控制器编号
     * @param rtuAddr 控制器地址
     * @return 符合条件的控制器列表
     */
    @Operation(summary = "获得控制器记录", description = "返回取控制器数据")
@@ -95,9 +95,9 @@
    })
    @GetMapping(path = "controller_list")
    @SsoAop()
    public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){
    public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
        try {
            List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>());
            List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
            if(list.size() <= 0) {
                return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
            }
@@ -126,17 +126,23 @@
    @PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
    @Transactional(rollbackFor = Exception.class)
    @SsoAop()
    public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
    //public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
    public BaseResponse<Boolean> add(@RequestBody @Valid PrController po, BindingResult bindingResult){
        if(bindingResult != null && bindingResult.hasErrors()){
            return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
        }

        PrController prController = DtoToPojo.INSTANCT.po2vo(po);
        //PrController prController = DtoToPojo.INSTANCT.po2vo(po);
        //Date operateTime = new Date();
        //prController.setOperatedt(operateTime);
        //prController.setDeleted((byte)0);
        //prController.setReporttime(operateTime);

        Date operateTime = new Date();
        prController.setOperatedt(operateTime);
        prController.setDeleted((byte)0);
        prController.setReporttime(operateTime);
        Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
        po.setOperateDt(operateTime);
        po.setDeleted((byte)0);
        po.setFindDt(operateTime);
        Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
        if(rec == 0) {
            return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
        }