|
@@ -1,12 +1,13 @@
|
|
|
package com.usky.iot.service.impl;
|
|
|
|
|
|
-import com.usky.common.core.exception.BusinessException;
|
|
|
+import com.alibaba.fastjson.JSONObject;
|
|
|
+import com.usky.agbox.RemotePatrolAgboxService;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
|
-import com.usky.iot.domain.BaseAlarmType;
|
|
|
import com.usky.iot.domain.BaseAppInfo;
|
|
|
import com.usky.iot.mapper.BaseAppInfoMapper;
|
|
|
import com.usky.iot.service.BaseAppInfoService;
|
|
|
import com.usky.common.mybatis.core.AbstractCrudService;
|
|
|
+import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.web.context.request.RequestAttributes;
|
|
|
import org.springframework.web.context.request.RequestContextHolder;
|
|
@@ -26,6 +27,9 @@ import java.time.LocalDateTime;
|
|
|
@Service
|
|
|
public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMapper, BaseAppInfo> implements BaseAppInfoService {
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private RemotePatrolAgboxService remotePatrolAgboxService;
|
|
|
+
|
|
|
public String getIpAddress(HttpServletRequest request) {
|
|
|
String ip = request.getHeader("X-Forwarded-For");
|
|
|
if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
|
|
@@ -51,6 +55,10 @@ public class BaseAppInfoServiceImpl extends AbstractCrudService<BaseAppInfoMappe
|
|
|
|
|
|
@Override
|
|
|
public void add(BaseAppInfo baseAppInfo){
|
|
|
+ JSONObject jsonObj = new JSONObject();
|
|
|
+ jsonObj.put("deviceId", baseAppInfo.getDeviceId());
|
|
|
+ JSONObject a = remotePatrolAgboxService.updateHeart(jsonObj.toJSONString());
|
|
|
+// baseAppInfo.setNetworkService(a.toJSONString());
|
|
|
HttpServletRequest request = getHttpServletRequest();
|
|
|
String accessIp = getIpAddress(request);
|
|
|
baseAppInfo.setAccessIp(accessIp);
|