Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserMemberController.java

@@ -67,40 +67,7 @@ public class UserMemberController {
         return memberBiz.upMemberDays(userId, days, type);
     }
 
-    @PostMapping("/user/export")
-    public ObjectRestResponse importUserMember(@RequestPart("file") MultipartFile userMemberExcel) {
-        List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel);
-        if (userMemberData.size() < 1) {
-            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
-        }
-        for (String[] userMemberDatum : userMemberData) {
-            if (userMemberDatum.length!=4){
-                return ObjectRestResponse.createFailedResult(1002, "数据不完整！！！");
-            }
-        }
-        userMemberData.remove(0);
-        try {
-            int effectSize = baseUserMemberExportBiz.importUserMember(userMemberData);
-            return  ObjectRestResponse.succ(effectSize);
-        }catch (BaseException ex){
-         return  ObjectRestResponse.createDefaultFail();
-        }
-    }
 
-    @GetMapping("/app/unauth/user/excel_model/dowload")
-    public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){
-        // 重置response
-        response.reset();
-        response.setCharacterEncoding("utf-8");
-        response.setContentType("multipart/form-data");
-        response.addHeader("Content-Disposition", "attachment;filename=usermember.xlsx");
-        InputStream inputStream = AdminBootstrap.class.getClassLoader().getResourceAsStream("file/usermember.xlsx");
-        try {
-            byte[] bytes = IOUtils.toByteArray(inputStream);
-            return ResponseEntity.ok(bytes);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
-    }
+
+
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

 package com.github.wxiaoqi.security.admin.rest.admin;
 
+import com.github.wxiaoqi.security.admin.AdminBootstrap;
 import com.github.wxiaoqi.security.admin.biz.BaseUserMemberExportBiz;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.excel.ExcelImport;
+import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
 
 /**
  * @author libin
@@ -22,6 +31,43 @@ public class UserMemberAdminController {
     @Autowired
     private BaseUserMemberExportBiz baseUserMemberExportBiz;
 
+    @PostMapping("/user/export")
+    public ObjectRestResponse importUserMember(@RequestPart("file") MultipartFile userMemberExcel) {
+        List<String[]> userMemberData = ExcelImport.getExcelData(userMemberExcel);
+        if (userMemberData.size() < 1) {
+            return ObjectRestResponse.createFailedResult(1001, "导入不能没数据！！！");
+        }
+        for (String[] userMemberDatum : userMemberData) {
+            if (userMemberDatum.length!=4){
+                return ObjectRestResponse.createFailedResult(1002, "数据不完整！！！");
+            }
+        }
+        userMemberData.remove(0);
+        try {
+            int effectSize = baseUserMemberExportBiz.importUserMember(userMemberData);
+            return  ObjectRestResponse.succ(effectSize);
+        }catch (BaseException ex){
+            return  ObjectRestResponse.createDefaultFail();
+        }
+    }
+
+
+    @GetMapping("/app/unauth/user/excel_model/dowload")
+    public ResponseEntity<byte[]> dowloadUserMemberExcelModel(HttpServletResponse response){
+        // 重置response
+        response.reset();
+        response.setCharacterEncoding("utf-8");
+        response.setContentType("multipart/form-data");
+        response.addHeader("Content-Disposition", "attachment;filename=usermember.xlsx");
+        InputStream inputStream = AdminBootstrap.class.getClassLoader().getResourceAsStream("file/usermember.xlsx");
+        try {
+            byte[] bytes = IOUtils.toByteArray(inputStream);
+            return ResponseEntity.ok(bytes);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
+    }
     @PostMapping("/save")
     public ObjectRestResponse<Void> saveUserMember(@RequestBody UserMemberSaveDTO userMemberSaveDTO) {
         baseUserMemberExportBiz.saveUserMember(userMemberSaveDTO);