From 6a4f68b8f99dca3a00c297cbcff82c065575212c Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 16 八月 2025 11:25:20 +0800
Subject: [PATCH] 1、完善代码；2、作物去除lat属性，采用关联气象站的lat；3、project模块增加查询全部气象站的方法。
---
pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
index 39d892e..d278197 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-model/src/main/java/com/dy/pipIrrModel/crops/CropsCtrl.java
@@ -1,6 +1,7 @@
package com.dy.pipIrrModel.crops;
import com.dy.common.aop.SsoAop;
+import com.dy.common.util.DateTime;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
@@ -20,6 +21,7 @@
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
+import java.util.Date;
import java.util.List;
import java.util.Objects;
@@ -53,7 +55,7 @@
schema = @Schema(implementation = VoCrops.class))}
)
})
- @GetMapping(path = "one", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "one")
@SsoAop()
public BaseResponse<VoCrops> one(Long id){
return BaseResponseUtils.buildSuccess(this.sv.selectById(id));
@@ -71,9 +73,9 @@
schema = @Schema(implementation = VoCrops.class))}
)
})
- @PostMapping(path = "some", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "some")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoCrops>>> some(@RequestBody CropsQo qo){
+ public BaseResponse<QueryResultVo<List<VoCrops>>> some(CropsQo qo){
try {
QueryResultVo<List<VoCrops>> res = this.sv.selectSome(qo) ;
return BaseResponseUtils.buildSuccess(res);
@@ -82,7 +84,30 @@
return BaseResponseUtils.buildException(e.getMessage()) ;
}
}
-
+ /**
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈変綔鐗╂暟鎹�
+ * @return 鎵�鏈変綔鐗╂暟鎹�
+ */
+ @Operation(summary = "鑾峰緱鎵�鏈変綔鐗�", description = "杩斿洖鎵�鏈変綔鐗╂暟鎹�")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖鎵�鏈変綔鐗╂暟鎹紙BaseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoCrops.class))}
+ )
+ })
+ @GetMapping(path = "all")
+ @SsoAop()
+ public BaseResponse<List<VoCrops>> all(){
+ try {
+ List<VoCrops> res = this.sv.selectAll() ;
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ浣滅墿寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
/**
* 鏂板淇濆瓨浣滅墿
* @param po 鏂板淇濆瓨浣滅墿form琛ㄥ崟瀵硅薄
@@ -103,9 +128,17 @@
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- po.id = null ;
int count;
try {
+ po.id = null ;
+ po.createDt = new Date();
+ po.deleted = 0 ;
+ if(po.life4End != null && po.startDt != null && !po.startDt.trim().equals("")){
+ String nowYear = DateTime.yyyy() ;
+ String startDt = nowYear + "-" + po.startDt ;
+ String endDt = DateTime.nextXDay_yyyy_MM_dd(startDt, po.life4End) ;
+ po.endDt = endDt.substring(5, 10) ;
+ }
count = this.sv.save(po);
} catch (Exception e) {
log.error("淇濆瓨浣滅墿寮傚父", e);
@@ -140,6 +173,8 @@
if(po.id == null){
return BaseResponseUtils.buildFail("鏃犳暟鎹疄浣揑D") ;
}
+ po.createDt = null ;
+ po.deleted = null ;
int count;
try {
count = this.sv.update(po);
@@ -169,7 +204,7 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "delete", consumes = MediaType.TEXT_PLAIN_VALUE)
+ @GetMapping(path = "delete")
@SsoAop()
public BaseResponse<Boolean> delete(Long id){
if(id == null){
--
Gitblit v1.8.0