添加心跳型号修改设备ip

common/src/main/java/com/jpsoft/smart/modules/base/service/DeviceInfoService.java

@@ -14,5 +14,5 @@ public interface DeviceInfoService {
 	int delete(String id);
 	List<DeviceInfo> list();
 	Page<DeviceInfo> pageSearch(Map<String, Object> searchParams, int pageNum, int pageSize,boolean count, List<Sort> sortList);
-	int updateByDeviceNo(String deviceNo,String ip);
+	void updateByDeviceNo(String deviceNo, String ip);
 }

common/src/main/java/com/jpsoft/smart/modules/base/service/impl/DeviceInfoServiceImpl.java

@@ -2,8 +2,9 @@ package com.jpsoft.smart.modules.base.service.impl;
 
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 import javax.annotation.Resource;
+
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 import com.jpsoft.smart.modules.base.dao.DeviceInfoDAO;
@@ -13,6 +14,7 @@ import com.github.pagehelper.Page;
 import com.jpsoft.smart.modules.common.dto.Sort;
 import com.github.pagehelper.PageHelper;
 
+@Slf4j
 @Transactional
 @Component(value="deviceInfoService")
 public class DeviceInfoServiceImpl implements DeviceInfoService {
@@ -69,9 +71,14 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
 	}
 
 	@Override
-	public int updateByDeviceNo(String deviceNo, String ip) {
+	public void updateByDeviceNo(String deviceNo, String ip) {
 		DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
+		String oldIp = deviceInfo.getIpAddress();
+		if (deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
+			deviceInfo.setIpAddress(ip);
+			deviceInfoDAO.update(deviceInfo);
+			log.warn(deviceNo+"的ip由原来的："+oldIp+"自动更新为："+ip);
+		}
 
-		return 0;
 	}
 }

common/src/main/java/com/jpsoft/smart/modules/common/utils/LApiUtil.java

@@ -83,6 +83,7 @@ public class LApiUtil {
         if (dataJson.getInteger("StatusCode") == 14){
             throw new Exception("重复订阅");
         }
+
         return dataJson.getJSONObject("Data");
     }
 

common/src/main/java/com/jpsoft/smart/modules/lapi/service/ILapiService.java

@@ -43,4 +43,6 @@ public interface ILapiService {
      * @return
      */
      String getFaceDbId(DeviceInfo deviceInfo, String companyName) throws Exception;
+
+     
 }

common/src/main/java/com/jpsoft/smart/modules/lapi/service/impl/LapiServiceImpl.java

@@ -135,19 +135,22 @@ public class LapiServiceImpl implements ILapiService {
                 String faceDbId = getFaceDbId(deviceInfo,companyInfo.getName());
                 JSONObject jsonObject = LApiUtil.PostRequest(deviceInfo.getIpAddress()+":"+deviceInfo.getPort()+LApiConstant.ADDPERSON+faceDbId+"/People",map);
                 JSONObject dataJson = jsonObject.getJSONObject("Response");
+                JSONObject response = LApiUtil.getResponse(dataJson);
                 if (dataJson.getInteger("ResponseCode") ==0 && dataJson.getInteger("StatusCode") == 0){
                     LapiMsgResult lapiMsgResult = new LapiMsgResult();
                     lapiMsgResult.setPersonName(personInfo.getName());
-                    lapiMsgResult.setMsg(true);
+                    lapiMsgResult.setSuccess(true);
                     lapiMsgResult.setAliasName(deviceInfo.getAliasName());
                     lapiMsgResults.add(lapiMsgResult);
                 }
+
             }catch (Exception e){
 
                 log.error(e.getMessage());
                 LapiMsgResult lapiMsgResult = new LapiMsgResult();
                 lapiMsgResult.setPersonName(personInfo.getName());
-                lapiMsgResult.setMsg(false);
+                lapiMsgResult.setSuccess(false);
+                lapiMsgResult.setMsg(e.getMessage());
                 lapiMsgResult.setAliasName(deviceInfo.getAliasName());
                 lapiMsgResults.add(lapiMsgResult);
 

common/src/main/java/com/jpsoft/smart/modules/lapi/vo/LapiMsgResult.java

@@ -13,5 +13,7 @@ public class LapiMsgResult {
 
     private String aliasName;
 
-    private boolean msg;
+    private String msg;
+
+    private boolean success;
 }

lapi/src/main/java/com/jpsoft/smart/lapi/handler/HeartReportHandler.java

@@ -33,7 +33,7 @@ public class HeartReportHandler extends SimpleChannelInboundHandler<HeartReportI
         log.warn(deviceNo);
         log.warn("ip =="+ip);
 
-     //   deviceInfoService.updateByDeviceNo(deviceNo,ip);
+        deviceInfoService.updateByDeviceNo(deviceNo,ip);