From 275abacb1a9fcf14081711c399625f0eb87a1e8a Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Tue, 3 Dec 2024 15:52:07 +0800
Subject: [PATCH] =?UTF-8?q?add(base):=20=E6=AF=8D=E7=BA=BF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BF=AB=E9=80=9F?=
 =?UTF-8?q?=E5=B7=A1=E6=A3=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BaseBusbarInfo 模型中添加 isInsp 字段，用于表示是否快速巡检
- 在 BaseBusbarInfoMapper.xml 中添加相应的 SQL 语句，支持 isInsp 字段的查询和更新- 在前端页面中添加是否快速巡检的筛选条件和表格列
- 更新相关的数据字典，增加 is_insp 类型
---
 .../com/ruoyi/base/domain/BaseBusbarInfo.java | 12 ++++++
 .../mapper/base/BaseBusbarInfoMapper.xml      | 18 ++++++---
 .../src/views/base/baseBusbarInfo/index.vue   | 40 ++++++++++++++++---
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
index 3a1cf85..1124336 100644
--- a/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
+++ b/ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
@@ -91,6 +91,10 @@ public class BaseBusbarInfo extends BaseEntity
     @Excel(name = "是否旋转:1-是；0-否")
     private Long isRotate;
 
+    /** 是否快速巡检:0-否；1-是 */
+    @Excel(name = "是否快速巡检:0-否；1-是")
+    private Long isInsp;
+
     List<BaseBusbarInfo> children = new ArrayList<BaseBusbarInfo>();
 
     public void setObjId(Long objId)
@@ -247,6 +251,13 @@ public class BaseBusbarInfo extends BaseEntity
         return isRotate;
     }
 
+    public Long getIsInsp() {
+        return isInsp;
+    }
+
+    public void setIsInsp(Long isInsp) {
+        this.isInsp = isInsp;
+    }
 
     public List<BaseBusbarInfo> getChildren() {
         return children;
@@ -277,6 +288,7 @@ public class BaseBusbarInfo extends BaseEntity
             .append("wTiltPos", getwTiltPos())
             .append("wZoomPos", getwZoomPos())
             .append("isRotate", getIsRotate())
+                .append("isInsp", getIsInsp())
             .toString();
     }
 }
diff --git a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
index c92b200..8cd39f4 100644
--- a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
@@ -3,7 +3,7 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.base.mapper.BaseBusbarInfoMapper">
-    
+
     <resultMap type="BaseBusbarInfo" id="BaseBusbarInfoResult">
         <result property="objId"    column="obj_id"    />
         <result property="busbarCode"    column="busbar_code"    />
@@ -23,15 +23,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="wTiltPos"    column="wTiltPos"    />
         <result property="wZoomPos"    column="wZoomPos"    />
         <result property="isRotate"    column="is_rotate"    />
+        <result property="isInsp"    column="is_insp"    />
     </resultMap>
 
     <sql id="selectBaseBusbarInfoVo">
-        select obj_id, busbar_code, busbar_alias, cabinet_code, busbar_dist, is_checked, is_end, is_flag, remark, created_by, created_time, updated_by, updated_time, is_pictures, wPanPos, wTiltPos, wZoomPos, is_rotate from base_busbar_info
+        select obj_id, busbar_code, busbar_alias, cabinet_code, busbar_dist, is_checked, is_end, is_flag, remark, created_by, created_time, updated_by, updated_time, is_pictures, wPanPos, wTiltPos, wZoomPos, is_rotate , is_insp
+        from base_busbar_info
     </sql>
 
     <select id="selectBaseBusbarInfoList" parameterType="BaseBusbarInfo" resultMap="BaseBusbarInfoResult">
         <include refid="selectBaseBusbarInfoVo"/>
-        <where>  
+        <where>
             <if test="objId != null "> and obj_id = #{objId}</if>
             <if test="busbarCode != null "> and busbar_code = #{busbarCode}</if>
             <if test="busbarAlias != null  and busbarAlias != ''"> and busbar_alias like concat('%', #{busbarAlias}, '%')</if>
@@ -50,9 +52,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wTiltPos != null  and wTiltPos != ''"> and wTiltPos = #{wTiltPos}</if>
             <if test="wZoomPos != null  and wZoomPos != ''"> and wZoomPos = #{wZoomPos}</if>
             <if test="isRotate != null "> and is_rotate = #{isRotate}</if>
+             <if test="isInsp != null "> and is_insp = #{isInsp}</if>
         </where>
     </select>
-    
+
     <select id="selectBaseBusbarInfoByObjId" parameterType="Long" resultMap="BaseBusbarInfoResult">
         <include refid="selectBaseBusbarInfoVo"/>
         where obj_id = #{objId}
@@ -78,6 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wTiltPos != null">wTiltPos,</if>
             <if test="wZoomPos != null">wZoomPos,</if>
             <if test="isRotate != null">is_rotate,</if>
+            <if test="isInsp != null">is_insp,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="busbarCode != null">#{busbarCode},</if>
@@ -97,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wTiltPos != null">#{wTiltPos},</if>
             <if test="wZoomPos != null">#{wZoomPos},</if>
             <if test="isRotate != null">#{isRotate},</if>
+            <if test="isInsp != null">#{isInsp},</if>
          </trim>
     </insert>
 
@@ -120,6 +125,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="wTiltPos != null">wTiltPos = #{wTiltPos},</if>
             <if test="wZoomPos != null">wZoomPos = #{wZoomPos},</if>
             <if test="isRotate != null">is_rotate = #{isRotate},</if>
+            <if test="isInsp != null">is_insp = #{isInsp},</if>
         </trim>
         where obj_id = #{objId}
     </update>
@@ -129,9 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteBaseBusbarInfoByObjIds" parameterType="String">
-        delete from base_busbar_info where obj_id in 
+        delete from base_busbar_info where obj_id in
         <foreach item="objId" collection="array" open="(" separator="," close=")">
             #{objId}
         </foreach>
     </delete>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
index 7f1c3a8..20f59cd 100644
--- a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
@@ -71,6 +71,18 @@
                 />
               </el-select>
             </el-form-item>
+
+            <el-form-item label="是否快检" prop="isInsp">
+              <el-select v-model="queryParamsBusbar.isInsp" placeholder="请选择是否快检" clearable>
+                <el-option
+                  v-for="dict in dict.type.is_insp"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryBusbar">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQueryBusbar">重置</el-button>
@@ -159,6 +171,11 @@
                 <dict-tag :options="dict.type.is_rotate" :value="scope.row.isRotate"/>
               </template>
             </el-table-column>
+            <el-table-column label="是否快检" align="center" prop="isInsp">
+              <template slot-scope="scope">
+                <dict-tag :options="dict.type.is_insp" :value="scope.row.isInsp"/>
+              </template>
+            </el-table-column>
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -391,6 +408,15 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="是否快检" prop="isInsp">
+          <el-radio-group v-model="formBusbar.isInsp">
+            <el-radio
+              v-for="dict in dict.type.is_insp"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitFormBusbar">确 定</el-button>
@@ -479,7 +505,7 @@ import { getBaseCabinetInfoTree } from "@/api/base/baseCabinetInfo";
 
 export default {
   name: "BaseBusbarAndAlarmInfo",
-  dicts: ['is_pictures', 'is_rotate', 'cabinet_is_checked',"busbar_is_checked", 'busbar_is_flag', 'busbar_is_end', 'judg_method', 'is_flag', 'alarm_type'],
+  dicts: ['is_pictures', 'is_rotate', 'cabinet_is_checked',"busbar_is_checked", 'busbar_is_flag', 'busbar_is_end', 'judg_method', 'is_flag', 'alarm_type', 'is_insp'],
   data() {
     return {
       selectedCabinetCode: null, // 保存当前选中的电柜编
@@ -542,7 +568,8 @@ export default {
         wPanPos: null,
         wTiltPos: null,
         wZoomPos: null,
-        isRotate: null
+        isRotate: null,
+        isInsp: null
       },
       queryParamsBusbar: {
         pageNum: 1,
@@ -564,7 +591,8 @@ export default {
         wPanPos: null,
         wTiltPos: null,
         wZoomPos: null,
-        isRotate: null
+        isRotate: null,
+        isInsp: null
       },
       queryParamsAlarm: {
         pageNum: 1,
@@ -701,7 +729,8 @@ export default {
         wPanPos: null,
         wTiltPos: null,
         wZoomPos: null,
-        isRotate: null
+        isRotate: null,
+        isInsp: null
       };
       this.handleQueryBusbar();
     },
@@ -846,7 +875,8 @@ export default {
         wPanPos: null,
         wTiltPos: null,
         wZoomPos: null,
-        isRotate: null
+        isRotate: null,
+        isInsp: null
       };
       this.resetForm("formBusbar");
     },