Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into wanghaicheng

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/dao/model/AnnualInspectionDataModel.java

@@ -2,8 +2,9 @@ package cn.com.ty.lift.batch.applet.dao.model;
 
 import cn.com.ty.lift.batch.applet.constants.DataStatisticsConstants;
 import lombok.Data;
+import org.apache.commons.lang3.StringUtils;
 
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 
 /**
@@ -16,7 +17,7 @@ public class AnnualInspectionDataModel extends BaseDataModel {
     /**
      * 计划年检时间
      */
-    private LocalDateTime planDate;
+    private LocalDate planDate;
     /**
      * 年检状态（0 待完成；1 已完成；2 超期）
      */
@@ -52,11 +53,13 @@ public class AnnualInspectionDataModel extends BaseDataModel {
      * @return
      * @description 获取年检计划时间，格式为yyyy-MM-dd
      */
-    public LocalDateTime getPlanDate() {
+    public LocalDate getPlanDate() {
         if (planDate != null) {
             //转换日期格式为yyyy-MM-dd
             String planDateStr = planDate.format(DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
-            return LocalDateTime.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            if (StringUtils.isNotBlank(planDateStr)) {
+                return LocalDate.parse(planDateStr, DateTimeFormatter.ofPattern(DataStatisticsConstants.PLAN_DATE_FORMAT));
+            }
         }
         return null;
     }

lift-batch-service/src/main/java/cn/com/ty/lift/batch/applet/service/AnnualInspectionDataService.java

@@ -65,7 +65,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate());
+                                return a.getPlanDate().isAfter(annualInspectionDataRequest.getStartTimeDate().toLocalDate());
                             }
                             return false;
                         })
@@ -76,7 +76,7 @@ public class AnnualInspectionDataService {
                 annualInspectionDataModelList = annualInspectionDataModelList.stream()
                         .filter(a -> {
                             if (a.getPlanDate() != null) {
-                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate());
+                                a.getPlanDate().isBefore(annualInspectionDataRequest.getEndTimeDate().toLocalDate());
                             }
                             return false;
                         })

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

@@ -48,4 +48,8 @@ public class MaintenancePlanPrintResponse {
      * 打印时间
      */
     private LocalDateTime printTime = LocalDateTime.now();
+    /**
+     * 当前月份天数
+     */
+    private Integer monthDay;
 }

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

@@ -399,14 +399,14 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
 
         //组装电梯列表中的维保计划数据
         for (LiftPrintResponse entry : liftList) {
-            List<Map<String,Object>> plans = new ArrayList<>();
+            List<Map<String, Object>> plans = new ArrayList<>();
             for (MaintenancePlan plan : planList) {
                 if (entry.getProjectId().equals(plan.getProjectId())
                         && entry.getLiftId().equals(plan.getLiftId())
-                        && entry.getMtCompanyId().equals(plan.getMtCompanyId())){
-                    Map<String,Object> map = new HashMap<>();
-                    map.put("planDate",plan.getPlanDate());
-                    map.put("type",plan.getType());
+                        && entry.getMtCompanyId().equals(plan.getMtCompanyId())) {
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("planDate", plan.getPlanDate());
+                    map.put("type", plan.getType());
                     plans.add(map);
                 }
             }

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

@@ -27,5 +27,6 @@ public class ProjectPrintRequest {
     /**
      * 当前年月日
      */
+    @NotNull(message = "notEmpty")
     private LocalDate beginTime;
 }

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

@@ -304,6 +304,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
      * @date 2020/3/2 4:54 下午
      */
     public MaintenancePlanPrintResponse planPrint(ProjectPrintRequest request) {
+        Integer monthDay = request.getBeginTime().lengthOfMonth();
         //根据项目id查询项目详情
         MaintenancePlanPrintResponse project = baseMapper.findProjectByIdAndCompanyId(request);
 
@@ -312,9 +313,10 @@ public class ProjectService extends ServiceImpl<ProjectMapper,Project> {
 
         List<Long> liftIdList = liftList.stream().map(ProjectLiftRelevance::getLiftId).collect(Collectors.toList());
         //根据公司id和电梯id列表查询维保计划列表
-        List<LiftPrintResponse> liftMaintenancePlanList = maintenancePlanService.getLiftMaintenancePlanList(request.getMtCompanyId(), liftIdList,request.getBeginTime());
+        List<LiftPrintResponse> liftMaintenancePlanList = maintenancePlanService.getLiftMaintenancePlanList(request.getMtCompanyId(), liftIdList, request.getBeginTime());
         project.setLiftList(liftMaintenancePlanList);
         project.setNum(liftList.size());
+        project.setMonthDay(monthDay);
         return project;
     }
 

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

@@ -248,8 +248,14 @@ public class LiftDataService {
      */
     private Map<Long, String> getLiftIdToMaintenanceRecordStatus(List<MtRecordDataModel> mtRecordDataModels) {
         if (mtRecordDataModels != null && mtRecordDataModels.size() > 0) {
+            mtRecordDataModels = mtRecordDataModels.stream().filter(mtRecordDataModel ->
+                    mtRecordDataModel.getLiftId() != null &&
+                            mtRecordDataModel.getStatus() != null)
+                    .collect(Collectors.toList());
             return mtRecordDataModels.stream()
-                    .collect(Collectors.toMap(MtRecordDataModel::getLiftId, MtRecordDataModel::getStatus));
+                    .collect(Collectors.toMap(
+                            MtRecordDataModel::getLiftId, MtRecordDataModel::getStatus
+                    ));
         }
         return new HashMap<>();
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserController.java

@@ -1,12 +1,9 @@
 package cn.com.ty.lift.system.user.controller;
 
-import cn.com.ty.lift.common.constants.ApiConstants;
-import cn.com.ty.lift.system.user.dao.entity.UserAccount;
 import cn.com.ty.lift.system.user.dao.entity.model.ChangeMobileRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserRequest;
 import cn.com.ty.lift.system.user.service.IUserService;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -33,9 +30,8 @@ public class UserController {
      * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(UserRequest userRequest) {
-        IPage<UserAccount> userAccountPage = userService.list(userRequest);
-        return RestResponse.success(userAccountPage, ApiConstants.RESULT_SUCCESS, "获取用户信息成功");
+    public RestResponse list(@RequestBody UserRequest userRequest) {
+        return userService.list(userRequest);
     }
 
     /**

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserResponse.java

@@ -6,7 +6,7 @@ import cn.com.ty.lift.system.user.dao.entity.Role;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -22,7 +22,7 @@ public class UserResponse {
     private Integer type;//用户类型
     private String avatarUrl;//用户头像
     private BigDecimal balance;//余额
-    private Date createTime;//创建时间/注册时间
+    private LocalDateTime createTime;//创建时间/注册时间
     private Integer expertFlag;//专家标识
     private String token;//验证token
     private List<MaintenanceCompany> companyList;//用户所在团队信息集合

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IUserService.java

@@ -5,7 +5,6 @@ import cn.com.ty.lift.system.user.dao.entity.model.ChangeMobileRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserRequest;
 import cn.com.ty.lift.system.user.dao.entity.model.UserResponse;
 import cn.com.xwy.boot.web.dto.RestResponse;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 import java.util.Map;
@@ -30,7 +29,7 @@ public interface IUserService {
      * @description 获取用户列表信息
      * @date 2019/11/27 10:03 AM
      */
-    IPage<UserAccount> list(UserRequest userRequest);
+    RestResponse list(UserRequest userRequest);
 
     /**
      * @param userRequest 用户请求参数对象

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -20,6 +20,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +39,9 @@ public class UserService implements IUserService {
     @Resource
     private IUserInfoService userInfoService;
 
+    @Resource
+    private IUserService userService;
+
     @Resource
     private IMtCompanyUserService mtCompanyUserService;
 
@@ -68,6 +72,8 @@ public class UserService implements IUserService {
         //设置账号(小梯号)
         userAccount.setAccount(userRequest.getAccount());
         userAccount.setCreateDate(LocalDateTime.now());
+        //设置用户注册时间
+        userAccount.setCreateDate(LocalDateTime.now());
         //设置用户类型
         userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         //设置用户微信openId
@@ -96,17 +102,37 @@ public class UserService implements IUserService {
     }
 
     @Override
-    public IPage<UserAccount> list(UserRequest userRequest) {
-        IPage<UserAccount> userAccountPage = new Page<>(userRequest.getPageNum(), userRequest.getPageSize());
+    public RestResponse list(UserRequest userRequest) {
+        IPage userAccountPage = new Page<>(userRequest.getPageNum(), userRequest.getPageSize());
         userAccountPage = userAccountService.page(userAccountPage, new QueryWrapper<UserAccount>()
                 //通过用户名模糊查询
-                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "account", userRequest.getQueryCondition())
+                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "account",
+                        userRequest.getQueryCondition())
                 .or()
                 //通过用户手机号模糊查询
-                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "mobile", userRequest.getQueryCondition())
+                .like(StringUtils.isNotBlank(userRequest.getQueryCondition()), "mobile",
+                        userRequest.getQueryCondition())
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
-        return userAccountPage;
+        List<UserAccount> userAccountList = userAccountPage.getRecords();
+        if (userAccountList != null && userAccountList.size() > 0) {
+            List<Long> userIdList = ProjectUtils.getAttrList(userAccountList, "userId", null);
+            Map<Long, UserInfo> userIdToUserInfo = userInfoService.userIdToInfo(userIdList);
+            List<UserResponse> userResponseList = new ArrayList<>(10);
+            if (userIdToUserInfo != null && userIdToUserInfo.size() > 0) {
+                userAccountList.forEach(userAccount -> {
+                    UserResponse userResponse = new UserResponse();
+                    UserInfo userInfo = userIdToUserInfo.get(userAccount.getUserId());
+                    userResponse.setUserId(userAccount.getUserId());
+                    userResponse.setName(userInfo.getName());
+                    userResponse.setMobile(userInfo.getMobile());
+                    userResponse.setCreateTime(userAccount.getCreateDate());
+                    userResponseList.add(userResponse);
+                });
+            }
+            userAccountPage.setRecords(userResponseList);
+        }
+        return RestResponse.success(userAccountPage, "获取用户信息成功");
     }
 
     @Override
@@ -180,7 +206,7 @@ public class UserService implements IUserService {
             maintenanceCompanyService.setCompanyUserNum(maintenanceCompanyList);
             userResponse.setCompanyList(maintenanceCompanyList);
             //用户进入后的默认团队信息
-            if(maintenanceCompanyList != null && maintenanceCompanyList.size() > 0){
+            if (maintenanceCompanyList != null && maintenanceCompanyList.size() > 0) {
                 MaintenanceCompany maintenanceCompany = maintenanceCompanyList.get(0);
                 userResponse.setMaintenanceCompany(maintenanceCompany);
                 //获取用户在默认团队中的角色信息
@@ -300,17 +326,17 @@ public class UserService implements IUserService {
         //验证手机号验证码
         RestResponse restResponse = loginService.verifySmsCode(changeMobileRequest.getNewMobile(),
                 changeMobileRequest.getNewMobileSmsCode());
-        if(restResponse != null){
+        if (restResponse != null) {
             return restResponse;
         }
         //验证用户原来手机号是否有效
         UserAccount oldUserAccount = userAccountService.getByMobile(changeMobileRequest.getOldMobile());
-        if(oldUserAccount == null){
+        if (oldUserAccount == null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "原手尚未注册无法");
         }
         //校验新手机号是否已经存在
         UserAccount newUserAccount = userAccountService.getByMobile(changeMobileRequest.getNewMobile());
-        if(newUserAccount != null){
+        if (newUserAccount != null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "新手机号已经被注册，无法更换");
         }
         //校验通过，更换手机号

lift-system-service/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,8 @@
+{
+  "properties": [
+    {
+      "name": "mybatis-plus.mapper-locations",
+      "type": "java.lang.String",
+      "description": "Description for mybatis-plus.mapper-locations."
+  }
+] }