修改bug

cloudutil/src/main/resources/application-util-greenvalley.yml

@@ -43,6 +43,14 @@ feign:
         loggerLevel: basic
   hystrix:
     enabled: true
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 60000
 # sleuth
 logging:
   level:

cloudutil/src/main/resources/application-util-prod.yml

@@ -52,6 +52,13 @@ hystrix:
       coreSize: 200 #并发执行的最大线程数，默认10
       maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1
       queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 60000
 # sleuth
 logging:
   level:

cloudutil/src/main/resources/application-util-prodsd.yml

@@ -52,6 +52,13 @@ hystrix:
       coreSize: 200 #并发执行的最大线程数，默认10
       maxQueueSize: 1000 #BlockingQueue的最大队列数，默认值-1
       queueSizeRejectionThreshold: 800 #即使maxQueueSize没有达到，达到queueSizeRejectionThreshold该值后，请求也会被拒绝，默认值5
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 60000
 # sleuth
 logging:
   level:

cloudutil/src/main/resources/application-util-test.yml

@@ -110,6 +110,14 @@ feign:
         loggerLevel: basic
   hystrix:
     enabled: true
+hystrix:
+  command:
+    default:
+      execution:
+        isolation:
+          strategy: SEMAPHORE
+          thread:
+            timeoutInMilliseconds: 60000
 # sleuth
 logging:
   level:

wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java

@@ -21,7 +21,7 @@ public class WisdomCarDto {
 
     @Data
     @ApiModel("绑定平车")
-    public class BindingCar {
+    public static class BindingCar {
         @NotNull
         @ApiModelProperty("平车ID")
         private Long carId;
@@ -43,6 +43,6 @@ public class WisdomCarDto {
 
     @Data
     @ApiModel("平车数据上传")
-    public class UploadCarData {
+    public static class UploadCarData {
     }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/persist/dao/StepTaskDao.java

@@ -19,4 +19,13 @@ public interface StepTaskDao extends StepTaskMapper {
      * @return 绑定平车任务ID
      */
     ProjectVo.BindCar getBindCarTaskId(@Param("taskSubId") Long taskSubId);
+
+    /**
+     * 查询当前平车绑定的患者和对应的环节的绑定关系
+     * @param carId 平车ID
+     * @param stepId 环节ID
+     * @param time 数据的时间
+     * @return 任务环节
+     */
+    StepTask getByCarAndStep(@Param("carId") Long carId, @Param("stepId") Long stepId, @Param("time") Long time);
 }

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

@@ -51,7 +51,7 @@ public class AsyncService implements IAsyncService {
 
         // 推送开始时间
         TaskDto.StartTask startTask = new TaskDto.StartTask();
-        startTask.setTaskId(startTask.getTaskId());
+        startTask.setTaskId(stepTask.getTaskSubId());
         startTask.setRoleId(0L);
         startTask.setProjectId(patient.getProjectId());
         startTask.setStartTime(data.getStartTime());

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

@@ -17,6 +17,7 @@ import com.ccsens.wisdomcar.bean.vo.Message.CarRecordMessageVo;
 import com.ccsens.wisdomcar.bean.vo.RecordVo;
 import com.ccsens.wisdomcar.bean.vo.StepVo;
 import com.ccsens.wisdomcar.persist.dao.StepDao;
+import com.ccsens.wisdomcar.persist.dao.StepTaskDao;
 import com.ccsens.wisdomcar.persist.dao.WisdomCarRecordDao;
 import com.ccsens.wisdomcar.persist.mapper.*;
 import com.ccsens.wisdomcar.util.Constant;
@@ -60,6 +61,11 @@ public class RecordService implements IRecordService{
     private RedisUtil redisUtil;
     @Resource
     private WisdomCarRecordDao wisdomCarRecordDao;
+    @Resource
+    private StepTaskDao stepTaskDao;
+    @Resource
+    private IProjectService projectService;
+
     @Value("#{T(java.lang.Long).parseLong('${wisdom.weight:10000}')}")
     private Long weightMinus;
     @Value("#{T(java.lang.Long).parseLong('${wisdom.time:300000}')}")
@@ -150,8 +156,8 @@ public class RecordService implements IRecordService{
         // rfid且有对应的真实环节 存储患者数据表
         if (carRecordMessageDto.getType() == Constant.CAR_RECORD_RFID && step != null && step.getStepType() == Constant.STEP_TYPE_REAL) {
             // TODO 异步推送数据
-
-//            projectService.saveData(wisdomCarRecord.getTime(), , wisdomCarRecord.getId(), Constant.OPERATION_CAR);
+            StepTask stepTask = stepTaskDao.getByCarAndStep(wisdomCarRecord.getCarId(), step.getId(), wisdomCarRecord.getTime());
+            projectService.saveData(wisdomCarRecord.getTime(), stepTask, wisdomCarRecord.getId(), Constant.OPERATION_CAR);
         }
     }
 

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

@@ -265,20 +265,20 @@ public class WisdomCarService implements IWisdomCarService {
         pc.setTaskSubId(param.getTaskSubId());
         pc.setPatientId(patient.getId());
         pc.setCarId(param.getCarId());
+        pc.setStartTime(param.getStartTime());
+        pc.setEndTime(param.getEndTime());
         pc.setIsDemo(param.getDemo());
-
+        pc.setBindingStatus(Constant.PUSH_STATUS_NO);
         if (CollectionUtil.isEmpty(carRecords)) {
             pc.setBindingStatus(Constant.PUSH_STATUS_SUCCESS);
-        } else {
-            pc.setBindingStatus(Constant.PUSH_STATUS_NO);
+            patientWisdomCarDao.insertSelective(pc);
+            return;
         }
-
+        carRecords.forEach(record -> {
+            projectService.saveData(record.getTime(), record.getStepTask(), record.getId(), Constant.OPERATION_CAR);
+        });
+        pc.setBindingStatus(Constant.PUSH_STATUS_SUCCESS);
         patientWisdomCarDao.insertSelective(pc);
-        if (pc.getBindingStatus() == Constant.PUSH_STATUS_NO) {
-            carRecords.forEach(record -> {
-                projectService.saveData(record.getTime(), record.getStepTask(), record.getId(), Constant.OPERATION_CAR);
-            });
-        }
 
     }
 

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

@@ -10,4 +10,20 @@
         t_patient_wisdom_car c
         where batch.batch = st.batch and batch.patient_id = st.patient_id and step.id = st.step_id and st.task_sub_id = c.task_sub_id and st.rec_status = 0 and c.rec_status = 0 order by c.start_time desc limit 1
     </select>
+    <select id="getByCarAndStep" resultMap="com.ccsens.wisdomcar.persist.mapper.StepTaskMapper.BaseResultMap">
+        SELECT
+        st2.*
+        FROM
+        t_patient_wisdom_car pc,
+        t_step_task st,
+        t_step_task st2
+        WHERE
+        pc.task_sub_id = st.task_sub_id
+        AND pc.patient_id = st2.patient_id
+        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}
+        order by pc.created_at desc limit 1
+    </select>
 </mapper>

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

@@ -33,10 +33,10 @@ WHERE
 			or
 			<choose>
 				<when test="endTime == null or endTime = 0">
-					(startTime &lt;= #{startTime} and endTime &gt;=#{startTime})
+					(start_time &lt;= #{startTime} and end_time &gt;=#{startTime})
 				</when>
 				<otherwise>
-					(startTime &lt;= #{endTime} and endTime &gt;= #{startTime})
+					(start_time &lt;= #{endTime} and end_time &gt;= #{startTime})
 				</otherwise>
 			</choose>
 			 )