|
@@ -45,6 +45,8 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
|
|
|
|
private static final String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
|
|
private static final String daGangUrl = "http://172.16.33.122:44325/api/logistics/TareApplyFor";
|
|
|
|
|
|
|
|
+ private static final String liuPiUrl = "http://172.16.33.122:44325/api/logistics/updateTareWeight";
|
|
|
|
+
|
|
private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
|
|
private static final String daXingUrl = "http://172.16.59.251:8121/daXingWeight/OrderBusiness/addOrder.do";
|
|
|
|
|
|
//给达钢发送委托
|
|
//给达钢发送委托
|
|
@@ -321,10 +323,9 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
if(measureCommission != null)
|
|
if(measureCommission != null)
|
|
map.put("materialId", measureCommission.get("materialId"));
|
|
map.put("materialId", measureCommission.get("materialId"));
|
|
addMeasureCommission(map); // 添加计量委托
|
|
addMeasureCommission(map); // 添加计量委托
|
|
-// System.out.println(measureCommission);
|
|
|
|
-// return 1;
|
|
|
|
|
|
+
|
|
/*访问接口发送数据*/
|
|
/*访问接口发送数据*/
|
|
- return sendMesToMeasure(measureCommission);
|
|
|
|
|
|
+ return sendMesToMeasure(measureCommission, daGangUrl);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
@@ -412,14 +413,14 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
* @param map
|
|
* @param map
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public int sendMesToMeasure(Map<String, Object> map){
|
|
|
|
|
|
+ public int sendMesToMeasure(Map<String, Object> map, String url){
|
|
List<Map<String, Object>> sendMap = new ArrayList<>();
|
|
List<Map<String, Object>> sendMap = new ArrayList<>();
|
|
sendMap.add(map);
|
|
sendMap.add(map);
|
|
JSONObject jsonObject = new JSONObject();
|
|
JSONObject jsonObject = new JSONObject();
|
|
jsonObject.put("data", sendMap);
|
|
jsonObject.put("data", sendMap);
|
|
String jsonData = null;
|
|
String jsonData = null;
|
|
try {
|
|
try {
|
|
- jsonData = HTTPRequestUtils.send(daGangUrl, jsonObject, "utf-8");
|
|
|
|
|
|
+ jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
|
|
} catch (IOException e) {
|
|
} catch (IOException e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
@@ -539,4 +540,59 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
|
|
return i;
|
|
return i;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 发送留皮委托
|
|
|
|
+ * @Author TXF
|
|
|
|
+ * @Date 2022/3/8 14:35
|
|
|
|
+ * @param capacityNumber
|
|
|
|
+ * @return
|
|
|
|
+ **/
|
|
|
|
+ @Override
|
|
|
|
+ synchronized public String sendLiuPiMeasureCommission(String capacityNumber) {
|
|
|
|
+ Map<String, Object> map = new HashMap<>();
|
|
|
|
+ String num = "LP" + System.currentTimeMillis();
|
|
|
|
+ map.put("carNumber", capacityNumber);
|
|
|
|
+ map.put("purchOrder", num);
|
|
|
|
+ int i = sendMesToMeasure2(map, liuPiUrl);
|
|
|
|
+ if(i != 1){
|
|
|
|
+ return "委托发送失败!";
|
|
|
|
+ }
|
|
|
|
+ // 设置单线程避免因网络问题同一时间高并发导致时间戳重复 (访问接口需要时间 也可能不需要)
|
|
|
|
+ try {
|
|
|
|
+ Thread.sleep(1);
|
|
|
|
+ } catch (InterruptedException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ return num;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 上面方法儿子方法
|
|
|
|
+ * @Author TXF
|
|
|
|
+ * @Date 2022/3/8 16:19
|
|
|
|
+ * @param map
|
|
|
|
+ * @param url
|
|
|
|
+ * @return
|
|
|
|
+ **/
|
|
|
|
+ public int sendMesToMeasure2(Map<String, Object> map, String url){
|
|
|
|
+ JSONObject jsonObject = new JSONObject(map);
|
|
|
|
+ String jsonData = null;
|
|
|
|
+ try {
|
|
|
|
+ jsonData = HTTPRequestUtils.send(url, jsonObject, "utf-8");
|
|
|
|
+ } catch (IOException e) {
|
|
|
|
+ e.printStackTrace();
|
|
|
|
+ }
|
|
|
|
+ if(!"null".equals(jsonData)){
|
|
|
|
+ System.out.println(jsonData);
|
|
|
|
+ HashMap hashMap = JSON.parseObject(jsonData, HashMap.class);
|
|
|
|
+ boolean success = (boolean) hashMap.get("success");
|
|
|
|
+ System.out.println(hashMap.get("msg"));
|
|
|
|
+ if(success){
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
+ }else{
|
|
|
|
+ System.out.println("委托发送失败:" + jsonData);
|
|
|
|
+ }
|
|
|
|
+ return 0;
|
|
|
|
+ }
|
|
}
|
|
}
|