集成积木报表

pom.xml

@@ -160,6 +160,16 @@
                 <groupId>org.apache.velocity</groupId>
                 <artifactId>velocity</artifactId>
                 <version>${velocity.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.commons</groupId>
+                        <artifactId>commons-lang3</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-lang</groupId>
+                        <artifactId>commons-lang</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <!-- 阿里JSON解析器 -->

snow-admin/pom.xml

@@ -22,6 +22,17 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-thymeleaf</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.10</version>
+        </dependency>
+        <!--jimureport-->
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>spring-boot-starter-jimureport</artifactId>
+            <version>1.3.1-beta4</version>
+        </dependency>
         <!--test-->
         <dependency>
             <groupId>org.springframework.boot</groupId>

snow-admin/src/main/java/com/snow/SnowApplication.java

@@ -29,11 +29,9 @@ import org.springframework.context.annotation.FilterType;
         }
 )
 @ComponentScan(basePackages = {"com.snow",
-        "org.flowable.ui"
-
-},
-        excludeFilters= @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RemoteAccountResource.class})
-)
+        "org.flowable.ui",
+        "org.jeecg.modules.jmreport"
+}, excludeFilters= @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = {RemoteAccountResource.class}))
 public class SnowApplication
 {
     public static void main(String[] args)

snow-admin/src/main/java/com/snow/web/controller/system/SysMessageCenterController.java

@@ -14,6 +14,7 @@ import com.snow.system.domain.SysMessageTransition;
 import com.snow.system.domain.SysOaCustomer;
 import com.snow.system.domain.SysUser;
 import com.snow.system.service.ISysMessageTemplateService;
+import com.snow.system.service.ISysMessageTransitionService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -36,6 +37,9 @@ public class SysMessageCenterController extends BaseController
 
     @Autowired
     private ISysMessageTemplateService sysMessageTemplateService;
+    
+    @Autowired
+    private ISysMessageTransitionService sysMessageTransitionService;
 
     @RequiresPermissions("system:messageCenter:view")
     @GetMapping()
@@ -45,8 +49,7 @@ public class SysMessageCenterController extends BaseController
         SysMessageTransition sysMessageTransition=new SysMessageTransition();
         sysMessageTransition.setConsumerId(String.valueOf(sysUser.getUserId()));
         sysMessageTransition.setMessageStatus(0L);
-        //List<SysMessageTemplate> sysMessageTemplates = sysMessageTemplateService.selectSysMessageTemplateList(sysMessageTransition);
-
+        List<SysMessageTransition> sysMessageTransitions = sysMessageTransitionService.selectSysMessageTransitionList(sysMessageTransition);
         return prefix + "/messageCenter";
     }
 

snow-admin/src/main/resources/application.yml

@@ -31,6 +31,7 @@ logging:
   level:
     com.snow: debug
     org.springframework: warn
+    org.jeecg.modules.jmreport: debug
 
 # 用户配置
 user:
@@ -161,3 +162,18 @@ flowable:
 sys:
    file:
      active: local
+
+minidao:
+  base-package: org.jeecg.modules.jmreport.desreport.dao*
+  db-type: mysql
+  show-sql: true
+#JimuReport[上传配置]
+jeecg :
+  # local|minio|alioss
+  uploadType: local
+  # local
+  path :
+    #文件路径
+    upload: /opt/upload
+
+

snow-common/pom.xml

@@ -52,9 +52,11 @@
         </dependency>
 
         <!--常用工具类 -->
+        <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
+            <version>3.10</version>
         </dependency>
 
         <!-- JSON工具类 -->

snow-framework/src/main/java/com/snow/framework/config/ShiroConfig.java

@@ -284,6 +284,11 @@ public class ShiroConfig
         filterChainDefinitionMap.put("/dingTalk/dingTalkCallBack", "anon");
         filterChainDefinitionMap.put("/third/oauth/**", "anon");
 
+        //积木报表排除
+        filterChainDefinitionMap.put("/jmreport/**", "anon");
+        filterChainDefinitionMap.put("/**/*.js.map", "anon");
+        filterChainDefinitionMap.put("/**/*.css.map", "anon");
+
         filterChainDefinitionMap.put("/dingTalk/dingFlowRobot", "anon");
         // 退出 logout地址，shiro去清除session
         filterChainDefinitionMap.put("/logout", "logout");