pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -102,7 +102,7 @@ try { List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>()); if (list.size() <= 0) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_RECORDS.getMessage()); } return BaseResponseUtils.buildSuccess(list); } catch (Exception e) { @@ -133,7 +133,7 @@ //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()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } //PrController prController = DtoToPojo.INSTANCT.po2vo(po); @@ -151,7 +151,7 @@ } Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0); if (rec == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.CONTROLLER_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true); } @@ -175,13 +175,13 @@ @SsoAop() public BaseResponse<Boolean> delete(@RequestBody Map map) { if (map == null || map.size() <= 0) { return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_CONTROLLER_ID.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_CONTROLLER_ID.getMessage()); } Long controllerId = Long.parseLong(map.get("controllerId").toString()); Integer recordCount = Optional.ofNullable(controllerSv.deleteControllerById(controllerId)).orElse(0); if (recordCount == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_CONTROLLER_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_CONTROLLER_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true); } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/divide/DivideCtrl.java
@@ -101,7 +101,7 @@ if(res != null) { return BaseResponseUtils.buildSuccess(res); }else { return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_DIVIDES.getMessage()); } } catch (Exception e) { log.error("查询农户异常", e); @@ -129,7 +129,7 @@ @SsoAop() public BaseResponse<Boolean> add(@RequestBody @Valid DtoDivide po, BindingResult bindingResult){ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } // 接收村编号（主键） Long villageId = po.getVillageId(); @@ -142,7 +142,7 @@ */ Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap()); if(map_districts.size() <= 0) { return BaseResponseUtils.buildFail("区划信息有误"); return BaseResponseUtils.buildErrorMsg("区划信息有误"); } Long countryId = Long.parseLong(map_districts.get("countryId").toString()); Long townId = Long.parseLong(map_districts.get("townId").toString()); @@ -155,7 +155,7 @@ prDivide.setDeleted((byte)0); Integer rec = Optional.ofNullable(divideSv.addDivide(prDivide)).orElse(0); if(rec == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.DIVIDE_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DIVIDE_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true) ; } @@ -186,7 +186,7 @@ try { Integer res = Optional.ofNullable(divideSv.deleteDivideById(id)).orElse(0); if(res == 0) return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage()); return BaseResponseUtils.buildSuccess(true); } catch (Exception e) { @@ -215,7 +215,7 @@ @SsoAop() public BaseResponse<Boolean> update(@RequestBody @Valid DtoDivide po, BindingResult bindingResult){ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } // 接收村编号（主键） @@ -229,7 +229,7 @@ */ Map map_districts = Optional.ofNullable(divideSv.getDistrictsByVillageId(villageId)).orElse(new HashMap()); if(map_districts.size() <= 0) { return BaseResponseUtils.buildFail("区划信息有误"); return BaseResponseUtils.buildErrorMsg("区划信息有误"); } Long countryId = Long.parseLong(map_districts.get("countryId").toString()); Long townId = Long.parseLong(map_districts.get("townId").toString()); @@ -242,7 +242,7 @@ Integer rec = Optional.ofNullable(divideSv.updateByPrimaryKey(prDivide)).orElse(0); if(rec == 0) { return BaseResponseUtils.buildFail("分水房修改失败"); return BaseResponseUtils.buildErrorMsg("分水房修改失败"); } return BaseResponseUtils.buildSuccess(true) ; } pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -78,7 +78,7 @@ try { QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll(); if (res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage()); } else { return BaseResponseUtils.buildSuccess(res); } @@ -106,7 +106,7 @@ @SsoAop() public BaseResponse<PrIntake> one(@PathVariable("id") Long id) { if (this.intakeSv.selectById(id) == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage()); } else { return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id)); } @@ -127,7 +127,7 @@ try { QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo); if (res == null) { return BaseResponseUtils.buildFail(ProjectResultCode.NO_INTAKES.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage()); } return BaseResponseUtils.buildSuccess(res); } catch (Exception e) { @@ -151,17 +151,17 @@ public BaseResponse<Boolean> add(@RequestBody @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) { DateTimeFormatter dtf = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); if (bindingResult != null && bindingResult.hasErrors()) { return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } List<Long> ids = intakeSv.getIntakeIdsByName(po.getName()); if (ids.size() > 0) { return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage()); } po.setOperateDt(new Date()); po.setDeleted((byte) 0); Integer rec = Optional.ofNullable(intakeSv.addIntake(po)).orElse(0); if (rec == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.ADD_INTAKE_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_INTAKE_FAIL.getMessage()); } return BaseResponseUtils.buildSuccess(true); } @@ -185,11 +185,11 @@ @SsoAop() public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form表单json数据", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult) { if (bindingResult != null && bindingResult.hasErrors()) { return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName()); if (ids.size() > 0) { return BaseResponseUtils.buildFail(ProjectResultCode.INTAKE_NAME_EXIST.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage()); } int count; po.setOperateDt(new Date()); @@ -200,7 +200,7 @@ return BaseResponseUtils.buildException(e.getMessage()); } if (count <= 0) { return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_INTAKE.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage()); } else { return BaseResponseUtils.buildSuccess(true); } @@ -225,14 +225,14 @@ @SsoAop() public BaseResponse<Boolean> delete(@RequestBody Map map) { if (map == null || map.size() <= 0) { return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage()); } Long id = Long.parseLong(map.get("id").toString()); try { //取水口ID Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0); if (recordCount == 0) { return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()); return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage()); } else { return BaseResponseUtils.buildSuccess(true); } pipIrr-platform/pipIrr-web/pipIrr-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -100,18 +100,15 @@ @PostMapping(path = "loginJson", consumes = MediaType.APPLICATION_JSON_VALUE) public BaseResponse<UserVo> loginJson(@RequestBody @Parameter(description = "登录json数据", required = true) @Valid LoginVo vo, @Parameter(hidden = true) BindingResult bindingResult) { if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } if(vo.phone == null || vo.phone.trim().length() == 0){ return BaseResponseUtils.buildFail("手机号不能为空"); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } if(!vo.phone.equals("admin")){ if(vo.phone.length() != 11){ return BaseResponseUtils.buildFail("手机号（长度不是11位）不正确"); return BaseResponseUtils.buildErrorMsg("手机号（长度不是11位）不正确"); } } if(vo.orgTag == null || vo.orgTag.trim().length() == 0){ return BaseResponseUtils.buildFail("未选择组织单位"); return BaseResponseUtils.buildErrorMsg("未选择组织单位"); } //把组织单位标签作为数据源名称 DataSourceContext.set(vo.orgTag); @@ -119,7 +116,7 @@ //得到所有用户账号 List<String> phones = sv.getPhones(); if(!phones.contains(vo.phone)){ return BaseResponseUtils.buildFail("账号不存在"); return BaseResponseUtils.buildErrorMsg("账号不存在"); } String uuid ; @@ -145,7 +142,7 @@ uVo.token = uuid ; return BaseResponseUtils.buildSuccess(uVo); }else{ return BaseResponseUtils.buildFail("密码错误"); return BaseResponseUtils.buildErrorMsg("密码错误"); } } @@ -166,10 +163,10 @@ @PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public BaseResponse<UserVo> loginForm(@Parameter(description = "form表单数据", required = true) @Valid LoginVo vo, @Parameter(hidden = true) BindingResult bindingResult){ if(bindingResult != null && bindingResult.hasErrors()){ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } if(vo.orgTag == null || vo.orgTag.trim().length() == 0){ return BaseResponseUtils.buildFail("未选择组织单位"); return BaseResponseUtils.buildErrorMsg("未选择组织单位"); } //把组织单位标签作为数据源名称 DataSourceContext.set(vo.orgTag); @@ -197,7 +194,7 @@ uVo.token = uuid ; return BaseResponseUtils.buildSuccess(uVo); }else{ return BaseResponseUtils.buildFail("登录失败"); return BaseResponseUtils.buildErrorMsg("登录失败"); } } @@ -222,7 +219,7 @@ this.sv.logout(token) ; return BaseResponseUtils.buildSuccess(true); }else{ return BaseResponseUtils.buildFail("未从header中得到token"); return BaseResponseUtils.buildErrorMsg("未从header中得到token"); } }
