revert(watch): 还原listByWatch绑定过滤改动，恢复仅排序逻辑

Co-Authored-By: Claude <noreply@anthropic.com>

db/updatesql/20260626-急救宣教.sql

@@ -1,4 +1,4 @@
--- =====================================================
+-- =====================================================
 -- 急救宣教资源管理 — 线上部署 SQL（达梦 DM8）
 -- 包含：分类/标签、资源、用户行为、版本历史、审核记录、推送记录
 -- 日期: 2026-06-25

db/updatesql/20260810-缩短急救宣教表名.sql

@@ -5,22 +5,22 @@
 -- =====================================================
 
 -- 1. 急救资源分类表
-RENAME QH_EME_FIRST_AID_RESOURCE_CATEGORY TO QH_EME_FIR_AID_RES_CATE;
+ALTER TABLE QH_EME_FIRST_AID_RESOURCE_CATEGORY RENAME TO QH_EME_FIR_AID_RES_CATE;
 
 -- 2. 用户操作记录表
-RENAME QH_EME_FIRST_AID_RESOURCE_USER_ACTION TO QH_EME_FIR_AID_RES_UACT;
+ALTER TABLE QH_EME_FIRST_AID_RESOURCE_USER_ACTION RENAME TO QH_EME_FIR_AID_RES_UACT;
 
 -- 3. 资源版本表
-RENAME QH_EME_FIRST_AID_RESOURCE_VERSION TO QH_EME_FIR_AID_RES_VER;
+ALTER TABLE QH_EME_FIRST_AID_RESOURCE_VERSION RENAME TO QH_EME_FIR_AID_RES_VER;
 
 -- 4. 资源审核表
-RENAME QH_EME_FIRST_AID_RESOURCE_AUDIT TO QH_EME_FIR_AID_RES_AUD;
+ALTER TABLE QH_EME_FIRST_AID_RESOURCE_AUDIT RENAME TO QH_EME_FIR_AID_RES_AUD;
 
 -- 5. 推送记录表
-RENAME QH_EME_FIRST_AID_PUSH_RECORD TO QH_EME_FIR_AID_PUSH_RD;
+ALTER TABLE QH_EME_FIRST_AID_PUSH_RECORD RENAME TO QH_EME_FIR_AID_PUSH_RD;
 
 -- 6. 急救资源主表（最后执行，避免外键依赖）
-RENAME QH_EME_FIRST_AID_RESOURCE TO QH_EME_FIR_AID_RES;
+ALTER TABLE QH_EME_FIRST_AID_RESOURCE RENAME TO QH_EME_FIR_AID_RES;
 
 -- =====================================================
 -- 验证：确认新表名已生效

db/updatesql/20260903-watch_monitor_data新增字段.sql

@@ -0,0 +1,10 @@
+-- QH_WAT_MONITOR_DATA 新增 EVENT_ID（事件ID）和 LOCATE_TIME（定位时间）字段
+-- 数据库：118-DM 达梦数据库，SQL 全大写规范
+ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "EVENT_ID" VARCHAR(64) DEFAULT NULL;
+ALTER TABLE "QH_WAT_MONITOR_DATA" ADD "LOCATE_TIME" DATETIME DEFAULT NULL;
+
+COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."EVENT_ID" IS '事件ID';
+COMMENT ON COLUMN "QH_WAT_MONITOR_DATA"."LOCATE_TIME" IS '定位时间';
+
+CREATE INDEX "IDX_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("EVENT_ID");
+CREATE INDEX "IDX_WATCH_NO_EVENT_ID" ON "QH_WAT_MONITOR_DATA"("WATCH_NO", "EVENT_ID");

health-emergency/API文档-急救宣教资源管理v3.md

@@ -1,4 +1,4 @@
-# 急救宣教资源管理 API 文档 v3
+# 急救宣教资源管理 API 文档 v3
 
 > **基础信息**  
 > 网关地址: `http://{gateway-host}:{port}`（前端加 `/health-emergency` 前缀）  

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidPushRecord.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResource.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import java.io.Serializable;
 import java.util.List;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResourceAudit.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResourceCategory.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import java.io.Serializable;
 import java.util.List;

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResourceUserAction.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import java.io.Serializable;
 

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/FirstAidResourceVersion.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.entity;
+package com.renkang.emergency.entity;
 
 import java.io.Serializable;
 

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/FirstAidResourceCategoryMapper.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.mapper;
+package com.renkang.emergency.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.renkang.emergency.entity.FirstAidResourceCategory;

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/FirstAidResourceMapper.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.mapper;
+package com.renkang.emergency.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.renkang.emergency.entity.FirstAidResource;

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/FirstAidResourceUserActionMapper.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.mapper;
+package com.renkang.emergency.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/mapper/FirstAidResourceVersionMapper.java

@@ -1,4 +1,4 @@
-package com.renkang.emergency.mapper;
+package com.renkang.emergency.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.renkang.emergency.entity.FirstAidResourceVersion;

health-emergency/health-emergency-start/src/main/resources/sql/first_aid_education_resource.sql

@@ -1,4 +1,4 @@
--- =====================================================
+-- =====================================================
 -- 急救宣教资源管理功能 DDL（达梦数据库）
 -- 表名前缀: QH_EME_ (应急模块)
 -- =====================================================

health-emergency/health-emergency-start/src/main/resources/sql/first_aid_migrate_status.sql

@@ -1,4 +1,4 @@
--- =====================================================
+-- =====================================================
 -- 急救宣教资源 - 状态字段值域迁移脚本（达梦数据库）
 -- 执行时机：代码变更后，启动前执行
 -- 说明：将 AUDIT_STATUS 值域从 {0,1,2} 迁移到 {10,11,12}

health-emergency/health-emergency-start/src/main/resources/sql/first_aid_migrate_status_rollback.sql

@@ -1,4 +1,4 @@
--- =====================================================
+-- =====================================================
 -- 急救宣教资源 - 状态字段值域回滚脚本（达梦数据库）
 -- 仅当需要回退代码时使用
 -- 将 AUDIT_STATUS 从 {null,10,11,12} 回退到 {0,1,2}

health-emergency/health-emergency-start/src/main/resources/sql/first_aid_seed_data.sql

@@ -1,4 +1,4 @@
--- =====================================================
+-- =====================================================
 -- 急救宣教资源 - 种子数据（达梦数据库）
 -- 包含：分类（扁平一层）、标签（归属分类下）、资源内容
 -- 执行方式：在达梦客户端中直接执行本脚本

health-watch/health-watch-api/src/main/java/com/renkang/watch/bean/response/AbnormalEvent.java

@@ -52,4 +52,18 @@ public class AbnormalEvent extends BaseUser {
     private Date bindDate;
     @Schema(title = "重点指标用户(0:非重点指标用户 1:大病异常 2:慢病异常 3:指标异常)")
     private List<WatchKeyUser> keyUserList;
+    /**
+     * 事件ID（用于告警事件与GPS位置更新关联的唯一标识）
+     */
+    @Excel(name = "事件ID", width = 32, orderNum = "12")
+    @Schema(title = "事件ID")
+    private String eventId;
+    /**
+     * 定位时间（手表定时上报的GPS定位时间）
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "定位时间", format = "yyyy-MM-dd HH:mm:ss", width = 20, orderNum = "13")
+    @Schema(title = "定位时间")
+    private Date locateTime;
 }

health-watch/health-watch-api/src/main/java/com/renkang/watch/entity/WatchMonitorData.java

@@ -151,6 +151,20 @@ public class WatchMonitorData implements Serializable {
     @Excel(name = "部门编码", width = 15)
     @Schema(title = "部门编码")
     private java.lang.String orgCode;
+    /**
+     * 事件ID（用于告警事件与GPS位置更新关联的唯一标识）
+     */
+    @Excel(name = "事件ID", width = 32)
+    @Schema(title = "事件ID")
+    private java.lang.String eventId;
+    /**
+     * 定位时间（手表上报的GPS定位时间，定时上报场景使用）
+     */
+    @Excel(name = "定位时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Schema(title = "定位时间")
+    private java.util.Date locateTime;
 
     @Schema(title = "员工编号")
     @TableField(exist = false)

health-watch/health-watch-api/src/main/java/com/renkang/watch/vo/WatchNotifyVo.java

@@ -45,4 +45,15 @@ public class WatchNotifyVo implements Serializable {
     private Date warnTime;
 
     private String gpsErrorMsg;
+
+    /**
+     * 事件ID（用于告警事件与GPS位置更新关联的唯一标识）
+     */
+    private String eventId;
+
+    /**
+     * 定位时间（手表上报的GPS定位时间，定时上报场景使用）
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date locateTime;
 }

health-watch/health-watch-biz/src/main/java/com/renkang/watch/controller/WatchApiController.java

@@ -44,6 +44,21 @@ public class WatchApiController {
         return watchMonitorDataService.notice(json);
     }
 
+    /**
+     * 更新告警事件GPS位置信息接口
+     * 根据 watchNo + eventId 联合定位已有告警数据；
+     * 仅更新GPS相关字段，不推送大屏与短信；
+     * 内部会调用高德接口进行GPS84→GCJ02坐标转换与地址反查。
+     *
+     * @param json 入参（watchNo、eventId、lon、lat、address、locateTime、gpsErrorMsg）
+     * @return 处理结果
+     */
+    @PostMapping("/updateMonitorGps")
+    @Operation(summary = "更新告警事件GPS位置信息")
+    public AjaxJson updateMonitorGps(@RequestBody JSONObject json) {
+        return watchMonitorDataService.updateMonitorGps(json);
+    }
+
     @GetMapping("/setData")
     public AjaxJson setData() {
         AjaxJson ajaxJson = new AjaxJson();

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java

@@ -38,6 +38,17 @@ public interface IWatchMonitorDataService extends IService<WatchMonitorData> {
      */
     AjaxJson notice(JSONObject jsonObject);
 
+    /**
+     * 更新告警事件GPS位置信息
+     * 根据 watchNo + eventId 联合定位已有告警数据；
+     * 缺失任一定位字段则忽略；已存在GPS信息则忽略；
+     * 仅更新数据，不推送大屏与短信。
+     *
+     * @param jsonObject 入参（含 watchNo、eventId、lon、lat、address、locateTime、gpsErrorMsg 等）
+     * @return 处理结果
+     */
+    AjaxJson updateMonitorGps(JSONObject jsonObject);
+
     /**
      * 处理历史数据 orgCode为空的问题
      * @return

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java

@@ -265,6 +265,102 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
         return ajaxJson;
     }
 
+    /**
+     * 更新告警事件GPS位置信息
+     * 根据 watchNo + eventId 联合定位已有告警数据；
+     * watchNo 或 eventId 任一缺失则忽略；
+     * 已存在 GPS 信息则忽略本次更新；
+     * 参考 createMonitorData 进行 GPS84 → GCJ02 坐标转换 + 高德地址反查；
+     * 仅更新数据，不推送大屏与短信。
+     *
+     * @param json 入参（含 watchNo、eventId、lon、lat、address、locateTime、gpsErrorMsg 等）
+     * @return 处理结果
+     */
+    @Override
+    public AjaxJson updateMonitorGps(JSONObject json) {
+        GlobalUtils.setHttpFeignToken();
+
+        AjaxJson ajaxJson = new AjaxJson();
+        logger.info("接收更新告警事件GPS信息=={}", json.toJSONString());
+
+        WatchNotifyVo data = json.toJavaObject(WatchNotifyVo.class);
+
+        // watchNo 或 eventId 任一缺失则忽略
+        if (StrUtil.isBlank(data.getWatchNo()) || StrUtil.isBlank(data.getEventId())) {
+            logger.warn("更新GPS信息缺失关键定位字段，忽略本次请求 watchNo={}, eventId={}", data.getWatchNo(), data.getEventId());
+            ajaxJson.setSuccess(true);
+            return ajaxJson;
+        }
+
+        // watchNo + eventId 联合定位已有告警数据
+        LambdaQueryWrapper<WatchMonitorData> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WatchMonitorData::getWatchNo, data.getWatchNo())
+                .eq(WatchMonitorData::getEventId, data.getEventId());
+        List<WatchMonitorData> existList = this.list(queryWrapper);
+        if (CollUtil.isEmpty(existList)) {
+            logger.warn("更新GPS信息失败，未匹配到告警记录 watchNo={}, eventId={}", data.getWatchNo(), data.getEventId());
+            ajaxJson.setSuccess(true);
+            return ajaxJson;
+        }
+
+        // 已存在GPS信息则忽略本次更新，避免覆盖已有有效坐标
+        boolean hasGps = existList.stream().anyMatch(m -> m.getLon() != null && m.getLat() != null);
+        if (hasGps) {
+            logger.info("告警记录已有GPS信息，忽略本次更新 watchNo={}, eventId={}", data.getWatchNo(), data.getEventId());
+            ajaxJson.setSuccess(true);
+            return ajaxJson;
+        }
+
+        // 计算高德坐标与高德地址（参考 createMonitorData 逻辑）
+        WatchMonitorData updateEntity = new WatchMonitorData();
+        updateEntity.setLon(data.getLon());
+        updateEntity.setLat(data.getLat());
+        updateEntity.setAddress(data.getAddress());
+        updateEntity.setGpsErrorMsg(data.getGpsErrorMsg());
+        updateEntity.setLocateTime(data.getLocateTime());
+
+        if (Stream.of(data.getLon(), data.getLat()).allMatch(value -> ObjUtil.isNotEmpty(value) && value != 0)) {
+            Gps gps = GPS84ToGCJ02(data.getLon(), data.getLat());
+            if (null != gps) {
+                // 写入高德坐标
+                updateEntity.setLonGd(BigDecimal.valueOf(gps.getLongitude()));
+                updateEntity.setLatGd(BigDecimal.valueOf(gps.getLatitude()));
+                // 调用高德接口获取地址信息
+                AmapResultVo amapResultVo = amapService.getFormattedAddress(gps.getLongitude(), gps.getLatitude(), 5000);
+                if (amapResultVo.isSuccess()) {
+                    updateEntity.setAddressGd(amapResultVo.getAddress());
+                    updateEntity.setAddress(amapResultVo.getAddress());
+                } else {
+                    String originError = StrUtil.isBlank(updateEntity.getGpsErrorMsg()) ? "" : updateEntity.getGpsErrorMsg() + "；";
+                    updateEntity.setGpsErrorMsg(originError + amapResultVo.getErrorMsg());
+                }
+            }
+        }
+
+        // 仅更新 GPS 相关字段，不推送大屏、不发短信
+        boolean updated = this.lambdaUpdate()
+                .eq(WatchMonitorData::getWatchNo, data.getWatchNo())
+                .eq(WatchMonitorData::getEventId, data.getEventId())
+                .set(WatchMonitorData::getLon, updateEntity.getLon())
+                .set(WatchMonitorData::getLat, updateEntity.getLat())
+                .set(WatchMonitorData::getAddress, updateEntity.getAddress())
+                .set(WatchMonitorData::getLonGd, updateEntity.getLonGd())
+                .set(WatchMonitorData::getLatGd, updateEntity.getLatGd())
+                .set(WatchMonitorData::getAddressGd, updateEntity.getAddressGd())
+                .set(WatchMonitorData::getGpsErrorMsg, updateEntity.getGpsErrorMsg())
+                .set(WatchMonitorData::getLocateTime, updateEntity.getLocateTime())
+                .update();
+
+        if (!updated) {
+            logger.warn("更新GPS信息失败 watchNo={}, eventId={}", data.getWatchNo(), data.getEventId());
+        } else {
+            logger.info("更新GPS信息成功 watchNo={}, eventId={}, 共更新{}条", data.getWatchNo(), data.getEventId(), existList.size());
+        }
+
+        ajaxJson.setSuccess(true);
+        return ajaxJson;
+    }
+
     /**
      * 构建异常数据
      *
@@ -272,13 +368,16 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl<WatchMonitorDataMap
      * @return 异常数据
      */
     private WatchMonitorData createMonitorData(WatchNotifyVo data) {
+
         log.info("开始构建异常数据 => {}", JSONObject.toJSONString(data));
         WatchMonitorData monitorDataEntity = new WatchMonitorData();
         monitorDataEntity.setAddress(data.getAddress());
         monitorDataEntity.setWatchNo(data.getWatchNo());
         monitorDataEntity.setLon(data.getLon());
         monitorDataEntity.setLat(data.getLat());
+        monitorDataEntity.setLocateTime(data.getLocateTime());
         monitorDataEntity.setEventType(data.getEventType());
+        monitorDataEntity.setEventId(data.getEventId());
         monitorDataEntity.setDataValue(data.getDataValue());
         monitorDataEntity.setCreateDate(data.getCreateTime());
         monitorDataEntity.setWarnTime(data.getWarnTime());

health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchUserDataServiceImpl.java

@@ -42,6 +42,7 @@ import org.jeecgframework.poi.excel.entity.params.ExcelExportEntity;
 import org.jeecgframework.poi.exception.excel.enums.ExcelExportEnum;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.task.AsyncTaskExecutor;
+import org.springframework.dao.DuplicateKeyException;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
@@ -208,7 +209,12 @@ public class WatchUserDataServiceImpl extends ServiceImpl<WatchUserDataMapper, W
         watchUserData.setDataDate(bindDateSave);
         watchUserData.setWatchNo(watchNo);
         watchUserData.setCreateDate(new Date());
-        this.save(watchUserData);
+        try {
+            this.save(watchUserData);
+        } catch (DuplicateKeyException e) {
+            //并发上报同一手表同一天数据时,先删后插存在竞态,另一线程已插入相同记录,忽略即可
+            log.warn("QH_WAT_USER_DATA并发写入冲突,已忽略: watchNo={}, dataDate={}", watchNo, s);
+        }
     }
 
 //    @Override

jeecg-boot-base-core/src/main/java/org/jeecg/enums/RoleEnum.java

@@ -48,7 +48,8 @@ public enum RoleEnum {
     MANAGER("manager"),
     MEDICALUSER("medicaluser"),
     MEDICALADMIN("medicaladmin"),
-    HOS_DOCTOR("hos_doctor");
+    HOS_DOCTOR("hos_doctor"),
+    NOTICE_ROLE("notice_role");
 
     /**
      * 角色名

jeecg-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/message/service/impl/SysMessageNoticeServiceImpl.java

@@ -189,12 +189,12 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl<SysMessageNoticeMap
         LoginUser loginUser = GlobalUtils.getLoginUser();
         /*
          * 1.后台接口的消息列表需要做一定数据权限控制需考虑的角色有admin,system,second_manager,third_manager
-         * 2.admin,system可查看所有的活动
+         * 2.admin,system可查看所有的消息通知
          * 3.second_manager,third_manager可查看管理单位下的消息列表
          */
         boolean permissions = false;
         List<String> roleCodes = Arrays.asList(Objects.toString(loginUser.getRoleCodes(), "").split(","));
-        if (roleCodes.contains(RoleEnum.ADMIN_MANAGER.roleName) || roleCodes.contains(RoleEnum.SYSTEM.roleName) || roleCodes.contains(RoleEnum.WEIGHT_PLAN_ADMIN.roleName)) {
+        if (roleCodes.contains(RoleEnum.ADMIN_MANAGER.roleName) || roleCodes.contains(RoleEnum.SYSTEM.roleName)) {
             permissions = true;
         } else if (roleCodes.contains(RoleEnum.SECOND_MANAGER.roleName)) {
             if (StrUtil.isNotEmpty(loginUser.getDepartCodes())) {
@@ -203,8 +203,8 @@ public class SysMessageNoticeServiceImpl extends ServiceImpl<SysMessageNoticeMap
                 permissions = true;
             }
         }
-        // 没有权限，返回空结果
-        wrapper.eq(!permissions, SysMessageNotice::getId, "-1");
+        // 只查看本人创建的消息
+        wrapper.eq(!permissions, SysMessageNotice::getCreateBy, loginUser.getUsername());
     }
 
     /**