From 82dcea603fc12698824ea44fef2fd8bfeb828656 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 26 九月 2023 18:16:30 +0800
Subject: [PATCH] 集成接口参数配置修改

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java |   64 ++++++++++++++++++++++++--------
 1 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
index 2360c4b..847c2c7 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/LifeCycleController.java
@@ -1,25 +1,29 @@
 package com.vci.ubcs.omd.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.vci.ubcs.omd.dto.LifeCycleDTO;
+import com.vci.ubcs.omd.entity.LifeCycleEvent;
 import com.vci.ubcs.omd.entity.LifeCycleRule;
 import com.vci.ubcs.omd.service.ILifeCycleService;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
+import com.vci.ubcs.omd.vo.LifeCycleEventVO;
 import com.vci.ubcs.omd.vo.LifeCycleVO;
 import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
-import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import com.vci.ubcs.starter.web.pagemodel.BladeQueryObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -38,18 +42,16 @@
 	 */
 	private final ILifeCycleService lifeCycleService;
 
+
 	/**
 	 * 鍒嗛〉鏌ヨ
 	 */
 	@GetMapping("page")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡",notes = "鍒嗛〉鏌ヨ鐢熷懡鍛ㄦ湡")
-	public R<IPage<LifeCycleVO>> page(BladeQueryObject baseQueryObject){
-		Map<String, Object> conditionMap = baseQueryObject.getConditionMap();
-		if (conditionMap == null){
-			conditionMap = new HashMap<>();
-		}
-		return R.data(lifeCycleService.listLife(conditionMap,baseQueryObject.getQuery()));
+	public R<IPage<LifeCycleVO>> page(@RequestParam Map<String, Object> conditionMap, Query query){
+
+		return R.data(lifeCycleService.listLife(conditionMap,query));
 	}
 
 
@@ -60,28 +62,50 @@
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "鏌ョ湅璇︽儏", notes = "鐢熷懡鍛ㄦ湡")
 	public R<LifeCycleVO> detail(LifeCycleDTO lifeCycleDTO){
-		LifeCycleRule lifeCycleRule = lifeCycleService.getOne(Condition.getQueryWrapper(BeanUtil.copy(lifeCycleDTO, LifeCycleRule.class)));
-		return R.data(LifeCycleRuleWrapper.build().entityVO(lifeCycleRule));
+		LifeCycleVO vo = lifeCycleService.detail(lifeCycleDTO);
+		return R.data(vo);
 	}
 
 	/**
-	 * 鏂板鎴栦慨鏀�
+	 * 鏂板
 	 */
 	@PostMapping("/submit")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
-	public R<LifeCycleVO> submit(@RequestBody LifeCycleDTO lifeCycleDTO){
+	@ApiOperation(value = "鏂板",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<LifeCycleVO> addSave(@RequestBody LifeCycleDTO lifeCycleDTO){
 		return R.data(lifeCycleService.addSave(lifeCycleDTO));
 	}
 
 	/**
-	 * 鏂板鎴栦慨鏀�
+	 * 淇敼
+	 */
+	@PutMapping("/edit-save")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "淇敼",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<LifeCycleVO> editSave(@RequestBody LifeCycleDTO lifeCycleDTO){
+		return R.data(lifeCycleService.editSave(lifeCycleDTO));
+	}
+
+
+
+	/**
+	 * 鏂板
 	 */
 	@PostMapping("/batch-submit")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐘舵�佹睜椤甸潰瀵硅薄")
-	public R<List<LifeCycleVO>> batchSubmit(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+	@ApiOperation(value = "鏂板鎴栦慨鏀�",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<List<LifeCycleVO>> batchAddSave(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
 		return R.data(lifeCycleService.batchAddSave(lifeCycleDTOs));
+	}
+
+	/**
+	 * 淇敼
+	 */
+	@PostMapping("/batch-edit-save")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "淇敼",notes = "浼犲叆鐢熷懡鍛ㄦ湡椤甸潰瀵硅薄")
+	public R<List<LifeCycleVO>> batchEditSave(@RequestBody List<LifeCycleDTO> lifeCycleDTOs){
+		return R.data(lifeCycleService.batchEditSave(lifeCycleDTOs));
 	}
 
 	/**
@@ -118,5 +142,13 @@
 		return R.data(lifeCycleService.listUses(lifeCycleDTO));
 	}
 
-
+	/**
+	 * 鍏ㄩ儴鐨勪簨浠�
+	 */
+	@GetMapping("page-event")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "鍏ㄩ儴鐨勪簨浠�",notes = "list鏌ヨ浜嬩欢")
+	public R<List<LifeCycleEventVO>> pageEvent(){
+		return R.data(lifeCycleService.listEventNoPage());
+	}
 }

--
Gitblit v1.9.3