Skip to content

N
New MineTRS
Commit f6c1c233 authored by kiritoausna's avatar kiritoausna
Browse files
Options

鑫华

parent 832d88f3
Show whitespace changes
Inline Side-by-side
Showing with 259 additions and 192 deletions
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/AbnormalController.java
View file @ f6c1c233
...@@ -140,7 +140,6 @@ public class AbnormalController { ...@@ -140,7 +140,6 @@ public class AbnormalController {
drybeachequipinforService.dealLevel(map); drybeachequipinforService.dealLevel(map);
return new ResponseEntity<>(new PostOrPutResult().success(), HttpStatus.OK); return new ResponseEntity<>(new PostOrPutResult().success(), HttpStatus.OK);
} }
@ApiOperation(value = "报警信息分页查询") @ApiOperation(value = "报警信息分页查询")
@GetMapping("histoty") @GetMapping("histoty")
public ResponseEntity<Object> page(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public ResponseEntity<Object> page(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
......
eladmin-system/src/main/java/me/zhengjie/gemho/mapper/tab/DrybeachequipinforMapper.java
View file @ f6c1c233
...@@ -78,16 +78,20 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor> ...@@ -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 !='基准点'") @Select(value = "select equipno as id ,equipname as name from tb_drybeachequipinfor where tailingid =#{tailno} and equipname !='基准点'")
List<HashMap<String, Object>> getDevice(String tailingid); 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); 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); 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); List<HashMap<String, Object>> dryStateCount(String tailingid);
Integer dryUnCount(String tailingid); Integer dryUnCount(String tailingid);
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/DrybeachequipinforServiceImpl.java
View file @ f6c1c233
...@@ -19,6 +19,7 @@ import me.zhengjie.utils.SecurityUtils; ...@@ -19,6 +19,7 @@ import me.zhengjie.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.*; import java.util.*;
...@@ -139,8 +140,23 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo ...@@ -139,8 +140,23 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo
String tailingid = TailNoForInfoUtil.getTailInfoNo(request); String tailingid = TailNoForInfoUtil.getTailInfoNo(request);
Page<HashMap<String, Object>> drybeachequipinforPage = new Page<>(page + 1, size); Page<HashMap<String, Object>> drybeachequipinforPage = new Page<>(page + 1, size);
Page<LevelVo> page1 = drybeachequipinforMapper.level(drybeachequipinforPage, tailingid, searchName, searchValue); Page<LevelVo> page1 = drybeachequipinforMapper.level(drybeachequipinforPage, tailingid, searchName, searchValue);
List records = page1.getRecords(); List<LevelVo> records = page1.getRecords();
long total = page1.getTotal(); long total = page1.getTotal();
records.forEach(item->{
String fourlevelalarmXYZ = item.getFourlevelalarmXYZ();
if (!ObjectUtils.isEmpty(fourlevelalarmXYZ)){
item.setFourlevelalarm(fourlevelalarmXYZ);
} String threelevelalarmXYZ = item.getThreelevelalarmXYZ();
if (!ObjectUtils.isEmpty(threelevelalarmXYZ)){
item.setThreelevelalarm(threelevelalarmXYZ);
} String twolevelalarmXYZ = item.getTwolevelalarmXYZ();
if (!ObjectUtils.isEmpty(twolevelalarmXYZ)){
item.setTwolevelalarm(twolevelalarmXYZ);
} String onelevelalarmXYZ = item.getOnelevelalarmXYZ();
if (!ObjectUtils.isEmpty(fourlevelalarmXYZ)){
item.setOnelevelalarm(onelevelalarmXYZ);
}
});
map.put("list", records); map.put("list", records);
map.put("total", total); map.put("total", total);
return map; return map;
...@@ -149,13 +165,24 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo ...@@ -149,13 +165,24 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo
@Override @Override
public void dealLevel(HashMap<String, String> map) { public void dealLevel(HashMap<String, String> map) {
String equipno = map.get("equipno"); String equipno = map.get("equipno");
String deviceType = map.get("deviceType");
String onelevelalarm = map.get("onelevelalarm"); String onelevelalarm = map.get("onelevelalarm");
String twolevelalarm = map.get("twolevelalarm"); String twolevelalarm = map.get("twolevelalarm");
String threelevelalarm = map.get("threelevelalarm"); String threelevelalarm = map.get("threelevelalarm");
String fourlevelalarm = map.get("fourlevelalarm"); String fourlevelalarm = map.get("fourlevelalarm");
if ("3".equals(deviceType)) {
List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.selectListMp(equipno);
if (ObjectUtils.isEmpty(hashMaps)){
drybeachequipinforMapper.insertMp(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
}else {
drybeachequipinforMapper.dealLevelMp(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
}
} else {
drybeachequipinforMapper.dealLevel(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm); drybeachequipinforMapper.dealLevel(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
} }
}
@Override @Override
public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) { public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) {
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request); String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
......
eladmin-system/src/main/java/me/zhengjie/gemho/x_datavo/tab/dry/LevelVo.java
View file @ f6c1c233
package me.zhengjie.gemho.x_datavo.tab.dry; package me.zhengjie.gemho.x_datavo.tab.dry;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
/** /**
...@@ -9,9 +10,18 @@ import lombok.Data; ...@@ -9,9 +10,18 @@ import lombok.Data;
public class LevelVo { public class LevelVo {
private String equipname; private String equipname;
private String equipno; private String equipno;
private double fourlevelalarm; private String deviceType;
private double onelevelalarm; private String fourlevelalarm;
private double threelevelalarm; @JSONField(serialize = false)
private double twolevelalarm; 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; private String unit;
} }
eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml
View file @ f6c1c233
<?xml version="1.0" encoding="UTF-8"?> <?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"> <!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"> <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 id="deleteall">
DELETE 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= 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 @@ ...@@ -14,6 +24,14 @@
fourlevelalarm=#{fourlevelalarm} fourlevelalarm=#{fourlevelalarm}
where equipno = #{equipno} where equipno = #{equipno}
</update> </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 id="dryStateCount" resultType="hashmap">
SELECT equipno, SELECT equipno,
case case
...@@ -44,4 +62,13 @@ ...@@ -44,4 +62,13 @@
set initialstateno = '1' set initialstateno = '1'
where equipno = #{equipno} where equipno = #{equipno}
</update> </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> </mapper>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment