From dd678ba29a3631558ab0c0c90b5be73ae489324b Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 02 七月 2024 17:00:33 +0800
Subject: [PATCH] 升版本/次等功能上传
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 86 ++++++++++++++++++++++++++++++++-----------
1 files changed, 64 insertions(+), 22 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 dec4cf0..494db59 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,16 +1,25 @@
package com.vci.frameworkcore.controller;
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.starter.web.annotation.controller.VciUnCheckRight;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
+import com.vci.starter.web.util.ControllerUtil;
+import com.vci.starter.web.util.LangBaseUtil;
+import com.vci.starter.web.util.LocalFileUtil;
+import com.vci.starter.web.util.VciBaseUtil;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
import java.util.List;
/**
@@ -110,7 +119,7 @@
}
/**
- * 鐢ㄦ埛绠＄悊鍒楄〃鍒嗛〉鏌ヨ锛屽钩鍙版槸涓嶆煡plusertype=0鐨勬垚鍛橈紝涔熷氨鏄痙eveloper鍜宎dmin
+ * 鐢ㄦ埛绠＄悊鍒楄〃鍒嗛〉鏌ヨ锛屽钩鍙版槸涓嶆煡plusertype=0鐨勬垚鍛橈紝涔熷氨鏄痙eveloper鍜宎dmin涔嬬被鐨勮处鍙�
* @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
* @return 鍏ㄩ儴鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鏁版嵁锛岃鑾峰彇鍏朵腑鐨刣ata灞炴��
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
@@ -123,7 +132,8 @@
return BaseResult.dataGrid(userVODataGrid);
}catch (Exception e) {
e.printStackTrace();
- log.error("鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
return BaseResult.fail("鐢ㄦ埛绠＄悊鍒楄〃鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
}
}
@@ -137,11 +147,12 @@
@VciUnCheckRight
public BaseResult addUser(@RequestBody SmUserDTO smUserDTO){
try {
- return BaseResult.success(userQueryService.addUser(smUserDTO) ? "鐢ㄦ埛娣诲姞鎴愬姛锛�":"鐢ㄦ埛娣诲姞澶辫触锛�");
+ return userQueryService.addUser(smUserDTO) ? BaseResult.success("鐢ㄦ埛娣诲姞鎴愬姛锛�"):BaseResult.fail("鐢ㄦ埛娣诲姞澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
- log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
- return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
}
}
@@ -157,8 +168,9 @@
return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "鐢ㄦ埛淇敼鎴愬姛锛�":"鐢ㄦ埛淇敼澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
- log.error("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
- return BaseResult.fail("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
}
}
@@ -168,14 +180,15 @@
* @return
*/
@RequestMapping(value = "/deleteUser",method = RequestMethod.DELETE)
- //@VciUnCheckRight
+ @VciUnCheckRight
public BaseResult deleteUser(String[] ids){
try {
- return BaseResult.success(userQueryService.deleteUser(ids) ? "鍒犻櫎鐢ㄦ埛鎴愬姛锛�":"鍒犻櫎鐢ㄦ埛澶辫触锛�");
+ return userQueryService.deleteUser(ids) ? BaseResult.success("鍒犻櫎鐢ㄦ埛鎴愬姛锛�"):BaseResult.fail("鍒犻櫎鐢ㄦ埛澶辫触锛�");
}catch (Exception e){
e.printStackTrace();
- log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
- return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + e.getMessage());
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
+ return BaseResult.fail("娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + exceptionMessage);
}
}
@@ -186,32 +199,61 @@
* @return
*/
@RequestMapping(value = "/stopUsers",method = RequestMethod.POST)
- //@VciUnCheckRight
- public BaseResult disableOrEnableUsers(String[] ids,boolean flag){
+ @VciUnCheckRight
+ public BaseResult stopUsers(String[] ids,boolean flag){
try {
- userQueryService.disableOrEnableUsers(ids,flag);
+ userQueryService.stopUsers(ids,flag);
return BaseResult.success("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞垚鍔燂紒");
}catch (Exception e){
e.printStackTrace();
- log.error("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + e.getMessage());
- return BaseResult.fail("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + e.getMessage());
+ String exceptionMessage = VciBaseUtil.getExceptionMessage(e);
+ log.error("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
+ return BaseResult.fail("鐢ㄦ埛銆愬仠鐢�/鍚敤銆戞椂鍑虹幇閿欒锛屽師鍥狅細" + exceptionMessage);
}
}
/**
* 涓嬭浇浜哄憳瀵煎叆妯℃澘
+ * @param downloadFileName
+ * @param response
*/
- @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.POST)
- public void downloadImportTemplate(){
-
+ @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.GET)
+ @VciUnCheckRight
+ public void downloadImportTemplate(String downloadFileName, HttpServletResponse response){
+ String excelPath = userQueryService.downloadImportTemplate(downloadFileName);
+ try {
+ ControllerUtil.writeFileToResponse(response,excelPath);
+ } catch (IOException e) {
+ String msg = "涓嬭浇鐢ㄦ埛瀵煎叆妯℃澘鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + LangBaseUtil.getErrorMsg(e);
+ try {
+ e.printStackTrace();
+ ControllerUtil.writeDataToResponse(response, StringUtils.isNotBlank(msg)?msg.getBytes():new byte[0],null);
+ } catch (IOException ioException) {
+ ioException.printStackTrace();
+ }
+ }
}
/**
* 浜哄憳瀵煎叆
*/
@RequestMapping(value = "/importUser",method = RequestMethod.POST)
- public void importUser(){
-
+ @VciUnCheckRight
+ public BaseResult importUser(MultipartFile file){
+ String excelFileName = LocalFileUtil.getDefaultTempFolder() + File.separator + LocalFileUtil.getFileNameForIE(file.getOriginalFilename());
+ File file1 = new File(excelFileName);
+ try {
+ file.transferTo(new File(excelFileName));
+ if (file != null) {
+ return userQueryService.importUser(file1);
+ } else {
+ return BaseResult.fail(FrameWorkLangCodeConstant.IMPORT_FAIL, new String[]{"鏃犲鍏ョ殑鏂囦欢"});
+ }
+ }catch (Throwable e) {
+ throw new VciBaseException(e.getMessage(),new String[0],e);
+ }finally {
+ file1.delete();
+ }
}
}
--
Gitblit v1.9.3