diff --git a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java index f89f72713..613f9db8a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/service/impl/ProjectUfaceConfigServiceImpl.java @@ -192,6 +192,9 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl param = new HashMap<>(); param.put("projectSn", workerInfo.getProjectSn()); log.info("---新数据:" + workerInfo.getUfaceDevId() + "-----老数据:" + oldWorkerInfo.getUfaceDevId()); + //有选择设备 + Boolean hasDev = true; if (StringUtils.isEmpty(workerInfo.getUfaceDevId())) { + hasDev = false; workerInfo.setUfaceDevId(oldWorkerInfo.getUfaceDevId()); } if ("0".equals(workerInfo.getUfaceDevId())) { @@ -262,6 +268,12 @@ public class ProjectUfaceConfigServiceImpl extends ServiceImpl map = BeanUtil.beanToMap(workerInfo); - map.put("isDelete", false); - String payload = JSON.toJSONString(map); - String topic = ""; - log.info("发送主题信息:{},主题为:{}", payload, topic); - IMqttSender mqttSender = SpringContextUtils.getBean(IMqttSender.class); - mqttSender.sendToMqtt(topic, 2, payload); + String[] splitArr = StringUtils.split(devSn, ","); + for (int i = 0; i < splitArr.length; i++) { + String ds = splitArr[i]; + Map map = BeanUtil.beanToMap(workerInfo); + map.put("isDelete", false); + map.put("devSn", ds); + String payload = JSON.toJSONString(map); + String topic = mqttTopic + ds; + log.info("发送主题信息:{},主题为:{}", payload, topic); + IMqttSender mqttSender = SpringContextUtils.getBean(IMqttSender.class); + mqttSender.sendToMqtt(topic, 2, payload); + } + } else { + log.info("海康门禁sdk,未查询到设备sn"); + } + } + + /** + * 删除人员 + * + * @param workerInfo + * @param tempProjectUfaceConfig + */ + public static void deletePerson(WorkerInfo workerInfo, ProjectUfaceConfig tempProjectUfaceConfig, String devSn) { + if (StrUtil.isNotBlank(devSn)) { + String[] splitArr = StringUtils.split(devSn, ","); + for (int i = 0; i < splitArr.length; i++) { + String ds = splitArr[i]; + Map map = BeanUtil.beanToMap(workerInfo); + map.put("isDelete", true); + map.put("devSn", ds); + String payload = JSON.toJSONString(map); + String topic = mqttTopic + ds; + log.info("发送主题信息:{},主题为:{}", payload, topic); + IMqttSender mqttSender = SpringContextUtils.getBean(IMqttSender.class); + mqttSender.sendToMqtt(topic, 2, payload); + } } else { log.error("海康门禁sdk,未查询到设备sn"); }