From 0eaef592517ced667ed16413f9d22ab677915101 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 02 四月 2024 11:24:53 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringCtrl.java | 115 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 64 insertions(+), 51 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringCtrl.java
index c30ad63..b58b548 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowMonitoringCtrl.java
@@ -36,13 +36,14 @@
@Slf4j
@Tag(name = "娴侀噺鐩戞祴绔欑鐞�", description = "娴侀噺鐩戞祴绔欐搷浣�")
@RestController
-@RequestMapping(path="flow_monitoring")
+@RequestMapping(path = "flow_monitoring")
@RequiredArgsConstructor
public class FlowMonitoringCtrl {
private final FlowMonitoringSv flowMonitoringSv;
/**
* 娣诲姞绠＄綉娴侀噺鐩戞祴绔�
+ *
* @param po
* @param bindingResult
* @return
@@ -58,38 +59,45 @@
})
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid PrFlowMonitoring po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
+ public BaseResponse<Boolean> add(@RequestBody @Valid PrFlowMonitoring po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
Long villageId = po.getVillageid();
-
- /**
- * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
- */
- Map map_districts = Optional.ofNullable(flowMonitoringSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if(map_districts.size() <= 0) {
- return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ if (villageId != null) {
+ /**
+ * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
+ */
+ Map map_districts = Optional.ofNullable(flowMonitoringSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
+ if (map_districts.size() <= 0) {
+ return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ }
+ Long countryId = Long.parseLong(map_districts.get("countryId").toString());
+ Long townId = Long.parseLong(map_districts.get("townId").toString());
+ po.setCountyid(countryId);
+ po.setTownid(townId);
}
-
- Long countryId = Long.parseLong(map_districts.get("countryId").toString());
- Long townId = Long.parseLong(map_districts.get("townId").toString());
- po.setCountyid(countryId);
- po.setTownid(townId);
+ if (po.getName() == null){
+ return BaseResponseUtils.buildFail("鐩戞祴绔欏悕绉颁笉鑳戒负绌�");}
+ if (po.getName().length()>25||po.getName().length()<1){
+ return BaseResponseUtils.buildFail("25>鐩戞祴绔欏悕绉�>1");}
+ if (po.getLat()== null||po.getLng()== null){
+ return BaseResponseUtils.buildFail("缁忕含搴︿笉鑳戒负绌�");}
Date operateTime = new Date();
po.setOperatedt(operateTime);
- po.setDeleted((byte)0);
+ po.setDeleted((byte) 0);
Integer rec = Optional.ofNullable(flowMonitoringSv.addFlowMonitoring(po)).orElse(0);
- if(rec == 0) {
+ if (rec == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.FLOW_MONITORING_FAIL.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
* 鍒犻櫎娴侀噺鐩戞祴绔�
+ *
* @param map
* @return
*/
@@ -104,21 +112,22 @@
})
@PostMapping(path = "delete")
@SsoAop()
- public BaseResponse<Boolean> delete(@RequestBody Map map){
- if(map == null || map.size() <=0) {
+ public BaseResponse<Boolean> delete(@RequestBody Map map) {
+ if (map == null || map.size() <= 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_FLOW_MONITORING_ID.getMessage());
}
Long flowMonitoringId = Long.parseLong(map.get("flowMonitoringId").toString());
Integer recordCount = Optional.ofNullable(flowMonitoringSv.deleteFlowMonitoring(flowMonitoringId)).orElse(0);
- if(recordCount == 0) {
+ if (recordCount == 0) {
return BaseResponseUtils.buildFail(ProjectResultCode.DELETE_FLOW_MONITORING_FAIL.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
* 缂栬緫淇敼鐩戞祴绔�
+ *
* @param po 淇濆瓨鐩戞祴绔檉orm琛ㄥ崟瀵硅薄
* @return 鏄惁鎴愬姛
*/
@@ -133,42 +142,46 @@
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@SsoAop()
- public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrFlowMonitoring po, @Parameter(hidden = true) BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
+ public BaseResponse<Boolean> update(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrFlowMonitoring po, @Parameter(hidden = true) BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
// 鎺ユ敹鏉戠紪鍙凤紙涓婚敭锛�
Long villageId = po.getVillageid();
- /**
- * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
- */
- Map map_districts = Optional.ofNullable(flowMonitoringSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
- if(map_districts.size() <= 0) {
- return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ if (villageId != null) {
+ /**
+ * 鑾峰彇5绾ц鏀垮尯鍒掍俊鎭�
+ */
+ Map map_districts = Optional.ofNullable(flowMonitoringSv.getDistrictsByVillageId(villageId)).orElse(new HashMap());
+ if (map_districts.size() <= 0) {
+ return BaseResponseUtils.buildFail("鍖哄垝淇℃伅鏈夎");
+ }
+ Long countryId = Long.parseLong(map_districts.get("countryId").toString());
+ Long townId = Long.parseLong(map_districts.get("townId").toString());
+ po.setCountyid(countryId);
+ po.setTownid(townId);
}
- Long countryId = Long.parseLong(map_districts.get("countryId").toString());
- Long townId = Long.parseLong(map_districts.get("townId").toString());
- po.setCountyid(countryId);
- po.setTownid(townId);
+
int count;
Date operateTime = new Date();
po.setOperatedt(operateTime);
- po.setDeleted((byte)0);
+ po.setDeleted((byte) 0);
try {
count = this.flowMonitoringSv.update(po);
} catch (Exception e) {
log.error("淇濆瓨鐩戞祴绔欏紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
- if(count <= 0){
- return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_FLOW_MONITORING_FAIL.getMessage()) ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ if (count <= 0) {
+ return BaseResponseUtils.buildFail(ProjectResultCode.UPDATE_FLOW_MONITORING_FAIL.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 瀹㈡埛绔姹傚緱鍒版墍鏈夌洃娴嬬珯鍚嶅瓧
+ *
* @return 鎵�鏈夌洃娴嬬珯鍚嶅瓧
*/
@Operation(summary = "鑾峰緱鍏ㄩ儴鐩戞祴绔�", description = "杩斿洖鍏ㄩ儴鐩戞祴绔欐暟鎹�")
@@ -182,22 +195,23 @@
})
@GetMapping(path = "all")
@SsoAop()
- public BaseResponse<QueryResultVo<List<PrFlowMonitoring>>> all(){
+ public BaseResponse<QueryResultVo<List<PrFlowMonitoring>>> all() {
try {
QueryResultVo<List<PrFlowMonitoring>> res = this.flowMonitoringSv.selectAll();
- if(res == null) {
+ if (res == null) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOW_MONITORINGS.getMessage());
- }else {
+ } else {
return BaseResponseUtils.buildSuccess(res);
}
} catch (Exception e) {
log.error("鏌ヨ鐩戞祴绔欏紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 寰楀埌涓�涓洃娴嬬珯鏁版嵁
+ *
* @return 涓�涓洃娴嬬珯鏁版嵁
*/
@Operation(summary = "涓�涓洃娴嬬珯", description = "寰楀埌涓�涓洃娴嬬珯鏁版嵁")
@@ -211,10 +225,10 @@
})
@GetMapping(path = "one/{id}")
@SsoAop()
- public BaseResponse<PrFlowMonitoring> one(@PathVariable("id") Long id){
- if(this.flowMonitoringSv.selectById(id) == null) {
+ public BaseResponse<PrFlowMonitoring> one(@PathVariable("id") Long id) {
+ if (this.flowMonitoringSv.selectById(id) == null) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOW_MONITORINGS.getMessage());
- }else {
+ } else {
return BaseResponseUtils.buildSuccess(this.flowMonitoringSv.selectById(id));
}
}
@@ -230,19 +244,18 @@
})
@GetMapping(path = "getFlowMonitoring")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoFlowMonitoring>>> getFlowMonitoring(QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoFlowMonitoring>>> getFlowMonitoring(QueryVo vo) {
try {
QueryResultVo<List<VoFlowMonitoring>> res = flowMonitoringSv.getPrFlowMonitorings(vo);
- if(res == null) {
+ if (res == null) {
return BaseResponseUtils.buildFail(ProjectResultCode.NO_FLOW_MONITORINGS.getMessage());
}
return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
log.error("鑾峰彇鐩戞祴绔欒褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
-
}
--
Gitblit v1.8.0