Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=jeecg-system-cloud-api
+groupId=org.jeecgframework.boot
+version=3.1.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -0,0 +1,10 @@
+org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.class
+org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.class
+org\jeecg\common\bpm\api\IBpmBaseExtAPI.class
+org\jeecg\common\online\api\IOnlineBaseExtAPI.class
+org\jeecg\config\FeignConfig.class
+org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.class
+org\jeecg\common\system\api\fallback\SysBaseAPIFallback.class
+org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.class
+org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.class
+org\jeecg\common\system\api\ISysBaseAPI.class

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-cloud-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,10 @@
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\fallback\SysBaseAPIFallback.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\fallback\BpmBaseExtAPIFallback.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\factory\SysBaseAPIFallbackFactory.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\factory\OnlineBaseExtAPIFallbackFactory.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\online\api\fallback\OnlineBaseExtAPIFallback.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\config\FeignConfig.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-cloud-api\src\main\java\org\jeecg\common\bpm\api\factory\BpmBaseExtAPIFallbackFactory.java

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-archiver/pom.properties

@@ -0,0 +1,3 @@
+artifactId=jeecg-system-local-api
+groupId=org.jeecgframework.boot
+version=3.1.0

jeecg-boot-base/jeecg-boot-base-api/jeecg-system-local-api/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -0,0 +1,3 @@
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\bpm\api\IBpmBaseExtAPI.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\system\api\ISysBaseAPI.java
+D:\senyudanz\afterend\sen-yu-new-service\jeecg-boot-base\jeecg-boot-base-api\jeecg-system-local-api\src\main\java\org\jeecg\common\online\api\IOnlineBaseExtAPI.java

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/base/controller/JeecgController.java

@@ -16,6 +16,7 @@ import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
 import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
+import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -153,6 +154,20 @@ public class JeecgController<T, S extends IService<T>> {
         }
     }
 
+    public static <T> ModelAndView export(String title, Class<T> clazz, List<T> exportList) {
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        //导出文件名称
+        mv.addObject(NormalExcelConstants.FILE_NAME, title);
+        //注解对象Class
+        mv.addObject(NormalExcelConstants.CLASS, clazz);
+        //自定义表格参数  "自定义导出Excel模板内容标题", "自定义Sheet名字"
+        mv.addObject(NormalExcelConstants.PARAMS, new ExportParams(title, title));
+        //导出数据列表
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        return mv;
+    }
+
+
     /**
      * 通过excel导入数据
      *

jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -76,6 +76,10 @@ public class ShiroConfig {
         filterChainDefinitionMap.put("/sys/cas/client/validateLogin", "anon"); //cas验证登录
         filterChainDefinitionMap.put("/sys/randomImage/**", "anon"); //登录验证码接口排除
         filterChainDefinitionMap.put("/sys/checkCaptcha", "anon"); //登录验证码接口排除
+        filterChainDefinitionMap.put("/scas/syCostAllocationSummary/**", "anon"); //成本分配汇总测试
+        filterChainDefinitionMap.put("/spapl/syPreAssembledPackingList/**", "anon"); //成本分配汇总测试
+        filterChainDefinitionMap.put("/scas/supplierCapacity/**", "anon"); //供应商产能报表测试
+        filterChainDefinitionMap.put("/scas/dyeLoss/**", "anon"); //染损报表测试
         filterChainDefinitionMap.put("/sys/login", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/mLogin", "anon"); //登录接口排除
         filterChainDefinitionMap.put("/sys/logout", "anon"); //登出接口排除