From a236d0df6640dbccb7d8b8f367944b393abed2d4 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 14:44:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java | 46 +++++++++++++++++++++++-----------------------
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java | 1 +
drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml | 4 ++--
3 files changed, 26 insertions(+), 25 deletions(-)
diff --git a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java
index e08c00a..00970a7 100644
--- a/drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java
+++ b/drone-ops/drone-resource/src/main/java/org/sxkj/resource/controller/AttachController.java
@@ -132,17 +132,17 @@
/**
* 分页 附件表
*/
- // @GetMapping("/list")
- // @ApiOperationSupport(order = 2)
- // @ApiOperation(value = "附件分页", notes = "传入attach")
- // public R<IPage<Attach>> list(Attach attach, Query query) {
- // List<String> wayLineJobIds = attach.getWayLineJobIds();
- // QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach);
- // QueryWrapper<Attach> queryWrapper = queryWrapper1.in(!CollectionUtils.isEmpty(wayLineJobIds), "wayline_job_id", wayLineJobIds);
- // queryWrapper.eq("is_deleted", 0);
- // IPage<Attach> pages = attachService.page(Condition.getPage(query), queryWrapper);
- // return R.data(pages);
- // }
+ @GetMapping("/list")
+ @ApiOperationSupport(order = 2)
+ @ApiOperation(value = "附件分页", notes = "传入attach")
+ public R<IPage<Attach>> list(Attach attach, Query query) {
+ List<String> wayLineJobIds = attach.getWayLineJobIds();
+ QueryWrapper<Attach> queryWrapper1 = Condition.getQueryWrapper(attach);
+ QueryWrapper<Attach> queryWrapper = queryWrapper1.in(!CollectionUtils.isEmpty(wayLineJobIds), "wayline_job_id", wayLineJobIds);
+ queryWrapper.eq("is_deleted", 0);
+ IPage<Attach> pages = attachService.page(Condition.getPage(query), queryWrapper);
+ return R.data(pages);
+ }
/**
* 自定义分页 附件表
@@ -189,22 +189,22 @@
/**
* 新增 附件表
*/
- // @PostMapping("/save")
- // @ApiOperationSupport(order = 4)
- // @ApiOperation(value = "新增", notes = "传入attach")
- // public R save(@Valid @RequestBody Attach attach) {
- // return R.status(attachService.save(attach));
- // }
+ @PostMapping("/save")
+ @ApiOperationSupport(order = 4)
+ @ApiOperation(value = "新增", notes = "传入attach")
+ public R save(@Valid @RequestBody Attach attach) {
+ return R.status(attachService.save(attach));
+ }
/**
* 修改 附件表
*/
- // @PostMapping("/update")
- // @ApiOperationSupport(order = 5)
- // @ApiOperation(value = "修改", notes = "传入attach")
- // public R update(@Valid @RequestBody Attach attach) {
- // return R.status(attachService.updateById(attach));
- // }
+ @PostMapping("/update")
+ @ApiOperationSupport(order = 5)
+ @ApiOperation(value = "修改", notes = "传入attach")
+ public R update(@Valid @RequestBody Attach attach) {
+ return R.status(attachService.updateById(attach));
+ }
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
index 29d4f87..28f2452 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/vo/FwAreaDivideVO.java
@@ -91,6 +91,7 @@
* 关联派出所id
*/
@ApiModelProperty(value = "关联派出所id")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long policeStationId;
/**
* 关联设备ID，逗号分隔
diff --git a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
index 802c09c..61abb07 100644
--- a/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
+++ b/drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/mapper/GdClueEventMapper.xml
@@ -98,7 +98,7 @@
from ja_gd_clue_event ce
left join ja_gd_task_result tr on tr.id = ce.result_id and tr.is_deleted = 0
<include refid="gdClueEventDeptWhere"/>
- and ce.event_status = 1
+ and ce.event_status in (1, 3)
<if test="onlyMine != null and onlyMine == 1">
and ce.dispose_user = #{userId}
</if>
@@ -130,7 +130,7 @@
ifnull(sum(case when ce.dispose_user = #{userId} then 1 else 0 end), 0) as my_count
from ja_gd_clue_event ce
<include refid="gdClueEventDeptWhere"/>
- and ce.event_status = 1
+ and ce.event_status in (1, 3)
</select>
--
Gitblit v1.9.3