鑫华

eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/AbnormalController.java

@@ -140,7 +140,6 @@ public class AbnormalController {
         drybeachequipinforService.dealLevel(map);
         return new ResponseEntity<>(new PostOrPutResult().success(), HttpStatus.OK);
     }
-
     @ApiOperation(value = "报警信息分页查询")
     @GetMapping("histoty")
     public ResponseEntity<Object> page(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {

eladmin-system/src/main/java/me/zhengjie/gemho/mapper/tab/DrybeachequipinforMapper.java

@@ -78,16 +78,20 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor>
     @Select(value = "select equipno as id ,equipname as name from tb_drybeachequipinfor where tailingid =#{tailno} and equipname !='基准点'")
     List<HashMap<String, Object>> getDevice(String tailingid);
 
-    @Select(value = "<script>" +
-            "select equipno, equipname, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm,eqdanwei as unit from tb_drybeachequipinfor where tailingid = #{tailingid}" +
-            " <if test='searchValue!=\"\" and searchValue!=null '>\n" +
-            "            and equipname like CONCAT('%',#{searchValue},'%')\n" +
-            "        </if>" +
-            "</script>")
     Page<LevelVo> level(Page page, String tailingid, String searchName, String searchValue);
 
     int dealLevel(@Param(value = "equipno") String equipno, @Param(value = "onelevelalarm") String onelevelalarm, @Param(value = "twolevelalarm") String twolevelalarm, @Param(value = "threelevelalarm") String threelevelalarm, @Param(value = "fourlevelalarm") String fourlevelalarm);
 
+    List<HashMap<String, Object>> selectListMp(@Param("equipno") String equipno);
+
+    int insertMp(@Param(value = "equipno") String equipno,
+                 @Param(value = "onelevelalarm") String onelevelalarm,
+                 @Param(value = "twolevelalarm") String twolevelalarm,
+                 @Param(value = "threelevelalarm") String threelevelalarm,
+                 @Param(value = "fourlevelalarm") String fourlevelalarm);
+
+    int dealLevelMp(@Param(value = "equipno") String equipno, @Param(value = "onelevelalarm") String onelevelalarm, @Param(value = "twolevelalarm") String twolevelalarm, @Param(value = "threelevelalarm") String threelevelalarm, @Param(value = "fourlevelalarm") String fourlevelalarm);
+
     List<HashMap<String, Object>> dryStateCount(String tailingid);
 
     Integer dryUnCount(String tailingid);

eladmin-system/src/main/java/me/zhengjie/gemho/x_datavo/tab/dry/LevelVo.java

 package me.zhengjie.gemho.x_datavo.tab.dry;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import lombok.Data;
 
 /**
@@ -9,9 +10,18 @@ import lombok.Data;
 public class LevelVo {
     private String equipname;
     private String equipno;
-    private double fourlevelalarm;
-    private double onelevelalarm;
-    private double threelevelalarm;
-    private double twolevelalarm;
+    private String deviceType;
+    private String fourlevelalarm;
+    @JSONField(serialize = false)
+    private String fourlevelalarmXYZ;
+    private String onelevelalarm;
+    @JSONField(serialize = false)
+    private String onelevelalarmXYZ;
+    private String threelevelalarm;
+    @JSONField(serialize = false)
+    private String threelevelalarmXYZ;
+    private String twolevelalarm;
+    @JSONField(serialize = false)
+    private String twolevelalarmXYZ;
     private String unit;
 }

eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="me.zhengjie.gemho.mapper.tab.DrybeachequipinforMapper">
+    <select id="level" resultType="me.zhengjie.gemho.x_datavo.tab.dry.LevelVo">
+        select td.equipno, equipname,devicetype as deviceType, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm,eqdanwei as unit,
+        da.one_alarm as onelevelalarmXYZ ,da.two_alarm as twolevelalarmXYZ ,da.three_alarm as threelevelalarmXYZ,da.four_alarm as  fourlevelalarmXYZ
+        from tb_drybeachequipinfor td
+       left join tb_mp_device_alarm da on td.equipno = da.equipno
+        where tailingid = #{tailingid}
+        <if test='searchValue!="" and searchValue!=null '>
+            and equipname like CONCAT('%',#{searchValue},'%')
+        </if>
+    </select>
     <delete id="deleteall">
         DELETE
         td.*,sy.*,ss.* from tb_drybeachequipinfor td left join sys_summary sy on td.equipno = sy.deviceid left join sys_select ss on sy.id= ss.sumid where td.equipno=
@@ -14,6 +24,14 @@
             fourlevelalarm=#{fourlevelalarm}
         where equipno = #{equipno}
     </update>
+    <update id="dealLevelMp">
+        update tb_mp_device_alarm
+        set one_alarm=#{onelevelalarm},
+            two_alarm=#{twolevelalarm},
+            three_alarm=#{threelevelalarm},
+            four_alarm=#{fourlevelalarm}
+        where equipno = #{equipno}
+    </update>
     <select id="dryStateCount" resultType="hashmap">
         SELECT equipno,
                case
@@ -44,4 +62,13 @@
         set initialstateno = '1'
         where equipno = #{equipno}
     </update>
+
+    <select id="selectListMp" resultType="java.util.HashMap">
+        select * from tb_mp_device_alarm  where equipno = #{equipno}
+    </select>
+
+    <insert id="insertMp">
+        insert into tb_mp_device_alarm (equipno,one_alarm,two_alarm,three_alarm,four_alarm)
+            values (#{equipno},#{onelevelalarm},#{twolevelalarm},#{threelevelalarm},#{fourlevelalarm})
+    </insert>
 </mapper>