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/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java index 023dbfe1..3e7f2b34 100644 --- a/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java +++ b/util/src/main/java/com/ccsens/util/config/RabbitMQConfig.java @@ -18,6 +18,7 @@ public class RabbitMQConfig { public static final String GAME_STATUS = PropUtil.gameMqName; public static final String WISDOM_CAR = "wisdom_car"; + public static final String WISDOM_CAR_2 = "wisdom_car2"; public static final String BENEFICIATION = "beneficiation"; @@ -66,6 +67,11 @@ public class RabbitMQConfig { return new Queue(WISDOM_CAR); } + @Bean + public Queue wisdomCar2(){ + return new Queue(WISDOM_CAR_2); + } + @Bean public Queue beneficiation(){ diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java index c14c123c..ca4d7c17 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/rabbitMQ/RabbitController.java @@ -24,7 +24,7 @@ import java.util.*; @Slf4j @Component -@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR) +@RabbitListener(queues = RabbitMQConfig.WISDOM_CAR_2) public class RabbitController { @Resource private IRecordService recordService; diff --git a/wisdomcar/src/main/resources/application-prod.yml b/wisdomcar/src/main/resources/application-prod.yml index 9b2069d4..06d986e5 100644 --- a/wisdomcar/src/main/resources/application-prod.yml +++ b/wisdomcar/src/main/resources/application-prod.yml @@ -4,17 +4,17 @@ server: context-path: spring: application: - name: wisdomcar + name: wisdomcar2 datasource: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: - host: 127.0.0.1 + host: www.tall.wiki password: 111111 port: 5672 username: admin redis: database: 0 - host: 127.0.0.1 + host: www.tall.wiki jedis: pool: max-active: 200 diff --git a/wisdomcar/src/main/resources/application.yml b/wisdomcar/src/main/resources/application.yml index a47f2a7b..1ac895fc 100644 --- a/wisdomcar/src/main/resources/application.yml +++ b/wisdomcar/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: dev - include: common, util-dev + active: prod + include: common, util-prod diff --git a/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml b/wisdomcar/src/main/resources/mapper_dao/StepTaskDao.xml index 63396a10..37a07db0 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 + 2 * 60 * 60 * 1000 > #{time} + AND pc.start_time <= #{time} AND pc.end_time = 0 AND pc.start_time + 2 * 60 * 60 * 1000 > #{time} order by pc.created_at desc limit 1 \ No newline at end of file