From 854a5baf0b9071ffdab7b82d697464c7b7aadbeb Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Thu, 02 Sep 2021 08:40:15 +0800 Subject: [PATCH] kafka小时数据修改 --- screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java | 403 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 394 insertions(+), 9 deletions(-) diff --git a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java index 5038125..e802b36 100644 --- a/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java +++ b/screen-manage/src/main/java/com/moral/api/service/impl/SpecialDeviceServiceImpl.java @@ -2,22 +2,34 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.moral.api.entity.*; import com.moral.api.mapper.*; +import com.moral.api.pojo.vo.device.DeviceVO; import com.moral.api.service.SpecialDeviceService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.moral.api.util.CacheUtils; +import com.moral.api.util.LogUtils; import com.moral.constant.Constants; +import com.moral.constant.RedisConstants; import com.moral.constant.ResponseCodeEnum; +import com.moral.util.DateUtils; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import javax.servlet.http.HttpServletRequest; +import java.beans.PropertyDescriptor; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * <p> @@ -48,6 +60,39 @@ @Autowired(required = false) private OrganizationMapper organizationMapper; + @Autowired(required = false) + private RedisTemplate redisTemplate; + + @Autowired(required = false) + private OrganizationUnitAlarmMapper organizationUnitAlarmMapper; + + @Autowired(required = false) + private VersionSensorUnitMapper versionSensorUnitMapper; + + @Autowired + private LogUtils logUtils; + + /* + * ���redis������������������ + * */ + private Map<String, Object> getDeviceInfoFromRedis(String mac) { + return (Map<String, Object>) redisTemplate.opsForHash().get(RedisConstants.DEVICE, mac); + } + + /* + * ������������������redis + */ + private void setDeviceInfoToRedis(String mac, Map<String, Object> deviceInfo) { + redisTemplate.opsForHash().put(RedisConstants.DEVICE, mac, deviceInfo); + } + + /* + * ���redis������������������ + */ + private void delDeviceInfoFromRedis(String mac) { + redisTemplate.opsForHash().delete(RedisConstants.DEVICE, mac); + } + @Override public Map<String, Object> getDataByCondition(Map map) { Map<String,Object> resultMap = new HashMap<>(); @@ -62,13 +107,15 @@ QueryWrapper<SpecialDevice> wrapper_Condition = new QueryWrapper<>(); wrapper_Condition.eq("is_delete",Constants.NOT_DELETE); if (!ObjectUtils.isEmpty(map.get("organization_id"))){ - wrapper_Condition.like("organization_id",map.get("organization_id").toString()); + wrapper_Condition.eq("organization_id",map.get("organization_id").toString()); } if (!ObjectUtils.isEmpty(map.get("keyword"))){ - wrapper_Condition.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString()); + wrapper_Condition.and(wc -> wc.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString())); + //wrapper_Condition.like("name",map.get("keyword").toString()).or().like("mac",map.get("keyword").toString()); } wrapper_Condition.orderByDesc("create_time"); Page resultPage = specialDeviceMapper.selectPage(page,wrapper_Condition); + int totalNumber = specialDeviceMapper.selectCount(wrapper_Condition); List<SpecialDevice> specialDevices = resultPage.getRecords(); SimpleDateFormat SDF = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); List<Map<String,Object>> specialDeviceList = new ArrayList<>(); @@ -90,6 +137,7 @@ QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>(); wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE); wapper_manageAccount.in("id",operateIdList); + wapper_manageAccount.select("id", "user_name"); List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount); for (ManageAccount manageAccount:manageAccounts) { Map<String,Object> operateMap = new HashMap<>(); @@ -112,7 +160,7 @@ deviceVersionMap.put("name",version.getName()); } } - specialDeviceMap.put("deviceVersion",deviceVersionMap); + specialDeviceMap.put("version",deviceVersionMap); Map<String,Object> specialTypeMap = new HashMap<>(); if (!ObjectUtils.isEmpty(specialDevice.getSpecialType()) && specialDevice.getSpecialType()!=null && !"".equals(specialDevice.getSpecialType())){ int specialTypeId = Integer.parseInt(specialDevice.getSpecialType().toString()); @@ -123,6 +171,7 @@ SysDictData sysDictData = sysDictDataMapper.selectOne(wapper_sysDictData); if (!ObjectUtils.isEmpty(sysDictData)){ specialTypeMap.put("id",sysDictData.getId()); + specialTypeMap.put("dataKey",sysDictData.getDataKey()); specialTypeMap.put("name",sysDictData.getDataValue()); } } @@ -139,7 +188,7 @@ organizationMap.put("name",organization.getName()); } } - specialDeviceMap.put("organazation",organizationMap); + specialDeviceMap.put("organization",organizationMap); List<Map<String,Object>> organizationList = new ArrayList<>(); QueryWrapper<SpecialDeviceHistory> wapper_specialDeviceHistory = new QueryWrapper<>(); wapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE); @@ -165,7 +214,6 @@ specialDeviceList.add(specialDeviceMap); } resultMap.put("specialDevices",specialDeviceList); - int totalNumber = specialDevices.size(); resultMap.put("totalNumber",totalNumber); resultMap.put("current",current); int totalPageNumber = totalNumber/size; @@ -175,4 +223,341 @@ resultMap.put("totalPageNumber",totalPageNumber); return resultMap; } + + @Transactional + @Override + public Map<String, Object> insert(SpecialDevice specialDevice) { + Map<String,Object> resultMap = new HashMap<>(); + String name = specialDevice.getName(); + String mac = specialDevice.getMac(); + int organizationId = specialDevice.getOrganizationId(); + int deviceVersionId = specialDevice.getDeviceVersionId(); + String operateIds = specialDevice.getOperateIds(); + String specialType = specialDevice.getSpecialType(); + if (ObjectUtils.isEmpty(name) || ObjectUtils.isEmpty(mac) || ObjectUtils.isEmpty(specialType) || ObjectUtils.isEmpty(organizationId) || ObjectUtils.isEmpty(deviceVersionId)){ + resultMap.put("code",ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode()); + resultMap.put("msg",ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg()); + return resultMap; + } + if (name.equals("") || mac.equals("") || specialType.equals("")){ + resultMap.put("code",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getCode()); + resultMap.put("msg",ResponseCodeEnum.PARAMETERS_NOT_REQUIREMENT.getMsg()); + return resultMap; + } + QueryWrapper<SpecialDevice> wrapper_mac = new QueryWrapper<>(); + wrapper_mac.eq("is_delete",Constants.NOT_DELETE); + wrapper_mac.eq("mac",mac); + int macNum = specialDeviceMapper.selectCount(wrapper_mac); + if (macNum>0){ + resultMap.put("code",ResponseCodeEnum.MAC_IS_EXIST.getCode()); + resultMap.put("msg",ResponseCodeEnum.MAC_IS_EXIST.getMsg()); + return resultMap; + } + specialDeviceMapper.insert(specialDevice); + QueryWrapper<SpecialDeviceHistory> wrapper_specialDeviceHistory = new QueryWrapper<>(); + wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE); + wrapper_specialDeviceHistory.eq("mac",mac); + wrapper_specialDeviceHistory.eq("organization_id",organizationId); + SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory); + SpecialDeviceHistory insertSpecialDeviceHistory = new SpecialDeviceHistory(); + BeanUtils.copyProperties(specialDevice,insertSpecialDeviceHistory); + if (ObjectUtils.isEmpty(specialDeviceHistory)){ + specialDeviceHistoryMapper.insert(insertSpecialDeviceHistory); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������������������").append(insertSpecialDeviceHistory.getName()).append(":").append("mac���").append(insertSpecialDeviceHistory.getMac()); + logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE); + }else { + /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>(); + wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE); + wrapper_specialDeviceHistory.eq("mac",mac); + wrapper_specialDeviceHistory.eq("organization_id",organizationId);*/ + specialDeviceHistoryMapper.update(insertSpecialDeviceHistory,wrapper_specialDeviceHistory); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������").append(specialDeviceHistory.getId()).append("���"); + Field[] fields = SpecialDevice.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("id")) { + continue; + } + if ("serialVersionUID".equals(field.getName())) { + continue; + } + String fieldName = field.getName(); + PropertyDescriptor pd = null; + try { + pd = new PropertyDescriptor(fieldName, SpecialDeviceHistory.class); + Method method = pd.getReadMethod(); + Object o1 = method.invoke(specialDeviceHistory); + Object o2 = method.invoke(insertSpecialDeviceHistory); + if (o2 != null) { + content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":"); + } + + } catch (Exception e) { + e.printStackTrace(); + } + + } + logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE); + } + Map<String, Object> deviceInfo = selectDeviceInfoById(specialDevice.getId()); + //��������������������������� + insertOrganizationUnitAlarm(specialDevice.getOrganizationId(), specialDevice.getDeviceVersionId()); + //������������������������redis + String mac1 = specialDevice.getMac(); + //���redis��������������������� + delDeviceInfoFromRedis(mac1); + //������������������redis + setDeviceInfoToRedis(mac1, deviceInfo); + //������deviceInfo������ + CacheUtils.refreshSpecialDeviceAlarmInfo(); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������").append(specialDevice.getName()).append(":").append("mac���").append(mac); + logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE); + resultMap.put("code", ResponseCodeEnum.SUCCESS.getCode()); + resultMap.put("msg", ResponseCodeEnum.SUCCESS.getMsg()); + return resultMap; + } + + @Transactional + @Override + public void update(SpecialDevice specialDevice) { + Integer specialDeviceId = specialDevice.getId(); + SpecialDevice oldSpecialDevice = specialDeviceMapper.selectById(specialDeviceId); + specialDeviceMapper.updateById(specialDevice); + SpecialDevice updateSpecialDevice = specialDeviceMapper.selectById(specialDeviceId); + String oleMac = oldSpecialDevice.getMac(); + //��������������������������� + Integer oldOrgId = oldSpecialDevice.getOrganizationId(); + Integer newOrgId = updateSpecialDevice.getOrganizationId(); + Integer oldVersionId = oldSpecialDevice.getDeviceVersionId(); + Integer newVersionId = updateSpecialDevice.getDeviceVersionId(); + if (!oldOrgId.equals(newOrgId) || !oldVersionId.equals(newVersionId)) { + deleteOrganizationUnitAlarm(oldOrgId, oldVersionId); + insertOrganizationUnitAlarm(newOrgId, newVersionId); + } + //���redis��������������������� + delDeviceInfoFromRedis(oleMac); + Map<String, Object> deviceInfo = selectDeviceInfoById(specialDeviceId); + //������������������redis + setDeviceInfoToRedis(updateSpecialDevice.getMac(), deviceInfo); + //������deviceInfo������ + CacheUtils.refreshSpecialDeviceAlarmInfo(); + QueryWrapper<SpecialDeviceHistory> wrapper_specialDeviceHistory = new QueryWrapper<>(); + wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE); + wrapper_specialDeviceHistory.eq("mac",updateSpecialDevice.getMac()); + wrapper_specialDeviceHistory.eq("organization_id",updateSpecialDevice.getOrganizationId()); + SpecialDeviceHistory specialDeviceHistory = specialDeviceHistoryMapper.selectOne(wrapper_specialDeviceHistory); + SpecialDeviceHistory updateSpecialDeviceHistory = new SpecialDeviceHistory(); + BeanUtils.copyProperties(updateSpecialDevice,updateSpecialDeviceHistory); + updateSpecialDeviceHistory.setCreateTime(null); + updateSpecialDeviceHistory.setUpdateTime(null); + updateSpecialDeviceHistory.setIsDelete(null); + if (ObjectUtils.isEmpty(specialDeviceHistory)){ + specialDeviceHistoryMapper.insert(updateSpecialDeviceHistory); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������������������").append(updateSpecialDeviceHistory.getName()).append(":").append("mac���").append(updateSpecialDeviceHistory.getMac()); + logUtils.saveOperationForManage(request, content.toString(), Constants.INSERT_OPERATE_TYPE); + }else { + /*UpdateWrapper<SpecialDeviceHistory> wrapper_insertSpecialDeviceHistory = new UpdateWrapper<>(); + wrapper_specialDeviceHistory.eq("is_delete",Constants.NOT_DELETE); + wrapper_specialDeviceHistory.eq("mac",mac); + wrapper_specialDeviceHistory.eq("organization_id",organizationId);*/ + specialDeviceHistoryMapper.update(updateSpecialDeviceHistory,wrapper_specialDeviceHistory); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������").append(specialDeviceHistory.getId()).append("���"); + Field[] fields = SpecialDevice.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("id")) { + continue; + } + if ("serialVersionUID".equals(field.getName())) { + continue; + } + String fieldName = field.getName(); + PropertyDescriptor pd = null; + try { + pd = new PropertyDescriptor(fieldName, SpecialDeviceHistory.class); + Method method = pd.getReadMethod(); + Object o1 = method.invoke(specialDeviceHistory); + Object o2 = method.invoke(updateSpecialDeviceHistory); + if (o2 != null) { + content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":"); + } + + } catch (Exception e) { + e.printStackTrace(); + } + + } + logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE); + } + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������������").append(specialDeviceId).append("���"); + Field[] fields = SpecialDevice.class.getDeclaredFields(); + for (Field field : fields) { + if (field.getName().equals("id")) { + continue; + } + if ("serialVersionUID".equals(field.getName())) { + continue; + } + String fieldName = field.getName(); + PropertyDescriptor pd = null; + try { + pd = new PropertyDescriptor(fieldName, SpecialDevice.class); + Method method = pd.getReadMethod(); + Object o1 = method.invoke(oldSpecialDevice); + Object o2 = method.invoke(specialDevice); + if (o2 != null) { + content.append(fieldName).append("���").append(o1).append("-->").append(o2).append(":"); + } + + } catch (Exception e) { + e.printStackTrace(); + } + + } + logUtils.saveOperationForManage(request, content.toString(), Constants.UPDATE_OPERATE_TYPE); + } + + @Override + public void delete(Integer specialDeviceId) { + SpecialDevice specialDevice = specialDeviceMapper.selectById(specialDeviceId); + UpdateWrapper<SpecialDevice> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("id",specialDeviceId).set("is_delete",Constants.DELETE); + specialDeviceMapper.update(null,updateWrapper); + String mac = specialDevice.getMac(); + //���redis��������������������� + delDeviceInfoFromRedis(mac); + //��������������������������� + Integer versionId = specialDevice.getDeviceVersionId(); + Integer orgId = specialDevice.getOrganizationId(); + deleteOrganizationUnitAlarm(orgId, versionId); + //������deviceInfo������ + CacheUtils.refreshSpecialDeviceAlarmInfo(); + //������������������ + HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); + StringBuilder content = new StringBuilder(); + content.append("������������������").append(specialDevice.getName()).append(";").append("mac���").append(mac); + logUtils.saveOperationForManage(request, content.toString(), Constants.DELETE_OPERATE_TYPE); + } + + @Override + public Map<String, Object> selectDeviceInfoById(Integer deviceId) { + String mac = specialDeviceMapper.selectById(deviceId).getMac(); + Map<String, Object> specialDeviceInfo = getDeviceInfoFromRedis(mac); + //������redis������ + if (specialDeviceInfo != null) { + return specialDeviceInfo; + } + specialDeviceInfo = new LinkedHashMap<>(); + //DeviceVO device = deviceMapper.selectDeviceInfoById(deviceId); + SpecialDevice specialDevice = specialDeviceMapper.selectById(deviceId); + //������ + specialDeviceInfo.put("id", specialDevice.getId()); + specialDeviceInfo.put("name", specialDevice.getName()); + specialDeviceInfo.put("mac", specialDevice.getMac()); + specialDeviceInfo.put("createTime", DateUtils.dateToDateString(specialDevice.getCreateTime())); + + //������������ + //specialDeviceInfo.put("extend", device.getExtend()); + + //������ + Map<String, Object> versionInfo = new LinkedHashMap<>(); + Version version = versionMapper.selectById(specialDevice.getDeviceVersionId()); + versionInfo.put("id", version.getId()); + versionInfo.put("name", version.getName()); + specialDeviceInfo.put("version", versionInfo); + + //��������� + List<Map<String, Object>> operatorsInfo = new ArrayList<>(); + String operateIds = specialDevice.getOperateIds(); + if (!ObjectUtils.isEmpty(operateIds)){ + String[] operateIdArr = operateIds.split(","); + if (operateIdArr.length>0){ + List<Integer> operateIdList = new ArrayList<>(); + for (int i = 0; i < operateIdArr.length; i++){ + operateIdList.add(Integer.parseInt(operateIdArr[i])); + } + QueryWrapper<ManageAccount> wapper_manageAccount = new QueryWrapper<>(); + wapper_manageAccount.eq("is_delete",Constants.NOT_DELETE); + wapper_manageAccount.in("id",operateIdList); + List<ManageAccount> manageAccounts = manageAccountMapper.selectList(wapper_manageAccount); + for (ManageAccount manageAccount:manageAccounts) { + Map<String,Object> operateMap = new HashMap<>(); + operateMap.put("id",manageAccount.getId()); + operateMap.put("name",manageAccount.getUserName()); + operatorsInfo.add(operateMap); + } + } + } + specialDeviceInfo.put("operators", operatorsInfo); + + //������ + Map<String, Object> orgInfo = new LinkedHashMap<>(); + Organization organization = organizationMapper.selectById(specialDevice.getOrganizationId()); + orgInfo.put("id", organization.getId()); + orgInfo.put("name", organization.getName()); + orgInfo.put("areaCode", organization.getAreaCode()); + orgInfo.put("cityCode", organization.getCityCode()); + orgInfo.put("provinceCode", organization.getProvinceCode()); + specialDeviceInfo.put("organization", orgInfo); + + setDeviceInfoToRedis(mac, specialDeviceInfo); + return specialDeviceInfo; + } + + private void insertOrganizationUnitAlarm(Integer orgId, Integer versionId) { + QueryWrapper<OrganizationUnitAlarm> queryOrganizationVersionWrapper = new QueryWrapper<>(); + queryOrganizationVersionWrapper.eq("organization_id", orgId); + queryOrganizationVersionWrapper.eq("version_id", versionId); + queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE); + List<OrganizationUnitAlarm> organizationUnitAlarms = organizationUnitAlarmMapper.selectList(queryOrganizationVersionWrapper); + if (org.springframework.util.ObjectUtils.isEmpty(organizationUnitAlarms)) { + QueryWrapper<VersionSensorUnit> queryVersionSensorUnitWrapper = new QueryWrapper<>(); + queryVersionSensorUnitWrapper.eq("version_id", versionId); + queryVersionSensorUnitWrapper.eq("is_delete", Constants.NOT_DELETE); + List<VersionSensorUnit> versionSensorUnits = versionSensorUnitMapper.selectList(queryVersionSensorUnitWrapper); + if (!org.springframework.util.ObjectUtils.isEmpty(versionSensorUnits)) { + for (VersionSensorUnit versionSensorUnit : versionSensorUnits) { + OrganizationUnitAlarm organizationUnitAlarm = new OrganizationUnitAlarm(); + organizationUnitAlarm.setOrganizationId(orgId); + organizationUnitAlarm.setVersionId(versionId); + organizationUnitAlarm.setSensorCode(versionSensorUnit.getSensorCode()); + organizationUnitAlarm.setUnitKey(versionSensorUnit.getUnitKey()); + organizationUnitAlarm.setShowUnitKey(versionSensorUnit.getUnitKey()); + organizationUnitAlarmMapper.insert(organizationUnitAlarm); + } + } + } + } + + private void deleteOrganizationUnitAlarm(Integer orgId, Integer versionId) { + QueryWrapper<SpecialDevice> queryOrganizationVersionWrapper = new QueryWrapper<>(); + queryOrganizationVersionWrapper.eq("organization_id", orgId); + queryOrganizationVersionWrapper.eq("device_version_id", versionId); + queryOrganizationVersionWrapper.eq("is_delete", Constants.NOT_DELETE); + List<SpecialDevice> specialDevices = specialDeviceMapper.selectList(queryOrganizationVersionWrapper); + if (org.springframework.util.ObjectUtils.isEmpty(specialDevices)) {//������������������������������������������������������ + UpdateWrapper deleteWrapper = new UpdateWrapper(); + deleteWrapper.eq("organization_id", orgId); + deleteWrapper.eq("version_id", versionId); + deleteWrapper.eq("is_delete", Constants.NOT_DELETE); + deleteWrapper.set("is_delete", Constants.DELETE); + organizationUnitAlarmMapper.update(null, deleteWrapper); + } + } } -- Gitblit v1.8.0