From 12d798d734a23a32519d5942dc2addff595304c4 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:27:22 +0800
Subject: [PATCH] 更新
---
CacheGlassModule/src/main/java/com/mes/MesApplication.java | 2
/dev/null | 34 -----------------
CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java | 33 +++++++++++-----
CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java | 24 +++++-------
TemperingGlassModule/target/classes/application.yml | 24 ++---------
5 files changed, 39 insertions(+), 78 deletions(-)
diff --git a/CacheGlassModule/src/main/java/com/mes/MesApplication.java b/CacheGlassModule/src/main/java/com/mes/MesApplication.java
index 991a752..2c50d25 100644
--- a/CacheGlassModule/src/main/java/com/mes/MesApplication.java
+++ b/CacheGlassModule/src/main/java/com/mes/MesApplication.java
@@ -1,7 +1,7 @@
package com.mes;
import com.mes.common.PlcTools.S7object;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.PpMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
diff --git a/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java b/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
index 144473e..70b4c5c 100644
--- a/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
+++ b/CacheGlassModule/src/main/java/com/mes/controller/TidyUpGlassModuleController.java
@@ -1,6 +1,6 @@
package com.mes.controller;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.PpMapper;
import java.util.List;
import java.util.Map;
@@ -9,7 +9,7 @@
import org.springframework.web.bind.annotation.*;
import com.mes.common.Result;
import com.mes.entity.Tempered;
-import com.mes.service.pp.SelectdppService;
+import com.mes.service.pp.PpService;
import com.mes.service.hangzhoumes.*;
@RestController
@@ -20,37 +20,50 @@
@Autowired
- private SelectdppService SelectppService;
+ private PpService ppService;
@Autowired
- private hangzhoumesService hangzhoumesService;
+ private HangzhoumesService hangzhoumesService;
@GetMapping("/SelectTerritoryInfo") // 鏌ヨ閽㈠寲鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
public Result SelectTerritoryInfo(@RequestParam(name = "ProcessId", required = false) String ProcessId) {
- List<Tempered> h = SelectppService.SelectTemperedTerritory(ProcessId);
+ List<Tempered> h = ppService.selectTemperedTerritory(ProcessId);
return Result.seccess(h);
}
@GetMapping("/CutTerritory") // 鏌ヨ鍒囧壊鐗堝浘淇℃伅-鏍规嵁 宸ョ▼鍙�
@ResponseBody
public Result CutTerritory(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory(ProcessId);
+ List<Map> h = ppService.selectCutTerritory(ProcessId);
return Result.seccess(h);
}
- @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
+ @GetMapping("/CurrentCutTerritory") // 璇嗗埆鏄剧ず 褰撳墠鐗堝浘
@ResponseBody
- public Result SelectCutTerritory(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory("P24032508");
+ public Result CurrentCutTerritory() {
+ List<Map> h = ppService.selectCutTerritory();
return Result.seccess(h);
}
+ @GetMapping("/SelectCutTerritory") // 璇嗗埆鏄剧ず 鐗瑰畾鐗堝浘
+ @ResponseBody
+ public Result SelectCutTerritory(String TerritoryId) {
+ List<Map> h = ppService.selectCutTerritory(TerritoryId);
+ return Result.seccess(h);
+ }
+
+ @GetMapping("/IdentControls") // 璇嗗埆鎿嶄綔锛� 鐮存崯/鎷胯蛋 鍙傛暟锛圛D锛屽姛鑳絒0:鐮存崯锛�1锛氭嬁璧癩锛�
+ @ResponseBody
+ public Result Ident(@RequestParam(name = "IdentId", required = false) String ProcessId,@RequestParam(name = "ControlsId", required = false) String ControlsId) {
+ List<Map> h = ppService.selectCutTerritory("P24032508");
+ return Result.seccess(h);
+ }
@GetMapping("/SelectCageInfo") // 鏌ヨ绗煎唴淇℃伅
@ResponseBody
public Result SelectCageInfo(String ProcessId) {
- List<Map> h = SelectppService.SelectCutTerritory("P24032508");
+ List<Map> h = hangzhoumesService.SelectCageInfo();
return Result.seccess(h);
}
diff --git a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java b/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
deleted file mode 100644
index e8bcfe2..0000000
--- a/CacheGlassModule/src/main/java/com/mes/mapper/SelectInfo.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.mes.mapper;
-
-import com.mes.entity.EdgStorageCageDetails;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.TaskCache;
-import com.mes.entity.Tempered;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.*;
-
-@Mapper
-public interface SelectInfo {
- // 鐜荤拑淇℃伅 鎸塈D鏌ヨ
- @Select("select * from `glass_info` where id=#{id}")
- GlassInfo SelectGlassId(String id);
-
- // 閽㈠寲鎸夊伐绋嬫煡璇�
- @Select("select * from `v_optimize_heat_layout` where project_no=#{projeceid} ")
- List<Tempered> SelectTemperedTerritory(String projeceid);
-
- // 鍒囧壊鐗堝浘鎸夊伐绋嬫煡璇�
- @Select("select * from optimize_detail where project_no=#{projeceid} ")
- List<Map> SelectCutTerritory(String projeceid);
-
- // 鏌ヨ纾ㄨ竟淇℃伅
- @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell}")
- List<Map> SelectEdgInfo(String EndCell);
-
- // 鏌ヨ绗煎瓙鍐呯┖闂�
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is null order by escd.slot")
- List<EdgStorageCageDetails> SelectCacheLeisure();
-
- // 鏌ヨ绗煎瓙鍐呭嚭鐗囦换鍔�
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot WHERE escd.slot IS NOT NULL order by escd.tempering_layout_id,escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> SelectCacheOut();
-
- // 鏌ヨ绗煎瓙鍐呬俊鎭�
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot order by esc.slot")
- List<EdgStorageCageDetails> SelectCachInfo();
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id=#{tempering_layout_id} and escd.tempering_feed_sequence<#{tempering_feed_sequence} and esc.remain_width-#{width}>0 order by escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, Integer tempering_feed_sequence,
- double width);
-
- // 鏌ヨ鍙繘姝ょ墖鐜荤拑鐨勬爡鏍煎彿
- @Select("select escd.* from edg_storage_cage as esc LEFT JOIN edg_storage_cage_details as escd on esc.slot=escd.slot where escd.slot is not null escd.tempering_layout_id<#{tempering_layout_id} and esc.remain_width-#{width}>0 order by escd.tempering_layout_id desc,escd.tempering_feed_sequence")
- List<EdgStorageCageDetails> SelectIsExistIntoCache(Integer tempering_layout_id, double width);
-
- // 鏌ヨ鍏ㄩ儴浠诲姟
- @Select("select * from task_cache")
- List<TaskCache> SelectCacheInfoAll();
-
- // 鏌ヨ杩涚墖浠诲姟
- @Select("select * from task_cache where task_type='1' and task_stauts='0'")
- List<TaskCache> SelectInputCacheInfo();
-
- // 鏌ヨ鍑虹墖浠诲姟
- @Select("select * from task_cache where task_type='2' and task_stauts='0'")
- List<TaskCache> SelectOutCacheInfo();
-
- // 鏌ヨ A09 鎴� A10 鏈�鏂扮殑涓�鐗� 鍑虹墖浠诲姟
- @Select("select * from task_cache where task_type='2' and task_stauts='2' and end_cell=#{EndCell} limit 1")
- GlassInfo SelectLastOutCacheInfo(String EndCell);
-
- // 淇敼绗煎瓙鍐呬俊鎭�
- @Update("update")
- Integer UpdateCache(@Param("id") Integer id, @Param("order_id") String order_id);
-
- // 娣诲姞鐞嗙墖浠诲姟
- @Insert("INSERT into task_cache VALUES(#{id},#{start},#{end},#{type},0)")
- Integer insertCacheTask(String id, String start, String end, String type);
-
- //
- // @Insert("INSERT `order`(order_id)VALUES(#{order_id})")
- // Integer insert(Order order);
- //
- // @Delete("delete from `order` where id=#{id}")
- // Integer deleteById(@Param("id") Integer id);
- //
- // @Update("update `order` set order_id=#{order_id} where id=#{id}")
- // Integer update(@Param("id") Integer id,@Param("order_id") String order_id);
-}
diff --git a/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java b/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java
deleted file mode 100644
index f239f84..0000000
--- a/CacheGlassModule/src/main/java/com/mes/service/CacheGlassService/Logic.java
+++ /dev/null
@@ -1,174 +0,0 @@
-package com.mes.service.CacheGlassService;
-
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.mes.common.PlcTools.S7control;
-import com.mes.entity.EdgStorageCageDetails;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.TaskCache;
-import com.mes.entity.device.PLCAutoMes;
-import com.mes.entity.device.PlcParameterObject;
-import com.mes.mapper.SelectInfo;
-
-
-@Service
-public class Logic {
- @Autowired
- private SelectInfo selectInfo;
- //璇嗗埆閫昏緫 涓嶄氦浜�
- public void identify(String Number){
- //鏌ヨ浠诲姟
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- String s=S7control.getinstance().ReadWord("DB14.26", 1).get(0)+"";
- boolean isexist=isExist(Number);
- if (isexist) {
- //瀛樺湪閫昏緫 1.娣诲姞淇℃伅 2.鍥炲PLC瀛樺湪
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- }else {
- //涓嶅瓨鍦ㄩ�昏緫 1.鍥炲PLC涓嶅瓨鍦�
- //S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 2);
- }
- }
- //鐞嗙墖
- public void Process(){
- String Result=S7control.getinstance().ReadWord("DB14.0", 1).get(0)+"";
- String Number=S7control.getinstance().ReadWord("DB14.2", 1).get(0)+"";
- if(Result=="1"){//杩涚墖璇锋眰
- processInto(Number);
- }else if(Result=="2"){//鍑虹墖璇锋眰
- processOut();
- }else if(Result=="3"){//杩涘嚭鐗囪姹�
- if (!processOut()) { //鍏堝嚭鍚庤繘
- processInto(Number);
- }
- }
- }
- //鐞嗙墖 杩�
- public boolean processInto(String Number){
- //鏌ヨ娑堟伅闃熷垪閲岀殑鐜荤拑
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){//瀛樺湪姝ょ幓鐠冪紪鍙�
- //鍚岄挗鍖栫増鍥惧唴鐨勬爡鏍煎彿
- List<EdgStorageCageDetails> list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getTemperingfeedsequence(),GlassInfo.getWidth());
- //绌烘爡鏍煎彿
- if (list.size()==0) {
- list=selectInfo.SelectCacheLeisure();
- }
- //灏忎簬姝ょ幓鐠冮挗鍖栫増鍥惧簭鍙风殑鏍呮牸鍙�
- if(list.size()==0){
- list=selectInfo.SelectIsExistIntoCache(GlassInfo.getTemperinglayoutid(),GlassInfo.getWidth());
- }
- if(list.size()>0){
- //瀛樺湪绌烘牸
- //1.鐢熸垚浠诲姟锛� 璧峰浣嶇疆0 缁撴潫浣嶇疆this.slot 浠诲姟绫诲瀷 1 锛堣繘鐗囦换鍔★級
- //2.鍥炲 1杩涚墖
- EdgStorageCageDetails item=list.get(0);
- selectInfo.insertCacheTask(GlassInfo.getId()+"","0",item.getSlot()+"","1");
- S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),(short) 1);
- return true;
- }
-
- }else{
- // ID缂栧彿涓嶅瓨鍦� 涓嶅鐞�/鍥炲PLC 杩涜鎶ヨ鎻愮ず
- }
- //杩斿洖缁撴灉
- return false;
- }
- //鐞嗙墖 鍑�
- public boolean processOut(){
- //鏌ヨ浠诲姟
- String A09=S7control.getinstance().ReadWord("DB14.56", 1).get(0)+"";
- String A10=S7control.getinstance().ReadWord("DB14.58", 1).get(0)+"";
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- List<EdgStorageCageDetails> list=selectInfo.SelectCacheOut();
- boolean isOut=true;//鍏朵粬鎯呭喌鏉′欢 濡傦細鍚庣画璁惧鏁呴殰绂佹鐞嗙墖鍑虹墖 绛�
- if (list.size()>0&&isOut) {
- EdgStorageCageDetails item=list.get(0);
- if(A09=="0"&&A10=="1"){
- //鍑哄埌 A09
- selectInfo.insertCacheTask(item.getGlassid()+"","0","09","2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "1");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }else if(A09=="1"&&A10=="0"){
- //鍑哄埌 A10
- selectInfo.insertCacheTask(item.getGlassid()+"","0","10","2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }else if(A09=="0"&&A10=="0"){
- //閮藉厑璁� A09/A10 涓婁竴鐗囨槸鍚﹀拰姝ょ墖鐜荤拑灏哄灏哄鐩稿悓
- String endcell="09";
- String SendEndcell="1";
- boolean If_=false;
- GlassInfo glassInfo09= selectInfo.SelectLastOutCacheInfo("09");
- GlassInfo glassInfo10= selectInfo.SelectLastOutCacheInfo("10");
- if(glassInfo10!=null&&glassInfo10.getWidth()==item.getWidth()&&glassInfo10.getHeight()==item.getHeight()){
- endcell="10";
- SendEndcell="2";
- }else if(glassInfo10!=null&&If_){
- //鍏朵粬鏉′欢
- }
- selectInfo.insertCacheTask(item.getGlassid()+"","0",endcell,"2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(), SendEndcell);
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- return true;
- }
- }
- //杩斿洖缁撴灉
- return false;
- }
-
- //纾ㄨ竟 涓嶄氦浜� 鐞嗙墖鍜岀（杈规満鑷繁浜や簰
- public void processMb(String Number){
- //鏌ヨ浠诲姟
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- PlcParameterObject plcmes=PLCAutoMes.PlcMesObject;
- if(GlassInfo!=null){
- //鍙戦�佷换鍔� ID 闀� 瀹� 鍘� 鍊掕 宸ヨ壓鍔熻兘绛�
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.22").getAddress(),"N10000");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.24").getAddress(), "1000");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.26").getAddress(),"800");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.28").getAddress(),"60");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.30").getAddress(), "2");
- S7control.getinstance().writeString(plcmes.getPlcParameter("DB14.20").getAddress(), "1");
- }
- //杩斿洖缁撴灉
- }
-
- //鏌ヨ娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean SelectMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
- //鍒犻櫎娑堟伅闃熷垪閲屾鐜荤拑ID鐨勬暟鎹�
- public boolean DeleteMessageId(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
-
- //鏄惁瀛樺湪姝ょ紪鍙风幓鐠�
- public boolean isExist(String Number){
- //鏌ヨ鏄惁瀛樺湪
- GlassInfo GlassInfo=selectInfo.SelectGlassId(Number);
- if(GlassInfo==null){
- return false;//杩斿洖 涓嶅瓨鍦�
- }
- return true;//杩斿洖 瀛樺湪
- }
-
-}
-
diff --git a/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java b/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
index 6ff9ab2..cc29839 100644
--- a/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
+++ b/CacheGlassModule/src/main/java/com/mes/service/hangzhoumes/hangzhoumesService.java
@@ -4,7 +4,8 @@
import com.mes.entity.EdgStorageCageDetails;
import com.mes.entity.GlassInfo;
import com.mes.entity.Tempered;
-import com.mes.mapper.SelectInfo;
+import com.mes.mapper.HangzhouMesMapper;
+import com.mes.mapper.PpMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -12,30 +13,25 @@
import java.util.Map;
@Service
-@DS("hangzhoumes")
-public class hangzhoumesService {
+public class HangzhoumesService {
@Autowired
- private SelectInfo SelectInfo;
-
+ private HangzhouMesMapper hangzhouMesMapper;
+ //鏍规嵁缂栧彿 鏌ユ壘鐜荤拑灏忕墖淇℃伅
public GlassInfo getUserInfo(String process_id){
- return SelectInfo.SelectGlassId(process_id);
+ return hangzhouMesMapper.selectGlassId(process_id);
}
- // //璇嗗埆淇℃伅
- // public List<Map> SelectCutTerritory(String process_id){
- // return SelectInfo.SelectCutTerritory(process_id);
- // }
//鐞嗙墖缂撳瓨 绗煎唴淇℃伅
- public List<EdgStorageCageDetails> SelectCageInfo(){
- return SelectInfo.SelectCachInfo();
+ public List<Map> SelectCageInfo(){
+ return hangzhouMesMapper.selectCachInfo();
}
//纾ㄨ竟灏忕墖淇℃伅
public List<Map> SelectEdgInfo(String line){
-
- return SelectInfo.SelectEdgInfo(line);
+ return hangzhouMesMapper.selectEdgInfo(line);
}
+
}
diff --git a/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java b/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java
deleted file mode 100644
index 2eecb75..0000000
--- a/CacheGlassModule/src/main/java/com/mes/service/pp/SelectdppService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.mes.service.pp;
-
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.mes.entity.GlassInfo;
-import com.mes.entity.Tempered;
-import com.mes.mapper.SelectInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-@DS("pp")
-public class SelectdppService {
-
- @Autowired
- private SelectInfo SelectInfo;
-
- public GlassInfo getUserInfo(String process_id){
- return SelectInfo.SelectGlassId(process_id);
- }
-
- public List<Tempered> SelectTemperedTerritory(String process_id){
- return SelectInfo.SelectTemperedTerritory(process_id);
- }
- //鍒囧壊鐗堝浘
- public List<Map> SelectCutTerritory(String process_id){
- return SelectInfo.SelectCutTerritory(process_id);
- }
-
-
-}
-
diff --git a/TemperingGlassModule/target/classes/application.yml b/TemperingGlassModule/target/classes/application.yml
index d74069d..a85e82a 100644
--- a/TemperingGlassModule/target/classes/application.yml
+++ b/TemperingGlassModule/target/classes/application.yml
@@ -2,31 +2,17 @@
server:
port: 8080
servlet:
- context-path: /mesModuleTools
+ context-path: /mesModuleTools
spring:
datasource:
dynamic:
- primary: user_info #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
+ primary: hangzhoumes #璁剧疆榛樿鐨勬暟鎹簮鎴栬�呮暟鎹簮缁�,榛樿鍊煎嵆涓簃aster
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
+
+ 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
\ No newline at end of file
--
Gitblit v1.8.0