联调代码修改：写入确认字

zhoushihao

2024-05-07 b4a4a24a65fa3f90b4d39a311918943f73e18d5d

联调代码修改：写入确认字

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/common/PlcHomeEdg.java

@@ -16,6 +16,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,7 +35,7 @@
    EdgStorageCageService edgStorageCageService;
    @Autowired
    EdgStorageCageDetailsService edgStorageCageDetailsService;
    @Autowired
    @Resource
    private EdgStorageCageDetailsMapper edgStorageCageDetailsMapper;

    private Map<String, String> mapParameter = new HashMap<String, String>();
@@ -44,28 +45,28 @@


    private void initialize() {
        mapParameter.put("A06_request_word", "DB11.0");   //work
        mapParameter.put("A05_scanning_ID", "DB11.2");
        mapParameter.put("MES_confirmation_word", "DB11.40");
        mapParameter.put("A09_glass_status", "DB11.70");
        //mapParameter.put("A10_glass_status", "DB11.72");
        mapParameter.put("A09_prohibit_film_production", "DB11.74");
        mapParameter.put("A10_prohibit_film_production", "DB11.76");
        mapSettings.put("territoryPoor", 3);
        mapType.put("A06_request_word", "Word");
        mapType.put("A05_scanning_ID", "String");
        mapType.put("MES_confirmation_word", "Word");
        mapType.put("A09_glass_status", "Word");
        //mapType.put("A10_glass_status", "Word");
        mapType.put("A09_prohibit_film_production", "Word");
        mapType.put("A10_prohibit_film_production", "Word");
//        mapValue.put("A06_request_word","1");//请求字
//        mapValue.put("A05_scanning_ID","7");//请求ID
//        mapValue.put("MES_confirmation_word","0");//MES发送字
//        mapValue.put("A09_glass_status","0");//A09玻璃状态
//        mapValue.put("A10_glass_status","0");//A09玻璃状态
//        mapValue.put("A09_prohibit_film_production","0");//A9禁止出片
//        mapValue.put("A10_prohibit_film_production","0");//A10禁止出片
//        mapParameter.put("A06_request_word", "DB11.0");   //work
//        mapParameter.put("A05_scanning_ID", "DB11.2");
//        mapParameter.put("MES_confirmation_word", "DB11.40");
//        mapParameter.put("A09_glass_status", "DB11.70");
//        //mapParameter.put("A10_glass_status", "DB11.72");
//        mapParameter.put("A09_prohibit_film_production", "DB11.74");
//        mapParameter.put("A10_prohibit_film_production", "DB11.76");
//        mapSettings.put("territoryPoor", 3);
//        mapType.put("A06_request_word", "Word");
//        mapType.put("A05_scanning_ID", "String");
//        mapType.put("MES_confirmation_word", "Word");
//        mapType.put("A09_glass_status", "Word");
//        //mapType.put("A10_glass_status", "Word");
//        mapType.put("A09_prohibit_film_production", "Word");
//        mapType.put("A10_prohibit_film_production", "Word");
        mapValue.put("A06_request_word","1");//请求字
        mapValue.put("A05_scanning_ID","11111111111");//请求ID
        mapValue.put("MES_confirmation_word","0");//MES发送字
        mapValue.put("A09_glass_status","0");//A09玻璃状态
        mapValue.put("A10_glass_status","0");//A09玻璃状态
        mapValue.put("A09_prohibit_film_production","0");//A9禁止出片
        mapValue.put("A10_prohibit_film_production","0");//A10禁止出片

    }

@@ -93,6 +94,7 @@
                taskCache.setCreateTime(new DateTime());
                edgStorageCageDetailsMapper.updateById(edgStorageCageDetails);
                taskCacheService.insertTaskCache(taskCache);
                S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
            } else {
                log.info("不存在空格");
            }
@@ -129,6 +131,7 @@
            taskCache.setTaskType(2);
            taskCache.setCreateTime(new DateTime());
            taskCacheService.insertTaskCache(taskCache);
            S7object.getinstance().plccontrol.WriteWord(mapParameter.get("MES_confirmation_word"), (short)1);
        }



 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml

@@ -14,6 +14,11 @@
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_hangzhoumes:
          url: jdbc:sqlserver://127.0.0.1:1433;databasename=hangzhoumes
          username: sa
          password: '!QAZ2wsx'
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
  cloud:
    nacos:
      discovery:

 hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application.yml

@@ -1,51 +1,12 @@
server:
  port: 8081
  port: 8085

spring:
  datasource:
    dynamic:
      primary: hangzhoumes #设置默认的数据源或者数据源组,默认值即为master
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        hangzhoumes:
          url: jdbc:mysql://localhost: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
          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        salve_hangzhoumes:
          url: jdbc:sqlserver://localhost:1433;databasename=hangzhoumes
          username: sa
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#        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
#        salve_hangzhoumes:
#          url: jdbc:sqlserver://10.153.19.150:1433;databasename=hangzhoumes
#          username: sa
#          password: beibo.123/
#          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
  cloud:
    nacos:
      discovery:
        server-addr: localhost:8848
  profiles:
    active: dev
  application:
    name: cacheGlass
  redis:
    database: 0
    host: localhost
    port: 6379
    password: 123456
  session:
    store-type: redis
    name: unLoadGlass
mybatis-plus:
  mapper-locations: classpath*:mapper/*.xml
  configuration:
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl