hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml
@@ -29,4 +29,14 @@ database: 0 host: 10.153.19.150 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-yw.yml
@@ -29,4 +29,14 @@ database: 0 host: 192.168.2.100 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: dev active: prod application: name: cacheGlass liquibase: @@ -15,8 +15,8 @@ thread-name-prefix: task-cache mybatis-plus: mapper-locations: classpath*:mapper/*.xml # configuration: # log-impl: org.apache.ibatis.logging.stdout.StdOutImpl configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: threshold: 3 ratio: 10 @@ -37,14 +37,4 @@ cellLength: 2500 sequence: order: false kangaroohy: milo: enabled: false primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/CacheGlassModule/src/test/java/com/mes/CacheGlassModuleApplicationTest.java
@@ -3,11 +3,9 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.yulichang.toolkit.JoinWrappers; import com.mes.common.config.Const; import com.mes.edgstoragecage.entity.EdgStorageCage; import com.mes.edgstoragecage.entity.EdgStorageCageDetails; import com.mes.edgstoragecage.service.EdgStorageCageDetailsService; import com.mes.edgstoragecage.service.EdgStorageCageService; import com.mes.glassinfo.entity.GlassInfo; import com.mes.glassinfo.service.GlassInfoService; import com.mes.job.CacheGlassTask; import com.mes.pp.entity.OptimizeDetail; @@ -72,35 +70,22 @@ @Test public void testChangeCellSize() { // String url=getClass().getResource("").getPath(); // log.info("完整路径:{}", Arrays.asList(url)); cacheGlassTask.queryChangeGlassInfo(Const.A09_OUT_TARGET_POSITION, ""); } @Test public void testCellSize() { // String url=getClass().getResource("").getPath(); // log.info("完整路径:{}", Arrays.asList(url)); cacheGlassTask.outTo(0, 0, "", "NG24051802A001|1|1|1|1", 0); } @Test public void testinTo() { // String url=getClass().getResource("").getPath(); // log.info("完整路径:{}", Arrays.asList(url)); // NG24051802A001|1|4|1|4 // cacheGlassTask.inTo("NG24051802A001|1|1|1|1", "1", "1"); // cacheGlassTask.inTo("NG24051802A001|1|4|1|4", "1", "1"); cacheGlassTask.inTo("NG24051802A001|1|1|2|1", "1", "1"); } @Test public void testChangeGlassInfo() { // String url=getClass().getResource("").getPath(); // log.info("完整路径:{}", Arrays.asList(url)); // NG24051802A001|1|4|1|4 cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|1|1|1"); // cacheGlassTask.queryAndChangeGlass("NG24051802A001|1|4|1|4"); } @Test @@ -118,23 +103,6 @@ } @Test public void testSelectCacheEmpty() { // List<EdgStorageCage> map = edgStorageCageService.selectCacheEmpty(); // log.info("笼内空格:{}", Arrays.asList(map)); } @Test public void testScan() { List<Map<String, Object>> map = edgStorageCageDetailsService.selectCutTerritory(); log.info("切割当前版图信息:{}", Arrays.asList(map)); } @Test public void testEngineerCutTerritory() { List<List<Map<String, Object>>> map = edgStorageCageDetailsService.selectCurrentCutTerritory("P24051806"); log.info("切割工程版图信息:{}", Arrays.asList(map)); } @Test public void testEngineerTerritory() { hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
@@ -27,4 +27,14 @@ database: 0 host: 10.153.19.150 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-yw.yml
@@ -5,26 +5,36 @@ strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源. datasource: hangzhoumes: url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8 url: jdbc:mysql://192.168.2.100:3306/hangzhoumes?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver pp: url: jdbc:mysql://127.0.0.1:3306/pp?serverTimezone=GMT%2b8 url: jdbc:mysql://192.168.2.100:3306/pp?serverTimezone=GMT%2b8 username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver salve_hangzhoumes: url: jdbc:sqlserver://127.0.0.1:1433;databasename=mes url: jdbc:sqlserver://192.168.2.100:1433;databasename=mes username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver cloud: nacos: discovery: server-addr: 127.0.0.1:8848 server-addr: 192.168.2.100:8848 redis: database: 0 host: 127.0.0.1 host: 192.168.2.100 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: yw active: prod application: name: cacheVerticalGlass liquibase: @@ -30,18 +30,4 @@ slotMaxHeight: 2500 slotMaxthickness: 12 temperingOutTargetPosition: 930 artificialOutTargetPosition: 931 scan: ip: 192.168.30.199 port: 5000 kangaroohy: milo: enabled: false primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv artificialOutTargetPosition: 931 hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml
@@ -28,3 +28,13 @@ host: 10.153.19.150 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-yw.yml
@@ -9,11 +9,6 @@ username: root password: beibo.123/ driver-class-name: com.mysql.cj.jdbc.Driver salve_hangzhoumes: url: jdbc:sqlserver://192.168.2.100:1433;databasename=hangzhoumes username: sa password: beibo.123/ driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver druid: wall: multi-statement-allow: true @@ -26,3 +21,13 @@ host: 192.168.2.100 port: 6379 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application.yml
@@ -3,25 +3,12 @@ spring: profiles: active: dev active: prod application: name: glassStorage liquibase: enabled: false mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl kangaroohy: milo: enabled: false primary: default config: default: endpoint: opc.tcp://192.168.10.241:49320 security-policy: basic256sha256 username: liu password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -3,13 +3,7 @@ import com.mes.GlassStorageApplication; import com.mes.rawglassdetails.entity.RawGlassStorageDetails; import com.mes.rawglassdetails.service.RawGlassStorageDetailsService; import com.mes.rawglasstask.entity.RawGlassStorageTask; import com.mes.rawglasstask.entity.request.RawGlassTaskRequest; import com.mes.rawglasstask.service.RawGlassStorageTaskService; import com.mes.rawusage.entity.RawUsage; import com.mes.rawusage.service.RawUsageService; import com.mes.shelfrack.service.ShelfRackService; import com.mes.storagetask.service.StorageTaskService; import lombok.extern.slf4j.Slf4j; import org.junit.Test; import org.junit.runner.RunWith; @@ -17,12 +11,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringRunner; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; /** @@ -33,17 +22,9 @@ @Slf4j @RunWith(SpringRunner.class) @SpringBootTest(classes = GlassStorageApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class GlassStorageModuleApplicationTest { @Autowired private StorageTaskService storageTaskService; @Autowired private ShelfRackService shelfRackService; @Autowired private RawUsageService rawUsageService; @Autowired private RawGlassStorageDetailsService rawGlassStorageDetailsService; @Autowired @@ -54,67 +35,6 @@ log.info("完整路径:{}", Arrays.asList("123")); } @Test public void testCacheGlass() { // storageTaskService.getBaseMapper().selectById(1); //StorageTask storageTask=new StorageTask(); // storageTask.setId(Long.valueOf("1")); // storageTask.setTaskState("1"); // storageTaskService.updateById(storageTask); // storageTaskService.getBaseMapper().deleteById(1); // storageTaskService.findList(storageTask); ///storageTaskService.findLatestTasks(); storageTaskService.Tasks(); } @Test public void selectshelf_rack() { shelfRackService.selectshelf_rack(); } /** * 测试 */ // @Test // public void testWebSocket() { // List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll(); // log.info("返回内容:{}",list); // } /** * 测试修改WebSocket 参数 */ // @Test // public void testWebSocketArgument() { // RawGlassTaskRequest request=new RawGlassTaskRequest(); // //设置参数: // DateFormat df = new SimpleDateFormat("yyyy-MM-dd"); // Date startDate=null; // Date endDate=null; // try { // startDate= df.parse("2022-01-01"); // endDate= df.parse("2025-01-01"); // }catch (ParseException e){ // e.printStackTrace(); // // request.setCreateTime(startDate);// // request.setPatternQuantity(endDate); // request.setEnableState(new ArrayList<Integer>()); // request.setEnableType(new ArrayList<Integer>()); // String list=rawGlassStorageTaskService.setRawGlassTaskRequest(request); // log.info("返回内容:{}",list); // } // } @Test public void updateRawPackageAndStorageRack() { RawUsage raw=new RawUsage(); raw.setId(null); rawUsageService.updateRawPackageAndStorageRack(raw); } @Test public void txt() { RawGlassStorageDetails rs=new RawGlassStorageDetails(); hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
@@ -27,4 +27,14 @@ database: 0 host: 10.153.19.150 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-yw.yml
@@ -30,4 +30,14 @@ database: 0 host: 192.168.2.100 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@ port: 8083 spring: profiles: active: dev active: prod application: name: loadGlass liquibase: @@ -10,7 +10,4 @@ mybatis-plus: mapper-locations: classpath*:mapper/*.xml configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl kangaroohy: milo: enabled: false log-impl: org.apache.ibatis.logging.stdout.StdOutImpl hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -36,4 +36,14 @@ port: 6379 password: 123456 liquibase: change-log: classpath:changelog/changelogBase.xml change-log: classpath:changelog/changelogBase.xml kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-yw.yml
@@ -34,4 +34,14 @@ database: 0 host: 192.168.2.100 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@ port: 8084 spring: profiles: active: yw active: prod application: name: temperingGlass liquibase: @@ -13,14 +13,4 @@ log-impl: org.apache.ibatis.logging.stdout.StdOutImpl mes: width: 2800 height: 5000 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv height: 5000 hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-prod.yml
@@ -27,4 +27,14 @@ database: 0 host: 10.153.19.150 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://10.153.19.150:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application-yw.yml
@@ -27,4 +27,14 @@ database: 0 host: 192.168.2.100 port: 6379 password: 123456 password: 123456 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv hangzhoumesParent/moduleService/howllowGlassModule/src/main/resources/application.yml
@@ -3,7 +3,7 @@ spring: profiles: active: yw active: prod application: name: hollowGlass liquibase: @@ -31,13 +31,3 @@ artificialOutTargetPosition: 931 slotMaxHeight: 2500 slotMaxthickness: 12 kangaroohy: milo: enabled: true primary: default config: default: endpoint: opc.tcp://192.168.2.100:49320 security-policy: basic256sha256 username: admin password: 1qaz2wsx3edc4rfv