Merge remote-tracking branch 'origin/pt' into pt

recovery/src/main/java/com/ccsens/recovery/service/PatientService.java

@@ -107,7 +107,7 @@ public class PatientService implements IPatientService{
         PatientRobot patientRobot = new PatientRobot();
         patientRobot.setId(snowflake.nextId());
         patientRobot.setPatientId(patient.getId());
-        patientRobot.setPatientId(robot.getId());
+        patientRobot.setRobotId(param.getRobotId());
         patientRobot.setStartTime(System.currentTimeMillis());
         patientRobotMapper.insertSelective(patientRobot);
 
@@ -132,6 +132,7 @@ public class PatientService implements IPatientService{
         //存储一条训练记录
         RecipeRecord recRecord = new RecipeRecord();
         recRecord.setId(snowflake.nextId());
+        recRecord.setPatientId(param.getPatientId());
         recRecord.setStartTime(System.currentTimeMillis());
         recRecord.setDecomposeId(param.getRecipeProjectId());
         recRecord.setRecoveryDoctorId(param.getSceneDoctorId());
@@ -243,6 +244,7 @@ public class PatientService implements IPatientService{
     @Override
     public void completeRecovery(PatientDto.EndRecovery param, Long userId) throws Exception {
         //TODO 给患者和机器人关联的记录添加结束时间
+
         //TODO 将处方项目关联的任务设为完成
         //发送消息，让机器人切回康复中心的项目
         Set<String> userIdSet = new HashSet<>();

recovery/src/main/resources/application.yml

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

util/src/main/java/com/ccsens/util/baidu/BaiDuDto.java

@@ -15,5 +15,6 @@ public class BaiDuDto {
     public static class GeneralBasic{
         private String image;
         private String url;
+        private String detect_direction = "true";
     }
 }

wisdomcar/src/main/java/com/ccsens/wisdomcar/api/ProjectController.java

@@ -71,7 +71,7 @@ public class ProjectController {
         log.info("查询开始时间结束：{}", time);
         return JsonResponse.newInstance().ok(time);
     }
-    @MustLogin
+//    @MustLogin
     @ApiOperation(value = "图像识别", notes = "whj")
     @RequestMapping(value = "/identifyWords", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
     public JsonResponse<ProjectVo.PersonMsg> identifyWords(@RequestParam(required = true) Part part) throws IOException {