From f5c0d8e28a4f1b00a6dc0716e034d14bd298df83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Tue, 20 May 2025 22:18:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/domain/DevTowerDataWarning.java | 137 +- .../device/DevTowerDataWarningMapper.xml | 74 +- .../device/TowerCraneApiController.java | 32 +- .../views/device/towerProjectConfig/index.vue | 1098 ++++++++++------- 4 files changed, 819 insertions(+), 522 deletions(-) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java index d29a474b..936509ba 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/device/domain/DevTowerDataWarning.java @@ -77,13 +77,45 @@ public class DevTowerDataWarning extends BaseEntity @Excel(name = "预警内容") private String warnNote; - /** 预警值 */ - @Excel(name = "预警值") - private String warnData; + /** 当前高度 */ + @Excel(name = "当前高度") + private String height; - /** 实际值 */ - @Excel(name = "实际值") - private String realData; + /** 当前幅度 */ + @Excel(name = "当前幅度") + private String range; + + /** 回转 */ + @Excel(name = "回转") + private String rotation; + + /** 当前吊重 */ + @Excel(name = "当前吊重") + private String load; + + /** 风速 */ + @Excel(name = "风速") + private String windSpeed; + + /** 水平倾角 */ + @Excel(name = "水平倾角") + private String leanAngleX; + + /** 垂直倾角 */ + @Excel(name = "垂直倾角") + private String leanAngleY; + + /** 力矩百分比 */ + @Excel(name = "力矩百分比") + private String momentPercent; + + /** 报警标识 */ + @Excel(name = "报警标识") + private Long alarmed; + + /** 倍率 */ + @Excel(name = "倍率") + private String rate; /** 是否有效 */ @Excel(name = "是否有效") @@ -179,25 +211,80 @@ public class DevTowerDataWarning extends BaseEntity { return warnNote; } - public void setWarnData(String warnData) - { - this.warnData = warnData; + + public String getHeight() { + return height; } - public String getWarnData() - { - return warnData; - } - public void setRealData(String realData) - { - this.realData = realData; + public void setHeight(String height) { + this.height = height; } - public String getRealData() - { - return realData; + public String getRange() { + return range; } - public void setIsDel(Long isDel) + + public void setRange(String range) { + this.range = range; + } + + public String getRotation() { + return rotation; + } + + public void setRotation(String rotation) { + this.rotation = rotation; + } + + public String getLoad() { + return load; + } + + public void setLoad(String load) { + this.load = load; + } + + public String getWindSpeed() { + return windSpeed; + } + + public void setWindSpeed(String windSpeed) { + this.windSpeed = windSpeed; + } + + public String getLeanAngleX() { + return leanAngleX; + } + + public void setLeanAngleX(String leanAngleX) { + this.leanAngleX = leanAngleX; + } + + public String getLeanAngleY() { + return leanAngleY; + } + + public void setLeanAngleY(String leanAngleY) { + this.leanAngleY = leanAngleY; + } + + public String getMomentPercent() { + return momentPercent; + } + + public void setMomentPercent(String momentPercent) { + this.momentPercent = momentPercent; + } + + public String getRate() { + return rate; + } + + public void setRate(String rate) { + this.rate = rate; + } + + public void setIsDel(Long isDel) { this.isDel = isDel; } @@ -215,6 +302,14 @@ public class DevTowerDataWarning extends BaseEntity this.projectName = projectName; } + public Long getAlarmed() { + return alarmed; + } + + public void setAlarmed(Long alarmed) { + this.alarmed = alarmed; + } + public String getComName() { return comName; } @@ -235,8 +330,6 @@ public class DevTowerDataWarning extends BaseEntity .append("warnType", getWarnType()) .append("warnName", getWarnName()) .append("warnNote", getWarnNote()) - .append("warnData", getWarnData()) - .append("realData", getRealData()) .append("isDel", getIsDel()) .append("createBy", getCreateBy()) .append("createTime", getCreateTime()) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml index a1ee4ca4..a2a9a496 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -19,8 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - + + + + + + + + + + @@ -42,8 +50,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dtdw.warn_type, dtdw.warn_name, dtdw.warn_note, - dtdw.warn_data, - dtdw.real_data, + dtdw.height, + dtdw.range, + dtdw.rotation, + dtdw.load, + dtdw.wind_speed, + dtdw.lean_angle_x, + dtdw.lean_angle_y, + dtdw.moment_percent, + dtdw.rate, + dtdw.alarmed, dtdw.is_del, dtdw.create_by, dtdw.create_time, @@ -51,9 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" dtdw.update_time, dtdw.remark from dev_tower_data_warning dtdw - left join sys_dept sp on sp.dept_id = dtdw.project_id - left join sys_dept sd on sd.dept_id = dtdw.com_id - left join pro_project_info_subdepts pd on pd.id=dtdw.dept_id + left join sys_dept sp on sp.dept_id = dtdw.project_id + left join sys_dept sd on sd.dept_id = dtdw.com_id + left join pro_project_info_subdepts pd on pd.id=dtdw.dept_id - + - + insert into dev_tower_data_warning @@ -93,8 +109,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warn_type, warn_name, warn_note, - warn_data, - real_data, + height, + `range`, + rotation, + `load`, + wind_speed, + lean_angle_x, + lean_angle_y, + moment_percent, + rate, + alarmed, is_del, create_by, create_time, @@ -113,8 +137,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{warnType}, #{warnName}, #{warnNote}, - #{warnData}, - #{realData}, + #{height}, + #{range}, + #{rotation}, + #{load}, + #{windSpeed}, + #{leanAngleX}, + #{leanAngleY}, + #{momentPercent}, + #{rate}, + #{alarmed}, #{isDel}, #{createBy}, #{createTime}, @@ -137,8 +169,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" warn_type = #{warnType}, warn_name = #{warnName}, warn_note = #{warnNote}, - warn_data = #{warnData}, - real_data = #{realData}, + height = #{height}, + `range` = #{range}, + rotation = #{rotation}, + `load` = #{load}, + wind_speed = #{windSpeed}, + lean_angle_x = #{leanAngleX}, + lean_angle_y = #{leanAngleY}, + moment_percent = #{momentPercent}, + rate = #{rate}, + alarmed = #{alarmed}, is_del = #{isDel}, create_by = #{createBy}, create_time = #{createTime}, @@ -154,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from dev_tower_data_warning where id in + delete from dev_tower_data_warning where id in #{id} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java index b188edec..272f48d2 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java @@ -154,7 +154,7 @@ public class TowerCraneApiController { List warnings = (List) dataContent.get("warnings"); devTowerDataRun.setWarnings(String.join(",", warnings)); for (String warning : warnings) { - pushWarningData(config, warning); + pushWarningData(config, warning, devTowerDataRun); Integer alarm = Convert.toInt(warning); if (alarm > 100 && alarm < 120) { devTowerDataRun.setIsAlarm(1L); @@ -213,7 +213,7 @@ public class TowerCraneApiController { List warnings = (List) dataContent.get("warning"); devTowerDataRound.setWarnings(String.join(",", warnings)); for (String warning : warnings) { - pushWarningData(config, warning); + pushWarningData(config, warning,null); Integer alarm = Convert.toInt(warning); if (alarm > 6 && alarm < 10) { devTowerDataRound.setIsOverload(1L); @@ -232,13 +232,27 @@ public class TowerCraneApiController { * @param config * @param warning */ - private void pushWarningData(DevTowerProjectConfig config, Object warning) { + private void pushWarningData(DevTowerProjectConfig config, Object warning, DevTowerDataRun devTowerDataRun) { DevTowerDataWarning devTowerDataWarning = new DevTowerDataWarning(); devTowerDataWarning.setCfgId(config.getId()); devTowerDataWarning.setProjectId(config.getProjectId()); devTowerDataWarning.setComId(config.getComId()); devTowerDataWarning.setDeviceKey(config.getDeviceSn()); devTowerDataWarning.setWarnType(Convert.toLong(warning)); + if(devTowerDataRun!=null){ + devTowerDataWarning.setHeight(devTowerDataRun.getHeight()); + devTowerDataWarning.setRange(devTowerDataRun.getRange()); + devTowerDataWarning.setRotation(devTowerDataRun.getRotation()); + devTowerDataWarning.setLoad(devTowerDataRun.getLoad()); + devTowerDataWarning.setWindSpeed(devTowerDataRun.getWindSpeed()); + devTowerDataWarning.setLeanAngleX(devTowerDataRun.getLeanAngleX()); + devTowerDataWarning.setLeanAngleY(devTowerDataRun.getLeanAngleY()); + devTowerDataWarning.setMomentPercent(devTowerDataRun.getMomentPercent()); + devTowerDataWarning.setRate(devTowerDataRun.getRate()); + } + if(devTowerDataWarning.getWarnType()>100){ + devTowerDataWarning.setAlarmed(1L); + } devTowerDataWarningService.insertDevTowerDataWarning(devTowerDataWarning); } @@ -473,6 +487,18 @@ public class TowerCraneApiController { String warningType = convertTyTowerWarningType(req.getType_id().toString()); devTowerDataWarning.setWarnType(Convert.toLong(warningType)); devTowerDataWarning.setWarnNote(req.getType()); + devTowerDataWarning.setHeight(Convert.toStr(req.getHeight())); + devTowerDataWarning.setRange(Convert.toStr(req.getRange())); + devTowerDataWarning.setRotation(Convert.toStr(req.getRotation())); + devTowerDataWarning.setLoad(Convert.toStr(req.getLifting_weight())); + devTowerDataWarning.setWindSpeed(Convert.toStr(req.getWind_speed())); + devTowerDataWarning.setLeanAngleX(Convert.toStr(req.getAnteversion_x())); + devTowerDataWarning.setLeanAngleY(Convert.toStr(req.getAnteversion_y())); + devTowerDataWarning.setMomentPercent(Convert.toStr(req.getForce_distance())); + devTowerDataWarning.setRate(Convert.toStr(req.getMagnification())); + if(devTowerDataWarning.getWarnType()>100){ + devTowerDataWarning.setAlarmed(1L); + } devTowerDataWarningService.insertDevTowerDataWarning(devTowerDataWarning); return AjaxResult.success(); } diff --git a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue index d4b5f4e2..d1949701 100644 --- a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue +++ b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue @@ -1,116 +1,222 @@ \ No newline at end of file +.tower-project-config { +} +