Merge branch 'master' of http://git.ycjcjy.com/civilized_city/service

src/main/java/com/example/civilizedcity/controller/TdQuestionController.java

@@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.example.civilizedcity.common.BaseController;
 import com.example.civilizedcity.common.ResponseBean;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.service.TaCheckItemAnService;
+import com.example.civilizedcity.service.TdQuAnswerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -24,6 +27,9 @@ public class TdQuestionController extends BaseController {
     
     @Autowired
     private TdQuestionService tdLocQuestionService;
+
+     @Autowired
+     private TdQuAnswerService tdLocQuAnswerService;
     
     /** 
      * 通过ID查询单条数据 
@@ -66,7 +72,16 @@ public class TdQuestionController extends BaseController {
     @ApiOperation("新增数据")
     @PostMapping("/tdLocQuestion")
     public ResponseBean add(@ApiParam("对象实体") @RequestBody TdQuestion tdLocQuestion) throws Exception {
-        tdLocQuestionService.save(tdLocQuestion);
+        String quId = tdLocQuestion.getQuId();
+
+        if (StringUtils.isEmpty(quId)) {
+            // 新增
+            tdLocQuestionService.save(tdLocQuestion);
+        } else {
+            tdLocQuestionService.updateById(tdLocQuestion);
+        }
+
+        tdLocQuAnswerService.mergeData(tdLocQuestion.getQuId(), tdLocQuestion.getQuAnswerList());
         return ResponseBean.success(tdLocQuestion);
     }
     

src/main/java/com/example/civilizedcity/entity/TdQuAnswer.java

@@ -24,7 +24,7 @@ import lombok.experimental.Accessors;
 public class TdQuAnswer implements Serializable,Cloneable{
     /** 答案ID */
     @ApiModelProperty(name = "答案ID",notes = "")
-    @TableId(value = "answer_id", type = IdType.INPUT)
+    @TableId(value = "answer_id", type = IdType.ASSIGN_UUID)
     private String answerId ;
     /** 问题ID */
     @ApiModelProperty(name = "问题ID",notes = "")

src/main/java/com/example/civilizedcity/entity/TdQuestion.java

@@ -1,5 +1,6 @@
 package com.example.civilizedcity.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -7,6 +8,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -45,4 +48,9 @@ public class TdQuestion implements Serializable,Cloneable{
     @ApiModelProperty(name = "创建时间",notes = "")
     private LocalDateTime createDate ;
 
+     /**
+      * 问题答案列表
+      */
+     @TableField(exist = false)
+     List<TdQuAnswer> quAnswerList;
 }

src/main/java/com/example/civilizedcity/service/TdQuAnswerService.java

@@ -1,12 +1,17 @@
 package com.example.civilizedcity.service;
 
+import com.example.civilizedcity.entity.TaCheckItemAn;
 import com.example.civilizedcity.entity.TdQuAnswer;
 
- /**
+import java.util.List;
+
+/**
  * 点位问题答案;(td_loc_qu_answer)表服务接口
  * @author : http://njyunzhi.com
  * @date : 2022-12-13
  */
 public interface TdQuAnswerService extends IBaseService<TdQuAnswer> {
-    
+ boolean mergeData(String quId, List<TdQuAnswer> quAnswerList);
+
+ List<TdQuAnswer> getListByQuId(String quId);
 }

src/main/java/com/example/civilizedcity/service/impl/TdQuAnswerServiceImpl.java

@@ -1,15 +1,54 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.common.StringUtils;
+import com.example.civilizedcity.entity.TaCheckItemAn;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TdQuAnswer;
 import com.example.civilizedcity.mapper.TdQuAnswerMapper;
 import com.example.civilizedcity.service.TdQuAnswerService;
- /**
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
  * 点位问题答案;(td_loc_qu_answer)表服务实现类
  * @author : http://www.chiner.pro
  * @date : 2022-12-13
  */
 @Service
 public class TdQuAnswerServiceImpl extends BaseServiceImpl<TdQuAnswerMapper, TdQuAnswer> implements TdQuAnswerService {
-    
+
+ @Override
+ public boolean mergeData(String quId, List<TdQuAnswer> quAnswerList) {
+  if (StringUtils.isEmpty(quId)) return false;
+
+  // 先删除所有
+  baseMapper.deleteByMap(new HashMap<String, Object>() {{
+   put("qu_id", quId);
+  }});
+
+  if (null == quAnswerList || quAnswerList.isEmpty()) {
+   return true;
+  }
+
+  for (int i = 0; i < quAnswerList.size(); i ++) {
+   TdQuAnswer item = quAnswerList.get(i);
+   item.setQuId(quId);
+   // 重新排序
+   item.setSortNo(i + 1);
+   save(item);
+  }
+
+  return true;
+ }
+
+ @Override
+ public List<TdQuAnswer> getListByQuId(String quId) {
+  QueryWrapper<TdQuAnswer> queryWrapper = new QueryWrapper<>();
+  queryWrapper.eq("qu_id", quId);
+  queryWrapper.orderByAsc("sort_no");
+
+  return list(queryWrapper);
+ }
 }

src/main/java/com/example/civilizedcity/service/impl/TdQuestionServiceImpl.java

@@ -1,5 +1,8 @@
 package com.example.civilizedcity.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.example.civilizedcity.entity.TaCheckItemQu;
+import com.example.civilizedcity.entity.TdQuAnswer;
 import org.springframework.stereotype.Service;
 import com.example.civilizedcity.entity.TdQuestion;
 import com.example.civilizedcity.mapper.TdQuestionMapper;
@@ -11,5 +14,5 @@ import com.example.civilizedcity.service.TdQuestionService;
  */
 @Service
 public class TdQuestionServiceImpl extends BaseServiceImpl<TdQuestionMapper, TdQuestion> implements TdQuestionService {
-    
-}
+
+ }