[基础模块] 增加了/xml和/workflow/xml的静态资源句柄 以修复在主系统无法获取XML的问题

src/main/java/com/tykj/workflowcore/base/config/WebMvcConfig.java

@@ -33,6 +33,8 @@ public class WebMvcConfig  {
             public void addResourceHandlers(ResourceHandlerRegistry registry) {
                 registry.addResourceHandler("/workflow/xml/**")
                         .addResourceLocations("file:" + System.getProperty("user.dir") + "\\xml\\");
+                registry.addResourceHandler("/xml/**")
+                        .addResourceLocations("file:" + System.getProperty("user.dir") + "\\xml\\");
             }
         };
     }

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

@@ -51,12 +51,7 @@ public class ModelController {
     @PostMapping("/getAllEntity")
     public ResponseEntity getAllEntity(@RequestBody SearchTableInfoVo searchTableInfoVo) {
         Page<TableInfo> tableInfos;
-        try {
-            tableInfos = modelService.pageAllEntities(searchTableInfoVo);
-        } catch (SQLException throwables) {
-            return ResultUtil.failed("数据查询失败！");
-
-        }
+        tableInfos = modelService.pageAllEntities(searchTableInfoVo);
         return ResultUtil.success(tableInfos, "数据查询成功！");
     }
 

src/main/java/com/tykj/workflowcore/workflow_editer/controller/FormPageController.java

@@ -5,6 +5,7 @@ import com.tykj.workflowcore.model_layer.entity.TableInfo;
 import com.tykj.workflowcore.model_layer.entity.vo.TableAndColumnInfoVO;
 import com.tykj.workflowcore.workflow_editer.entity.FormPage;
 //import com.tykj.workflowcore.workflow_editer.entity.PageEntity;
+import com.tykj.workflowcore.workflow_editer.entity.vo.SearchPageEntityVo;
 import com.tykj.workflowcore.workflow_editer.service.FormPageService;
 //import com.tykj.workflowcore.workflow_editer.service.PageEntityService;
 import com.tykj.workflowcore.workflow_editer.entity.vo.FormPageVo;
@@ -72,9 +73,9 @@ public class FormPageController {
 
     @ApiOperation("通过页面id查询所对应的数据模型")
     @PostMapping("/findByPageIds")
-    public List<TableInfo>  findByPageIds(@RequestBody List<Integer> pageIds){
+    public List<TableInfo>  findByPageIds(@RequestBody SearchPageEntityVo searchPageEntityVo){
 
-        return formPageService.findByPageIds(pageIds);
+        return formPageService.findByPageIds(searchPageEntityVo.getPageIds());
     }
 
 

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

+package com.tykj.workflowcore.workflow_editer.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @author HuangXiahao
+ * @version V1.0
+ * @class SearchPageEntityVo
+ * @packageName com.tykj.workflowcore.workflow_editer.entity.vo
+ **/
+@AllArgsConstructor
+@NoArgsConstructor
+@Data
+public class SearchPageEntityVo {
+    List<Integer> pageIds;
+
+}

src/main/java/com/tykj/workflowcore/workflow_editer/service/impl/FormPageServiceImpl.java

@@ -85,7 +85,7 @@ public class FormPageServiceImpl implements FormPageService {
     public List<TableInfo> findByPageIds(List<Integer> pageIds) {
 
         PredicateBuilder<FormPage> builder = Specifications.and();
-        builder.in("id", pageIds);
+        builder.in("id", pageIds.toArray());
         List<FormPage> tableInfoList = formPageMapper.findAll(builder.build());
         StringBuffer entityIds = new StringBuffer();
         for (int i = 0; i < tableInfoList.size(); i++) {
@@ -96,14 +96,10 @@ public class FormPageServiceImpl implements FormPageService {
                 entityIds.deleteCharAt(entityIds.length()-1);
             }
         }
-
         String[] split = entityIds.toString().split(",");
-        List<String> lastEntityIds = Arrays.asList(split).stream().distinct().collect(Collectors.toList());
-        //todo
-        Integer[] ids = (Integer[]) lastEntityIds.toArray();
+        Integer[] ids =Arrays.stream(split).mapToInt(Integer::parseInt).boxed().toArray(Integer[]::new);
         SearchTableInfoVo searchTableInfoVo = new SearchTableInfoVo();
         searchTableInfoVo.setIds(ids);
-
         return  modelService.listAllEntities(searchTableInfoVo);
     }