From 5811a7c58068e0b231df4c21ef5acd1a7b0ef1a8 Mon Sep 17 00:00:00 2001
From: "zangch@mesnac.com" <zangch@mesnac.com>
Date: Fri, 27 Feb 2026 09:18:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(dms):=20=E6=B7=BB=E5=8A=A0=E5=B7=A1?=
 =?UTF-8?q?=E6=A3=80=E5=B7=A5=E5=8D=95=E6=98=8E=E7=BB=86=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=BE=E5=A4=87=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 SEQ_DMS_INSPECT_INSTANCE_DETAIL 序列用于巡检工单明细
- 在 DMS_SEQUENCES.sql 中添加序列创建和权限配置
- 修改 BaseDeviceParamValMapper.xml 将数据查询时间范围从当天调整为最近2小时
- 移除 DmsBillsMaintInstanceMapper.xml 中的 isFlag 字段映射
- 为 DmsInspectInstanceDetailMapper.xml 配置自定义序列主键生成策略
---
 .../mapper/base/BaseDeviceParamValMapper.xml  |  2 +-
 aucma-dms/DMS_SEQUENCES.sql                   | 20 +++++++++++++++++++
 .../dms/DmsBillsMaintInstanceMapper.xml       |  4 ----
 .../dms/DmsInspectInstanceDetailMapper.xml    |  7 ++++++-
 4 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
index 8c3b913..b5ef5d5 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceParamValMapper.xml
@@ -156,7 +156,7 @@
             FROM base_device_param_val
             WHERE param_name IN ('机台状态-三色灯机器运行', '机台状态-三色灯机器暂停', '机台状态-三色灯机器待机', '机台状态-三色灯机器报警')
               AND UPPER(param_value) = 'TRUE'
-              AND collect_time &gt;= TRUNC(SYSDATE) AND collect_time &lt; TRUNC(SYSDATE) + 1
+              AND collect_time &gt;= SYSDATE - (2/24) AND collect_time &lt; SYSDATE
         ),
         device_status AS (
             SELECT device_code, param_name FROM today_latest WHERE rn = 1
diff --git a/aucma-dms/DMS_SEQUENCES.sql b/aucma-dms/DMS_SEQUENCES.sql
index 5375522..616b048 100644
--- a/aucma-dms/DMS_SEQUENCES.sql
+++ b/aucma-dms/DMS_SEQUENCES.sql
@@ -72,6 +72,23 @@ CREATE SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_RTE_DTL"
   INCREMENT BY 1
   CACHE 20;
 
+-- ----------------------------
+-- 4A. SEQ_DMS_INSPECT_INSTANCE_DETAIL (巡检工单明细)
+-- 表: DMS_INSPECT_INSTANCE_DETAIL
+-- ----------------------------
+BEGIN
+   EXECUTE IMMEDIATE 'DROP SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_INSTANCE_DETAIL"';
+EXCEPTION
+   WHEN OTHERS THEN NULL;
+END;
+/
+CREATE SEQUENCE "HAIWEI"."SEQ_DMS_INSPECT_INSTANCE_DETAIL"
+  MINVALUE 1
+  MAXVALUE 9999999999999999999999999999
+  START WITH 1
+  INCREMENT BY 1
+  CACHE 20;
+
 -- ----------------------------
 -- 5. SEQ_DMS_LUBE_STD (润滑标准)
 -- 表: DMS_BASE_LUBE_STANDARD
@@ -573,6 +590,8 @@ BEGIN
   sync_seq('HAIWEI.SEQ_DMS_INSPECT_STD',            'HAIWEI.DMS_BASE_INSPECT_STANDARD',     'INSPECT_STANDARD_ID');
   -- 4. 点检路线明细
   sync_seq('HAIWEI.SEQ_DMS_INSPECT_RTE_DTL',        'HAIWEI.DMS_INSPECT_ROUTE_DETAIL',      'ROUTE_DETAIL_ID');
+  -- 4A. 巡检工单明细
+  sync_seq('HAIWEI.SEQ_DMS_INSPECT_INSTANCE_DETAIL','HAIWEI.DMS_INSPECT_INSTANCE_DETAIL',   'INSTANCE_DETAIL_ID');
   -- 5. 润滑标准
   sync_seq('HAIWEI.SEQ_DMS_LUBE_STD',               'HAIWEI.DMS_BASE_LUBE_STANDARD',        'LUBE_STANDARD_ID');
   -- 6. 润滑部位
@@ -631,6 +650,7 @@ BEGIN
   grant_and_synonym('SEQ_DMS_INSPECT_ROUTE');
   grant_and_synonym('SEQ_DMS_INSPECT_STD');
   grant_and_synonym('SEQ_DMS_INSPECT_RTE_DTL');
+  grant_and_synonym('SEQ_DMS_INSPECT_INSTANCE_DETAIL');
   grant_and_synonym('SEQ_DMS_LUBE_STD');
   grant_and_synonym('SEQ_DMS_LUBE_STATION');
   grant_and_synonym('SEQ_DMS_MAINT_PROJ');
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
index 8ba62b3..4e4563f 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml
@@ -16,7 +16,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="realEndTime"    column="real_end_time"    />
         <result property="maintStatus"    column="maint_status"    />
         <result property="maintCompRate"    column="maint_comp_rate"    />
-        <result property="isFlag"    column="is_flag"    />
         <result property="remark"    column="remark"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -100,7 +99,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realEndTime != null">real_end_time,</if>
             <if test="maintStatus != null">maint_status,</if>
             <if test="maintCompRate != null">maint_comp_rate,</if>
-            <if test="isFlag != null">is_flag,</if>
             <if test="remark != null">remark,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -119,7 +117,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realEndTime != null">#{realEndTime},</if>
             <if test="maintStatus != null">#{maintStatus},</if>
             <if test="maintCompRate != null">#{maintCompRate},</if>
-            <if test="isFlag != null">#{isFlag},</if>
             <if test="remark != null">#{remark},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -141,7 +138,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realEndTime != null">real_end_time = #{realEndTime},</if>
             <if test="maintStatus != null">maint_status = #{maintStatus},</if>
             <if test="maintCompRate != null">maint_comp_rate = #{maintCompRate},</if>
-            <if test="isFlag != null">is_flag = #{isFlag},</if>
             <if test="remark != null">remark = #{remark},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
diff --git a/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml b/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml
index 2962b59..2667663 100644
--- a/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml
+++ b/aucma-dms/src/main/resources/mapper/dms/DmsInspectInstanceDetailMapper.xml
@@ -45,9 +45,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where instance_detail_id = #{instanceDetailId}
     </select>
 
-    <insert id="insertDmsInspectInstanceDetail" parameterType="DmsInspectInstanceDetail" useGeneratedKeys="true" keyProperty="instanceDetailId">
+    <insert id="insertDmsInspectInstanceDetail" parameterType="DmsInspectInstanceDetail">
+        <selectKey keyProperty="instanceDetailId" resultType="long" order="BEFORE">
+            SELECT HAIWEI.SEQ_DMS_INSPECT_INSTANCE_DETAIL.NEXTVAL FROM DUAL
+        </selectKey>
         insert into dms_inspect_instance_detail
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            instance_detail_id,
             <if test="inspectInstanceId != null">inspect_instance_id,</if>
             <if test="lineStep != null">line_step,</if>
             <if test="realLineStep != null">real_line_step,</if>
@@ -62,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateTime != null">update_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            #{instanceDetailId},
             <if test="inspectInstanceId != null">#{inspectInstanceId},</if>
             <if test="lineStep != null">#{lineStep},</if>
             <if test="realLineStep != null">#{realLineStep},</if>