lyhzzz 1 год назад
Родитель
Сommit
0f61f14293

+ 3 - 1
README.md

@@ -115,4 +115,6 @@
 2.rtk管理
 3.计算优先级
 4.全景相机作品列表。    /overall/cameraSceneList
-~~~~
+~~~~
+
+

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/RtkAccountServiceImpl.java

@@ -104,7 +104,7 @@ public class RtkAccountServiceImpl extends ServiceImpl<IRtkAccountMapper, RtkAcc
         RtkUseLog rtkUseLog = rtkUseLogService.getByRtkSn(rtkSnCode);
         if(rtkUseLog != null && rtkUseLog.getRtkAccountId() != null){
             RtkAccount rtkAccount2 = this.getById(rtkUseLog.getRtkAccountId());
-            if(rtkAccount2 != null && rtkAccount2.getStatus() == 1 && rtkAccount2.getUseStatus() == 0 &&  rtkAccount2.getFailureTime().getTime() > new Date().getTime()){
+            if(rtkAccount2 != null && rtkAccount2.getStatus() == 1 && rtkAccount2.getUseStatus() == 0 && rtkAccount2.getFailureTime() !=null &&  rtkAccount2.getFailureTime().getTime() > new Date().getTime()){
                 rtkAccount = rtkAccount2;
             }
         }

BIN
src/main/resources/template/cameraOut.xlsx


BIN
src/main/resources/template/rtkAccount.xlsx


BIN
src/main/resources/template/rtkAccountFailureTime.xlsx