未完成版

boman-report/pom.xml

@@ -30,95 +30,60 @@
             <version>1.1.0</version>
         </dependency>
 
-        <!-- SpringCloud Ailibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
         <!-- SpringBoot Actuator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-<!--        &lt;!&ndash; Swagger UI &ndash;&gt;-->
-<!--        <dependency>-->
-<!--            <groupId>io.springfox</groupId>-->
-<!--            <artifactId>springfox-swagger-ui</artifactId>-->
-<!--            <version>${swagger.fox.version}</version>-->
-<!--        </dependency>-->
-
         <!-- Mysql Connector -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
 
-        <!-- RuoYi Common DataSource -->
-        <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-datasource</artifactId>
-        </dependency>
-
-        <!--         RuoYi Common DataScope-->
-<!--        <dependency>-->
-<!--            <groupId>com.boman</groupId>-->
-<!--            <artifactId>boman-common-datascope</artifactId>-->
-<!--        </dependency>-->
-
-        <!--         RuoYi Common Log-->
-<!--        <dependency>-->
-<!--            <groupId>com.boman</groupId>-->
-<!--            <artifactId>boman-common-log</artifactId>-->
-<!--        </dependency>-->
-
         <!--         RuoYi Common Swagger-->
         <dependency>
             <groupId>com.boman</groupId>
             <artifactId>boman-common-swagger</artifactId>
         </dependency>
 
-        <!--        远程调用 gen-->
         <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-api-gen</artifactId>
-            <version>2.5.0-SNAPSHOT</version>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
         </dependency>
 
         <dependency>
             <groupId>com.boman</groupId>
-            <artifactId>boman-api-web-core</artifactId>
+            <artifactId>boman-domain</artifactId>
             <version>2.5.0-SNAPSHOT</version>
         </dependency>
 
+        <!-- Mybatis 依赖配置 -->
         <dependency>
-            <groupId>com.boman</groupId>
-            <artifactId>boman-common-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>commons-beanutils</groupId>
-            <artifactId>commons-beanutils</artifactId>
-            <version>1.9.4</version>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>${spring-boot.mybatis}</version>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>org.projectlombok</groupId>-->
-<!--            <artifactId>lombok</artifactId>-->
-<!--            <version>1.18.4</version>-->
-<!--        </dependency>-->
-<!--        <dependency>-->
-<!--            <groupId>com.boman</groupId>-->
-<!--            <artifactId>boman-visual</artifactId>-->
-<!--            <version>2.5.0-SNAPSHOT</version>-->
-<!--        </dependency>-->
-
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.alibaba.cloud</groupId>
+                <artifactId>spring-cloud-starter-alibaba-seata</artifactId>
+            </dependency>
+            <dependency>
+                <groupId>com.boman</groupId>
+                <artifactId>boman-common-core</artifactId>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
-        <finalName>${artifactId}</finalName>
+        <finalName>${artifactId}-${version}}</finalName>
         <plugins>
             <plugin>
                 <groupId>org.springframework.boot</groupId>

boman-report/src/main/java/com/boman/report/controller/TableController.java

@@ -1,6 +1,5 @@
 package com.boman.report.controller;
 
-import com.boman.common.core.web.controller.BaseController;
 import com.boman.domain.GenTable;
 import com.boman.report.service.ITableService;
 import org.jeecg.modules.jmreport.common.vo.Result;
@@ -11,7 +10,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/jmreport/table")
-public class TableController extends BaseController {
+public class TableController{
 
     @Autowired
     private ITableService tableService;

boman-report/src/main/java/com/boman/report/domain/TableDataInfo.java

@@ -0,0 +1,85 @@
+package com.boman.report.domain;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 表格分页数据对象
+ * 
+ * @author ruoyi
+ */
+public class TableDataInfo implements Serializable
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 总记录数 */
+    private long total;
+
+    /** 列表数据 */
+    private List<?> rows;
+
+    /** 消息状态码 */
+    private int code;
+
+    /** 消息内容 */
+    private String msg;
+
+    /**
+     * 表格数据对象
+     */
+    public TableDataInfo()
+    {
+    }
+
+    /**
+     * 分页
+     * 
+     * @param list 列表数据
+     * @param total 总记录数
+     */
+    public TableDataInfo(List<?> list, int total)
+    {
+        this.rows = list;
+        this.total = total;
+    }
+
+    public long getTotal()
+    {
+        return total;
+    }
+
+    public void setTotal(long total)
+    {
+        this.total = total;
+    }
+
+    public List<?> getRows()
+    {
+        return rows;
+    }
+
+    public void setRows(List<?> rows)
+    {
+        this.rows = rows;
+    }
+
+    public int getCode()
+    {
+        return code;
+    }
+
+    public void setCode(int code)
+    {
+        this.code = code;
+    }
+
+    public String getMsg()
+    {
+        return msg;
+    }
+
+    public void setMsg(String msg)
+    {
+        this.msg = msg;
+    }
+}

boman-report/src/main/java/com/boman/report/service/ITableService.java

@@ -1,6 +1,5 @@
 package com.boman.report.service;
 
-import com.boman.common.core.web.page.TableDataInfo;
 import com.boman.domain.GenTable;
 
 import java.util.List;

boman-report/src/main/java/com/boman/report/service/impl/GenTableColumnServiceImpl.java

@@ -1,12 +1,10 @@
 package com.boman.report.service.impl;
 
-import com.boman.common.core.utils.obj.ObjectUtils;
 import com.boman.domain.GenTable;
 import com.boman.domain.GenTableColumn;
 import com.boman.report.mapper.GenTableColumnMapper;
 import com.boman.report.mapper.GenTableMapper;
 import com.boman.report.service.IGenTableColumnService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -36,7 +34,7 @@ public class GenTableColumnServiceImpl implements IGenTableColumnService {
         GenTable genTable = genTableMapper.selectGenTableByName(tableName);
 
         List<GenTableColumn> columns = genTable.getColumns();
-        if (ObjectUtils.isEmpty(columns)) {
+        if (null == columns || columns.size() == 0) {
             columns = listByTableIdList(Collections.singletonList(genTable.getId()));
         }
 

boman-report/src/main/java/com/boman/report/service/impl/TableServiceImpl.java

@@ -4,7 +4,6 @@ import com.boman.domain.GenTable;
 import com.boman.report.constant.IgnoreTable;
 import com.boman.report.mapper.TableMapper;
 import com.boman.report.service.ITableService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

boman-report/src/main/java/org/jeecg/modules/jmreport/BomanReportApplication.java

@@ -1,6 +1,5 @@
 package org.jeecg.modules.jmreport;
 
-//import com.boman.common.security.annotation.EnableCustomConfig;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -13,9 +12,9 @@ import org.springframework.scheduling.annotation.EnableAsync;
  *
  * @author shiqian
  */
-@EnableAspectJAutoProxy(exposeProxy = true)
+//@EnableAspectJAutoProxy(exposeProxy = true)
 @MapperScan("com.boman.**.mapper")
-@EnableAsync
+//@EnableAsync
 @ComponentScan(value = {"com.boman", "org.jeecg.modules.jmreport"})
 @SpringBootApplication
 public class BomanReportApplication {

boman-report/src/main/java/org/jeecg/modules/jmreport/desreport/a/a.java

@@ -85,7 +85,7 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.HandlerMapping;
 
-@RestController("designReportController")
+@RestController
 @RequestMapping({"/jmreport"})
 public class a {
     private static final Logger a = LoggerFactory.getLogger(a.class);

boman-report/src/main/resources/application.yml

@@ -2,15 +2,6 @@ server:
   port: 1234
 
 spring:
-  application:
-    name: boman-report
-
-#  redis:
-#    host: 192.168.101.10
-#    port: 6379
-#    password: Boman123
-#    database: 2
-
   datasource:
     url: jdbc:mysql://192.168.101.11:3306/zhaoshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
@@ -21,35 +12,6 @@ spring:
     min-idle: 5
     initial-size: 5
 
-#  datasource:
-#    druid:
-#      stat-view-servlet:
-#        enabled: true
-#        loginUsername: admin
-#        loginPassword: 123456
-#    dynamic:
-#      druid:
-#        initial-size: 5
-#        min-idle: 5
-#        maxActive: 20
-#        maxWait: 60000
-#        timeBetweenEvictionRunsMillis: 60000
-#        minEvictableIdleTimeMillis: 300000
-#        validationQuery: SELECT 1 FROM DUAL
-#        testWhileIdle: true
-#        testOnBorrow: false
-#        testOnReturn: false
-#        poolPreparedStatements: true
-#        maxPoolPreparedStatementPerConnectionSize: 20
-#        filters: stat,wall,slf4j
-#        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
-#      datasource:
-#        master:
-##          driver-class-name: com.mysql.jdbc.Driver
-#          url: jdbc:mysql://192.168.101.10/jiaoyuju?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
-#          username: root
-#          password: Boman123
-
 report:
   tableNames: boman_message,sys_config,sys_contacts,sys_dept,sys_dict_data,sys_dict_type,sys_info,sys_job,sys_job_log,sys_logininfor,sys_memorandum,sys_menu,sys_notice,sys_oper_log,sys_post,sys_role,sys_role_data,sys_role_dept,sys_schedule,sys_user,sys_user_old,sys_user_post,sys_user_role,boman_group,boman_group_user,instance_business,gen_table,gen_table_column,gen_table_relation,boman_message_receive,boman_news,boman_recieve_dispatch_message,urge_read_message,statistic_report,statistic_report_personnel,table_sql
 
@@ -64,13 +26,4 @@ jeecg:
 
 mybatis:
 #  typeAliasesPackage: com.boman.web.core
-  mapperLocations: classpath:mapper/**/*.xml
-
-seata:
-  enabled: false
-  application-id: ${spring.application.name}
-  tx-service-group: ${spring.application.name}-group
-  enable-auto-data-source-proxy: false
-  service:
-    vgroup-mapping:
-      boman-system-group: default
+  mapperLocations: classpath:mapper/**/*.xml

boman-web-core/src/main/java/com/boman/web/core/mapper/StandardMapper.java

@@ -464,7 +464,7 @@ public interface StandardMapper {
             wholeSql.append(" from ").append(tableName);
             // 条件
             packCondition(packCondition, wholeSql);
-            wholeSql.append(" order by ").append(orderBy).append(" limit ").append(limit);
+            wholeSql.append(" order by ").append(orderBy(orderBy)).append(" limit ").append(limit);
             if (isNotEmpty(offset)) {
                 wholeSql.append(", ").append(offset);
             }
@@ -487,7 +487,7 @@ public interface StandardMapper {
 
             // 条件
             packCondition(packCondition, wholeSql);
-            wholeSql.append(" order by ").append(orderBy).append(" limit ").append(limit);
+            wholeSql.append(" order by ").append(orderBy(orderBy)).append(" limit ").append(limit);
             if (isNotEmpty(offset)) {
                 wholeSql.append(", ").append(offset);
             }
@@ -710,5 +710,9 @@ public interface StandardMapper {
                 }
             }
         }
+
+        public static String orderBy(String orderBy){
+            return isNullOrEmpty(orderBy) ? " create_time desc " : orderBy;
+        }
     }
 }