[设置模块]字段改动

src/main/java/com/tykj/setting/controller/GroupSettingController.java

 package com.tykj.setting.controller;
 
 import com.tykj.base.result.ResultUtil;
-import com.tykj.setting.entity.GroupSetting;
+import com.tykj.setting.entity.vo.GroupSettingVo;
 import com.tykj.setting.service.GroupSettingService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,15 +19,15 @@ public class GroupSettingController {
 
     @PostMapping
     @ApiOperation("新增分类设置")
-    public ResponseEntity save(@RequestBody GroupSetting groupSetting){
-        groupSettingService.save(groupSetting);
+    public ResponseEntity save(@RequestBody GroupSettingVo groupSettingVo){
+        groupSettingService.save(groupSettingVo);
         return ResultUtil.success("", "保存成功");
     }
 
     @PutMapping
     @ApiOperation("更新分类设置")
-    public ResponseEntity update(@RequestBody GroupSetting groupSetting){
-        groupSettingService.update(groupSetting);
+    public ResponseEntity update(@RequestBody GroupSettingVo groupSettingVo){
+        groupSettingService.update(groupSettingVo);
         return ResultUtil.success("", "更新成功");
     }
 

src/main/java/com/tykj/setting/entity/GroupSetting.java

 package com.tykj.setting.entity;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import javax.persistence.*;
 
 @AllArgsConstructor
 @NoArgsConstructor
@@ -18,16 +14,15 @@ public class GroupSetting {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @ApiModelProperty("主键")
     private Integer id;
 
-    @ApiModelProperty("模型ID")
     private Integer modelId;
 
-    @ApiModelProperty("字段ID")
     private Integer columnId;
 
-    @ApiModelProperty("名称")
     private String name;
 
+    @Column(columnDefinition = "text")
+    private String groupConditions;
+
 }

src/main/java/com/tykj/setting/entity/vo/GroupSettingVo.java

+package com.tykj.setting.entity.vo;
+
+import com.tykj.model_layer.entity.vo.GroupCondition;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class GroupSettingVo {
+
+    @ApiModelProperty("主键")
+    private Integer id;
+
+    @ApiModelProperty("模型ID")
+    private Integer modelId;
+
+    @ApiModelProperty("字段ID")
+    private Integer columnId;
+
+    @ApiModelProperty("名称")
+    private String name;
+
+    @ApiModelProperty("分类条件")
+    private List<GroupCondition> groupConditions;
+
+}

src/main/java/com/tykj/setting/service/GroupSettingService.java

 package com.tykj.setting.service;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.tykj.model_layer.entity.vo.GroupCondition;
 import com.tykj.setting.entity.GroupSetting;
+import com.tykj.setting.entity.vo.GroupSettingVo;
 import com.tykj.setting.repository.GroupSettingRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.Optional;
+import java.util.stream.Collectors;
 
 @Service
 public class GroupSettingService {
@@ -15,35 +21,34 @@ public class GroupSettingService {
     @Autowired
     private GroupSettingRepository groupSettingRepository;
 
-    public void save(GroupSetting groupSetting) {
-        boolean newData = Objects.isNull(groupSetting.getId());
+    public void save(GroupSettingVo groupSettingVo) {
+        boolean newData = Objects.isNull(groupSettingVo.getId());
         if (newData) {
+            GroupSetting groupSetting = groupSetting(groupSettingVo);
             groupSettingRepository.save(groupSetting);
         } else {
             throw new RuntimeException("新增数据不可附带id");
         }
     }
 
-    public void update(GroupSetting groupSetting) {
-        boolean exist = Objects.nonNull(groupSetting.getId()) && groupSettingRepository.existsById(groupSetting.getId());
+    public void update(GroupSettingVo groupSettingVo) {
+        boolean exist = Objects.nonNull(groupSettingVo.getId()) && groupSettingRepository.existsById(groupSettingVo.getId());
         if (exist) {
+            GroupSetting groupSetting = groupSetting(groupSettingVo);
             groupSettingRepository.save(groupSetting);
         } else {
             throw new RuntimeException("未找到该id的数据");
         }
     }
 
-    public List<GroupSetting> findAll() {
-        return groupSettingRepository.findAll();
+    public List<GroupSettingVo> findAll() {
+        return groupSettingRepository.findAll().stream()
+                .map(this::groupSettingVo)
+                .collect(Collectors.toList());
     }
 
-    public GroupSetting findById(Integer id) {
-        Optional<GroupSetting> byId = groupSettingRepository.findById(id);
-        if (byId.isPresent()) {
-            return byId.get();
-        } else {
-            throw new RuntimeException("未找到该id的数据");
-        }
+    public GroupSettingVo findById(Integer id) {
+        return groupSettingRepository.findById(id).map(this::groupSettingVo).orElseThrow(() -> new RuntimeException("未找到该id的数据"));
     }
 
     public void deleteById(Integer id) {
@@ -51,4 +56,37 @@ public class GroupSettingService {
     }
 
 
+    private GroupSetting groupSetting(GroupSettingVo groupSettingVo){
+        String groupConditions = "[]";
+        try {
+            groupConditions = new ObjectMapper().writeValueAsString(groupSettingVo.getGroupConditions());
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return new GroupSetting(
+                groupSettingVo.getId(),
+                groupSettingVo.getModelId(),
+                groupSettingVo.getColumnId(),
+                groupSettingVo.getName(),
+                groupConditions
+        );
+    }
+
+    private GroupSettingVo groupSettingVo(GroupSetting groupSetting){
+        List<GroupCondition> groupConditions = new ArrayList<>();
+        try {
+            groupConditions = new ObjectMapper().readValue(groupSetting.getGroupConditions(), new TypeReference<List<GroupCondition>>() {
+            });
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return new GroupSettingVo(
+                groupSetting.getId(),
+                groupSetting.getModelId(),
+                groupSetting.getColumnId(),
+                groupSetting.getName(),
+                groupConditions
+        );
+    }
+
 }