From bb48edb3d9faaaeab0088151c86fc24137acdb08 Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期六, 18 十一月 2023 11:42:44 +0800
Subject: [PATCH] 科技装车
---
JavaSource/com/mandi/fendan/util/Contants.java | 2 +
JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java | 2
JavaSource/com/mandi/webservice/service/impl/InvoiceService.java | 18 ++++++++
JavaSource/com/mandi/webservice/service/IFdXSTDService.java | 2 +
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 49 +++++++++++++++++++++++-
5 files changed, 68 insertions(+), 5 deletions(-)
diff --git a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
index 859e0c3..b056fd7 100644
--- a/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
+++ b/JavaSource/com/mandi/fendan/mapper/Fd_XSTDMXMapper.java
@@ -166,7 +166,7 @@
})
public List<Map> getHwList(String sdepartNo);
- // 涔夌憺LED鏄剧ず 搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵��
+ /** 涔夌憺銆佺鎶�LED鏄剧ず 搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�� **/
@Select({
"select bs.numberplates,businessNo,zcWz,firstzxhtime," ,
"case WHEN EXISTS ( SELECT * FROM bussinessitems WHERE bussinessNo = x.businessNo ) THEN '鍦ㄨ'" ,
diff --git a/JavaSource/com/mandi/fendan/util/Contants.java b/JavaSource/com/mandi/fendan/util/Contants.java
index c102fda..409a2df 100644
--- a/JavaSource/com/mandi/fendan/util/Contants.java
+++ b/JavaSource/com/mandi/fendan/util/Contants.java
@@ -51,6 +51,8 @@
//鏈夊彲鑳藉彉鍔ㄧ殑鍙橀噺锛屽垏璁颁笉瑕佸啓鎴恌inal浜嗭紝鍚﹀垯甯搁噺鍊肩紪璇戝埌鏂囦欢閲岄潰浜嗭紱閬囧埌涓�涓猣inal鐨勯棶棰橈紝鏇挎崲閰嶇疆鏂囦欢鏃犳晥锛屽緢閮侀椃锛屽師鏉ユ槸杩欓噷瀵艰嚧鐨勯棶棰橈紱鑱槑鍙嶈鑱槑璇紱
public static String msLedServiceAddr= "http://10.22.12.104:8080/APPService.asmx"; // 鏄庢櫉瑁呰溅 ABC鍖篖ED webservice
public static String yr_zcLedUrl = "http://10.4.12.97:8080/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
+ public static String kj_zcLedUrl = "http://10.3.5.16:8080/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
+
//鍒嗗崟鍥炲啓nc绯荤粺娴嬭瘯鍦板潃
// public static String NCfdhx_url = "http://10.0.13.20:9090/api/Domain/mtcesb/servlet/PubAPIServlet";
// 姝ｅ紡
diff --git a/JavaSource/com/mandi/webservice/service/IFdXSTDService.java b/JavaSource/com/mandi/webservice/service/IFdXSTDService.java
index ffe1f78..d2118ca 100644
--- a/JavaSource/com/mandi/webservice/service/IFdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/IFdXSTDService.java
@@ -96,4 +96,6 @@
* @param currPch
*/
public void sendToYrLed(String currPch);
+
+ public void sendToKjLed(String currPch);
}
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 4dff3ec..6582071 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -67,7 +67,7 @@
public static Boolean refreshMsLedLock = false;
public static Boolean refreshYrLedLock = false;
-
+ public static Boolean refreshKjLedLock = false;
@Override
@Transactional(rollbackFor=Exception.class)
public ObjectResult<Boolean> saveFd_xstd(String dataArr) throws Exception {
@@ -633,11 +633,9 @@
if("08".equals(fdb.getSdepartNo())) {
final String cph = currPch;
ThreadPoolUtil.getInstance().execute(()->{
-
Map scanCodeParamMap = new HashMap();
scanCodeParamMap.put("pch",cph);
Wxhtmethod.post(Contants.yr_scanCodeNoticeUrl, scanCodeParamMap);
-
try {
synchronized (FdXSTDService.refreshYrLedLock) {
if (FdXSTDService.refreshYrLedLock) { // 绯荤粺绻佸繖
@@ -651,6 +649,25 @@
} finally {
synchronized (FdXSTDService.refreshYrLedLock) {
FdXSTDService.refreshYrLedLock = false;
+ }
+ }
+ });
+ } else if("04".equals(fdb.getSdepartNo())) { // 绉戞妧
+ final String cph = currPch;
+ ThreadPoolUtil.getInstance().execute(()->{
+ try {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ if (FdXSTDService.refreshKjLedLock) { // 绯荤粺绻佸繖
+ return ;
+ }
+ FdXSTDService.refreshKjLedLock = true;
+ }
+ sendToKjLed(cph);
+ } catch (Exception e) {
+ log.error(e);
+ } finally {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ FdXSTDService.refreshKjLedLock = false;
}
}
});
@@ -894,6 +911,32 @@
Wxhtmethod.post(Contants.yr_zcLedUrl + "/SendLED",paramMap);
log.info("yr_zcLedUrl: " + Contants.yr_zcLedUrl + ";title:" + strTitle + ",content:" + strContent);
}
+ @Override
+ public void sendToKjLed(String currPch) {
+ // 鐘舵�� 涓�纾呭悗锛屽緟瑁咃紱PDA鎵爜 鍦ㄨ锛� 浜屾杩囩鍚庢秷澶�
+ // 瑁呰溅鍖� 涓や釜姹夊瓧鍔犱袱涓嫳鏂囨垨鏁板瓧
+ String strTitle="搴忓彿 杞﹀彿 瑁呰溅鍖� 鐘舵�乗r\n";
+ String strContent = "";
+ String contentFormatStr = "%s %s %s %s\r\n";
+ List<Map> list = tdmxper.yRZcList("04");
+ int index = 1;
+ for (Map map : list) {
+ String numberplates = (String) map.get("numberplates"); // 杞︾墝鍙�
+ String zcWz = (String) map.get("zcWz"); // 瑁呰溅浣嶇疆
+ if(StringUtils.isNotBlank(zcWz)) {
+ zcWz = zcWz.substring(0,4);
+ } else { // 绌烘槸6涓綅缃�
+ zcWz = " ";
+ }
+ String zcStatus = (String) map.get("zcStatus"); // 瑁呰溅浣嶇疆 鍦ㄥ姙/寰呭姙
+ strContent += String.format(contentFormatStr, fillWithZero(index++), numberplates, zcWz, zcStatus);
+ }
+ Map paramMap = new HashMap();
+ paramMap.put("strTitle",strTitle);
+ paramMap.put("strContent",strContent);
+ Wxhtmethod.post(Contants.kj_zcLedUrl + "/SendLED",paramMap);
+ log.info("kj_zcLedUrl: " + Contants.kj_zcLedUrl + ";title:" + strTitle + ",content:" + strContent);
+ }
String fillWithZero(int str){
String s;
diff --git a/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java b/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
index d3bede5..f55d198 100644
--- a/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/InvoiceService.java
@@ -398,7 +398,7 @@
FdXSTDService.refreshMsLedLock = false;
}
}
- }else if ("08".equals(sdepartNo)) { // 涔夌憺
+ } else if ("08".equals(sdepartNo)) { // 涔夌憺
synchronized (FdXSTDService.refreshYrLedLock) {
if (FdXSTDService.refreshYrLedLock) { // 绯荤粺绻佸繖
return null;
@@ -415,6 +415,22 @@
}
}
}
+ } else if ("04".equals(sdepartNo)) { // 绉戞妧
+ synchronized (FdXSTDService.refreshYrLedLock) {
+ if (FdXSTDService.refreshKjLedLock) { // 绯荤粺绻佸繖
+ return null;
+ }
+ }
+ try {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ FdXSTDService.refreshKjLedLock = true;
+ }
+ fdser.sendToKjLed(null);
+ } finally {
+ synchronized (FdXSTDService.refreshKjLedLock) {
+ FdXSTDService.refreshKjLedLock = false;
+ }
+ }
}
return null;
}
--
Gitblit v1.9.3