提交代码

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 = "预警值")
+    @Excel(name = "当前高度")
-    private String warnData;
+    private String height;
 
-    /** 实际值 */
+    /** 当前幅度 */
-    @Excel(name = "实际值")
+    @Excel(name = "当前幅度")
-    private String realData;
+    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) 
+
-    {
+    public String getHeight() {
-        this.warnData = warnData;
+        return height;
     }
 
-    public String getWarnData() 
+    public void setHeight(String height) {
-    {
+        this.height = height;
-        return warnData;
-    }
-    public void setRealData(String realData) 
-    {
-        this.realData = realData;
     }
 
-    public String getRealData() 
+    public String getRange() {
-    {
+        return range;
-        return realData;
     }
-    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())

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">
 <mapper namespace="com.yanzhu.device.mapper.DevTowerDataWarningMapper">
-    
+
     <resultMap type="DevTowerDataWarning" id="DevTowerDataWarningResult">
         <result property="id"    column="id"    />
         <result property="cfgId"    column="cfg_id"    />
@@ -19,8 +19,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="warnType"    column="warn_type"    />
         <result property="warnName"    column="warn_name"    />
         <result property="warnNote"    column="warn_note"    />
-        <result property="warnData"    column="warn_data"    />
+        <result property="height"    column="height"    />
-        <result property="realData"    column="real_data"    />
+        <result property="range"    column="range"    />
+        <result property="rotation"    column="rotation"    />
+        <result property="load"    column="load"    />
+        <result property="windSpeed"    column="wind_speed"    />
+        <result property="leanAngleX"    column="lean_angle_x"    />
+        <result property="leanAngleY"    column="lean_angle_y"    />
+        <result property="momentPercent"    column="moment_percent"    />
+        <result property="rate"    column="rate"    />
+        <result property="alarmed"    column="alarmed"    />
         <result property="isDel"    column="is_del"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -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.height,
-               dtdw.real_data,
+               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 sp on sp.dept_id = dtdw.project_id
-                 left join sys_dept sd on sd.dept_id = dtdw.com_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 pro_project_info_subdepts pd on pd.id=dtdw.dept_id
     </sql>
 
     <select id="selectDevTowerDataWarningList" parameterType="DevTowerDataWarning" resultMap="DevTowerDataWarningResult">
@@ -74,12 +90,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
         order by dtdw.id desc
     </select>
-    
+
     <select id="selectDevTowerDataWarningById" parameterType="Long" resultMap="DevTowerDataWarningResult">
         <include refid="selectDevTowerDataWarningVo"/>
         where dtdw.id = #{id} and dtdw.is_del=0
     </select>
-        
+
     <insert id="insertDevTowerDataWarning" parameterType="DevTowerDataWarning" useGeneratedKeys="true" keyProperty="id">
         insert into dev_tower_data_warning
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -93,8 +109,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warnType != null">warn_type,</if>
             <if test="warnName != null">warn_name,</if>
             <if test="warnNote != null">warn_note,</if>
-            <if test="warnData != null">warn_data,</if>
+            <if test="height != null">height,</if>
-            <if test="realData != null">real_data,</if>
+            <if test="range != null">`range`,</if>
+            <if test="rotation != null">rotation,</if>
+            <if test="load != null">`load`,</if>
+            <if test="windSpeed != null">wind_speed,</if>
+            <if test="leanAngleX != null">lean_angle_x,</if>
+            <if test="leanAngleY != null">lean_angle_y,</if>
+            <if test="momentPercent != null">moment_percent,</if>
+            <if test="rate != null">rate,</if>
+            <if test="alarmed != null">alarmed,</if>
             <if test="isDel != null">is_del,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -113,8 +137,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warnType != null">#{warnType},</if>
             <if test="warnName != null">#{warnName},</if>
             <if test="warnNote != null">#{warnNote},</if>
-            <if test="warnData != null">#{warnData},</if>
+            <if test="height != null">#{height},</if>
-            <if test="realData != null">#{realData},</if>
+            <if test="range != null">#{range},</if>
+            <if test="rotation != null">#{rotation},</if>
+            <if test="load != null">#{load},</if>
+            <if test="windSpeed != null">#{windSpeed},</if>
+            <if test="leanAngleX != null">#{leanAngleX},</if>
+            <if test="leanAngleY != null">#{leanAngleY},</if>
+            <if test="momentPercent != null">#{momentPercent},</if>
+            <if test="rate != null">#{rate},</if>
+            <if test="alarmed != null">#{alarmed},</if>
             <if test="isDel != null">#{isDel},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -137,8 +169,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="warnType != null">warn_type = #{warnType},</if>
             <if test="warnName != null">warn_name = #{warnName},</if>
             <if test="warnNote != null">warn_note = #{warnNote},</if>
-            <if test="warnData != null">warn_data = #{warnData},</if>
+            <if test="height != null">height = #{height},</if>
-            <if test="realData != null">real_data = #{realData},</if>
+            <if test="range != null">`range` = #{range},</if>
+            <if test="rotation != null">rotation = #{rotation},</if>
+            <if test="load != null">`load` = #{load},</if>
+            <if test="windSpeed != null">wind_speed = #{windSpeed},</if>
+            <if test="leanAngleX != null">lean_angle_x = #{leanAngleX},</if>
+            <if test="leanAngleY != null">lean_angle_y = #{leanAngleY},</if>
+            <if test="momentPercent != null">moment_percent = #{momentPercent},</if>
+            <if test="rate != null">rate = #{rate},</if>
+            <if test="alarmed != null">alarmed = #{alarmed},</if>
             <if test="isDel != null">is_del = #{isDel},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
@@ -154,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteDevTowerDataWarningByIds" parameterType="String">
-        delete from dev_tower_data_warning where id in 
+        delete from dev_tower_data_warning where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/device/TowerCraneApiController.java

@@ -154,7 +154,7 @@ public class TowerCraneApiController {
             List<String> warnings = (List<String>) 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<String> warnings = (List<String>) 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();
     }