diff --git a/car-mis/src/main/java/com/weiqi/mis/contorller/CarController.java b/car-mis/src/main/java/com/weiqi/mis/contorller/CarController.java
index dba2ee8..c1bc44f 100644
--- a/car-mis/src/main/java/com/weiqi/mis/contorller/CarController.java
+++ b/car-mis/src/main/java/com/weiqi/mis/contorller/CarController.java
@@ -1,5 +1,6 @@
package com.weiqi.mis.contorller;
+import com.weiqi.mis.PushService;
import com.weiqi.vo.OrderInfoVo;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -21,6 +22,8 @@ public class CarController {
@Autowired
MsgService msgService;
+ @Autowired
+ PushService pushService;
/**
@@ -108,7 +111,8 @@ public class CarController {
public Object tb(int id) {
log.info("id= {}", id);
- return ReturnValue.buildErrordata(0, "同步成功！");
+ return pushService.pushorder(id);
+// return ReturnValue.buildErrordata(0, "同步成功！");
}
@RequestMapping(value = "addinfo")
diff --git a/car-mis/src/main/resources/logback-test.xml b/car-mis/src/main/resources/logback-test.xml
index 44309d4..0f1c422 100644
--- a/car-mis/src/main/resources/logback-test.xml
+++ b/car-mis/src/main/resources/logback-test.xml
@@ -124,7 +124,7 @@
-
+
diff --git a/car-mis/src/main/resources/templates/car/orderInfo.html b/car-mis/src/main/resources/templates/car/orderInfo.html
index 88c5276..33f65ad 100644
--- a/car-mis/src/main/resources/templates/car/orderInfo.html
+++ b/car-mis/src/main/resources/templates/car/orderInfo.html
@@ -171,13 +171,11 @@
limits: [1000, 2000, 3000, 4000, 5000]
,
where: {
- appid: $('#appid').val(),
+ id: $('#id').val(),
endTime: $('#endTime').val(),
beginTime: $('#beginTime').val(),
- sendStatus: $('#sendStatus').val(),
- sp: $('#sp').val(),
- message: $('#message').val(),
- mobile: $('#mobile').val()
+ status: $('#status').val(),
+ platenumber: $('#platenumber').val()
}
// ,cellMinWidth: 80 //全局定义常规单元格的最小宽度，layui 2.2.1 新增
,
@@ -186,13 +184,11 @@
{title: '明细列表', colspan: 8}
],
[
- // {field:'msgid', title: '序号', sort: true}
- // ,
{field: 'id', title: 'ID', width: 105}
, {field: 'orderno', title: '订单编号', sort: true, width: 150}
, {
field: 'mname', title: '施工单位名称', width: 220 }
- , {field: 'orderuserid', title: '订单创建人id', width: 105} //minWidth：局部定义当前单元格的最小宽度，layui 2.2.1 新增
+ , {field: 'orderuserid', title: '创建人id', width: 105} //minWidth：局部定义当前单元格的最小宽度，layui 2.2.1 新增
, {field: 'orderusername', title: '订单创建人姓名', width: 150, sort: true}
, {field: 'platenumber', title: '车牌号', sort: true}
, {fixed: 'right', title: '同步', toolbar: '#barDemo', width: '5%', edit: 'text'}
@@ -215,11 +211,12 @@
$.ajax({
url: '/mis/down/tb?id=' + data.id,
success: function (data) {
- var code = data.code;
- if (code == "-1") {
- layer.alert("删除失败！");
+ var code = data.returncode;
+ var msg = data.message;
+ if (code == "0") {
+ layer.alert("同步成功！");
} else {
- layer.alert("删除成功！");
+ layer.alert(msg);
}
doSearch();
}
diff --git a/car-service/src/main/java/com/weiqi/mis/impl/PushServiceImpl.java b/car-service/src/main/java/com/weiqi/mis/impl/PushServiceImpl.java
index 75e0c20..bbc4a90 100644
--- a/car-service/src/main/java/com/weiqi/mis/impl/PushServiceImpl.java
+++ b/car-service/src/main/java/com/weiqi/mis/impl/PushServiceImpl.java
@@ -63,10 +63,16 @@ public class PushServiceImpl implements PushService {
JSONObject pollutesave = pollutesave(wxXrPemsOrder, wxSgPolluteSdsList, orderId);
- if (pollutesave.getInteger("returncode") != 2000) {
+ Integer returncode = pollutesave.getInteger("returncode");
+ if (returncode== 2000||returncode==3000) {
+ jsret.put("returncode", 0);
+ jsret.put("message", "调用接口保存成功xxx");
+ return jsret;
+ }else{
jsret.put("returncode", -1);
jsret.put("message", "调用接口保存订单失败");
return jsret;
+
}
} catch (Exception e) {
@@ -106,8 +112,14 @@ public class PushServiceImpl implements PushService {
Map fields = new HashMap<>();
String body = "";
try {
- fields.put("mid", wxXrPemsOrder.getMid()+"");
- fields.put("userid", wxXrPemsOrder.getOrderuserid()+"");
+ //测试时只能写固定值，防止数据投送到其他站点
+ fields.put("mid", "22");
+ fields.put("userid", "36");
+ fields.put("usid", "36");
+
+// fields.put("mid", wxXrPemsOrder.getMid()+"");
+// fields.put("userid", wxXrPemsOrder.getOrderuserid()+"");
+// fields.put("usid", wxXrPemsOrder.getOrderuserid()+"");
fields.put("vin", wxXrPemsOrder.getVin());
fields.put("platenum", wxXrPemsOrder.getPlatenumber());
fields.put("licensingtime", DateHelper.serialize(wxXrPemsOrder.getAdmissiontime(), DateHelper.DATEFORMAT_ONLY_DATE));
@@ -119,16 +131,15 @@ public class PushServiceImpl implements PushService {
fields.put("linkname", wxXrPemsOrder.getLinkname() == null ? "" : wxXrPemsOrder.getLinkname());
fields.put("phonenum", wxXrPemsOrder.getLinktel() == null ? "" : wxXrPemsOrder.getLinktel());
fields.put("engine_air_count", wxXrPemsOrder.getEnginestructurenumber()+"");
- // 排气系统类型 1，单排 2，双排 这个对应表中哪个字段，是排期构造？ exhau
+ // 排气系统类型 1，单排 2，双排 这个对应表中哪个字段，是排期构造？ exhau
fields.put("exhaustsystem", "1");
- // fields.put("exhaustsystem", wxXrPemsOrder.getExhauststructure());
+ // fields.put("exhaustsystem", wxXrPemsOrder.getExhauststructure());
fields.put("appid", "LANBBXCXtest");
fields.put("os", "xiaochengxu");
fields.put("version", "1.1.2");
fields.put("timestamp", (System.currentTimeMillis() / 1000)+"");
fields.put("udid", "000");
fields.put("noncestr", "000");
- fields.put("usid", wxXrPemsOrder.getOrderuserid()+"");
fields.put("_sign", "77705A9803DCEBBD6006E07BF592882D");
String url = "https://api.mycar369.com/api/sg/createorder?";
@@ -218,7 +229,8 @@ public class PushServiceImpl implements PushService {
fields.put("timestamp", (System.currentTimeMillis()/1000)+"");
fields.put("udid", "000");
fields.put("noncestr", "000");
- fields.put("usid", wxXrPemsOrder.getOrderuserid()+"");
+ fields.put("usid", "36");//TODO之后需要修改
+// fields.put("usid", wxXrPemsOrder.getOrderuserid()+"");
fields.put("_sign", "77705A9803DCEBBD6006E07BF592882D");
body= HttpUtil.sendGetRequest(url, fields);