1，新增benam，mapper，service

pom.xml

@@ -14,8 +14,8 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.10.RELEASE</version>
-		<relativePath/> <!-- lookup parent from repository -->
+		<version>2.7.0</version> <!-- 使用稳定版本 -->
+		<relativePath/>
 	</parent>
 
 	<properties>
@@ -30,13 +30,34 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-freemarker</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>javax.validation</groupId>
+			<artifactId>validation-api</artifactId>
+			<version>2.0.1.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>org.hibernate.validator</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>6.0.13.Final</version>
+		</dependency>
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.2.23</version>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-jdbc</artifactId>
+		</dependency>
 		<!--springboot测试组件-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
 		<!--springboot热部署组件-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -50,14 +71,17 @@
 			<artifactId>mybatis-spring-boot-starter</artifactId>
 			<version>1.3.1</version>
 		</dependency>
-
 		<!--通用mapper-->
 		<dependency>
 			<groupId>tk.mybatis</groupId>
 			<artifactId>mapper-spring-boot-starter</artifactId>
 			<version>1.1.5</version>
 		</dependency>
-
+		<dependency>
+			<groupId>org.springdoc</groupId>
+			<artifactId>springdoc-openapi-ui</artifactId>
+			<version>1.6.14</version>
+		</dependency>
 		<!--pagehelper 分页插件-->
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
@@ -91,8 +115,16 @@
 			<artifactId>aspectjweaver</artifactId>
 			<version>1.8.0</version>
 		</dependency>
-
-
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-boot-starter</artifactId>
+			<version>3.5.3.1</version>
+		</dependency>
+		<dependency>
+			<groupId>io.springfox</groupId>
+			<artifactId>springfox-swagger2</artifactId>
+			<version>2.9.2</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.shiro</groupId>
 			<artifactId>shiro-core</artifactId>
@@ -109,15 +141,37 @@
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
 		</dependency>
-
-
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
 			<version>3.4</version>
 		</dependency>
-
-
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-webflux</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<version>5.3.21</version> <!-- 请根据实际情况调整版本 -->
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<scope>provided</scope>
+		</dependency>
 		<!--部署外部tomcat容器的时候再开启-->
 		<!--<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/zjt/ManagerApplication.java

@@ -5,18 +5,24 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-@EnableTransactionManagement  // 启注解事务管理，等同于xml配置方式的
-//首先要将spring boot自带的DataSourceAutoConfiguration禁掉，因为它会读取application.properties文件的spring.datasource.*属性并自动配置单数据源。在@SpringBootApplication注解中添加exclude属性即可：
-@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class})
-public class ManagerApplication  extends SpringBootServletInitializer {
+@EnableTransactionManagement
+@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class,
+		com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure.class,
+		org.springframework.boot.autoconfigure.web.reactive.WebFluxAutoConfiguration.class
+
+})
+@MapperScan(basePackages = "com.zjt.mapper")
+public class ManagerApplication extends SpringBootServletInitializer {
+
+	public static void main(String[] args) {
+		SpringApplication.run(ManagerApplication.class, args);
+	}
+
 	@Override
 	protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
 		return application.sources(ManagerApplication.class);
 	}
-	public static void main(String[] args) {
-		SpringApplication.run(ManagerApplication.class, args);
-	}
-}
+}

src/main/java/com/zjt/config/MyWebMvcConfigurerAdapter.java

@@ -1,11 +1,12 @@
 package com.zjt.config;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.ViewControllerRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 
 @Configuration
-public class MyWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
+public class MyWebMvcConfigurerAdapter  implements WebMvcConfigurer {
 
 
     /**
@@ -22,7 +23,6 @@ public class MyWebMvcConfigurerAdapter extends WebMvcConfigurerAdapter {
         registry.addViewController("/error/errordeal").setViewName("error/errordealogin");
         registry.addViewController("/error/unauthorized").setViewName("error/unauthorized");
         registry.addViewController("/main").setViewName("main");
-        super.addViewControllers(registry);
     }
 
 }

src/main/java/com/zjt/entity/ProductionHeader.java

@@ -1,291 +0,0 @@
-package com.zjt.entity;
-
-import java.io.Serializable;
-
-/**
- * 生产表头Bean类
- * 对应图片中的表格字段
- */
-public class ProductionHeader implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    // 系列
-    private String series;
-
-    // 商品1
-    private String product1;
-
-    // 产品
-    private String product;
-
-    // 设计
-    private String design;
-
-    // 折射率
-    private String refractiveIndex;
-
-    // 膜层
-    private String coating;
-
-    // 颜色
-    private String color;
-
-    // 属性
-    private String attribute;
-
-    // 光度范围
-    private String diopterRange;
-
-    // 范围说明
-    private String rangeDescription;
-
-    // 售价
-    private String retailPrice;
-
-    // 单眼瞳距
-    private String singleEyePupillaryDistance;
-
-    // 单眼瞳距（右）
-    private String singleEyePupillaryDistanceRight;
-
-    // 单眼瞳距（左）
-    private String singleEyePupillaryDistanceLeft;
-
-    // 镜眼距
-    private String lensEdgeDistance;
-
-    // 前倾角
-    private String frontAngle;
-
-    // 镜架面
-    private String frameSurface;
-
-    // 习惯阅读距离
-    private String habitReadingDistance;
-
-    // 近用瞳距
-    private String nearUsePupillaryDistance;
-
-    // NVB
-    private String nvb;
-
-    // 主视眼
-    private String mainVision;
-
-    // ERCO
-    private String ercd;
-
-    // 年龄
-    private String age;
-
-    // 商品编码
-    private String productCode;
-
-    // 商品名称
-    private String productName;
-
-    // 构造函数
-    public ProductionHeader() {
-    }
-
-    // getter和setter方法
-    public String getSeries() {
-        return series;
-    }
-
-    public void setSeries(String series) {
-        this.series = series;
-    }
-
-    public String getProduct1() {
-        return product1;
-    }
-
-    public void setProduct1(String product1) {
-        this.product1 = product1;
-    }
-
-    public String getProduct() {
-        return product;
-    }
-
-    public void setProduct(String product) {
-        this.product = product;
-    }
-
-    public String getDesign() {
-        return design;
-    }
-
-    public void setDesign(String design) {
-        this.design = design;
-    }
-
-    public String getRefractiveIndex() {
-        return refractiveIndex;
-    }
-
-    public void setRefractiveIndex(String refractiveIndex) {
-        this.refractiveIndex = refractiveIndex;
-    }
-
-    public String getCoating() {
-        return coating;
-    }
-
-    public void setCoating(String coating) {
-        this.coating = coating;
-    }
-
-    public String getColor() {
-        return color;
-    }
-
-    public void setColor(String color) {
-        this.color = color;
-    }
-
-    public String getAttribute() {
-        return attribute;
-    }
-
-    public void setAttribute(String attribute) {
-        this.attribute = attribute;
-    }
-
-    public String getDiopterRange() {
-        return diopterRange;
-    }
-
-    public void setDiopterRange(String diopterRange) {
-        this.diopterRange = diopterRange;
-    }
-
-    public String getRangeDescription() {
-        return rangeDescription;
-    }
-
-    public void setRangeDescription(String rangeDescription) {
-        this.rangeDescription = rangeDescription;
-    }
-
-    public String getRetailPrice() {
-        return retailPrice;
-    }
-
-    public void setRetailPrice(String retailPrice) {
-        this.retailPrice = retailPrice;
-    }
-
-    public String getSingleEyePupillaryDistance() {
-        return singleEyePupillaryDistance;
-    }
-
-    public void setSingleEyePupillaryDistance(String singleEyePupillaryDistance) {
-        this.singleEyePupillaryDistance = singleEyePupillaryDistance;
-    }
-
-    public String getSingleEyePupillaryDistanceRight() {
-        return singleEyePupillaryDistanceRight;
-    }
-
-    public void setSingleEyePupillaryDistanceRight(String singleEyePupillaryDistanceRight) {
-        this.singleEyePupillaryDistanceRight = singleEyePupillaryDistanceRight;
-    }
-
-    public String getSingleEyePupillaryDistanceLeft() {
-        return singleEyePupillaryDistanceLeft;
-    }
-
-    public void setSingleEyePupillaryDistanceLeft(String singleEyePupillaryDistanceLeft) {
-        this.singleEyePupillaryDistanceLeft = singleEyePupillaryDistanceLeft;
-    }
-
-    public String getLensEdgeDistance() {
-        return lensEdgeDistance;
-    }
-
-    public void setLensEdgeDistance(String lensEdgeDistance) {
-        this.lensEdgeDistance = lensEdgeDistance;
-    }
-
-    public String getFrontAngle() {
-        return frontAngle;
-    }
-
-    public void setFrontAngle(String frontAngle) {
-        this.frontAngle = frontAngle;
-    }
-
-    public String getFrameSurface() {
-        return frameSurface;
-    }
-
-    public void setFrameSurface(String frameSurface) {
-        this.frameSurface = frameSurface;
-    }
-
-    public String getHabitReadingDistance() {
-        return habitReadingDistance;
-    }
-
-    public void setHabitReadingDistance(String habitReadingDistance) {
-        this.habitReadingDistance = habitReadingDistance;
-    }
-
-    public String getNearUsePupillaryDistance() {
-        return nearUsePupillaryDistance;
-    }
-
-    public void setNearUsePupillaryDistance(String nearUsePupillaryDistance) {
-        this.nearUsePupillaryDistance = nearUsePupillaryDistance;
-    }
-
-    public String getNvb() {
-        return nvb;
-    }
-
-    public void setNvb(String nvb) {
-        this.nvb = nvb;
-    }
-
-    public String getMainVision() {
-        return mainVision;
-    }
-
-    public void setMainVision(String mainVision) {
-        this.mainVision = mainVision;
-    }
-
-    public String getErcd() {
-        return ercd;
-    }
-
-    public void setErcd(String ercd) {
-        this.ercd = ercd;
-    }
-
-    public String getAge() {
-        return age;
-    }
-
-    public void setAge(String age) {
-        this.age = age;
-    }
-
-    public String getProductCode() {
-        return productCode;
-    }
-
-    public void setProductCode(String productCode) {
-        this.productCode = productCode;
-    }
-
-    public String getProductName() {
-        return productName;
-    }
-
-    public void setProductName(String productName) {
-        this.productName = productName;
-    }
-}

src/main/java/com/zjt/entity/ProductionVariety.java

@@ -0,0 +1,29 @@
+package com.zjt.entity;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProductionVariety对象", description="")
+public class ProductionVariety implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String variety;
+
+
+}

src/main/java/com/zjt/entity/ProductionVarietyAdd.java

@@ -0,0 +1,31 @@
+package com.zjt.entity;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProductionVarietyAdd对象", description="")
+public class ProductionVarietyAdd implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Float tdId;
+
+    private String add;
+
+
+}

src/main/java/com/zjt/entity/ProductionVarietyDetail.java

@@ -0,0 +1,33 @@
+package com.zjt.entity;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProductionVarietyDetail对象", description="")
+public class ProductionVarietyDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Float varietyId;
+
+    private String variety;
+
+    private String varietyDetails;
+
+
+}

src/main/java/com/zjt/entity/ProductionVarietyDetailColour.java

@@ -0,0 +1,31 @@
+package com.zjt.entity;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProductionVarietyDetailColour对象", description="")
+public class ProductionVarietyDetailColour implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Float varietyDetailsId;
+
+    private String colour;
+
+
+}

src/main/java/com/zjt/entity/ProductionVarietyTd.java

@@ -0,0 +1,33 @@
+package com.zjt.entity;
+
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="ProductionVarietyTd对象", description="")
+public class ProductionVarietyTd implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String variety;
+
+    private Float varietyId;
+
+    private Integer td;
+
+
+}

src/main/java/com/zjt/entity/Productionheader.java

@@ -0,0 +1,125 @@
+package com.zjt.entity;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value="Productionheader对象", description="")
+public class Productionheader implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "关联订单ID")
+    private Long orderId;
+
+    @ApiModelProperty(value = "关联客户ID")
+    private Long customerId;
+
+    @ApiModelProperty(value = "系列")
+    private String series;
+
+    @ApiModelProperty(value = "商品1")
+    private String product1;
+
+    @ApiModelProperty(value = "产品")
+    private String product;
+
+    @ApiModelProperty(value = "设计")
+    private String design;
+
+    @ApiModelProperty(value = "折射率")
+    private String refractiveIndex;
+
+    @ApiModelProperty(value = "膜层")
+    private String coating;
+
+    @ApiModelProperty(value = "颜色")
+    private String color;
+
+    @ApiModelProperty(value = "属性")
+    private String attribute;
+
+    @ApiModelProperty(value = "光度范围")
+    private String diopterRange;
+
+    @ApiModelProperty(value = "范围说明")
+    private String rangeDescription;
+
+    @ApiModelProperty(value = "售价")
+    private BigDecimal retailPrice;
+
+    @ApiModelProperty(value = "单眼瞳高")
+    private String pupillaryHeight;
+
+    @ApiModelProperty(value = "单眼瞳距（右）")
+    private String singleEyePupillaryDistanceRight;
+
+    @ApiModelProperty(value = "单眼瞳距（左）")
+    private String singleEyePupillaryDistanceLeft;
+
+    @ApiModelProperty(value = "镜眼距")
+    private String lensEdgeDistance;
+
+    @ApiModelProperty(value = "前倾角")
+    private String frontAngle;
+
+    @ApiModelProperty(value = "镜架面")
+    private String frameSurface;
+
+    @ApiModelProperty(value = "习惯阅读距离")
+    private String habitReadingDistance;
+
+    @ApiModelProperty(value = "近用瞳距")
+    private String nearUsePupillaryDistance;
+
+    @ApiModelProperty(value = "NVB")
+    private String nvb;
+
+    @ApiModelProperty(value = "主视眼")
+    private String mainVision;
+
+    @ApiModelProperty(value = "ERCD")
+    private String ercd;
+
+    @ApiModelProperty(value = "年龄")
+    private String age;
+
+    @ApiModelProperty(value = "商品编码")
+    private String productCode;
+
+    @ApiModelProperty(value = "商品名称")
+    private String productName;
+
+    @ApiModelProperty(value = "状态：0-禁用，1-启用")
+    @TableField("STATUS")
+    private Integer status;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+
+
+}

src/main/java/com/zjt/mapper/ProductionVarietyAddMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.ProductionVarietyAdd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionVarietyAddMapper extends BaseMapper<ProductionVarietyAdd> {
+
+}

src/main/java/com/zjt/mapper/ProductionVarietyDetailColourMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionVarietyDetailColourMapper extends BaseMapper<ProductionVarietyDetailColour> {
+
+}

src/main/java/com/zjt/mapper/ProductionVarietyDetailMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.ProductionVarietyDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionVarietyDetailMapper extends BaseMapper<ProductionVarietyDetail> {
+
+}

src/main/java/com/zjt/mapper/ProductionVarietyMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.ProductionVariety;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionVarietyMapper extends BaseMapper<ProductionVariety> {
+
+}

src/main/java/com/zjt/mapper/ProductionVarietyTdMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.ProductionVarietyTd;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionVarietyTdMapper extends BaseMapper<ProductionVarietyTd> {
+
+}

src/main/java/com/zjt/mapper/ProductionheaderMapper.java

@@ -0,0 +1,16 @@
+package com.zjt.mapper;
+
+import com.zjt.entity.Productionheader;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface ProductionheaderMapper extends BaseMapper<Productionheader> {
+
+}

src/main/java/com/zjt/service/IProductionVarietyAddService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.ProductionVarietyAdd;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionVarietyAddService extends IService<ProductionVarietyAdd> {
+
+}

src/main/java/com/zjt/service/IProductionVarietyDetailColourService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionVarietyDetailColourService extends IService<ProductionVarietyDetailColour> {
+
+}

src/main/java/com/zjt/service/IProductionVarietyDetailService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.ProductionVarietyDetail;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionVarietyDetailService extends IService<ProductionVarietyDetail> {
+
+}

src/main/java/com/zjt/service/IProductionVarietyService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.ProductionVariety;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionVarietyService extends IService<ProductionVariety> {
+
+}

src/main/java/com/zjt/service/IProductionVarietyTdService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.ProductionVarietyTd;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionVarietyTdService extends IService<ProductionVarietyTd> {
+
+}

src/main/java/com/zjt/service/IProductionheaderService.java

@@ -0,0 +1,16 @@
+package com.zjt.service;
+
+import com.zjt.entity.Productionheader;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+public interface IProductionheaderService extends IService<Productionheader> {
+
+}

src/main/java/com/zjt/service/impl/ProductionVarietyAddServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.ProductionVarietyAdd;
+import com.zjt.mapper.ProductionVarietyAddMapper;
+import com.zjt.service.IProductionVarietyAddService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionVarietyAddServiceImpl extends ServiceImpl<ProductionVarietyAddMapper, ProductionVarietyAdd> implements IProductionVarietyAddService {
+
+}

src/main/java/com/zjt/service/impl/ProductionVarietyDetailColourServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.ProductionVarietyDetailColour;
+import com.zjt.mapper.ProductionVarietyDetailColourMapper;
+import com.zjt.service.IProductionVarietyDetailColourService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionVarietyDetailColourServiceImpl extends ServiceImpl<ProductionVarietyDetailColourMapper, ProductionVarietyDetailColour> implements IProductionVarietyDetailColourService {
+
+}

src/main/java/com/zjt/service/impl/ProductionVarietyDetailServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.ProductionVarietyDetail;
+import com.zjt.mapper.ProductionVarietyDetailMapper;
+import com.zjt.service.IProductionVarietyDetailService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionVarietyDetailServiceImpl extends ServiceImpl<ProductionVarietyDetailMapper, ProductionVarietyDetail> implements IProductionVarietyDetailService {
+
+}

src/main/java/com/zjt/service/impl/ProductionVarietyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.ProductionVariety;
+import com.zjt.mapper.ProductionVarietyMapper;
+import com.zjt.service.IProductionVarietyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionVarietyServiceImpl extends ServiceImpl<ProductionVarietyMapper, ProductionVariety> implements IProductionVarietyService {
+
+}

src/main/java/com/zjt/service/impl/ProductionVarietyTdServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.ProductionVarietyTd;
+import com.zjt.mapper.ProductionVarietyTdMapper;
+import com.zjt.service.IProductionVarietyTdService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionVarietyTdServiceImpl extends ServiceImpl<ProductionVarietyTdMapper, ProductionVarietyTd> implements IProductionVarietyTdService {
+
+}

src/main/java/com/zjt/service/impl/ProductionheaderServiceImpl.java

@@ -0,0 +1,20 @@
+package com.zjt.service.impl;
+
+import com.zjt.entity.Productionheader;
+import com.zjt.mapper.ProductionheaderMapper;
+import com.zjt.service.IProductionheaderService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@Service
+public class ProductionheaderServiceImpl extends ServiceImpl<ProductionheaderMapper, Productionheader> implements IProductionheaderService {
+
+}

src/main/java/com/zjt/web/MenuController.java

@@ -274,7 +274,7 @@ public class MenuController {
     @ResponseBody
     @RequestMapping(value = "/deletemenu")
     @RequiresPermissions(value = {"菜单管理"})
-    public Map<String, Object> deletemenu(HttpSession session,Tmenu tmenu) {
+    public Map<String, Object> deletemenu(HttpSession session, Tmenu tmenu) {
         LinkedHashMap<String, Object> resultmap = new LinkedHashMap<String, Object>();
         try {
             if(tmenu.getId()!=null&&!tmenu.getId().equals(0)){

src/main/java/com/zjt/web/ProductionVarietyAddController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/production-variety-add")
+public class ProductionVarietyAddController {
+
+}

src/main/java/com/zjt/web/ProductionVarietyController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/production-variety")
+public class ProductionVarietyController {
+
+}

src/main/java/com/zjt/web/ProductionVarietyDetailColourController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/production-variety-detail-colour")
+public class ProductionVarietyDetailColourController {
+
+}

src/main/java/com/zjt/web/ProductionVarietyDetailController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/production-variety-detail")
+public class ProductionVarietyDetailController {
+
+}

src/main/java/com/zjt/web/ProductionVarietyTdController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/production-variety-td")
+public class ProductionVarietyTdController {
+
+}

src/main/java/com/zjt/web/ProductionheaderController.java

@@ -0,0 +1,20 @@
+package com.zjt.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xxu
+ * @since 2025-09-25
+ */
+@RestController
+@RequestMapping("/entity/productionheader")
+public class ProductionheaderController {
+
+}

src/main/java/com/zjt/web/UserController.java

@@ -1,8 +1,6 @@
 package com.zjt.web;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.zjt.entity.*;
@@ -19,12 +17,11 @@ import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
+import javax.servlet.http.HttpSession;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpSession;
 import javax.validation.Valid;
-import javax.validation.constraints.Size;
-import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
@@ -34,249 +31,188 @@ import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
-import static org.apache.commons.lang3.StringUtils.length;
-
-/**
-* @Description: 当前登录用户控制器
-* @Date: Created in 2018/2/8 19:28
-* @param 
-*/
 @Controller
 @RequestMapping("/user")
 public class UserController {
 
+	private static final String ADMIN_ROLE = "admin";
+	private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+	private static final String ID_PREFIX = "S";
+
 	@Resource
-	private com.zjt.service.MaterialType MaterialType;
+	private MaterialType materialType;
 
 	@Resource
 	private TroleService troleService;
-	
+
 	@Resource
 	private TuserService tuserService;
-	
+
 	@Resource
 	private TmenuService tmenuService;
 
-	/*@Resource
-	private LogService logService;*/
 	@RequestMapping("list")
-	public String select(String id,String storeCode, String createtime,String receive, HttpSession session, Model model){
-		Tuser users= (Tuser) session.getAttribute("currentUser");
+	public String select(String id, String storeCode, String createtime, String receive, Model model, HttpSession session) {
+		Tuser users = (Tuser) session.getAttribute("currentUser");
 		List<cgmaterial> collect1;
-		String id1="";
-		if(!"".equals(id)){
-			id1=id.substring(1);
+		String id1 = "";
+
+		if (StringUtils.isNotEmpty(id)) {
+			id1 = id.substring(1);
 		}
-		if(!"".equals(createtime)){
+
+		SimpleDateFormat sdf1 = new SimpleDateFormat(DATE_FORMAT);
+		if (StringUtils.isNotEmpty(createtime)) {
 			String[] split1 = createtime.split(" - ");
-			String strDateFormat1 = "yyyy-MM-dd HH:mm:ss";
-			SimpleDateFormat sdf1 = new SimpleDateFormat(strDateFormat1);
-			if(!"".equals(storeCode)){
-				if("admin".equals(users.getTrueName())){
-					collect1=MaterialType.selectDataBy(id1,storeCode,split1[0],split1[1],receive);
-				}else{
-					collect1=MaterialType.selectDataBy(id1,users.getUserName(),split1[0],split1[1],receive);
+			if (StringUtils.isNotEmpty(storeCode)) {
+				if (ADMIN_ROLE.equals(users.getTrueName())) {
+					collect1 = materialType.selectDataBy(id1, storeCode, split1[0], split1[1], receive);
+				} else {
+					collect1 = materialType.selectDataBy(id1, users.getUserName(), split1[0], split1[1], receive);
 				}
-			}else{
-				if("admin".equals(users.getTrueName())){
-					collect1=MaterialType.selectDataBy(id1,"",split1[0],split1[1],receive);
-				}else{
-					collect1=MaterialType.selectDataBy(id1,users.getUserName(),split1[0],split1[1],receive);
+			} else {
+				if (ADMIN_ROLE.equals(users.getTrueName())) {
+					collect1 = materialType.selectDataBy(id1, "", split1[0], split1[1], receive);
+				} else {
+					collect1 = materialType.selectDataBy(id1, users.getUserName(), split1[0], split1[1], receive);
 				}
 			}
-		}else{
-			if(!"".equals(storeCode)){
-				if("admin".equals(users.getTrueName())){
-					collect1=MaterialType.selectDataBy(id1,storeCode,"","",receive);
-				}else{
-					collect1=MaterialType.selectDataBy(id1,users.getUserName(),"","",receive);
+		} else {
+			if (StringUtils.isNotEmpty(storeCode)) {
+				if (ADMIN_ROLE.equals(users.getTrueName())) {
+					collect1 = materialType.selectDataBy(id1, storeCode, "", "", receive);
+				} else {
+					collect1 = materialType.selectDataBy(id1, users.getUserName(), "", "", receive);
 				}
-			}else{
-				if("admin".equals(users.getTrueName())){
-					collect1=MaterialType.selectDataBy(id1,"","","",receive);
-				}else {
-					collect1 = MaterialType.selectDataBy(id1, users.getUserName(), "", "", receive);
+			} else {
+				if (ADMIN_ROLE.equals(users.getTrueName())) {
+					collect1 = materialType.selectDataBy(id1, "", "", "", receive);
+				} else {
+					collect1 = materialType.selectDataBy(id1, users.getUserName(), "", "", receive);
 				}
 			}
 		}
-		model.addAttribute("listcg",collect1);
+		model.addAttribute("listcg", collect1);
 
-		//List<cgmaterial> collect1 = MaterialType.selectDataBy(id,storeCode,split1[0],split1[1],receive);
-
-		Predicate<cgmaterial> predicate = a->{
-			if(!"admin".equals(users.getTrueName())){
-				if(a.getUsername().equals(users.getTrueName())){
-					return true;
-				}else{
-					return false;
-				}
-			}else {
-			return true;
+		Predicate<cgmaterial> predicate = a -> {
+			if (!ADMIN_ROLE.equals(users.getTrueName())) {
+				return a.getUsername().equals(users.getTrueName());
 			}
+			return true;
 		};
-		Predicate<cgmaterial> predicate2=a->{
-			if(createtime.length()>0){
+
+		Predicate<cgmaterial> predicate2 = a -> {
+			if (StringUtils.isNotEmpty(createtime)) {
 				String[] split = createtime.split(" - ");
-				String strDateFormat = "yyyy-MM-dd HH:mm:ss";
-				SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
-				if(sdf.format(a.getCreatetime()).compareTo(split[0])>0&&sdf.format(a.getCreatetime()).compareTo(split[1])<0){
-					return true;
-				}else{
-					return false;
-				}
-			}else{
-				return true;
+				SimpleDateFormat sdf = new SimpleDateFormat(DATE_FORMAT);
+				String createTimeStr = sdf.format(a.getCreatetime());
+				return createTimeStr.compareTo(split[0]) > 0 && createTimeStr.compareTo(split[1]) < 0;
 			}
+			return true;
 		};
-/*		Predicate<cgmaterial> predicate3=a->{
-		if(receive.length()>0){
-			if(a.getLy().equals(receive)){
-				return true;
-			}else{
-				return false;
-			}
-		}else {
-				return true;
-			}
 
-		};*/
-		Predicate<cgmaterial> predicate4=a->{
-			if(storeCode.length()>0){
-				if(a.getStore().equals(storeCode)){
-					return true;
-				}else{
-					return false;
-				}
-			}else {
-				return true;
-			}
-		};
-		Predicate<cgmaterial> predicate5=a->{
-			if(id.length()>0){
-				String replace = id.replace(",", "");
-				if(("S"+a.getId()).equals(replace)){
-					return true;
-				}else{
-					return false;
-				}
-			}else {
-				return true;
-			}
-		};
+		Predicate<cgmaterial> predicate4 = a -> StringUtils.isEmpty(storeCode) || a.getStore().equals(storeCode);
+		Predicate<cgmaterial> predicate5 = a -> StringUtils.isEmpty(id) || (ID_PREFIX + a.getId()).equals(id.replace(",", ""));
 
-/*		List<cgmaterial> collect = MaterialType.selectData().stream()
+		// 合并所有过滤条件
+		List<cgmaterial> collect = collect1.stream()
 				.filter(predicate)
 				.filter(predicate2)
-				.filter(predicate3)
 				.filter(predicate4)
 				.filter(predicate5)
-				.collect(Collectors.toList());*/
+				.collect(Collectors.toList());
 
 		return "mypackage/selectcg";
 	}
 
 	@RequestMapping("input")
-	public String input(){
+	public String input() {
 		return "mypackage/input";
 	}
 
 	@RequestMapping("test")
-	public String test(){
+	public String test() {
 		return "mypackage/test";
 	}
-		@RequestMapping("insert")
-		public String insert(@RequestParam("list")String userList,HttpSession session){
-			//List<requestDate> requestDates = JSON.parseArray(userList, requestDate.class);
-			List<cgmaterial> cgmaterial = JSON.parseArray(userList, cgmaterial.class);
-			Tuser user= (Tuser) session.getAttribute("currentUser");
-			SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");//设置日期格式
-			String s=user.getId()+""+df.format(new Date());
-			Consumer<cgmaterial> consumer= a->MaterialType.insertCg(a);
-			Predicate<cgmaterial> predicate=a->{
-				if(a.getMaterialcode()!= null&&a.getWz()!=null&&a.getLy()!=null){
-				return true;
-			}else{
-				return false;
-				}
-			};
-
-			cgmaterial.stream().filter(a->a.getMaterialcode()!= null&&a.getWz()!=null&&a.getLy()!=null).map(
-					a->{
-						a.setId(Long.parseLong(s));
-						a.setUsername(user.getTrueName());
-						a.setCreatetime(new Date());
-						a.setStore(user.getUserName());
+
+	@RequestMapping("insert")
+	public String insert(@RequestParam("list") String userList, HttpSession session) {
+		List<cgmaterial> cgmaterials = JSON.parseArray(userList, cgmaterial.class);
+		Tuser user = (Tuser) session.getAttribute("currentUser");
+		SimpleDateFormat df = new SimpleDateFormat("yyyyMMddHHmmss");
+		String s = user.getId() + "" + df.format(new Date());
+
+		Consumer<cgmaterial> consumer = materialType::insertCg;
+
+		cgmaterials.stream()
+				.filter(a -> a.getMaterialcode() != null && a.getWz() != null && a.getLy() != null)
+				.map(a -> {
+					a.setId(Long.parseLong(s));
+					a.setUsername(user.getTrueName());
+					a.setCreatetime(new Date());
+					a.setStore(user.getUserName());
 					return a;
-					}
-			).collect(Collectors.toList()).forEach(consumer);
-			return "mypackage/test";
+				})
+				.forEach(consumer);
+
+		return "mypackage/test";
+	}
+
+	@ResponseBody
+	@PostMapping("/login")
+	public Map<String, Object> login(String imageCode, @Valid Tuser user, BindingResult bindingResult, HttpSession session) {
+		Map<String, Object> map = new HashMap<>();
+		if (StringUtils.isEmpty(imageCode)) {
+			map.put("success", false);
+			map.put("errorInfo", "请输入验证码！");
+			return map;
+		}
+		if (!session.getAttribute("checkcode").equals(imageCode)) {
+			map.put("success", false);
+			map.put("errorInfo", "验证码输入错误！");
+			return map;
 		}
+		if (bindingResult.hasErrors()) {
+			map.put("success", false);
+			map.put("errorInfo", bindingResult.getFieldError().getDefaultMessage());
+			return map;
+		}
+
+		Subject subject = SecurityUtils.getSubject();
+		UsernamePasswordToken token = new UsernamePasswordToken(user.getUserName(), user.getPassword());
+		try {
+			subject.login(token);
+			if (!subject.isAuthenticated()) {
+				map.put("success", false);
+				map.put("errorInfo", "认证失败！");
+				return map;
+			}
 
-	
-	/**
-     * 用户登录请求
-     * @param user
-     * @return
-     */
-    @ResponseBody
-    @PostMapping("/login")
-    public Map<String,Object> login(String imageCode, @Valid Tuser user, BindingResult bindingResult, HttpSession session){
-    	Map<String,Object> map=new HashMap<String,Object>();
-    	if(StringUtils.isEmpty(imageCode)){
-    		map.put("success", false);
-    		map.put("errorInfo", "请输入验证码！");
-    		return map;
-    	}
-    	if(!session.getAttribute("checkcode").equals(imageCode)){
-    		map.put("success", false);
-    		map.put("errorInfo", "验证码输入错误！");
-    		return map;
-    	}
-    	if(bindingResult.hasErrors()){
-    		map.put("success", false);
-    		map.put("errorInfo", bindingResult.getFieldError().getDefaultMessage());
-    		return map;
-    	}
-		Subject subject=SecurityUtils.getSubject();
-		UsernamePasswordToken token=new UsernamePasswordToken(user.getUserName(), user.getPassword());
-		try{
-			subject.login(token); // 登录认证
-			String userName=(String) SecurityUtils.getSubject().getPrincipal();
-			//Tuser currentUser=tuserService.findByUserName(userName);
-			Example tuserExample=new Example(Tuser.class);
-			tuserExample.or().andEqualTo("userName",userName);
-			Tuser currentUser=tuserService.selectByExample(tuserExample).get(0);
+			String userName = (String) SecurityUtils.getSubject().getPrincipal();
+			Example tuserExample = new Example(Tuser.class);
+			tuserExample.or().andEqualTo("userName", userName);
+			Tuser currentUser = tuserService.selectByExample(tuserExample).get(0);
 			session.setAttribute("currentUser", currentUser);
-			//List<Trole> roleList=troleService.findByUserId(currentUser.getId());
-			List<Trole> roleList=troleService.selectRolesByUserId(currentUser.getId());
+
+			List<Trole> roleList = troleService.selectRolesByUserId(currentUser.getId());
 			map.put("roleList", roleList);
 			map.put("roleSize", roleList.size());
 			map.put("success", true);
-			//logService.save(new Log(Log.LOGIN_ACTION,"用户登录")); // 写入日志
 			return map;
-		}catch(Exception e){
+		} catch (Exception e) {
 			e.printStackTrace();
 			map.put("success", false);
 			map.put("errorInfo", "用户名或者密码错误！");
 			return map;
 		}
-    }
-
-
+	}
 
-	/**
-	 * 保存角色信息
-	 * @param roleId
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 */
 	@ResponseBody
 	@PostMapping("/saveRole")
-	public Map<String,Object> saveRole(Integer roleId,HttpSession session)throws Exception{
-		Map<String,Object> map=new HashMap<String,Object>();
-		Trole currentRole=troleService.selectByKey(roleId);
-		session.setAttribute("currentRole", currentRole); // 保存当前角色信息
+	public Map<String, Object> saveRole(Integer roleId, HttpSession session) {
+		Map<String, Object> map = new HashMap<>();
+		Trole currentRole = troleService.selectByKey(roleId);
+		session.setAttribute("currentRole", currentRole);
 
 		putTmenuOneClassListIntoSession(session);
 
@@ -284,138 +220,82 @@ public class UserController {
 		return map;
 	}
 
-
-	/**
-	 * 安全退出
-	 *
-	 * @return
-	 * @throws Exception
-	 */
 	@GetMapping("/logout")
-	public String logout() throws Exception {
-//		logService.save(new Log(Log.LOGOUT_ACTION,"用户注销"));
+	public String logout() {
 		SecurityUtils.getSubject().logout();
 		return "redirect:/tologin";
 	}
 
-
-	/**
-	 * 加载权限菜单
-	 * @param session
-	 * @return
-	 * @throws Exception
-	 * 这里传入的parentId是1
-	 */
 	@ResponseBody
 	@GetMapping("/loadMenuInfo")
-	public String loadMenuInfo(HttpSession session, Integer parentId)throws Exception{
-
+	public String loadMenuInfo(HttpSession session, Integer parentId) {
 		putTmenuOneClassListIntoSession(session);
 
-		Trole currentRole=(Trole) session.getAttribute("currentRole");
-		//根据当前用户的角色id和父节点id查询所有菜单及子集json
-		String json=getAllMenuByParentId(parentId,currentRole.getId()).toString();
-		//System.out.println(json);
+		Trole currentRole = (Trole) session.getAttribute("currentRole");
+		String json = getAllMenuByParentId(parentId, currentRole.getId()).toString();
 		return json;
 	}
 
-	/**
-	 * 获取根频道所有菜单信息
-	 * @param parentId
-	 * @param roleId
-	 * @return
-	 */
-	private JsonObject getAllMenuByParentId(Integer parentId,Integer roleId){
-		JsonObject resultObject=new JsonObject();
-		JsonArray jsonArray=this.getMenuByParentId(parentId, roleId);//得到所有一级菜单
-		for(int i=0;i<jsonArray.size();i++){
-			JsonObject jsonObject=(JsonObject) jsonArray.get(i);
-			//判断该节点下时候还有子节点
-			Example example=new Example(Tmenu.class);
-			example.or().andEqualTo("pId",jsonObject.get("id").getAsString());
-			//if("true".equals(jsonObject.get("spread").getAsString())){
-			if (tmenuService.selectCountByExample(example)==0) {
+	private JsonObject getAllMenuByParentId(Integer parentId, Integer roleId) {
+		JsonObject resultObject = new JsonObject();
+		JsonArray jsonArray = getMenuByParentId(parentId, roleId);
+
+		for (int i = 0; i < jsonArray.size(); i++) {
+			JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
+			Example example = new Example(Tmenu.class);
+			example.or().andEqualTo("pId", jsonObject.get("id").getAsString());
+
+			if (tmenuService.selectCountByExample(example) == 0) {
 				continue;
-			}else{
-				//由于后台模板的规定，一级菜单以title最为json的key
-				resultObject.add(jsonObject.get("title").getAsString(), getAllMenuJsonArrayByParentId(jsonObject.get("id").getAsInt(),roleId));
+			} else {
+				resultObject.add(jsonObject.get("title").getAsString(), getAllMenuJsonArrayByParentId(jsonObject.get("id").getAsInt(), roleId));
 			}
 		}
 		return resultObject;
 	}
 
+	private JsonArray getAllMenuJsonArrayByParentId(Integer parentId, Integer roleId) {
+		JsonArray jsonArray = getMenuByParentId(parentId, roleId);
 
+		for (int i = 0; i < jsonArray.size(); i++) {
+			JsonObject jsonObject = jsonArray.get(i).getAsJsonObject();
+			Example example = new Example(Tmenu.class);
+			example.or().andEqualTo("pId", jsonObject.get("id").getAsString());
 
-	//获取根频道下子频道菜单列表集合
-	private JsonArray getAllMenuJsonArrayByParentId(Integer parentId,Integer roleId){
-		JsonArray jsonArray=this.getMenuByParentId(parentId, roleId);
-		for(int i=0;i<jsonArray.size();i++){
-			JsonObject jsonObject=(JsonObject) jsonArray.get(i);
-			//判断该节点下是否还有子节点
-			Example example=new Example(Tmenu.class);
-			example.or().andEqualTo("pId",jsonObject.get("id").getAsString());
-			//if("true".equals(jsonObject.get("spread").getAsString())){
-			if (tmenuService.selectCountByExample(example)==0) {
+			if (tmenuService.selectCountByExample(example) == 0) {
 				continue;
-			}else{
-				//二级或三级菜单
-				jsonObject.add("children", getAllMenuJsonArrayByParentId(jsonObject.get("id").getAsInt(),roleId));
+			} else {
+				jsonObject.add("children", getAllMenuJsonArrayByParentId(jsonObject.get("id").getAsInt(), roleId));
 			}
 		}
 		return jsonArray;
 	}
 
-
-
-
-	/**
-	 * 根据父节点和用户角色id查询菜单
-	 * @param parentId
-	 * @param roleId
-	 * @return
-	 */
-	private JsonArray getMenuByParentId(Integer parentId,Integer roleId){
-		//List<Menu> menuList=menuService.findByParentIdAndRoleId(parentId, roleId);
-		HashMap<String,Object> paraMap=new HashMap<String,Object>();
-		paraMap.put("pid",parentId);
-		paraMap.put("roleid",roleId);
-		List<Tmenu> menuList=tmenuService.selectByParentIdAndRoleId(paraMap);
-		JsonArray jsonArray=new JsonArray();
-		for(Tmenu menu:menuList){
-			JsonObject jsonObject=new JsonObject();
-			jsonObject.addProperty("id", menu.getId()); // 节点id
-			jsonObject.addProperty("title", menu.getName()); // 节点名称
-			jsonObject.addProperty("spread", false); // 不展开
+	private JsonArray getMenuByParentId(Integer parentId, Integer roleId) {
+		HashMap<String, Object> paraMap = new HashMap<>();
+		paraMap.put("pid", parentId);
+		paraMap.put("roleid", roleId);
+		List<Tmenu> menuList = tmenuService.selectByParentIdAndRoleId(paraMap);
+
+		JsonArray jsonArray = new JsonArray();
+		for (Tmenu menu : menuList) {
+			JsonObject jsonObject = new JsonObject();
+			jsonObject.addProperty("id", menu.getId());
+			jsonObject.addProperty("title", menu.getName());
+			jsonObject.addProperty("spread", false);
 			jsonObject.addProperty("icon", menu.getIcon());
-			if(StringUtils.isNotEmpty(menu.getUrl())){
-				jsonObject.addProperty("href", menu.getUrl()); // 菜单请求地址
+			if (StringUtils.isNotEmpty(menu.getUrl())) {
+				jsonObject.addProperty("href", menu.getUrl());
 			}
 			jsonArray.add(jsonObject);
-
 		}
 		return jsonArray;
 	}
 
-
-
-
-public void putTmenuOneClassListIntoSession(HttpSession session){
-	//用来在welcome.ftl中获取主菜单列表
-	Example example=new Example(Tmenu.class);
-	example.or().andEqualTo("pId",1);
-	List<Tmenu> tmenuOneClassList=tmenuService.selectByExample(example);
-	session.setAttribute("tmenuOneClassList", tmenuOneClassList);
-}
-
-
-
-
-
-
-
-
-
-
-
-    
+	public void putTmenuOneClassListIntoSession(HttpSession session) {
+		Example example = new Example(Tmenu.class);
+		example.or().andEqualTo("pId", 1);
+		List<Tmenu> tmenuOneClassList = tmenuService.selectByExample(example);
+		session.setAttribute("tmenuOneClassList", tmenuOneClassList);
+	}
 }

src/main/resources/application-dev.properties

@@ -18,7 +18,7 @@ spring.datasource.validationQuery=SELECT 1 FROM DUAL
 spring.datasource.testWhileIdle=true
 spring.datasource.testOnBorrow=false
 spring.datasource.testOnReturn=false
-
+spring.main.allow-bean-definition-overriding=true
 spring.datasource.poolPreparedStatements=true
 spring.datasource.maxPoolPreparedStatementPerConnectionSize=20
 
@@ -64,10 +64,10 @@ spring.freemarker.request-context-attribute=request
 spring.freemarker.suffix=.ftl
 spring.freemarker.template-loader-path=classpath:/templates/ 
 #spring.freemarker.view-names= #whitelistofviewnamesthatcanberesolved
-
+logging.level.org.springframework.boot.autoconfigure=INFO
 #spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/,file:${web.upload-path}
-spring.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
-
+spring.web.resources.static-locations=classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/
+spring.main.allow-circular-references: true
 spring.freemarker.settings.auto_import=common/common.ftl as com
 spring.freemarker.settings.datetime_format=yyyy-MM-dd
 spring.freemarker.settings.classic_compatible=true

src/main/resources/mapper/ProductionVarietyAddMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionVarietyAddMapper">
+
+</mapper>

src/main/resources/mapper/ProductionVarietyDetailColourMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionVarietyDetailColourMapper">
+
+</mapper>

src/main/resources/mapper/ProductionVarietyDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionVarietyDetailMapper">
+
+</mapper>

src/main/resources/mapper/ProductionVarietyMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionVarietyMapper">
+
+</mapper>

src/main/resources/mapper/ProductionVarietyTdMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionVarietyTdMapper">
+
+</mapper>

src/main/resources/mapper/ProductionheaderMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zjt.mapper.ProductionheaderMapper">
+
+</mapper>