Commit f6c1c233 authored by kiritoausna's avatar kiritoausna

鑫华

parent 832d88f3
...@@ -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) {
......
...@@ -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);
......
...@@ -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.*;
...@@ -33,185 +34,211 @@ import java.util.*; ...@@ -33,185 +34,211 @@ import java.util.*;
*/ */
@Service @Service
public class DrybeachequipinforServiceImpl extends ServiceImpl<DrybeachequipinforMapper, Drybeachequipinfor> implements DrybeachequipinforService { public class DrybeachequipinforServiceImpl extends ServiceImpl<DrybeachequipinforMapper, Drybeachequipinfor> implements DrybeachequipinforService {
@Autowired @Autowired
private DrybeachequipinforMapper drybeachequipinforMapper; private DrybeachequipinforMapper drybeachequipinforMapper;
@Autowired @Autowired
private SysSelectMapper sysSelectMapper; private SysSelectMapper sysSelectMapper;
@Autowired @Autowired
private SysSummaryMapper sysSummaryMapper; private SysSummaryMapper sysSummaryMapper;
@Autowired @Autowired
private OnlineUserService onlineUserService; private OnlineUserService onlineUserService;
@Override @Override
public HashMap<String, Object> pageall(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public HashMap<String, Object> pageall(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage(); long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize(); long size = dataQueryCriteria.getSize();
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>(); QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
String currentUsername = SecurityUtils.getCurrentUsername(); String currentUsername = SecurityUtils.getCurrentUsername();
String gettailno = onlineUserService.gettailno(currentUsername, request); String gettailno = onlineUserService.gettailno(currentUsername, request);
drybeachequipinforQueryWrapper.eq("tailingid", gettailno); drybeachequipinforQueryWrapper.eq("tailingid", gettailno);
ServiceUtil.query(drybeachequipinforQueryWrapper, dataQueryCriteria); ServiceUtil.query(drybeachequipinforQueryWrapper, dataQueryCriteria);
drybeachequipinforQueryWrapper.ne("equipname", "基准点"); drybeachequipinforQueryWrapper.ne("equipname", "基准点");
Page<Drybeachequipinfor> drybeachequipinforPage = new Page<>(page + 1, size); Page<Drybeachequipinfor> drybeachequipinforPage = new Page<>(page + 1, size);
drybeachequipinforPage = drybeachequipinforMapper.selectPage(drybeachequipinforPage, drybeachequipinforQueryWrapper); drybeachequipinforPage = drybeachequipinforMapper.selectPage(drybeachequipinforPage, drybeachequipinforQueryWrapper);
hashMap.put("list", drybeachequipinforPage.getRecords()); hashMap.put("list", drybeachequipinforPage.getRecords());
hashMap.put("total", drybeachequipinforPage.getTotal()); hashMap.put("total", drybeachequipinforPage.getTotal());
return hashMap; return hashMap;
} }
@Override @Override
public boolean jcbj(String equipname) { public boolean jcbj(String equipname) {
try { try {
int jcbj = drybeachequipinforMapper.jcbj(equipname); int jcbj = drybeachequipinforMapper.jcbj(equipname);
if (jcbj > 0) { if (jcbj > 0) {
return true; return true;
} else { } else {
return false; return false;
} }
} catch (Exception e) { } catch (Exception e) {
System.out.println(e); System.out.println(e);
return false; return false;
} }
} }
@Override @Override
public ArrayList<HashMap<String, String>> getDryCode() { public ArrayList<HashMap<String, String>> getDryCode() {
ArrayList<HashMap<String, String>> dryCode = drybeachequipinforMapper.getDryCode(); ArrayList<HashMap<String, String>> dryCode = drybeachequipinforMapper.getDryCode();
return dryCode; return dryCode;
} }
@Override @Override
public HashMap<String, Object> getdyinfo(HttpServletRequest request) { public HashMap<String, Object> getdyinfo(HttpServletRequest request) {
//获取不在线数量 //获取不在线数量
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request); String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) { if (tailInfoNo == null) {
return null; return null;
} }
List<Map> maps = drybeachequipinforMapper.dryUnDetails(tailInfoNo); List<Map> maps = drybeachequipinforMapper.dryUnDetails(tailInfoNo);
int unlinecount = maps.size(); int unlinecount = maps.size();
//获取所有设备 //获取所有设备
int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo); int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo);
int onlinecount = getallcount - unlinecount; int onlinecount = getallcount - unlinecount;
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("online", onlinecount); map.put("online", onlinecount);
map.put("unline", unlinecount); map.put("unline", unlinecount);
map.put("unlineList", maps); map.put("unlineList", maps);
map.put("all", getallcount); map.put("all", getallcount);
return map; return map;
} }
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public boolean deleteall(String equipno) { public boolean deleteall(String equipno) {
int deleteall = drybeachequipinforMapper.deleteall(equipno); int deleteall = drybeachequipinforMapper.deleteall(equipno);
if (deleteall > 0) { if (deleteall > 0) {
return true; return true;
} }
return false; return false;
} }
@Override @Override
public List<String> getequipno(String tailno) { public List<String> getequipno(String tailno) {
List<String> getequipno = drybeachequipinforMapper.getequipno(tailno); List<String> getequipno = drybeachequipinforMapper.getequipno(tailno);
return getequipno; return getequipno;
} }
@Override @Override
public HashMap<String, Object> level(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) { public HashMap<String, Object> level(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage(); long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize(); long size = dataQueryCriteria.getSize();
String vague = dataQueryCriteria.getVague(); String vague = dataQueryCriteria.getVague();
String searchValue = null; String searchValue = null;
String searchName = null; String searchName = null;
if (vague != null) { if (vague != null) {
Map map = JSON.parseObject(vague, Map.class); Map map = JSON.parseObject(vague, Map.class);
Set set = map.keySet(); Set set = map.keySet();
for (Object o : set) { for (Object o : set) {
searchName = o.toString(); searchName = o.toString();
searchValue = map.get(o.toString()).toString(); searchValue = map.get(o.toString()).toString();
} }
} }
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
//获取当前尾矿库编码 //获取当前尾矿库编码
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();
map.put("list", records); records.forEach(item->{
map.put("total", total); String fourlevelalarmXYZ = item.getFourlevelalarmXYZ();
return map; if (!ObjectUtils.isEmpty(fourlevelalarmXYZ)){
} item.setFourlevelalarm(fourlevelalarmXYZ);
} String threelevelalarmXYZ = item.getThreelevelalarmXYZ();
@Override if (!ObjectUtils.isEmpty(threelevelalarmXYZ)){
public void dealLevel(HashMap<String, String> map) { item.setThreelevelalarm(threelevelalarmXYZ);
String equipno = map.get("equipno"); } String twolevelalarmXYZ = item.getTwolevelalarmXYZ();
String onelevelalarm = map.get("onelevelalarm"); if (!ObjectUtils.isEmpty(twolevelalarmXYZ)){
String twolevelalarm = map.get("twolevelalarm"); item.setTwolevelalarm(twolevelalarmXYZ);
String threelevelalarm = map.get("threelevelalarm"); } String onelevelalarmXYZ = item.getOnelevelalarmXYZ();
String fourlevelalarm = map.get("fourlevelalarm"); if (!ObjectUtils.isEmpty(fourlevelalarmXYZ)){
drybeachequipinforMapper.dealLevel(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm); item.setOnelevelalarm(onelevelalarmXYZ);
} }
});
@Override map.put("list", records);
public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) { map.put("total", total);
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request); return map;
if (tailInfoNo == null) { }
return null;
} @Override
List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.dryStateCount(tailInfoNo); public void dealLevel(HashMap<String, String> map) {
return hashMaps; String equipno = map.get("equipno");
} String deviceType = map.get("deviceType");
String onelevelalarm = map.get("onelevelalarm");
@Override String twolevelalarm = map.get("twolevelalarm");
public List<DrybeachequipinforVo> sensorList(String code, HttpServletRequest request) { String threelevelalarm = map.get("threelevelalarm");
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>(); String fourlevelalarm = map.get("fourlevelalarm");
if (code != null) { if ("3".equals(deviceType)) {
drybeachequipinforQueryWrapper.eq("devicetype", code); List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.selectListMp(equipno);
} if (ObjectUtils.isEmpty(hashMaps)){
//获取当前尾矿库 drybeachequipinforMapper.insertMp(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request); }else {
if (tailInfoNo == null) { drybeachequipinforMapper.dealLevelMp(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
return null; }
} } else {
drybeachequipinforQueryWrapper.eq("tailingid", tailInfoNo).ne("equipname", "基准点"); drybeachequipinforMapper.dealLevel(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
List<Drybeachequipinfor> drybeachequipinfors = drybeachequipinforMapper.selectList(drybeachequipinforQueryWrapper); }
ArrayList<DrybeachequipinforVo> drybeachequipinforVos = new ArrayList<>();
for (Drybeachequipinfor drybeachequipinfor : drybeachequipinfors) { }
DrybeachequipinforVo dryVo = new DrybeachequipinforVo().setEquipname(drybeachequipinfor.getEquipname()).setEquipno(drybeachequipinfor.getEquipno());
drybeachequipinforVos.add(dryVo); @Override
} public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) {
return drybeachequipinforVos; String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
} if (tailInfoNo == null) {
return null;
@Override }
public List<DrybeachequipinforVo> pointDrys(HttpServletRequest request) { List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.dryStateCount(tailInfoNo);
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>(); return hashMaps;
//获取当前尾矿库 }
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) { @Override
return null; public List<DrybeachequipinforVo> sensorList(String code, HttpServletRequest request) {
} QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
drybeachequipinforQueryWrapper.eq("tailingid", tailInfoNo).ne("equipname", "基准点"); if (code != null) {
List<Drybeachequipinfor> drybeachequipinfors = drybeachequipinforMapper.selectList(drybeachequipinforQueryWrapper); drybeachequipinforQueryWrapper.eq("devicetype", code);
ArrayList<DrybeachequipinforVo> drybeachequipinforVos = new ArrayList<>(); }
for (Drybeachequipinfor drybeachequipinfor : drybeachequipinfors) { //获取当前尾矿库
DrybeachequipinforVo dryVo = new DrybeachequipinforVo().setEquipname(drybeachequipinfor.getEquipname()).setEquipno(drybeachequipinfor.getEquipno()); String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
drybeachequipinforVos.add(dryVo); if (tailInfoNo == null) {
} return null;
return drybeachequipinforVos; }
} drybeachequipinforQueryWrapper.eq("tailingid", tailInfoNo).ne("equipname", "基准点");
List<Drybeachequipinfor> drybeachequipinfors = drybeachequipinforMapper.selectList(drybeachequipinforQueryWrapper);
@Override ArrayList<DrybeachequipinforVo> drybeachequipinforVos = new ArrayList<>();
public boolean enforceOnline(HashMap<String, String> map) { for (Drybeachequipinfor drybeachequipinfor : drybeachequipinfors) {
String id = map.get("id").toString(); DrybeachequipinforVo dryVo = new DrybeachequipinforVo().setEquipname(drybeachequipinfor.getEquipname()).setEquipno(drybeachequipinfor.getEquipno());
int i = drybeachequipinforMapper.enforceOnline(id); drybeachequipinforVos.add(dryVo);
if (i > 0) { }
return true; return drybeachequipinforVos;
} }
return false;
} @Override
public List<DrybeachequipinforVo> pointDrys(HttpServletRequest request) {
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
//获取当前尾矿库
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) {
return null;
}
drybeachequipinforQueryWrapper.eq("tailingid", tailInfoNo).ne("equipname", "基准点");
List<Drybeachequipinfor> drybeachequipinfors = drybeachequipinforMapper.selectList(drybeachequipinforQueryWrapper);
ArrayList<DrybeachequipinforVo> drybeachequipinforVos = new ArrayList<>();
for (Drybeachequipinfor drybeachequipinfor : drybeachequipinfors) {
DrybeachequipinforVo dryVo = new DrybeachequipinforVo().setEquipname(drybeachequipinfor.getEquipname()).setEquipno(drybeachequipinfor.getEquipno());
drybeachequipinforVos.add(dryVo);
}
return drybeachequipinforVos;
}
@Override
public boolean enforceOnline(HashMap<String, String> map) {
String id = map.get("id").toString();
int i = drybeachequipinforMapper.enforceOnline(id);
if (i > 0) {
return true;
}
return false;
}
} }
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;
} }
<?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