From 7f66dd2dee66a81df6ab999fc9daea3ac60a3642 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 20 一月 2025 13:52:44 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java | 217 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 152 insertions(+), 65 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
index cdb44cb..a1cf5ef 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeCtrl.java
@@ -1,15 +1,21 @@
package com.dy.pipIrrProject.intake;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.common.webUtil.ResultCodeMsg;
+import com.dy.pipIrrGlobal.excel.CellWriteHandler;
+import com.dy.pipIrrGlobal.excel.ExcelUtil;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
+import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
+import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
import com.dy.pipIrrGlobal.voSe.VoActiveCard;
+import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat;
+import com.dy.pipIrrProject.result.ProjectResultCode;
+import com.taobao.api.ApiException;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
@@ -31,11 +37,9 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
/**
* @author WuZeYu
@@ -47,14 +51,20 @@
@Slf4j
@Tag(name = "鍙栨按鍙ｇ鐞�", description = "鍙栨按鍙ｆ搷浣�")
@RestController
-@RequestMapping(path="intake")
+@RequestMapping(path = "intake")
@RequiredArgsConstructor
public class IntakeCtrl {
private final IntakeSv intakeSv;
+ @GetMapping("/test")
+ public String sendMessage(String message) throws ApiException {
+ return intakeSv.sendMessage(message);
+ }
+
/**
- * 瀹㈡埛绔姹傚緱鍒版墍鏈夊垎姘村彛鍚嶅瓧
- * @return 鎵�鏈夊垎姘村彛鍚嶅瓧
+ * 瀹㈡埛绔姹傚緱鍒版墍鏈夊彇姘村彛鍚嶅瓧
+ *
+ * @return 鎵�鏈夊彇姘村彛鍚嶅瓧
*/
@Operation(summary = "鑾峰緱鍏ㄩ儴鍙栨按鍙�", description = "杩斿洖鍏ㄩ儴鍙栨按鍙ｆ暟鎹�")
@ApiResponses(value = {
@@ -67,18 +77,23 @@
})
@GetMapping(path = "all")
@SsoAop()
- public BaseResponse<QueryResultVo<List<PrIntake>>> all(){
+ public BaseResponse<QueryResultVo<List<VoAllIntake>>> all() {
try {
- QueryResultVo<List<PrIntake>> res = this.intakeSv.selectAll();
- return BaseResponseUtils.buildSuccess(res);
+ QueryResultVo<List<VoAllIntake>> res = this.intakeSv.selectAll();
+ if (res == null) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
+ } 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 = "寰楀埌涓�涓彇姘村彛鏁版嵁")
@@ -90,10 +105,14 @@
schema = @Schema(implementation = PrIntake.class))}
)
})
- @GetMapping(path = "one/{id}")
+ @GetMapping(path = "one")
@SsoAop()
- public BaseResponse<PrIntake> one(@PathVariable("id") Long id){
- return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ public BaseResponse<VoAllIntake> one(@RequestParam("id") Long id) {
+ if (this.intakeSv.selectById(id) == null) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_INTAKES.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(this.intakeSv.selectById(id));
+ }
}
@Operation(summary = "鑾峰緱涓�椤靛彇姘村彛璁板綍", description = "杩斿洖涓�椤靛彇姘村彛鏁版嵁")
@@ -105,18 +124,14 @@
schema = @Schema(implementation = VoActiveCard.class))}
)
})
- @GetMapping(path = "getIntakes", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @GetMapping(path = "getIntakes")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(@RequestBody @Parameter(description = "鏌ヨform琛ㄥ崟json鏁版嵁", required = true) QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoIntake>>> getIntakes(QueryVo vo) {
try {
- QueryResultVo<List<VoIntake>> res = intakeSv.getIntakes(vo);
- if(res == null) {
- return BaseResponseUtils.buildFail("鏌ヨ澶辫触");
- }
- return BaseResponseUtils.buildSuccess(res);
+ return BaseResponseUtils.buildSuccess(intakeSv.getIntakes(vo));
} catch (Exception e) {
log.error("鑾峰彇鍙栨按鍙ｈ褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
@@ -132,23 +147,27 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid PrIntake po, @Parameter(hidden = true) BindingResult bindingResult){
+ 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());
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
-
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ List<Long> ids = intakeSv.getIntakeIdsByName(po.getName());
+ if (ids.size() > 0) {
+ 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("鏁版嵁搴撳瓨鍌ㄥけ璐�");
+ if (rec == 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.ADD_INTAKE_FAIL.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
}
/**
* 缂栬緫淇敼鍙栨按鍙�
+ *
* @param po 淇濆瓨鍙栨按鍙orm琛ㄥ崟瀵硅薄
* @return 鏄惁鎴愬姛
*/
@@ -163,29 +182,60 @@
})
@PostMapping(path = "update", consumes = MediaType.APPLICATION_JSON_VALUE)
@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());
+ 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.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ List<Long> ids = intakeSv.getIntakeIdByNameExcludeId(po.getId(), po.getName());
+ if (ids.size() > 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.INTAKE_NAME_EXIST.getMessage());
}
int count;
- Date operateTime = new Date();
- po.setOperateDt(operateTime);
+ po.setOperateDt(new Date());
try {
count = this.intakeSv.update(po);
} catch (Exception e) {
- log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ log.error("淇濆瓨鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ if (count <= 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
+ }
+
+ /**
+ * app淇敼鍙栨按鍙ｇ粡绾害
+ * @param po
+ * @param bindingResult
+ * @return
+ */
+ @PostMapping(path = "updateIntakeLngLat", consumes = MediaType.APPLICATION_JSON_VALUE)
+ @SsoAop()
+ public BaseResponse<Boolean> updateIntakeLngLat(@RequestBody @Parameter(description = "form琛ㄥ崟json鏁版嵁", required = true) @Valid IntakeUpdateLngLat po, @Parameter(hidden = true) BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ int count;
+ po.setOperateDt(new Date());
+ try {
+ count = this.intakeSv.updateIntakeLngLat(po);
+ } catch (Exception e) {
+ log.error("淇濆瓨鍙栨按鍙ｇ粡绾害寮傚父", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ if (count <= 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.UPDATE_INTAKE.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
}
}
/**
* 鍒犻櫎鍙栨按鍙�
- * @param id 鍙栨按鍙D
+ *
+ * @param map 鍙栨按鍙D
* @return 鏄惁鎴愬姛
*/
@Operation(summary = "鍒犻櫎鍒嗘按鍙�", description = "鎻愪氦鍙栨按鍙D锛岃繘琛岄�昏緫鍒犻櫎")
@@ -197,47 +247,49 @@
schema = @Schema(implementation = Boolean.class))}
)
})
- @GetMapping(path = "delete/{id}")
+ @PostMapping(path = "delete")
@SsoAop()
- public BaseResponse<Boolean> delete(@PathVariable("id") Long id){
- if(id == null){
- return BaseResponseUtils.buildFail("id涓嶈兘涓虹┖") ;
+ public BaseResponse<Boolean> delete(@RequestBody Map map) {
+ if (map == null || map.size() <= 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.PLEASE_INPUT_INTAKE_ID.getMessage());
}
- int count;
+ Long id = Long.parseLong(map.get("id").toString());
try {
- count = this.intakeSv.delete(id);
+ //鍙栨按鍙D
+ Integer recordCount = Optional.ofNullable(intakeSv.delete(id)).orElse(0);
+ if (recordCount == 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_INTAKE_FAIL.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(true);
+ }
} catch (Exception e) {
log.error("淇濆瓨鍒嗘按鍙ｅ紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
- }
- if(count <= 0){
- return BaseResponseUtils.buildFail("鏁版嵁搴撳瓨鍌ㄥけ璐�") ;
- }else{
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 瀵煎嚭鍙栨按鍙ｅ垪琛�
+ *
* @param response
* @param vo
*/
@SneakyThrows(IOException.class)
@GetMapping(value = "exportIntakes")
+ @SsoAop()
public void exportIntakes(HttpServletResponse response, QueryVo vo) {
- setExcelRespProp(response, "鍙栨按鍙ｅ垪琛�");
- //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
- List<VoIntake> memberList = intakeSv.exportIntakes(vo);
+ List<VoIntake> intakeList = intakeSv.exportIntakes(vo);
- EasyExcel.write(response.getOutputStream())
- .head(VoIntake.class)
- .excelType(ExcelTypeEnum.XLSX)
- .sheet("鍙栨按鍙ｅ垪琛�")
- .doWrite(memberList);
+ ExcelUtil.setExcelRespProp(response, "鍙栨按鍙ｅ垪琛�" + LocalDate.now());
+ EasyExcel.write(response.getOutputStream(), VoIntake.class)
+ .registerWriteHandler(new CellWriteHandler("鍙栨按鍙ｅ垪琛�"))
+ .sheet("鍙栨按鍙�")
+ .doWrite(intakeList);
}
/**
* 瀵煎叆鍙栨按鍙ｅ垪琛�
+ *
* @param file
*/
@SneakyThrows
@@ -248,7 +300,7 @@
.head(VoIntake.class)
.sheet()
.doReadSync();
- return BaseResponseUtils.buildSuccess(memberList) ;
+ return BaseResponseUtils.buildSuccess(memberList);
}
/**
@@ -260,4 +312,39 @@
String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
}
+
+ /**
+ * 姝ゅ姛鑳藉凡缍撶Щ妞嶅埌remote妯″鐨凪onitroCtrl涓�
+ * 鑾峰彇鍙栨按鍙ｅ垪琛紙鍦ㄧ嚎鍜屼笉鍦ㄧ嚎锛�
+ * @param qo
+ * @return
+ @GetMapping(path = "all_intakes")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoOnLineIntake>>> getAllIntakes(OnLineIntakesQO qo) {
+ try {
+ QueryResultVo<List<VoOnLineIntake>> res = intakeSv.selectOnLineIntakes(qo);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
+ */
+ /**
+ * 鏍规嵁鎿嶄綔鍛樿幏鍙栧父鐢ㄥ彇姘村彛锛堝湪绾垮拰涓嶅湪绾匡級
+ *
+ * @param operator
+ * @return
+ */
+ @GetMapping(path = "used_intakes")
+ @SsoAop()
+ public BaseResponse<List<VoOnLineIntake>> getUsedIntakes(Long operator) {
+ try {
+ List<VoOnLineIntake> res = intakeSv.getUsedIntakes(operator);
+ return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鏌ヨ鍙栨按鍙ｅ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
+ }
}
--
Gitblit v1.8.0