[数据模型] 修改了查询列名的逻辑

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

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

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

@@ -4,12 +4,14 @@ import cn.hutool.db.Db;
 
 import com.github.wenhao.jpa.PredicateBuilder;
 import com.github.wenhao.jpa.Specifications;
-import com.tykj.workflowcore.model_layer.annotatiion.WorkFlowCoreNoScan;
+import com.tykj.workflowcore.model_layer.annotations.WorkFlowCoreNoScan;
 import com.tykj.workflowcore.model_layer.dao.ColumnInfoDao;
 import com.tykj.workflowcore.model_layer.dao.TableInfoDao;
-import com.tykj.workflowcore.model_layer.model.*;
+import com.tykj.workflowcore.model_layer.entity.TableInfo;
+import com.tykj.workflowcore.model_layer.entity.vo.*;
+import com.tykj.workflowcore.model_layer.entity.*;
 import com.tykj.workflowcore.model_layer.service.ModelService;
-import com.tykj.workflowcore.model_layer.utils.CreatTableUtil;
+import com.tykj.workflowcore.model_layer.utils.CreateTableUtil;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.extern.slf4j.Slf4j;
@@ -41,7 +43,8 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 
 import static com.tykj.workflowcore.model_layer.utils.ClassTypeLength.setLength;
-import static com.tykj.workflowcore.model_layer.utils.CreatTableUtil.*;
+
+import static com.tykj.workflowcore.model_layer.utils.CreateTableUtil.*;
 import static com.tykj.workflowcore.model_layer.utils.HqlUtil.createQuery;
 
 
@@ -91,15 +94,12 @@ public class ModelImpl implements ModelService {
      * @Date 16:15 2021/3/5
      **/
     @Override
-    public List<ColumnInfo> showModelFields(String tableName) {
+    public List<ColumnInfo> showModelFields(SearchColumnInfoVo SearchColumnInfoVo) {
+        PredicateBuilder<ColumnInfo> and = Specifications.and();
+        and.eq(SearchColumnInfoVo.getId() != null, "id",  SearchColumnInfoVo.getId());
+        and.eq(SearchColumnInfoVo.getDbName() != null, "dbName", SearchColumnInfoVo.getDbName());
+        return columnInfoDao.findAll(and.build());
 
-        Specification specification = (Specification) (root, criteriaQuery, criteriaBuilder) -> {
-            Path dbName = root.get("dbName");
-            Predicate equal = criteriaBuilder.equal(dbName, tableName);
-            return equal;
-        };
-        List<ColumnInfo> all = columnInfoDao.findAll(specification);
-        return all;
     }
 
 
@@ -112,7 +112,7 @@ public class ModelImpl implements ModelService {
      **/
     @Override
     public TableVO newTable(TableVO tableVO) {
-        String xmlMapping = creatTable(tableVO);
+        String xmlMapping = createTable(tableVO);
         Integer modelType = tableVO.getModelType();
         String parentTable = null;
         //扫描新建类型
@@ -123,7 +123,7 @@ public class ModelImpl implements ModelService {
             tableVO.setModelType(1);
         }
 
-        CreatTableUtil creatTableUtil = new CreatTableUtil();
+        CreateTableUtil creatTableUtil = new CreateTableUtil();
         Session session = creatTableUtil.getSession(entityManagerFactory, xmlMapping);
 
         List<ColumnVO> dataList = tableVO.getDataList();
@@ -199,7 +199,7 @@ public class ModelImpl implements ModelService {
      * @Date 16:17 2021/3/5
      **/
     public void insertValue(String tableName, String xml, Map map) {
-        CreatTableUtil creatTableUtil = new CreatTableUtil();
+        CreateTableUtil creatTableUtil = new CreateTableUtil();
         Session newSession = creatTableUtil.getSession(entityManagerFactory, xml);
         SessionImpl session = (SessionImpl) newSession;
         EntityPersister entityPersister = session.getEntityPersister(tableName, map);
@@ -300,7 +300,7 @@ public class ModelImpl implements ModelService {
                         list.add(columnVO);
                     }
                     tableVO.setDataList(list);
-                    String xml = creatTable(tableVO);
+                    String xml = createTable(tableVO);
                     tableInfo.setName(tableVO.getModelName());
                     tableInfo.setCnName(tableVO.getModelTitle());
                     tableInfo.setXml(xml);