diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java index 8f0b0e9..07e576b 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjbb.java @@ -1,6 +1,9 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +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; import lombok.Data; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java index f8a324f..dee6ef1 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbjgry.java @@ -1,9 +1,7 @@ package com.dsic.gj_erp.bean.jcsj; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java index d9c296f..b9df005 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.bean.jcsj; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java index ccec210..b36d318 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbwxjh.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; import java.io.Serializable; /** diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java index 1219fb5..b61cd54 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmJtsyjh.java @@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java index 88051a1..5e4bbad 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygd.java @@ -9,7 +9,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.util.List; /** *
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java index b029d78..a820ec4 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmSygdMx.java @@ -13,7 +13,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.math.BigDecimal; /** *
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java index 0a3eb43..81709d1 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmTzjh.java @@ -9,8 +9,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import javax.persistence.Entity; -import javax.persistence.Id; import java.io.Serializable; /** diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java index 9834ad5..8630bce 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java @@ -1,8 +1,6 @@ package com.dsic.gj_erp.bean.jhgk; -import com.alibaba.excel.annotation.ExcelProperty; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java index 8e18e87..982e872 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhLj.java @@ -7,7 +7,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; -import org.apache.poi.ooxml.POIXMLDocumentPart; import java.io.Serializable; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java index dcb781b..1c8aaed 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmYdjhxf.java @@ -1,12 +1,7 @@ package com.dsic.gj_erp.bean.jhgk; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; import java.io.Serializable; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java index 4bf117d..f6a8032 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmZrcjh.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.bean.jhgk; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.annotation.ExcelIgnore; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java index 9fc1a9f..67c953f 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Dhdto.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.bean.jhgk.dto; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java index 0a77c86..97657d5 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Pldto.java @@ -1,11 +1,8 @@ package com.dsic.gj_erp.bean.jhgk.dto; import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; -import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import lombok.Data; -import java.util.List; - @Data public class Pldto extends DmCzplpNew { diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java index a990497..e7d345d 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/dto/Xbjhdto.java @@ -4,7 +4,6 @@ import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmXbjh; import lombok.Data; -import java.math.BigDecimal; import java.util.List; @Data diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java index 27e99eb..f29197c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel.java @@ -3,15 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; /** *
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java index 8beba9f..8a6a051 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/GdxqExcel1.java @@ -3,14 +3,8 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serializable; /** *
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java index 162df6c..92e7a6e 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java +++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/excel/SyExcel.java @@ -1,9 +1,7 @@ package com.dsic.gj_erp.bean.jhgk.excel; import com.alibaba.excel.annotation.ExcelProperty; -import com.alibaba.excel.annotation.format.DateTimeFormat; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java index 3ba8303..ad3f32c 100644 --- a/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java +++ b/src/main/java/com/dsic/gj_erp/bean/jiuzhou/Sljh.java @@ -7,8 +7,6 @@ import com.dsic.gj_erp.bean.jhgk.DmYdjh; import lombok.Getter; import lombok.Setter; -import java.util.Random; - @Getter @Setter @TableName("im_slxx") diff --git a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java index 9e93bfb..bfb6773 100644 --- a/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java +++ b/src/main/java/com/dsic/gj_erp/bean/kc/ImCkwpkwp.java @@ -1,8 +1,6 @@ package com.dsic.gj_erp.bean.kc; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java index 5f55447..ec49116 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/DmPpxxb.java @@ -1,17 +1,15 @@ package com.dsic.gj_erp.bean.pgd; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; - +import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java index 68b3327..c9c2fa0 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java index 6973b85..636baa5 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdDmjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java index 3ac9acf..5eece15 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPkjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java index 1304dc3..99f2230 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdPwjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java index 9fabac8..0625d95 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQgjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java index bb7d0ac..e989dab 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdQmjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java index 0e28c4c..d9af066 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdSljh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java index 90d0b67..c6080ad 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/PgdTzjh.java @@ -2,12 +2,13 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java index 78a2951..6bba1f9 100644 --- a/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java +++ b/src/main/java/com/dsic/gj_erp/bean/pgd/Qmqz.java @@ -1,12 +1,12 @@ package com.dsic.gj_erp.bean.pgd; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableField; -import java.io.Serializable; import io.swagger.annotations.ApiModel; import lombok.Data; import lombok.EqualsAndHashCode; +import java.io.Serializable; + /** *
* diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java index 465bd72..282b6af 100644 --- a/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java +++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyDictItem.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.bean.sy; -import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -12,7 +11,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; -import java.math.BigDecimal; /** *
diff --git a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java index 692c323..013ede4 100644 --- a/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java +++ b/src/main/java/com/dsic/gj_erp/bean/sy/SyLog.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.bean.sy; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; - import com.dsic.gj_erp.annotation.Dict; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java index 685c5fb..b1facbb 100644 --- a/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java +++ b/src/main/java/com/dsic/gj_erp/config/MyPhysicalNamingStrategy.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.config; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.toolkit.StringUtils; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment; diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java index 55a4b0b..a929cdb 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java @@ -1,42 +1,25 @@ package com.dsic.gj_erp.controller.jhgk; -import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; -import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; -import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; -import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import com.dsic.gj_erp.bean.jcsj.excel.PlExcel; -import com.dsic.gj_erp.bean.jhgk.DmQfxq; -import com.dsic.gj_erp.bean.jhgk.DmSygd; import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmYdjhxf; import com.dsic.gj_erp.bean.jhgk.excel.JhxfExcel; -import com.dsic.gj_erp.handler.ComputePlan; import com.dsic.gj_erp.listeners.ExcelJhxfListener; -import com.dsic.gj_erp.listeners.ExcelPlListener; -import com.dsic.gj_erp.pc.Manager; -import com.dsic.gj_erp.pc.排产; import com.dsic.gj_erp.service.jcsj.EmGcrlService; import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; -import com.dsic.gj_erp.service.sy.SYService; -import com.sun.org.apache.bcel.internal.generic.RETURN; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.IOException; import java.util.*; -import java.util.concurrent.Semaphore; import java.util.stream.Collectors; /** diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java index 0737792..efc1c84 100644 --- a/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java +++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/中日程批量表合并导入控制器.java @@ -6,6 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.dsic.gj_erp.annotation.AuthFunction; import com.dsic.gj_erp.bean.ResultBean; import com.dsic.gj_erp.bean.jcsj.DmCzplp; import com.dsic.gj_erp.bean.jcsj.DmCzplpNew; @@ -46,6 +47,7 @@ public class 中日程批量表合并导入控制器 { private final DmZrcjhOldService oldService; @PostMapping("upload") + @AuthFunction @Transactional(rollbackFor = Exception.class) public ResultBean upload(@RequestParam("file") MultipartFile file,String dcCh, HttpServletRequest req) throws IOException { ExcelZrcAndPlb excelZrcAndPlb = new ExcelZrcAndPlb(); @@ -75,15 +77,16 @@ public class 中日程批量表合并导入控制器 { if (ObjectUtil.isNotEmpty(dmZrcjhOne)) { //存进备份表 DmZrcjhOld old= BeanUtil.copyProperties(dmZrcjhOne, DmZrcjhOld.class); + old.setXh(null); oldService.save(old); String dmZrcjhOneBzr = dmZrcjhOne.getBzr(); String dmZrcjhOneBzrq = dmZrcjhOne.getBzrq(); if (!dmZrcjhOneBzr.contains(bzr)) { dmZrcjh.setBzr(StrUtil.format("{}@{}",dmZrcjhOneBzr , bzr)); dmZrcjh.setBzrq(StrUtil.format("{}@{}",dmZrcjhOneBzrq , day)); - dmZrcjh.setXh(dmZrcjhOne.getXh()); } - zrcjhService.updateById(dmZrcjh); + dmZrcjh.setXh(dmZrcjhOne.getXh()); + zrcjhList.add(dmZrcjh); } else { dmZrcjh.setBzr(bzr); dmZrcjh.setBzrq(day); @@ -99,8 +102,8 @@ public class 中日程批量表合并导入控制器 { fdList.stream().filter(fst -> plb.getDcPl().equals(fst.getDcPl())) .findFirst().ifPresent(it->updateCzPlp(plb,it)); }catch (Exception ignored){} + plList.add(plb); } - plList.add(plb); //旧表数据,仅当首次导入时写入即可 if (!remove){ @@ -111,7 +114,7 @@ public class 中日程批量表合并导入控制器 { } } } - zrcjhService.saveBatch(zrcjhList,500); + zrcjhService.saveOrUpdateBatch(zrcjhList,500); if (!plList.isEmpty()) { czplpNewService.saveBatch(plList,500); @@ -139,7 +142,7 @@ public class 中日程批量表合并导入控制器 { dmCzplpService.saveBatch(dmCzplpList); } - return new ResultBean<>(); + return new ResultBean<>(zrcjhList); } private void updateCzPlp(DmCzplpNew czplpNew,DmCzplpNew czplp){ diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java index 95a9059..95cf6eb 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmGcrlRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jcsj; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java index efda05b..4cdaa49 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbjbbRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jcsj; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import com.dsic.gj_erp.bean.sy.Dm_zhbmlbp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java index ee76802..5da5616 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jcsj/EmSbrydypRepository.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.dao.jcsj; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbrydyp; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java b/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java index cb5db63..54e7fdc 100644 --- a/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java +++ b/src/main/java/com/dsic/gj_erp/dao/jhgk/DmJtsyjhRepository.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.dao.jhgk; import com.dsic.gj_erp.bean.jhgk.DmJtsyjh; -import com.dsic.gj_erp.bean.jhgk.DmXbjh; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java index a1fb2a2..70adf07 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjbbMapper.java @@ -1,18 +1,10 @@ package com.dsic.gj_erp.mapper.jcsj; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; -import org.mapstruct.Mapper; -import java.io.Serializable; -import java.util.Collection; import java.util.List; -import java.util.Map; -import java.util.function.Function; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java index d5d70d3..4edd813 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jcsj/EmSbjgryMapper.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.jcsj; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbjgry; /** diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java index 6289d9d..00c78bc 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmJtsyjhMapper.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.mapper.jhgk; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jhgk.DmJtsyjh; -import io.lettuce.core.dynamic.annotation.Param; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java index e0b4180..79a7bc5 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/jhgk/DmSygdxqMapper.java @@ -2,10 +2,8 @@ package com.dsic.gj_erp.mapper.jhgk; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jhgk.DmSygdMx; import com.dsic.gj_erp.bean.jhgk.DmSygdMxLj; import com.dsic.gj_erp.bean.jhgk.DmSygdxq; -import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java index 7e66d8a..b77ae32 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/DmPpxxbMapper.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.mapper.pgd; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.DmPpxxb; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java index b600521..4f9b3c7 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdDh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java index a756191..ed0ae99 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdDmjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdDmjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdDmjh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java index ff77df2..abd38d8 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPkjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdPkjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdPkjh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java index 8e60cbe..47e1b90 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdPwjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdPwjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdPwjh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java index 350a2e0..d53f257 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQgjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdQgjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdQgjh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java index 7c3a54f..a6bede6 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdQmjhMapper.java @@ -1,9 +1,8 @@ package com.dsic.gj_erp.mapper.pgd; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dsic.gj_erp.bean.jhgk.DmYdjhLj; import com.dsic.gj_erp.bean.pgd.PgdQmjh; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.pgd.Qmqz; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java index 3725126..39ff74a 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdSljhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdSljh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdSljh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java index c8016c1..0037445 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/pgd/PgdTzjhMapper.java @@ -1,7 +1,7 @@ package com.dsic.gj_erp.mapper.pgd; -import com.dsic.gj_erp.bean.pgd.PgdTzjh; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dsic.gj_erp.bean.pgd.PgdTzjh; /** *
diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java index 37cdb6d..f4a484f 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/应付账款Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.应付账款; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java index 83af2da..0dcbe14 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/盘点Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.盘点; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java index 8644722..faf5fc1 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/退货Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.退货; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java b/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java index c6872ca..de2869e 100644 --- a/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java +++ b/src/main/java/com/dsic/gj_erp/mapper/txzz/采购订单Mapper.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.mapper.txzz; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.dsic.gj_erp.bean.jt.入库; import com.dsic.gj_erp.bean.jt.采购订单; import org.apache.ibatis.annotations.Mapper; diff --git a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java index 03aff28..45eb3ea 100644 --- a/src/main/java/com/dsic/gj_erp/pc/DataFactory.java +++ b/src/main/java/com/dsic/gj_erp/pc/DataFactory.java @@ -19,7 +19,10 @@ import com.dsic.gj_erp.pc.dto.data.钢料需求; import com.dsic.gj_erp.pc.dto.gx.*; import com.dsic.gj_erp.pc.dto.sb.*; import com.dsic.gj_erp.pc.dto.tlt.*; -import com.dsic.gj_erp.pc.dto.*; +import com.dsic.gj_erp.pc.dto.套料图工序; +import com.dsic.gj_erp.pc.dto.工序产能; +import com.dsic.gj_erp.pc.dto.设备; +import com.dsic.gj_erp.pc.dto.资源; import com.dsic.gj_erp.pc.service.工序CD接口; import com.dsic.gj_erp.pc.service.订货计划滚动信息接口; import com.dsic.gj_erp.pc.service.设备产能接口; diff --git a/src/main/java/com/dsic/gj_erp/pc/Manager.java b/src/main/java/com/dsic/gj_erp/pc/Manager.java index 023a28f..62c9eaf 100644 --- a/src/main/java/com/dsic/gj_erp/pc/Manager.java +++ b/src/main/java/com/dsic/gj_erp/pc/Manager.java @@ -3,7 +3,6 @@ package com.dsic.gj_erp.pc; import com.dsic.gj_erp.bean.jcsj.EmGcrl; import com.dsic.gj_erp.bean.jcsj.EmSbjbb; import com.dsic.gj_erp.pc.dto.data.Bom; -import com.dsic.gj_erp.pc.dto.data.钢料需求; import com.dsic.gj_erp.pc.dto.资源; import java.util.ArrayList; diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java b/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java index f542138..68901ca 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/工序产能.java @@ -6,8 +6,6 @@ import com.dsic.gj_erp.pc.service.工序排产处理接口; import lombok.Getter; import lombok.Setter; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import java.util.Optional; import java.util.concurrent.ConcurrentLinkedDeque; diff --git a/src/main/java/com/dsic/gj_erp/pc/dto/资源.java b/src/main/java/com/dsic/gj_erp/pc/dto/资源.java index a6e32f4..9769f50 100644 --- a/src/main/java/com/dsic/gj_erp/pc/dto/资源.java +++ b/src/main/java/com/dsic/gj_erp/pc/dto/资源.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.dto; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.dsic.gj_erp.pc.Constant; import com.dsic.gj_erp.pc.dto.data.Bom; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java index 91eab79..9d60d51 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/三月滚动接口.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.pc.service; import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; -import cn.hutool.core.util.ObjUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dsic.gj_erp.bean.ResultBean; @@ -15,7 +14,6 @@ import com.dsic.gj_erp.pc.Manager; import com.dsic.gj_erp.service.jhgk.DmSygdMxLjService; import com.dsic.gj_erp.service.jhgk.DmSygdMxService; import com.dsic.gj_erp.service.jhgk.DmSygdService; -import com.dsic.gj_erp.service.jhgk.impl.DmSygdMxLjServiceImpl; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java index 6d56d34..fc257c1 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/工序CD接口.java @@ -1,7 +1,6 @@ package com.dsic.gj_erp.pc.service; import com.dsic.gj_erp.pc.工序CD; -import com.dsic.gj_erp.pc.设备产能; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CachePut; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java b/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java index 64a8a26..431a04e 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/订货计划滚动信息接口.java @@ -1,7 +1,5 @@ package com.dsic.gj_erp.pc.service; -import com.dsic.gj_erp.bean.jhgk.DmSygd; -import com.dsic.gj_erp.pc.工序CD; import com.dsic.gj_erp.pc.订货计划; import lombok.AllArgsConstructor; import org.springframework.cache.annotation.CacheEvict; diff --git a/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java index 82590e6..a85fe4a 100644 --- a/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java +++ b/src/main/java/com/dsic/gj_erp/pc/service/设备产能接口.java @@ -8,7 +8,10 @@ import org.springframework.cache.annotation.Cacheable; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; @Service @AllArgsConstructor diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java b/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java index 454c84c..e193d82 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/EmGcrlService.java @@ -4,7 +4,6 @@ package com.dsic.gj_erp.service.jcsj; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.extension.service.IService; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import java.util.List; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java index 0d1dfc3..6f583a8 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/BomUploadServiceImpl.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; -import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.dsic.gj_erp.bean.ResultBean; @@ -18,14 +17,9 @@ import com.dsic.gj_erp.service.jcsj.*; import com.dsic.gj_erp.service.jhgk.DmTzjhService; import com.dsic.gj_erp.service.sy.SYService; import org.apache.commons.lang3.StringUtils; -import org.apache.pdfbox.pdmodel.PDDocument; -import org.apache.pdfbox.text.PDFTextStripper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.multipart.MultipartFile; import javax.script.ScriptException; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java index bddad2e..de178f2 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/DmBomServiceImpl.java @@ -1,6 +1,5 @@ package com.dsic.gj_erp.service.jcsj.impl; -import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; @@ -12,7 +11,6 @@ import com.dsic.gj_erp.bean.jcsj.vo.BomVO; import com.dsic.gj_erp.exception.CustomException; import com.dsic.gj_erp.mapper.jcsj.DmBomMapper; import com.dsic.gj_erp.service.jcsj.DmBomService; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java index 4f1d906..6b93557 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmGcrlServiceImpl.java @@ -1,29 +1,24 @@ package com.dsic.gj_erp.service.jcsj.impl; -import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.EmGcrl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.dao.jcsj.EmGcrlRepository; import com.dsic.gj_erp.mapper.jcsj.EmGcrlMapper; import com.dsic.gj_erp.service.jcsj.EmGcrlService; -import io.swagger.models.auth.In; import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Repository; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.time.DayOfWeek; import java.time.LocalDate; -import java.time.Period; -import java.time.Year; import java.time.format.DateTimeFormatter; import java.time.temporal.WeekFields; -import java.util.*; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; /** *
diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java index 4fbf036..9139f5e 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbcnpServiceImpl.java @@ -2,7 +2,6 @@ package com.dsic.gj_erp.service.jcsj.impl; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dsic.gj_erp.bean.jcsj.EmSbcnp; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java index 0251e8a..99af377 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjbbServiceImpl.java @@ -1,10 +1,8 @@ package com.dsic.gj_erp.service.jcsj.impl; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - import com.dsic.gj_erp.bean.jcsj.EmSbjbb; import com.dsic.gj_erp.bean.request.EmSbjbbBean; import com.dsic.gj_erp.dao.jcsj.EmSbjbbRepository; diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java index cb87b18..dd056f9 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbjgryServiceImpl.java @@ -1,22 +1,12 @@ package com.dsic.gj_erp.service.jcsj.impl; -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.dsic.gj_erp.bean.jcsj.EmSbcnp; import com.dsic.gj_erp.bean.jcsj.EmSbjgry; -import com.dsic.gj_erp.mapper.jcsj.EmSbcnpMapper; import com.dsic.gj_erp.mapper.jcsj.EmSbjgryMapper; -import com.dsic.gj_erp.service.jcsj.EmSbcnpService; import com.dsic.gj_erp.service.jcsj.EmSbjgryService; -import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import javax.annotation.Resource; -import java.util.List; -import java.util.stream.Collectors; - /** *
* 服务实现类 diff --git a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java index 2355052..d4638cb 100644 --- a/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java +++ b/src/main/java/com/dsic/gj_erp/service/jcsj/impl/EmSbrydypServiceImpl.java @@ -15,7 +15,6 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.List; import java.util.Map; -import java.util.stream.Collectors; /** *
diff --git a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
index 2a601db..3b81dbc 100644
--- a/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
@@ -26,7 +26,6 @@ import com.dsic.gj_erp.mapper.jhgk.DmSygdMxMapper;
import com.dsic.gj_erp.service.jcsj.EmSbcnpService;
import com.dsic.gj_erp.service.jhgk.*;
import com.dsic.gj_erp.util.MyString;
-import io.swagger.annotations.ApiModelProperty;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -912,6 +911,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl
* 服务实现类
diff --git a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java
index 9a8c273..983bda0 100644
--- a/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/pgd/impl/PgdTzjhServiceImpl.java
@@ -3,6 +3,7 @@ package com.dsic.gj_erp.service.pgd.impl;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.dsic.gj_erp.bean.jcsj.DmBchxjbp;
import com.dsic.gj_erp.bean.jcsj.DmBclqjbp;
import com.dsic.gj_erp.bean.pgd.PgdTzjh;
@@ -10,10 +11,7 @@ import com.dsic.gj_erp.mapper.pgd.PgdTzjhMapper;
import com.dsic.gj_erp.service.jcsj.DmBchxjbpService;
import com.dsic.gj_erp.service.jcsj.DmBclqjbpService;
import com.dsic.gj_erp.service.pgd.PgdTzjhService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
-import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
index c417f6b..35463d2 100644
--- a/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
+++ b/src/main/java/com/dsic/gj_erp/service/sy/SYService.java
@@ -6,29 +6,24 @@ import cn.hutool.core.util.ObjectUtil;
import com.dsic.gj_erp.bean.sy.*;
import com.dsic.gj_erp.dao.sy.*;
import com.dsic.gj_erp.mapper.SyuserMapper;
-import com.dsic.gj_erp.util.MD5Util;
import com.querydsl.core.Tuple;
import com.querydsl.core.types.dsl.BooleanExpression;
import com.querydsl.jpa.impl.JPAQueryFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.RequestBody;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
-import javax.xml.bind.DatatypeConverter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import static com.alibaba.excel.util.StringUtils.isEmpty;
-
/**
* 系统安全子系统处理逻辑
*/
diff --git a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java
index 93615a4..20bd3b5 100644
--- a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictItemServiceImpl.java
@@ -9,8 +9,8 @@ import com.dsic.gj_erp.service.sy.SyDictItemService;
import com.dsic.gj_erp.util.CacheConstant;
import com.dsic.gj_erp.util.ConditionSelect;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import org.springframework.cache.annotation.Cacheable;
+import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java
index 79257ed..7e02866 100644
--- a/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java
+++ b/src/main/java/com/dsic/gj_erp/service/sy/impl/SyDictServiceImpl.java
@@ -7,9 +7,9 @@ import com.dsic.gj_erp.bean.sy.SyDict;
import com.dsic.gj_erp.bean.tree.ProjectTreeVo;
import com.dsic.gj_erp.mapper.SyDictMapper;
import com.dsic.gj_erp.service.sy.SyDictService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
diff --git a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
index ae3b11c..2daccf4 100644
--- a/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
+++ b/src/main/java/com/dsic/gj_erp/util/ExcelUtil.java
@@ -1,9 +1,6 @@
package com.dsic.gj_erp.util;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.dsic.gj_erp.bean.jhgk.DmJtsyjh;
-import com.dsic.gj_erp.bean.jhgk.DmXbjh;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -13,7 +10,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
-import java.io.InputStream;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.regex.Matcher;
diff --git a/src/main/java/com/dsic/gj_erp/util/FileUtil.java b/src/main/java/com/dsic/gj_erp/util/FileUtil.java
index 873759a..0f0061c 100644
--- a/src/main/java/com/dsic/gj_erp/util/FileUtil.java
+++ b/src/main/java/com/dsic/gj_erp/util/FileUtil.java
@@ -10,7 +10,6 @@ import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.Optional;
-import java.util.UUID;
import java.util.concurrent.atomic.AtomicReference;
public class FileUtil {
diff --git a/src/main/java/com/dsic/gj_erp/util/IPUtils.java b/src/main/java/com/dsic/gj_erp/util/IPUtils.java
index dc893a2..0a2c640 100644
--- a/src/main/java/com/dsic/gj_erp/util/IPUtils.java
+++ b/src/main/java/com/dsic/gj_erp/util/IPUtils.java
@@ -1,15 +1,17 @@
package com.dsic.gj_erp.util;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+ import org.apache.commons.lang3.StringUtils;
+ import org.slf4j.Logger;
+ import org.slf4j.LoggerFactory;
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.*;
-import java.util.Enumeration;
+ import javax.servlet.http.HttpServletRequest;
+ import java.io.BufferedReader;
+ import java.io.IOException;
+ import java.io.InputStreamReader;
+ import java.net.Inet4Address;
+ import java.net.InetAddress;
+ import java.net.NetworkInterface;
+ import java.util.Enumeration;
/**
* IP地址
diff --git a/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java b/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java
index 30fd3d6..d37146f 100644
--- a/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java
+++ b/src/main/java/com/dsic/gj_erp/ws/WsInitListener.java
@@ -2,7 +2,6 @@ package com.dsic.gj_erp.ws;
import com.corundumstudio.socketio.SocketIOServer;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
diff --git a/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java b/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java
index 89fd5d0..63b1dbf 100644
--- a/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java
+++ b/src/main/java/com/dsic/gj_erp/ws/WsStopListener.java
@@ -2,7 +2,6 @@ package com.dsic.gj_erp.ws;
import com.corundumstudio.socketio.SocketIOServer;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.ApplicationListener;
import org.springframework.context.event.ContextClosedEvent;
import org.springframework.stereotype.Component;
diff --git a/src/main/resources/application-localws.yml b/src/main/resources/application-localws.yml
new file mode 100644
index 0000000..fbc2ea4
--- /dev/null
+++ b/src/main/resources/application-localws.yml
@@ -0,0 +1,13 @@
+ws:
+ host: 0.0.0.0
+ port: 23456
+ workCount: 100
+ allowCustomRequests: true
+ upgradeTimeout: 10000
+ pingTimeout: 60000
+ pingInterval: 25000
+ maxHttpContentLength: 1048576
+ maxFramePayloadLength: 1048576
+ client:
+ url: ws://192.168.18.1:9000
+ id: 100000000001
\ No newline at end of file
diff --git a/src/main/resources/application-ws.yml b/src/main/resources/application-ws.yml
index 2e17433..c6a5680 100644
--- a/src/main/resources/application-ws.yml
+++ b/src/main/resources/application-ws.yml
@@ -9,5 +9,5 @@ ws:
maxHttpContentLength: 1048576
maxFramePayloadLength: 1048576
client:
- url: ws://192.168.13.9:9000
- id: abc
\ No newline at end of file
+ url: ws://127.0.0.1:9000
+ id: 100000000001
\ No newline at end of file