From b00684f3ba2efa51f26f7dc0064066c52be19291 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 24 八月 2024 15:31:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
index 8e9cf64..b86ab56 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
@@ -1,16 +1,25 @@
package com.vci.web.controller;
+import com.vci.corba.common.PLException;
+import com.vci.dto.ClonePortalVIDTOList;
+import com.vci.dto.DeletePortalVIDTOList;
+import com.vci.dto.OsBtmTypeDTO;
import com.vci.dto.PortalVIDTO;
import com.vci.pagemodel.KeyValue;
import com.vci.pagemodel.PortalVIVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.annotation.log.VciBusinessLog;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.DataGrid;
+import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.enumpck.ItemDblEnum;
import com.vci.web.enumpck.ItemTypeEnum;
import com.vci.web.service.OsPortalVIServiceI;
import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,6 +32,12 @@
@RestController
@RequestMapping("/portalVIController")
public class WebPortalVIController {
+ /**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ @Autowired
private OsPortalVIServiceI portalVIServiceI;
/**
* 琛ㄥ崟鍒楄〃
@@ -31,24 +46,93 @@
* @param baseQueryObject 鏌ヨ鏉′欢
* @return 鍒楄〃鐨勫唴瀹�
*/
- @GetMapping( "/referDataGrid")
+ @GetMapping( "/gridPortalVIDatas")
@VciBusinessLog(operateName = "琛ㄥ崟/琛ㄦ牸鍒楄〃")
- public DataGrid<PortalVIVO> referDataGrid(BaseQueryObject baseQueryObject){
+ public DataGrid<PortalVIVO> gridPortalVIDatas(BaseQueryObject baseQueryObject){
return portalVIServiceI.gridPortalVIVOs(baseQueryObject);
}
+
+ /**
+ *鏍规嵁琛ㄥ崟id鑾峰彇鍏蜂綋鏁版嵁
+ * @param id
+ * @return
+ */
+ @GetMapping( "/getPortalVIById")
+ @VciBusinessLog(operateName = "鑾峰彇琛ㄥ崟/琛ㄦ牸鏁版嵁")
+ public BaseResult getPortalVIById(@RequestBody String id,@RequestBody String viType){
+ try{
+ PortalVIVO portalVIVO= portalVIServiceI.getPortalVIById(id,viType);
+ return BaseResult.success(portalVIVO);
+ }catch (Throwable e){
+ e.printStackTrace();
+ String exceptionMessage = "鍒涘缓涓氬姟绫诲瀷鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
/**
* 琛ㄥ崟/table淇濆瓨
* @param portalVIDTO
* @return
*/
@PostMapping("/savePortalVI")
- @VciBusinessLog(operateName = "娣诲姞琛ㄥ崟/琛ㄦ牸")
+ @VciBusinessLog(operateName = "淇濆瓨琛ㄥ崟/琛ㄦ牸")
public BaseResult savePortalVI(@RequestBody PortalVIDTO portalVIDTO){
if(StringUtils.isNotBlank(portalVIDTO.getId())){
- return portalVIServiceI.edit(portalVIDTO);
+ return portalVIServiceI.editSave(portalVIDTO);
}else{
- return portalVIServiceI.add(portalVIDTO);
+ return portalVIServiceI.addSave(portalVIDTO);
+ }
+
+ }
+ /**
+ * 涓氬姟绫诲瀷鍒犻櫎
+ * btmTypeDTO 涓氬姟绫诲瀷瀵硅薄
+ * @return 鍒犻櫎缁撴灉
+ */
+ @DeleteMapping("/delete")
+ @VciBusinessLog(operateName = "鍒犻櫎琛ㄥ崟/琛ㄦ牸")
+ public BaseResult delete(@RequestBody DeletePortalVIDTOList deletePortalVIDTOList){
+ try {
+ return portalVIServiceI.delete(deletePortalVIDTOList) ? BaseResult.success("鍒犻櫎鎴愬姛锛�"):BaseResult.fail("鍒犻櫎澶辫触锛�");
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+ /**
+ * 涓氬姟绫诲瀷鍒犻櫎
+ * btmTypeDTO 涓氬姟绫诲瀷瀵硅薄
+ * @return 鍒犻櫎缁撴灉
+ */
+ @DeleteMapping("/deleteByIds")
+ @VciBusinessLog(operateName = "鍒犻櫎琛ㄥ崟/琛ㄦ牸")
+ public BaseResult deleteByIds(@RequestBody String ids){
+ try {
+ return portalVIServiceI.delete(ids) ? BaseResult.success("鍒犻櫎鎴愬姛锛�"):BaseResult.fail("鍒犻櫎澶辫触锛�");
+ } catch (PLException e) {
+ e.printStackTrace();
+ String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+ /**
+ *
+ */
+ @PostMapping("/clone")
+ @VciBusinessLog(operateName = "鍒犻櫎琛ㄥ崟/琛ㄦ牸")
+ public BaseResult clone(@RequestBody ClonePortalVIDTOList portalVIDTOList){
+ try {
+ return portalVIServiceI.clone(portalVIDTOList) ? BaseResult.success("鍒犻櫎鎴愬姛锛�"):BaseResult.fail("鍒犻櫎澶辫触锛�");
+ } catch (Throwable e) {
+ e.printStackTrace();
+ String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
--
Gitblit v1.9.3