bug修改

6.program/pom.xml

@@ -51,9 +51,10 @@
                 <spring.redis.password><![CDATA["@WSXcde3"]]></spring.redis.password>
                 <spring.redis.database>5</spring.redis.database>-->
                 <!-- database -->
-                <!--<spring.datasource.url>jdbc:p6spy:mysql://localhost:3036/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false-->
+                <!--<spring.datasource.url>jdbc:p6spy:mysql://localhost:30306/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false-->
+
                 <spring.datasource.url>jdbc:p6spy:mysql://mysql.picaiba.com:30307/mt_wms_qj?characterEncoding=utf8&amp;zeroDateTimeBehavior=convertToNull&amp;useSSL=false
-                </spring.datasource.url>
+                 </spring.datasource.url>
                 <spring.datasource.username>root</spring.datasource.username>
                 <!--<spring.datasource.password>ABC.10086</spring.datasource.password>-->
                 <spring.datasource.password>1qaz@WSX3edc$RFV</spring.datasource.password>

6.program/wms-empty/src/main/java/com/mt/wms/empty/task/ScheduledTask.java

@@ -104,6 +104,7 @@ public class ScheduledTask extends BaseService {
                 nowCurrTask.setRemainingTime(remainingTime);
                 int completeness =(int) (((float)remainingTime/(float)setupTime )*100);
                 nowCurrTask.setCompleteness(completeness);
+                nowCurrTask.setKilnCode("BMA1");
                 //标识卡详情
                 List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, nowCurrTask.getId()));
                 List<CurrTaskDetVo> currTaskDetVoList = BeanUtils.copyList(currTaskDetList, CurrTaskDetVo.class);
@@ -122,7 +123,7 @@ public class ScheduledTask extends BaseService {
     /**
      * 正在加工的加工任务详情
      */
-    @Scheduled(fixedDelay = 1000*60)
+    //@Scheduled(fixedDelay = 1000*60)
     public void screen() throws IOException {
         //查询出正在进炉加工的curr_task,查询对应炉号是否Working,查询计划时间，剩余时间，查询标识卡详情
         List<CurrTask> currTaskList = currTaskServiceBiz.list(new QueryWrapper<CurrTask>().eq(CurrTask.IS_IN, 1));
@@ -161,6 +162,7 @@ public class ScheduledTask extends BaseService {
                 nowCurrTask.setRemainingTime(remainingTime);
                 int completeness =(int) (((float)remainingTime/(float)setupTime )*100);
                 nowCurrTask.setCompleteness(completeness);
+                nowCurrTask.setKilnCode(kilnInfo.getCode());
                 //标识卡详情
                 List<CurrTaskDet> currTaskDetList = currTaskDetServiceBiz.list(new QueryWrapper<CurrTaskDet>().eq(CurrTaskDet.CURR_TASK_ID, nowCurrTask.getId()));
                 List<CurrTaskDetVo> currTaskDetVoList = BeanUtils.copyList(currTaskDetList, CurrTaskDetVo.class);
@@ -177,7 +179,7 @@ public class ScheduledTask extends BaseService {
     /**
      * 查询加工完成的窑炉
      */
-    @Scheduled(fixedDelay = 1000*60*3)
+    //@Scheduled(fixedDelay = 1000*60*3)
     public void taskForStockToKiln() throws IOException {
         //两辆车是否都空闲，只有两辆车都空闲才被允许做任务
         List<VehicleInfo> vehicleInfoList = vehicleInfoServiceBiz.list(new QueryWrapper<VehicleInfo>().eq(VehicleInfo.STATUS, 0));
@@ -210,7 +212,7 @@ public class ScheduledTask extends BaseService {
     }
 
     //查询出正在加工的窑炉，遍历，根据采集频率的不同，采集高频数据能源消耗。暂定30秒
-    @Scheduled(fixedDelay = 1000*30)
+    //@Scheduled(fixedDelay = 1000*30)
     public void getFastValue(){
         //加工炉列表
         List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list(new QueryWrapper<KilnInfo>().in(KilnInfo.TYPE,1,3));
@@ -298,7 +300,7 @@ public class ScheduledTask extends BaseService {
     }
 
     //查询出正在加工的窑炉，遍历，根据采集频率的不同，采集低频数据能源消耗。暂定3分钟一次
-    @Scheduled(fixedDelay = 1000*60*3)
+    //@Scheduled(fixedDelay = 1000*60*3)
     public void getSlowValue(){
         System.out.println("开始采集数据");
         List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list();
@@ -442,7 +444,7 @@ public class ScheduledTask extends BaseService {
 
     //遍历窑炉，空窑炉查询缓存区是否有等待加工的任务，
     //待加工任务存在且没有状态为正在进炉的情况下，按照先进先出的规则选择待加工任务呼叫车辆进炉
-    @Scheduled(fixedDelay = 1000*60)
+    //@Scheduled(fixedDelay = 1000*60)
     public void runTaskForEmptyKiln() throws IOException {
         List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list(new QueryWrapper<KilnInfo>()
                 .eq(KilnInfo.VALID, 1).eq(KilnInfo.STATUS, 0));
@@ -489,7 +491,7 @@ public class ScheduledTask extends BaseService {
     }
 
     //遍历正在工作炉子的报警变量，记录报警
-    @Scheduled(fixedDelay = 1000*30)
+    //@Scheduled(fixedDelay = 1000*30)
     public void listenKilnAlarm(){
         List<KilnInfo> kilnInfoList = kilnInfoServiceBiz.list();
         for (KilnInfo kilnInfo:kilnInfoList