From 34640adf8a1d16f4202edcad644081b28bf61f1d Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 26 六月 2024 17:57:20 +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 | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 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 bf29cdb..690357b 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,20 +1,15 @@
package com.vci.frameworkcore.controller;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.dto.SmUserDTO;
+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.web.model.SmUserDO;
-import com.zeroc.IceInternal.Ex;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-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.ResponseBody;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -23,7 +18,7 @@
* @author weidy
* @date 2020/3/4
*/
-@Controller
+@RestController
@RequestMapping("/userQueryController")
@Slf4j
public class SmUserQueryController {
@@ -41,7 +36,6 @@
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
- @ResponseBody
public BaseResult<SmUserVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
//浠ｇ爜绀轰緥
if(queryObject == null){
@@ -60,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);
@@ -76,7 +69,6 @@
* @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();
@@ -95,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();
@@ -113,20 +104,18 @@
* @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
+ * 鐢ㄦ埛绠＄悊鍒楄〃鍒嗛〉鏌ヨ锛屽钩鍙版槸涓嶆煡plusertype=0鐨勬垚鍛橈紝涔熷氨鏄痙eveloper鍜宎dmin涔嬬被鐨勮处鍙�
* @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
* @return 鍏ㄩ儴鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鏁版嵁锛岃鑾峰彇鍏朵腑鐨刣ata灞炴��
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/getDataGridUsers",method = RequestMethod.GET)
- @ResponseBody
@VciUnCheckRight
public BaseResult<SmUserVO> getDataGridUsers(BaseQueryObject queryObject) throws VciBaseException {
try {
@@ -145,7 +134,6 @@
* @return
*/
@RequestMapping(value = "/addUser",method = RequestMethod.POST)
- @ResponseBody
@VciUnCheckRight
public BaseResult addUser(@RequestBody SmUserDTO smUserDTO){
try {
@@ -163,7 +151,6 @@
* @return
*/
@RequestMapping(value = "/updateUser",method = RequestMethod.PUT)
- @ResponseBody
@VciUnCheckRight
public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){
try {
@@ -181,7 +168,6 @@
* @return
*/
@RequestMapping(value = "/deleteUser",method = RequestMethod.DELETE)
- @ResponseBody
//@VciUnCheckRight
public BaseResult deleteUser(String[] ids){
try {
@@ -200,7 +186,6 @@
* @return
*/
@RequestMapping(value = "/stopUsers",method = RequestMethod.POST)
- @ResponseBody
//@VciUnCheckRight
public BaseResult disableOrEnableUsers(String[] ids,boolean flag){
try {
@@ -213,5 +198,20 @@
}
}
+ /**
+ * 涓嬭浇浜哄憳瀵煎叆妯℃澘
+ */
+ @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.POST)
+ public void downloadImportTemplate(){
+
+ }
+
+ /**
+ * 浜哄憳瀵煎叆
+ */
+ @RequestMapping(value = "/importUser",method = RequestMethod.POST)
+ public void importUser(){
+
+ }
}
--
Gitblit v1.9.3