From a875909342e52116582a07b6c6b2f5287552f924 Mon Sep 17 00:00:00 2001
From: hyy-alt <1041001226@qq.com>
Date: Fri, 4 Jun 2021 15:06:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ccsens/wisdomcar/bean/dto/OtherRecordsDto.java   | 3 +++
 .../com/ccsens/wisdomcar/bean/dto/PatientAndFamilyDto.java    | 2 ++
 .../main/java/com/ccsens/wisdomcar/bean/dto/WisdomCarDto.java | 1 +
 .../com/ccsens/wisdomcar/service/OtherRecordsService.java     | 4 ++++
 .../java/com/ccsens/wisdomcar/service/WisdomCarService.java   | 4 ++++
 wisdomcar/src/main/resources/application.yml                  | 4 ++--
 6 files changed, 16 insertions(+), 2 deletions(-)

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/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<PatientInformationRecord> 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/WisdomCarService.java b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
index 97012455..97a22a05 100644
--- a/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
+++ b/wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java
@@ -303,6 +303,10 @@ public class WisdomCarService implements IWisdomCarService {
     @Override
     public List<WisdomCarVo.BindingCarInfo> queryBindingCar(WisdomCarDto.QueryInfo param) {
         List<WisdomCarVo.BindingCarInfo> 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/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