Merge branch 'master' of http://47.115.223.229:8888/yangjun/dbsd_kczx_java

jeecg-module-main/src/main/java/org/jeecg/modules/kc/KcBdgxbcopy/entity/KcBdgxbcopy.java

@@ -37,6 +37,7 @@ public class KcBdgxbcopy implements Serializable {
 	/**userid*/
 	@Excel(name = "userid", width = 15)
     @ApiModelProperty(value = "userid")
+	@TableId
     private java.lang.String userid;
 	/**bdtime*/
 	@Excel(name = "bdtime", width = 15, format = "yyyy-MM-dd")

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TBks.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TBks {
 	/**xh*/
 	@Excel(name = "xh", width = 15)
     @ApiModelProperty(value = "xh")
+	@TableId
 	private java.lang.String xh;
 	/**xm*/
 	@Excel(name = "xm", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TDw.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TDw {
 	/**dwh*/
 	@Excel(name = "dwh", width = 15)
     @ApiModelProperty(value = "dwh")
+	@TableId
 	private java.lang.String dwh;
 	/**sfyxm*/
 	@Excel(name = "sfyxm", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtBkjxtkpj.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -30,6 +32,7 @@ public class TFwdtBkjxtkpj implements Serializable {
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
+	@TableId
     private String bh;
 	/**轮次编号*/
 	@Excel(name = "轮次编号", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TFwdtShryxx.java

@@ -2,6 +2,8 @@ package org.jeecg.modules.kc.grab.exports.entity;
 
 import java.io.Serializable;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -29,6 +31,7 @@ public class TFwdtShryxx implements Serializable {
 	/**工号*/
 	@Excel(name = "工号", width = 15)
     @ApiModelProperty(value = "工号")
+	@TableId
     private java.lang.String gh;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJsjbxx.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -115,6 +113,7 @@ public class TJwJsjbxx implements Serializable {
 	/**教室号(关联视图T_JW_KCKB里的JSBH)*/
 	@Excel(name = "教室号(关联视图T_JW_KCKB里的JSBH)", width = 15)
     @ApiModelProperty(value = "教室号(关联视图T_JW_KCKB里的JSBH)")
+	@TableId
     private java.lang.String jsh;
 	/**timestamps*/
 	@Excel(name = "timestamps", width = 15, format = "yyyy-MM-dd")

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwJxljbxx.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -43,6 +41,7 @@ public class TJwJxljbxx implements Serializable {
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
+	@TableId
     private java.lang.String bh;
 	/**状态*/
 	@Excel(name = "状态", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcapzb.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TJwKcapzb {
 	/**xnxqbh*/
 	@Excel(name = "xnxqbh", width = 15)
     @ApiModelProperty(value = "xnxqbh")
+	@TableId
 	private java.lang.String xnxqbh;
 	/**cjlrbz*/
 	@Excel(name = "cjlrbz", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKckb.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,6 +26,7 @@ public class TJwKckb {
 	/**kcbh*/
 	@Excel(name = "kcbh", width = 15)
     @ApiModelProperty(value = "kcbh")
+	@TableId
 	private java.lang.String kcbh;
 	/**kcmc*/
 	@Excel(name = "kcmc", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwKcxxb.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -34,6 +36,7 @@ public class TJwKcxxb {
 	/**khfsdm*/
 	@Excel(name = "khfsdm", width = 15)
     @ApiModelProperty(value = "khfsdm")
+	@TableId
 	private java.lang.String khfsdm;
 	/**kkdwh*/
 	@Excel(name = "kkdwh", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkkcb.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -34,6 +36,7 @@ public class TJwTkkcb {
 	/**jzwh*/
 	@Excel(name = "jzwh", width = 15)
     @ApiModelProperty(value = "jzwh")
+	@TableId
 	private java.lang.String jzwh;
 	/**jzwmc*/
 	@Excel(name = "jzwmc", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwTkxx.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -34,6 +36,7 @@ public class TJwTkxx {
 	/**lcjgbh*/
 	@Excel(name = "lcjgbh", width = 15)
     @ApiModelProperty(value = "lcjgbh")
+	@TableId
 	private java.lang.String lcjgbh;
 	/**bkjh*/
 	@Excel(name = "bkjh", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJwXsxkb.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TJwXsxkb {
 	/**hbmxbh*/
 	@Excel(name = "hbmxbh", width = 15)
     @ApiModelProperty(value = "hbmxbh")
+	@TableId
 	private java.lang.String hbmxbh;
 	/**xh*/
 	@Excel(name = "xh", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TJzgXskc.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TJzgXskc {
     /**gh*/
     @Excel(name = "gh", width = 15)
     @ApiModelProperty(value = "gh")
+    @TableId
     private java.lang.String gh;
     /**xm*/
     @Excel(name = "xm", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/TZzbLdxx.java

@@ -1,5 +1,7 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -26,6 +28,7 @@ public class TZzbLdxx {
 	/**gh*/
 	@Excel(name = "gh", width = 15)
     @ApiModelProperty(value = "gh")
+	@TableId
 	private java.lang.String gh;
 	/**xm*/
 	@Excel(name = "xm", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/exports/entity/Tdmjzgdqzt.java

@@ -1,14 +1,12 @@
 package org.jeecg.modules.kc.grab.exports.entity;
 
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * @Description: T_BKS-抓取
@@ -25,6 +23,7 @@ public class Tdmjzgdqzt {
     
 	/**xh*/
     @ApiModelProperty(value = "dm")
+	@TableId
 	private String dm;
 	/**xm*/
     @ApiModelProperty(value = "mc")

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbbkjxtkpj.java

@@ -33,6 +33,7 @@ public class Xxhbbkjxtkpj implements Serializable {
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
+	@TableId
     private java.lang.String bh;
 	/**轮次编号*/
 	@Excel(name = "轮次编号", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjsjbxx.java

@@ -105,6 +105,7 @@ public class Xxhbjsjbxx implements Serializable {
 	/**编号*/
 	@Excel(name = "编号", width = 15)
     @ApiModelProperty(value = "编号")
+	@TableId
     private java.lang.String bh;
 	/**座位数*/
 	@Excel(name = "座位数", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbjxljbxx.java

@@ -33,6 +33,7 @@ public class Xxhbjxljbxx implements Serializable {
 	/**院系号*/
 	@Excel(name = "院系号", width = 15)
     @ApiModelProperty(value = "院系号")
+	@TableId
     private java.lang.String yxh;
 	/**建筑物状况码*/
 	@Excel(name = "建筑物状况码", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/imports/entity/Xxhbshryxx.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.kc.grab.imports.entity;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -30,6 +31,7 @@ public class Xxhbshryxx implements Serializable {
 	/**工号*/
 	@Excel(name = "工号", width = 15)
     @ApiModelProperty(value = "工号")
+	@TableId
     private java.lang.String gh;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansBad.java

@@ -43,6 +43,7 @@ public class KcOldEvaluationansBad implements Serializable {
 	/**上课教师工号*/
 	@Excel(name = "上课教师工号", width = 15)
     @ApiModelProperty(value = "上课教师工号")
+	@TableId
     private java.lang.String jgh;
 	/**上课教师*/
 	@Excel(name = "上课教师", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/log/entity/KcOldEvaluationansGood.java

@@ -43,6 +43,7 @@ public class KcOldEvaluationansGood implements Serializable {
 	/**上课教师工号*/
 	@Excel(name = "上课教师工号", width = 15)
     @ApiModelProperty(value = "上课教师工号")
+	@TableId
     private java.lang.String jgh;
 	/**上课教师*/
 	@Excel(name = "上课教师", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcJiaoshixinxibiao.java

@@ -35,6 +35,7 @@ public class KcJiaoshixinxibiao implements Serializable {
 	/**教室编号*/
 	@Excel(name = "教室编号", width = 15)
     @ApiModelProperty(value = "教室编号")
+	@TableId
     private java.lang.String jsbh;
 	/**教室名称*/
 	@Excel(name = "教室名称", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsHisrecord/entity/KcEvaluationsHisrecord.java

@@ -40,6 +40,7 @@ public class KcEvaluationsHisrecord implements Serializable {
 	/**课程编号*/
 	@Excel(name = "课程编号", width = 15)
     @ApiModelProperty(value = "课程编号")
+	@TableId
     private java.lang.String kcbh;
 	/**课程名称*/
 	@Excel(name = "课程名称", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/kcEvaluationsStat/entity/KcEvaluationsStat.java

@@ -32,6 +32,7 @@ public class KcEvaluationsStat implements Serializable {
 
 	/**主键*/
     @ApiModelProperty(value = "主键")
+	@TableId
     private java.lang.String col00;
 	/**学期*/
 	@Excel(name = "学期", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/qa/entity/KcOldEvaluationans.java

@@ -4,10 +4,8 @@ import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
 import java.util.Date;
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
+
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -43,6 +41,7 @@ public class KcOldEvaluationans implements Serializable {
 	/**上课教师工号*/
 	@Excel(name = "上课教师工号", width = 15)
     @ApiModelProperty(value = "上课教师工号")
+	@TableId
     private java.lang.String jgh;
 	/**上课教师*/
 	@Excel(name = "上课教师", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctkcstj/entity/KcTkcstj.java

@@ -39,6 +39,7 @@ public class KcTkcstj implements Serializable {
 	/**教师工号*/
 	@Excel(name = "教师工号", width = 15)
     @ApiModelProperty(value = "教师工号")
+	@TableId
     private java.lang.String jgh;
 	/**教师姓名*/
 	@Excel(name = "教师姓名", width = 15)

jeecg-module-main/src/main/java/org/jeecg/modules/kc/tksf/kctksfrzb/entity/KcTksfrzb.java

@@ -33,6 +33,7 @@ public class KcTksfrzb implements Serializable {
 	/**工号*/
 	@Excel(name = "工号", width = 15)
     @ApiModelProperty(value = "工号")
+	@TableId
     private java.lang.String gh;
 	/**姓名*/
 	@Excel(name = "姓名", width = 15)

pom.xml

@@ -147,6 +147,16 @@
 			<groupId>com.baidu.aip</groupId>
 			<artifactId>java-sdk</artifactId>
 			<version>4.16.18</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.slf4j</groupId>
+					<artifactId>slf4j-simple</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
     </dependencies>