push

yd-question-api/src/main/java/com/yd/question/api/controller/ApiQuestionnairesController.java

@@ -4,6 +4,7 @@ import com.yd.common.result.Result;
 import com.yd.question.api.service.ApiQuestionnairesService;
 import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
+import com.yd.question.feign.request.ApiObjectSaveRequest;
 import com.yd.question.feign.response.ApiAnswerSaveResponse;
 import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,4 +45,13 @@ public class ApiQuestionnairesController implements ApiQuestionnairesFeignClient
     public Result<ApiAnswerSaveResponse> answerSave(ApiAnswerSaveRequest request) {
         return apiQuestionnairesService.answerSave(request);
     }
+
+    /**
+     * 问卷-业务对象绑定
+     * @return
+     */
+    @Override
+    public Result objectSave(ApiObjectSaveRequest request) {
+        return apiQuestionnairesService.objectSave(request);
+    }
 }

yd-question-api/src/main/java/com/yd/question/api/service/ApiQuestionnairesService.java

@@ -2,6 +2,7 @@ package com.yd.question.api.service;
 
 import com.yd.common.result.Result;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
+import com.yd.question.feign.request.ApiObjectSaveRequest;
 import com.yd.question.feign.response.ApiAnswerSaveResponse;
 import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 
@@ -9,4 +10,6 @@ public interface ApiQuestionnairesService {
     Result<ApiQuestionnairesDetailResponse> detail(String questionnaireBizId, String objectBizId);
 
     Result<ApiAnswerSaveResponse> answerSave(ApiAnswerSaveRequest request);
+
+    Result objectSave(ApiObjectSaveRequest request);
 }

yd-question-api/src/main/java/com/yd/question/api/service/impl/ApiQuestionnairesServiceImpl.java

@@ -11,6 +11,7 @@ import com.yd.common.utils.RandomStringGenerator;
 import com.yd.question.api.service.ApiQuestionnairesService;
 import com.yd.question.feign.dto.*;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
+import com.yd.question.feign.request.ApiObjectSaveRequest;
 import com.yd.question.feign.response.ApiAnswerSaveResponse;
 import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import com.yd.question.service.dto.AnswerSessionsDto;
@@ -19,6 +20,7 @@ import com.yd.question.service.model.*;
 import com.yd.question.service.service.*;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -352,8 +354,14 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
             AnswerSessions answerSessions = answerSessionsList.get(0);
             apiAnswerSessionsDto = new ApiAnswerSessionsDto();
             BeanUtils.copyProperties(answerSessions,apiAnswerSessionsDto);
-            apiAnswerSessionsDto.setOptionJsonDtoList(apiAnswerSessionsDto.getOptionJsonDtoList());
-            apiAnswerSessionsDto.setQuestionTextJsonDtoList(apiAnswerSessionsDto.getQuestionTextJsonDtoList());
+            if (StringUtils.isNotBlank(apiAnswerSessionsDto.getOptionJson())) {
+                List<ApiOptionJsonDto> optionJsonDtoList = JSON.parseArray(apiAnswerSessionsDto.getOptionJson(),ApiOptionJsonDto.class);
+                apiAnswerSessionsDto.setOptionJsonDtoList(optionJsonDtoList);
+            }
+            if (StringUtils.isNotBlank(apiAnswerSessionsDto.getQuestionTextJson())) {
+                List<ApiQuestionTextJsonDto> questionTextJsonDtoList = JSON.parseArray(apiAnswerSessionsDto.getQuestionTextJson(),ApiQuestionTextJsonDto.class);
+                apiAnswerSessionsDto.setQuestionTextJsonDtoList(questionTextJsonDtoList);
+            }
         }
         return apiAnswerSessionsDto;
     }
@@ -408,6 +416,18 @@ public class ApiQuestionnairesServiceImpl implements ApiQuestionnairesService {
     }
 
     /**
+     * 问卷-业务对象绑定
+     * @return
+     */
+    @Override
+    public Result objectSave(ApiObjectSaveRequest request) {
+        RelObjectQuestionnaire relObjectQuestionnaire = new RelObjectQuestionnaire();
+        BeanUtils.copyProperties(request,relObjectQuestionnaire);
+        iRelObjectQuestionnaireService.saveOrUpdate(relObjectQuestionnaire);
+        return Result.success();
+    }
+
+    /**
      * 校验问卷信息是否存在
      * @param questionnaireBizId
      * @return

yd-question-api/src/main/resources/bootstrap.yml

@@ -56,7 +56,7 @@ spring:
           group: YD_GROUP
           refresh: true
         extension-configs: # 扩展配置
-          - data-id: yd-email-api.yml
+          - data-id: yd-question-api.yml
             group: YD_GROUP
             refresh: true
       # 发布到注册中心 （如果没有使用可以不配）

yd-question-feign/src/main/java/com/yd/question/feign/client/ApiQuestionnairesFeignClient.java

@@ -3,6 +3,7 @@ package com.yd.question.feign.client;
 import com.yd.common.result.Result;
 import com.yd.question.feign.fallback.ApiQuestionnairesFeignFallbackFactory;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
+import com.yd.question.feign.request.ApiObjectSaveRequest;
 import com.yd.question.feign.response.ApiAnswerSaveResponse;
 import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -34,4 +35,11 @@ public interface ApiQuestionnairesFeignClient {
      */
     @PostMapping("/answer/save")
     Result<ApiAnswerSaveResponse> answerSave(@Validated @RequestBody ApiAnswerSaveRequest request);
+
+    /**
+     * 问卷-业务对象绑定
+     * @return
+     */
+    @PostMapping("/object/save")
+    Result objectSave(@Validated @RequestBody ApiObjectSaveRequest request);
 }

yd-question-feign/src/main/java/com/yd/question/feign/fallback/ApiQuestionnairesFeignFallbackFactory.java

@@ -3,6 +3,7 @@ package com.yd.question.feign.fallback;
 import com.yd.common.result.Result;
 import com.yd.question.feign.client.ApiQuestionnairesFeignClient;
 import com.yd.question.feign.request.ApiAnswerSaveRequest;
+import com.yd.question.feign.request.ApiObjectSaveRequest;
 import com.yd.question.feign.response.ApiAnswerSaveResponse;
 import com.yd.question.feign.response.ApiQuestionnairesDetailResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -27,6 +28,11 @@ public class ApiQuestionnairesFeignFallbackFactory implements FallbackFactory<Ap
             public Result<ApiAnswerSaveResponse> answerSave(ApiAnswerSaveRequest request) {
                 return null;
             }
+
+            @Override
+            public Result objectSave(ApiObjectSaveRequest request) {
+                return null;
+            }
         };
     }
 }

yd-question-feign/src/main/java/com/yd/question/feign/request/ApiObjectSaveRequest.java

+package com.yd.question.feign.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ApiObjectSaveRequest {
+
+    /**
+     * 答题的对象业务ID（操作的业务对象，例：预约信息业务唯一ID）
+     */
+    @NotBlank(message = "答题的对象业务ID不能为空")
+    private String objectBizId;
+
+    /**
+     * 对象名
+     */
+    private String objectName;
+
+    /**
+     * 对象表名
+     */
+    private String objectTableName;
+
+    /**
+     * 答题选择的问卷唯一业务ID
+     */
+    @NotBlank(message = "答题选择的问卷唯一业务ID不能为空")
+    private String questionnaireBizId;
+
+}

yd-question-service/src/main/java/com/yd/question/service/model/RelObjectQuestionnaire.java

@@ -26,7 +26,7 @@ public class RelObjectQuestionnaire implements Serializable {
 
     /**
      * 主键id
-     Options
+     */
     @TableId(value = "id", type = IdType.AUTO)
     private Long id;