Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -445,6 +445,7 @@ CREATE TABLE `sweet_answer`
     `answer_id`   varchar(200)    NOT NULL DEFAULT '' COMMENT 'answer_id',
     `phone`       varchar(11)     NOT NULL DEFAULT '' COMMENT '手机号',
     `answer_json` varchar(255)    NOT NULL DEFAULT '' COMMENT '答案json',
+    `img_url`     varchar(255)    NOT NULL DEFAULT '' COMMENT '图片',
     `created_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
     PRIMARY KEY (`mid`),

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetAnswerController.java

@@ -43,9 +43,10 @@ public class SweetAnswerController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", dataType = "String", name = "phone", value = "手机号", required = true),
             @ApiImplicitParam(type = "form", dataType = "String", name = "answerJson", value = "答案json", required = true),
+            @ApiImplicitParam(type = "form", dataType = "String", name = "imgUrl", value = "图片地址", required = true),
     })
-    public ResponseDto<Boolean> add(@RequestParam() String phone, @RequestParam() String answerJson) {
-        return sweetAnswerService.create(phone, answerJson);
+    public ResponseDto<Boolean> add(@RequestParam() String phone, @RequestParam() String answerJson, @RequestParam() String imgUrl) {
+        return sweetAnswerService.create(phone, answerJson, imgUrl);
     }
 
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetAnswer.java

@@ -39,6 +39,11 @@ public class SweetAnswer implements Serializable {
      */
     private String answerJson;
 
+    /**
+     * 图片
+     */
+    private String imgUrl;
+
     /**
      * 创建时间
      */

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/ISweetAnswerService.java

@@ -17,5 +17,5 @@ public interface ISweetAnswerService extends IService<SweetAnswer> {
 
     ResponseDto<SweetAnswerVo> getInfo(String phone);
 
-    ResponseDto<Boolean> create(String phone, String answerJson);
+    ResponseDto<Boolean> create(String phone, String answerJson, String imgUrl);
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetAnswerServiceImpl.java

@@ -34,11 +34,12 @@ public class SweetAnswerServiceImpl extends ServiceImpl<SweetAnswerMapper, Sweet
     }
 
     @Override
-    public ResponseDto<Boolean> create(String phone, String answerJson) {
+    public ResponseDto<Boolean> create(String phone, String answerJson, String imgUrl) {
         SweetAnswer sweetAnswer = SweetAnswer.getNew();
         sweetAnswer.setAnswerId(IDGenerator.nextSnowId());
         sweetAnswer.setPhone(phone);
         sweetAnswer.setAnswerJson(answerJson);
+        sweetAnswer.setImgUrl(imgUrl);
         sweetAnswerMapper.insert(sweetAnswer);
 
         SweetAnswerVo sweetAnswerVo = SweetAnswerVo.getNew().copy(sweetAnswer);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/vo/SweetAnswerVo.java

@@ -18,6 +18,11 @@ public class SweetAnswerVo implements Serializable, Cloneable {
      */
     private String answerJson;
 
+    /**
+     * 图片
+     */
+    private String imgUrl;
+
     /**
      * 创建时间
      */
@@ -41,6 +46,7 @@ public class SweetAnswerVo implements Serializable, Cloneable {
         if (null == source) return this;
         this.setPhone(source.getPhone());
         this.setAnswerJson(source.getAnswerJson());
+        this.setImgUrl(source.getImgUrl());
         this.setCreatedAt(source.getCreatedAt());
         this.setUpdatedAt(source.getUpdatedAt());
         return this;