[chg] app端统计进行中的年检，急修移到common中

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/controller/AnnualInspectionController.java

@@ -540,14 +540,4 @@ public class AnnualInspectionController {
         IPage<InspectionResponse> pages = annualInspectionService.pageByLift(request);
         return RestResponse.success(pages);
     }
-
-    /**
-     * 根据用户统计进行中的年检总数
-     */
-    @PostMapping("countDoing")
-    @Verifier(fields = {"mtCompanyId", "userId"})
-    public RestResponse countDoing(@Ver @RequestBody InspectionRequest request){
-        long count = annualInspectionService.countDoingByUser(request);
-        return RestResponse.success(count);
-    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/mapper/AnnualInspectionMapper.java

@@ -3,6 +3,7 @@ package cn.com.ty.lift.business.annualinspection.mapper;
 import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.dto.InspectionResponse;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
+import cn.com.ty.lift.business.common.CommonRequest;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -34,5 +35,5 @@ public interface AnnualInspectionMapper extends BaseMapper<AnnualInspection> {
 
     IPage<InspectionResponse> pageByLift(IPage<InspectionResponse> page, @Param("cond") InspectionRequest request);
 
-    long countDoingByUser(@Param("cond") InspectionRequest request);
+    long countDoingByUser(@Param("cond") CommonRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/annualinspection/service/AnnualInspectionService.java

@@ -4,6 +4,7 @@ import cn.com.ty.lift.business.annualinspection.dto.InspectionRequest;
 import cn.com.ty.lift.business.annualinspection.dto.InspectionResponse;
 import cn.com.ty.lift.business.annualinspection.entity.AnnualInspection;
 import cn.com.ty.lift.business.annualinspection.mapper.AnnualInspectionMapper;
+import cn.com.ty.lift.business.common.CommonRequest;
 import cn.com.ty.lift.business.emergency.entity.EmergencyRepair;
 import cn.com.ty.lift.business.emergency.service.EmergencyRepairService;
 import cn.com.ty.lift.business.library.dao.entity.Lift;
@@ -282,7 +283,7 @@ public class AnnualInspectionService extends ServiceImpl<AnnualInspectionMapper,
         return getOne(lambdaQueryWrapper);
     }
 
-    public long countDoingByUser(InspectionRequest request){
+    public long countDoingByUser(CommonRequest request){
         return baseMapper.countDoingByUser(request);
     }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonController.java

@@ -1,11 +1,15 @@
 package cn.com.ty.lift.business.common;
 
+import cn.com.ty.lift.business.annualinspection.service.AnnualInspectionService;
+import cn.com.ty.lift.business.emergency.service.EmergencyRepairService;
 import cn.com.ty.lift.business.framework.conf.SystemConfiguration;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.LiftBrand;
 import cn.com.ty.lift.common.constants.RedisConstants;
 import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.ty.lift.common.utils.ValuePool;
+import cn.com.ty.lift.common.verify.Ver;
+import cn.com.ty.lift.common.verify.Verifier;
 import cn.com.ty.lift.common.verify.Verify;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.date.DateUtil;
@@ -15,10 +19,7 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
@@ -38,6 +39,8 @@ public class CommonController {
 
     private RedisTemplate<String, Object> redisTemplate;
     private SystemConfiguration           systemConfiguration;
+    private AnnualInspectionService       annualInspectionService;
+    private EmergencyRepairService        emergencyRepairService;
 
     /**
      * @return RestResponse 省、市、区树形结构列表
@@ -167,4 +170,15 @@ public class CommonController {
         log.info("上传文件，新文件名：{}", fileName);
         return fileName;
     }
+
+    @PostMapping("countDoing")
+    @Verifier(fields = {"mtCompanyId", "userId"})
+    public RestResponse countDoing(@Ver @RequestBody CommonRequest request){
+        long inspection = annualInspectionService.countDoingByUser(request);
+        long repair = emergencyRepairService.countDoingByUser(request);
+        CommonResponse common = new CommonResponse();
+        common.setInspection(inspection);
+        common.setRepair(repair);
+        return RestResponse.success(common);
+    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonRequest.java

@@ -0,0 +1,25 @@
+package cn.com.ty.lift.business.common;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+
+/**
+ * TODO
+ *
+ * @author wcz
+ * @since 2020/4/24
+ */
+@Data
+public class CommonRequest {
+    /**
+     * 维保公司id
+     */
+    @Min(value = 1, message = "维保公司ID有误")
+    private Long mtCompanyId;
+    /**
+     * 当前用户
+     */
+    @Min(value = 1, message = "当前用户ID有误")
+    private Long userId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/common/CommonResponse.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.business.common;
+
+import lombok.Data;
+
+/**
+ * TODO
+ *
+ * @author wcz
+ * @since 2020/4/24
+ */
+@Data
+public class CommonResponse {
+
+    private long inspection;
+    private long repair;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/controller/EmergencyRepairController.java

@@ -890,14 +890,4 @@ public class EmergencyRepairController {
             }
         }
     }
-
-    /**
-     * 根据用户总计进行中的急修总数
-     */
-    @PostMapping("countDoing")
-    @Verifier(fields = {"mtCompanyId", "userId"})
-    public RestResponse countDoing(@Ver @RequestBody RepairRequest request){
-        long count = emergencyRepairService.countDoingByUser(request);
-        return RestResponse.success(count);
-    }
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/mapper/EmergencyRepairMapper.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.emergency.mapper;
 
+import cn.com.ty.lift.business.common.CommonRequest;
 import cn.com.ty.lift.business.emergency.dto.RepairRequest;
 import cn.com.ty.lift.business.emergency.dto.RepairResponse;
 import cn.com.ty.lift.business.emergency.entity.EmergencyRepair;
@@ -33,9 +34,9 @@ public interface EmergencyRepairMapper extends BaseMapper<EmergencyRepair> {
 
     List<RepairResponse> listByIdList(@Param("cond") RepairRequest request);
 
-    long countDoingByWorker(@Param("cond") RepairRequest request);
+    long countDoingByWorker(@Param("cond") CommonRequest request);
 
-    long countDoingByUser(@Param("cond") RepairRequest request);
+    long countDoingByUser(@Param("cond") CommonRequest request);
 
-    String findUserRole(@Param("cond") RepairRequest request);
+    String findUserRole(@Param("cond") CommonRequest request);
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/emergency/service/EmergencyRepairService.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.emergency.service;
 
+import cn.com.ty.lift.business.common.CommonRequest;
 import cn.com.ty.lift.business.emergency.dto.RepairRequest;
 import cn.com.ty.lift.business.emergency.dto.RepairResponse;
 import cn.com.ty.lift.business.emergency.entity.EmergencyHistory;
@@ -505,7 +506,7 @@ public class EmergencyRepairService extends ServiceImpl<EmergencyRepairMapper, E
         return RestResponse.success(true);
     }
 
-    public long countDoingByUser(RepairRequest request){
+    public long countDoingByUser(CommonRequest request){
         String userRole = baseMapper.findUserRole(request);
         if(Objects.nonNull(userRole)){
             if(Objects.equals("13", userRole)){

lift-business-service/src/main/resources/mapper/annualinspection/AnnualInspectionMapper.xml

@@ -238,7 +238,7 @@
         </where>
     </select>
 
-    <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.annualinspection.dto.InspectionRequest">
+    <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">
         SELECT
             count( * )
         FROM

lift-business-service/src/main/resources/mapper/emergency/EmergencyRepairMapper.xml

@@ -286,7 +286,7 @@
 		</where>
 	</select>
 
-    <select id="countDoingByWorker" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest">
+    <select id="countDoingByWorker" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">
         SELECT
             count(*)
         FROM
@@ -301,7 +301,7 @@
 
     </select>
 
-    <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest">
+    <select id="countDoingByUser" resultType="java.lang.Long" parameterType="cn.com.ty.lift.business.common.CommonRequest">
         SELECT
             count(*)
         FROM
@@ -316,17 +316,17 @@
         </if>
     </select>
 
-    <select id="findUserRole" resultType="java.lang.String" parameterType="cn.com.ty.lift.business.emergency.dto.RepairRequest">
+    <select id="findUserRole" resultType="java.lang.String" parameterType="cn.com.ty.lift.business.common.CommonRequest">
         SELECT
-            user_role
+            pu.user_role
         FROM
-            project_user
+            project_user pu
         <where>
             <if test="cond.userId != null and cond.userId > 0">
-                AND user_id = #{cond.userId}
+                AND pu.user_id = #{cond.userId}
             </if>
             <if test="cond.mtCompanyId != null and cond.mtCompanyId > 0">
-                AND mt_company_id = #{cond.mtCompanyId}
+                AND pu.mt_company_id = #{cond.mtCompanyId}
             </if>
         </where>
     </select>