Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectController.java

@@ -1,7 +1,6 @@
 package cn.com.ty.lift.business.project.controller;
 
 import cn.com.ty.lift.business.framework.util.MessageUtils;
-import cn.com.ty.lift.business.library.dao.entity.model.request.LiftLockRequest;
 import cn.com.ty.lift.business.library.dao.entity.model.request.SelectBatchPlatformCompanyRequest;
 import cn.com.ty.lift.business.library.service.PlatformCompanyLiftRelevanceService;
 import cn.com.ty.lift.business.project.dao.entity.Project;
@@ -53,7 +52,7 @@ public class ProjectController {
      * @date 2019/11/28 4:18 PM
      */
     @PostMapping("list")
-    public RestResponse list(@RequestBody ProjectRequest request) {
+    public RestResponse list(@Valid @RequestBody ProjectRequest request) {
         IPage<ProjectResponse> page =  projectService.list(request);
         if (ObjectUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
@@ -68,7 +67,7 @@ public class ProjectController {
      * @date 2019/12/9 10:32 AM
      */
     @PostMapping("companyList")
-    public RestResponse companyList(@RequestBody ProjectRequest request) {
+    public RestResponse companyList(@Valid @RequestBody ProjectCompanyRequest request) {
         IPage<ProjectResponse> page = projectService.companyList(request);
         if (ObjectUtil.isEmpty(page.getRecords())) {
             return RestResponse.success();
@@ -113,7 +112,7 @@ public class ProjectController {
      * @date 2019/12/13 2:40 PM
      */
     @PostMapping("projectIDList")
-    public RestResponse projectIDList(@RequestBody ProjectRequest request) {
+    public RestResponse projectIDList(@RequestBody ProjectRegionRequest request) {
         List<ProjectIDResponse> projectIDList = projectService.projectIDList(request);
         if (ObjectUtil.isEmpty(projectIDList)) {
             return RestResponse.success();

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectCompanyRequest.java

@@ -0,0 +1,38 @@
+package cn.com.ty.lift.business.project.dao.entity.model.request;
+
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author bieao
+ * @date 2020/1/3
+ * @description 公司项目列表请求体
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProjectCompanyRequest extends BaseRequestModel {
+
+
+    /**
+     * 甲方公司id
+     */
+    @NotNull(message = "notEmpty")
+    private Long ppCompanyId;
+
+    /**
+     * 甲方联系人id
+     */
+    @NotNull(message = "notEmpty")
+    private Long ppContactId;
+
+    /**
+     * 项目状态
+     */
+    @NotEmpty(message = "notEmpty")
+    private String projectStatus;
+
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectRegionRequest.java

@@ -0,0 +1,21 @@
+package cn.com.ty.lift.business.project.dao.entity.model.request;
+
+import lombok.Data;
+
+/**
+ * @author bieao
+ * @date 2020/1/3
+ * @description
+ */
+@Data
+public class ProjectRegionRequest {
+    /**
+     * 区域id
+     */
+    private Long regionId;
+
+    /**
+     * 维保公司id
+     */
+    private Long mtCompanyId;
+}

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/entity/model/request/ProjectRequest.java

@@ -4,6 +4,8 @@ import cn.com.xwy.boot.controller.BaseRequestModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.validation.constraints.NotNull;
+
 /**
  * @author bieao
  * @date 2019/11/28
@@ -40,20 +42,12 @@ public class ProjectRequest extends BaseRequestModel {
     /**
      * 项目状态
      */
-    private Byte projectStatus;
-
-    /**
-     * 甲方公司id
-     */
-    private Long ppCompanyId;
-
-    /**
-     * 甲方联系人id
-     */
-    private Long ppContactId;
+    @NotNull(message = "notEmpty")
+    private String projectStatus;
 
     /**
      * 维保公司id
      */
-    private String mtCompanyId;
+    @NotNull(message = "notEmpty")
+    private Long mtCompanyId;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/project/dao/mapper/ProjectMapper.java

@@ -2,9 +2,7 @@ package cn.com.ty.lift.business.project.dao.mapper;
 
 
 import cn.com.ty.lift.business.project.dao.entity.Project;
-import cn.com.ty.lift.business.project.dao.entity.model.request.CompanyRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectDetailRequest;
-import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest;
+import cn.com.ty.lift.business.project.dao.entity.model.request.*;
 import cn.com.ty.lift.business.project.dao.entity.model.response.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -21,9 +19,9 @@ public interface ProjectMapper extends BaseMapper<Project> {
 
     IPage<ProjectResponse> findByCondition(IPage<ProjectResponse> page, @Param("request") ProjectRequest request);
 
-    IPage<ProjectResponse> findCompanyListByCondition(IPage<ProjectResponse> page, @Param("request") ProjectRequest request);
+    IPage<ProjectResponse> findCompanyListByCondition(IPage<ProjectResponse> page, @Param("request") ProjectCompanyRequest request);
 
-    List<ProjectIDResponse> findProjectListByRegionId(@Param("request") ProjectRequest request);
+    List<ProjectIDResponse> findProjectListByRegionId(@Param("request") ProjectRegionRequest request);
 
     /**
      * @param request 项目id

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -103,10 +103,9 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2019/12/5 11:00 AM
      */
     public RestResponse liftLockOrUnLock(LiftLockRequest request) {
-        List<Long> list = request.getLiftList();
-        List<ProjectLiftRelevance> projectLiftList = list(request.getMtCompanyId(), list);
+        List<ProjectLiftRelevance> projectLiftList = list(request.getMtCompanyId(), request.getLiftList());
         if (ObjectUtil.isEmpty(projectLiftList)) {
-            return RestResponse.success();
+            return RestResponse.success(null, MessageUtils.get("msg.company.lift.empty"));
         }
         projectLiftList.forEach(entry -> entry.setLiftLocked(request.getLock()));
         boolean result = updateBatchById(projectLiftList);
@@ -134,14 +133,14 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
         //根据项目id和公司id查询项目下电梯
         List<ProjectLiftRelevance> relevanceList = baseMapper.findIdList(request);
         if (ObjectUtil.isEmpty(relevanceList)) {
-            return RestResponse.success();
+            return RestResponse.success(null, MessageUtils.get("msg.project.status.update"));
         }
         relevanceList.forEach(relevance -> relevance.setLiftLocked(request.getLock()));
         boolean response = updateBatchById(relevanceList);
         if (!response) {
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
-        return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, MessageUtils.get("msg.modify.success"));
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**

lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectService.java

@@ -1,12 +1,13 @@
 package cn.com.ty.lift.business.project.service;
 
-import cn.com.ty.lift.business.common.PinYinUtils;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.project.dao.entity.Project;
 import cn.com.ty.lift.business.project.dao.entity.ProjectHistory;
 import cn.com.ty.lift.business.project.dao.entity.ProjectUser;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectCompanyRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectExtensionRequest;
 import cn.com.ty.lift.business.project.dao.entity.*;
+import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRegionRequest;
 import cn.com.ty.lift.business.project.dao.entity.model.response.ProjectIDResponse;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectImportModel;
 import cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest;
@@ -101,7 +102,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 查询公司项目列表
      * @date 2019/12/9 10:32 AM
      */
-    public IPage<ProjectResponse> companyList(ProjectRequest request) {
+    public IPage<ProjectResponse> companyList(ProjectCompanyRequest request) {
         IPage<ProjectResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
         return projectMapper.findCompanyListByCondition(page, request);
     }
@@ -123,7 +124,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @description 项目ID和名称列表
      * @date 2019/12/16 4:21 PM
      */
-    public List<ProjectIDResponse> projectIDList(ProjectRequest request) {
+    public List<ProjectIDResponse> projectIDList(ProjectRegionRequest request) {
         return projectMapper.findProjectListByRegionId(request);
     }
 

lift-business-service/src/main/resources/locale/response.properties

@@ -15,4 +15,6 @@ msg.lift.library.exist=\u7535\u68AF\u5E93\u5DF2\u5B58\u5728\u8BE5\u7535\u68AF
 msg.lift.exist=\u516C\u53F8\u4E0B\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u4E0D\u80FD\u91CD\u590D\u6DFB\u52A0
 msg.lift.company.exist=\u5176\u4ED6\u516C\u53F8\u5DF2\u6709\u6B64\u7535\u68AF\uFF0C\u8FD4\u56DE\u7535\u68AF\u4FE1\u606F
 msg.pre.judge=\u524D\u7F6E\u6821\u9A8C\u901A\u8FC7
-notEmpty={0}\u4E0D\u80FD\u4E3A\u7A7A
+notEmpty={0}\u4E0D\u80FD\u4E3A\u7A7A
+msg.project.status.update=\u9879\u76EE\u9501\u5B9A\u72B6\u6001\u66F4\u65B0\u6210\u529F\uFF0C\u9879\u76EE\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u68AF
+msg.company.lift.empty=\u8BE5\u516C\u53F8\u4E0B\u6682\u65F6\u6CA1\u6709\u7535\u68AF

lift-business-service/src/main/resources/mapper/lift/LiftMapper.xml

@@ -62,7 +62,8 @@
 	</sql>
 
 	<!-- 根据区域，项目，电梯号，电梯品牌，电梯类型，维保工查询电梯列表信息-->
-	<select id="findByCondition" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse" parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest" >
+	<select id="findByCondition" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
+			parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest" >
         SELECT
 		l.id                     AS id,
 		l.lift_code              AS liftCode,
@@ -76,12 +77,12 @@
         plr.lift_locked          AS liftLocked
         FROM platform_company_lift_relevance pclr
         LEFT JOIN lift l ON pclr.lift_id = l.id
-        LEFT JOIN project_lift_relevance plr ON pclr.company_id = plr.company_id and pclr.lift_id = plr.lift_id
-        LEFT JOIN project p ON pclr.company_id = p.mt_company_id and plr.project_id = p.id
+        LEFT JOIN project_lift_relevance plr ON pclr.mt_company_id = plr.mt_company_id and pclr.lift_id = plr.lift_id
+        LEFT JOIN project p ON pclr.mt_company_id = p.mt_company_id and plr.project_id = p.id
         LEFT JOIN lift_brand lb ON l.lift_brand = lb.code
 		WHERE 1=1
         <if test="request.companyId!=null and request.companyId!=''">
-			AND pclr.company_id = #{request.companyId,jdbcType=BIGINT}
+			AND pclr.mt_company_id = #{request.companyId,jdbcType=BIGINT}
         </if>
 		<if test="request.liftStatus != null and request.liftStatus != '' and request.liftStatus == 1">
 			AND pclr.lift_company_status != 1
@@ -101,7 +102,8 @@
 	</select>
 
 	<!-- 查询项目下电梯列表 -->
-    <select id="findLiftListByProjectId" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse" parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.ProjectLiftRequest">
+    <select id="findLiftListByProjectId" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
+			parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.ProjectLiftRequest">
         SELECT
           l.id                      AS id,
           l.lift_code               AS liftCode,
@@ -122,7 +124,7 @@
           LEFT JOIN platform_company_lift_relevance pclr ON plr.lift_id = pclr.lift_id AND pclr.id = plr.relevance_id
         WHERE 1=1
 		<if test="request.companyId!=null and request.companyId!=''">
-			AND plr.company_id = #{request.companyId,jdbcType=BIGINT}
+			AND plr.mt_company_id = #{request.companyId,jdbcType=BIGINT}
 		</if>
         <if test="request.projectId!=null and request.projectId!=''">
             AND plr.project_id = #{request.projectId,jdbcType=BIGINT}
@@ -130,7 +132,8 @@
     </select>
 
 	<!-- 选择电梯 -->
-	<select id="chooseLiftList" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse" parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftChooseRequest">
+	<select id="chooseLiftList" resultType="cn.com.ty.lift.business.library.dao.entity.model.response.LiftResponse"
+			parameterType="cn.com.ty.lift.business.library.dao.entity.model.request.LiftChooseRequest">
 		SELECT
 		l.id                      AS id,
 		l.lift_code               AS liftCode,
@@ -150,7 +153,7 @@
 		AND pclr.lift_company_status != '1'
 		AND l.lift_status = '2'
 		<if test="request.companyId!=null and request.companyId!=''">
-			AND plr.company_id != #{request.companyId,jdbcType=BIGINT}
+			AND plr.mt_company_id != #{request.companyId,jdbcType=BIGINT}
 		</if>
 	</select>
 
@@ -170,13 +173,13 @@
 			plr.relevance_id,
 			plr.worker_id,
 			ui.`name` AS worker_name,
-			plr.company_id
+			plr.mt_company_id
 		FROM
 			lift li
 			LEFT JOIN project_lift_relevance plr ON li.id = plr.lift_id
 			LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		WHERE
-			plr.company_id = #{mtCompanyId}
+			plr.mt_company_id = #{mtCompanyId}
 			AND plr.project_id = #{projectId}
 	</select>
 

lift-business-service/src/main/resources/mapper/maintenance/MaintenancePlanMapper.xml

@@ -28,7 +28,7 @@
 		l.registration_code         AS registrationCode,
 		l.device_position           AS devicePosition,
 		plr.id                      AS relevanceId,
-		plr.company_id              AS mtCompanyId,
+		plr.mt_company_id           AS mtCompanyId,
 		plr.worker_id               AS workerId,
 		plr.plan_interval           AS planInterval,
 		p.id                        AS projectId,
@@ -39,15 +39,15 @@
 		ui.name                     AS workerName
 		FROM
 		project_lift_relevance plr
-		LEFT JOIN platform_company_lift_relevance pclr ON plr.company_id = pclr.company_id AND plr.lift_id = pclr.lift_id
+		LEFT JOIN platform_company_lift_relevance pclr ON plr.mt_company_id = pclr.mt_company_id AND plr.lift_id = pclr.lift_id
 		LEFT JOIN lift l ON plr.lift_id = l.id
-		LEFT JOIN project p ON plr.company_id = p.mt_company_id AND plr.project_id = p.id
-		LEFT JOIN maintenance_plan mp ON plr.company_id = mp.mt_company_id AND plr.project_id = mp.project_id
+		LEFT JOIN project p ON plr.mt_company_id = p.mt_company_id AND plr.project_id = p.id
+		LEFT JOIN maintenance_plan mp ON plr.mt_company_id = mp.mt_company_id AND plr.project_id = mp.project_id
 		AND mp.status = 0 AND mp.plan_date = (SELECT MIN(plan_date) FROM maintenance_plan WHERE status = 0
 		AND mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}) AND plr.lift_id = mp.lift_id
 		LEFT JOIN user_info ui ON plr.worker_id = ui.user_id
 		LEFT JOIN region r ON p.region_id = r.id
-		WHERE plr.company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
+		WHERE plr.mt_company_id = #{request.mtCompanyId,jdbcType=VARCHAR}
 		<if test="request.projectId!=null and request.projectId!=''">
 			AND p.id = #{request.projectId,jdbcType=BIGINT}
 		</if>

lift-business-service/src/main/resources/mapper/project/ProjectMapper.xml

@@ -68,7 +68,7 @@
         LEFT JOIN region r ON p.region_id = r.id
         LEFT JOIN user_info ui ON r.user_id = ui.user_id
         LEFT JOIN property_company pc ON p.pp_company_id = pc.id
-        WHERE 1 = 1
+        WHERE p.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
 		<if test="request.provinceCode!=null and request.provinceCode!=''">
 			AND p.province_code= #{request.provinceCode,jdbcType=VARCHAR}
 		</if>
@@ -96,7 +96,7 @@
 
 	<!-- 根据甲方公司ID和项目状态查询公司项目管理列表-->
 	<select id="findCompanyListByCondition" resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectResponse"
-			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest" >
+			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectCompanyRequest" >
 		SELECT
 		a.project_code as projectCode,
 		a.project_name as projectName,
@@ -130,7 +130,7 @@
 
 	<!--根据区域id或维保公司id查询项目id和名称列表 -->
 	<select id="findProjectListByRegionId" resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectIDResponse"
-			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest">
+			parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRegionRequest">
 		SELECT
 		  id           AS projectId,
 		  project_name AS projectName
@@ -156,7 +156,7 @@
 		LEFT JOIN project p ON plr.project_id = p.id
 		WHERE 1=1
 		<if test="request.companyId!=null and request.companyId!=''">
-			AND plr.company_id = #{request.companyId,jdbcType=VARCHAR}
+			AND plr.mt_company_id = #{request.companyId,jdbcType=VARCHAR}
 		</if>
 	</select>