[数据模型] 修改了扫描的BUG

src/main/java/com/tykj/workflowcore/api/entity/EntityInfo.java

@@ -18,6 +18,12 @@ public class EntityInfo {
     @ApiModelProperty(value = "参数名")
     private String name;
 
+    /**
+     * 方便前端加的字段
+     */
+    @ApiModelProperty(value = "表达式")
+    private String exp;
+
     @ApiModelProperty(value = "变量信息")
     private List<EntityInfo> fields;
 

src/main/java/com/tykj/workflowcore/api/service/ApiService.java

@@ -101,7 +101,7 @@ public class ApiService {
                 if (isDifferentClass) {
                     fieldClassInfo = entityInfo(fieldClass, fieldName);
                 } else {
-                    fieldClassInfo = new EntityInfo(fieldClass.getSimpleName(), field.getName(), new ArrayList<>(), description);
+                    fieldClassInfo = new EntityInfo(fieldClass.getSimpleName(), field.getName(),"", new ArrayList<>(), description);
                 }
                 fields.add(fieldClassInfo);
             }
@@ -109,6 +109,7 @@ public class ApiService {
         return new EntityInfo(
                 classType,
                 name,
+                "",
                 fields,
                 description
         );

src/main/java/com/tykj/workflowcore/model_layer/dao/TableInfoDao.java

@@ -33,4 +33,6 @@ public interface TableInfoDao extends JpaRepository<TableInfo, Integer>, JpaSpec
     @Transactional(rollbackFor = Exception.class)
     @Modifying
    List<TableInfo> deleteAllByModelType(Integer type);
+
+    List<TableInfo> findAllByModelType(Integer modeType);
 }

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

@@ -348,6 +348,10 @@ public class ModelImpl implements ModelService {
                     //判断是否存在
                     if (checkRepeat(realName)) {
                         tableInfo = tableInfoDao.save(tableInfo);
+                    } else {
+                        tableInfo = tableInfoDao.findByModelName(tableInfo.getModelName());
+                        log.info("{}已存在", realName);
+                    }
                     List<ColumnVO> dataList = tableVO.getDataList();
                     for (ColumnVO columnVO : dataList) {
                         ColumnInfo columnInfo = new ColumnInfo();
@@ -356,14 +360,10 @@ public class ModelImpl implements ModelService {
                         columnInfo.setFieldLength(columnVO.getFieldLength());
                         columnInfo.setFieldTitle(columnVO.getFieldTitle());
                         columnInfo.setPrimaryKey(columnVO.getPrimaryKey());
-
                         columnInfo.setDbName(realName);
                         columnInfo.setDbId(tableInfo.getId());
                         columnInfoDao.save(columnInfo);
                     }
-                    } else {
-                        log.info("{}已存在", realName);
-                    }
                 }
             }
         }
@@ -608,12 +608,10 @@ public class ModelImpl implements ModelService {
 
     public void delTableAndColumnInfo() {
         /* 先删除上次扫描的基础类型*/
-        List<TableInfo> tableInfos = tableInfoDao.deleteAllByModelType(ModelType.BASICS);
-        for (TableInfo tableInfo : tableInfos) {
+        List<TableInfo> tableInfoList = tableInfoDao.findAllByModelType(ModelType.BASICS);
+        for (TableInfo tableInfo : tableInfoList) {
             /*删除columnInfo*/
             columnInfoDao.deleteAllByDbId(tableInfo.getId());
         }
-
-
     }
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/vo/ParameterVo.java

@@ -24,6 +24,6 @@ public class ParameterVo {
 
     private String name;
 
-    private List<ParameterVo> parameterVoList;
+    private List<ParameterVo> params;
 
 }

src/main/java/com/tykj/workflowcore/workflow_editer/entity/vo/VariableStorageVo.java

@@ -36,14 +36,14 @@ public class VariableStorageVo {
     private String className;
 
     @ApiModelProperty("调用方法名")
-    private String method;
+    private String name;
 
-    private List<ParameterVo> parameterList;
+    private List<ParameterVo> params;
 
     public VariableStorage toEntity(){
         VariableStorage variableStorage = new VariableStorage();
         BeanUtils.copyProperties(this,variableStorage);
-        variableStorage.setParameterInfo(JSON.toJSONString(parameterList));
+        variableStorage.setParameterInfo(JSON.toJSONString(params));
         return variableStorage;
     }
 }

src/main/java/com/tykj/workflowcore/workflow_editer/listener/ProcessEndListener.java

@@ -191,7 +191,7 @@ public class ProcessEndListener extends AbstractFlowableEngineEventListener {
         }else {
             instance.put(parameterVo.getName(),"");
         }
-        List<ParameterVo> parameterVoList = parameterVo.getParameterVoList();
+        List<ParameterVo> parameterVoList = parameterVo.getParams();
         if (parameterVoList!=null&&parameterVoList.size()>0){
             for (int i = 0; i < parameterVoList.size() ; i++) {
                 FillParameter(instance,parameterVoList.get(i),execution);