Browse Source

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
646d02f437
4 changed files with 13 additions and 16 deletions
  1. +0
    -4
      mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java
  2. +2
    -2
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java
  3. +5
    -5
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java
  4. +6
    -5
      mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java

+ 0
- 4
mallinkCallback/src/main/java/com/iformall/controller/base/BaseController.java View File

@@ -39,10 +39,6 @@ public class BaseController {
});
}

public void setTenantInfo(TenantEntity dest, TenantEntity source) {
dest.setTenantId(source.getTenantId());
}

public String getIpAddr() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String ipaddress = IPUtil.getIpAddr(request);


+ 2
- 2
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarETCPCallBackController.java View File

@@ -300,7 +300,7 @@ public class WxCarETCPCallBackController extends BaseController {
//return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId);
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(park.getTenantId());
wxCarCmdLog.updateTenantInfo(park);
}

String carNumber = paramMap.get(ETCPUtil.ETCP_CAR_NUMBER);
@@ -412,7 +412,7 @@ public class WxCarETCPCallBackController extends BaseController {
// return new Result(ErrorCode.CAR_PARK_NOT_FOUND.getCode(), "ETCP车场未找到"+ etcpParkId);
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(tenantId);
wxCarCmdLog.updateTenantInfo(park);
}

try {


+ 5
- 5
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarTJDCallBackController.java View File

@@ -142,7 +142,7 @@ public class WxCarTJDCallBackController extends BaseController {
return map;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(park.getTenantId());
wxCarCmdLog.updateTenantInfo(park);
}

try {
@@ -259,7 +259,7 @@ public class WxCarTJDCallBackController extends BaseController {
return map;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(tenantId);
wxCarCmdLog.updateTenantInfo(park);
}

try {
@@ -274,7 +274,7 @@ public class WxCarTJDCallBackController extends BaseController {
try {
// 保存WxCarPayRecord
WxCarPayRecord record = new WxCarPayRecord();
record.setTenantId(tenantId);
record.updateTenantInfo(park);
record.setVendorType(wxCarCmdLog.getVendorType());
record.setParkId(parkId);
record.setParkName(parkName);
@@ -292,7 +292,7 @@ public class WxCarTJDCallBackController extends BaseController {
record.setFee(stopFee);
}
WxCarPayRecord query = new WxCarPayRecord();
query.setTenantId(tenantId);
query.updateTenantInfo(park);
query.setParkId(parkId);
query.setSynId(tradeId);
PageInfo<WxCarPayRecord> page = wxCarPayRecordService.findCarPayListByPage(query,1,1);
@@ -463,7 +463,7 @@ public class WxCarTJDCallBackController extends BaseController {
return map;
} else {
tenantId = park.getTenantId();
wxCarCmdLog.setTenantId(tenantId);
wxCarCmdLog.updateTenantInfo(park);
}

try {


+ 6
- 5
mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java View File

@@ -7,6 +7,7 @@ import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
import com.iformall.domain.po.KwBox;
import com.iformall.domain.po.KwBoxCmdHistory;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumBoxOnlineStatus;
import com.iformall.enums.EnumBoxRegisterStatus;
import com.iformall.service.kw.KwBoxCmdHistoryService;
@@ -45,7 +46,7 @@ public class KwBoxV1Controller extends BaseController {
private KwBoxCmdHistoryService kwBoxCmdHistoryService;


private void saveCmd(String tenantId, String cmd, String imei, String ccid, Date deviceTime, Map<String,Object> paramMap)
private void saveCmd(TenantEntity tenantEntity, String cmd, String imei, String ccid, Date deviceTime, Map<String,Object> paramMap)
{
KwBoxCmdHistory kwBoxCmdHistory = new KwBoxCmdHistory();
kwBoxCmdHistory.setCmd(cmd);
@@ -54,7 +55,7 @@ public class KwBoxV1Controller extends BaseController {
kwBoxCmdHistory.setIccid(ccid);
kwBoxCmdHistory.setImei(imei);
kwBoxCmdHistory.setContent(JSONObject.toJSON(paramMap).toString());
kwBoxCmdHistory.setTenantId(tenantId);
kwBoxCmdHistory.updateTenantInfo(tenantEntity);
kwBoxCmdHistoryService.saveOrUpdate(kwBoxCmdHistory);

}
@@ -78,7 +79,7 @@ public class KwBoxV1Controller extends BaseController {
if (!kwBox.getRegisterStatus().equals(EnumBoxRegisterStatus.INIT.getCode()))
return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST);

saveCmd(kwBox.getTenantId(),KwBoxService.CMD_REGISTER,imei,ccid,deviceTime,paramMap);
saveCmd(kwBox,KwBoxService.CMD_REGISTER,imei,ccid,deviceTime,paramMap);

KwBox record = new KwBox();
record.setId(kwBox.getId());
@@ -135,7 +136,7 @@ public class KwBoxV1Controller extends BaseController {
if (!checkSign(kwBox, paramMap, sign))
return new ResultData(ErrorCode.DEVICE_SIGN_INVALID);

saveCmd(kwBox.getTenantId(),KwBoxService.CMD_LOGIN,imei,ccid,deviceTime,paramMap);
saveCmd(kwBox,KwBoxService.CMD_LOGIN,imei,ccid,deviceTime,paramMap);

KwBox record = new KwBox();
record.setId(kwBox.getId());
@@ -163,7 +164,7 @@ public class KwBoxV1Controller extends BaseController {
if (!checkSign(kwBox, paramMap, sign))
return new ResultData(ErrorCode.DEVICE_SIGN_INVALID);

saveCmd(kwBox.getTenantId(),KwBoxService.CMD_HEARTBEAT,imei,ccid,deviceTime,paramMap);
saveCmd(kwBox,KwBoxService.CMD_HEARTBEAT,imei,ccid,deviceTime,paramMap);

KwBox record = new KwBox();
record.setId(kwBox.getId());


Loading…
Cancel
Save