From ab6243cfc821e95def6b26dc5324a203d42bdb59 Mon Sep 17 00:00:00 2001
From: zy_Java <654600784@qq.com>
Date: Fri, 4 Jun 2021 20:37:56 +0800
Subject: [PATCH] 20210604v1.5

---
 .../wisdomcar/service/ProjectService.java       | 17 +++++++++--------
 wisdomcar/src/main/resources/application.yml    |  4 ++--
 wisdomcar/src/main/resources/druid-dev.yml      |  4 ++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
index 1d436860..63854a70 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/ProjectService.java
@@ -68,16 +68,14 @@ public class ProjectService implements IProjectService {
     @Override
     public void saveData(Long startTime, StepTask stepTask, Long operationId, byte operation) {
         //患者平车id
-        Long patientCarId = null;
+        // 修改平车结束时间点
+        ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
+
         // 判断是否为结束结点
         Step step = stepDao.selectByPrimaryKey(stepTask.getStepId());
         Integer max = stepDao.getMaxSequence(Constant.STEP_TYPE_REAL);
         if (step != null && max != null && step.getSequence() != null && step.getSequence().intValue() == max.intValue()) {
-            // 修改平车结束时间点
-            ProjectVo.BindCar bindCar = stepTaskDao.getBindCarTaskId(stepTask.getTaskSubId());
-            if(ObjectUtil.isNotNull(bindCar)){
-                patientCarId = bindCar.getCarId();
-            }
+
             boolean needModifyEndTime = bindCar != null && (bindCar.getEndTime() == null || bindCar.getEndTime() == 0);
             if (needModifyEndTime) {
                 log.info("出现异常，未找到绑定平车：{}", stepTask.getTaskSubId());
@@ -107,19 +105,22 @@ public class ProjectService implements IProjectService {
 
 
         PatientData data = new PatientData();
+
         data.setId(snowflake.nextId());
         if (operation == Constant.OPERATION_USER) {
             data.setUserId(operationId);
         } else {
             data.setWisdomCarRecordId(operationId);
         }
-        data.setPatientCarId(patientCarId);
-
+        if(ObjectUtil.isNotNull(bindCar)) {
+            data.setPatientCarId(bindCar.getId());
+        }
         data.setTaskSubId(stepTask.getTaskSubId());
         data.setStepId(stepTask.getStepId());
         data.setPushStatus(Constant.PUSH_STATUS_NO);
         data.setStartTime(startTime);
         data.setType(operation);
+        log.info("添加患者数据：{}", data);
         patientDataDao.insertSelective(data);
         // 异步推送数据 根据结果修改状态
         asyncService.pushTime(stepTask, data);
diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml
index 1ac895fc..a47f2a7b 100644
--- a/wisdomcar/src/main/resources/application.yml
+++ b/wisdomcar/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: prod
-    include: common, util-prod
+    active: dev
+    include: common, util-dev
 
 
diff --git a/wisdomcar/src/main/resources/druid-dev.yml b/wisdomcar/src/main/resources/druid-dev.yml
index 51522909..9e94758c 100644
--- a/wisdomcar/src/main/resources/druid-dev.yml
+++ b/wisdomcar/src/main/resources/druid-dev.yml
@@ -28,8 +28,8 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://49.233.89.188:3306/wisdomcar?useUnicode=true&characterEncoding=UTF-8
-#      url: jdbc:mysql://127.0.0.1/mt?useUnicode=true&characterEncoding=UTF-8
+#      url: jdbc:mysql://49.233.89.188:3306/wisdomcar?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://81.70.54.64/wisdomcar?useUnicode=true&characterEncoding=UTF-8
       username: root
       validationQuery: SELECT 1 FROM DUAL
 #      env: CCSENS_GAME