diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..8c4012f 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -30,6 +30,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IDeviceService; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -167,4 +168,17 @@ } } + /** + * 接收下发结果 + * @param httpServletRequest + * @return + */ + @RequestMapping(value = "/receiveMsg") + @ResponseBody + public Object receiveMsg(HttpServletRequest httpServletRequest){ + String remoteAddr = httpServletRequest.getRemoteAddr(); + String msg = httpServletRequest.getParameter("msg"); + logger.info("device ".concat(remoteAddr).concat(" update iris data result: ").concat(msg)); + return ResponseData.success(); + } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..8c4012f 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -30,6 +30,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IDeviceService; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -167,4 +168,17 @@ } } + /** + * 接收下发结果 + * @param httpServletRequest + * @return + */ + @RequestMapping(value = "/receiveMsg") + @ResponseBody + public Object receiveMsg(HttpServletRequest httpServletRequest){ + String remoteAddr = httpServletRequest.getRemoteAddr(); + String msg = httpServletRequest.getParameter("msg"); + logger.info("device ".concat(remoteAddr).concat(" update iris data result: ").concat(msg)); + return ResponseData.success(); + } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index efbb939..6a33175 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -5,6 +5,8 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.SocketClientUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -24,6 +26,7 @@ */ @Service public class DeviceServiceImpl extends ServiceImpl implements IDeviceService { + private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${iris.socket-port}") private Integer port; @@ -59,9 +62,11 @@ Map res = SocketClientUtil.sendMessage(devIp,port,DeviceConst.UPDATE_DB); if ((boolean)res.get("success")){ // 成功 + logger.info("device " + device.getDevIp() + " update iris data message ok"); }else { // 失败 failedIds.add(id); + logger.info("device " + device.getDevIp() + " update iris data message fail"); } } return failedIds; diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 193565d..8c4012f 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -30,6 +30,7 @@ import com.casic.missiles.modular.system.model.Device; import com.casic.missiles.modular.system.service.IDeviceService; +import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import static com.casic.missiles.modular.system.constant.DeviceConst.DEVICE_ADD_LOG_KEY; @@ -167,4 +168,17 @@ } } + /** + * 接收下发结果 + * @param httpServletRequest + * @return + */ + @RequestMapping(value = "/receiveMsg") + @ResponseBody + public Object receiveMsg(HttpServletRequest httpServletRequest){ + String remoteAddr = httpServletRequest.getRemoteAddr(); + String msg = httpServletRequest.getParameter("msg"); + logger.info("device ".concat(remoteAddr).concat(" update iris data result: ").concat(msg)); + return ResponseData.success(); + } } diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index efbb939..6a33175 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -5,6 +5,8 @@ import com.casic.missiles.modular.system.service.IDeviceService; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.casic.missiles.modular.system.util.SocketClientUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -24,6 +26,7 @@ */ @Service public class DeviceServiceImpl extends ServiceImpl implements IDeviceService { + private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${iris.socket-port}") private Integer port; @@ -59,9 +62,11 @@ Map res = SocketClientUtil.sendMessage(devIp,port,DeviceConst.UPDATE_DB); if ((boolean)res.get("success")){ // 成功 + logger.info("device " + device.getDevIp() + " update iris data message ok"); }else { // 失败 failedIds.add(id); + logger.info("device " + device.getDevIp() + " update iris data message fail"); } } return failedIds; diff --git a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java index 60b0d20..2dc091c 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/util/SocketClientUtil.java @@ -13,6 +13,8 @@ Map res = new HashMap<>(); try{ Socket socket = new Socket(ip,port); + // read的超时时间 10s + socket.setSoTimeout(10000); // 向服务端发送数据 OutputStream out = socket.getOutputStream(); out.write(msg.getBytes("utf-8"));