Skip to content

N
New MineTRS
Commit a0f36d5d authored by Administrator's avatar Administrator
Browse files
Options

2023-11.25 增加浸润线 干滩等一下接口 

2023.12.19 添加简易的登录过期
parent 4dc55a00
Show whitespace changes
Inline Side-by-side
Showing with 321 additions and 55 deletions
eladmin-system/pom.xml
View file @ a0f36d5d
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<!-- 打包 --> <!-- 打包 -->
<build> <build>
<finalName>MineTRS_new0.16</finalName> <finalName>MineTRS_NEW</finalName>
<plugins> <plugins>
<!-- 跳过单元测试 --> <!-- 跳过单元测试 -->
<plugin> <plugin>
......
eladmin-system/src/main/java/me/zhengjie/gemho/controller/tab/DrybeachequipinforController.java
View file @ a0f36d5d
...@@ -246,7 +246,7 @@ public class DrybeachequipinforController { ...@@ -246,7 +246,7 @@ public class DrybeachequipinforController {
@ApiOperation(value = "在线设备统计") @ApiOperation(value = "在线设备统计")
@GetMapping("count") @GetMapping("count")
public ResponseEntity<Object> getdryInfo(HttpServletRequest request) { public ResponseEntity<Object> getdryInfo(HttpServletRequest request) {
HashMap<String, Integer> map = drybeachequipinforService.getdyinfo(request); HashMap<String, Object> map = drybeachequipinforService.getdyinfo(request);
return new ResponseEntity<>(new PageResult().success(map), HttpStatus.OK); return new ResponseEntity<>(new PageResult().success(map), HttpStatus.OK);
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/entity/data/MpData.java
View file @ a0f36d5d
...@@ -185,6 +185,8 @@ public class MpData implements Serializable { ...@@ -185,6 +185,8 @@ public class MpData implements Serializable {
@JSONField(format = "yyyy-MM-dd HH:mm:ss") @JSONField(format = "yyyy-MM-dd HH:mm:ss")
@TableField(exist = false) @TableField(exist = false)
private Date jctime; private Date jctime;
@TableField(exist = false)
private String difference;
} }
eladmin-system/src/main/java/me/zhengjie/gemho/entity/data/StData.java
View file @ a0f36d5d
...@@ -104,6 +104,14 @@ public class StData implements Serializable { ...@@ -104,6 +104,14 @@ public class StData implements Serializable {
public Date jctime; public Date jctime;
@TableField(exist = false) @TableField(exist = false)
public String danwei; public String danwei;
@TableField(exist = false)
public String jrxHoleTopElevation;
@TableField(exist = false)
public String jrxHoleBottomElevation;
@TableField(exist = false)
public String jrxTrepanning;
@TableField(exist = false)
public String jrxBurial;
/** /**
* 差值 * 差值
......
eladmin-system/src/main/java/me/zhengjie/gemho/entity/tab/Drybeachequipinfor.java
View file @ a0f36d5d
...@@ -209,7 +209,8 @@ public class Drybeachequipinfor implements Serializable { ...@@ -209,7 +209,8 @@ public class Drybeachequipinfor implements Serializable {
* 浸润线埋深 * 浸润线埋深
*/ */
@ApiModelProperty(value = "浸润线埋深") @ApiModelProperty(value = "浸润线埋深")
private Double burial_depth; @TableField(value = "hole_base_elevation")
private Double HoleBaseElevation;
/** /**
* 检验周期（天）,单位是天， * 检验周期（天）,单位是天，
...@@ -272,10 +273,6 @@ public class Drybeachequipinfor implements Serializable { ...@@ -272,10 +273,6 @@ public class Drybeachequipinfor implements Serializable {
*/ */
@ApiModelProperty(value = "干滩安全超高,只用于干滩监测") @ApiModelProperty(value = "干滩安全超高,只用于干滩监测")
private String gtsafeheight; private String gtsafeheight;
/**
* .浸润线设备到开孔位置的距离
*/
private Double jrx_burial;
/** /**
* 浸润线开孔深度 * 浸润线开孔深度
*/ */
...@@ -285,8 +282,12 @@ public class Drybeachequipinfor implements Serializable { ...@@ -285,8 +282,12 @@ public class Drybeachequipinfor implements Serializable {
* 设备距离坡面左侧距离(单位:m) * 设备距离坡面左侧距离(单位:m)
*/ */
private Double jrx_coord_x; private Double jrx_coord_x;
/**
*
*/
private Double jrx_burial;
@TableField(value = "hole_bottom_elevation")
public String jrxHoleBottomElevation;
private Integer sensortype; private Integer sensortype;
/** /**
* 排水量流速（单位是m/s）,只用于排水量，表示流速 * 排水量流速（单位是m/s）,只用于排水量，表示流速
......
eladmin-system/src/main/java/me/zhengjie/gemho/entity/tab/JrxDissect.java
View file @ a0f36d5d
...@@ -40,6 +40,10 @@ public class JrxDissect implements Serializable { ...@@ -40,6 +40,10 @@ public class JrxDissect implements Serializable {
* 剖面编号 * 剖面编号
*/ */
private String code; private String code;
/**
*
*/
private String type;
private Double height; private Double height;
......
eladmin-system/src/main/java/me/zhengjie/gemho/mapper/data/DmDataMapper.java
View file @ a0f36d5d
...@@ -22,6 +22,6 @@ public interface DmDataMapper extends BaseMapper<DmData> { ...@@ -22,6 +22,6 @@ public interface DmDataMapper extends BaseMapper<DmData> {
@Select("select a.* from tb_dm_data a join (select max(time) as time ,sensorid from tb_dm_data GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid where a.sensorid=#{sensorid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')") @Select("select a.* from tb_dm_data a join (select max(time) as time ,sensorid from tb_dm_data GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid where a.sensorid=#{sensorid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')")
List<DmData> dealmonth(String sensorid, String start, String end); List<DmData> dealmonth(String sensorid, String start, String end);
@Select(value = "select b.eqdanwei as eqdanwei,b.equipname as sensorname,b.equipno equipno,a.dispA as dispA,a.dispB as dispB , DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_dm_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_dm_data GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC ") @Select(value = "select b.eqdanwei as eqdanwei,b.sensortype,b.equipname as sensorname,b.equipno equipno,a.dispA as dispA,a.dispB as dispB , DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_dm_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_dm_data GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC ")
List<HashMap<String, Object>> real(String tailingid); List<HashMap<String, Object>> real(String tailingid);
} }
eladmin-system/src/main/java/me/zhengjie/gemho/mapper/data/StDataMapper.java
View file @ a0f36d5d
package me.zhengjie.gemho.mapper.data; package me.zhengjie.gemho.mapper.data;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import me.zhengjie.gemho.entity.data.StData; import me.zhengjie.gemho.entity.data.StData;
import me.zhengjie.gemho.x_datavo.tab.visual.JrxDryVo; import me.zhengjie.gemho.x_datavo.tab.visual.JrxDryVo;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Select;
import java.util.HashMap; import java.util.HashMap;
...@@ -19,10 +22,13 @@ import java.util.List; ...@@ -19,10 +22,13 @@ import java.util.List;
*/ */
@Mapper @Mapper
public interface StDataMapper extends BaseMapper<StData> { public interface StDataMapper extends BaseMapper<StData> {
@Select("select a.* from tb_sl_data a join (select max(time) as time ,sensorid from tb_sl_data GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid where a.sensorid=#{deviceid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')") @Select(value = "SELECT a.*,b.jrx_trepanning as jrxTrepanning ,b.hole_base_elevation as jrxHoleTopElevation,b.hole_bottom_elevation as jrxHoleBottomElevation, b.jrx_burial as jrxBurial from `tb_st_data` a left join tb_drybeachequipinfor b on a.sensorid =b.equipno ${ew.customSqlSegment} ")
Page<StData> pageAll(Page<StData> page, @Param("ew") Wrapper wrapper);
@Select("select a.* from tb_st_data a join (select max(time) as time ,sensorid from tb_st_data GROUP BY sensorid,DATE_FORMAT( time, '%y-%m-%d' ))b on a.time =b.time and a.sensorid=b.sensorid where a.sensorid=#{deviceid} and a.time>=#{start} and a.time <=#{end}GROUP BY DATE_FORMAT(a.time,'%y-%m-%d')")
List<StData> dealmonth(String deviceid, String start, String end); List<StData> dealmonth(String deviceid, String start, String end);
@Select(value = "select b.eqdanwei as eqdanwei,b.equipno equipno,b.equipname as sensorname,a.stage as stage,a.depth as depth ,DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_st_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_sl_data GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC") @Select(value = "select b.eqdanwei as eqdanwei,b.equipno equipno,b.equipname as sensorname,a.stage as stage,a.depth as depth ,DATE_FORMAT(a.time,'%Y-%m-%d %H:%i:%m') as time from tb_st_data a join tb_drybeachequipinfor b on a.sensorid=b.equipno join (select max(time) as time ,sensorid from tb_st_data GROUP BY sensorid) c on a.time =c.time and a.sensorid=c.sensorid where a.datasource =1 and b.tailingid=#{tailingid} ORDER BY time DESC")
List<HashMap<String, Object>> real(String tailingid); List<HashMap<String, Object>> real(String tailingid);
List<JrxDryVo> getStageDepth(List<String> sensorids); List<JrxDryVo> getStageDepth(List<String> sensorids);
......
eladmin-system/src/main/java/me/zhengjie/gemho/mapper/tab/DrybeachequipinforMapper.java
View file @ a0f36d5d
...@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Update; ...@@ -13,6 +13,7 @@ import org.apache.ibatis.annotations.Update;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
* <p> * <p>
...@@ -90,6 +91,7 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor> ...@@ -90,6 +91,7 @@ public interface DrybeachequipinforMapper extends BaseMapper<Drybeachequipinfor>
List<HashMap<String, Object>> dryStateCount(String tailingid); List<HashMap<String, Object>> dryStateCount(String tailingid);
Integer dryUnCount(String tailingid); Integer dryUnCount(String tailingid);
List<Map> dryUnDetails(String tailingid);
int enforceOnline(String equipno); int enforceOnline(String equipno);
} }
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DbDataServiceImpl.java
View file @ a0f36d5d
...@@ -488,6 +488,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme ...@@ -488,6 +488,7 @@ public class DbDataServiceImpl extends ServiceImpl<DbDataMapper, DbData> impleme
map.put("人工监测项", dbdata.getJcziitemname()); map.put("人工监测项", dbdata.getJcziitemname());
map.put("人工监测值", dbdata.getJcvalue()); map.put("人工监测值", dbdata.getJcvalue());
map.put("人工监测时间", dbdata.getJctime()); map.put("人工监测时间", dbdata.getJctime());
map.put("人工监测差异", dbdata.getDifference());
} }
list.add(map); list.add(map);
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/DmDataServiceImpl.java
View file @ a0f36d5d
...@@ -44,6 +44,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -44,6 +44,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
@Autowired @Autowired
private DrybeachequipinforMapper drybeachequipinforMapper; private DrybeachequipinforMapper drybeachequipinforMapper;
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
@Override @Override
public DataVo day(String date, String values, String deviceid, String subitem) { public DataVo day(String date, String values, String deviceid, String subitem) {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
...@@ -185,7 +186,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -185,7 +186,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
String name = field.getName(); String name = field.getName();
if (dmdatum.equals(name)) { if (dmdatum.equals(name)) {
hashMap.put(dmdatum, Double.parseDouble((String) field.get(data1))); hashMap.put(dmdatum, Double.parseDouble((String) field.get(data1)));
rgdate=sdf2.parse(sdf2.format(data1.getTime())); rgdate = sdf2.parse(sdf2.format(data1.getTime()));
} }
} }
} }
...@@ -277,7 +278,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -277,7 +278,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
for (String dmdatum : dmdata) { for (String dmdatum : dmdata) {
if (dmdatum.equals(field.getName())) { if (dmdatum.equals(field.getName())) {
hashMap.put(dmdatum, Double.parseDouble((String) field.get(data1))); hashMap.put(dmdatum, Double.parseDouble((String) field.get(data1)));
rgdate=sdf2.parse(sdf2.format(data1.getTime())); rgdate = sdf2.parse(sdf2.format(data1.getTime()));
} }
} }
} }
...@@ -367,7 +368,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -367,7 +368,7 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
Integer integer = sensorType.get(record.getSensorid()); Integer integer = sensorType.get(record.getSensorid());
record.setSensorname(noName.get(record.getSensorid())); record.setSensorname(noName.get(record.getSensorid()));
record.setDanwei(noDan.get(record.getSensorid())); record.setDanwei(noDan.get(record.getSensorid()));
if(!ObjectUtils.isEmpty(integer)){ if (!ObjectUtils.isEmpty(integer)) {
if (3 == integer) { if (3 == integer) {
String dispB = record.getDispB(); String dispB = record.getDispB();
record.setCjvalue(dispB); record.setCjvalue(dispB);
...@@ -406,7 +407,13 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -406,7 +407,13 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
realDataVo.setTime(time); realDataVo.setTime(time);
realDataVo.setEquipno(equipno); realDataVo.setEquipno(equipno);
realDataVo.setData(real); realDataVo.setData(real);
String sensortype = real.get("sensortype") + "";
if ("3".equals(sensortype)) {
Object keys2 = dbdata.get("dmdata1");
realDataVo.setKeys(keys2);
}else{
realDataVo.setKeys(keys1); realDataVo.setKeys(keys1);
}
realDataVo.setName(sensorname); realDataVo.setName(sensorname);
realDataVo.setType(equipno1); realDataVo.setType(equipno1);
realDataVo.setEqdanwei(eqdanwei); realDataVo.setEqdanwei(eqdanwei);
...@@ -471,10 +478,10 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme ...@@ -471,10 +478,10 @@ public class DmDataServiceImpl extends ServiceImpl<DmDataMapper, DmData> impleme
ImgDataVo imgDataVo = new ImgDataVo(); ImgDataVo imgDataVo = new ImgDataVo();
if (3 == sensortype) { if (3 == sensortype) {
//处理封装数据 //处理封装数据
imgDataVo = ServiceUtil.deal("dmdata1", sensorname, dmData, danwei); imgDataVo = ServiceUtil.deal("dmdata1", sensorname, dmData, danwei,dataQueryCriteria.getCode());
} else { } else {
//处理封装数据 //处理封装数据
imgDataVo = ServiceUtil.deal("dmdata", sensorname, dmData, danwei); imgDataVo = ServiceUtil.deal("dmdata", sensorname, dmData, danwei,dataQueryCriteria.getCode());
} }
return imgDataVo; return imgDataVo;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/MpDataServiceImpl.java
View file @ a0f36d5d
...@@ -47,6 +47,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -47,6 +47,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
@Autowired @Autowired
private ArtificialDataMapper artificialDataMapper; private ArtificialDataMapper artificialDataMapper;
SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf2 = new SimpleDateFormat("yyyy-MM-dd");
@Override @Override
public DataVo day(String date, String values, String deviceid) { public DataVo day(String date, String values, String deviceid) {
SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
...@@ -194,7 +195,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -194,7 +195,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
for (Field field : data1.getClass().getDeclaredFields()) { for (Field field : data1.getClass().getDeclaredFields()) {
if (mpdata.equals(field.getName())) { if (mpdata.equals(field.getName())) {
hashMap.put(mpdata, Double.parseDouble((String) field.get(data1))); hashMap.put(mpdata, Double.parseDouble((String) field.get(data1)));
rgdate=sdf2.parse(sdf2.format(data1.getTime())); rgdate = sdf2.parse(sdf2.format(data1.getTime()));
} }
} }
} }
...@@ -290,7 +291,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -290,7 +291,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
for (Field field : data1.getClass().getDeclaredFields()) { for (Field field : data1.getClass().getDeclaredFields()) {
if (mpdata.equals(field.getName())) { if (mpdata.equals(field.getName())) {
hashMap.put(mpdata, Double.parseDouble((String) field.get(data1))); hashMap.put(mpdata, Double.parseDouble((String) field.get(data1)));
rgdate=sdf2.parse(sdf2.format(data1.getTime())); rgdate = sdf2.parse(sdf2.format(data1.getTime()));
} }
} }
} }
...@@ -388,6 +389,26 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -388,6 +389,26 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
record.setJcziitemname(jczx.get(artificialDataPageRecord.getJczx_id())); record.setJcziitemname(jczx.get(artificialDataPageRecord.getJczx_id()));
record.setJcvalue(artificialDataPageRecord.getValue()); record.setJcvalue(artificialDataPageRecord.getValue());
record.setJctime(time1); record.setJctime(time1);
//计算差值
if (checkArtificial.equals("14")) {
Double aDouble = Double.valueOf(record.getDispx());
Double aDouble1 = Double.valueOf(record.getJcvalue());
Double difference = aDouble - aDouble1;
double v = (difference < 0) ? -difference : difference;
record.setDifference(String.valueOf(v));
} else if (checkArtificial.equals("22")) {
Double aDouble = Double.valueOf(record.getDispy());
Double aDouble1 = Double.valueOf(record.getJcvalue());
Double difference = aDouble - aDouble1;
double v = (difference < 0) ? -difference : difference;
record.setDifference(String.valueOf(v));
} else if (checkArtificial.equals("23")) {
Double aDouble = Double.valueOf(record.getDisph());
Double aDouble1 = Double.valueOf(record.getJcvalue());
Double difference = aDouble - aDouble1;
double v = (difference < 0) ? -difference : difference;
record.setDifference(String.format("%.3f", v));
}
} }
} }
} }
...@@ -488,7 +509,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -488,7 +509,7 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("mpdata1", sensorname, mpData, danwei); ImgDataVo mpdata = ServiceUtil.deal("mpdata1", sensorname, mpData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
...@@ -512,12 +533,16 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme ...@@ -512,12 +533,16 @@ public class MpDataServiceImpl extends ServiceImpl<MpDataMapper, MpData> impleme
map.put("x变化量", mpDatum.getDispx()); map.put("x变化量", mpDatum.getDispx());
map.put("y变化量", mpDatum.getDispy()); map.put("y变化量", mpDatum.getDispy());
map.put("z变化量", mpDatum.getDisph()); map.put("z变化量", mpDatum.getDisph());
map.put("大地坐标x", mpDatum.getVelocityx());
map.put("大地坐标y", mpDatum.getVelocityy());
map.put("大地坐标h", mpDatum.getVelocityh());
map.put("是否报警", mpDatum.getState() == 0 ? "否" : "是"); map.put("是否报警", mpDatum.getState() == 0 ? "否" : "是");
map.put("监测时间", mpDatum.getTime()); map.put("监测时间", mpDatum.getTime());
if (result) { if (result) {
map.put("人工监测项", mpDatum.getJcziitemname()); map.put("人工监测项", mpDatum.getJcziitemname());
map.put("人工监测值", mpDatum.getJcvalue()); map.put("人工监测值", mpDatum.getJcvalue());
map.put("人工监测时间", mpDatum.getJctime()); map.put("人工监测时间", mpDatum.getJctime());
map.put("人工监测差异", mpDatum.getDifference());
} }
list.add(map); list.add(map);
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/PslDataServiceImpl.java
View file @ a0f36d5d
...@@ -365,7 +365,7 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl ...@@ -365,7 +365,7 @@ public class PslDataServiceImpl extends ServiceImpl<PslDataMapper, PslData> impl
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("psldata1", sensorname, pslData, danwei); ImgDataVo mpdata = ServiceUtil.deal("psldata1", sensorname, pslData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/RgDataServiceImpl.java
View file @ a0f36d5d
...@@ -375,7 +375,7 @@ public class RgDataServiceImpl extends ServiceImpl<RgDataMapper, RgData> impleme ...@@ -375,7 +375,7 @@ public class RgDataServiceImpl extends ServiceImpl<RgDataMapper, RgData> impleme
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("rgdata", sensorname, rgData, danwei); ImgDataVo mpdata = ServiceUtil.deal("rgdata", sensorname, rgData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/SlDataServiceImpl.java
View file @ a0f36d5d
...@@ -406,7 +406,7 @@ public class SlDataServiceImpl extends ServiceImpl<SlDataMapper, SlData> impleme ...@@ -406,7 +406,7 @@ public class SlDataServiceImpl extends ServiceImpl<SlDataMapper, SlData> impleme
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("sldata1", sensorname, pslData, danwei); ImgDataVo mpdata = ServiceUtil.deal("sldata1", sensorname, pslData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/StDataServiceImpl.java
View file @ a0f36d5d
...@@ -372,7 +372,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme ...@@ -372,7 +372,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
QueryWrapper<StData> stDataQueryWrapper = new QueryWrapper<>(); QueryWrapper<StData> stDataQueryWrapper = new QueryWrapper<>();
ServiceUtil.dbquery(stDataQueryWrapper, dataQueryCriteria, request); ServiceUtil.dbquery(stDataQueryWrapper, dataQueryCriteria, request);
Page<StData> stDataPage = new Page<>(page + 1, size); Page<StData> stDataPage = new Page<>(page + 1, size);
stDataPage = stDataMapper.selectPage(stDataPage, stDataQueryWrapper); stDataPage = stDataMapper.pageAll(stDataPage, stDataQueryWrapper);
List<StData> records = stDataPage.getRecords(); List<StData> records = stDataPage.getRecords();
HashMap<String, Object> hashMap = new HashMap<>(); HashMap<String, Object> hashMap = new HashMap<>();
//获取编号名字map //获取编号名字map
...@@ -403,7 +403,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme ...@@ -403,7 +403,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
record.setJcvalue(artificialDataPageRecord.getValue()); record.setJcvalue(artificialDataPageRecord.getValue());
record.setJctime(time1); record.setJctime(time1);
//计算差值 //计算差值
Double aDouble = Double.valueOf(record.getStage()); Double aDouble = Double.valueOf(record.getDepth());
Double aDouble1 = Double.valueOf(record.getJcvalue()); Double aDouble1 = Double.valueOf(record.getJcvalue());
Double difference = aDouble-aDouble1; Double difference = aDouble-aDouble1;
double v = (difference < 0) ? -difference : difference; double v = (difference < 0) ? -difference : difference;
...@@ -445,7 +445,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme ...@@ -445,7 +445,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("stdata", sensorname, stData, danwei); ImgDataVo mpdata = ServiceUtil.deal("stdata", sensorname, stData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
...@@ -474,6 +474,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme ...@@ -474,6 +474,7 @@ public class StDataServiceImpl extends ServiceImpl<StDataMapper, StData> impleme
map.put("人工监测项", stDatum.getJcziitemname()); map.put("人工监测项", stDatum.getJcziitemname());
map.put("人工监测值", stDatum.getJcvalue()); map.put("人工监测值", stDatum.getJcvalue());
map.put("人工监测时间", stDatum.getJctime()); map.put("人工监测时间", stDatum.getJctime());
map.put("人工监测差异", stDatum.getDifference());
} }
list.add(map); list.add(map);
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WpbDataServiceImpl.java
View file @ a0f36d5d
...@@ -378,7 +378,7 @@ public class WpbDataServiceImpl extends ServiceImpl<WpbDataMapper, WpbData> impl ...@@ -378,7 +378,7 @@ public class WpbDataServiceImpl extends ServiceImpl<WpbDataMapper, WpbData> impl
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("wpbdata", sensorname, wpbData, danwei); ImgDataVo mpdata = ServiceUtil.deal("wpbdata", sensorname, wpbData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/data/impl/WtDataServiceImpl.java
View file @ a0f36d5d
...@@ -387,7 +387,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme ...@@ -387,7 +387,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme
String danwei = noDan.get(dataQueryCriteria.getCode()); String danwei = noDan.get(dataQueryCriteria.getCode());
String sensorname = noName.get(dataQueryCriteria.getCode()); String sensorname = noName.get(dataQueryCriteria.getCode());
//处理封装数据 //处理封装数据
ImgDataVo mpdata = ServiceUtil.deal("wtdata", sensorname, wtData, danwei); ImgDataVo mpdata = ServiceUtil.deal("wtdata", sensorname, wtData, danwei,dataQueryCriteria.getCode());
return mpdata; return mpdata;
} }
...@@ -407,7 +407,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme ...@@ -407,7 +407,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme
Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> map = new LinkedHashMap<>();
map.put("设备名称", wtDatum.getSensorname()); map.put("设备名称", wtDatum.getSensorname());
map.put("设备ID", wtDatum.getSensorid()); map.put("设备ID", wtDatum.getSensorid());
map.put("水位", wtDatum.getStage()); map.put("压力(MPa)", wtDatum.getStage());
map.put("是否报警", wtDatum.getState() == 0 ? "否" : "是"); map.put("是否报警", wtDatum.getState() == 0 ? "否" : "是");
map.put("监测时间", wtDatum.getTime()); map.put("监测时间", wtDatum.getTime());
if (result) { if (result) {
...@@ -418,7 +418,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme ...@@ -418,7 +418,7 @@ public class WtDataServiceImpl extends ServiceImpl<WtDataMapper, WtData> impleme
list.add(map); list.add(map);
} }
} }
FileUtil.downloadExcel(list, "监测数据: 库水位", response); FileUtil.downloadExcel(list, "监测数据: 压力", response);
} }
@Override @Override
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/DrybeachequipinforService.java
View file @ a0f36d5d
...@@ -25,7 +25,12 @@ public interface DrybeachequipinforService extends IService<Drybeachequipinfor> ...@@ -25,7 +25,12 @@ public interface DrybeachequipinforService extends IService<Drybeachequipinfor>
ArrayList<HashMap<String, String>> getDryCode(); ArrayList<HashMap<String, String>> getDryCode();
HashMap<String, Integer> getdyinfo(HttpServletRequest request); /**
* 大屏 设备在线离线统计
* @param request
* @return
*/
HashMap<String, Object> getdyinfo(HttpServletRequest request);
/** /**
* 删除设备并且删除检测项和配置信息 * 删除设备并且删除检测项和配置信息
......
eladmin-system/src/main/java/me/zhengjie/gemho/service/tab/impl/DrybeachequipinforServiceImpl.java
View file @ a0f36d5d
...@@ -53,7 +53,7 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo ...@@ -53,7 +53,7 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo
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());
...@@ -83,27 +83,22 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo ...@@ -83,27 +83,22 @@ public class DrybeachequipinforServiceImpl extends ServiceImpl<Drybeachequipinfo
} }
@Override @Override
public HashMap<String, Integer> getdyinfo(HttpServletRequest request) { public HashMap<String, Object> getdyinfo(HttpServletRequest request) {
/* String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);if(tailInfoNo==null){return null;}
int onlinecount = 0;
ArrayList<Integer> getonlinecount = drybeachequipinforMapper.getonlinecount(tailInfoNo);
for (Integer integer : getonlinecount) {
onlinecount += integer;
}
int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo);
int unlinecount = getallcount - onlinecount;*/
//获取不在线数量 //获取不在线数量
String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request); String tailInfoNo = TailNoForInfoUtil.getTailInfoNo(request);
if (tailInfoNo == null) { if (tailInfoNo == null) {
return null; return null;
} }
Integer unlinecount = drybeachequipinforMapper.dryUnCount(tailInfoNo); List<Map> maps = drybeachequipinforMapper.dryUnDetails(tailInfoNo);
int unlinecount = maps.size();
//获取所有设备 //获取所有设备
int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo); int getallcount = drybeachequipinforMapper.getallcount(tailInfoNo);
int onlinecount = getallcount - unlinecount; int onlinecount = getallcount - unlinecount;
HashMap<String, Integer> 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("all", getallcount); map.put("all", getallcount);
return map; return map;
} }
......
eladmin-system/src/main/java/me/zhengjie/gemho/util/DateUtil.java
View file @ a0f36d5d
package me.zhengjie.gemho.util; package me.zhengjie.gemho.util;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.time.Instant; import java.time.Instant;
...@@ -160,4 +164,22 @@ public class DateUtil { ...@@ -160,4 +164,22 @@ public class DateUtil {
LocalDateTime localDateTime = instant.atZone(zone).toLocalDateTime(); LocalDateTime localDateTime = instant.atZone(zone).toLocalDateTime();
return localDateTime; return localDateTime;
} }
public static LocalDateTime getNetworkTime(String webUrl) {
try {
URL url = new URL(webUrl);
URLConnection conn = url.openConnection();
conn.connect();
long dateL = conn.getDate();
Date date = new Date(dateL);
LocalDateTime localDateTime = dateToLocalDateTime(date);
return localDateTime;
} catch (MalformedURLException e) {
e.printStackTrace();
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
} }
\ No newline at end of file
eladmin-system/src/main/java/me/zhengjie/gemho/util/ReadJsonFileUtil.java
View file @ a0f36d5d
package me.zhengjie.gemho.util; package me.zhengjie.gemho.util;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.ClassPathResource;
import org.springframework.util.ObjectUtils;
import java.io.BufferedReader;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -16,18 +22,106 @@ import java.util.Map; ...@@ -16,18 +22,106 @@ import java.util.Map;
public class ReadJsonFileUtil { public class ReadJsonFileUtil {
public static HashMap<String, List<Map>> getMap(String path) { public static HashMap<String, List<Map>> getMap(String path) {
path = "/json/" + path + ".json"; String externalFilePath = System.getProperty("user.dir") + "\\jsons\\" + path + ".json"; // 外部文件路径
HashMap<String, List<Map>> map = new LinkedHashMap(); String resourceName = "\\json\\" + path + ".json"; // 资源文件名
try {
//路径 String json = readJsonFile(externalFilePath, resourceName);
ClassPathResource classPathResource = new ClassPathResource(path); if (json != null) {
// 处理读取到的 JSON 数据
System.out.println(json);
HashMap<String, List<Map>> stringListHashMap = parseJsonToHashMap(json);
return stringListHashMap;
} else {
System.err.println("JSON file not found.");
return null;
}
}
public static void main(String[] args) {
String externalFilePath = System.getProperty("user.dir") + "\\json\\realdata1.json"; // 外部文件路径
String resourceName = "\\json\\realdata.json"; // 资源文件名
String json = readJsonFile(externalFilePath, resourceName);
if (json != null) {
// 处理读取到的 JSON 数据
System.out.println(json);
} else {
System.err.println("JSON file not found.");
}
}
public static String readJsonFile(String externalFilePath, String resourceName) {
String json = null;
// 优先尝试读取外部文件
if (externalFilePath != null && !externalFilePath.isEmpty()) {
json = readExternalJsonFile(externalFilePath);
}
if (ObjectUtils.isEmpty(json)) {
// 如果外部文件不存在或读取失败，则读取资源文件
System.out.println("外部文件不存在,读取 内部资源 ");
json = readResourceJsonFile(resourceName);
} else {
System.out.println("外部文件读取完毕");
}
return json;
}
public static String readResourceJsonFile(String resourceName) {
ClassPathResource classPathResource = new ClassPathResource(resourceName);
//读取文件信息 //读取文件信息
try {
String str = IOUtils.toString(new InputStreamReader(classPathResource.getInputStream(), "UTF-8")); String str = IOUtils.toString(new InputStreamReader(classPathResource.getInputStream(), "UTF-8"));
//转换为Map对象 return str;
map = JSONObject.parseObject(str, LinkedHashMap.class); } catch (IOException e) {
throw new RuntimeException(e);
}
}
public static String readExternalJsonFile(String filePath) {
try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
String line;
StringBuilder jsonContent = new StringBuilder();
while ((line = reader.readLine()) != null) {
jsonContent.append(line);
}
return jsonContent.toString();
} catch (IOException e) {
// 文件不存在或读取失败
return null;
}
}
public static HashMap<String, List<Map>> parseJsonToHashMap(String json) {
try {
JSONObject jsonObject = JSON.parseObject(json);
HashMap<String, List<Map>> resultMap = new HashMap<>();
// 遍历 JSON 对象的键值对
for (Map.Entry<String, Object> entry : jsonObject.entrySet()) {
String key = entry.getKey();
JSONArray jsonArray = (JSONArray) entry.getValue();
List<Map> list = new ArrayList<>();
// 遍历 JSON 数组中的元素，将其转换为 Map
for (Object obj : jsonArray) {
if (obj instanceof Map) {
list.add((Map<String, Object>) obj);
}
}
resultMap.put(key, list);
}
return resultMap;
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
return null;
} }
return map;
} }
} }
\ No newline at end of file
eladmin-system/src/main/java/me/zhengjie/gemho/util/ServiceUtil.java
View file @ a0f36d5d
...@@ -664,6 +664,62 @@ public class ServiceUtil { ...@@ -664,6 +664,62 @@ public class ServiceUtil {
return imgDataVo; return imgDataVo;
} }
/**
* 处理图表数据
*
* @param str
* @param sensorname
* @param data
* @return
*/
public static ImgDataVo deal(String str, String sensorname, List<?> data, String danwei, String deviceid) {
//获取json 数据
HashMap<String, List<Map>> realdata = ReadJsonFileUtil.getMap("realdata");
List<Map> dbdata = realdata.get(str);
//返回对象
ImgDataVo imgDataVo = new ImgDataVo();
ArrayList<Result> results = new ArrayList<>();
//遍历数据
if (!ObjectUtils.isEmpty(data)) {
for (Object dbDatum : data) {
Date time = null;
HashMap map = new HashMap<String, Object>();
for (Field declaredField : dbDatum.getClass().getDeclaredFields()) {
for (Map dbmap : dbdata) {
String key = dbmap.get("key").toString();
if (declaredField.getName().equals(key)) {
try {
map.put(declaredField.getName(), declaredField.get(dbDatum));
break;
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
if (declaredField.getName().equals("time")) {
try {
time = (Date) declaredField.get(dbDatum);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
}
}
Result result = new Result();
result.setDate(time);
result.setValues(map);
results.add(result);
}
}
HashMap<String, Object> dealalarm = DataUtil.dealalarm(deviceid);
imgDataVo.setLists(results);
imgDataVo.setSensorname(sensorname);
imgDataVo.setNames(dbdata);
imgDataVo.setDanwei(danwei);
imgDataVo.setAlarm(dealalarm);
return imgDataVo;
}
/** /**
* 获取编码-名的map * 获取编码-名的map
* *
......
eladmin-system/src/main/java/me/zhengjie/gemho/x_datavo/tab/JrxDissectDto.java
View file @ a0f36d5d
...@@ -28,6 +28,11 @@ public class JrxDissectDto implements Serializable { ...@@ -28,6 +28,11 @@ public class JrxDissectDto implements Serializable {
*/ */
private String name; private String name;
/**
* 剖面名称
*/
private String type;
private Double height; private Double height;
......
eladmin-system/src/main/java/me/zhengjie/gemho/x_datavo/tab/visual/JrxDryVo.java
View file @ a0f36d5d
package me.zhengjie.gemho.x_datavo.tab.visual; package me.zhengjie.gemho.x_datavo.tab.visual;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data; import lombok.Data;
import java.time.LocalDateTime; import java.time.LocalDateTime;
...@@ -27,6 +28,8 @@ public class JrxDryVo { ...@@ -27,6 +28,8 @@ public class JrxDryVo {
*/ */
private Double jrx_coord_x; private Double jrx_coord_x;
@JSONField(format = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime time; private LocalDateTime time;
private String name;
} }
eladmin-system/src/main/java/me/zhengjie/gemho/x_generato/modules/security/rest/AuthorizationController.java
View file @ a0f36d5d
...@@ -25,6 +25,8 @@ import me.zhengjie.annotation.rest.AnonymousDeleteMapping; ...@@ -25,6 +25,8 @@ import me.zhengjie.annotation.rest.AnonymousDeleteMapping;
import me.zhengjie.annotation.rest.AnonymousGetMapping; import me.zhengjie.annotation.rest.AnonymousGetMapping;
import me.zhengjie.annotation.rest.AnonymousPostMapping; import me.zhengjie.annotation.rest.AnonymousPostMapping;
import me.zhengjie.config.RsaProperties; import me.zhengjie.config.RsaProperties;
import me.zhengjie.exception.BadRequestException;
import me.zhengjie.gemho.util.DateUtil;
import me.zhengjie.gemho.util.PostOrPutResult; import me.zhengjie.gemho.util.PostOrPutResult;
import me.zhengjie.gemho.x_generato.modules.security.config.bean.LoginCodeEnum; import me.zhengjie.gemho.x_generato.modules.security.config.bean.LoginCodeEnum;
import me.zhengjie.gemho.x_generato.modules.security.config.bean.LoginProperties; import me.zhengjie.gemho.x_generato.modules.security.config.bean.LoginProperties;
...@@ -43,6 +45,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio ...@@ -43,6 +45,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticatio
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.core.Authentication; import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.util.ObjectUtils;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
...@@ -51,6 +54,9 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -51,6 +54,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -78,6 +84,19 @@ public class AuthorizationController { ...@@ -78,6 +84,19 @@ public class AuthorizationController {
@ApiOperation("登录授权") @ApiOperation("登录授权")
@AnonymousPostMapping(value = "/login") @AnonymousPostMapping(value = "/login")
public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception { public ResponseEntity<Object> login(@Validated @RequestBody AuthUserDto authUser, HttpServletRequest request) throws Exception {
//获取当前计算机时间
LocalDateTime networkTime = DateUtil.getNetworkTime("http://www.baidu.com");
if (ObjectUtils.isEmpty(networkTime)){
networkTime=LocalDateTime.now();
}
//和日期比较
String expirationTimeString="2023-12-26 07:00:00";
DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
LocalDateTime expirationTime = LocalDateTime.parse(expirationTimeString,dateTimeFormatter);
boolean after = networkTime.isAfter(expirationTime);
if (after){
throw new BadRequestException("用户已过期 请联系厂商!!!");
}
boolean b = userService.JuUserName(authUser.getUsername()); boolean b = userService.JuUserName(authUser.getUsername());
if (!b) { if (!b) {
return new ResponseEntity<>(new PostOrPutResult().noUserFailed(), HttpStatus.OK); return new ResponseEntity<>(new PostOrPutResult().noUserFailed(), HttpStatus.OK);
......
eladmin-system/src/main/resources/json/realdata.json
View file @ a0f36d5d
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
"stdata": [ "stdata": [
{ {
"key": "stage", "key": "stage",
"name": "水位" "name": "水位1"
}, },
{ {
"key": "depth", "key": "depth",
......
eladmin-system/src/main/resources/mapper/data/StDataMapper.xml
View file @ a0f36d5d
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
c.jrx_burial, c.jrx_burial,
c.jrx_trepanning, c.jrx_trepanning,
c.jrx_coord_x, c.jrx_coord_x,
c.equipno as sensorid c.equipno as sensorid,
c.equipname as name
FROM FROM
( (
SELECT CONVERT SELECT CONVERT
......
eladmin-system/src/main/resources/mapper/tab/DrybeachequipinforMapper.xml
View file @ a0f36d5d
...@@ -30,6 +30,15 @@ ...@@ -30,6 +30,15 @@
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 2 Hour), '%Y-%m-%d %H:%i:%s') and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 2 Hour), '%Y-%m-%d %H:%i:%s')
or datarealtime is Null) and equipname !='基准点' or datarealtime is Null) and equipname !='基准点'
</select> </select>
<select id="dryUnDetails" resultType="map">
SELECT equipname as equipname,
equipno as equipno,
IFNULL(DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s'), '111') as datarealtime
FROM tb_drybeachequipinfor
where tailingid = #{tailingid}
and (DATE_FORMAT(datarealtime, '%Y-%m-%d %H:%i:%s') &lt;= DATE_FORMAT(DATE_SUB(NOW(), INTERVAL 2 Hour), '%Y-%m-%d %H:%i:%s')
or datarealtime is Null) and equipname !='基准点'
</select>
<update id="enforceOnline"> <update id="enforceOnline">
update tb_drybeachequipinfor update tb_drybeachequipinfor
set initialstateno = '1' set initialstateno = '1'
......
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