pipIrr-SV.git - Gitblit

			@@ -68,7 +68,11 @@
			public BaseResponse<QueryResultVo<List<VoDivide>>> getDivides(QueryVo vo){
			try {
			QueryResultVo<List<VoDivide>> res = divideSv.getDivides(vo);
			return BaseResponseUtils.buildSuccess(res);
			if(res.itemTotal != null && res.itemTotal > 0) {
			return BaseResponseUtils.buildSuccess(res);
			}else {
			return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
			}
			} catch (Exception e) {
			log.error("获取开卡记录异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;
			@@ -94,7 +98,11 @@
			public BaseResponse<PrDivide> getOneDivide(@PathVariable("id") Long id){
			try {
			PrDivide res = divideSv.getOneDivide(id);
			return BaseResponseUtils.buildSuccess(res);
			if(res != null) {
			return BaseResponseUtils.buildSuccess(res);
			}else {
			return BaseResponseUtils.buildFail(ProjectResultCode.NO_DIVIDES.getMessage());
			}
			} catch (Exception e) {
			log.error("查询农户异常", e);
			return BaseResponseUtils.buildException(e.getMessage()) ;
			@@ -153,7 +161,7 @@

			/**
			* 根据分水房ID逻辑删除分水房
			* @param id
			* @param map
			* @return
			*/
			@Operation(summary = "删除一个分水房", description = "删除一个分水房数据")
			@@ -166,14 +174,19 @@
			)
			})

			@GetMapping(path = "/delone/{id}")
			//@GetMapping(path = "/delone/{id}")
			@PostMapping(path = "delete", consumes = MediaType.APPLICATION_JSON_VALUE)
			@SsoAop()
			public BaseResponse<Boolean> deleteDivideById(@PathVariable("id") Long id){
			public BaseResponse<Boolean> deleteDivideById(@RequestBody Map map){
			Long id = Optional.ofNullable(Long.parseLong(map.get("id").toString())).orElse(0L);
			if(id == 0)
			return BaseResponseUtils.buildException(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());

			try {
			Integer res = Optional.ofNullable(divideSv.deleteDivideById(id)).orElse(0);
			if(res == 0) {
			return BaseResponseUtils.buildFail("分水房删除失败");
			}
			if(res == 0)
			return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_DIVIDE_FAIL.getMessage());

			return BaseResponseUtils.buildSuccess(true);
			} catch (Exception e) {
			log.error("删除分水房异常", e);