修改app编辑保养记录接口，增加保养单地址

lift-business-service/src/main/java/cn/com/ty/lift/business/framework/conf/MetaHandler.java

@@ -48,8 +48,9 @@ public class MetaHandler implements MetaObjectHandler {
     }
 
     private Long getUserId() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-                .getRequest();
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (Objects.isNull(servletRequestAttributes)) return 10000L;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
         HttpSession session = request.getSession();
         Object userId = session.getAttribute(ApiConstants.CURRENT_USER_ID);
         if (ObjectUtil.isNotEmpty(userId)) {

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/MtRecordImg.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.business.maintenance.dao.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,8 +26,8 @@ public class MtRecordImg implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId("id")
-    private Integer id;
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Long id;
     /**
      * 维保记录ID
      */

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

@@ -7,8 +7,10 @@ import lombok.EqualsAndHashCode;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * @author bieao
@@ -80,6 +82,12 @@ public class MaintenanceRecordRequest extends PageRequest {
     @NotNull(message = "结束日期不能为空")
     private LocalDate endTime;
 
+    /**
+     * 保养图片列表
+     */
+    @NotEmpty(message = "保养单列表不能为空")
+    private List<String> recordImageList;
+
     /**
      * 保养信息
      */

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -150,15 +150,36 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     }
 
     /**
-     * @param record 保养信息
+     * @param request 保养信息
      * @return 是否成功
      * @description 编辑保养信息
      * @date 2020/1/13 2:31 下午
      */
-    public boolean modify(MaintenanceRecord record){
+    public RestResponse modify(MaintenanceRecordRequest request) {
+        MaintenanceRecord record = request.getRecord();
+        MaintenanceRecord detail = detail(record.getId());
+        if (Objects.isNull(detail))
+            return RestResponse.success(null, MessageUtils.get("msg.record.not.exist"));
         record.setRecoveryDate(LocalDateTime.now());
         record.setStatus(CommonEnum.MaintenanceRecordStatus.COMPLETE.getCode());
-        return updateById(record);
+        boolean result = updateById(record);
+        if (!result){
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        List<MtRecordImg> imageList = new ArrayList<>();
+        //更新保养图片
+        request.getRecordImageList().forEach(entry -> {
+            MtRecordImg image = new MtRecordImg();
+            image.setImgUrl(entry);
+            image.setMtRecordId(record.getId());
+            imageList.add(image);
+        });
+        boolean ret = mtRecordImgService.updateBatchById(imageList);
+        if (!ret){
+            rollback();
+            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
+        }
+        return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
     }
 
     /**

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

@@ -113,20 +113,15 @@ public class ProjectAppController {
     }
 
     /**
-     * @param record app端保养信息
+     * @param request app端保养信息
      * @return 1.成功, 0.失败, 消息描述
      * @description 编辑保养记录
      * @date 2020/1/13 2:33 下午
      */
     @PostMapping("record/modify")
-    @Validation(fields = {"id"})
-    public RestResponse modify(@Val @RequestBody MaintenanceRecord record) {
-        boolean result = maintenanceRecordService.modify(record);
-        if (result) {
-            return RestResponse.success(null, MessageUtils.get("msg.modify.success"));
-        } else {
-            return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
-        }
+    @Validation(fields = {"id", "recordImageList"})
+    public RestResponse modify(@Val @RequestBody MaintenanceRecordRequest request) {
+        return maintenanceRecordService.modify(request);
     }
 
     /**
@@ -170,7 +165,7 @@ public class ProjectAppController {
     @PostMapping("project/detail")
     @Validation(fields = {"id"})
     public RestResponse detail(@Val @RequestBody ProjectRequest request) {
-        ProjectDetailResponse response = projectAppService.detail(request);
+        ProjectDetailResponse response = projectAppService.detail(request.getId());
         if (ObjectUtil.isEmpty(response)) {
             return RestResponse.success();
         }

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

@@ -25,6 +25,10 @@ public class ProjectDetailResponse {
      * 实际台量
      */
     private Integer actualNum;
+    /**
+     * 台量
+     */
+    private Integer num;
     /**
      * 省
      */

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

@@ -40,12 +40,12 @@ public interface ProjectMapper extends BaseMapper<Project> {
     IPage<ProjectCompanyResponse> findListByCompanyId(IPage<ProjectCompanyResponse> page, @Param("request") ProjectRequest request);
 
     /**
-     * @param request 项目id
+     * @param projectId 项目id
      * @return ProjectDetailResponse 项目详情
      * @description 根据项目id查询项目详情
      * @date 2020/1/2 10:52 上午
      */
-    ProjectDetailResponse findProjectById(@Param("request") ProjectRequest request);
+    ProjectDetailResponse findProjectById(@Param("id") Long projectId);
 
     /**
      * @param projectIdList 项目id列表

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

@@ -113,13 +113,13 @@ public class ProjectAppService extends ServiceImpl<ProjectMapper, Project> {
     }
 
     /**
-     * @param request 项目id
+     * @param projectId 项目id
      * @return RestResponse 项目详情
      * @description 根据项目id查询项目详情
      * @date 2020/1/2 1:50 下午
      */
-    public ProjectDetailResponse detail(ProjectRequest request) {
-        return baseMapper.findProjectById(request);
+    public ProjectDetailResponse detail(Long projectId) {
+        return baseMapper.findProjectById(projectId);
     }
 
     /**

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

@@ -29,6 +29,7 @@ msg.sign.limit=\u4ECA\u65E5\u5DF2\u7B7E\u5230
 msg.user.not.exist=\u7B26\u5408\u6761\u4EF6\u7684\u7EF4\u4FDD\u5DE5\u4E0D\u5B58\u5728\uFF0C\u8BF7\u6838\u5B9E\u6570\u636E
 msg.time.error=\u5F00\u59CB\u65F6\u95F4\u4E0D\u80FD\u665A\u4E8E\u7ED3\u675F\u65F6\u95F4
 msg.capital.not.exist=\u5927\u4FEE\u9879\u76EE\u4E0D\u5B58\u5728
+msg.record.not.exist=\u4FDD\u517B\u5355\u4E0D\u5B58\u5728
 msg.lift.not.exist=\u7535\u68AF\u4E0D\u5B58\u5728
 msg.project.not.exist=\u9879\u76EE\u4E0D\u5B58\u5728
 msg.contract.not.exist=\u5408\u540C\u4E0D\u5B58\u5728

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

@@ -190,7 +190,7 @@
 	</select>
 
 	<!--app端 根据项目id查询项目详情 -->
-	<select id="findProjectById" parameterType="cn.com.ty.lift.business.project.dao.entity.model.request.ProjectRequest"
+	<select id="findProjectById" parameterType="java.lang.Long"
 			resultType="cn.com.ty.lift.business.project.dao.entity.model.response.ProjectDetailResponse">
 		SELECT t.*,
 			   ui.name         AS clerkName,
@@ -200,6 +200,7 @@
 					 p.project_usage AS projectUsage,
 					 p.address       AS address,
 					 p.actual_num    AS actualNum,
+		             p.num           As num,
 					 p.province      AS province,
 					 p.city          AS city,
 					 p.district      AS district,

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/config/MetaHandler.java

@@ -41,20 +41,21 @@ public class MetaHandler implements MetaObjectHandler {
     @Override
     public void updateFill(MetaObject metaObject) {
         //获取当前登陆用户id
-        Long userId = 100L;
+        Long userId = getUserId();
         LocalDateTime now = LocalDateTime.now();
         setFieldValByName(UPDATE_ID, userId, metaObject);
         setFieldValByName(UPDATE_DATE, now, metaObject);
     }
 
     private long getUserId() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-                .getRequest();
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (Objects.isNull(servletRequestAttributes)) return 10000L;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
         HttpSession session = request.getSession();
         Object userId = session.getAttribute(ApiConstants.CURRENT_USER_ID);
         if (ObjectUtil.isNotEmpty(userId)) {
             return Long.parseLong(Objects.toString(userId));
         }
-        return 10000;
+        return 10000L;
     }
 }

lift-quan-service/src/main/java/cn/com/ty/lift/quan/config/MetaHandler.java

@@ -41,15 +41,16 @@ public class MetaHandler implements MetaObjectHandler {
     @Override
     public void updateFill(MetaObject metaObject) {
         //获取当前登陆用户id
-        Long userId = 100L;
+        Long userId = getUserId();
         LocalDateTime now = LocalDateTime.now();
         setFieldValByName(UPDATE_ID, userId, metaObject);
         setFieldValByName(UPDATE_DATE, now, metaObject);
     }
 
     private long getUserId() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-                .getRequest();
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (Objects.isNull(servletRequestAttributes)) return 10000L;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
         HttpSession session = request.getSession();
         Object userId = session.getAttribute(ApiConstants.CURRENT_USER_ID);
         if (ObjectUtil.isNotEmpty(userId)) {

lift-system-service/src/main/java/cn/com/ty/lift/system/config/MetaHandler.java

@@ -41,20 +41,21 @@ public class MetaHandler implements MetaObjectHandler {
     @Override
     public void updateFill(MetaObject metaObject) {
         //获取当前登陆用户id
-        Long userId = 100L;
+        Long userId = getUserId();
         LocalDateTime now = LocalDateTime.now();
         setFieldValByName(UPDATE_ID, userId, metaObject);
         setFieldValByName(UPDATE_DATE, now, metaObject);
     }
 
     private long getUserId() {
-        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes())
-                .getRequest();
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+        if (Objects.isNull(servletRequestAttributes)) return 10000L;
+        HttpServletRequest request = servletRequestAttributes.getRequest();
         HttpSession session = request.getSession();
         Object userId = session.getAttribute(ApiConstants.CURRENT_USER_ID);
         if (ObjectUtil.isNotEmpty(userId)) {
             return Long.parseLong(Objects.toString(userId));
         }
-        return 10000;
+        return 10000L;
     }
 }