From 55798c815327639fdc8f1874acf2ec543c596aa1 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 28 八月 2024 17:22:45 +0800
Subject: [PATCH] 优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 92 +++++++++++++++++++++++++++++++++-------------
1 files changed, 66 insertions(+), 26 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
index 6002806..e8a1df2 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrProject.controller;
+import com.alibaba.fastjson2.JSONArray;
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.support.ExcelTypeEnum;
import com.dy.common.aop.SsoAop;
@@ -43,13 +44,14 @@
@Slf4j
@Tag(name = "鎺у埗鍣ㄧ鐞�", description = "鎺у埗鍣ㄦ搷浣�")
@RestController
-@RequestMapping(path="controller")
+@RequestMapping(path = "controller")
@RequiredArgsConstructor
public class ControllerCtrl {
private final ControllerSv controllerSv;
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄥ垪琛�
+ *
* @param vo 鏌ヨ鏉′欢
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@@ -64,23 +66,24 @@
})
@GetMapping(path = "/getControllers")
@SsoAop()
- public BaseResponse<QueryResultVo<List<VoController>>> getControllers(QueryVo vo){
+ public BaseResponse<QueryResultVo<List<VoController>>> getControllers(QueryVo vo) {
try {
QueryResultVo<List<VoController>> res = controllerSv.getControllers(vo);
- if(res.itemTotal != null && res.itemTotal > 0) {
+ if (res.itemTotal != null && res.itemTotal > 0) {
return BaseResponseUtils.buildSuccess(res);
- }else {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
+ } else {
+ return BaseResponseUtils.buildSuccess(ProjectResultCode.NO_RECORDS.getMessage());
}
//return BaseResponseUtils.buildSuccess(res);
} catch (Exception e) {
- log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ log.error("鑾峰彇鎺у埗鍣ㄨ褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
+ *
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@@ -95,22 +98,23 @@
})
@GetMapping(path = "controller_list")
@SsoAop()
- public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr){
+ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr) {
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());
+ if (list.size() <= 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.NO_RECORDS.getMessage());
}
return BaseResponseUtils.buildSuccess(list);
} catch (Exception e) {
log.error("鏌ヨ鎺у埗鍣ㄥ紓甯�", e);
- return BaseResponseUtils.buildException(e.getMessage()) ;
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
/**
* 娣诲姞鎺у埗鍣�
- * @param po 鎺у埗鍣ㄥ疄浣撳璞�
+ *
+ * @param po 鎺у埗鍣ㄥ疄浣撳璞�
* @param bindingResult
* @return 娣诲姞鏄惁鎴愬姛
*/
@@ -127,9 +131,9 @@
@Transactional(rollbackFor = Exception.class)
@SsoAop()
//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());
+ public BaseResponse<Boolean> add(@RequestBody @Valid PrController po, BindingResult bindingResult) {
+ if (bindingResult != null && bindingResult.hasErrors()) {
+ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
//PrController prController = DtoToPojo.INSTANCT.po2vo(po);
@@ -140,17 +144,21 @@
Date operateTime = new Date();
po.setOperateDt(operateTime);
- po.setDeleted((byte)0);
+ po.setDeleted((byte) 0);
po.setFindDt(operateTime);
- Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
- if(rec == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
+ if (po.getAddWays() == null) {
+ po.setAddWays((byte) 1);
}
- return BaseResponseUtils.buildSuccess(true) ;
+ Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
+ if (rec == 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.CONTROLLER_FAIL.getMessage());
+ }
+ return BaseResponseUtils.buildSuccess(true);
}
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙峰垹闄ゆ帶鍒跺櫒
+ *
* @param map
* @return
*/
@@ -165,21 +173,51 @@
})
@PostMapping(path = "delete")
@SsoAop()
- public BaseResponse<Boolean> delete(@RequestBody Map map){
- if(map == null || map.size() <=0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.PLEASE_INPUT_CONTROLLER_ID.getMessage());
+ public BaseResponse<Boolean> delete(@RequestBody Map map) {
+ if (map == null || map.size() <= 0) {
+ 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());
+ if (recordCount == 0) {
+ return BaseResponseUtils.buildErrorMsg(ProjectResultCode.DELETE_CONTROLLER_FAIL.getMessage());
}
- return BaseResponseUtils.buildSuccess(true) ;
+ return BaseResponseUtils.buildSuccess(true);
+ }
+
+ /**
+ * 鑾峰彇鏈粦鎺у埗鍣ㄧ殑鍙栨按鍙ｅ垪琛�
+ *
+ * @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 = BaClient.class))}
+ )
+ })
+ @GetMapping(path = "nobinding_intakes")
+ @SsoAop()
+ public BaseResponse<JSONArray> getNoBindingIntakes() {
+ try {
+ JSONArray array = controllerSv.getNoBindingIntakes();
+// if (array.size() <= 0) {
+// return BaseResponseUtils.buildFail(ProjectResultCode.NO_BINDING_INTAKE.getMessage());
+// }
+ return BaseResponseUtils.buildSuccess(array);
+ } catch (Exception e) {
+ log.error("鏌ヨ鎺у埗鍣ㄥ紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
+ }
}
/**
* 瀵煎嚭鎺у埗鍣ㄥ垪琛�
+ *
* @param response
* @param vo
*/
@@ -206,4 +244,6 @@
String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
}
+
+
}
--
Gitblit v1.8.0