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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..71c3922 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -47,7 +47,7 @@ * 设备IP */ @TableField("DEV_IP") - @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "illegal IP address") private String devIp; /** * 设备类型 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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..71c3922 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -47,7 +47,7 @@ * 设备IP */ @TableField("DEV_IP") - @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "illegal IP address") private String devIp; /** * 设备类型 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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..71c3922 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -47,7 +47,7 @@ * 设备IP */ @TableField("DEV_IP") - @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "illegal IP address") private String devIp; /** * 设备类型 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-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 350ebf5..0c3cc15 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -209,4 +209,10 @@ //展示数据封装 return defaultPage; } + + @RequestMapping("/getPhoto") + @ResponseBody + public Object getPhoto(Long personId){ + return ResponseData.success(iIrisPersonPhotoService.selectById(personId).getPhotoData()); + } } 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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..71c3922 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -47,7 +47,7 @@ * 设备IP */ @TableField("DEV_IP") - @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "illegal IP address") private String devIp; /** * 设备类型 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-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 350ebf5..0c3cc15 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -209,4 +209,10 @@ //展示数据封装 return defaultPage; } + + @RequestMapping("/getPhoto") + @ResponseBody + public Object getPhoto(Long personId){ + return ResponseData.success(iIrisPersonPhotoService.selectById(personId).getPhotoData()); + } } diff --git a/casic-web/src/main/resources/config/temp/personTemp.xlsx b/casic-web/src/main/resources/config/temp/personTemp.xlsx index 57b85c0..4ffb2cc 100644 --- a/casic-web/src/main/resources/config/temp/personTemp.xlsx +++ b/casic-web/src/main/resources/config/temp/personTemp.xlsx Binary files differ 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 95a4d66..215e1f4 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 @@ -31,6 +31,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; @@ -168,4 +169,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/model/Device.java b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java index 0326b9f..71c3922 100644 --- a/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java +++ b/casic-iris-device/src/main/java/com/casic/missiles/modular/system/model/Device.java @@ -47,7 +47,7 @@ * 设备IP */ @TableField("DEV_IP") - @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "设备IP必须为合法IP地址") + @Pattern(regexp = "((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)\\.){3}(25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)",message = "illegal IP address") private String devIp; /** * 设备类型 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-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 350ebf5..0c3cc15 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -209,4 +209,10 @@ //展示数据封装 return defaultPage; } + + @RequestMapping("/getPhoto") + @ResponseBody + public Object getPhoto(Long personId){ + return ResponseData.success(iIrisPersonPhotoService.selectById(personId).getPhotoData()); + } } diff --git a/casic-web/src/main/resources/config/temp/personTemp.xlsx b/casic-web/src/main/resources/config/temp/personTemp.xlsx index 57b85c0..4ffb2cc 100644 --- a/casic-web/src/main/resources/config/temp/personTemp.xlsx +++ b/casic-web/src/main/resources/config/temp/personTemp.xlsx Binary files differ diff --git a/casic-web/src/main/resources/config/temp/recordsTemp.xlsx b/casic-web/src/main/resources/config/temp/recordsTemp.xlsx index d71e420..ec3724c 100644 --- a/casic-web/src/main/resources/config/temp/recordsTemp.xlsx +++ b/casic-web/src/main/resources/config/temp/recordsTemp.xlsx Binary files differ