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

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/service/SignInService.java

@@ -108,6 +108,7 @@ public class SignInService extends ServiceImpl<SignInMapper, SignIn> {
         LambdaQueryWrapper<SignIn> lambdaQueryWrapper = queryWrapper.lambda();
         lambdaQueryWrapper.eq(SignIn::getMtCompanyId, request.getMtCompanyId());
         lambdaQueryWrapper.eq(SignIn::getProjectId, request.getProjectId());
+        lambdaQueryWrapper.eq(Objects.nonNull(request.getSignDate()), SignIn::getSignDate, request.getSignDate());
         //考勤记录列表
         ArrayList<SignIn> recordList = (ArrayList<SignIn>) list(lambdaQueryWrapper);
 

lift-business-service/src/main/java/cn/com/ty/lift/business/library/service/LiftService.java

@@ -223,6 +223,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
      * @date 2020/5/5 9:26 下午
      */
     public void sendAddMessage(Long liftId, Long projectId, Long mtCompanyId) {
+        log.info("新增电梯开始消息推送");
         //消息推送
         List<Long> userIds = new ArrayList<>();
         Region region = pushUserService.findRegionByProject(projectId, mtCompanyId);
@@ -235,6 +236,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
             List<PushUserInfo> userInfos = pushUserService.listByUserIds(mtCompanyId, userIds);
             pushUserInfos.addAll(userInfos);
         }
+        log.info("新增电梯推送人员：" + pushUserInfos.toString());
         if (!pushUserInfos.isEmpty()) {
             Optional<Project> project = projectService.getOne(projectId);
             if (project.isPresent()) {
@@ -250,6 +252,7 @@ public class LiftService extends ServiceImpl<LiftMapper, Lift> {
                     SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, sendToUserIdList, pushMessage.getContent(),
                             WebSocketConstants.MessageType.WORK_MSG);
                 });
+                log.info("新增电梯消息推送结束");
             }
         }
     }

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

@@ -18,6 +18,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordRes
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
 import cn.com.ty.lift.common.constants.CommonEnum;
 import cn.com.ty.lift.common.utils.MapHelper;
+import cn.com.ty.lift.common.verify.VerifyUtils;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import cn.hutool.core.collection.IterUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -128,13 +129,23 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         Long planId = record.getMtPlanId();
         Long mtCompanyId = record.getMtCompanyId();
         Long workerId = record.getWorkerId();
-        String liftCoordinate = getCoordinate(record.getLiftId());
+        Long liftId = record.getLiftId();
+        //校验电梯是否定位
+        String liftCoordinate = getCoordinate(liftId);
         if (StrUtil.isEmpty(liftCoordinate)) return RestResponse.fail(MessageUtils.get("msg.lift.not.position"));
+        //查询该电梯是否有保养记录
         boolean count = count(planId, mtCompanyId, workerId);
-        if (count) return RestResponse.fail(MessageUtils.get("msg.exist.record"));
-        boolean result = calc(liftCoordinate, request.getCoordinate());
-        if (result) return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
-        Long liftId = record.getLiftId();
+        if (count)
+            return RestResponse.fail(MessageUtils.get("msg.exist.record"));
+        String coordinate = request.getCoordinate();
+        //校验是否为经纬度
+        boolean verifyResult = VerifyUtils.preJudgment(coordinate);
+        if (!verifyResult)
+            return RestResponse.fail(MessageUtils.get("msg.longitude.error"));
+        //维保工是否在电梯附近
+        boolean result = calc(liftCoordinate, coordinate);
+        if (result)
+            return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
         Optional<Lift> lift = liftService.getOne(null, liftId);
         if (lift.isPresent()) {
             Lift l = lift.get();
@@ -224,6 +235,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @description 查看保养信息详情
      * @date 2020/1/13 2:39 下午
      */
+    @Deprecated
     public MaintenanceRecordDetailResponse queryById(Long id) {
         MaintenanceRecord record = getById(id);
         List<MtRecordImg> imgList = mtRecordImgService.listByRecord(id);

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

@@ -131,6 +131,7 @@ public class ProjectAppController {
      * @description 查看保养记录
      * @date 2020/1/13 2:33 下午
      */
+    @Deprecated
     @PostMapping("record/detail")
     @Validation(fields = {"id"})
     public RestResponse detail(@Val @RequestBody MaintenanceRecordRequest request) {

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

@@ -80,13 +80,15 @@
         p.id                     AS projectId,
         plr.lift_locked          AS liftLocked,
         plr.worker_id            AS workerId,
-        ac.mobile                AS mobile
+        ac.mobile                AS mobile,
+        ui.name                  AS workerName
         FROM platform_company_lift_relevance pclr
         LEFT JOIN lift l ON pclr.lift_id = l.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
         LEFT JOIN user_account ac ON ac.user_id = plr.worker_id
+        LEFT JOIN user_info ui ON ui.user_id = plr.worker_id
         <where>
         <if test="request.mtCompanyId!=null and request.mtCompanyId!=''">
             AND pclr.mt_company_id = #{request.mtCompanyId,jdbcType=BIGINT}