[数据模型模块] 修改了一些BUG

src/main/java/com/tykj/workflowcore/model_layer/controller/ModelController.java

@@ -45,7 +45,7 @@ public class ModelController {
      * @Date 16:19 2021/3/4
      **/
     @ApiOperation("得到所有数据表信息")
-    @RequestMapping("/getAllEntity")
+    @GetMapping("/getAllEntity")
     public ResponseEntity getAllEntity(SearchTableInfoVo searchTableInfoVo) {
         Page<TableInfo> tableInfos = null;
         try {
@@ -58,16 +58,15 @@ public class ModelController {
     }
 
     /**
-     * @param tableName
+     * @param searchColumnInfoVo
      * @return java.util.List<com.tykj.workflowcore.model_layer.model.ColumnInfo>
      * @Author WWW
      * @Description 根据表名得到所有字段名
      * @Date 16:20 2021/3/4
      **/
     @ApiOperation("根据表名获查询所有字段")
-    @GetMapping("/getAllField")
-    public ResponseEntity getFields(SearchColumnInfoVo searchColumnInfoVo) {
-
+    @GetMapping("/getAllEntity")
+    public ResponseEntity getFields( SearchColumnInfoVo searchColumnInfoVo) {
         return ResultUtil.success(modelService.showModelFields(searchColumnInfoVo), "");
     }
 

src/main/java/com/tykj/workflowcore/model_layer/entity/vo/SearchColumnInfoVo.java

@@ -17,6 +17,6 @@ import lombok.NoArgsConstructor;
 @Data
 public class SearchColumnInfoVo extends JpaCustomPage {
 
-    private Integer id;
+    private Integer dbId;
     private String dbName;
 }

src/main/java/com/tykj/workflowcore/model_layer/service/ModelService.java

@@ -43,7 +43,7 @@ public interface ModelService {
 
     /**
      * 根据表名查询所有字段信息
-     * @param modelName
+     * @param searchColumnInfoVo
      * @return
      */
     List<ColumnInfo> showModelFields(SearchColumnInfoVo searchColumnInfoVo);

src/main/java/com/tykj/workflowcore/model_layer/service/impl/ModelImpl.java

@@ -87,7 +87,7 @@ public class ModelImpl implements ModelService {
     }
 
     /**
-     * @param tableName
+     * @param SearchColumnInfoVo
      * @return java.util.List<com.tykj.workflowcore.model_layer.model.ColumnInfo>
      * @Author WWW
      * @Description 根据表名得到所有字段名
@@ -96,10 +96,9 @@ public class ModelImpl implements ModelService {
     @Override
     public List<ColumnInfo> showModelFields(SearchColumnInfoVo SearchColumnInfoVo) {
         PredicateBuilder<ColumnInfo> and = Specifications.and();
-        and.eq(SearchColumnInfoVo.getId() != null, "id",  SearchColumnInfoVo.getId());
+        and.eq(SearchColumnInfoVo.getDbId() != null, "dbId",  SearchColumnInfoVo.getDbId());
         and.eq(SearchColumnInfoVo.getDbName() != null, "dbName", SearchColumnInfoVo.getDbName());
         return columnInfoDao.findAll(and.build());
-
     }