From c659560c7ee8d8f8278b938421de13bf65d1e1b1 Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期三, 15 一月 2025 14:28:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 55 insertions(+), 2 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
index 4ebd730..03226c4 100644
--- a/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
+++ b/Source/plt-web/plt-web-parent/plt-web-permission/src/main/java/com/vci/web/controller/SmUserQueryController.java
@@ -181,9 +181,9 @@
* @throws VciBaseException
*/
@RequestMapping(value = "/listUserByUserType",method = RequestMethod.GET)
- public BaseResult<List<SmUserVO>> listUserByUserType() throws VciBaseException{
+ public BaseResult<List<SmUserVO>> listUserByUserType(Integer type) throws VciBaseException{
try {
- List<SmUserVO> smUserVOList = userQueryService.listUserByUserType();
+ List<SmUserVO> smUserVOList = userQueryService.listUserByUserType(type);
return BaseResult.dataList(smUserVOList);
}catch (Exception e){
e.printStackTrace();
@@ -290,6 +290,39 @@
}
/**
+ * 淇敼鐢ㄦ埛澶村儚
+ * @param file 鏂囦欢
+ * @return
+ */
+ @RequestMapping(value = "/updateUserPhoto",method = RequestMethod.POST)
+ public BaseResult updateUserPhoto(MultipartFile file){
+ try {
+ return userQueryService.updateUserPhoto(file) ? BaseResult.success("鐢ㄦ埛澶村儚淇敼鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛澶村儚淇敼澶辫触锛�");
+ }catch (Exception e){
+ e.printStackTrace();
+ String exceptionMessage = "淇敼鐢ㄦ埛澶村儚鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+ logger.error(exceptionMessage);
+ return BaseResult.fail(exceptionMessage);
+ }
+ }
+
+
+ /**
+ * 鑾峰彇鐢ㄦ埛澶村儚
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/getUserPhoto",method = RequestMethod.GET)
+ public void getUserPhoto(HttpServletResponse response){
+ try {
+ ControllerUtil.writeFileToResponse(response,userQueryService.getUserPhoto());
+ } catch (Exception e) {
+ throw new VciBaseException(e.getMessage(),new String[0],e);
+ }
+ }
+
+
+ /**
* 鍒犻櫎鐢ㄦ埛
* @param ids
* @return
@@ -370,6 +403,26 @@
}
/**
+ * 瀵煎嚭浜哄憳
+ * @param response
+ */
+ @RequestMapping(value = "/expUser",method = RequestMethod.GET)
+ public void expUser(HttpServletResponse response){
+ try {
+ String excelPath = userQueryService.expUser();
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ } catch (Exception e) {
+ String msg = "瀵煎嚭鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + LangBaseUtil.getErrorMsg(e);
+ try {
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response,"error_" + Func.format(new Date(),"yyyy-MM-dd HHmmss.sss") + ".txt", StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
+ }
+
+ /**
* 鐢ㄦ埛鏉冮檺閫夋嫨鏍�
* @param treeQueryObject 鏍戝舰鏁版嵁鐨勬煡璇㈠璞★紝鍖呮嫭鏌ヨ鏉′欢锛屼笂绾т富閿紝鏄惁澶氶�夌瓑锛屽嵆鍏佽浣跨敤SmUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
* @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬爲褰㈡暟鎹紝宸茬粡杞崲杩囦笂涓嬬骇鍏崇郴锛岃鑾峰彇鍏朵腑鐨則reeData灞炴��
--
Gitblit v1.9.3