From 889842eb8b64a0b72c449ce23ff21e4e8c935cae Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 26 七月 2024 16:06:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java | 89 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 16 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
index 99f46f6..df34042 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmPwdStrategyQueryController.java
@@ -1,16 +1,17 @@
package com.vci.frameworkcore.controller;
+import com.vci.dto.SmPasswordStrategyDTO;
import com.vci.frameworkcore.compatibility.SmPwdStrategyQueryServiceI;
-import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.pagemodel.SmPasswordStrategyVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
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.util.Func;
-import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
@@ -25,7 +26,6 @@
*/
@RestController
@RequestMapping("/passwordStrategyQueryController")
-@Slf4j
public class SmPwdStrategyQueryController {
/**
@@ -35,22 +35,26 @@
private SmPwdStrategyQueryServiceI pwdStrategyQueryService;
/**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
+
+ /**
* 瀵嗙爜瀹夊叏绛栫暐鐨勫垪琛ㄥ弬鐓ф煡璇�
* @param queryObject 鏌ヨ鏉′欢
* @return
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
- @VciUnCheckRight
public BaseResult<SmPasswordStrategyVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
try {
DataGrid<SmPasswordStrategyVO> pwdStrategyVODataGrid = pwdStrategyQueryService.refDataGrid(queryObject.getConditionMap(),queryObject.getPageHelper());
return BaseResult.dataGrid(pwdStrategyVODataGrid);
}catch (Exception e) {
e.printStackTrace();
- String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
- log.error("瀵嗙爜瀹夊叏绛栫暐鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
- return BaseResult.fail("瀵嗙爜瀹夊叏绛栫暐鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = "瀵嗙爜瀹夊叏绛栫暐鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -61,16 +65,15 @@
* @throws VciBaseException
*/
@RequestMapping(value = "/selectPwdStrategyMap",method = RequestMethod.GET)
- @VciUnCheckRight
public BaseResult<List<Map<String,String>>> selectPwdStrategyMap(BaseQueryObject queryObject) throws VciBaseException {
try {
List<Map<String,String>> pwdStrategyVODataGrid = pwdStrategyQueryService.selectPwdStrategyMap(queryObject.getConditionMap());
return BaseResult.dataList(pwdStrategyVODataGrid);
}catch (Exception e) {
e.printStackTrace();
- String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
- log.error("瀵嗙爜瀹夊叏绛栫暐涓嬫媺鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
- return BaseResult.fail("瀵嗙爜瀹夊叏绛栫暐涓嬫媺鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = "瀵嗙爜瀹夊叏绛栫暐涓嬫媺鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -87,9 +90,63 @@
? BaseResult.success("涓虹敤鎴疯缃瘑鐮佸畨鍏ㄧ瓥鐣ユ垚鍔燂紒"):BaseResult.fail("涓虹敤鎴疯缃瘑鐮佸畨鍏ㄧ瓥鐣ュけ璐ワ紒");
}catch (Exception e){
e.printStackTrace();
- String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
- log.error("涓虹敤鎴疯缃瘑鐮佸畨鍏ㄧ瓥鐣ユ椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
- return BaseResult.fail("涓虹敤鎴疯缃瘑鐮佸畨鍏ㄧ瓥鐣ユ椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
+ String exceptionMessage = "涓虹敤鎴疯缃瘑鐮佸畨鍏ㄧ瓥鐣ユ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 鏂板瀵嗙爜绛栫暐
+ * @param smPasswordStrategyDTO
+ * @return
+ */
+ @RequestMapping(value = "/addPasswordStrateg",method = RequestMethod.POST)
+ public BaseResult addPasswordStrateg(@RequestBody SmPasswordStrategyDTO smPasswordStrategyDTO){
+ try {
+ return pwdStrategyQueryService.addPasswordStrateg(smPasswordStrategyDTO)
+ ? BaseResult.success("鏂板瀵嗙爜瀹夊叏绛栫暐鎴愬姛锛�"):BaseResult.fail("鏂板瀵嗙爜瀹夊叏绛栫暐澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "鏂板瀵嗙爜瀹夊叏绛栫暐鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 淇敼瀵嗙爜绛栫暐
+ * @param smPasswordStrategyDTO
+ * @return
+ */
+ @RequestMapping(value = "/updatePasswordStrateg",method = RequestMethod.PUT)
+ public BaseResult updatePasswordStrateg(@RequestBody SmPasswordStrategyDTO smPasswordStrategyDTO){
+ try {
+ return pwdStrategyQueryService.updatePasswordStrateg(smPasswordStrategyDTO)
+ ? BaseResult.success("淇敼瀵嗙爜瀹夊叏绛栫暐鎴愬姛锛�"):BaseResult.fail("淇敼瀵嗙爜瀹夊叏绛栫暐澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "淇敼瀵嗙爜瀹夊叏绛栫暐鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" +VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+ /**
+ * 鍒犻櫎瀵嗙爜绛栫暐
+ * @param pwdIds
+ * @return
+ */
+ @RequestMapping(value = "/delPasswordStrateg",method = RequestMethod.DELETE)
+ public BaseResult delPasswordStrateg(String[] pwdIds){
+ try {
+ return pwdStrategyQueryService.delPasswordStrateg(pwdIds)
+ ? BaseResult.success("鍒犻櫎瀵嗙爜瀹夊叏绛栫暐鎴愬姛锛�"):BaseResult.fail("鍒犻櫎瀵嗙爜瀹夊叏绛栫暐澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "鍒犻櫎瀵嗙爜瀹夊叏绛栫暐鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
--
Gitblit v1.9.3