From dcd238531d8154633b9c1e2188b81e519760a17e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 七月 2024 16:09:45 +0800
Subject: [PATCH] 调整项目结构,统一DTO、VO、PO、BO等对象到plt-web-api模块下,拷贝vci-file-integration、plt-web-api、vci-framework-api、vci-file-api等依赖下的对象到plt-web-api模块下,并取消对这些jar的引用(为了解决同路径同名独享导致打包运行时对象加载出错问题)。

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java |  302 ++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 267 insertions(+), 35 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..7dda639 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,15 +1,28 @@
 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.pagemodel.SmUserVO;
+import com.vci.constant.FrameWorkLangCodeConstant;
+import com.vci.pagemodel.SmUserVO;
 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 com.vci.web.util.Func;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 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 org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.IOException;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -17,7 +30,7 @@
  * @author weidy
  * @date 2020/3/4
  */
-@Controller
+@RestController
 @RequestMapping("/userQueryController")
 public class SmUserQueryController {
 
@@ -28,13 +41,17 @@
     private SmUserQueryServiceI userQueryService;
 
     /**
+     * 鏃ュ織
+     */
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    /**
      * 鐢ㄦ埛鐨勫垪琛ㄥ弬鐓э紝
      * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
      * @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬樉绀哄璞″垪琛ㄦ暟鎹紝璇疯幏鍙栧叾涓殑data灞炴��
      * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
      */
     @RequestMapping(value = "/refDataGrid",method = RequestMethod.GET)
-    @ResponseBody
     public BaseResult<SmUserVO> refDataGrid(BaseQueryObject queryObject) throws VciBaseException {
         //浠g爜绀轰緥
         if(queryObject == null){
@@ -53,7 +70,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);
@@ -62,41 +78,123 @@
     }
 
     /**
-     * 浣跨敤閮ㄩ棬鏉ヨ幏鍙栫敤鎴风殑鍙傜収鍒楄〃
+     * 閮ㄩ棬绠$悊缁熻鎸夐挳锛屾煡璇㈡帴鍙�
+     * @param pkDepartment
+     * @param queryObject
+     * @return 鍖呭惈瀛愰儴闂ㄤ笅鐨勭敤鎴�
+     * @throws VciBaseException
+     */
+    @RequestMapping(value = "/countSmUserByDeptOid",method = RequestMethod.GET)
+    public BaseResult<List<SmUserVO>> countSmUserByDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
+        //VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");鍏佽涓虹┖鍥犱负浼氬嚭鐜扮粺璁℃墍鏈夐儴闂ㄨ繖涓妭鐐圭殑鎯呭喌
+        try {
+            if(queryObject == null){
+                queryObject = new BaseQueryObject();
+            }
+            List<SmUserVO> userVODataGrid = userQueryService.countSmUserByDeptOid(pkDepartment, queryObject.getConditionMap());
+            return BaseResult.dataList(userVODataGrid);
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "閫氳繃閮ㄩ棬涓婚敭鑾峰彇鍦ㄨ閮ㄩ棬涓嬬殑锛岀敤鎴峰弬鐓у垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 浣跨敤閮ㄩ棬涓婚敭鑾峰彇锛屽湪璇ラ儴闂ㄤ笅鐨勭敤鎴风敤鎴峰弬鐓у垪琛�
      * @param pkDepartment 閮ㄩ棬鐨勪富閿紝涓嶈兘涓虹┖
      * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
      * @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬樉绀哄璞″垪琛ㄦ暟鎹紝璇疯幏鍙栧叾涓殑data灞炴��
      * @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();
+    @RequestMapping(value = "/listUserByDeptOid",method = RequestMethod.GET)
+    public BaseResult<List<SmUserVO>> listUserByDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
+        VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");
+        try {
+            if(queryObject == null){
+                queryObject = new BaseQueryObject();
+            }
+            List<SmUserVO> userVODataGrid = userQueryService.listUserByDeptOid(pkDepartment, queryObject.getConditionMap());
+            return BaseResult.dataList(userVODataGrid);
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "閫氳繃閮ㄩ棬涓婚敭鑾峰彇鍦ㄨ閮ㄩ棬涓嬬殑锛岀敤鎴峰弬鐓у垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
         }
-        DataGrid<SmUserVO> userVODataGrid = userQueryService.gridUserByDeptOid(pkDepartment, queryObject.getConditionMap(), queryObject.getPageHelper());
-        return  BaseResult.dataGrid(userVODataGrid);
-        //濡傛灉鏄�佺殑椤圭洰锛屽簲璇ュ湪gridUserByDeptOid涓婃坊鍔爐ry锛宑atch锛岀劧鍚巆atch閲屽簲璇ヤ娇鐢ㄤ笅闈㈢殑浠g爜
-        //BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�");
     }
 
     /**
-     * 浣跨敤瑙掕壊鏉ヨ幏鍙栫敤鎴风殑鍙傜収鍒楄〃
-     * @param pkRole 瑙掕壊鐨勪富閿紝涓嶈兘涓虹┖
+     * 浣跨敤閮ㄩ棬涓婚敭鑾峰彇锛屼笉鍦ㄨ閮ㄩ棬涓嬬殑鐢ㄦ埛鐢ㄦ埛鍙傜収鍒楄〃
+     * @param pkDepartment 閮ㄩ棬鐨勪富閿紝涓嶈兘涓虹┖
      * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
-     * @return 鏅�氱敤鎴凤紙涓嶅寘鍚笁鍛橈紝涔熶笉鍖呭惈鍋滅敤鐨勶級鐨勬樉绀哄璞″垪琛ㄦ暟鎹紝璇疯幏鍙栧叾涓殑data灞炴��
-     * @throws VciBaseException 瑙掕壊鐨勪富閿负绌恒�佹煡璇㈠嚭閿欑殑鏃跺�欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
+     * @return 鏍规嵁褰撳墠鐧诲綍鐨勭敤鎴峰喅瀹氭煡閭d簺鐢ㄦ埛鍑烘潵锛岀殑鏄剧ず瀵硅薄鍒楄〃鏁版嵁锛岃鑾峰彇鍏朵腑鐨刣ata灞炴��
+     * @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();
+    @RequestMapping(value = "/listUserUnInDeptOid",method = RequestMethod.GET)
+    public BaseResult<List<SmUserVO>> listUserUnInDeptOid(String pkDepartment,BaseQueryObject queryObject) throws VciBaseException{
+        VciBaseUtil.alertNotNull(pkDepartment,"閮ㄩ棬涓婚敭");
+        try {
+            if(queryObject == null){
+                queryObject = new BaseQueryObject();
+            }
+            List<SmUserVO> userVODataGrid = userQueryService.listUserUnInDeptOid(pkDepartment, queryObject.getConditionMap());
+            return BaseResult.dataList(userVODataGrid);
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "閫氳繃閮ㄩ棬涓婚敭鑾峰彇涓嶅湪璇ラ儴闂ㄤ笅鐨勶紝鐢ㄦ埛鍙傜収鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
         }
-        DataGrid<SmUserVO> userVODataGrid = userQueryService.gridUserByRoleOid(pkRole, queryObject.getConditionMap(), queryObject.getPageHelper());
-        return  BaseResult.dataGrid(userVODataGrid);
-        //濡傛灉鏄�佺殑椤圭洰锛屽簲璇ュ湪gridUserByRoleOid涓婃坊鍔爐ry锛宑atch锛岀劧鍚巆atch閲屽簲璇ヤ娇鐢ㄤ笅闈㈢殑浠g爜
-        //BaseResult.fail("杩欓噷杩斿洖鍓嶇鐨勯敊璇俊鎭�");
+    }
+
+    /**
+     * 浣跨敤瑙掕壊鑾峰彇鍏宠仈鐨勭敤鎴峰弬鐓у垪琛細琚仠鐢ㄧ殑鐢ㄦ埛涔熶細鏌ュ嚭鏉�
+     * @param pkRole 瑙掕壊鐨勪富閿紝涓嶈兘涓虹┖
+     * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+     * @return
+     * @throws VciBaseException
+     */
+    @RequestMapping(value = "/listUserByRoleOid",method = RequestMethod.GET)
+    public BaseResult<List<SmUserVO>> listUserByRoleOid(String pkRole,BaseQueryObject queryObject) throws VciBaseException{
+        VciBaseUtil.alertNotNull(pkRole,"瑙掕壊涓婚敭");
+        try {
+            if(queryObject == null){
+                queryObject = new BaseQueryObject();
+            }
+            List<SmUserVO> smUserVOList = userQueryService.listUserByRoleOid(pkRole, queryObject.getConditionMap());
+            return  BaseResult.dataList(smUserVOList);
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "閫氳繃瑙掕壊鏉ヨ幏鍙栫敤鎴风殑鍙傜収鍒楄〃鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 浣跨敤瑙掕壊鑾峰彇涓嶅湪鏌愪釜瑙掕壊涓嬬殑鐢ㄦ埛鍙傜収鍒楄〃
+     * @param pkRole 瑙掕壊鐨勪富閿紝涓嶈兘涓虹┖
+     * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+     * @return
+     * @throws VciBaseException
+     */
+    @RequestMapping(value = "/listUserUnInRoleOid",method = RequestMethod.GET)
+    public BaseResult<List<SmUserVO>> listUserUnInRoleOid(String pkRole,BaseQueryObject queryObject) throws VciBaseException{
+        VciBaseUtil.alertNotNull(pkRole,"瑙掕壊涓婚敭");
+        try {
+            if(queryObject == null){
+                queryObject = new BaseQueryObject();
+            }
+            List<SmUserVO> smUserVOList = userQueryService.listUserUnInRoleOid(pkRole, queryObject.getConditionMap());
+            return  BaseResult.dataList(smUserVOList);
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "鑾峰彇涓嶅湪褰撳墠瑙掕壊涓嬬殑锛岀敤鎴峰弬鐓у垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
     }
 
     /**
@@ -106,14 +204,148 @@
      * @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("淇敼瀵嗙爜鎴愬姛");
+    public BaseResult changePassword(String userOid,String oldPassword, String password, String confirmPassword) throws PLException {
+        try {
+            return BaseResult.success(userQueryService.changePassword(userOid, oldPassword, password, confirmPassword) ? "淇敼瀵嗙爜鎴愬姛锛�":"淇敼瀵嗙爜澶辫触锛�");
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "淇敼瀵嗙爜鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
     }
 
+    /**
+     * 鐢ㄦ埛绠$悊鍒楄〃鍒嗛〉鏌ヨ锛屽钩鍙版槸涓嶆煡plusertype=0鐨勬垚鍛橈紝涔熷氨鏄痙eveloper鍜宎dmin涔嬬被鐨勮处鍙�
+     * @param queryObject 鏌ヨ瀵硅薄锛屽寘鍚簡鏌ヨ鏉′欢锛屽垎椤碉紝鎺掑簭绛�,鍗冲厑璁镐娇鐢⊿mUserVO閲岀殑鎵�鏈夊睘鎬т綔涓烘煡璇㈡潯浠讹紝涔熷彲浠ヤ娇鐢╬kRole.xxx锛宲kDepartment.xxx,pkDuty.xxx杩欐牱鏉ユ煡璇�
+     * @return 鍏ㄩ儴鐢ㄦ埛鏄剧ず瀵硅薄鍒楄〃鏁版嵁锛岃鑾峰彇鍏朵腑鐨刣ata灞炴��
+     * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父锛屽鏋滄槸鑰佺殑椤圭洰閲屼笉鎶涘嚭寮傚父
+     */
+    @RequestMapping(value = "/getDataGridUsers",method = RequestMethod.GET)
+    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);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(e.getMessage());
+        }
+    }
 
+    /**
+     * 娣诲姞鐢ㄦ埛
+     * @param smUserDTO
+     * @return
+     */
+    @RequestMapping(value = "/addUser",method = RequestMethod.POST)
+    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);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
 
+    /**
+     * 淇敼鐢ㄦ埛淇℃伅
+     * @param smUserDTO
+     * @return
+     */
+    @RequestMapping(value = "/updateUser",method = RequestMethod.PUT)
+    public BaseResult updateUser(@RequestBody SmUserDTO smUserDTO){
+        try {
+            return BaseResult.success(userQueryService.updateUser(smUserDTO) ? "鐢ㄦ埛淇敼鎴愬姛锛�":"鐢ㄦ埛淇敼澶辫触锛�");
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "淇敼鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
 
+    /**
+     * 鍒犻櫎鐢ㄦ埛
+     * @param ids
+     * @return
+     */
+    @RequestMapping(value = "/deleteUser",method = RequestMethod.DELETE)
+    public BaseResult deleteUser(String[] ids){
+        try {
+            return userQueryService.deleteUser(ids) ? BaseResult.success("鍒犻櫎鐢ㄦ埛鎴愬姛锛�"):BaseResult.fail("鍒犻櫎鐢ㄦ埛澶辫触锛�");
+        }catch (Exception e){
+            e.printStackTrace();
+            String exceptionMessage = "娣诲姞鐢ㄦ埛鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 鐢ㄦ埛鍋滅敤/鍚敤
+     * @param ids
+     * @param flag
+     * @return
+     */
+    @RequestMapping(value = "/stopUsers",method = RequestMethod.POST)
+    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);
+            logger.error(exceptionMessage);
+            return BaseResult.fail(exceptionMessage);
+        }
+    }
+
+    /**
+     * 涓嬭浇浜哄憳瀵煎叆妯℃澘
+     * @param downloadFileName
+     * @param response
+     */
+    @RequestMapping(value = "/downloadImportTemplate",method = RequestMethod.GET)
+    public void downloadImportTemplate(String downloadFileName, HttpServletResponse response){
+        try {
+            String excelPath = userQueryService.downloadImportTemplate(downloadFileName);
+            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 file
+     * @return
+     */
+    @RequestMapping(value = "/importUser",method = RequestMethod.POST)
+    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