修改招商积木配置

boman-report/src/main/java/com/boman/report/mapper/TableMapper.java

@@ -45,13 +45,10 @@ public interface TableMapper {
             String tableComment = (String) params.get("tableComment");
 
             StringBuilder sql = new StringBuilder();
-            sql.append("select id, table_name as tableName, table_comment as tableComment, sub_table_name as subTableName, sub_table_fk_name  as subTableFkName, ")
+            sql.append("select table_id, table_name as tableName, table_comment as tableComment, sub_table_name as subTableName, sub_table_fk_name  as subTableFkName, ")
                     .append("class_name as className, tpl_category as tplCategory, package_name as packageName, module_name as moduleName, business_name as businessName,  ")
                     .append("function_name, function_author, gen_type, gen_path, options, ")
-                    .append(" create_by, create_time, update_by, update_time, remark, is_menu,  ")
-                    .append("menu_role, ak_column, dk_column, trigger_create, trigger_retrieve, ")
-                    .append("trigger_update, trigger_delete, trigger_submit, real_table_name,  ")
-                    .append("filter_conditions, extended_attributes, table_primary_key, table_column as tableColumn")
+                    .append(" create_by, create_time, update_by, update_time, remark  ")
                     .append(" from gen_table ").append(" where 1 = 1 ");
             if(StringUtils.isNotEmpty(tableName)) {
                sql.append("AND lower(table_name) like lower(concat('%',").append("'").append(tableName).append("'").append(", '%'))");

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

@@ -5,16 +5,16 @@ spring:
   application:
     name: boman-report
 
-  redis:
-    host: 192.168.101.10
-    port: 6379
-    password: Boman123
-    database: 2
+#  redis:
+#    host: 192.168.101.10
+#    port: 6379
+#    password: Boman123
+#    database: 2
 
   datasource:
-    url: jdbc:mysql://192.168.101.10/jiaoyuju?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
+    url: jdbc:mysql://192.168.101.11:3306/zhaoshang?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
     username: root
-    password: Boman123
+    password: 123456
     driver-class-name: com.mysql.cj.jdbc.Driver
     max-idle: 10
     max-wait: 10000

src/main/java/generator/StatisticReport.java

@@ -2,13 +2,11 @@ package generator;
 
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 /**
  * statistic_report
  * @author 
  */
-@Data
 public class StatisticReport implements Serializable {
     /**
      * 主键
@@ -81,4 +79,141 @@ public class StatisticReport implements Serializable {
     private Date updateTime;
 
     private static final long serialVersionUID = 1L;
+
+
+    @Override
+    public String toString() {
+        return "StatisticReport{" +
+                "id=" + id +
+                ", reportName='" + reportName + '\'' +
+                ", reportId='" + reportId + '\'' +
+                ", templateName='" + templateName + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", reportStatus='" + reportStatus + '\'' +
+                ", status='" + status + '\'' +
+                ", repUploadFile='" + repUploadFile + '\'' +
+                ", remark='" + remark + '\'' +
+                ", createBy='" + createBy + '\'' +
+                ", createTime=" + createTime +
+                ", updateBy='" + updateBy + '\'' +
+                ", updateTime=" + updateTime +
+                '}';
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getReportName() {
+        return reportName;
+    }
+
+    public void setReportName(String reportName) {
+        this.reportName = reportName;
+    }
+
+    public String getReportId() {
+        return reportId;
+    }
+
+    public void setReportId(String reportId) {
+        this.reportId = reportId;
+    }
+
+    public String getTemplateName() {
+        return templateName;
+    }
+
+    public void setTemplateName(String templateName) {
+        this.templateName = templateName;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getReportStatus() {
+        return reportStatus;
+    }
+
+    public void setReportStatus(String reportStatus) {
+        this.reportStatus = reportStatus;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    public String getRepUploadFile() {
+        return repUploadFile;
+    }
+
+    public void setRepUploadFile(String repUploadFile) {
+        this.repUploadFile = repUploadFile;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getCreateBy() {
+        return createBy;
+    }
+
+    public void setCreateBy(String createBy) {
+        this.createBy = createBy;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public String getUpdateBy() {
+        return updateBy;
+    }
+
+    public void setUpdateBy(String updateBy) {
+        this.updateBy = updateBy;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
 }