From ba2094c7f6f6892f4cc3230b623472fc45dbd4af Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Fri, 4 Jun 2021 15:07:20 +0800 Subject: [PATCH] =?UTF-8?q?20210604=E4=BF=AE=E6=94=B9$?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/ccsens/recovery/api/PatientController.java | 1 - tall/src/main/resources/application.yml | 4 ++-- wisdomcar/src/main/resources/application.yml | 4 ++-- wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/recovery/src/main/java/com/ccsens/recovery/api/PatientController.java b/recovery/src/main/java/com/ccsens/recovery/api/PatientController.java index f10e0e0c..371a1bfc 100644 --- a/recovery/src/main/java/com/ccsens/recovery/api/PatientController.java +++ b/recovery/src/main/java/com/ccsens/recovery/api/PatientController.java @@ -111,7 +111,6 @@ public class PatientController { return JsonResponse.newInstance().ok(recipeRecordId); } - @MustLogin @ApiOperation(value = "结束训练", notes = "zy:") @RequestMapping(value = "/end", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse endDrill(@ApiParam @Validated @RequestBody QueryDto params) { diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index ebc544af..b5408a3a 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: test - include: util-test,common + active: dev + include: util-dev,common diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml b/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml index 00984c2e..3c9d0107 100644 --- a/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml +++ b/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 <= #{time} AND pc.end_time = 0 AND pc.start_time > #{time - 2 * 60 * 60 * 1000} order by pc.created_at desc limit 1 \ No newline at end of file