From 25f011a10fcf9ad322927637c2f0f2fea79e727e Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 24 Apr 2025 15:56:17 +0800 Subject: [PATCH 1/5] =?UTF-8?q?[feat]=201=E3=80=81=E6=8E=A8=E9=80=81dev?= =?UTF-8?q?=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/business/controller/BusinessAlertController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java index b57a0f9..0611c9a 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java +++ b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessAlertController.java @@ -73,6 +73,7 @@ public class BusinessAlertController extends BaseController { @Operation(summary ="ai实时流预警保存",description = "ai实时流预警保存") @PostMapping("/saveAlertList") public R saveAlert(@RequestBody List alertVoList) { + businessAlertService.addBusinessAlertList(alertVoList); return R.ok(); } From d01e5c72372e36add3279175a5a8b646504afaca Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 24 Apr 2025 16:13:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E5=AD=98=E5=82=A8redis?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DeviceProServiceImpl.java | 45 +++++++++++-------- 1 file changed, 26 insertions(+), 19 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java index bbfbbc1..5cc1736 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java @@ -88,6 +88,8 @@ public class DeviceProServiceImpl implements IDeviceProService { @Autowired private IDeviceProUserMapper deviceProUserMapper; + private final ObjectMapper objectMapper = new ObjectMapper(); + @Override public PaginationData listDeviceProEntityMap(Page page, DeviceProDTO deviceProDTO) { Page pagination = deviceProMapper.listDeviceProEntityMap(page, deviceProDTO); @@ -148,13 +150,13 @@ public class DeviceProServiceImpl implements IDeviceProService { difference.forEach(proUserEntity -> { //删除人员项目组信息 List projects = RedisUtils.getCacheList(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())); - List projectList = projects.stream() - .filter(DeviceProEntity.class::isInstance) - .map(DeviceProEntity.class::cast) + List projectList = projects.stream() + .filter(Map.class::isInstance) + .map(Map.class::cast) .toList(); //删除人员中所拥有的当前的项目组，然后构建新的存入redis - List deviceProEntities = projectList.stream().filter(p -> !p.getId().equals(proId)).toList(); + List deviceProEntities = projectList.stream().filter(p -> !Integer.valueOf(p.get("id") + "").equals(proId)).toList(); //删除 RedisUtils.deleteObject(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())); //重新插入 @@ -163,19 +165,21 @@ public class DeviceProServiceImpl implements IDeviceProService { //删除人员所拥有的设备信息 List cacheList = RedisUtils.getCacheList(String.format(Constants.PRO_DEVICE, proUserEntity.getUserId())); - List deviceList = cacheList.stream() - .filter(DeviceEntity.class::isInstance) - .map(DeviceEntity.class::cast) + List deviceList = cacheList.stream() + .filter(Map.class::isInstance) + .map(Map.class::cast) .toList(); //过滤除了这个删除的项目组之外的设备 - deviceList = deviceList.stream().filter(p-> !p.getProId().equals(proId)).toList(); + deviceList = deviceList.stream().filter(p-> !Integer.valueOf(p.get("proId") + "").equals(proId)).toList(); //删除 RedisUtils.deleteObject(String.format(Constants.PRO_DEVICE, proUserEntity.getUserId())); - RedisUtils.setCacheList(String.format(String.format(Constants.PRO_DEVICE, proUserEntity.getUserId())),deviceList); + RedisUtils.setCacheList(String.format(Constants.PRO_DEVICE, proUserEntity.getUserId()),deviceList); }); + //--------------------------------------------缓存相关操作---------------------------------------------------------------- + //先清除原来的项目组成员 deviceProUserMapper.delete(new LambdaQueryWrapper().eq(DeviceProUserEntity::getDeviceProId, proId)); @@ -186,13 +190,14 @@ public class DeviceProServiceImpl implements IDeviceProService { //更新缓存记录 userEntity.forEach(proUserEntity -> { List projects = RedisUtils.getCacheList(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())); - List projectList = projects.stream() - .filter(DeviceProEntity.class::isInstance) - .map(DeviceProEntity.class::cast) + List projectList = projects.stream() + .filter(Map.class::isInstance) + .map(Map.class::cast) .toList(); - if (!projectList.stream().anyMatch(p-> p.getId().equals(proUserEntity.getDeviceProId()))){ - RedisUtils.addCacheList(String.format(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())), deviceProEntity); + if (!projectList.stream().anyMatch(p-> Integer.valueOf(p.get("id") + "").equals(proUserEntity.getDeviceProId()))){ + Map proMap = objectMapper.convertValue(deviceProEntity, Map.class); + RedisUtils.addCacheList(String.format(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())), proMap); } }); } @@ -230,13 +235,15 @@ public class DeviceProServiceImpl implements IDeviceProService { List proUserEntityList = deviceProUserMapper.selectList(new LambdaQueryWrapper().eq(DeviceProUserEntity::getDeviceProId, proId)); proUserEntityList.forEach(deviceProUserEntity -> { List devices = RedisUtils.getCacheList(String.format(Constants.PRO_DEVICE, deviceProUserEntity.getUserId())); - List deviceList = devices.stream() - .filter(DeviceEntity.class::isInstance) - .map(DeviceEntity.class::cast) + List deviceList = devices.stream() + .filter(Map.class::isInstance) + .map(Map.class::cast) .toList(); - if (!deviceList.stream().anyMatch(p-> p.getId().equals(deviceEntity.getId()))){ - RedisUtils.addCacheList(String.format(String.format(Constants.PRO_DEVICE, deviceProUserEntity.getUserId())), deviceEntity); + if (!deviceList.stream().anyMatch(p-> Integer.valueOf(p.get("id") + "").equals(deviceEntity.getId()))){ + Map deviceMap = objectMapper.convertValue(deviceEntity, Map.class); + + RedisUtils.addCacheList(String.format(String.format(Constants.PRO_DEVICE, deviceProUserEntity.getUserId())), deviceMap); } }); } From 7370ef502d76b8dd93145a3a4b6d6b9b91d6412d Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 24 Apr 2025 16:22:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E5=AD=98=E5=82=A8redis?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceProServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java index 5cc1736..0b92c81 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java @@ -243,7 +243,7 @@ public class DeviceProServiceImpl implements IDeviceProService { if (!deviceList.stream().anyMatch(p-> Integer.valueOf(p.get("id") + "").equals(deviceEntity.getId()))){ Map deviceMap = objectMapper.convertValue(deviceEntity, Map.class); - RedisUtils.addCacheList(String.format(String.format(Constants.PRO_DEVICE, deviceProUserEntity.getUserId())), deviceMap); + RedisUtils.addCacheList(String.format(Constants.PRO_DEVICE, deviceProUserEntity.getUserId()), deviceMap); } }); } From 4e824465054a8b455529811aa097f09cc8e78ece Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Thu, 24 Apr 2025 16:25:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E6=9D=83=E9=99=90=E5=AD=98=E5=82=A8redis?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E2=91=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sample/manage/service/impl/DeviceProServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java index 0b92c81..b58bc1e 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceProServiceImpl.java @@ -197,7 +197,7 @@ public class DeviceProServiceImpl implements IDeviceProService { if (!projectList.stream().anyMatch(p-> Integer.valueOf(p.get("id") + "").equals(proUserEntity.getDeviceProId()))){ Map proMap = objectMapper.convertValue(deviceProEntity, Map.class); - RedisUtils.addCacheList(String.format(String.format(Constants.PRO_GROUP, proUserEntity.getUserId())), proMap); + RedisUtils.addCacheList(String.format(Constants.PRO_GROUP, proUserEntity.getUserId()), proMap); } }); } From 891a63496b122a1531aa201e7d3f723317b46f5c Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 25 Apr 2025 10:07:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4:=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E6=AF=94=E5=AF=B9=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wayline/model/dto/AiCompareDTO.java | 2 +- .../service/impl/AiCompareServiceImpl.java | 7 ++++-- .../main/resources/mapper/AiCompareMapper.xml | 24 ++++++++++--------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java index a45a158..45b5d3f 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/model/dto/AiCompareDTO.java @@ -95,7 +95,7 @@ public class AiCompareDTO implements Serializable { * 创建者 */ - private Long createId; + private Long createBy; /** *用户昵称 * */ diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 17879c1..476f7dc 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java @@ -83,7 +83,7 @@ public class AiCompareServiceImpl implements IAiCompareService { QueryWrapper wrapper = Wrappers.query(); wrapper .eq(StringUtils.isNotEmpty(bo.getStatus()), "status",bo.getStatus()) - .eq(ObjectUtil.isNotEmpty(bo.getCreateId()), "create_by",bo.getCreateId()) + .eq(ObjectUtil.isNotEmpty(bo.getCreateBy()), "create_id",bo.getCreateBy()) .like(StringUtils.isNotBlank(bo.getDeptName()), "lower(dept_name)", StringUtils.lowerCase(bo.getDeptName())) .like(StringUtils.isNotBlank(bo.getJobName()), "lower(job_name)", StringUtils.lowerCase(bo.getJobName())) .between(params.get("beginTime") != null && params.get("endTime") != null, @@ -156,7 +156,10 @@ public class AiCompareServiceImpl implements IAiCompareService { if(isIllegal){ QueryWrapper queryWrapper = new QueryWrapper().eq("file_id", e.getFileId()); AiComparePlateEntity plateEntity = aiComparePlateMapper.selectOne(queryWrapper); - e.setPatternUrl(fileService.getObjectUrlOne(MinIOConstants.BUCKET_ALERT,plateEntity.getPatternName(),seconds).toString()); + if(plateEntity != null){ + e.setPatternUrl(fileService.getObjectUrlOne(MinIOConstants.BUCKET_ALERT,plateEntity.getPatternName(),seconds).toString()); + } + } }); } diff --git a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml index 84c237e..3bd86ee 100644 --- a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml +++ b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml @@ -10,28 +10,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"