Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/iHotel_student_houtai into develop-wxl

src/main/java/com/template/common/utils/HttpClientHelper.java

@@ -51,9 +51,9 @@ public class HttpClientHelper {
 //    private int socketTimeout = 100000;
     private int socketTimeout = 30000;
 //    private int connectionRequestTimeout = 90000;
-    private int connectionRequestTimeout = 15000;
+    private int connectionRequestTimeout = 20000;
 //    private int connectTimeout = 90000;
-    private int connectTimeout = 15000;
+    private int connectTimeout = 20000;
 
     // 代理信息
     public static String proxy_ip;

src/main/java/com/template/controller/AdminController.java

@@ -235,10 +235,10 @@ public class AdminController implements AdminAPI {
         }
 //      判断该用户是否拥有权限
         //      判断该用户是否拥有权限
-        String accountManagement = permissionSetting.getAccountManagement();
-        if (!"0".equals(accountManagement) && !accountManagement.contains("1")) {
-            return CommonResult.fail("此账号暂无该权限");
-        }
+//        String accountManagement = permissionSetting.getAccountManagement();
+//        if (!"0".equals(accountManagement) && !accountManagement.contains("1")) {
+//            return CommonResult.fail("此账号暂无该权限");
+//        }
 
         LambdaQueryWrapper<Users> wrapperU = new LambdaQueryWrapper<>();
         wrapperU.like(ObjectUtils.isNotEmpty(keyWord), Users::getCardNumber, keyWord)

src/main/java/com/template/controller/LoginController.java

@@ -239,6 +239,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo12.setStatus(1);
                 strings.add(functionPointVo12);
 
+                FunctionPointVo functionPointVo14 = new FunctionPointVo();
+                functionPointVo14.setFunctionPoint("查看界面");
+                functionPointVo14.setStatus(1);
+                strings.add(functionPointVo14);
+
             } else {
 
                 FunctionPointVo functionPointVo = ifContains(houseStatusManagement, "1");
@@ -286,6 +291,10 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo12 = ifContains(houseStatusManagement, "12");
                 functionPointVo12.setFunctionPoint("开房");
                 strings.add(functionPointVo12);
+
+                FunctionPointVo functionPointVo14 = ifContains(houseStatusManagement, "14");
+                functionPointVo14.setFunctionPoint("查看界面");
+                strings.add(functionPointVo14);
             }
 
             menuBarVo.setFunctionPoints(strings);
@@ -318,6 +327,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos2.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo6 = new FunctionPointVo();
+                functionPointVo6.setFunctionPoint("查看界面");
+                functionPointVo6.setStatus(1);
+                vos2.add(functionPointVo6);
+
                 menuBarVo2.setFunctionPoints(vos2);
 
             } else {
@@ -334,6 +348,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setFunctionPoint("删除");
                 vos2.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo6 = ifContains(houseTypeManagement, "6");
+                functionPointVo6.setFunctionPoint("查看界面");
+                vos2.add(functionPointVo6);
+
                 menuBarVo2.setFunctionPoints(vos2);
 
             }
@@ -360,6 +378,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setStatus(1);
                 vos3.add(functionPointVo5);
 
+                FunctionPointVo functionPointVo7 = new FunctionPointVo();
+                functionPointVo7.setFunctionPoint("查看界面");
+                functionPointVo7.setStatus(1);
+                vos3.add(functionPointVo7);
+
                 menuBarVo3.setFunctionPoints(vos3);
             } else {
                 FunctionPointVo functionPointVo4 = ifContains(housePriceManagement, "4");
@@ -370,6 +393,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setFunctionPoint("改价记录");
                 vos3.add(functionPointVo5);
 
+                FunctionPointVo functionPointVo7 = ifContains(housePriceManagement, "7");
+                functionPointVo7.setFunctionPoint("查看界面");
+                vos3.add(functionPointVo7);
+
+
                 menuBarVo3.setFunctionPoints(vos3);
             }
 
@@ -409,6 +437,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setStatus(1);
                 vos4.add(functionPointVo5);
 
+                FunctionPointVo functionPointVo6 = new FunctionPointVo();
+                functionPointVo6.setFunctionPoint("查看界面");
+                functionPointVo6.setStatus(1);
+                vos4.add(functionPointVo6);
+
                 FunctionPointVo functionPointVo8 = new FunctionPointVo();
                 functionPointVo8.setFunctionPoint("换房");
                 functionPointVo8.setStatus(1);
@@ -440,6 +473,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setFunctionPoint("退房");
                 vos4.add(functionPointVo5);
 
+                FunctionPointVo functionPointVo6 = ifContains(houseOrderManagement, "6");
+                functionPointVo6.setFunctionPoint("查看界面");
+                vos4.add(functionPointVo6);
+
                 FunctionPointVo functionPointVo8 = ifContains(houseOrderManagement, "8");
                 functionPointVo8.setFunctionPoint("换房");
                 vos4.add(functionPointVo8);
@@ -468,6 +505,12 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo2.setFunctionPoint("导出");
                 functionPointVo2.setStatus(1);
                 vos5.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = new FunctionPointVo();
+                functionPointVo3.setFunctionPoint("查看界面");
+                functionPointVo3.setStatus(1);
+                vos5.add(functionPointVo3);
+
             } else {
                 FunctionPointVo functionPointVo = ifContains(dutyManagement, "1");
                 functionPointVo.setFunctionPoint("导入值班");
@@ -476,6 +519,10 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo2 = ifContains(dutyManagement, "2");
                 functionPointVo2.setFunctionPoint("导出");
                 vos5.add(functionPointVo2);
+
+                FunctionPointVo functionPointVo3 = ifContains(dutyManagement, "3");
+                functionPointVo3.setFunctionPoint("查看界面");
+                vos5.add(functionPointVo3);
             }
             menuBarVo5.setFunctionPoints(vos5);
             menuBarVos.add(menuBarVo5);
@@ -498,6 +545,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo4.setStatus(1);
                 vos6.add(functionPointVo4);
 
+                FunctionPointVo functionPointVo5 = new FunctionPointVo();
+                functionPointVo5.setFunctionPoint("查看界面");
+                functionPointVo5.setStatus(1);
+                vos6.add(functionPointVo5);
+
                 FunctionPointVo functionPointVo6 = new FunctionPointVo();
                 functionPointVo6.setFunctionPoint("规则设置");
                 functionPointVo6.setStatus(1);
@@ -512,6 +564,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo4.setFunctionPoint("驳回");
                 vos6.add(functionPointVo4);
 
+                FunctionPointVo functionPointVo5 = ifContains(processManagement, "5");
+                functionPointVo5.setFunctionPoint("查看界面");
+                vos6.add(functionPointVo5);
+
                 FunctionPointVo functionPointVo6 = ifContains(processManagement, "6");
                 functionPointVo6.setFunctionPoint("规则设置");
                 vos6.add(functionPointVo6);
@@ -528,11 +584,20 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo7.setName("统计报表");
             ArrayList<FunctionPointVo> vos7 = new ArrayList<>();
             if (reportManagement.contains("0")) {
+                FunctionPointVo functionPointVo1 = new FunctionPointVo();
+                functionPointVo1.setFunctionPoint("查看界面");
+                functionPointVo1.setStatus(1);
+                vos7.add(functionPointVo1);
+
                 FunctionPointVo functionPointVo2 = new FunctionPointVo();
                 functionPointVo2.setFunctionPoint("导出");
                 functionPointVo2.setStatus(1);
                 vos7.add(functionPointVo2);
             } else {
+                FunctionPointVo functionPointVo1 = ifContains(reportManagement, "1");
+                functionPointVo1.setFunctionPoint("查看界面");
+                vos7.add(functionPointVo1);
+
                 FunctionPointVo functionPointVo2 = ifContains(reportManagement, "2");
                 functionPointVo2.setFunctionPoint("导出");
                 vos7.add(functionPointVo2);
@@ -549,6 +614,11 @@ public class LoginController implements LoginControllerAPI {
             menuBarVo8.setName("门锁管理");
             ArrayList<FunctionPointVo> vos8 = new ArrayList<>();
             if (doorLockManagement.contains("0")) {
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos8.add(functionPointVo4);
+
                 FunctionPointVo functionPointVo5 = new FunctionPointVo();
                 functionPointVo5.setFunctionPoint("导出");
                 functionPointVo5.setStatus(1);
@@ -585,6 +655,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo15.setStatus(1);
                 vos8.add(functionPointVo15);
             } else {
+                FunctionPointVo functionPointVo4 = ifContains(doorLockManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos8.add(functionPointVo4);
+
                 FunctionPointVo functionPointVo5 = ifContains(doorLockManagement, "5");
                 functionPointVo5.setFunctionPoint("导出");
                 vos8.add(functionPointVo5);
@@ -642,6 +716,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos9.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos9.add(functionPointVo4);
+
                 FunctionPointVo functionPointVo5 = new FunctionPointVo();
                 functionPointVo5.setFunctionPoint("导出");
                 functionPointVo5.setStatus(1);
@@ -665,6 +744,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setFunctionPoint("删除");
                 vos9.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = ifContains(hydropowerManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos9.add(functionPointVo4);
+
                 FunctionPointVo functionPointVo5 = ifContains(hydropowerManagement, "5");
                 functionPointVo5.setFunctionPoint("导出");
                 vos9.add(functionPointVo5);
@@ -699,6 +782,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos10.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos10.add(functionPointVo4);
+
 
             } else {
                 FunctionPointVo functionPointVo1 = ifContains(userManagement, "1");
@@ -713,6 +801,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setFunctionPoint("删除");
                 vos10.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = ifContains(userManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos10.add(functionPointVo4);
+
             }
             menuBarVo10.setFunctionPoints(vos10);
             menuBarVos.add(menuBarVo10);
@@ -740,6 +832,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos11.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos11.add(functionPointVo4);
+
 
             } else {
                 FunctionPointVo functionPointVo1 = ifContains(roleManagement, "1");
@@ -754,6 +851,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setFunctionPoint("删除");
                 vos11.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = ifContains(roleManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos11.add(functionPointVo4);
+
             }
             menuBarVo11.setFunctionPoints(vos11);
             menuBarVos.add(menuBarVo11);
@@ -781,6 +882,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setStatus(1);
                 vos12.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = new FunctionPointVo();
+                functionPointVo4.setFunctionPoint("查看界面");
+                functionPointVo4.setStatus(1);
+                vos12.add(functionPointVo4);
 
             } else {
                 FunctionPointVo functionPointVo1 = ifContains(accountManagement, "1");
@@ -795,6 +900,10 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo3.setFunctionPoint("删除");
                 vos12.add(functionPointVo3);
 
+                FunctionPointVo functionPointVo4 = ifContains(accountManagement, "4");
+                functionPointVo4.setFunctionPoint("查看界面");
+                vos12.add(functionPointVo4);
+
             }
             menuBarVo12.setFunctionPoints(vos12);
             menuBarVos.add(menuBarVo12);
@@ -832,6 +941,11 @@ public class LoginController implements LoginControllerAPI {
                 functionPointVo5.setStatus(1);
                 vos13.add(functionPointVo5);
 
+                FunctionPointVo functionPointVo6 = new FunctionPointVo();
+                functionPointVo6.setFunctionPoint("查看界面");
+                functionPointVo6.setStatus(1);
+                vos13.add(functionPointVo6);
+
             } else {
                 FunctionPointVo functionPointVo1 = ifContains(systemManagement, "1");
                 functionPointVo1.setFunctionPoint("退房设置");
@@ -852,6 +966,10 @@ public class LoginController implements LoginControllerAPI {
                 FunctionPointVo functionPointVo5 = ifContains(systemManagement, "5");
                 functionPointVo5.setFunctionPoint("设施服务设置");
                 vos13.add(functionPointVo5);
+
+                FunctionPointVo functionPointVo6 = ifContains(systemManagement, "5");
+                functionPointVo6.setFunctionPoint("查看界面");
+                vos13.add(functionPointVo6);
             }
             menuBarVo13.setFunctionPoints(vos13);
             menuBarVos.add(menuBarVo13);

src/main/java/com/template/model/vo/HousedetailsVo.java

@@ -37,6 +37,8 @@ public class HousedetailsVo {
     @ApiModelProperty(value = "房间图片")
     private String roomPicture;
 
+    private String housePicture;
+
 //  房间号
     private String roomIds;
 }

src/main/resources/application-dev.yml

@@ -6,6 +6,14 @@ server:
 spring:
   main:
     allow-circular-references: true
+
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 10MB
+      max-request-size: 10MB
+
   datasource:
     username: root
     password: Chuanghai_test

src/main/resources/application-prod.yml

@@ -6,6 +6,12 @@ server:
 spring:
   main:
     allow-circular-references: true
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 10MB
+      max-request-size: 10MB
   datasource:
     username: root
     password: Chuanghai_test

src/main/resources/application.yml

@@ -8,6 +8,13 @@ spring:
       active: dev
   main:
     allow-circular-references: true
+  servlet:
+    multipart:
+      enabled: true
+      file-size-threshold: 0
+      max-file-size: 10MB
+      max-request-size: 10MB
+
   datasource:
     username: root
     password: Chuanghai_test