change(config): 更新生产环境主库数据库连接配置

- 将主库数据库连接地址由10.100.70.11改为10.100.70.50
- 修改主库数据库密码为Aucma#2026
- 保持从库数据源配置不变

aucma-admin/src/main/resources/application-prod.yml

@@ -65,9 +65,9 @@ spring:
         druid:
             # 主库数据源
             master:
-                url: jdbc:oracle:thin:@10.100.70.11:1521/NMES
+                url: jdbc:oracle:thin:@10.100.70.50:1521/NMES
                 username: haiwei
-                password: 123456
+                password: Aucma#2026
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsFaultInstanceController.java

@@ -77,6 +77,17 @@ public class DmsBillsFaultInstanceController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询检修工单列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('dms:dmsBillsFaultInstance:list')" )
+    @GetMapping("/listAll")
+    public AjaxResult listAll(DmsBillsFaultInstance dmsBillsFaultInstance)
+    {
+        List<DmsBillsFaultInstance> list = dmsBillsFaultInstanceService.selectDmsBillsFaultInstanceList(dmsBillsFaultInstance);
+        return success(list);
+    }
+
     /**
      * 导出检修工单列表
      */

aucma-dms/src/main/java/com/aucma/dms/controller/DmsBillsMaintInstanceController.java

@@ -44,6 +44,17 @@ public class DmsBillsMaintInstanceController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询保养工单列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('dms:dmsBillsMaintInstance:list')" )
+    @GetMapping("/listAll")
+    public AjaxResult listAll(DmsBillsMaintInstance dmsBillsMaintInstance)
+    {
+        List<DmsBillsMaintInstance> list = dmsBillsMaintInstanceService.selectDmsBillsMaintInstanceList(dmsBillsMaintInstance);
+        return success(list);
+    }
+
     /**
      * 导出保养工单列表
      */

aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordInspectController.java

@@ -42,6 +42,17 @@ public class DmsRecordInspectController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询巡检记录列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('dms:dmsRecordInspect:list')" )
+    @GetMapping("/listAll")
+    public AjaxResult listAll(DmsRecordInspect dmsRecordInspect)
+    {
+        List<DmsRecordInspect> list = dmsRecordInspectService.selectDmsRecordInspectList(dmsRecordInspect);
+        return success(list);
+    }
+
     /**
      * 导出巡检记录列表
      */

aucma-dms/src/main/java/com/aucma/dms/controller/DmsRecordShutDownController.java

@@ -40,6 +40,17 @@ public class DmsRecordShutDownController extends BaseController
         return getDataTable(list);
     }
 
+    /**
+     * 查询停机记录列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('dms:shutDown:list')" )
+    @GetMapping("/listAll")
+    public AjaxResult listAll(DmsRecordShutDown dmsRecordShutDown)
+    {
+        List<DmsRecordShutDown> list = dmsRecordShutDownService.selectDmsRecordShutDownList(dmsRecordShutDown);
+        return success(list);
+    }
+
     /**
      * 导出停机记录列表
      */

aucma-dms/src/main/java/com/aucma/dms/controller/DmsRepairRecordController.java

@@ -40,6 +40,16 @@ public class DmsRepairRecordController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询维修记录列表（不分页）
+     */
+    @PreAuthorize("@ss.hasPermi('dms:repairRecord:list')")
+    @GetMapping("/listAll")
+    public AjaxResult listAll(DmsRepairRecord dmsRepairRecord) {
+        List<DmsRepairRecord> list = dmsRepairRecordService.selectDmsRepairRecordList(dmsRepairRecord);
+        return AjaxResult.success(list);
+    }
+
     /**
      * 导出维修记录列表
      */

aucma-dms/src/main/java/com/aucma/dms/domain/DmsBillsMaintInstance.java

@@ -74,6 +74,18 @@ public class DmsBillsMaintInstance extends DmsBaseEntity
     private String maintStatusStr;
     private String maintLevelName;
     private String maintProtocol;
+
+    /** 设备编码（查询用，非持久化字段） */
+    private String deviceCode;
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
     public String getMaintProtocol() {
         return maintProtocol;
     }

aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordInspect.java

@@ -72,6 +72,18 @@ public class DmsRecordInspect extends DmsBaseEntity
     /** 是否标识：1-是；0-否 */
     @Excel(name = "是否标识：1-是；0-否")
     private String isFlag;
+
+    /** 设备编码（查询用，非持久化字段） */
+    private String deviceCode;
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
     private Long inspectInstanceId;
     public void setInspectInstanceId(Long inspectInstanceId)
     {

aucma-dms/src/main/java/com/aucma/dms/domain/DmsRecordShutDown.java

@@ -53,6 +53,17 @@ public class DmsRecordShutDown extends DmsBaseEntity
     @Excel(name = "是否标识：1-是；2-否")
     private Long isFlag;
 
+    /** 设备编码（查询用，非持久化字段） */
+    private String deviceCode;
+
+    public String getDeviceCode() {
+        return deviceCode;
+    }
+
+    public void setDeviceCode(String deviceCode) {
+        this.deviceCode = deviceCode;
+    }
+
     public void setRecordShutDownId(Long recordShutDownId) 
     {
         this.recordShutDownId = recordShutDownId;

aucma-dms/src/main/resources/mapper/dms/DmsBillsFaultInstanceMapper.xml

@@ -112,6 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="instanceType != null  and instanceType != ''"> and instance_type = #{instanceType}</if>
             <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
             <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
+            <if test="deviceCode != null  and deviceCode != ''"> and device_id in (select OBJ_ID from base_deviceledger where device_code = #{deviceCode})</if>
         </where>
         order by create_time desc
     </select>

aucma-dms/src/main/resources/mapper/dms/DmsBillsMaintInstanceMapper.xml

@@ -41,7 +41,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.real_end_time,
             a.maint_status,
             a.maint_comp_rate,
-            a.is_flag,
             a.create_by,
             a.create_time,
             a.update_by,
@@ -66,7 +65,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="realEndTime != null "> and   #{realEndTime} > a.real_end_time</if>
             <if test="maintStatus != null "> and a.maint_status = #{maintStatus}</if>
             <if test="maintCompRate != null "> and a.maint_comp_rate = #{maintCompRate}</if>
-            <if test="isFlag != null "> and a.is_flag = #{isFlag}</if>
+            <!-- 注意：dms_bills_maint_detail 表使用 machine_id 而非 device_id -->
+            <if test="deviceCode != null and deviceCode != ''">
+                and a.maint_instance_id in (
+                    select d.maint_instance_id 
+                    from dms_bills_maint_detail d 
+                    left join base_deviceledger l on d.machine_id = l.OBJ_ID 
+                    where l.device_code = #{deviceCode}
+                )
+            </if>
         </where>
         order by create_time desc
     </select>

aucma-dms/src/main/resources/mapper/dms/DmsRecordInspectMapper.xml

@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <sql id="selectDmsRecordInspectVo">
         select record_inspect_id,plan_inspect_id,bills_inspect_code, inspect_type, inspect_route_id, device_amount,
          plan_begin_time,plan_end_time, real_begin_time, real_end_time, performer, inspect_status, inspect_duration,
-         is_flag, remark, create_by, create_time, update_by, update_time from dms_record_inspect
+         remark, create_by, create_time, update_by, update_time from dms_record_inspect
     </sql>
 
     <select id="selectDmsRecordInspectList" parameterType="DmsRecordInspect" resultMap="DmsRecordInspectResult">
@@ -46,7 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="performer != null  and performer != ''"> and performer = #{performer}</if>
             <if test="inspectStatus != null "> and inspect_status = #{inspectStatus}</if>
             <if test="inspectDuration != null "> and inspect_duration = #{inspectDuration}</if>
-            <if test="isFlag != null  and isFlag != ''"> and is_flag = #{isFlag}</if>
+            <if test="deviceCode != null and deviceCode != ''">
+                and inspect_route_id in (
+                    select r.inspect_route_id 
+                    from dms_inspect_route_detail r 
+                    left join base_deviceledger l on r.machine_id = l.OBJ_ID 
+                    where l.device_code = #{deviceCode}
+                )
+            </if>
         </where>
     </select>
 

aucma-dms/src/main/resources/mapper/dms/DmsRecordShutDownMapper.xml

@@ -20,15 +20,16 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
+    <!-- 注意：实际表字段名与XML定义不同，已修正字段映射 -->
     <sql id="selectDmsRecordShutDownVo">
         select record_shut_down_id,
-               device_id,
+               machine_id as device_id,
-               shut_type,
+               shut_type_id as shut_type,
                shut_reason,
                shut_begin_time,
                shut_end_time,
                shut_time,
-               is_flag,
+               active_flag as is_flag,
                remark,
                create_by,
                create_time,
@@ -40,13 +41,12 @@
     <select id="selectDmsRecordShutDownList" parameterType="DmsRecordShutDown" resultMap="DmsRecordShutDownResult">
         <include refid="selectDmsRecordShutDownVo"/>
         <where>
-            <if test="deviceId != null ">and device_id = #{deviceId}</if>
+            <if test="shutType != null ">and shut_type_id = #{shutType}</if>
-            <if test="shutType != null ">and shut_type = #{shutType}</if>
             <if test="shutReason != null  and shutReason != ''">and shut_reason = #{shutReason}</if>
             <if test="shutBeginTime != null ">and shut_begin_time >= #{shutBeginTime}</if>
             <if test="shutEndTime != null ">and #{shutEndTime}>=shut_end_time</if>
             <if test="shutTime != null ">and shut_time = #{shutTime}</if>
-            <if test="isFlag != null ">and is_flag = #{isFlag}</if>
+            <if test="deviceCode != null and deviceCode != ''">and machine_id in (select OBJ_ID from base_deviceledger where device_code = #{deviceCode})</if>
         </where>
     </select>
 

aucma-dms/src/main/resources/mapper/dms/DmsRepairRecordMapper.xml

@@ -60,6 +60,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceId != null">
                 and device_id = #{deviceId}
             </if>
+            <if test="deviceCode != null and deviceCode != ''">
+                and device_code = #{deviceCode}
+            </if>
             <if test="deviceName != null and deviceName != ''">
                 and device_name like '%' || #{deviceName} || '%'
             </if>