jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_xd' of http://62.234.3.186:3000/jiangyq/YZProjectCloud into dev_xd

dev_xd
姜玉琦 2025-03-30 22:04:23 +08:00
parent 5a580280a7 3cdb0d62da
commit dd32355b98
9 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-bigscreen/src/views/safety/towerCrane.vue
View File

@ -191,7 +191,8 @@
<div class="safe-tower-crane-min" style="position: relative">
<el-row class="row-crane-min">
<el-col :span="2">
<div class="safe-tower-left" @click="safeTowerLeft"></div>
<div class="safe-tower-left" v-if="towerConfigList.length > 1"
@click="safeTowerLeft"></div>
</el-col>
<el-col :span="20">
<div class="safe-tower-content-max">
@ -206,7 +207,8 @@
</div>
</el-col>
<el-col :span="2">
<div class="safe-tower-right" @click="safeTowerRight"></div>
<div class="safe-tower-right" v-if="towerConfigList.length > 1"
@click="safeTowerRight"></div>
</el-col>
</el-row>
</div>
@ -399,7 +401,7 @@ export default {
},
initTowerConfigView() {
let postData = {
comdId: this.selProject.comId,
comId: this.selProject.comId,
projectId: this.selProject.id,
};
this.$api.tower.findTowerConfigGroupOnline(postData).then((d) => {

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
View File

@ -70,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataCollideList" parameterType="DevTowerDataCollide" resultMap="DevTowerDataCollideResult">
<include refid="selectDevTowerDataCollideVo"/>
<where>
dtdc.is_del=0
<if test="cfgId != null">and dtdc.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
<if test="comId != null "> and dtdc.com_id = #{comId}</if>
@ -89,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.id as sub_id, b.collide_id as sub_collide_id, b.device_key as sub_device_key, b.device_source as sub_device_source, b.tower_id as sub_tower_id, b.coordinate_x as sub_coordinate_x, b.coordinate_y as sub_coordinate_y, b.front_brachium as sub_front_brachium, b.after_brachium as sub_after_brachium, b.tower_body_height as sub_tower_body_height, b.height as sub_height, b.angle as sub_angle, b.range as sub_range, b.collide_horizontal_distance as sub_collide_horizontal_distance, b.collide_vertical_distance as sub_collide_vertical_distance, b.collide_state as sub_collide_state
from dev_tower_data_collide a
left join dev_tower_data_collide_detail b on b.collide_id = a.id
where a.id = #{id}
where a.id = #{id} and a.is_del=0
</select>
<insert id="insertDevTowerDataCollide" parameterType="DevTowerDataCollide" useGeneratedKeys="true" keyProperty="id">
@ -211,6 +212,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findCollideCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
select count(1) as total from dev_tower_data_collide
<where>
is_del=0
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>
</where>

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
View File

@ -66,12 +66,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_dept sd on sd.dept_id = dtdl.com_id
left join pro_project_info_subdepts pd on pd.id=dtdl.dept_id
</sql>
<select id="selectDevTowerDataLimitList" parameterType="DevTowerDataLimit" resultMap="DevTowerDataLimitResult">
<include refid="selectDevTowerDataLimitVo"/>
<where>
dtdl.is_del=0
<if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataLimitById" parameterType="Long" resultMap="DevTowerDataLimitResult">
<include refid="selectDevTowerDataLimitVo"/>
where dtdl.id = #{id}
where dtdl.id = #{id} and dtdr.is_del=0
</select>
<insert id="insertDevTowerDataLimit" parameterType="DevTowerDataLimit" useGeneratedKeys="true" keyProperty="id">

3
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
View File

@ -85,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataLocalList" parameterType="DevTowerDataLocal" resultMap="DevTowerDataLocalResult">
<include refid="selectDevTowerDataLocalVo"/>
<where>
dtdl.is_del=0
<if test="cfgId != null">and dtdl.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
<if test="comId != null "> and dtdl.com_id = #{comId}</if>
@ -101,7 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataLocalById" parameterType="Long" resultMap="DevTowerDataLocalResult">
<include refid="selectDevTowerDataLocalVo"/>
where dtdl.id = #{id}
where dtdl.id = #{id} and dtdr.is_del=0
</select>
<insert id="insertDevTowerDataLocal" parameterType="DevTowerDataLocal" useGeneratedKeys="true" keyProperty="id">

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
View File

@ -102,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataRoundList" parameterType="DevTowerDataRound" resultMap="DevTowerDataRoundResult">
<include refid="selectDevTowerDataRoundVo"/>
<where>
dtdr.is_del=0
<if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
@ -118,7 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataRoundById" parameterType="Long" resultMap="DevTowerDataRoundResult">
<include refid="selectDevTowerDataRoundVo"/>
where dtdr.id = #{id}
where dtdr.id = #{id} and dtdr.is_del=0
</select>
<insert id="insertDevTowerDataRound" parameterType="DevTowerDataRound" useGeneratedKeys="true" keyProperty="id">
@ -270,6 +271,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findRoundCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
select count(1) as total from dev_tower_data_round
<where>
is_del=0
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
<if test='activeName == "cz"'> and is_overload = 1 </if>
<if test='activeName == "gj"'> and is_alarm = 1 </if>

4
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
View File

@ -92,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataRunList" parameterType="DevTowerDataRun" resultMap="DevTowerDataRunResult">
<include refid="selectDevTowerDataRunVo"/>
<where>
dtdr.is_del=0
<if test="cfgId != null">and dtdr.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
<if test="comId != null "> and dtdr.com_id = #{comId}</if>
@ -108,7 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataRunById" parameterType="Long" resultMap="DevTowerDataRunResult">
<include refid="selectDevTowerDataRunVo"/>
where dtdr.id = #{id}
where dtdr.id = #{id} and dtdr.is_del=0
</select>
<insert id="insertDevTowerDataRun" parameterType="DevTowerDataRun" useGeneratedKeys="true" keyProperty="id">
@ -242,6 +243,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findRunCountByDeviceKey" parameterType="DevTowerDataRound" resultType="Int">
select count(1) as total from dev_tower_data_run
<where>
is_del=0
<if test="deviceKey != null and deviceKey != ''">and cfg_id in (select dc.id from dev_tower_project_config dc where dc.device_sn=#{deviceKey}) and device_key = #{deviceKey}</if>
<if test='activeName == "gj"'> and is_alarm = 1 </if>
<if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and date(create_time) between #{params.beginCreateTime} and #{params.endCreateTime}</if>

3
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
View File

@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataWarningList" parameterType="DevTowerDataWarning" resultMap="DevTowerDataWarningResult">
<include refid="selectDevTowerDataWarningVo"/>
<where>
dtdw.is_del=0
<if test="cfgId != null">and dtdw.cfg_id = #{cfgId}</if>
<if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
<if test="comId != null "> and dtdw.com_id = #{comId}</if>
@ -76,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerDataWarningById" parameterType="Long" resultMap="DevTowerDataWarningResult">
<include refid="selectDevTowerDataWarningVo"/>
where dtdw.id = #{id}
where dtdw.id = #{id} and dtdw.is_del=0
</select>
<insert id="insertDevTowerDataWarning" parameterType="DevTowerDataWarning" useGeneratedKeys="true" keyProperty="id">

7
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
View File

@ -75,7 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
<include refid="selectDevTowerProjectConfigVo"/>
<where>
<where>
dtpc.is_del = 0
<if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
<if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
<if test="comId != null "> and dtpc.com_id = #{comId}</if>
@ -86,14 +87,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceSource != null and deviceSource != ''"> and dtpc.device_source = #{deviceSource}</if>
<if test="towerId != null and towerId != ''"> and dtpc.tower_id = #{towerId}</if>
<if test="towerType != null and towerType != ''"> and dtpc.tower_type = #{towerType}</if>
<if test="isDel != null "> and dtpc.is_del = #{isDel}</if>
</where>
order by dtpc.id desc
</select>
<select id="selectDevTowerProjectConfigById" parameterType="Long" resultMap="DevTowerProjectConfigResult">
<include refid="selectDevTowerProjectConfigVo"/>
where dtpc.id = #{id}
where dtpc.id = #{id} and dtpc.is_del=0
</select>
<insert id="insertDevTowerProjectConfig" parameterType="DevTowerProjectConfig" useGeneratedKeys="true" keyProperty="id">
@ -203,6 +203,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="findtowerConfigGroupOnline" parameterType="DevTowerProjectConfig" resultType="Map">
select online, count(1) as total from dev_tower_project_config
<where>
is_del=0
<if test="projectId != null "> and project_id = #{projectId}</if>
<if test="comId != null "> and com_id = #{comId}</if>
</where>

3
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/bigscreen/TowerCraneController.java
View File

@ -53,6 +53,7 @@ public class TowerCraneController extends BaseController {
{
DevTowerProjectConfig devTowerProjectConfig = new DevTowerProjectConfig();
devTowerProjectConfig.setProjectId(Convert.toLong(projectId));
devTowerProjectConfig.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
List<Map<String, Object>> list = devTowerProjectConfigService.findtowerConfigGroupOnline(devTowerProjectConfig);
return success(list);
}
@ -87,6 +88,7 @@ public class TowerCraneController extends BaseController {
public AjaxResult selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
{
startPage();
devTowerDataLimit.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
List<DevTowerDataLimit> list = devTowerDataLimitService.selectDevTowerDataLimitList(devTowerDataLimit);
return success(list);
}
@ -98,6 +100,7 @@ public class TowerCraneController extends BaseController {
public AjaxResult selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
{
startPage();
devTowerDataRun.setIsDel(Convert.toLong(PublicStateEnum.OK.getCode()));
List<DevTowerDataRun> list = devTowerDataRunService.selectDevTowerDataRunList(devTowerDataRun);
return success(list);
}