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/bean/dto/OtherRecordsDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java index 6adcc498..b7a01bbf 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -17,6 +18,7 @@ public class OtherRecordsDto { @Data @ApiModel("上传图片和记录") public static class PicturesAndRecords { + @NotNull(message="请说明您的任务") @ApiModelProperty("分解任务id") private Long id; @ApiModelProperty("上传图片") @@ -27,6 +29,7 @@ public class OtherRecordsDto { @Data @ApiModel("查询上传图片和记录") public static class QueryId { + @NotNull(message="请说明您的任务") @ApiModelProperty("分解任务id") private Long id; } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java index b5cb55dd..dc005625 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -49,6 +50,7 @@ public class PatientAndFamilyDto { @Data @ApiModel("查询患者参数") public static class queryPatientInfo{ + @NotNull(message="请说明您的项目") @ApiModelProperty("项目ID") private Long projectId; } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java index 0c6168e4..6a548da9 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java @@ -51,6 +51,7 @@ public class WisdomCarDto { @Data @ApiModel("查询绑定平车参数") public static class QueryInfo { + @NotNull(message="请说明您的任务") @ApiModelProperty("分解任务id") private Long taskSubId; 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/java/com/ccsens/wisdomcar/service/OtherRecordsService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java index 9ac1c009..6ed17829 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/OtherRecordsService.java @@ -97,6 +97,10 @@ public class OtherRecordsService implements IOtherRecordsService { PatientInformationRecordExample patientInformationRecordExample = new PatientInformationRecordExample(); patientInformationRecordExample.createCriteria().andTaskSubIdEqualTo(param.getId()); List patientInformationRecords = patientInformationRecordMapper.selectByExample(patientInformationRecordExample); + if(CollectionUtil.isEmpty(patientInformationRecords)){ + log.info("没有找到对应的的任务"); + throw new BaseException(CodeEnum.PARAM_ERROR); + } for (PatientInformationRecord patientInformationRecord : patientInformationRecords) { OtherRecordsVo.TypeAndComment query = new OtherRecordsVo.TypeAndComment(); query.setComment(patientInformationRecord.getContent()); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java index 6c11b9b8..34c3da78 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/RecordService.java +++ b/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); + } + } } diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java index d790b1cb..58ce3f63 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java +++ b/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 dto = new QueryDto<>(); @@ -313,6 +313,10 @@ public class WisdomCarService implements IWisdomCarService { @Override public List queryBindingCar(WisdomCarDto.QueryInfo param) { List bindingCarList = patientWisdomCarDao.queryBindingCarList(param.getTaskSubId()); + if(CollectionUtil.isEmpty(bindingCarList)){ + log.info("未找到对应的任务"); + throw new BaseException(CodeEnum.PARAM_ERROR); + } for (WisdomCarVo.BindingCarInfo bindingCar : bindingCarList) { //拿到患者id把 患者的信息存入 PatientProject patientProject = patientProjectDao.selectByPrimaryKey(bindingCar.getPatientId()); diff --git a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java index f8ee2289..5f2eecc4 100644 --- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java +++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/util/Constant.java @@ -52,7 +52,8 @@ public class Constant { /** * 智慧平车,模板项目id */ - public static final Long TEMPLATE_PROJECT = 1399649478197252096L; + public static final String TEMPLATE_PROJECT_KEY = "template_project_key"; +// public static final Long TEMPLATE_PROJECT = 1399649478197252096L; /** * 项目名字 */ 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 3c9d0107..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 <= #{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 + 2 * 60 * 60 * 1000 > #{time} order by pc.created_at desc limit 1 \ No newline at end of file