|
|
|
@@ -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()); |
|
|
|
|