项目相关接口加入验证

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

@@ -52,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();
@@ -67,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();
@@ -112,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/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/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 AND p.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}
+        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