添加批量导入

base-manager/src/main/java/com/mortals/xhx/module/window/service/impl/WindowBusinessServiceImpl.java

@@ -66,7 +66,7 @@ public class WindowBusinessServiceImpl extends AbstractCRUDServiceImpl<WindowBus
                 item.setFromnum(windowEntity.getFromnum());
                 WindowHallEntity windowHallEntity = windowHallEntityMap.get(item.getWindowId());
                 if (!ObjectUtils.isEmpty(windowHallEntity)) {
-                    item.setHallId(windowHallEntity.getWindowId());
+                    item.setHallId(windowHallEntity.getHallId());
                     item.setHallName(windowHallEntity.getHallName());
                 }
             } else {

base-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -9,7 +9,7 @@
     "baseUrl": "http://192.168.0.98:11078/base"
   },
   "base-test1": {
-    "baseUrl": "http://192.168.0.98:17211/base"
+    "baseUrl": "http://8.136.255.30:11078/base"
   },
   "base-yibintest": {
     "baseUrl": "http://192.168.2.169:11078/base"

base-manager/src/test/java/com/mortals/httpclient/site/SiteHallController.http

@@ -19,7 +19,7 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":11
 }
 
 

base-manager/src/test/java/com/mortals/httpclient/window/WindowBusinessController.http

@@ -5,7 +5,8 @@ Content-Type: application/json
 
 {
     "page":1,
-    "size":10
+    "size":10,
+  "hallId": 11
 }
 
 

portal-manager/src/main/java/com/mortals/xhx/module/user/model/UserEntity.java

@@ -24,7 +24,7 @@ public class UserEntity extends UserVo implements IUser {
     /**
     * 登录名
     */
-    @Excel(name = "用户账号")
+    @Excel(name = "登录账号")
     private String loginName;
     /**
     * 登录密码，使用md5双次加密

portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java

@@ -23,6 +23,7 @@ import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.HashMap;
 import java.util.List;
@@ -270,4 +271,15 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
     public void doImportDataBefore(List<UserEntity> list, boolean updateSupport, Context context) throws AppException {
         super.doImportDataBefore(list, updateSupport, context);
     }
+
+    /**
+     * @param file
+     * @param updateSupport
+     * @return
+     */
+    @Override
+    @UnAuth
+    public String importData(MultipartFile file, boolean updateSupport) {
+        return super.importData(file, updateSupport);
+    }
 }
\ No newline at end of file

portal-manager/src/test/java/com/mortals/httpclient/user/UserController.http

+POST {{baseUrl}}/user/importData
+Content-Type: multipart/form-data; boundary=WebAppBoundary
+
+--WebAppBoundary
+Content-Disposition: form-data; name="file"; filename="user.xlsx"
+
+< F:\\user.xlsx
+--WebAppBoundary--
+
+###
+###用户信息业务列表
+POST {{baseUrl}}/user/downloadTemplate
+Content-Type: application/json
+
 
 ###用户信息业务列表
 POST {{baseUrl}}/user/list
@@ -59,3 +73,6 @@ Accept: application/json
 
 
 
+
+
+