[数据模块] 修复了一些BUG

src/main/java/com/tykj/model_layer/controller/QuoteController.java

 package com.tykj.model_layer.controller;
 
 import com.tykj.base.result.ResultUtil;
+import com.tykj.model_layer.entity.vo.SearchQuoteVO;
 import com.tykj.model_layer.entity.vo.UpdateQuoteVO;
 import com.tykj.model_layer.service.QuoteService;
 import io.swagger.annotations.Api;
@@ -36,4 +37,12 @@ public class QuoteController {
     public ResponseEntity UpdateQuote(@RequestBody UpdateQuoteVO updateQuoteVO) {
         return ResultUtil.success(quoteService.updateQuote(updateQuoteVO), "查询成功！");
     }
+
+    @ApiModelProperty("引用更新")
+    @PostMapping("/getAllQuote")
+    public ResponseEntity getAllQuote(@RequestBody SearchQuoteVO searchQuoteVO) {
+        return ResultUtil.success(quoteService.getAllQuote(searchQuoteVO), "查询成功！");
+    }
+
+
 }

src/main/java/com/tykj/model_layer/service/impl/QuoteServiceImpl.java

@@ -35,8 +35,6 @@ public class QuoteServiceImpl implements QuoteService {
 
     @Override
     public  List<Quote> updateQuote(UpdateQuoteVO updateQuoteVO) {
-
-
         List<Quote> quoteList = updateQuoteVO.getQuoteList();
         for (Quote quote : quoteList) {
             quote.setColumnId(updateQuoteVO.getId());
@@ -53,7 +51,6 @@ public class QuoteServiceImpl implements QuoteService {
                     "value", "%" + searchQuoteVO.getValue() + "%");
             and.in(searchQuoteVO.getColumnIds()!=null && searchQuoteVO.getColumnIds().length>0,
                     "columnId",searchQuoteVO.getColumnIds());
-
             and.in(searchQuoteVO.getValues()!=null && searchQuoteVO.getValues().length>0,
                     "value", searchQuoteVO.getValues());
         }

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

@@ -24,8 +24,8 @@ public class ConditionSetting {
     @ApiModelProperty("主键")
     private Integer id;
 
-    @ApiModelProperty("字段名")
-    private String columnName;
+    @ApiModelProperty("字段ID")
+    private Integer columnId;
 
     @ApiModelProperty("操作符类型")
     private String type;

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

@@ -24,4 +24,7 @@ public class ScreenSetting {
     @ApiModelProperty("表信息id")
     private Integer tableInfoId;
 
+    @ApiModelProperty("名称")
+    private String name;
+
 }

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

@@ -19,6 +19,11 @@ public class ScreenSettingVo {
     @ApiModelProperty("表信息id")
     private Integer tableInfoId;
 
+    @ApiModelProperty("名称")
+    private String name;
+
     @ApiModelProperty("筛选条件")
     private List<ConditionSetting> conditions;
+
+
 }

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

@@ -29,7 +29,7 @@ public class ScreenSettingService {
     public void save(ScreenSettingVo screenSettingVo){
         boolean newData = Objects.isNull(screenSettingVo.getId());
         if (newData){
-            ScreenSetting saved = screenSettingRepository.save(new ScreenSetting(screenSettingVo.getId(),screenSettingVo.getTableInfoId()));
+            ScreenSetting saved = screenSettingRepository.save(new ScreenSetting(screenSettingVo.getId(),screenSettingVo.getTableInfoId(),screenSettingVo.getName()));
             Integer savedId = saved.getId();
             List<ConditionSetting> conditionsForSave = screenSettingVo.getConditions().stream()
                     .map(conditionSetting -> conditionSetting.setScreenSettingId(savedId))
@@ -44,7 +44,7 @@ public class ScreenSettingService {
         boolean exist = Objects.nonNull(screenSettingVo.getId()) && screenSettingRepository.existsById(screenSettingVo.getId());
         if (exist){
             conditionSettingRepository.deleteAllByScreenSettingId(screenSettingVo.getId());
-            screenSettingRepository.save(new ScreenSetting(screenSettingVo.getId(),screenSettingVo.getTableInfoId()));
+            screenSettingRepository.save(new ScreenSetting(screenSettingVo.getId(),screenSettingVo.getTableInfoId(),screenSettingVo.getName()));
             Integer savedId = screenSettingVo.getId();
             List<ConditionSetting> conditionsForSave = screenSettingVo.getConditions().stream()
                     .map(conditionSetting -> conditionSetting.setScreenSettingId(savedId))
@@ -66,7 +66,7 @@ public class ScreenSettingService {
         if (byId.isPresent()){
             ScreenSetting screenSetting = byId.get();
             List<ConditionSetting> conditions = conditionSettingRepository.findAllByScreenSettingId(id);
-            return new ScreenSettingVo(screenSetting.getId(),screenSetting.getTableInfoId(),conditions
+            return new ScreenSettingVo(screenSetting.getId(),screenSetting.getTableInfoId(),screenSetting.getName(),conditions
             );
         } else {
             throw new RuntimeException("未找到该id的数据");
@@ -80,7 +80,7 @@ public class ScreenSettingService {
 
     private ScreenSettingVo screenSettingVo(ScreenSetting screenSetting){
         List<ConditionSetting> conditions = conditionSettingRepository.findAllByScreenSettingId(screenSetting.getId());
-        return new ScreenSettingVo(screenSetting.getId(),screenSetting.getTableInfoId(),conditions);
+        return new ScreenSettingVo(screenSetting.getId(),screenSetting.getTableInfoId(),screenSetting.getName(),conditions);
     }
 
 }

src/main/resources/application.yml

@@ -2,11 +2,11 @@ spring:
   datasource:
     username: root
     password: Huang123+
-    url: jdbc:mysql://47.106.142.73:3306/dataTest?useSSL=false&serverTimezone=GMT%2b8&characterEncoding=utf-8
+    url: jdbc:mysql://47.106.142.73:3306/dataTest?useSSL=false&serverTimezone=GMT%2b8&characterEncoding=utf-8&nullCatalogMeansCurrent=true
     driver-class-name: com.mysql.cj.jdbc.Driver
   jpa:
     show-sql: true
     hibernate:
       ddl-auto: update
 server:
-      port: 8801
+      port: 8801
\ No newline at end of file