UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
@@ -1,6 +1,5 @@ package com.mes.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.entity.DownGlassInfo; @@ -16,7 +15,6 @@ @Component @Repository @InterceptorIgnore(tenantLine = "true") @DS("hangzhoumes") // 指定使用 hangzhoumes 数据源 public interface DownWorkstationMapper extends BaseMapper<DownWorkstation> { //根据工位ID和设备ID更新工位状态 @Update("UPDATE down_workstation SET work_state = #{workState} " + hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MybatisPlusConfig.java
@@ -1,19 +1,11 @@ package com.mes.common.config; import com.alibaba.druid.pool.DruidDataSource; import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; import org.apache.ibatis.session.SqlSessionFactory; import org.mybatis.spring.SqlSessionFactoryBean; import org.mybatis.spring.annotation.MapperScan; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import javax.annotation.Resource; import javax.sql.DataSource; /** @@ -33,29 +25,6 @@ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); return interceptor; } @Resource private DataSourceProperties dataSourceProperties; @Bean(name = "dataSource") public DataSource dataSource() { DruidDataSource dataSource = new DruidDataSource(); dataSource.setUrl(dataSourceProperties.getUrl()); dataSource.setDriverClassName(dataSourceProperties.getDriverClassName()); dataSource.setUsername(dataSourceProperties.getUsername()); dataSource.setPassword(dataSourceProperties.getPassword()); return dataSource; } public SqlSessionFactory sqlSessionFactory() throws Exception { SqlSessionFactoryBean sqlSessionFactoryBean = new SqlSessionFactoryBean(); sqlSessionFactoryBean.setDataSource(dataSource()); return sqlSessionFactoryBean.getObject(); } } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeDetail.java
New file @@ -0,0 +1,123 @@ package com.mes.pp.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; /** * <p> * * </p> * * @author zhoush * @since 2024-04-16 */ @Data @EqualsAndHashCode(callSuper = false) public class OptimizeDetail implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 工程号 */ private String projectNo; /** * 流程卡号 */ private String processId; /** * 层 */ private Integer layer; /** * 序号 */ private Integer orderSort; /** * 版图id */ private Integer stockId; /** * 版图序 */ private Integer stockNumber; /** * 图号 */ private Integer graphNo; /** * 小片编号 */ private String glassId; /** * 小片ID */ private Integer polysId; /** * 小片宽（加磨量） */ private Double pWidth; /** * 小片高（加磨量） */ private Double pHeight; /** * 小片宽 */ private Double width; /** * 小片高 */ private Double height; /** * x坐标 */ private Double xAxis; /** * y坐标 */ private Double yAxis; /** * 钢化版图编号(架号) */ private Integer heatLayoutId; private String h; private String g; private String r; private String glassPoint; @TableField("intRemark") private Integer intremark; @TableField("strRemark") private String strremark; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
New file @@ -0,0 +1,106 @@ package com.mes.pp.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.time.LocalDateTime; /** * <p> * * </p> * * @author zhoush * @since 2024-04-16 */ @Data @EqualsAndHashCode(callSuper = false) public class OptimizeLayout implements Serializable { private static final long serialVersionUID = 1L; @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 工程号 */ private String projectNo; /** * 原片ID */ private Integer stockId; private Double width; private Double height; private Double realwidth; private Double realheight; /** * 切裁率 */ private String usageRate; /** * 物料编码 */ private String stockCode; /** * 上修边 */ private String upTrim; /** * 下 */ private String downTrim; /** * 左 */ private String leftTrim; /** * 右 */ private String rightTrim; /** * 数量 */ private Integer count; /** * 小片数 */ private String glassCount; /** * 小片面积 */ private String glassArea; /** * 创建人 */ private Integer creater; private LocalDateTime createTime; @TableField("intRemark") private Integer intremark; @TableField("strRemark") private String strremark; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
New file @@ -0,0 +1,205 @@ package com.mes.pp.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import lombok.Data; import lombok.EqualsAndHashCode; import java.io.Serializable; import java.time.LocalDateTime; /** * <p> * * </p> * * @author zhoush * @since 2024-04-16 */ @Data @EqualsAndHashCode(callSuper = false) public class OptimizeProject implements Serializable { private static final long serialVersionUID = 1L; /** * 自增：<优化-工程> */ @TableId(value = "id", type = IdType.AUTO) private Integer id; /** * 工程编号 */ private String projectNo; /** * 工程项目名 */ private String projectName; /** * 玻璃膜系 */ private String glassType; /** * 玻璃厚度 */ private String glassThickness; /** * 工程种类 */ private Integer type; /** * 状态： -2删除； -1默认； 1流程卡创建； 2第一次优化保存; 10钢化推荐创建保存； 20优化结果保存 */ private Integer state; /** * 总数 */ private Integer glassTotal; /** * 总面积 */ private Double glassTotalArea; /** * 流程卡数量 */ private Integer processQty; /** * 循环落架数 */ private Integer guidance; /** * 第一次使用原料数 */ private Integer fristStockQty; /** * 第一次平均切裁率 */ private String fristCutPct; /** * 使用的原料数 */ private Integer rawStockQty; /** * 使用的原料面积 */ private String rawStockArea; /** * 平均切裁率 */ private String avgCutPct; /** * 有效切裁率 */ private String validCutPct; /** * 尾片切裁率 */ private String lastCutPct; /** * g混排程度 */ private String chaosPct; /** * g最大装载率 */ private String maxLoadPct; /** * g最大面积 */ private String maxArea; /** * g最大数量 */ private Integer maxQty; /** * g上片宽 */ private Float loadWidth; /** * g上片长 */ private Float loadLength; /** * x间隔 */ private Float xSpace; /** * y间隔 */ private Float ySpace; /** * g平均装载率 */ private Float loadRate; /** * 流程卡集合 */ private String processCards; /** * g总炉数 */ private Integer furnacesQty; /** * 备注 */ private String remark; /** * 创建人 */ private String creater; /** * 创建时间 */ private LocalDateTime createTime; /** * 修改时间 */ private LocalDateTime updateTime; /** * 预留，使用需注明 */ @TableField("intRemark") private Integer intremark; /** * 预留，使用需注明 */ @TableField("strRemark") private String strremark; } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
New file @@ -0,0 +1,18 @@ package com.mes.pp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.pp.entity.OptimizeDetail; import org.apache.ibatis.annotations.Mapper; /** * <p> * Mapper 接口 * </p> * * @author zhoush * @since 2024-04-16 */ @Mapper public interface OptimizeDetailMapper extends BaseMapper<OptimizeDetail> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
New file @@ -0,0 +1,18 @@ package com.mes.pp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.pp.entity.OptimizeLayout; import org.apache.ibatis.annotations.Mapper; /** * <p> * Mapper 接口 * </p> * * @author zhoush * @since 2024-04-16 */ @Mapper public interface OptimizeLayoutMapper extends BaseMapper<OptimizeLayout> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
New file @@ -0,0 +1,18 @@ package com.mes.pp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.pp.entity.OptimizeProject; import org.apache.ibatis.annotations.Mapper; /** * <p> * Mapper 接口 * </p> * * @author zhoush * @since 2024-04-16 */ @Mapper public interface OptimizeProjectMapper extends BaseMapper<OptimizeProject> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
New file @@ -0,0 +1,16 @@ package com.mes.pp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.pp.entity.OptimizeDetail; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-16 */ public interface OptimizeDetailService extends IService<OptimizeDetail> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
New file @@ -0,0 +1,16 @@ package com.mes.pp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.pp.entity.OptimizeLayout; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-16 */ public interface OptimizeLayoutService extends IService<OptimizeLayout> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
New file @@ -0,0 +1,16 @@ package com.mes.pp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.mes.pp.entity.OptimizeProject; /** * <p> * 服务类 * </p> * * @author zhoush * @since 2024-04-16 */ public interface OptimizeProjectService extends IService<OptimizeProject> { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
New file @@ -0,0 +1,22 @@ package com.mes.pp.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.pp.entity.OptimizeDetail; import com.mes.pp.mapper.OptimizeDetailMapper; import com.mes.pp.service.OptimizeDetailService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-16 */ @Service @DS("pp") public class OptimizeDetailServiceImpl extends ServiceImpl<OptimizeDetailMapper, OptimizeDetail> implements OptimizeDetailService { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
New file @@ -0,0 +1,23 @@ package com.mes.pp.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.pp.entity.OptimizeLayout; import com.mes.pp.mapper.OptimizeLayoutMapper; import com.mes.pp.service.OptimizeLayoutService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-16 */ @Service @DS("pp") public class OptimizeLayoutServiceImpl extends ServiceImpl<OptimizeLayoutMapper, OptimizeLayout> implements OptimizeLayoutService { } hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
New file @@ -0,0 +1,22 @@ package com.mes.pp.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.mes.pp.entity.OptimizeProject; import com.mes.pp.mapper.OptimizeProjectMapper; import com.mes.pp.service.OptimizeProjectService; import org.springframework.stereotype.Service; /** * <p> * 服务实现类 * </p> * * @author zhoush * @since 2024-04-16 */ @Service @DS("pp") public class OptimizeProjectServiceImpl extends ServiceImpl<OptimizeProjectMapper, OptimizeProject> implements OptimizeProjectService { } hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
@@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.mes.bigstorage.entity.BigStorageCageDetails; import feign.Param; /** hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -3,10 +3,20 @@ spring: datasource: driver-class-name: com.mysql.cj.jdbc.Driver url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8&characterEncoding=utf-8&useSSL=false username: root password: beibo.123/ dynamic: primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?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 cloud: nacos: discovery:
