From 258fb5fa6e99490a9e667b4e7d49f48c29ce2c9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 10:24:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java | 52 ++++++++++++++++++++++++++
src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java | 8 ++--
src/main/java/com/zy/asrs/service/BasDevpService.java | 2 +
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java | 3 +
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 5 ++
src/main/resources/mapper/BasDevpMapper.xml | 7 +++
6 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
index 668d2ca..79fd860 100644
--- a/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -15,4 +15,7 @@
List<Integer> getAvailableInSite(@Param("typeNo") Integer typeNo);
List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
+
+ void updateReportSignFalse(@Param("devpNo") Integer devpNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpService.java b/src/main/java/com/zy/asrs/service/BasDevpService.java
index 3e8f21f..f50d2fe 100644
--- a/src/main/java/com/zy/asrs/service/BasDevpService.java
+++ b/src/main/java/com/zy/asrs/service/BasDevpService.java
@@ -49,4 +49,6 @@
*/
BasDevp checkSiteStatusEmpty(Integer devpNo, boolean pakin);
+ void updateReportSignFalse(Integer devpNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index fa2dd99..7718cf7 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -93,4 +93,9 @@
}
return station;
}
+
+ @Override
+ public void updateReportSignFalse(Integer devpNo){
+ baseMapper.updateReportSignFalse(devpNo);
+ }
}
diff --git a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
index 6ae61d5..d9d4660 100644
--- a/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OneLouHangJiaScheduler.java
@@ -2,8 +2,13 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
import com.zy.asrs.entity.WrkMastSta;
+import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.service.RgvOneSignService;
import com.zy.asrs.service.WrkMastStaService;
+import com.zy.asrs.service.impl.BasDevpServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OneLouHangJiaHandler;
import com.zy.asrs.task.handler.RailwayPlatformHandler;
@@ -24,6 +29,10 @@
private OneLouHangJiaHandler oneLouHangJiaHandler;
@Autowired
private WrkMastStaService wrkMastStaService;
+ @Autowired
+ private BasDevpService basDevpService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@Scheduled(cron = "0/3 * * * * ? ")
private void execute(){//閫�搴撴媶鐮佸灈
@@ -46,4 +55,47 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeoTHER(){//131銆�135鏍囪鑷姩娓呴櫎
+// int[] staNos =new int[]{131,135};
+ int[][] staNoLists =new int[2][3];
+ staNoLists[0] = new int[]{131,118,119};
+ staNoLists[1] = new int[]{135,120,121};
+ int i = 0;
+ for (int[] staNos : staNoLists){
+ if (i==0){
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
+ if (rgvOneSign.getRgvOneSign()==1){//1:閫�搴撴ā寮�
+ i++;
+ continue;
+ }
+ }
+ boolean sign = true;
+ int j =0;
+ for (int staNo : staNos){
+ try{
+ BasDevp basDevp = basDevpService.selectById(staNo);
+ if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y")){
+ if (
+ (j==0 && basDevp.getReportSign()==1 && basDevp.getLoading().equals("Y")&& basDevp.getLoadingSuper().equals("Y"))
+ ||
+ (j!=0 && basDevp.getReportSign()==0)
+ ){
+ j++;
+ continue;
+ }
+ }
+ }catch (Exception e){
+ log.error("131銆�135鏍囪鑷姩娓呴櫎"+staNo+"绔欑偣澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ sign = false;
+ j++;
+ }
+ if (sign){
+ basDevpService.updateReportSignFalse(staNos[0]);
+ }
+ i++;
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
index 829cdde..ffab943 100644
--- a/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OneLouHangJiaHandler.java
@@ -61,7 +61,7 @@
Integer staOther = getStaOther(staNoEnd);
BasDevp basDevp = basDevpService.selectById(staNo);
if (Cools.isEmpty(basDevp) || basDevp.getWrkNo()==0
- || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getInEnable().equals("Y")){
+ || !basDevp.getAutoing().equals("Y") || !basDevp.getLoading().equals("Y") || !basDevp.getLoadingSuper().equals("Y") || !basDevp.getInEnable().equals("Y")){
return FAIL;
}
BasDevp basDevp131 = basDevpService.selectById(131);
@@ -92,7 +92,7 @@
return FAIL;
}
- if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
+ if (basDevpEnd.getLoading().equals("Y") && basDevpEnd.getLoadingSuper().equals("Y") && basDevpEnd.getEmptyMk().equals("Y")){
//鐢熸垚鏈烘鑷備换鍔�
TrussCombParam trussCombParam = new TrussCombParam(wrkDetl,staNoEnd);
try{
@@ -115,10 +115,10 @@
log.error("妗佹灦涓婁綅杞欢閫�搴撳け璐�"+e);
return FAIL;
}
- }else if (!basDevpEnd.getLoading().equals("Y") ){
+ }else if (!basDevpEnd.getLoading().equals("Y") && !basDevpEnd.getLoadingSuper().equals("Y")){
Thread.sleep(1000);
basDevpEnd = basDevpService.selectById(staNoEnd);
- if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || basDevpEnd.getLoading().equals("Y") ){
+ if (Cools.isEmpty(basDevpEnd) || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getReportSign()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getLoadingSuper().equals("Y")){
return FAIL;
}
WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>().eq("wrk_no",staNoEnd + 19999L));
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index 17b205f..5fad2e2 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -69,4 +69,11 @@
group by abd.dev_no
</select>
+ <update id="updateReportSignFalse">
+ update man_order
+ set report_sign = 0
+ where 1=1
+ and dev_no = #{devpNo}
+ </update>
+
</mapper>
--
Gitblit v1.9.1