Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

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<PatientDto.EndDrill> params) {

recovery/src/main/resources/application-prod.yml

@@ -11,7 +11,7 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 127.0.0.1
+    host: 121.36.3.207
     password: 111111
     port: 5672
     username: admin
@@ -24,15 +24,15 @@ spring:
         max-idle: 10
         max-wait: -1ms
         min-idle: 0
-#    password: ''
+    password: ''
-    password: 'areowqr!@43ef'
+#    password: 'areowqr!@43ef'
     port: 6379
     timeout: 1000ms
 swagger:
   enable: false
 eureka:
   instance:
-    ip-address: 121.36.3.207
+    ip-address: 119.3.214.36
 
 gatewayUrl: https://www.tall.wiki/gateway/
 file:

recovery/src/main/resources/druid-prod.yml

@@ -15,8 +15,8 @@ spring:
       maxWait: 60000
       minEvictableIdleTimeMillis: 300000
       minIdle: 5
-#      password: 7cdefb88e0b8c8a401b66a83ee0cf80387461268074d1c3dcb146ab485318633
+      password: 68073a279b399baa1fa12cf39bfbb65bfc1480ffee7b659ccc81cf19be8c4473
-      password:
+#      password:
       poolPreparedStatements: true
       servletLogSlowSql: true
       servletLoginPassword: 111111
@@ -28,7 +28,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
-      url: jdbc:mysql://127.0.0.1/recovery?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
+      url: jdbc:mysql://121.36.3.207/recovery?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL
-      env: CCSENS_HEALTH
+      env: CCSENS_TALL

tall/src/main/resources/application.yml

@@ -1,5 +1,5 @@
 spring:
   profiles:
-    active: test
+    active: dev
-    include: util-test,common
+    include: util-dev,common
 

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(){

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;
     }

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;
     }

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;
 

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;

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());

wisdomcar/src/main/java/com/ccsens/wisdomcar/service/WisdomCarService.java

@@ -221,7 +221,9 @@ public class WisdomCarService implements IWisdomCarService {
                                 stepTask.setBatch(1);
                                 stepTask.setPatientId(patient.getId());
                                 stepTask.setTaskSubId(taskSub.getTaskSubId());
+                                if (CollectionUtil.isNotEmpty(steps)){
                                     stepTask.setStepId(steps.get(0).getId());
+                                }
                                 stepTaskDao.insertSelective(stepTask);
                             }
                         }
@@ -313,6 +315,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());

wisdomcar/src/main/resources/application-prod.yml

@@ -4,17 +4,20 @@ server:
     context-path:
 spring:
   application:
-    name: wisdomcar
+    name: wisdomcar2
+#    name: wisdomcar
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
   rabbitmq:
-    host: 127.0.0.1
+#    host: 127.0.0.1
+    host: 121.36.3.207
     password: 111111
     port: 5672
     username: admin
   redis:
     database: 0
-    host: 127.0.0.1
+    host: 121.36.3.207
+#    host: 127.0.0.1
     jedis:
       pool:
         max-active: 200
@@ -29,7 +32,7 @@ swagger:
   enable: true
 eureka:
   instance:
-    ip-address: 121.36.3.207
+    ip-address: 81.70.54.64
 
 gatewayUrl: https://www.tall.wiki/gateway/
 notGatewayUrl: https://www.tall.wiki/

wisdomcar/src/main/resources/application.yml

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: test
+    active: prod
-    include: common, util-test
+    include: common, util-prod
 
 

wisdomcar/src/main/resources/druid-prod.yml

@@ -27,6 +27,7 @@ spring:
       testOnReturn: false
       testWhileIdle: true
       timeBetweenEvictionRunsMillis: 60000
+#      url: jdbc:mysql://127.0.0.1/wisdomcar?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       url: jdbc:mysql://127.0.0.1/wisdomcar?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
       username: root
       validationQuery: SELECT 1 FROM DUAL

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
     </select>
 </mapper>