From d5b3d0c3d85041edff4f692755299944b7349dcd Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 2 Dec 2024 16:48:16 +0800
Subject: [PATCH] =?UTF-8?q?change(base):=20=E6=AF=8D=E6=8E=92=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E5=9D=90=E6=A0=87=E5=92=8C=E6=97=8B?=
 =?UTF-8?q?=E8=BD=AC=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 BaseBusbarInfo 模型中添加了 wPanPos、wTiltPos、wZoomPos 和 isRotate 字段
- 更新了 mapper 和 SQL 文件以支持新字段
- 在前端页面中添加了新字段的表单和表格列
- 优化了部分 UI 样式，如添加了注释和调整了布局
---
 .../com/ruoyi/base/domain/BaseBusbarInfo.java |  60 +++++++---
 .../mapper/base/BaseBusbarInfoMapper.xml      |  80 +++++++-------
 .../src/views/base/baseBusbarInfo/index.vue   | 103 ++++++++++++++++--
 3 files changed, 179 insertions(+), 64 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 5d30d0d..06eb5f9 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
@@ -75,11 +75,21 @@ public class BaseBusbarInfo extends BaseEntity
     @Excel(name = "是否拍照:1-是;0-否")
     private Long isPictures;
 
-    /** 电柜别名 */
-    @Excel(name = "电柜别名")
-    private String cabinetAlias;
+    /** 坐标P */
+    @Excel(name = "坐标P")
+    private String wPanPos;
 
-    private List<BaseBusbarInfo> children = new ArrayList<BaseBusbarInfo>();
+    /** 坐标T */
+    @Excel(name = "坐标T")
+    private String wTiltPos;
+
+    /** 坐标Z */
+    @Excel(name = "坐标Z")
+    private String wZoomPos;
+
+    /** 是否旋转:1-是；0-否 */
+    @Excel(name = "是否旋转:1-是；0-否")
+    private Long isRotate;
 
     public void setObjId(Long objId)
     {
@@ -198,22 +208,41 @@ public class BaseBusbarInfo extends BaseEntity
     {
         return isPictures;
     }
-
-    public String getCabinetAlias() {
-        return cabinetAlias;
+    public void setwPanPos(String wPanPos)
+    {
+        this.wPanPos = wPanPos;
     }
 
-    public void setCabinetAlias(String cabinetAlias) {
-        this.cabinetAlias = cabinetAlias;
+    public String getwPanPos()
+    {
+        return wPanPos;
+    }
+    public void setwTiltPos(String wTiltPos)
+    {
+        this.wTiltPos = wTiltPos;
     }
 
+    public String getwTiltPos()
+    {
+        return wTiltPos;
+    }
+    public void setwZoomPos(String wZoomPos)
+    {
+        this.wZoomPos = wZoomPos;
+    }
 
-    public List<BaseBusbarInfo> getChildren() {
-        return children;
+    public String getwZoomPos()
+    {
+        return wZoomPos;
+    }
+    public void setIsRotate(Long isRotate)
+    {
+        this.isRotate = isRotate;
     }
 
-    public void setChildren(List<BaseBusbarInfo> children) {
-        this.children = children;
+    public Long getIsRotate()
+    {
+        return isRotate;
     }
 
     @Override
@@ -233,7 +262,10 @@ public class BaseBusbarInfo extends BaseEntity
             .append("updatedBy", getUpdatedBy())
             .append("updatedTime", getUpdatedTime())
             .append("isPictures", getIsPictures())
-                .append("cabinetAlias", getCabinetAlias())
+            .append("wPanPos", getwPanPos())
+            .append("wTiltPos", getwTiltPos())
+            .append("wZoomPos", getwZoomPos())
+            .append("isRotate", getIsRotate())
             .toString();
     }
 }
diff --git a/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml b/ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
index e07ad4d..c92b200 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"    />
@@ -19,53 +19,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updatedBy"    column="updated_by"    />
         <result property="updatedTime"    column="updated_time"    />
         <result property="isPictures"    column="is_pictures"    />
-
-        <result property="cabinetAlias" column="cabinet_alias"/>
+        <result property="wPanPos"    column="wPanPos"    />
+        <result property="wTiltPos"    column="wTiltPos"    />
+        <result property="wZoomPos"    column="wZoomPos"    />
+        <result property="isRotate"    column="is_rotate"    />
     </resultMap>
 
     <sql id="selectBaseBusbarInfoVo">
-        select bbi.obj_id,
-               bbi.busbar_code,
-               bbi.busbar_alias,
-               bbi.cabinet_code,
-               bbi.busbar_dist,
-               bbi.is_checked, is_end,
-               bbi.is_flag,
-               bbi.remark,
-               bbi.created_by,
-               bbi.created_time,
-               bbi.updated_by,
-               bbi.updated_time,
-               bbi.is_pictures
-
-        from base_busbar_info bbi
-
+        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
     </sql>
 
     <select id="selectBaseBusbarInfoList" parameterType="BaseBusbarInfo" resultMap="BaseBusbarInfoResult">
         <include refid="selectBaseBusbarInfoVo"/>
-        <where>
-            <if test="objId != null "> and bbi.obj_id = #{objId}</if>
-            <if test="busbarCode != null "> and bbi.busbar_code = #{busbarCode}</if>
-            <if test="busbarAlias != null  and busbarAlias != ''"> and bbi.busbar_alias = #{busbarAlias}</if>
-            <if test="cabinetCode != null "> and bbi.cabinet_code = #{cabinetCode}</if>
-            <if test="busbarDist != null "> and bbi.busbar_dist = #{busbarDist}</if>
-            <if test="isChecked != null "> and bbi.is_checked = #{isChecked}</if>
-            <if test="isEnd != null "> and bbi.is_end = #{isEnd}</if>
-            <if test="isFlag != null "> and bbi.is_flag = #{isFlag}</if>
-            <if test="remark != null  and remark != ''"> and bbi.remark = #{remark}</if>
-            <if test="createdBy != null  and createdBy != ''"> and bbi.created_by = #{createdBy}</if>
-            <if test="params.beginCreatedTime != null and params.beginCreatedTime != '' and params.endCreatedTime != null and params.endCreatedTime != ''"> and bbi.created_time between #{params.beginCreatedTime} and #{params.endCreatedTime}</if>
-            <if test="updatedBy != null  and updatedBy != ''"> and bbi.updated_by = #{updatedBy}</if>
-            <if test="params.beginUpdatedTime != null and params.beginUpdatedTime != '' and params.endUpdatedTime != null and params.endUpdatedTime != ''"> and bbi.updated_time between #{params.beginUpdatedTime} and #{params.endUpdatedTime}</if>
-            <if test="isPictures != null "> and bbi.is_pictures = #{isPictures}</if>
-
+        <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>
+            <if test="cabinetCode != null "> and cabinet_code = #{cabinetCode}</if>
+            <if test="busbarDist != null "> and busbar_dist = #{busbarDist}</if>
+            <if test="isChecked != null "> and is_checked = #{isChecked}</if>
+            <if test="isEnd != null "> and is_end = #{isEnd}</if>
+            <if test="isFlag != null "> and is_flag = #{isFlag}</if>
+            <if test="remark != null  and remark != ''"> and remark = #{remark}</if>
+            <if test="createdBy != null  and createdBy != ''"> and created_by = #{createdBy}</if>
+            <if test="params.beginCreatedTime != null and params.beginCreatedTime != '' and params.endCreatedTime != null and params.endCreatedTime != ''"> and created_time between #{params.beginCreatedTime} and #{params.endCreatedTime}</if>
+            <if test="updatedBy != null  and updatedBy != ''"> and updated_by = #{updatedBy}</if>
+            <if test="params.beginUpdatedTime != null and params.beginUpdatedTime != '' and params.endUpdatedTime != null and params.endUpdatedTime != ''"> and updated_time between #{params.beginUpdatedTime} and #{params.endUpdatedTime}</if>
+            <if test="isPictures != null "> and is_pictures = #{isPictures}</if>
+            <if test="wPanPos != null  and wPanPos != ''"> and wPanPos = #{wPanPos}</if>
+            <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>
         </where>
     </select>
-
+    
     <select id="selectBaseBusbarInfoByObjId" parameterType="Long" resultMap="BaseBusbarInfoResult">
         <include refid="selectBaseBusbarInfoVo"/>
-        where bbi.obj_id = #{objId}
+        where obj_id = #{objId}
     </select>
 
     <insert id="insertBaseBusbarInfo" parameterType="BaseBusbarInfo" useGeneratedKeys="true" keyProperty="objId">
@@ -84,6 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedBy != null">updated_by,</if>
             <if test="updatedTime != null">updated_time,</if>
             <if test="isPictures != null">is_pictures,</if>
+            <if test="wPanPos != null">wPanPos,</if>
+            <if test="wTiltPos != null">wTiltPos,</if>
+            <if test="wZoomPos != null">wZoomPos,</if>
+            <if test="isRotate != null">is_rotate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="busbarCode != null">#{busbarCode},</if>
@@ -99,6 +93,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedBy != null">#{updatedBy},</if>
             <if test="updatedTime != null">#{updatedTime},</if>
             <if test="isPictures != null">#{isPictures},</if>
+            <if test="wPanPos != null">#{wPanPos},</if>
+            <if test="wTiltPos != null">#{wTiltPos},</if>
+            <if test="wZoomPos != null">#{wZoomPos},</if>
+            <if test="isRotate != null">#{isRotate},</if>
          </trim>
     </insert>
 
@@ -118,6 +116,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updatedBy != null">updated_by = #{updatedBy},</if>
             <if test="updatedTime != null">updated_time = #{updatedTime},</if>
             <if test="isPictures != null">is_pictures = #{isPictures},</if>
+            <if test="wPanPos != null">wPanPos = #{wPanPos},</if>
+            <if test="wTiltPos != null">wTiltPos = #{wTiltPos},</if>
+            <if test="wZoomPos != null">wZoomPos = #{wZoomPos},</if>
+            <if test="isRotate != null">is_rotate = #{isRotate},</if>
         </trim>
         where obj_id = #{objId}
     </update>
@@ -127,9 +129,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>
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
index 3cd8664..394ca84 100644
--- a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
@@ -48,14 +48,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>-->
-      <el-form-item label="母排别名" prop="busbarAlias">
+<!--      <el-form-item label="母排别名" prop="busbarAlias">
         <el-input
           v-model="queryParams.busbarAlias"
           placeholder="请输入母排别名"
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="电柜编号" prop="cabinetCode">
         <el-input
           v-model="queryParams.cabinetCode"
@@ -71,7 +71,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>-->
+      </el-form-item>--><!--
       <el-form-item label="是否检测" prop="isChecked">
         <el-select v-model="queryParams.isChecked" placeholder="请选择是否检测" clearable>
           <el-option
@@ -80,8 +80,14 @@
             :label="dict.label"
             :value="dict.value"
           />
+&lt;!&ndash;          <el-option
+            v-for="dict in dict.type.cabinet_is_checked"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />&ndash;&gt;
         </el-select>
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="是否尾排" prop="isEnd">
         <el-select v-model="queryParams.isEnd" placeholder="请选择是否尾排" clearable>
           <el-option
@@ -92,7 +98,7 @@
           />
         </el-select>
       </el-form-item>-->
-      <el-form-item label="是否快检" prop="isFlag">
+<!--      <el-form-item label="是否快检" prop="isFlag">
         <el-select v-model="queryParams.isFlag" placeholder="请选择是否快检" clearable>
           <el-option
             v-for="dict in dict.type.busbar_is_flag"
@@ -101,7 +107,7 @@
             :value="dict.value"
           />
         </el-select>
-</el-form-item>
+</el-form-item>-->
       <!--       <el-form-item label="备注" prop="remark">
          <el-input
            v-model="queryParams.remark"
@@ -148,7 +154,7 @@
            end-placeholder="结束日期"
          ></el-date-picker>
        </el-form-item>-->
-      <el-form-item label="是否拍照" prop="isPictures">
+<!--      <el-form-item label="是否拍照" prop="isPictures">
         <el-select v-model="queryParams.isPictures" placeholder="请选择是否拍照" clearable>
           <el-option
             v-for="dict in dict.type.is_pictures"
@@ -157,7 +163,41 @@
             :value="dict.value"
           />
         </el-select>
+      </el-form-item>-->
+<!--      <el-form-item label="坐标P" prop="wPanPos">
+        <el-input
+          v-model="queryParams.wPanPos"
+          placeholder="请输入坐标P"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
       </el-form-item>
+      <el-form-item label="坐标T" prop="wTiltPos">
+        <el-input
+          v-model="queryParams.wTiltPos"
+          placeholder="请输入坐标T"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="坐标Z" prop="wZoomPos">
+        <el-input
+          v-model="queryParams.wZoomPos"
+          placeholder="请输入坐标Z"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>-->
+<!--      <el-form-item label="是否旋转" prop="isRotate">
+        <el-select v-model="queryParams.isRotate" placeholder="请选择是否旋转" clearable>
+          <el-option
+            v-for="dict in dict.type.is_rotate"
+            :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="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -221,6 +261,7 @@
       <el-table-column label="是否检测" align="center" prop="isChecked">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.busbar_is_checked" :value="scope.row.isChecked"/>
+<!--          <dict-tag :options="dict.type.cabinet_is_checked" :value="scope.row.isChecked"/>-->
         </template>
       </el-table-column>
       <el-table-column label="是否尾排" align="center" prop="isEnd">
@@ -251,6 +292,14 @@
           <dict-tag :options="dict.type.is_pictures" :value="scope.row.isPictures"/>
         </template>
       </el-table-column>
+      <el-table-column label="坐标P" align="center" prop="wPanPos" />
+      <el-table-column label="坐标T" align="center" prop="wTiltPos" />
+      <el-table-column label="坐标Z" align="center" prop="wZoomPos" />
+      <el-table-column label="是否旋转" align="center" prop="isRotate">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_rotate" :value="scope.row.isRotate"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -305,6 +354,11 @@
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
+<!--            <el-radio
+              v-for="dict in dict.type.cabinet_is_checked"
+              :key="dict.value"
+              :label="parseInt(dict.value)"
+            >{{dict.label}}</el-radio>-->
           </el-radio-group>
         </el-form-item>
         <el-form-item label="是否尾排" prop="isEnd">
@@ -359,6 +413,24 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
+        <el-form-item label="坐标P" prop="wPanPos">
+          <el-input v-model="form.wPanPos" placeholder="请输入坐标P" />
+        </el-form-item>
+        <el-form-item label="坐标T" prop="wTiltPos">
+          <el-input v-model="form.wTiltPos" placeholder="请输入坐标T" />
+        </el-form-item>
+        <el-form-item label="坐标Z" prop="wZoomPos">
+          <el-input v-model="form.wZoomPos" placeholder="请输入坐标Z" />
+        </el-form-item>
+        <el-form-item label="是否旋转" prop="isRotate">
+          <el-radio-group v-model="form.isRotate">
+            <el-radio
+              v-for="dict in dict.type.is_rotate"
+              :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="submitForm">确 定</el-button>
@@ -374,7 +446,7 @@ import {getBaseCabinetInfoTree} from "@/api/base/baseCabinetInfo";
 
 export default {
   name: "BaseBusbarInfo",
-  dicts: ['is_pictures', 'busbar_is_flag', 'busbar_is_end', 'busbar_is_checked'],
+  dicts: ['is_pictures', 'is_rotate', 'cabinet_is_checked', 'busbar_is_flag', 'busbar_is_end'],
   data() {
     return {
       //电柜信息下拉树选项
@@ -426,7 +498,11 @@ export default {
         createdTime: null,
         updatedBy: null,
         updatedTime: null,
-        isPictures: null
+        isPictures: null,
+        wPanPos: null,
+        wTiltPos: null,
+        wZoomPos: null,
+        isRotate: null
       },
       // 表单参数
       form: {},
@@ -487,7 +563,11 @@ export default {
         createdTime: null,
         updatedBy: null,
         updatedTime: null,
-        isPictures: null
+        isPictures: null,
+        wPanPos: null,
+        wTiltPos: null,
+        wZoomPos: null,
+        isRotate: null
       };
       this.resetForm("form");
     },
@@ -585,7 +665,8 @@ export default {
 };
 </script>
 
-<style scoped>.tree-container {
+<style scoped>
+.tree-container {
   height: 666px; /* 设置固定高度 */
   overflow-y: auto; /* 添加垂直滚动条 */
 }