ZengTao
2025-09-12 60525d151c7a1de6fe455acb61a7a29017935279
1、修改150配置
7个文件已修改
28 ■■■■ 已修改文件
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-prod.yml
@@ -10,7 +10,7 @@
          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://10.153.19.150:3309/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3309/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/GlassStorageModule/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3309/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-prod.yml
@@ -10,12 +10,12 @@
          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://10.153.19.150:3309/pp?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
          url: jdbc:mysql://10.153.19.150:3309/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -38,7 +38,7 @@
     * fixedDelay : 上一个调用结束后再次调用的延时
     */
    @Scheduled(fixedDelay = 10000)
    @Scheduled(fixedDelay = 1000)
    public void screenHome() {
        JSONObject jsonObject = new JSONObject();
@@ -61,8 +61,10 @@
            String endOfPeriodStr = endOfPeriod.format(formatter);
            // 设置为最近七天的时间范围
//        reportingdamage.setReportingWorkTime("2024-05-11");
            reportingdamage.setReportingWorkTime(startOfPeriodStr);
            reportingdamage.setReportingWorkTime2(endOfPeriodStr);
//            reportingdamage.setReportingWorkTime(startOfPeriodStr);
//            reportingdamage.setReportingWorkTime2(endOfPeriodStr);
            reportingdamage.setReportingWorkTime("2025-04-15");
            reportingdamage.setReportingWorkTime2("2025-04-22");
            //扇形图各设备的加工破损数量
            List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
            jsonObject.append("device", device);
@@ -71,8 +73,8 @@
            List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
            jsonObject.append("awaitingRepairs", awaitingRepairs);
            //获取正在进行的工程
            List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
            jsonObject.append("DoingTask", optimizeProjects);
//            List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
//            jsonObject.append("DoingTask", optimizeProjects);
            //获取当前订单
            List<Orders> orders = ordersService.selectOrders();
            jsonObject.append("orders", orders);
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-prod.yml
@@ -15,12 +15,12 @@
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3309/pp?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
          url: jdbc:mysql://10.153.19.150:3309/sd?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/application-prod.yml
@@ -15,7 +15,7 @@
          password: beibo.123/
          driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
        pp:
          url: jdbc:mysql://10.153.19.150:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3309/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver