From 13b31b2ca2a5f8600002a042b536c9d5529842e3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 09 三月 2026 19:21:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/BasWrkIotype.java | 1 -
src/main/java/com/zy/asrs/entity/BasRgv.java | 1 -
src/main/java/com/zy/asrs/entity/WrkLastno.java | 1 -
src/main/java/com/zy/asrs/entity/BasStation.java | 1 -
src/main/resources/logback-spring.xml | 16 ++++++----------
src/main/java/com/zy/asrs/entity/BasDualCrnp.java | 1 -
src/main/java/com/zy/asrs/entity/BasWrkStatus.java | 1 -
src/main/java/com/zy/asrs/entity/WrkMast.java | 1 -
src/main/java/com/zy/asrs/entity/BasCrnp.java | 1 -
src/main/java/com/zy/asrs/entity/LocMast.java | 1 -
src/main/java/com/zy/asrs/entity/BasLocSts.java | 1 -
11 files changed, 6 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasCrnp.java b/src/main/java/com/zy/asrs/entity/BasCrnp.java
index 91d0811..61047a3 100644
--- a/src/main/java/com/zy/asrs/entity/BasCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasCrnp.java
@@ -30,7 +30,6 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
private Integer crnNo;
@ApiModelProperty(value= "")
diff --git a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
index e342057..5652c84 100644
--- a/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDualCrnp.java
@@ -30,7 +30,6 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "crn_no", type = IdType.INPUT)
- @TableField("crn_no")
private Integer crnNo;
/**
diff --git a/src/main/java/com/zy/asrs/entity/BasLocSts.java b/src/main/java/com/zy/asrs/entity/BasLocSts.java
index cd24080..2867228 100644
--- a/src/main/java/com/zy/asrs/entity/BasLocSts.java
+++ b/src/main/java/com/zy/asrs/entity/BasLocSts.java
@@ -24,7 +24,6 @@
*/
@ApiModelProperty(value= "搴撲綅鐘舵�佷唬鍙�")
@TableId(value = "loc_sts", type = IdType.INPUT)
- @TableField("loc_sts")
private String locSts;
/**
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
index 5a6f986..754d51d 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgv.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -25,7 +25,6 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "rgv_no", type = IdType.INPUT)
- @TableField("rgv_no")
private Integer rgvNo;
/**
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index e90134b..5c5dac5 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -23,7 +23,6 @@
*/
@ApiModelProperty(value= "缂栧彿")
@TableId(value = "station_id", type = IdType.INPUT)
- @TableField("station_id")
private Integer stationId;
/**
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
index 1c7558a..3d0385e 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkIotype.java
@@ -24,7 +24,6 @@
*/
@ApiModelProperty(value= "鍏ュ嚭绫诲瀷浠ｅ彿")
@TableId(value = "io_type", type = IdType.INPUT)
- @TableField("io_type")
private Integer ioType;
/**
diff --git a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
index 7c707c1..a476f5f 100644
--- a/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
+++ b/src/main/java/com/zy/asrs/entity/BasWrkStatus.java
@@ -24,7 +24,6 @@
*/
@ApiModelProperty(value= "浠ｅ彿")
@TableId(value = "wrk_sts", type = IdType.INPUT)
- @TableField("wrk_sts")
private Long wrkSts;
/**
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 378615b..2975c7d 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -27,7 +27,6 @@
*/
@ApiModelProperty(value= "搴撲綅鍙�")
@TableId(value = "loc_no", type = IdType.INPUT)
- @TableField("loc_no")
private String locNo;
@ApiModelProperty(value= "搴撲綅鐘舵��")
diff --git a/src/main/java/com/zy/asrs/entity/WrkLastno.java b/src/main/java/com/zy/asrs/entity/WrkLastno.java
index 8192ef4..9057d57 100644
--- a/src/main/java/com/zy/asrs/entity/WrkLastno.java
+++ b/src/main/java/com/zy/asrs/entity/WrkLastno.java
@@ -24,7 +24,6 @@
*/
@ApiModelProperty(value= "绫诲瀷")
@TableId(value = "wrk_mk", type = IdType.INPUT)
- @TableField("wrk_mk")
private Integer wrkMk;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 176ea5a..bcf4d6c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -30,7 +30,6 @@
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
- @TableField("wrk_no")
private Integer wrkNo;
@ApiModelProperty(value= "")
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index fdc914b..57d6c54 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -27,12 +27,10 @@
<!--info绾у埆-->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/info.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_PATH}/info_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>10MB</maxFileSize>
<maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
@@ -46,12 +44,10 @@
<level>ERROR</level>
</filter>
<file>${LOG_PATH}/error.log</file>
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+ <fileNamePattern>${LOG_PATH}/error_%d{yyyy-MM-dd}.%i.log</fileNamePattern>
+ <maxFileSize>10MB</maxFileSize>
<maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>10MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
--
Gitblit v1.9.1