From c7cef19248eb9bb6a5420a48d1b26167ff7db858 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 27 六月 2024 17:58:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 125 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 114 insertions(+), 11 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
index 570a070..15de3d6 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
@@ -1,14 +1,15 @@
package com.vci.frameworkcore.controller;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
+import com.vci.frameworkcore.model.dto.SmUserDTO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
+import com.vci.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -17,8 +18,9 @@
* @author weidy
* @date 2020/3/4
*/
-@Controller
+@RestController
@RequestMapping("/userQueryController")
+@Slf4j
public class SmUserQueryController {
/**
@@ -34,7 +36,6 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
- @ResponseBody
public BaseResult<SmUserVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
//浠ｇ爜绀轰緥
if(queryObject == null){
@@ -53,7 +54,6 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refTree",method = RequestMethod.GET)
- @ResponseBody
public BaseResult<Tree> refTree(TreeQueryObject treeQueryObject) throws VciBaseException{
List<Tree> userTreeList = userQueryService.refTreeUsers(treeQueryObject);
return BaseResult.tree(userTreeList);
@@ -69,13 +69,12 @@
* @throws VciBaseException 閮ㄩ棬涓婚敭涓虹┖銆佹煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGridByPkDepartment",method = RequestMethod.GET)
- @ResponseBody
public BaseResult<SmUserVO> refDataGridByPkDepartment(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
if(queryObject == null){
queryObject = new BaseQueryObject();
}
DataGrid<SmUserVO> userVODataGrid = userQueryService.gridUserByDeptOid(pkDepartment, queryObject.getConditionMap(), queryObject.getPageHelper());
- return BaseResult.dataGrid(userVODataGrid);
+ return BaseResult.dataGrid(userVODataGrid);
//濡傛灉鏄�佺殑椤圭洰锛屽簲璇ュ湪gridUserByDeptOid涓婃坊鍔爐ry锛宑atch锛岀劧鍚巆atch閲屽簲璇ヤ娇鐢ㄤ笅闈㈢殑浠ｇ爜
//BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�");
}
@@ -88,7 +87,6 @@
* @throws VciBaseException 瑙掕壊鐨勪富閿负绌恒�佹煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGridByPkRole",method = RequestMethod.GET)
- @ResponseBody
public BaseResult<SmUserVO> refDataGridByPkRole(String pkRole,BaseQueryObject queryObject) throws VciBaseException{
if(queryObject == null){
queryObject = new BaseQueryObject();
@@ -106,14 +104,119 @@
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
- @ResponseBody
public BaseResult changePassword(String userOid, String password, String confirmPassword) {
userQueryService.changePassword(userOid, password, confirmPassword);
return BaseResult.success("淇敼瀵嗙爜鎴愬姛");
}
+ /**
+ * 鐢ㄦ埛绠＄悊鍒楄〃鍒嗛〉鏌ヨ锛屽钩鍙版槸涓嶆煡plusertype=0鐨勬垚鍛橈紝涔熷氨鏄痙eveloper鍜宎dmin涔嬬被鐨勮处鍙�
+ * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
+ * @return 鍏ㄩ儴鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鏁版嵁锛岃鑾峰彇鍏朵腑鐨刣ata灞炴��
+ * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
+ */
+ @RequestMapping(value = "/getDataGridUsers",method = RequestMethod.GET)
+ @VciUnCheckRight
+ public BaseResult<SmUserVO> getDataGridUsers(BaseQueryObject queryObject) throws VciBaseException {
+ try {
+ DataGrid<SmUserVO> userVODataGrid = userQueryService.getDataGridUsers(queryObject.getConditionMap(),queryObject.getPageHelper());
+ return BaseResult.dataGrid(userVODataGrid);
+ }catch (Exception e) {
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ }
+ }
+ /**
+ * 娣诲姞鐢ㄦ埛
+ * @param smUserDTO
+ * @return
+ */
+ @RequestMapping(value = "/addUser",method = RequestMethod.POST)
+ @VciUnCheckRight
+ public BaseResult addUser(@RequestBody SmUserDTO smUserDTO){
+ try {
+ return userQueryService.addUser(smUserDTO) ? BaseResult.success("鐢ㄦ埛娣诲姞鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛娣诲姞澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ }
+ }
+ /**
+ * 淇敼鐢ㄦ埛淇℃伅
+ * @param smUserDTO
+ * @return
+ */
+ @RequestMapping(value = "/updateUser",method = RequestMethod.PUT)
+ @VciUnCheckRight
+ public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){
+ try {
+ return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "鐢ㄦ埛淇敼鎴愬姛锛�":"鐢ㄦ埛淇敼澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ }
+ }
+ /**
+ * 鍒犻櫎鐢ㄦ埛
+ * @param ids
+ * @return
+ */
+ @RequestMapping(value = "/deleteUser",method = RequestMethod.DELETE)
+ @VciUnCheckRight
+ public BaseResult deleteUser(String[] ids){
+ try {
+ return userQueryService.deleteUser(ids) ? BaseResult.success("鍒犻櫎鐢ㄦ埛鎴愬姛锛�"):BaseResult.fail("鍒犻櫎鐢ㄦ埛澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ }
+ }
+
+ /**
+ * 鐢ㄦ埛鍋滅敤/鍚敤
+ * @param ids
+ * @param flag
+ * @return
+ */
+ @RequestMapping(value = "/stopUsers",method = RequestMethod.POST)
+ @VciUnCheckRight
+ public BaseResult stopUsers(String[] ids,boolean flag){
+ try {
+ userQueryService.stopUsers(ids,flag);
+ return BaseResult.success("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞垚鍔燂紒");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
+ return BaseResult.fail("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
+ }
+ }
+
+ /**
+ * 涓嬭浇浜哄憳瀵煎叆妯℃澘
+ */
+ @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.POST)
+ public void downloadImportTemplate(){
+
+ }
+
+ /**
+ * 浜哄憳瀵煎叆
+ */
+ @RequestMapping(value = "/importUser",method = RequestMethod.POST)
+ public void importUser(){
+
+ }
}
--
Gitblit v1.9.3