From e52025e9cf0d6d7c22146758a2a4f2dd3fe0cc9d Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Fri, 25 Apr 2025 11:40:23 +0800 Subject: [PATCH 01/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E6=80=BB=E6=9E=B6=E6=AC=A1=E6=80=BB=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=97=B6=E9=95=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/feign/FeignDeviceGroup.java | 5 + .../BusinessAlertStatisticsServiceImpl.java | 93 ++++++++++--------- .../DeviceFlightRecordsController.java | 28 ++++++ .../mapper/DeviceFlightRecordsMapper.java | 7 ++ .../entity/DeviceFlightRecordsEntity.java | 46 +++++++++ .../service/IDeviceFlightRecordsService.java | 15 +++ .../impl/DeviceFlightRecordsServiceImpl.java | 59 ++++++++++++ .../mapper/DeviceFlightRecordsMapper.xml | 8 ++ 8 files changed, 215 insertions(+), 46 deletions(-) create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFlightRecordsController.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/DeviceFlightRecordsMapper.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java create mode 100644 dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java create mode 100644 dk-modules/sample/src/main/resources/mapper/DeviceFlightRecordsMapper.xml diff --git a/dk-modules/business/src/main/java/org/dromara/business/feign/FeignDeviceGroup.java b/dk-modules/business/src/main/java/org/dromara/business/feign/FeignDeviceGroup.java index 4a36405..21924a8 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/feign/FeignDeviceGroup.java +++ b/dk-modules/business/src/main/java/org/dromara/business/feign/FeignDeviceGroup.java @@ -6,6 +6,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import java.util.List; +import java.util.Map; @FeignClient(name = "gateway",path = "sample") public interface FeignDeviceGroup { @@ -17,4 +18,8 @@ public interface FeignDeviceGroup { @GetMapping("/manage/api/v1/device/group/feign/device") public List listDevice(@RequestParam("userId") Long userId); + + + @GetMapping("/device/flight/count") + public Map getDevices(); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java index 6ed5233..d4276b3 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertStatisticsServiceImpl.java @@ -186,57 +186,58 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist //----------------------------------------------获取飞行总架次、总时长---------------------------------------------- //获取飞行总架次、总时长 //获取机场信息根据当前登录人 - List deviceSnList = ObjectUtil.isNotEmpty(feignDeviceGroup.listDevice(LoginHelper.getUserId()))?feignDeviceGroup.listDevice(LoginHelper.getUserId()):ListUtil.empty(); +// List deviceSnList = ObjectUtil.isNotEmpty(feignDeviceGroup.listDevice(LoginHelper.getUserId()))?feignDeviceGroup.listDevice(LoginHelper.getUserId()):ListUtil.empty(); //过滤redis中用户所拥有的设备 - Map countMap = Optional.ofNullable(RedisUtils.getCacheMap(FLY_COUNT)) - .map(map -> map.entrySet().stream() - .filter(entry -> deviceSnList.contains(entry.getKey())) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))) - .orElse(new HashMap<>()); - - int flyCount; - - if (ObjectUtil.isNotEmpty(countMap)){ - flyCount = countMap.values().stream() - .filter(Objects::nonNull) - .mapToInt(value -> { - if (value instanceof Number) { - return ((Number) value).intValue(); - } - return 0; - }) - .sum(); - } else { - flyCount = 0; - } +// Map countMap = Optional.ofNullable(RedisUtils.getCacheMap(FLY_COUNT)) +// .map(map -> map.entrySet().stream() +// .filter(entry -> deviceSnList.contains(entry.getKey())) +// .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))) +// .orElse(new HashMap<>()); + +// int flyCount; +// +// if (ObjectUtil.isNotEmpty(countMap)){ +// flyCount = countMap.values().stream() +// .filter(Objects::nonNull) +// .mapToInt(value -> { +// if (value instanceof Number) { +// return ((Number) value).intValue(); +// } +// return 0; +// }) +// .sum(); +// } else { +// flyCount = 0; +// } //过滤redis中用户所拥有的设备 - Map accTimeMap = Optional.ofNullable(RedisUtils.getCacheMap(FLY_ACC_TIME)) - .map(map -> map.entrySet().stream() - .filter(entry -> deviceSnList.contains(entry.getKey())) - .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))) - .orElse(new HashMap<>()); - - - double flyAccTime; - - if (ObjectUtil.isNotEmpty(accTimeMap)) { - flyAccTime = accTimeMap.values().stream() - .filter(Objects::nonNull) - .mapToDouble(value -> { - if (value instanceof Number) { - return ((Number) value).doubleValue(); - } - return 0.0; - }) - .sum(); - } else { - flyAccTime = 0.0; - } +// Map accTimeMap = Optional.ofNullable(RedisUtils.getCacheMap(FLY_ACC_TIME)) +// .map(map -> map.entrySet().stream() +// .filter(entry -> deviceSnList.contains(entry.getKey())) +// .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue))) +// .orElse(new HashMap<>()); +// +// +// double flyAccTime; +// +// if (ObjectUtil.isNotEmpty(accTimeMap)) { +// flyAccTime = accTimeMap.values().stream() +// .filter(Objects::nonNull) +// .mapToDouble(value -> { +// if (value instanceof Number) { +// return ((Number) value).doubleValue(); +// } +// return 0.0; +// }) +// .sum(); +// } else { +// flyAccTime = 0.0; +// } //----------------------------------------------获取飞行总架次、总时长---------------------------------------------- + Map devices = feignDeviceGroup.getDevices(); Map panel = baseMapper.countPanelAlert(businessAlertBo); @@ -245,8 +246,8 @@ public class BusinessAlertStatisticsServiceImpl implements IBusinessAlertStatist ObjectUtil.isEmpty(panel.get("total"))?0:panel.get("total"), ObjectUtil.isEmpty(panel.get("finishCount"))?0:panel.get("finishCount"), ObjectUtil.isEmpty(panel.get("cancelCount"))?0:panel.get("cancelCount"), - flyCount, - flyAccTime); + ObjectUtil.isEmpty(devices.get("flyCount"))?0:devices.get("flyCount"), + ObjectUtil.isEmpty(devices.get("flyAccTime"))?0:devices.get("flyAccTime")); } @Override diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFlightRecordsController.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFlightRecordsController.java new file mode 100644 index 0000000..44c721a --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/controller/DeviceFlightRecordsController.java @@ -0,0 +1,28 @@ +package org.dromara.sample.manage.controller; + +import lombok.extern.slf4j.Slf4j; +import org.dromara.sample.manage.service.IDeviceFlightRecordsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +@RestController +@Slf4j +@RequestMapping("/device/flight") +public class DeviceFlightRecordsController { + + @Autowired + private IDeviceFlightRecordsService deviceFlightRecordsService; + + @GetMapping("/count") + public Map getDevices() { + log.info("----------------------------开始调用feign接口查询项目组----------------------------"); + Map deviceFlightCount = deviceFlightRecordsService.getDeviceFlightCount(); + log.info("----------------------------调用feign接口查询项目组结束----------------------------"); + return deviceFlightCount; + } + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/DeviceFlightRecordsMapper.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/DeviceFlightRecordsMapper.java new file mode 100644 index 0000000..5db879e --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/mapper/DeviceFlightRecordsMapper.java @@ -0,0 +1,7 @@ +package org.dromara.sample.manage.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.dromara.sample.manage.model.entity.DeviceFlightRecordsEntity; + +public interface DeviceFlightRecordsMapper extends BaseMapper { +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java new file mode 100644 index 0000000..34d15f8 --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java @@ -0,0 +1,46 @@ +package org.dromara.sample.manage.model.entity; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "device_flight_records") +public class DeviceFlightRecordsEntity { + + + @TableId(type = IdType.AUTO) + private Long id; + + /** + * 机场sn + */ + private String deviceSn; + + /** + * 飞行总架次 + */ + private Integer flyCount; + + /** + * 飞行总时长 + */ + private Integer flyAccTime; + + /** + * 创建时间 + */ + private Date createTime; + + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java new file mode 100644 index 0000000..71012f0 --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/IDeviceFlightRecordsService.java @@ -0,0 +1,15 @@ +package org.dromara.sample.manage.service; + +import org.dromara.sample.manage.model.entity.DeviceFlightRecordsEntity; + +import java.util.List; +import java.util.Map; + +public interface IDeviceFlightRecordsService { + + + void saveDeviceFlight(List deviceFlightRecords); + + Map getDeviceFlightCount(); + +} diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java new file mode 100644 index 0000000..9f08d95 --- /dev/null +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceFlightRecordsServiceImpl.java @@ -0,0 +1,59 @@ +package org.dromara.sample.manage.service.impl; + +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.sample.manage.mapper.DeviceFlightRecordsMapper; +import org.dromara.sample.manage.model.entity.DeviceFlightRecordsEntity; +import org.dromara.sample.manage.service.IDeviceFlightRecordsService; +import org.springframework.stereotype.Service; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + + +@Service +public class DeviceFlightRecordsServiceImpl extends ServiceImpl implements IDeviceFlightRecordsService { + + + @Override + public void saveDeviceFlight(List deviceFlightRecords) { + + deviceFlightRecords.forEach(deviceFlightRecord -> { + //查询之前的数据 + DeviceFlightRecordsEntity deviceFlightRecordsEntities = this.baseMapper.selectOne(new LambdaQueryWrapper().eq(DeviceFlightRecordsEntity::getDeviceSn,deviceFlightRecord.getDeviceSn())); + + if (ObjectUtil.isNotEmpty(deviceFlightRecordsEntities)) { + deviceFlightRecordsEntities.setFlyCount(deviceFlightRecordsEntities.getFlyCount() + deviceFlightRecord.getFlyCount()); + deviceFlightRecordsEntities.setFlyAccTime(deviceFlightRecordsEntities.getFlyAccTime() + deviceFlightRecord.getFlyAccTime()); + + this.updateById(deviceFlightRecordsEntities); + }else { + this.save(deviceFlightRecord); + } + }); + } + + @Override + public Map getDeviceFlightCount() { + Map resultMap = new HashMap<>(); + + List deviceFlightRecordsEntities = this.baseMapper.selectList(new LambdaQueryWrapper<>()); + + int flyCount = deviceFlightRecordsEntities.stream() + .map(DeviceFlightRecordsEntity::getFlyCount) + .reduce(0, Integer::sum); + + + int flyAccTime = deviceFlightRecordsEntities.stream() + .map(DeviceFlightRecordsEntity::getFlyAccTime) + .reduce(0, Integer::sum); + + + resultMap.put("flyCount",flyCount); + resultMap.put("flyAccTime",flyAccTime); + + return resultMap; + } +} diff --git a/dk-modules/sample/src/main/resources/mapper/DeviceFlightRecordsMapper.xml b/dk-modules/sample/src/main/resources/mapper/DeviceFlightRecordsMapper.xml new file mode 100644 index 0000000..0b77503 --- /dev/null +++ b/dk-modules/sample/src/main/resources/mapper/DeviceFlightRecordsMapper.xml @@ -0,0 +1,8 @@ + + + + + + From 06a836da0572757c8a293e6affbed3b40f86c967 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Fri, 25 Apr 2025 11:43:21 +0800 Subject: [PATCH 02/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A3=9E=E8=A1=8C=E6=80=BB=E6=9E=B6=E6=AC=A1=E6=80=BB=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E4=BB=A5=E5=8F=8A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E6=97=B6=E9=95=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/model/entity/DeviceFlightRecordsEntity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java index 34d15f8..7220bf8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/model/entity/DeviceFlightRecordsEntity.java @@ -1,9 +1,7 @@ package org.dromara.sample.manage.model.entity; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.*; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -40,6 +38,7 @@ public class DeviceFlightRecordsEntity { /** * 创建时间 */ + @TableField(fill = FieldFill.INSERT) private Date createTime; From caae858c5ae04ce2abb428b77a2fde9aaa1bbafb Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Fri, 25 Apr 2025 14:12:52 +0800 Subject: [PATCH 03/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BusinessAlertController.java | 9 +++++++++ .../dromara/business/service/IBusinessAlertService.java | 2 ++ .../business/service/impl/BusinessAlertServiceImpl.java | 9 +++++++++ 3 files changed, 20 insertions(+) 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 0611c9a..20c53ab 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 @@ -1,5 +1,6 @@ package org.dromara.business.controller; +import cn.dev33.satoken.annotation.SaCheckPermission; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.RequiredArgsConstructor; @@ -52,6 +53,14 @@ public class BusinessAlertController extends BaseController { return R.ok(businessAlertService.getTodoBusinessAlert(alertId)); } + + @SaCheckPermission("business:alert:delete") + @Operation(summary ="删除预警",description = "删除预警") + @GetMapping("/{alertId}/delete") + public R deleteFalseAlert(@PathVariable("alertId") Long alertId) { + return R.ok(businessAlertService.deleteFalseAlert(alertId)); + } + /** * 查询全部预警/待办/已完成/忽略 */ diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index 994a451..8d8405d 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java @@ -84,4 +84,6 @@ public interface IBusinessAlertService { List listTodoAlert(BusinessAlertBo businessAlertBo); BusinessAlert getTodoBusinessAlert(Long alertId); + + Boolean deleteFalseAlert(Long alertId); } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 85c30be..dc67990 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -380,6 +380,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { //排除状态为验证状态预警 wrapper.ne("t.handle_type", BusinessStatusEnum.VERIFY.getStatus()); + wrapper.eq("t.del_flag", 0); if (ObjectUtil.isNotEmpty(bo.getHandleType())){ wrapper.eq("t.handle_type", bo.getHandleType()); @@ -647,6 +648,14 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return businessAlert; } + @Override + public Boolean deleteFalseAlert(Long alertId) { + LambdaUpdateWrapper wrapper = new LambdaUpdateWrapper<>(); + wrapper.eq(BusinessAlert::getId, alertId); + wrapper.set(BusinessAlert::getDelFlag,1); + return this.baseMapper.update(wrapper) > 0; + } + public static void main(String[] args) { System.out.println(getLastSixDays()); From 07dd54ebfb924c60a73807499669ddb372bb885f Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Fri, 25 Apr 2025 14:20:31 +0800 Subject: [PATCH 04/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/controller/BusinessAlertController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 20c53ab..3a84f9d 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 @@ -56,7 +56,7 @@ public class BusinessAlertController extends BaseController { @SaCheckPermission("business:alert:delete") @Operation(summary ="删除预警",description = "删除预警") - @GetMapping("/{alertId}/delete") + @GetMapping("/alert/{alertId}/delete") public R deleteFalseAlert(@PathVariable("alertId") Long alertId) { return R.ok(businessAlertService.deleteFalseAlert(alertId)); } From 05b13a353c88550da4c569cd6b6d409eda927b71 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 25 Apr 2025 15:14:45 +0800 Subject: [PATCH 05/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=AF=94=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/service/impl/DeviceQrtzServiceImpl.java | 1 + .../sample/media/service/impl/MediaServiceImpl.java | 2 +- .../wayline/controller/AiCompareController.java | 11 ++++++++++- .../sample/wayline/service/IAiCompareService.java | 1 + .../wayline/service/impl/AiCompareServiceImpl.java | 8 ++++++++ 5 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java index 62a8036..bb817ed 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/manage/service/impl/DeviceQrtzServiceImpl.java @@ -327,6 +327,7 @@ public class DeviceQrtzServiceImpl implements IDeviceQrtzService { HttpResultResponse httpResultResponse = flightTaskService.publishFlightTask(device.getWorkspaceId(), createJobParam, deviceQrtzFileEntity.getNickName()); if(httpResultResponse.getCode() == 0){ deviceQrtzFileEntity.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_2); + deviceQrtzFileEntity.setFlightDate(new Date()); deviceQrtzFileMapper.updateById(deviceQrtzFileEntity); continue; } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java index 8158778..f6bcd97 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/media/service/impl/MediaServiceImpl.java @@ -122,7 +122,7 @@ public class MediaServiceImpl extends AbstractMediaService implements IMediaServ && request.getTid().equals(mediaFileCount.getTid()))) { if(CollectionUtils.isEmpty(deviceQrtzFileEntities)){ deviceQrtzFileEntities.stream().forEach(item->{ - item.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_2); + item.setStatus(DeviceQrtzConstants.QRTZ_FILE_STATUS_3); }); deviceQrtzFileMapper.updateById(deviceQrtzFileEntities,100); } diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java index 4a8b119..84575e4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java @@ -136,7 +136,16 @@ public class AiCompareController extends BaseController { public R edit(@Validated(EditGroup.class) @RequestBody Map bo) { return toAjax(aiCompareService.update(bo)); } - + /** + * 状态更改 + */ + @SaCheckPermission("sample:compare:add") + @Log(title = "状态更改", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @GetMapping("/updateStatus") + public R updateStatus(Long id,String status) { + return toAjax(aiCompareService.updateStatus(id,status)); + } /** * 画框 diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java index b650bcd..5da35a9 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java @@ -23,6 +23,7 @@ public interface IAiCompareService { Boolean update(Map compareDTO); + Boolean updateStatus(Long id,String status); AiCompareEntity getInfo(Long id); List queryById(Long id); 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 476f7dc..78863fa 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 @@ -185,6 +185,14 @@ public class AiCompareServiceImpl implements IAiCompareService { return i>0; } + @Override + public Boolean updateStatus(Long id, String status) { + AiCompareEntity aiCompareEntity =new AiCompareEntity(); + aiCompareEntity.setId(id); + aiCompareEntity.setStatus(status); + return aiCompareMapper.updateById(aiCompareEntity)>0; + } + @Override public AiCompareEntity getInfo(Long id) { return aiCompareMapper.selectById(id); From def0122c5f18c7cf09865aa03097fecda6466593 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 25 Apr 2025 16:05:34 +0800 Subject: [PATCH 06/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E6=AF=94=E5=AF=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wayline/controller/AiCompareController.java | 4 ++-- .../sample/wayline/service/IAiCompareService.java | 2 +- .../wayline/service/impl/AiCompareServiceImpl.java | 13 ++++++++----- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java index 84575e4..0e4b2b4 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/controller/AiCompareController.java @@ -143,8 +143,8 @@ public class AiCompareController extends BaseController { @Log(title = "状态更改", businessType = BusinessType.UPDATE) @RepeatSubmit() @GetMapping("/updateStatus") - public R updateStatus(Long id,String status) { - return toAjax(aiCompareService.updateStatus(id,status)); + public R updateStatus(Long id) { + return toAjax(aiCompareService.updateStatus(id)); } /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java index 5da35a9..dae7a03 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java +++ b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/IAiCompareService.java @@ -23,7 +23,7 @@ public interface IAiCompareService { Boolean update(Map compareDTO); - Boolean updateStatus(Long id,String status); + Boolean updateStatus(Long id); AiCompareEntity getInfo(Long id); List queryById(Long id); 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 78863fa..5285f52 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 @@ -186,11 +186,14 @@ public class AiCompareServiceImpl implements IAiCompareService { } @Override - public Boolean updateStatus(Long id, String status) { - AiCompareEntity aiCompareEntity =new AiCompareEntity(); - aiCompareEntity.setId(id); - aiCompareEntity.setStatus(status); - return aiCompareMapper.updateById(aiCompareEntity)>0; + public Boolean updateStatus(Long id) { + AiCompareEntity aiCompareEntity = aiCompareMapper.selectById(id); + Boolean falg=false; + if(aiCompareEntity!=null&& ObjectUtil.equals(aiCompareEntity.getStatus(),AiCompareStatusConstants.COMPARE_STATUS_2)){ + aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_4); + falg= aiCompareMapper.updateById(aiCompareEntity)>0; + } + return falg; } @Override From f9eb07ce5e83b3cf35ac4ad2654b59f1188c71fc Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Fri, 25 Apr 2025 16:32:23 +0800 Subject: [PATCH 07/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/controller/BusinessAlertController.java | 3 +++ 1 file changed, 3 insertions(+) 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 3a84f9d..db13d60 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 @@ -10,6 +10,8 @@ import org.dromara.business.domain.bo.BusinessAlertBo; import org.dromara.business.domain.vo.BusinessAlertVo; import org.dromara.business.service.IBusinessAlertService; import org.dromara.common.core.domain.R; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; @@ -55,6 +57,7 @@ public class BusinessAlertController extends BaseController { @SaCheckPermission("business:alert:delete") + @Log(title = "删除预警", businessType = BusinessType.DELETE) @Operation(summary ="删除预警",description = "删除预警") @GetMapping("/alert/{alertId}/delete") public R deleteFalseAlert(@PathVariable("alertId") Long alertId) { From a5b383a28579d1e9bf0ffd3e4da5f6043b9252b6 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Fri, 25 Apr 2025 16:58:26 +0800 Subject: [PATCH 08/29] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml index 3bd86ee..bebdf53 100644 --- a/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml +++ b/dk-modules/sample/src/main/resources/mapper/AiCompareMapper.xml @@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + From c9f0286fd80c6b4b1a6537710b4a43f420286d44 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 28 Apr 2025 16:01:52 +0800 Subject: [PATCH 16/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/controller/BusinessAlertController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 398e0f0..229dba3 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 @@ -57,10 +57,10 @@ public class BusinessAlertController extends BaseController { @Operation(summary ="根据经纬度获取历史预警",description = "根据经纬度获取历史预警") - @GetMapping("/listHandleHistory") + @GetMapping("/alert/listHandleHistory") public R> listHandleHistory( - @RequestParam("lng") String lng, - @RequestParam("lat") String lat, + @RequestParam(value = "lng",required = false) String lng, + @RequestParam(value ="lat",required = false) String lat, @RequestParam("createTime") String createTime) { return R.ok(businessAlertService.listHandleHistory(lng,lat,createTime)); } From 5224a43389e0f6f9cea37ba9063ba7406155f367 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Mon, 28 Apr 2025 16:34:24 +0800 Subject: [PATCH 17/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=AF=94=E5=AF=B9=E5=8E=86=E5=8F=B2=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E3=80=81=E6=A0=B9=E6=8D=AE=E7=BB=8F=E7=BA=AC=E5=BA=A6?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E9=87=8D=E5=A4=8D=E9=A2=84=E8=AD=A6=E4=B8=AA?= =?UTF-8?q?=E6=95=B0=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/BusinessAlertMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index f9469b3..228cbca 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -835,7 +835,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + + 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 6b6f271..3a04257 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 @@ -189,12 +189,11 @@ public class AiCompareServiceImpl implements IAiCompareService { @Override public Boolean updateStatus(Long id) { AiCompareEntity aiCompareEntity = aiCompareMapper.selectById(id); - Boolean falg=false; if(aiCompareEntity!=null&& ObjectUtil.equals(aiCompareEntity.getStatus(),AiCompareStatusConstants.COMPARE_STATUS_2)){ aiCompareEntity.setStatus(AiCompareStatusConstants.COMPARE_STATUS_4); - falg= aiCompareMapper.updateById(aiCompareEntity)>0; + return aiCompareMapper.updateById(aiCompareEntity)>0; } - return falg; + return true; } @Override From 3fca31c79f75978bba932b55dbfc18bfe67b832c Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 13:57:27 +0800 Subject: [PATCH 26/29] =?UTF-8?q?[feat]=201=E3=80=81=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2=E6=9C=AA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9A=84=E9=A2=84=E8=AD=A6=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/business/BusinessAlertMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index 91df2c6..c3bb93a 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and ba.handle_type != 'verify' + and ba.del_flag = '0' and ba.label_en in From 987006d305dd63661591a8ed0d298c56ef991715 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 15:26:42 +0800 Subject: [PATCH 27/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3=E2=91=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/mapper/BusinessAlertMapper.java | 10 ++++- .../service/IBusinessAlertService.java | 4 +- .../impl/BusinessAlertServiceImpl.java | 37 +++++++++++++++++-- .../mapper/business/BusinessAlertMapper.xml | 9 ++++- .../controller/system/SysRoleController.java | 16 ++++++++ .../dromara/system/mapper/SysRoleMapper.java | 5 +++ .../system/service/ISysRoleService.java | 4 ++ .../service/impl/SysRoleServiceImpl.java | 10 +++-- .../resources/mapper/system/SysRoleMapper.xml | 21 +++++++++++ 9 files changed, 106 insertions(+), 10 deletions(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 255c006..53d0a00 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -29,7 +29,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus pageAlertFinish(@Param("page") Page page,@Param("ew") QueryWrapper ew); + Page pageBusinessAlertHandle(@Param("page") Page page,@Param("ew") QueryWrapper ew); /** * 处理中 @@ -47,6 +47,13 @@ public interface BusinessAlertMapper extends BaseMapperPlus pageBusinessAlertCancel(@Param("page") Page page,@Param("ew") QueryWrapper ew); + + @DataPermission( + @DataColumn(key = "deptName", value = "t.dept_id") + ) + Page pageBusinessAlertFinish(Page build, QueryWrapper wrapper); + + @DataPermission( @DataColumn(key = "deptName", value = "t.dept_id") ) @@ -107,4 +114,5 @@ public interface BusinessAlertMapper extends BaseMapperPlus> listOneDepartAlert(@Param("param") BusinessAlertBo businessAlertBo); List> listOneDepartAlertStatus(@Param("param") BusinessAlertBo businessAlertBo); + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index c3d8589..becd098 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java @@ -22,11 +22,13 @@ public interface IBusinessAlertService { TableDataInfo pageBusinessAlertTodo(BusinessAlertBo bo, PageQuery pageQuery); - TableDataInfo pageBusinessAlertFinish(BusinessAlertBo bo, PageQuery pageQuery); + TableDataInfo pageBusinessAlertHandle(BusinessAlertBo bo, PageQuery pageQuery); TableDataInfo pageBusinessAlertAll(BusinessAlertBo bo, PageQuery pageQuery); TableDataInfo pageBusinessAlertCancel(BusinessAlertBo bo, PageQuery pageQuery); + + TableDataInfo pageBusinessAlertFinish(BusinessAlertBo bo, PageQuery pageQuery); /** * 新增预警任务 * diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 8b228df..0e316c6 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -284,11 +284,10 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return new TableDataInfo<>(); } - wrapper.notIn("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus()); + wrapper.eq("t.handle_type",BusinessStatusEnum.FINISH.getStatus()); - wrapper.apply(" EXISTS(select * from dk_workflow.flow_his_task ht where ht.approver ='" + LoginHelper.getUserId() + "' and ht.instance_id = t.instanceId)"); - Page page = this.baseMapper.pageAlertFinish(pageQuery.build(), wrapper); + Page page = this.baseMapper.pageBusinessAlertFinish(pageQuery.build(), wrapper); try { page.getRecords().forEach(businessAlertVo->{ @@ -360,6 +359,38 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { return TableDataInfo.build(page); } + @Override + public TableDataInfo pageBusinessAlertHandle(BusinessAlertBo bo, PageQuery pageQuery) { + QueryWrapper wrapper = buildQueryWrapper(bo); + + if (ObjectUtil.isEmpty(wrapper)){ + return new TableDataInfo<>(); + } + + wrapper.notIn("t.flowStatus", BusinessStatusEnum.CANCEL.getStatus()); + + wrapper.apply(" EXISTS(select * from dk_workflow.flow_his_task ht where ht.approver ='" + LoginHelper.getUserId() + "' and ht.instance_id = t.instanceId)"); + + Page page = this.baseMapper.pageBusinessAlertHandle(pageQuery.build(), wrapper); + + try { + page.getRecords().forEach(businessAlertVo->{ + if (businessAlertVo.getBusinessType() == 2){ + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600).toString()); + }else { + businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getImages(), 3600).toString()); + businessAlertVo.setMaxImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxImages(), 3600).toString()); + businessAlertVo.setMaxMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMaxMateSourceImgUrl(), 3600).toString()); + businessAlertVo.setMateSourceImgUrl(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_ALERT, businessAlertVo.getMateSourceImgUrl(), 3600).toString()); + } + }); + } catch (Exception e) { + log.error(e.getMessage(),e); + } + + return TableDataInfo.build(page); + } + /** * 构建wrapper diff --git a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml index c3bb93a..e28d333 100644 --- a/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml +++ b/dk-modules/business/src/main/resources/mapper/business/BusinessAlertMapper.xml @@ -31,6 +31,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${ew.getCustomSqlSegment} + + - select t.* from ( select ba.*, diff --git a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index f3db430..dedb36f 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/dk-modules/system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -1,6 +1,7 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.web.core.BaseController; @@ -9,6 +10,8 @@ import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysRoleBo; @@ -226,5 +229,18 @@ public class SysRoleController extends BaseController { selectVo.setDepts(deptService.selectDeptTreeList(new SysDeptBo())); return R.ok(selectVo); } + + /** + * 获取对应角色部门树列表 + * + */ + @GetMapping(value = "/user/list") + public R> listRoleUser() { + String roleName = "dispose"; + + List userList = roleService.getUserIno(roleName); + + return R.ok(userList); + } } diff --git a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java index ac5a47e..76dc28b 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java +++ b/dk-modules/system/src/main/java/org/dromara/system/mapper/SysRoleMapper.java @@ -8,6 +8,7 @@ import org.dromara.common.mybatis.annotation.DataColumn; import org.dromara.common.mybatis.annotation.DataPermission; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysUser; import org.dromara.system.domain.vo.SysRoleVo; import java.util.List; @@ -59,4 +60,8 @@ public interface SysRoleMapper extends BaseMapperPlus { */ List selectRolesByUserId(Long userId); + @DataPermission({ + @DataColumn(key = "deptName", value = "su.dept_id"), + }) + List getUserIno(@Param("roleName") String roleName); } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/ISysRoleService.java b/dk-modules/system/src/main/java/org/dromara/system/service/ISysRoleService.java index 64740ae..bef91ab 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -2,6 +2,8 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.system.domain.SysRole; +import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; @@ -197,4 +199,6 @@ public interface ISysRoleService { void cleanOnlineUserByRole(Long roleId); + List getUserIno(String roleName); + } diff --git a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index 2751c9b..09db755 100644 --- a/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/dk-modules/system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -22,10 +22,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.api.model.LoginUser; -import org.dromara.system.domain.SysRole; -import org.dromara.system.domain.SysRoleDept; -import org.dromara.system.domain.SysRoleMenu; -import org.dromara.system.domain.SysUserRole; +import org.dromara.system.domain.*; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; import org.dromara.system.mapper.SysRoleDeptMapper; @@ -511,4 +508,9 @@ public class SysRoleServiceImpl implements ISysRoleService { } }); } + + @Override + public List getUserIno(String roleName) { + return this.baseMapper.getUserIno(roleName); + } } diff --git a/dk-modules/system/src/main/resources/mapper/system/SysRoleMapper.xml b/dk-modules/system/src/main/resources/mapper/system/SysRoleMapper.xml index 4ef7b1e..d2d37d1 100644 --- a/dk-modules/system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/dk-modules/system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -56,4 +56,25 @@ WHERE r.del_flag = '0' and r.role_id = #{roleId} + + From 98ee5beb6135f6926106442463f6d1b291290116 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 15:48:20 +0800 Subject: [PATCH 28/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/dromara/business/mapper/BusinessAlertMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java index 53d0a00..74dbd6d 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java +++ b/dk-modules/business/src/main/java/org/dromara/business/mapper/BusinessAlertMapper.java @@ -51,7 +51,7 @@ public interface BusinessAlertMapper extends BaseMapperPlus pageBusinessAlertFinish(Page build, QueryWrapper wrapper); + Page pageBusinessAlertFinish(@Param("page") Page page, @Param("ew") QueryWrapper wrapper); @DataPermission( From 0bab96fa64a6d5655abf87e9aa71c3085b0f4a32 Mon Sep 17 00:00:00 2001 From: yangwei <867012372@qq.com> Date: Tue, 29 Apr 2025 19:16:31 +0800 Subject: [PATCH 29/29] =?UTF-8?q?[feat]=201=E3=80=81=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E5=B7=B2=E5=AE=8C=E7=BB=93=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=81=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=A4=84=E7=BD=AE=E4=BA=BA=E5=91=98=E6=8E=A5=E5=8F=A3=E2=91=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/service/impl/BusinessAlertServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 0e316c6..cf80f93 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java @@ -375,6 +375,7 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService { try { page.getRecords().forEach(businessAlertVo->{ + businessAlertVo.setHandleType(null); if (businessAlertVo.getBusinessType() == 2){ businessAlertVo.setImages(MinioUntil.getObjectUrlOne(MinIOConstants.BUCKET_DKCY, businessAlertVo.getImages(), 3600).toString()); }else {