From e3a585f2e592a96d2f5251db43af55abe6699970 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 15 十月 2024 17:58:29 +0800
Subject: [PATCH] 优化代码 控制器查询 最近未报数的取水口分页优化 取水口管理与测控一体阀合并
---
pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/controller/ControllerCtrl.java | 133 ++++++++++++++++++++++++++++++-------------
1 files changed, 92 insertions(+), 41 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 4f15979..c68002e 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,12 +1,14 @@
package com.dy.pipIrrProject.controller;
import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson2.JSONArray;
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.pojoBa.BaClient;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.voPr.VoController;
@@ -31,6 +33,7 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.util.*;
/**
@@ -43,13 +46,14 @@
@Slf4j
@Tag(name = "鎺у埗鍣ㄧ鐞�", description = "鎺у埗鍣ㄦ搷浣�")
@RestController
-@RequestMapping(path="controller")
+@RequestMapping(path = "controller")
@RequiredArgsConstructor
public class ControllerCtrl {
private final ControllerSv controllerSv;
/**
* 鏍规嵁鎸囧畾鏉′欢鑾峰彇鎺у埗鍣ㄥ垪琛�
+ *
* @param vo 鏌ヨ鏉′欢
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@@ -64,24 +68,25 @@
})
@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 controllerCode 鎺у埗鍣ㄧ紪鍙�
+ *
+ * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
* @return 绗﹀悎鏉′欢鐨勬帶鍒跺櫒鍒楄〃
*/
@Operation(summary = "鑾峰緱鎺у埗鍣ㄨ褰�", description = "杩斿洖鍙栨帶鍒跺櫒鏁版嵁")
@@ -95,22 +100,23 @@
})
@GetMapping(path = "controller_list")
@SsoAop()
- public BaseResponse<List<Map<String, Object>>> getControllersByCode(String controllerCode){
+ public BaseResponse<List<Map<String, Object>>> getControllersByCode(String rtuAddr) {
try {
- List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByCode(controllerCode)).orElse(new ArrayList<>());
- if(list.size() <= 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
+ List<Map<String, Object>> list = Optional.ofNullable(controllerSv.getControllersByAddr(rtuAddr)).orElse(new ArrayList<>());
+ 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 娣诲姞鏄惁鎴愬姛
*/
@@ -126,26 +132,35 @@
@PostMapping(path = "add", consumes = MediaType.APPLICATION_JSON_VALUE)
@Transactional(rollbackFor = Exception.class)
@SsoAop()
- public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ //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.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
- PrController prController = DtoToPojo.INSTANCT.po2vo(po);
+ //PrController prController = DtoToPojo.INSTANCT.po2vo(po);
+ //Date operateTime = new Date();
+ //prController.setOperatedt(operateTime);
+ //prController.setDeleted((byte)0);
+ //prController.setReporttime(operateTime);
+
Date operateTime = new Date();
- prController.setOperatedt(operateTime);
- prController.setDeleted((byte)0);
- prController.setOnlinestate((byte)2);
- prController.setReporttime(operateTime);
- Integer rec = Optional.ofNullable(controllerSv.addController(prController)).orElse(0);
- if(rec == 0) {
- return BaseResponseUtils.buildFail(ProjectResultCode.CONTROLLER_FAIL.getMessage());
+ po.setOperateDt(operateTime);
+ po.setDeleted((byte) 0);
+ po.setFindDt(operateTime);
+ 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
*/
@@ -160,36 +175,70 @@
})
@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
*/
@SneakyThrows(IOException.class)
@RequestMapping(value = "/export", method = RequestMethod.GET)
public void export(HttpServletResponse response, QueryVo vo) {
- setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
- //List<VoDivide> memberList = LocalJsonUtil.getListFromJson("json/members.json", VoDivide.class);
- List<VoController> memberList = controllerSv.export(vo);
+ //setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�");
+ List<VoController> controllerList = controllerSv.export(vo);
+ ExcelUtil.setExcelRespProp(response, "鎺у埗鍣ㄥ垪琛�" + LocalDate.now());
+ EasyExcel.write(response.getOutputStream(), VoController.class)
+ .registerWriteHandler(new CellWriteHandler("鎺у埗鍣ㄥ垪琛�"))
+ .sheet("鎺у埗鍣�")
+ .doWrite(controllerList);
- EasyExcel.write(response.getOutputStream())
- .head(VoController.class)
- .excelType(ExcelTypeEnum.XLSX)
- .sheet("鎺у埗鍣ㄥ垪琛�")
- .doWrite(memberList);
+ //EasyExcel.write(response.getOutputStream())
+ // .head(VoController.class)
+ // .excelType(ExcelTypeEnum.XLSX)
+ // .sheet("鎺у埗鍣ㄥ垪琛�")
+ // .doWrite(memberList);
}
/**
@@ -201,4 +250,6 @@
String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
}
+
+
}
--
Gitblit v1.8.0