zyw 1 рік тому
батько
коміт
bf0ba54a15

+ 62 - 4
src/main/java/com/zhaoliangsz/grainsearch/domain/entity/TestTable.java

@@ -42,6 +42,67 @@ public class TestTable extends BaseDO<TestTable> {
      */
     @TableField("creator_id")
     private Long creatorId;
+    /**
+     * 时间
+     */
+    @TableField("date")
+    private LocalDateTime date;
+    /**
+     * 类型
+     */
+    @TableField("type")
+    private String type;
+    /**
+     * 班组
+     */
+    @TableField("banzu")
+    private String banzu;
+    /**
+     * 班次
+     */
+    @TableField("banci")
+    private String banci;
+    /**
+     * 巴西(吨)
+     */
+    @TableField("filed1")
+    private Double filed1;
+    /**
+     * 中美洲(吨)
+     */
+    @TableField("filed2")
+    private Double filed2;
+    /**
+     * 回溶(吨)
+     */
+    @TableField("filed3")
+    private Double filed3;
+    /**
+     * 加工糖100%(吨)
+     */
+    @TableField("filed4")
+    private Double filed4;
+    /**
+     * 非食用糖92%(吨)
+     */
+    @TableField("filed5")
+    private Double filed5;
+    /**
+     * 国储(吨)
+     */
+    @TableField("filed6")
+    private Double filed6;
+    /**
+     * 出库合计
+     */
+    @TableField("total")
+    private Double total;
+    /**
+     * 入库量
+     */
+    @TableField("in_num")
+    private Double inNum;
+
     @TableField("create_by")
     private String createBy;
     @TableField("create_time")
@@ -53,10 +114,7 @@ public class TestTable extends BaseDO<TestTable> {
     @TableField("has_deleted")
     @TableLogic
     private Integer hasDeleted;
-    @TableField(exist = false)
-    private String filed1;
-    @TableField(exist = false)
-    private String filed2;
+
 
 
 }

+ 3 - 3
src/main/resources/application-dev.yml

@@ -1,8 +1,8 @@
 spring:
  datasource:
-    url: jdbc:mysql://127.0.0.1:3306/grain_search?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
-    username: root
-    password: 123456
+    url: jdbc:mysql://10.23.250.88:3306/h5?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=Asia/Shanghai
+    username: admin
+    password: 14789632
     driver-class-name: com.mysql.cj.jdbc.Driver
  data:
    redis:

+ 6 - 0
src/test/java/com/zhaoliangsz/grainsearch/GrainSearchApplicationTests.java

@@ -1,13 +1,19 @@
 package com.zhaoliangsz.grainsearch;
 
 import org.junit.jupiter.api.Test;
+import org.springframework.boot.SpringBootVersion;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.SpringVersion;
 
 @SpringBootTest
 class GrainSearchApplicationTests {
 
 	@Test
 	void contextLoads() {
+//		String version = SpringVersion.getVersion();
+//		String version1 = SpringBootVersion.getVersion();
+//		System.out.println(version);
+//		System.out.println(version1);
 	}
 
 }