CacheGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -15,8 +15,11 @@ List<User> findAll(); User findOne(Integer id); @Select("select user_name FROM `user` where login_name=#{LoginName} ") User findOneLoginName(String LoginName); @Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ") int checkUser(@Param("userName") String userName,@Param("password") String password);
New file @@ -0,0 +1,32 @@ server: port: 8080 servlet: context-path: /mesModuleTools spring: datasource: dynamic: primary: user_info #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: user_info: url: jdbc:mysql://10.153.19.150:3306/erp_user_info?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver sd: url: jdbc:mysql://10.153.19.150:3306/sd?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver mm: url: jdbc:mysql://10.153.19.150:3306/mm?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver pp: url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver LoadGlassModule/src/main/java/com/mes/mapper/LoadGlassMapper.java
New file @@ -0,0 +1,11 @@ package com.mes.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.entity.OrderTest; import org.apache.ibatis.annotations.*; @Mapper public interface OrderTestMapper extends BaseMapper<OrderTest> { } LoadGlassModule/src/main/java/com/mes/service/LoadGlassService.java
New file @@ -0,0 +1,31 @@ package com.example.springboot.service; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.example.springboot.component.PLCAutoMes; import com.example.springboot.component.S7control; import com.example.springboot.entity.StorageCage; import com.example.springboot.entity.north_glass_buffer1; import com.example.springboot.entity.device.PlcParameterObject; import com.example.springboot.mapper.SpianMapper; import com.google.common.primitives.Bytes; @Service public class LoadGlassService { @Autowired public Short selectAll(String glassid) { } } TemperingGlassModule/effective-pom.xml
New file Diff too large TemperingGlassModule/src/main/java/com/mes/entity/BigStorageCage.java
New file @@ -0,0 +1,18 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`big_storage_cage`") public class BigStorageCage { @TableId(type = IdType.AUTO) private Integer id;//大理片笼表id private Integer device_id;//设备id private String slot;//栅格号 private String enable_state;//启用状态 private Integer remain_width;//剩余宽度 } TemperingGlassModule/src/main/java/com/mes/entity/BigStorageCageDetails.java
New file @@ -0,0 +1,27 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`big_storage_cage_details`") public class BigStorageCageDetails { @TableId(type = IdType.AUTO) private Integer id;//大理片笼详情表id private Integer deviceid;//设备id private Integer slot;//栅格号 private Integer glassid;//玻璃id private Integer sequence;//小片在格内的顺序 private String flowcardid;//流程卡号 private Integer glasstype;//玻璃类型 private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Integer temperinglayoutid;//钢化版图id private Integer temperingfeedsequence;//钢化版图片序 private Integer state;//状态 private Integer gap;//玻璃间隙 } TemperingGlassModule/src/main/java/com/mes/entity/DownGlassInfo.java
New file @@ -0,0 +1,19 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`down_glass_info`") public class DownGlassInfo { @TableId(type = IdType.AUTO) private Integer id;//下片玻璃信息表id private String flowcardid;//流程卡号 private Integer sequence;//顺序 private Integer width;//宽 private Integer height;//高 private Integer thickness;//厚度 } TemperingGlassModule/src/main/java/com/mes/entity/DownStorageCage.java
New file @@ -0,0 +1,18 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`down_storage_cage`") public class DownStorageCage { @TableId(type = IdType.AUTO) private Integer id;//下片前理片笼表id private Integer deviceid;//设备id private String slot;//栅格号 private String enablestate;//启用状态 private Integer remainwidth;//剩余 } TemperingGlassModule/src/main/java/com/mes/entity/DownStorageCagedetails.java
New file @@ -0,0 +1,27 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`down_storage_cage_details`") public class DownStorageCagedetails { @TableId(type = IdType.AUTO) private Integer id;//下片前理片笼明细表id private Integer deviceid;//设备id private Integer slot;//栅格号 private Integer glassid;//玻璃id private Integer sequence;//小片在格内的顺序 private String flow_card_id;//流程卡号 private Integer glass_type;//玻璃类型 private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Integer temperinglayoutid;//钢化版图id private Integer tempering_feed_sequence;//钢化版图片序 private Integer state;//状态 private Integer gap;//玻璃间隙 } TemperingGlassModule/src/main/java/com/mes/entity/DownWorkstation.java
New file @@ -0,0 +1,19 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`down_workstation`") public class DownWorkstation { @TableId(type = IdType.AUTO) private Integer id;//下片工位表id private Integer flowcard_id;//工位id private String glass_type;//流程卡号 private Integer width;//设备id private Integer height;//启用状态 private Integer thickness;//工作状态 } TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCage.java
New file @@ -0,0 +1,18 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`edg_storage_cage`") public class EdgStorageCage { @TableId(type = IdType.AUTO) private Integer id;//磨边前理片笼表id private Integer flowcard_id;//设备id private String glass_type;//栅格号 private String height;//启用状态 private Integer thickness;//剩余 } TemperingGlassModule/src/main/java/com/mes/entity/EdgStorageCageDetails.java
New file @@ -0,0 +1,30 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`edg_storage_cage_details`") public class EdgStorageCageDetails { @TableId(type = IdType.AUTO) private Integer id;//磨边前理片笼详情表id private Integer deviceid;//设备id private Integer slot;//栅格号 private Integer glassid;//玻璃id private Integer sequence;//小片在格内的顺序 private String flowcardid;//流程卡号 private Integer glasstype;//玻璃类型 private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Double edgwidth;//磨前宽 private Double edgheight;//磨前高 private Integer temperinglayoutid;//钢化版图id private Integer temperingfeedsequence;//钢化版图片序 private Integer patternsequence;//原片顺序 private Integer state;//状态 private Integer gap;//玻璃间隙 } TemperingGlassModule/src/main/java/com/mes/entity/Engineering.java
New file @@ -0,0 +1,30 @@ package com.mes.entity; import java.math.BigInteger; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`engineering`") public class Engineering { @TableId(type = IdType.AUTO) private BigInteger id;//工程表id private Integer engineerid;//工程号 private String engineername;//工程名称 private Double avgavailability;//平均利用率 private Double validavailability;//有效利用率 private Double lastavailability;//尾片利用率 private Integer state;//状态 private Integer glasstotal;//小片总数 private Double glasstotalarea;//小片总面积 private Integer planpatterntotal;//计划原片总数 private Double planpatterntotalarea;//计划原片总面积 private Integer realitypatterntotal;//实际原片总数 private Double realitypatterntotalarea;//实际原片总面积 private Integer filmsid;//膜系id private String notes;//备注 } TemperingGlassModule/src/main/java/com/mes/entity/GlassFilms.java
New file @@ -0,0 +1,17 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`glass_films`") public class GlassFilms { @TableId(type = IdType.AUTO) private Integer id;//膜系表id private Integer films_id;//膜系id private String films_name;//膜系 } TemperingGlassModule/src/main/java/com/mes/entity/GlassInfo.java
New file @@ -0,0 +1,34 @@ package com.mes.entity; import java.math.BigInteger; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`glass_info`") public class GlassInfo { @TableId(type = IdType.AUTO) private BigInteger id;//玻璃信息表id private String flowcardid;//流程卡 private Integer glasstype;//流程卡玻璃类型 private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Integer filmsid;//膜系 private Double edgwidth;//磨前宽 private Double edgheight;//磨前高 private Integer ismultiple;//是否配片 private Double maxwidth;//配片最大宽 private Double maxheight;//配片最大高 private Integer ishorizontal;//钢化是否接受横放 private Integer patternsequence;//原片顺序 private Integer temperinglayoutid;//钢化版图id private Integer temperingfeedsequence;//钢化版图片序 private Integer xcoordinate;//x坐标 private Integer ycoordinate;//y坐标 private Integer angle;//旋转角度（逆时针） } TemperingGlassModule/src/main/java/com/mes/entity/Tempering.java
New file @@ -0,0 +1,27 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`tempering_glass_info`") public class Tempering { @TableId(type = IdType.AUTO) private Integer id;//钢化小片信息表id private String flowcard_id;//流程卡 private Integer glass_type;//流程卡玻璃类型 private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Integer filmsid;//膜系 private Integer ishorizontal;//钢化是否接受横放 private Integer tempering_layout_id;//钢化版图id private Integer tempering_feed_sequence;//钢化版图片序 private Integer x_coordinate;//x坐标 private Integer y_coordinate;//y坐标 private Integer angle;//旋转角度（逆时针） private Integer state;//状态 } TemperingGlassModule/src/main/java/com/mes/entity/UpPattenUsage.java
New file @@ -0,0 +1,21 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`up_patten_usage`") public class UpPattenUsage { @TableId(type = IdType.AUTO) private Integer id;//原片使用情况表id private Integer engineeringid;//工程号 private Integer filmsid;//膜系id private Double width;//宽 private Double height;//高 private Double thickness;//厚度 private Integer layoutsequence;//原片版图片序 private Integer state;//状态 } TemperingGlassModule/src/main/java/com/mes/entity/UpWorkstation.java
New file @@ -0,0 +1,23 @@ package com.mes.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data //lombok 简写java代码 实体类的get与set @TableName("`up_workstation`") public class UpWorkstation { @TableId(type = IdType.AUTO) private Integer id;//上片工位表id private Integer workstationid;//工位号 private Integer deviceid;//设备id private Integer enablestate;//启用状态 private Integer workstate;//工作状态 private Double patternwidth;//原片宽 private Double patternheigth;//原片高 private Double patternthickness;//原片厚度 private Integer filmsid;//膜系 private Integer number;//数量 } TemperingGlassModule/src/main/java/com/mes/mapper/TemperingMapper.java
New file @@ -0,0 +1,18 @@ package com.mes.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.entity.OrderTest; import com.mes.entity.Tempering; import org.apache.ibatis.annotations.*; @Mapper public interface OrderTestMapper extends BaseMapper<OrderTest> { //查询该玻璃的尺寸和坐标 @Select("select*from where id=#{glassId}") Tempering SelectTempering(String glassId); } TemperingGlassModule/src/main/java/com/mes/mapper/userInfo/UserMapper.java
@@ -16,7 +16,9 @@ User findOne(Integer id); @Select("select user_name FROM `user` where login_name=#{LoginName} ") User findOneLoginName(String LoginName); @Select("select count(id) FROM `user` where login_name=#{userName} and password=#{password} ") int checkUser(@Param("userName") String userName,@Param("password") String password);
