From f6c2f15c37aef4675dda01fb5ec17cde4e141c3f Mon Sep 17 00:00:00 2001
From: hjg <hjg@123.com>
Date: 星期六, 14 十月 2023 20:21:09 +0800
Subject: [PATCH] 暂时注销掉了，明天打开
---
JavaSource/com/mandi/fendan/util/Contants.java | 21 ++++++++++++++-------
JavaSource/applicationcontext.xml | 12 ++++++------
JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java | 18 ++++++++++--------
3 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/JavaSource/applicationcontext.xml b/JavaSource/applicationcontext.xml
index 13218fd..3d3a0b7 100644
--- a/JavaSource/applicationcontext.xml
+++ b/JavaSource/applicationcontext.xml
@@ -24,16 +24,16 @@
<bean id="hikari" class="com.zaxxer.hikari.HikariDataSource">
<property name="driverClassName" value="net.sourceforge.jtds.jdbc.Driver" />
- <!--<property name="jdbcUrl" value="jdbc:jtds:sqlserver://10.1.1.9:1433;databaseName=IPASS" />
+ <property name="jdbcUrl" value="jdbc:jtds:sqlserver://10.22.3.34;databaseName=goblinTest" />
<property name="username" value="sa" />
- <property name="password" value="mingtai@80565" />-->
+ <property name="password" value="mingtai@80565" />
<!-- <property name="jdbcUrl" value="jdbc:jtds:sqlserver://47.104.255.13;databaseName=goblin_10" />
<property name="username" value="goblin" />
<property name="password" value="goblin_2021" />-->
- <property name="jdbcUrl"
- value="jdbc:jtds:sqlserver://127.0.0.1:1433;databaseName=goblin" />
- <property name="username" value="sa" />
- <property name="password" value="123" />
+<!-- <property name="jdbcUrl"-->
+<!-- value="jdbc:jtds:sqlserver://127.0.0.1:1433;databaseName=goblin" />-->
+<!-- <property name="username" value="sa" />-->
+<!-- <property name="password" value="123" />-->
<property name="readOnly" value="false" />
<property name="connectionTimeout" value="30000" />
<property name="idleTimeout" value="600000" />
diff --git a/JavaSource/com/mandi/fendan/util/Contants.java b/JavaSource/com/mandi/fendan/util/Contants.java
index 98c4b6d..c102fda 100644
--- a/JavaSource/com/mandi/fendan/util/Contants.java
+++ b/JavaSource/com/mandi/fendan/util/Contants.java
@@ -1,5 +1,6 @@
package com.mandi.fendan.util;
+// 姝ｅ紡鐜 鍜屾祴璇曠幆澧冭娉ㄦ剰
public class Contants {
public static int XSTDlastSearchday = 120;// 閿�鍞彁鍗曞垎鍗曟煡璇㈡渶鍚庢椂闂� 120澶�
@@ -23,7 +24,7 @@
//nc鍙戣揣鍗曟帹閫佸垎鍗曠郴缁焌ction鍊�
public static String NcactionCode_add = "1020";
public static String NcactionCode_del = "1022";
- public static String NcactionCode_close = "1024";
+ public static String NcactionCode_close = "1024"; // 鍏抽棴
public static String NcactionCode_open = "1026";
// 鍒嗗崟绯荤粺鎺ㄩ�佷竴鍗￠�氱郴缁熷湴鍧�
@@ -39,15 +40,21 @@
//鍒嗗崟绯荤粺鎺ㄩ�佷竴鍗￠�氭祴璇曞湴鍧�
- public static String yktLocalAdd = "http://127.0.0.1:8080"; // "http://10.1.1.9:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧� todo 鏀逛负8080
- public static String msLedServiceAddr = "http://192.168.200.211:8077/APPService.asmx"; // 鏄庢櫉ABC鍖篖ED
+// public static String yktLocalAdd="http://10.0.12.9:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧�
+// public static String yktLocalAdd="http://125.46.81.106:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧�
+ // 姝ｅ紡
+ public static String yktLocalAdd = "http://10.0.12.11:8080";
- public static String yr_zcLedUrl = "http://192.168.200.211:8077/APPService.asmx"; // 涔夌憺LED 瑁呰溅 webservice
public static String yr_scanCodeNoticeUrl = yktLocalAdd + "/routine/app/notice/scan.htm"; // 閫氱煡涔夌憺瑁呰溅鐨勬帴鍙�
public static String yr_canDoScanUrl = yktLocalAdd + "/routine/app/notice/canDoScan.htm"; // 閫氱煡涔夌憺瑁呰溅鐨勬帴鍙�
-// public static String yktLocalAdd="http://125.46.81.106:8088";//涓�鍗￠�氬缃戞祴璇曞湴鍧�
- //鍒嗗崟鍥炲啓nc绯荤粺娴嬭瘯鍦板潃NCfdhx_url
- public static String NCfdhx_url = "http://10.0.13.20:9088/api/Domain/mtcesb/servlet/PubAPIServlet";
+
+ //鏈夊彲鑳藉彉鍔ㄧ殑鍙橀噺锛屽垏璁颁笉瑕佸啓鎴恌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
+ //鍒嗗崟鍥炲啓nc绯荤粺娴嬭瘯鍦板潃
+// public static String NCfdhx_url = "http://10.0.13.20:9090/api/Domain/mtcesb/servlet/PubAPIServlet";
+ // 姝ｅ紡
+ public static String NCfdhx_url = "http://10.0.12.17:9088/api/Domain/mtcesb/servlet/PubAPIServlet";
// 鑾峰彇涓�鍗￠�氱紪鍙�,鍒嗗崟琛ㄥご鎺ㄩ�佷竴鍗￠��,鍙栨秷鍒嗗崟鍒犻櫎涓�鍗￠�氫笟鍔″崟淇℃伅,涓氬姟鍗曞彂閫佺煭淇�,
public static String YKTgetPrefix_url = yktLocalAdd+"/ws/api/prefix";
diff --git a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
index 3a95b46..ab42c4e 100644
--- a/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
+++ b/JavaSource/com/mandi/webservice/service/impl/FdXSTDService.java
@@ -460,17 +460,19 @@
String tdmx_pch = jo.get("tdmx_pch").getAsString();
tdmxPchList.add(tdmx_pch);
}
- // 妫�鏌ユ槸鍚﹀綋鍓嶅尯鍩熷凡缁忔帓闃�
- Map paramMap = new HashMap();
- paramMap.put("vehicleId",vehicleId);
- paramMap.put("tdmxPchList", tdmxPchList);
- String jsonStr = Jacksonmethod.tojson(paramMap,false);
- JsonObject jsonObject = Wxhtmethod.postJsonStr(Contants.yr_canDoScanUrl,jsonStr);
- if( jsonObject.get("code").getAsInt() !=0) {
+ /*if("08".equals(fdb.getSdepartNo())) { // 鍙槸涔夌憺鍘傚尯鏈夋晥
+ // 妫�鏌ユ槸鍚﹀綋鍓嶅尯鍩熷凡缁忔帓闃�
+ Map paramMap = new HashMap();
+ paramMap.put("vehicleId", vehicleId);
+ paramMap.put("tdmxPchList", tdmxPchList);
+ String jsonStr = Jacksonmethod.tojson(paramMap, false);
+ JsonObject jsonObject = Wxhtmethod.postJsonStr(Contants.yr_canDoScanUrl, jsonStr);
+ if (jsonObject.get("code").getAsInt() != 0) {
prr.setCode(1);
prr.setErrmsg(jsonObject.get("errmsg").getAsString());
return prr;
- }
+ }
+ }*/
for (JsonElement je : dataArr) {
JsonObject jo=je.getAsJsonObject();
String tdmx_pch = jo.get("tdmx_pch").getAsString();
--
Gitblit v1.9.3