Pārlūkot izejas kodu

修复bug-电梯未定位时,不能开始保养

别傲 5 gadi atpakaļ
vecāks
revīzija
de877d0ba4

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

@@ -82,8 +82,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      * @description 计算维保工开始保养时,是否在电梯200米范围内
      * @date 2020/1/13 11:30 上午
      */
-    public boolean calc(Long id, String coordinate) {
-        String liftCoordinate = getCoordinate(id);
+    public boolean calc(String liftCoordinate, String coordinate) {
         double expected = 200;
         double result = MapHelper.GetPointDistance(liftCoordinate, coordinate);
         return (result * 1000) > expected;
@@ -113,9 +112,11 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         MaintenanceRecord record = request.getRecord();
         Long planId = record.getMtPlanId();
         Long mtCompanyId = record.getMtCompanyId();
+        String liftCoordinate = getCoordinate(record.getLiftId());
+        if (StrUtil.isEmpty(liftCoordinate)) return RestResponse.fail(MessageUtils.get("msg.lift.not.position"));
         boolean count = count(planId,mtCompanyId);
         if (count) return  RestResponse.fail(MessageUtils.get("msg.exist.record"));
-        boolean result = calc(record.getLiftId(), request.getCoordinate());
+        boolean result = calc(liftCoordinate, request.getCoordinate());
         if (result) return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
         Long liftId = record.getLiftId();
         Optional<Lift> lift = liftService.getOne(null, liftId);

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

@@ -1,4 +1,3 @@
-msg.data.empty=\u6682\u65E0\u6570\u636E
 msg.query.success=\u67E5\u8BE2\u5217\u8868\u6210\u529F
 msg.query.detail.success=\u67E5\u8BE2\u8BE6\u60C5\u6210\u529F
 msg.add.success=\u65B0\u589E\u6210\u529F
@@ -13,9 +12,9 @@ msg.modify.batch.success=\u6279\u91CF\u4FEE\u6539\u6210\u529F
 msg.modify.batch.fail=\u6279\u91CF\u4FEE\u6539\u5931\u8D25
 msg.limit.num=\u5F53\u524D\u7535\u68AF\u53F0\u91CF\u5927\u4E8E\u4F01\u4E1A\u8BBE\u7F6E\u7535\u68AF\u53F0\u91CF
 msg.param.empty=\u53C2\u6570\u4E0D\u80FD\u4E3A\u7A7A
-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.lift.not.position=\u8BE5\u7535\u68AF\u672A\u5B9A\u4F4D\uFF0C\u65E0\u6CD5\u5F00\u59CB\u4FDD\u517B
 msg.pre.judge=\u524D\u7F6E\u6821\u9A8C\u901A\u8FC7
 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