Merge remote-tracking branch 'origin/pt' into pt

# Conflicts:
#	wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java

@@ -157,7 +157,10 @@ public class RecordService implements IRecordService{
         if (carRecordMessageDto.getType() == Constant.CAR_RECORD_RFID && step != null && step.getStepType() == Constant.STEP_TYPE_REAL) {
             // TODO 异步推送数据
             StepTask stepTask = stepTaskDao.getByCarAndStep(wisdomCarRecord.getCarId(), step.getId(), wisdomCarRecord.getTime());
-            projectService.saveData(wisdomCarRecord.getTime(), stepTask, wisdomCarRecord.getId(), Constant.OPERATION_CAR);
+            if (stepTask != null) {
+                projectService.saveData(wisdomCarRecord.getTime(), stepTask, wisdomCarRecord.getId(), Constant.OPERATION_CAR);
+            }
+
         }
     }
 

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -184,7 +184,7 @@ public class WisdomCarService implements IWisdomCarService {
             newProjectName +="-"+param.getPatientName();
         }
         ProjectDto.CopyProject copyProject = new ProjectDto.CopyProject();
-        copyProject.setProjectId(Constant.TEMPLATE_PROJECT);
+        copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY));
         copyProject.setProjectName(newProjectName);
         log.info("调用tall内的复制项目:{}",copyProject);
         QueryDto<ProjectDto.CopyProject> dto = new QueryDto<>();

wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java

@@ -52,7 +52,8 @@ public class Constant {
     /**
      * 智慧平车,模板项目id
      */
-    public static final Long TEMPLATE_PROJECT = 1400648836304736256L;
+    public static final String TEMPLATE_PROJECT_KEY = "template_project_key";
+//    public static final Long TEMPLATE_PROJECT = 1399649478197252096L;
     /**
      * 项目名字
      */

wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml

@@ -23,7 +23,7 @@
         AND st.batch = st2.batch
         AND st2.step_id = #{stepId}
         AND pc.car_id = #{carId}
-        AND pc.start_time $lt;= #{time} AND pc.end_time = 0 AND pc.start_time > #{time - 2 * 60 * 60 * 1000}
+        AND pc.start_time $lt;= #{time} AND pc.end_time = 0 AND pc.start_time  + 2 * 60 * 60 * 1000 > #{time}
         order by pc.created_at desc limit 1
     </select>
 </mapper>