From ffb758283ece163e04c629def3bd700d292d7f89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 16 四月 2024 10:12:06 +0800
Subject: [PATCH] 上片模块配置pp表多数据源（可供其他模块配置多数据源参考）
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java | 22 ++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java | 23 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml | 18 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java | 18 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java | 205 ++++++++++++++++++
UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java | 18 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java | 16 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeDetail.java | 123 +++++++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java | 18 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java | 106 +++++++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java | 1
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MybatisPlusConfig.java | 31 --
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java | 22 ++
16 files changed, 617 insertions(+), 38 deletions(-)
diff --git a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java b/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
index beb867d..3d00318 100644
--- a/UnLoadGlassModule/src/main/java/com/mes/mapper/DownWorkstationMapper.java
+++ b/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鍜岃澶嘔D鏇存柊宸ヤ綅鐘舵��
@Update("UPDATE down_workstation SET work_state = #{workState} " +
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MybatisPlusConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MybatisPlusConfig.java
index 440d02b..94e02f0 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/MybatisPlusConfig.java
+++ b/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();
}
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeDetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeDetail.java
new file mode 100644
index 0000000..ba5ea47
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeDetail.java
@@ -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;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
new file mode 100644
index 0000000..f9a85ec
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeLayout.java
@@ -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;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
new file mode 100644
index 0000000..30eab79
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/OptimizeProject.java
@@ -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;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
new file mode 100644
index 0000000..b73f34e
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeDetailMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
new file mode 100644
index 0000000..1cef895
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeLayoutMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
new file mode 100644
index 0000000..be5eec9
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/mapper/OptimizeProjectMapper.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
new file mode 100644
index 0000000..3cd12bc
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeDetailService.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
new file mode 100644
index 0000000..ec7dc25
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeLayoutService.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
new file mode 100644
index 0000000..b8b4cc6
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/OptimizeProjectService.java
@@ -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> {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
new file mode 100644
index 0000000..81df3f4
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeDetailServiceImpl.java
@@ -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 {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
new file mode 100644
index 0000000..4881d52
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeLayoutServiceImpl.java
@@ -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 {
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
new file mode 100644
index 0000000..d09f0a9
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/OptimizeProjectServiceImpl.java
@@ -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 {
+
+}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
index d5e380f..493a805 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstorage/mapper/BigStorageCageDetailsMapper.java
+++ b/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;
/**
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
index 84a3bd6..ae352b3 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
+++ b/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 #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ 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:
--
Gitblit v1.8.0