From d2008fc35a45ff00b0f37939a13b792ab12e8c6f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 21 十一月 2024 10:25:05 +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 | 121 +++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 50 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 b325c16..f3d796e 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,9 +1,10 @@
package com.vci.frameworkcore.controller;
+import com.vci.dto.SmUserDTO;
+import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
-import com.vci.frameworkcore.constant.FrameWorkLangCodeConstant;
-import com.vci.frameworkcore.model.dto.SmUserDTO;
-import com.vci.frameworkcore.pagemodel.SmUserVO;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.SmUserVO;
import com.vci.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
@@ -12,8 +13,9 @@
import com.vci.starter.web.util.LocalFileUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.web.util.Func;
-import lombok.extern.slf4j.Slf4j;
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 org.springframework.web.multipart.MultipartFile;
@@ -31,7 +33,6 @@
*/
@RestController
@RequestMapping("/userQueryController")
-@Slf4j
public class SmUserQueryController {
/**
@@ -39,6 +40,11 @@
*/
@Autowired
private SmUserQueryServiceI userQueryService;
+
+ /**
+ * 鏃ュ織
+ */
+ private Logger logger = LoggerFactory.getLogger(getClass());
/**
* 鐢ㄦ埛鐨勫垪琛ㄥ弬鐓э紝
@@ -80,9 +86,8 @@
* @throws VciBaseException
*/
@RequestMapping(value = "/countSmUserByDeptOid",method = RequestMethod.GET)
- @VciUnCheckRight
public BaseResult<List<SmUserVO>> countSmUserByDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
- VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");
+ //VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");鍏佽涓虹┖鍥犱负浼氬嚭鐜扮粺璁℃墍鏈夐儴闂ㄨ繖涓妭鐐圭殑鎯呭喌
try {
if(queryObject == null){
queryObject = new BaseQueryObject();
@@ -91,9 +96,9 @@
return BaseResult.dataList(userVODataGrid);
}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);
}
}
@@ -105,7 +110,6 @@
* @throws VciBaseException 閮ㄩ棬涓婚敭涓虹┖銆佹煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/listUserByDeptOid",method = RequestMethod.GET)
- @VciUnCheckRight
public BaseResult<List<SmUserVO>> listUserByDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");
try {
@@ -116,9 +120,9 @@
return BaseResult.dataList(userVODataGrid);
}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);
}
}
@@ -130,7 +134,6 @@
* @throws VciBaseException 閮ㄩ棬涓婚敭涓虹┖銆佹煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
*/
@RequestMapping(value = "/listUserUnInDeptOid",method = RequestMethod.GET)
- @VciUnCheckRight
public BaseResult<List<SmUserVO>> listUserUnInDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");
try {
@@ -141,9 +144,9 @@
return BaseResult.dataList(userVODataGrid);
}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);
}
}
@@ -165,9 +168,9 @@
return BaseResult.dataList(smUserVOList);
}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);
}
}
@@ -189,22 +192,29 @@
return BaseResult.dataList(smUserVOList);
}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 userOid 鐢ㄦ埛涓婚敭
+ * @param userName 鐢ㄦ埛鍚�
* @param password 鏂板瘑鐮�
* @param confirmPassword 纭瀵嗙爜
*/
@RequestMapping(value = "/changePassword",method = RequestMethod.POST)
- public BaseResult changePassword(String userOid, String password, String confirmPassword) {
- userQueryService.changePassword(userOid, password, confirmPassword);
- return BaseResult.success("淇敼瀵嗙爜鎴愬姛");
+ @VciUnCheckRight
+ public BaseResult changePassword(String userName,String oldPassword, String password, String confirmPassword) throws PLException {
+ try {
+ return userQueryService.changePassword(userName, oldPassword, password, confirmPassword) ? BaseResult.success(true,"鐢ㄦ埛淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛淇敼澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
}
/**
@@ -214,16 +224,15 @@
* @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());
+ String exceptionMessage = "鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -233,15 +242,14 @@
* @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);
+ String exceptionMessage = "娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -251,15 +259,14 @@
* @return
*/
@RequestMapping(value = "/updateUser",method = RequestMethod.PUT)
- @VciUnCheckRight
public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){
try {
- return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "鐢ㄦ埛淇敼鎴愬姛锛�":"鐢ㄦ埛淇敼澶辫触锛�");
+ return userQueryService.updateUser(smUserDTO) ? 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);
}
}
@@ -269,15 +276,14 @@
* @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);
+ String exceptionMessage = "娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -288,16 +294,15 @@
* @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);
+ String exceptionMessage = "鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
}
}
@@ -307,7 +312,6 @@
* @param response
*/
@RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.GET)
- @VciUnCheckRight
public void downloadImportTemplate(String downloadFileName, HttpServletResponse response){
try {
String excelPath = userQueryService.downloadImportTemplate(downloadFileName);
@@ -325,6 +329,8 @@
/**
* 浜哄憳瀵煎叆
+ * @param file
+ * @return
*/
@RequestMapping(value = "/importUser",method = RequestMethod.POST)
public BaseResult importUser(MultipartFile file){
@@ -344,4 +350,19 @@
}
}
+ /**
+ * 鐢ㄦ埛鏉冮檺閫夋嫨鏍�
+ * @param treeQueryObject 鏍戝舰鏁版嵁鐨勬煡璇㈠璞★紝鍖呮嫭鏌ヨ鏉′欢锛屼笂绾т富閿紝鏄惁澶氶�夌瓑锛屽嵆鍏佽浣跨敤SmUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
+ * @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬爲褰㈡暟鎹紝宸茬粡杞崲杩囦笂涓嬬骇鍏崇郴锛岃鑾峰彇鍏朵腑鐨則reeData灞炴��
+ * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
+ */
+ @RequestMapping(value = "/refPersonOrgTree",method = RequestMethod.GET)
+ public BaseResult<Tree> refPersonOrgTree(TreeQueryObject treeQueryObject) throws VciBaseException{
+ List<Tree> userTreeList = userQueryService.refPersonOrgTree(treeQueryObject);
+ return BaseResult.tree(userTreeList);
+ //鑰佺殑椤圭洰渚濈劧鏄坊鍔爐ry catch锛屾柟娉曢噷涓嶆姏鍑哄紓甯�
+ //BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�");
+ }
+
+
}
--
Gitblit v1.9.3