From 5eec83f601475c4b9c0a5819ac01ce55cb130bd0 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 02 一月 2024 20:31:52 +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/controller/ControllerCtrl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 ebf961a..d395513 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
@@ -3,11 +3,13 @@
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.pojoPr.PrController;
+import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrGlobal.voSe.VoActiveCard;
import com.dy.pipIrrProject.result.ProjectResultCode;
import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -19,12 +21,10 @@
import org.springframework.http.MediaType;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.Date;
+import java.util.List;
import java.util.Objects;
import java.util.Optional;
@@ -43,6 +43,38 @@
public class ControllerCtrl {
private final ControllerSv controllerSv;
+ @Operation(summary = "鑾峰緱涓�椤垫帶鍒跺櫒璁板綍", description = "杩斿洖涓�椤垫帶鍒跺櫒鏁版嵁")
+ @ApiResponses(value = {
+ @ApiResponse(
+ responseCode = ResultCodeMsg.RsCode.SUCCESS_CODE,
+ description = "杩斿洖涓�椤垫帶鍒跺櫒鏁版嵁锛圔aseResponse.content:QueryResultVo[{}]锛�",
+ content = {@Content(mediaType = MediaType.APPLICATION_JSON_VALUE,
+ schema = @Schema(implementation = VoActiveCard.class))}
+ )
+ })
+ @GetMapping(path = "/getControllers")
+ @SsoAop()
+ public BaseResponse<QueryResultVo<List<VoController>>> getControllers(QueryVo vo){
+ try {
+ QueryResultVo<List<VoController>> res = controllerSv.getControllers(vo);
+ if(res.itemTotal != null && res.itemTotal > 0) {
+ return BaseResponseUtils.buildSuccess(res);
+ }else {
+ return BaseResponseUtils.buildFail(ProjectResultCode.NO_RECORDS.getMessage());
+ }
+ //return BaseResponseUtils.buildSuccess(res);
+ } catch (Exception e) {
+ log.error("鑾峰彇寮�鍗¤褰曞紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage()) ;
+ }
+ }
+
+ /**
+ * 娣诲姞鎺у埗鍣�
+ * @param po 鎺у埗鍣ㄥ疄浣撳璞�
+ * @param bindingResult
+ * @return 娣诲姞鏄惁鎴愬姛
+ */
@Operation(summary = "娣诲姞鎺у埗鍣ㄨ褰�", description = "娣诲姞鎺у埗鍣ㄨ褰�")
@ApiResponses(value = {
@ApiResponse(
@@ -55,15 +87,18 @@
@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 PrController po, @Parameter(hidden = true) BindingResult bindingResult){
+ public BaseResponse<Boolean> add(@RequestBody @Valid DtoController po, BindingResult bindingResult){
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
}
+ PrController prController = DtoToPojo.INSTANCT.po2vo(po);
Date operateTime = new Date();
- po.setOperatedt(operateTime);
- po.setDeleted((byte)0);
- Integer rec = Optional.ofNullable(controllerSv.addController(po)).orElse(0);
+ 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());
}
--
Gitblit v1.8.0