zangch
/
SaiLun.Thermoelectricity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add(base): 母线信息增加是否快速巡检功能

Browse Source 
- 在 BaseBusbarInfo 模型中添加 isInsp 字段，用于表示是否快速巡检
- 在 BaseBusbarInfoMapper.xml 中添加相应的 SQL 语句，支持 isInsp 字段的查询和更新- 在前端页面中添加是否快速巡检的筛选条件和表格列
- 更新相关的数据字典，增加 is_insp 类型
IOT
zch 1 year ago
parent ca5453aad6
commit 275abacb1a
3 changed files with 59 additions and 11 deletions
Show Stats Download Patch File Download Diff File

12
ruoyi-module/src/main/java/com/ruoyi/base/domain/BaseBusbarInfo.java
Unescape Escape View File

@ -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();
}
}

18
ruoyi-module/src/main/resources/mapper/base/BaseBusbarInfoMapper.xml
Unescape Escape View File

@ -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>
</mapper>

40
ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
Unescape Escape View File

@ -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");
},

Write Preview
Loading…
Cancel
Save