Skip to content

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

鑫华

parent 832d88f3
Hide 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 {
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
View file @ f6c1c233
......@@ -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/service/tab/impl/DrybeachequipinforServiceImpl.java
View file @ f6c1c233
......@@ -19,6 +19,7 @@ import me.zhengjie.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.ObjectUtils;
import javax.servlet.http.HttpServletRequest;
import java.util.*;
......@@ -33,185 +34,211 @@ import java.util.*;
*/
@Service
public class DrybeachequipinforServiceImpl extends ServiceImpl<DrybeachequipinforMapper, Drybeachequipinfor> implements DrybeachequipinforService {
@Autowired
private DrybeachequipinforMapper drybeachequipinforMapper;
@Autowired
private SysSelectMapper sysSelectMapper;
@Autowired
private SysSummaryMapper sysSummaryMapper;
@Autowired
private OnlineUserService onlineUserService;
@Override
public HashMap<String, Object> pageall(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize();
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
String currentUsername = SecurityUtils.getCurrentUsername();
String gettailno = onlineUserService.gettailno(currentUsername, request);
drybeachequipinforQueryWrapper.eq("tailingid", gettailno);
ServiceUtil.query(drybeachequipinforQueryWrapper, dataQueryCriteria);
drybeachequipinforQueryWrapper.ne("equipname", "基准点");
Page<Drybeachequipinfor> drybeachequipinforPage = new Page<>(page + 1, size);
drybeachequipinforPage = drybeachequipinforMapper.selectPage(drybeachequipinforPage, drybeachequipinforQueryWrapper);
hashMap.put("list", drybeachequipinforPage.getRecords());
hashMap.put("total", drybeachequipinforPage.getTotal());
return hashMap;
}
@Override
public boolean jcbj(String equipname) {
try {
int jcbj = drybeachequipinforMapper.jcbj(equipname);
if (jcbj > 0) {
return true;
} else {
return false;
}
} catch (Exception e) {
System.out.println(e);
return false;
}
}
@Override
public ArrayList<HashMap<String, String>> getDryCode() {
ArrayList<HashMap<String, String>> dryCode = drybeachequipinforMapper.getDryCode();
return dryCode;
}
@Override
public HashMap<String, Object> getdyinfo(HttpServletRequest request) {
//获取不在线数量
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) {
return null;
}
List<Map> maps = drybeachequipinforMapper.dryUnDetails(tailInfoNo);
int unlinecount = maps.size();
//获取所有设备
int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo);
int onlinecount = getallcount - unlinecount;
HashMap<String, Object> map = new HashMap<>();
map.put("online", onlinecount);
map.put("unline", unlinecount);
map.put("unlineList", maps);
map.put("all", getallcount);
return map;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteall(String equipno) {
int deleteall = drybeachequipinforMapper.deleteall(equipno);
if (deleteall > 0) {
return true;
}
return false;
}
@Override
public List<String> getequipno(String tailno) {
List<String> getequipno = drybeachequipinforMapper.getequipno(tailno);
return getequipno;
}
@Override
public HashMap<String, Object> level(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize();
String vague = dataQueryCriteria.getVague();
String searchValue = null;
String searchName = null;
if (vague != null) {
Map map = JSON.parseObject(vague, Map.class);
Set set = map.keySet();
for (Object o : set) {
searchName = o.toString();
searchValue = map.get(o.toString()).toString();
}
}
HashMap<String, Object> map = new HashMap<>();
//获取当前尾矿库编码
String tailingid = TailNoForInfoUtil.getTailInfoNo(request);
Page<HashMap<String, Object>> drybeachequipinforPage = new Page<>(page + 1, size);
Page<LevelVo> page1 = drybeachequipinforMapper.level(drybeachequipinforPage, tailingid, searchName, searchValue);
List records = page1.getRecords();
long total = page1.getTotal();
map.put("list", records);
map.put("total", total);
return map;
}
@Override
public void dealLevel(HashMap<String, String> map) {
String equipno = map.get("equipno");
String onelevelalarm = map.get("onelevelalarm");
String twolevelalarm = map.get("twolevelalarm");
String threelevelalarm = map.get("threelevelalarm");
String fourlevelalarm = map.get("fourlevelalarm");
drybeachequipinforMapper.dealLevel(equipno, onelevelalarm, twolevelalarm, threelevelalarm, fourlevelalarm);
}
@Override
public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) {
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) {
return null;
}
List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.dryStateCount(tailInfoNo);
return hashMaps;
}
@Override
public List<DrybeachequipinforVo> sensorList(String code, HttpServletRequest request) {
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
if (code != null) {
drybeachequipinforQueryWrapper.eq("devicetype", code);
}
//获取当前尾矿库
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 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;
}
@Autowired
private DrybeachequipinforMapper drybeachequipinforMapper;
@Autowired
private SysSelectMapper sysSelectMapper;
@Autowired
private SysSummaryMapper sysSummaryMapper;
@Autowired
private OnlineUserService onlineUserService;
@Override
public HashMap<String, Object> pageall(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize();
HashMap<String, Object> hashMap = new HashMap<>();
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
String currentUsername = SecurityUtils.getCurrentUsername();
String gettailno = onlineUserService.gettailno(currentUsername, request);
drybeachequipinforQueryWrapper.eq("tailingid", gettailno);
ServiceUtil.query(drybeachequipinforQueryWrapper, dataQueryCriteria);
drybeachequipinforQueryWrapper.ne("equipname", "基准点");
Page<Drybeachequipinfor> drybeachequipinforPage = new Page<>(page + 1, size);
drybeachequipinforPage = drybeachequipinforMapper.selectPage(drybeachequipinforPage, drybeachequipinforQueryWrapper);
hashMap.put("list", drybeachequipinforPage.getRecords());
hashMap.put("total", drybeachequipinforPage.getTotal());
return hashMap;
}
@Override
public boolean jcbj(String equipname) {
try {
int jcbj = drybeachequipinforMapper.jcbj(equipname);
if (jcbj > 0) {
return true;
} else {
return false;
}
} catch (Exception e) {
System.out.println(e);
return false;
}
}
@Override
public ArrayList<HashMap<String, String>> getDryCode() {
ArrayList<HashMap<String, String>> dryCode = drybeachequipinforMapper.getDryCode();
return dryCode;
}
@Override
public HashMap<String, Object> getdyinfo(HttpServletRequest request) {
//获取不在线数量
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) {
return null;
}
List<Map> maps = drybeachequipinforMapper.dryUnDetails(tailInfoNo);
int unlinecount = maps.size();
//获取所有设备
int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo);
int onlinecount = getallcount - unlinecount;
HashMap<String, Object> map = new HashMap<>();
map.put("online", onlinecount);
map.put("unline", unlinecount);
map.put("unlineList", maps);
map.put("all", getallcount);
return map;
}
@Transactional(rollbackFor = Exception.class)
@Override
public boolean deleteall(String equipno) {
int deleteall = drybeachequipinforMapper.deleteall(equipno);
if (deleteall > 0) {
return true;
}
return false;
}
@Override
public List<String> getequipno(String tailno) {
List<String> getequipno = drybeachequipinforMapper.getequipno(tailno);
return getequipno;
}
@Override
public HashMap<String, Object> level(DataQueryCriteria dataQueryCriteria, HttpServletRequest request) {
long page = dataQueryCriteria.getPage();
long size = dataQueryCriteria.getSize();
String vague = dataQueryCriteria.getVague();
String searchValue = null;
String searchName = null;
if (vague != null) {
Map map = JSON.parseObject(vague, Map.class);
Set set = map.keySet();
for (Object o : set) {
searchName = o.toString();
searchValue = map.get(o.toString()).toString();
}
}
HashMap<String, Object> map = new HashMap<>();
//获取当前尾矿库编码
String tailingid = TailNoForInfoUtil.getTailInfoNo(request);
Page<HashMap<String, Object>> drybeachequipinforPage = new Page<>(page + 1, size);
Page<LevelVo> page1 = drybeachequipinforMapper.level(drybeachequipinforPage, tailingid, searchName, searchValue);
List<LevelVo> records = page1.getRecords();
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("total", total);
return map;
}
@Override
public void dealLevel(HashMap<String, String> map) {
String equipno = map.get("equipno");
String deviceType = map.get("deviceType");
String onelevelalarm = map.get("onelevelalarm");
String twolevelalarm = map.get("twolevelalarm");
String threelevelalarm = map.get("threelevelalarm");
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);
}
}
@Override
public List<HashMap<String, Object>> dryStateCount(HttpServletRequest request) {
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) {
return null;
}
List<HashMap<String, Object>> hashMaps = drybeachequipinforMapper.dryStateCount(tailInfoNo);
return hashMaps;
}
@Override
public List<DrybeachequipinforVo> sensorList(String code, HttpServletRequest request) {
QueryWrapper<Drybeachequipinfor> drybeachequipinforQueryWrapper = new QueryWrapper<>();
if (code != null) {
drybeachequipinforQueryWrapper.eq("devicetype", code);
}
//获取当前尾矿库
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 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;
}
}
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;
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
View file @ f6c1c233
<?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>
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