Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-wcz

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -67,24 +67,24 @@ public class ApiConstants {
     public static final String CURRENT_USER_TYPE = "currentUserType";
 
     /**
-     *  访问类型 app端访问
+     *  访问类型 pc端访问
      */
-    public static final int ACCESS_TYPE_PC = 1;
+    public static final int ACCESS_TYPE_PC = 0;
 
     /**
      *  访问类型 app端访问
      */
-    public static final int ACCESS_TYPE_APP = 2;
+    public static final int ACCESS_TYPE_APP = 1;
 
     /**
-     *  访问类型 app端访问
+     *  访问类型 公众号端访问
      */
-    public static final int ACCESS_TYPE_PUBLIC = 3;
+    public static final int ACCESS_TYPE_PUBLIC = 2;
 
     /**
-     *  访问类型 app端访问
+     *  访问类型 小程序端访问
      */
-    public static final int ACCESS_TYPE_APPLETS = 4;
+    public static final int ACCESS_TYPE_APPLETS = 3;
 
     /**
      * 已删除

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/dto/request/PlatformCalendarRequest.java

@@ -35,6 +35,11 @@ public class PlatformCalendarRequest {
      */
     private String monthEndStr;
 
+    /**
+     * 电梯状态
+     */
+    private Integer calendarLiftStatus;
+
     public String getRequestDateStr(){
         if(StringUtils.isNotBlank(requestDateStr)) {
             return requestDateStr + "-01";

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/service/PlatformCalendarService.java

@@ -46,7 +46,7 @@ public class PlatformCalendarService {
                 dayToCalendarLiftMap.forEach((status, calendarLiftList) -> {
                     if (calendarLiftList != null) {
                         if (status != 0) {
-                            statusToLiftNum.put(status, calendarLiftList.stream().count());
+                            statusToLiftNum.put(status, (long) calendarLiftList.size());
                         }
                     }
                 });
@@ -72,11 +72,19 @@ public class PlatformCalendarService {
         Map<Integer, List<CalendarLiftDataModel>> statusToLiftData = dayToCalendarLift.get(CommonUtil.getDateStrDayValue(
                 platformCalendarRequest.getRequestDateDayStr(), CommonConstants.PlatformCalendarConstants.TRANS_DATE_FORMAT));
         if (statusToLiftData != null && statusToLiftData.size() > 0) {
-            statusToLiftData.forEach((status, calendarLiftList) -> {
-                if(status != 0) {
-                    calendarLiftDataModelList.addAll(calendarLiftList);
-                }
-            });
+            if (platformCalendarRequest.getCalendarLiftStatus() == null) {
+                //如果不传类型就获取所有状态的电梯数据
+                List<CalendarLiftDataModel> finalCalendarLiftDataModelList = calendarLiftDataModelList;
+                statusToLiftData.forEach((status, calendarLiftList) -> {
+                    if (status != 0) {
+                        finalCalendarLiftDataModelList.addAll(calendarLiftList);
+                    }
+                });
+                calendarLiftDataModelList = finalCalendarLiftDataModelList;
+            } else {
+                //传类型就获取指定状态的电梯数据
+                calendarLiftDataModelList = statusToLiftData.get(platformCalendarRequest.getCalendarLiftStatus());
+            }
         }
         //去除id相同的电梯数据
         removeDuplicationLift(calendarLiftDataModelList);

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/LoginService.java

@@ -113,7 +113,8 @@ public class LoginService implements ILoginService {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号尚未注册");
         }
         //判断用户是否为物管端用户
-        if (ApiConstants.UserConstants.PUBLIC_TYPE_USER == userAccount.getType()) {
+        int userType = userAccount.getType() != null ? userAccount.getType() : ApiConstants.UserConstants.TYPE_USER;
+        if (ApiConstants.UserConstants.PUBLIC_TYPE_USER == userType) {
             //物管端用户，查看登录端
             if (ApiConstants.ACCESS_TYPE_APPLETS == userRequest.getMobileType()
                     || ApiConstants.ACCESS_TYPE_PC == userRequest.getMobileType()) {

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/RoleService.java

@@ -101,15 +101,18 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         if (roleMapper.updateById(role) == 0) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新角色信息失败");
         }
-        //删除角色原来关联的菜单信息
-        if (roleMenuService.deleteRoleMenu(role.getId()) == 0) {
-            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新角色信息失败");
+        int roleMenuCount = roleMenuService.count(new QueryWrapper<RoleMenu>().eq("role_id", role.getId()));
+        if (roleMenuCount > 0) {
+            //删除角色原来关联的菜单信息
+            if (roleMenuService.deleteRoleMenu(role.getId()) == 0) {
+                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return RestResponse.fail(ApiConstants.RESULT_ERROR, "原有菜单删除失败");
+            }
         }
         //保存角色关联的新的菜单信息
-        if (roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds())) {
+        if (!roleMenuService.saveRoleMenu(role.getId(), roleRequest.getMenuIds())) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新角色信息失败");
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存新菜单失败");
         }
         return RestResponse.success(role, ApiConstants.RESULT_SUCCESS, "更新角色信息成功");
     }