首页数据

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

@@ -223,6 +223,7 @@ public class CommonEnum {
 
         MTWORK("维保工", "ROLEMTWORK"),
         CLERK("文员", "CLERK"),
+        FINANCE("财务", "FINANCE"),
         REGION_DIRECTOR("区域主管", "REGION_DIRECTOR"),
         HIGH_DIRECTOR("总经理", "HIGH_DIRECTOR"),
         ENTERPRISE_ADMIN("企业管理员", "ENTERPRISE_ADMIN");

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

@@ -16,38 +16,42 @@ public class DefaultMenuConstants {
     public static final CommonEnum.DefaultRole[] DEFAULT_ROLE= {
             CommonEnum.DefaultRole.MTWORK,
             CommonEnum.DefaultRole.CLERK,
+            CommonEnum.DefaultRole.FINANCE,
             CommonEnum.DefaultRole.REGION_DIRECTOR,
-            CommonEnum.DefaultRole.HIGH_DIRECTOR
+            CommonEnum.DefaultRole.HIGH_DIRECTOR,
     };
     /**
      * 维保工默认菜单
      */
-    public static final Long[] MTWORK_MENUIDS = {1L, 2L, 3L};
+    public static final long[] MTWORK_MENUIDS = {};
     /**
      * 文员默认菜单
      */
-    public static final Long[] CLERK_MENUIDS = {1L, 2L, 3L};
+    public static final long[] CLERK_MENUIDS = {1L, 2L, 3L};
+    /**
+     * 财务默认菜单
+     */
+    public static final long[] FINANCE_MENUIDS = {};
     /**
      * 区域主管默认菜单
      */
-    public static final Long[] REGION_DIRECTOR_MENUIDS = {1L, 2L, 3L};
+    public static final long[] REGION_DIRECTOR_MENUIDS = {1L, 2L, 3L};
     /**
      * 高级主管默认菜单
      */
-    public static final Long[] HIGH_DIRECTOR_MENUIDS = {1L, 2L, 3L};
+    public static final long[] HIGH_DIRECTOR_MENUIDS = {1L, 2L, 3L};
     /**
      * 默认角色对应菜单信息
      */
-    public static Map<String, Long[]> DEFAULT_ROLE_MENUIDS = new HashMap<>();
+    public static Map<String, long[]> DEFAULT_ROLE_MENUIDS = new HashMap<>();
 
-    /**
-     * 初始化数据
-     */
     static {
         //设置维保工默认菜单
         DEFAULT_ROLE_MENUIDS.put(CommonEnum.DefaultRole.MTWORK.getCode(), MTWORK_MENUIDS);
         //设置文员默认菜单
         DEFAULT_ROLE_MENUIDS.put(CommonEnum.DefaultRole.CLERK.getCode(), CLERK_MENUIDS);
+        //设置财务默认菜单
+        DEFAULT_ROLE_MENUIDS.put(CommonEnum.DefaultRole.FINANCE.getCode(), FINANCE_MENUIDS);
         //设置区域主管默认菜单
         DEFAULT_ROLE_MENUIDS.put(CommonEnum.DefaultRole.REGION_DIRECTOR.getCode(), REGION_DIRECTOR_MENUIDS);
         //设置高级主管默认菜单

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

@@ -29,7 +29,9 @@ public class PushMessageConstants {
             //文员
             CommonEnum.DefaultRole.CLERK.getCode(),
             //维保工
-            CommonEnum.DefaultRole.MTWORK.getCode()
+            CommonEnum.DefaultRole.MTWORK.getCode(),
+            //财务
+            CommonEnum.DefaultRole.FINANCE.getCode(),
     };
 
     /**
@@ -45,13 +47,17 @@ public class PushMessageConstants {
      */
     public static final int PUSH_THREE = 3;
     /**
-     * 企业管理员 + 高级主管 + 区域主管 + 文员
+     * 企业管理员 + 高级主管 + 区域主管 + 财务
      */
     public static final int PUSH_FOUR = 4;
     /**
-     * 企业管理员 + 高级主管 + 区域主管 + 文员 + 维保工
+     * 企业管理员 + 高级主管 + 区域主管 + 财务 + 文员
      */
     public static final int PUSH_FIVE = 5;
+    /**
+     * 企业管理员 + 高级主管 + 区域主管 + 财务 + 文员 + 维保工
+     */
+    public static final int PUSH_SIX = 6;
 
     /**
      * 推送情形数组
@@ -61,7 +67,8 @@ public class PushMessageConstants {
             PUSH_TWO,
             PUSH_THREE,
             PUSH_FOUR,
-            PUSH_FIVE
+            PUSH_FIVE,
+            PUSH_SIX
     };
 
     static {

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

@@ -12,11 +12,11 @@ import javax.annotation.Resource;
 /**
  * @author huangyuan
  * @date 2020/2/14
- * @description
+ * @description 企业-电梯分布图
  */
 @RestController
-@RequestMapping("/home/lift")
-public class LiftDataController {
+@RequestMapping("/home/enterprise/lift")
+public class LiftDataEnterpriseController {
 
     @Resource
     private LiftDataService liftDataService;

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

@@ -12,10 +12,10 @@ import javax.annotation.Resource;
 /**
  * @author huangyuan
  * @date 2020/2/14
- * @description 平台日历
+ * @description 企业首页-日历
  */
 @RestController
-@RequestMapping("/home/calendar")
+@RequestMapping("/home/enterprise/calendar")
 public class PlatformCalendarController {
 
     @Resource

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

@@ -10,10 +10,10 @@ import javax.annotation.Resource;
 /**
  * @author huangyuan
  * @date 2020/2/14
- * @description 平台数据统计
+ * @description 平台首页-数据统计
  */
 @RestController
-@RequestMapping("/home/statistics")
+@RequestMapping("/home/platform/statistics")
 public class PlatformDataStatisticsController {
 
     @Resource

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

@@ -12,11 +12,11 @@ import javax.annotation.Resource;
 /**
  * @author huangyuan
  * @date 2020/2/14
- * @description 待办事项
+ * @description 企业 - 待办事项
  */
 @RestController
-@RequestMapping("/home/todo")
-public class TodoController {
+@RequestMapping("/home/enterprise/todo")
+public class TodoEnterpriseController {
 
     @Resource
     private TodoService todoService;
@@ -32,17 +32,6 @@ public class TodoController {
         return todoService.todoNum(todoRequest);
     }
 
-    /**
-     * @param
-     * @return
-     * @description 团队申请团队待办
-     * @date 2020/2/24 10:38 上午
-     */
-    @RequestMapping("/companyApplyTodo")
-    public RestResponse companyApplyTodo(@RequestBody TodoRequest todoRequest) {
-        return todoService.companyApplyTodo(todoRequest);
-    }
-
     /**
      * @param
      * @return

lift-system-service/src/main/java/cn/com/ty/lift/system/homepage/dao/mapper/HomeLiftDataMapper.java

@@ -1,6 +1,7 @@
 package cn.com.ty.lift.system.homepage.dao.mapper;
 
 import cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest;
+import cn.com.ty.lift.system.homepage.dao.dto.response.PlatformLiftData;
 import cn.com.ty.lift.system.homepage.dao.model.LiftMapDataModel;
 import cn.com.ty.lift.system.homepage.dao.model.LiftUnitsDataModel;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
@@ -38,4 +39,20 @@ public interface HomeLiftDataMapper {
      * @date 2020/2/19 1:30 下午
      */
     List<LiftMapDataModel> getCompanyLiftData(LiftDataRequest liftDataRequest);
+
+    /**
+     * @param liftDataRequest 电梯数据请求
+     * @return 电梯数据
+     * @description 获取总电梯数量
+     * @date 2020/4/23 2:13 下午
+     */
+    Long getTotalLiftNum(LiftDataRequest liftDataRequest);
+
+    /**
+     * @param liftDataRequest 电梯请求数据
+     * @return 电梯数据
+     * @description
+     * @date 2020/4/23 3:00 下午
+     */
+    List<PlatformLiftData> getPlatformLiftList(LiftDataRequest liftDataRequest);
 }

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

@@ -5,6 +5,7 @@ import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest;
+import cn.com.ty.lift.system.homepage.dao.dto.response.PlatformLiftData;
 import cn.com.ty.lift.system.homepage.dao.mapper.CommonDataMapper;
 import cn.com.ty.lift.system.homepage.dao.mapper.HomeLiftDataMapper;
 import cn.com.ty.lift.system.homepage.dao.model.EmergencyRecordDataModel;
@@ -274,5 +275,26 @@ public class LiftDataService {
         return new HashMap<>();
     }
 
+    /**
+     * @param liftDataRequest 平台电梯数量
+     * @description 获取平台电梯数量
+     * @date 2020/4/23 2:07 下午
+     */
+    public RestResponse liftPlatformNum(LiftDataRequest liftDataRequest) {
+        Long totalLiftNum = homeLiftDataMapper.getTotalLiftNum(liftDataRequest);
+        Map<String, Long> liftNum = new HashMap<>();
+        liftNum.put("totalLiftNum", totalLiftNum != null ? totalLiftNum : 0L);
+        return RestResponse.success(liftNum, ApiConstants.RESULT_SUCCESS, "获取总电梯数量成功");
+    }
 
+    /**
+     * @param liftDataRequest 请求数据
+     * @return 平台电梯数据
+     * @description 获取平台电梯数据
+     * @date 2020/4/23 2:57 下午
+     */
+    public RestResponse getPlatformLiftList(LiftDataRequest liftDataRequest) {
+        List<PlatformLiftData> platformLiftData = homeLiftDataMapper.getPlatformLiftList(liftDataRequest);
+        return RestResponse.success(platformLiftData, ApiConstants.RESULT_SUCCESS, "获取平台电梯数据成功");
+    }
 }

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

@@ -55,7 +55,7 @@ public class TodoService {
                 .eq("status", ApiConstants.ApplicationConstants.APPLY_WAIT)
         );
         //公司申请待办,平台公司才能有公司申请待办
-        if (todoRequest.getMtCompanyId() == ApiConstants.PLATFORM_COMPANY_ID) {
+        if (todoRequest.getMtCompanyId().equals(ApiConstants.PLATFORM_COMPANY_ID)) {
             long platCompanyTodoCount = mtCompanyAttestationService.count(new QueryWrapper<MtCompanyAttestation>()
                     .eq("is_certificated", ApiConstants.CompanyConstants.MAINTENANCE_WAIT_CERTIFICATE)
             );

lift-system-service/src/main/resources/mapper/CommonDataMapper.xml

@@ -93,7 +93,7 @@
             parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            <include refid="companyIdToCountSql"></include>
+            <include refid="companyIdToCountSql"/>
         from
             project
         group by
@@ -101,7 +101,7 @@
         having
             1=1
             <!-- 判断公司id是否在集合中 -->
-            <include refid="setCompanyId"></include>
+            <include refid="setCompanyId"/>
 
     </select>
 
@@ -110,7 +110,7 @@
             parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            <include refid="companyIdToCountSql"></include>
+            <include refid="companyIdToCountSql"/>
         from
             maintenance_record
         group by
@@ -118,7 +118,7 @@
         having
             1=1
             <!-- 判断公司id是否在集合中 -->
-            <include refid="setCompanyId"></include>
+            <include refid="setCompanyId"/>
     </select>
 
     <!-- 获取公司急修记录 -->
@@ -126,7 +126,7 @@
             parameterType="cn.com.ty.lift.system.settings.dao.entity.model.MaintenanceCompanyRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.CountDataModel">
         select
-            <include refid="companyIdToCountSql"></include>
+            <include refid="companyIdToCountSql"/>
         from
             emergency_repair
         group by
@@ -134,7 +134,7 @@
         having
             1=1
             <!-- 判断公司id是否在集合中 -->
-            <include refid="setCompanyId"></include>
+            <include refid="setCompanyId"/>
     </select>
 
     <!--################################################################################-->
@@ -146,7 +146,7 @@
             parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.MtPlanDataModel">
         select
-            <include refid="liftInfoSql"></include>
+            <include refid="liftInfoSql"/>
             mp.plan_date as planDate,
             mp.status as status
         from
@@ -155,7 +155,7 @@
             lift l
         on
             mp.lift_id = l.id
-            <include refid="liftInfoJoinSql"></include>
+            <include refid="liftInfoJoinSql"/>
         where
             mp.mt_company_id = #{mtCompanyId}
         and
@@ -170,7 +170,7 @@
             parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.MtRecordDataModel">
         select
-            <include refid="liftInfoSql"></include>
+            <include refid="liftInfoSql"/>
             mr.work_date as workDate,
             mr.status as status
         from
@@ -179,7 +179,7 @@
             lift l
         on
             mr.lift_id = l.id
-            <include refid="liftInfoJoinSql"></include>
+            <include refid="liftInfoJoinSql"/>
         where
             mr.mt_company_id = #{mtCompanyId}
         and
@@ -194,7 +194,7 @@
             parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.EmergencyRecordDataModel">
         select
-            <include refid="liftInfoSql"></include>
+            <include refid="liftInfoSql"/>
             er.caller_date as callerDate,
             er.recovery_date as recoveryDate,
             er.status as status
@@ -204,7 +204,7 @@
             lift l
         on
             er.lift_id = l.id
-            <include refid="liftInfoJoinSql"></include>
+            <include refid="liftInfoJoinSql"/>
         where
             er.mt_company_id = #{mtCompanyId}
         and
@@ -219,7 +219,7 @@
             parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest"
             resultType="cn.com.ty.lift.system.homepage.dao.model.AnnualInspectionDataModel">
         select
-            <include refid="liftInfoSql"></include>
+            <include refid="liftInfoSql"/>
             ai.finish_time as finishTime,
             ai.status as status
         from
@@ -228,7 +228,7 @@
             lift l
         on
             ai.lift_id = l.id
-            <include refid="liftInfoJoinSql"></include>
+            <include refid="liftInfoJoinSql"/>
         where
             ai.mt_company_id = #{mtCompanyId}
         and

lift-system-service/src/main/resources/mapper/HomeLiftDataMapper.xml

@@ -72,4 +72,25 @@
         </if>
     </select>
 
+    <!-- 获取总电梯数量-->
+    <select id="getTotalLiftNum" parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest"
+            resultType="java.lang.Long">
+        select
+            count(1)
+        from
+            lift
+    </select>
+
+    <!-- 获取平台电梯数量 -->
+    <select id="getPlatformLiftList" parameterType="cn.com.ty.lift.system.homepage.dao.dto.request.LiftDataRequest"
+            resultType="cn.com.ty.lift.system.homepage.dao.dto.response.PlatformLiftData">
+        select
+            id as liftId,
+            registration_code as registrationCode,
+            lift_code as liftCode,
+            lift_type as liftType,
+            coordinate
+        from
+            lift
+    </select>
 </mapper>

lift-system-service/src/main/resources/mapper/TodoDataMapper.xml

@@ -54,8 +54,8 @@
             user_info ui
         on
             mp.worker_id = ui.user_id
-        <include refid="maintenanceTodoQuerySql"></include>
-        <include refid="pageQuerySql"></include>
+        <include refid="maintenanceTodoQuerySql"/>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取急修待办数据 -->
@@ -88,8 +88,8 @@
             user_info ui
         on
             er.worker_id = ui.user_id
-        <include refid="emergencyTodoQuerySql"></include>
-        <include refid="pageQuerySql"></include>
+        <include refid="emergencyTodoQuerySql"/>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取大修待办事项 -->
@@ -105,8 +105,8 @@
             cr.push_flag as pushFlag
         from
             capital_repair cr
-        <include refid="capitalTodoQuerySql"></include>
-        <include refid="pageQuerySql"></include>
+        <include refid="capitalTodoQuerySql"/>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取年检待办数据 -->
@@ -141,8 +141,8 @@
             user_info ui
         on
             ui.user_id = plr.worker_id
-        <include refid="annualInspectionTodoSql"></include>
-        <include refid="pageQuerySql"></include>
+        <include refid="annualInspectionTodoSql"/>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取团队申请待办信息 -->
@@ -160,7 +160,7 @@
             mt_company_attestation mca
         where
             mca.is_certificated = #{isCertificated}
-        <include refid="pageQuerySql"></include>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取团队成员申请待办信息 -->
@@ -188,7 +188,7 @@
             ua.mt_company_id = #{mtCompanyId}
         and
             ua.status = ${status}
-        <include refid="pageQuerySql"></include>
+        <include refid="pageQuerySql"/>
     </select>
 
     <!-- 获取急修待办条数 -->
@@ -199,7 +199,7 @@
             count(1)
         from
             emergency_repair er
-        <include refid="emergencyTodoQuerySql"></include>
+        <include refid="emergencyTodoQuerySql"/>
     </select>
 
     <!-- 获取维保待办条数 -->
@@ -210,7 +210,7 @@
             count(1)
         from
             maintenance_plan mp
-        <include refid="maintenanceTodoQuerySql"></include>
+        <include refid="maintenanceTodoQuerySql"/>
     </select>
 
     <!-- 获取大修待办条数 -->
@@ -221,7 +221,7 @@
             count(1)
         from
             capital_repair cr
-        <include refid="capitalTodoQuerySql"></include>
+        <include refid="capitalTodoQuerySql"/>
     </select>
 
     <!-- 获取年检待办条数 -->
@@ -232,7 +232,7 @@
             count(1)
         from
             annual_inspection ai
-        <include refid="annualInspectionTodoSql"></include>
+        <include refid="annualInspectionTodoSql"/>
     </select>
 
 </mapper>

lift-system-service/src/main/resources/mapper/UserRoleMapper.xml

@@ -15,9 +15,9 @@
 	<!-- 通过用户id和公司id获取角色用户关联关系 -->
 	<select id="getByUserRole" parameterType="cn.com.ty.lift.system.user.dao.entity.UserRole" resultType="cn.com.ty.lift.system.user.dao.entity.UserRole">
 		select
-		<include refid="Base_Column_List"></include>
+		<include refid="Base_Column_List"/>
 		from user_role
-		where  1=1
+		where  true
 		<if test="userId != null">
 			and user_id = #{userId,jdbcType=BIGINT}
 		</if>