admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

大屏高支模

Browse Source
This commit is contained in:
Administrator 2023-03-23 18:51:10 +08:00
parent 5e6791e399
commit dbfe7243b0
19 changed files with 147 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java
View File

@ -39,7 +39,7 @@ public class UopModifyMessageReceiveListener {
receiver = new UopMQMessageReceiverServiceImpl(name, password, url);
// 将上一步自定义的Listener加进去
receiver.addListener(new UopCustomMessageReceiverServiceImpl());
receiver.start();
//receiver.start();
System.out.println("启动消费者");
}
}

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java
View File

@ -57,9 +57,9 @@ public class TowerCurrentDataController {
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String")
})
@PostMapping(value = "/list")
public Result<IPage<EntityMap>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<EntityMap>> result = new Result<IPage<EntityMap>>();
IPage<EntityMap> pageList = towerCurrentDataService.queryTowerCurrentDataPageList(map);
public Result<IPage<TowerCurrentData>> queryPageList(@RequestBody Map<String, Object> map) {
Result<IPage<TowerCurrentData>> result = new Result<>();
IPage<TowerCurrentData> pageList = towerCurrentDataService.queryTowerCurrentDataPageList(map);
result.setSuccess(true);
result.setResult(pageList);
return result;

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerCurrentDataMapper.java
View File

@ -27,7 +27,7 @@ public interface TowerCurrentDataMapper extends BaseMapper<TowerCurrentData> {
TowerCurrentData selectNewestOneTowerCurrentData(Map<String, Object> map);
List<EntityMap> queryTowerCurrentDataPageList(Page<EntityMap> page, @Param("param") Map<String, Object> map);
List<TowerCurrentData> queryTowerCurrentDataPageList(Page<TowerCurrentData> page, @Param("param") Map<String, Object> map);
List<EntityMap> selectExcelTowerCurrentDataList(Map<String, Object> map);

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml
View File

@ -41,7 +41,7 @@
ORDER BY a.recive_time DESC
LIMIT 1
</select>
<select id="queryTowerCurrentDataPageList" resultType="com.zhgd.jeecg.common.mybatis.EntityMap">
<select id="queryTowerCurrentDataPageList" resultType="com.zhgd.xmgl.modules.bigdevice.entity.TowerCurrentData">
SELECT a.*
from tower_current_data a
where a.project_sn=#{param.projectSn}

2
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java
View File

@ -28,7 +28,7 @@ public interface ITowerCurrentDataService extends IService<TowerCurrentData> {
List<EntityMap> selectProjectTowerNewestCurrentDataList(Map<String, Object> map);
IPage<EntityMap> queryTowerCurrentDataPageList(Map<String, Object> map);
IPage<TowerCurrentData> queryTowerCurrentDataPageList(Map<String, Object> map);
void exporExcelTowerCurrentData(HttpServletResponse response, Map<String, Object> map);

6
src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java
View File

@ -202,11 +202,11 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl<TowerCurrentDataMap
}
@Override
public IPage<EntityMap> queryTowerCurrentDataPageList(Map<String, Object> map) {
public IPage<TowerCurrentData> queryTowerCurrentDataPageList(Map<String, Object> map) {
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<EntityMap> page = new Page<>(pageNo, pageSize);
List<EntityMap> list = towerCurrentDataMapper.queryTowerCurrentDataPageList(page, map);
Page<TowerCurrentData> page = new Page<>(pageNo, pageSize);
List<TowerCurrentData> list = towerCurrentDataMapper.queryTowerCurrentDataPageList(page, map);
return page.setRecords(list);
}

29
src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo;
import com.zhgd.xmgl.modules.highformwork.service.IHighFormworkMeasureCurrentDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@ -11,7 +12,10 @@ import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
@ -55,13 +59,32 @@ public class HighFormworkMeasureCurrentDataController {
* @param highFormworkMeasureCurrentData
* @return
*/
@ApiOperation(value = " 添加高支模-测量点实时数据信息", notes = "添加高支模-测量点实时数据信息" , httpMethod="POST")
@ApiOperation(value = " 添加高支模-测量点实时数据信息", notes = "添加高支模-测量点实时数据信息", httpMethod = "POST")
@PostMapping(value = "/add")
public Result<HighFormworkMeasureCurrentData> add(@RequestBody HighFormworkMeasureCurrentData highFormworkMeasureCurrentData) {
Result<HighFormworkMeasureCurrentData> result = new Result<HighFormworkMeasureCurrentData>();
highFormworkMeasureCurrentDataService.saveHighFormworkMeasureCurrentData(highFormworkMeasureCurrentData);
highFormworkMeasureCurrentDataService.saveHighFormworkMeasureCurrentData(highFormworkMeasureCurrentData);
return result;
}
/**
* 大屏高支模分页列表查询
*
* @return
*/
@ApiOperation(value = "大屏高支模分页列表查询", notes = "大屏高支模分页列表查询", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "measurePointNumber", value = "监测点编号", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "startTime", value = "开始时间，格式2021-05-08", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "endTime", value = "结束时间，格式2021-05-08", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "alarmState", value = "报警状态，1正常，2预警，3报警", paramType = "query", required = false, dataType = "String"),
@ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
@ApiImplicitParam(name = "pageSize", value = "每页显示条数", paramType = "query", required = true, dataType = "Integer"),
})
@PostMapping(value = "/big/screen/list")
public Result<IPage<BigScreenHighFormworkVo>> queryBigScreenPageList(@RequestBody Map<String, Object> map) {
return Result.success(highFormworkMeasureCurrentDataService.queryBigScreenPageList(map));
}
}

4
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java
View File

@ -3,10 +3,12 @@ package com.zhgd.xmgl.modules.highformwork.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@ -38,6 +40,8 @@ public class HighFormworkMeasureCurrentData implements Serializable {
/**采集时间*/
@Excel(name = "采集时间", width = 15)
@ApiModelProperty(value="采集时间")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date collectTime ;
/**电量（%）*/
@Excel(name = "电量（%）", width = 15)

27
src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/BigScreenHighFormworkVo.java Normal file
View File

@ -0,0 +1,27 @@
package com.zhgd.xmgl.modules.highformwork.entity.vo;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 大屏高支模Vo
*/
@Data
@ApiModel(value = "大屏高支模Vo")
public class BigScreenHighFormworkVo extends HighFormworkMeasureCurrentData {
/**
* 测量点名称
*/
@Excel(name = "测量点名称", width = 15)
@ApiModelProperty(value = "测量点名称")
private java.lang.String measurePointName;
/**
* 测量点编号
*/
@Excel(name = "测量点编号", width = 15)
@ApiModelProperty(value = "测量点编号")
private java.lang.String measurePointNumber;
}

4
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java
View File

@ -3,8 +3,10 @@ package com.zhgd.xmgl.modules.highformwork.mapper;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
@ -23,4 +25,6 @@ public interface HighFormworkMeasureCurrentDataMapper extends BaseMapper<HighFor
HighFormworkMeasureCurrentData selectNewestHighFormworkMeasureCurrentData(@Param("measurePointNumber")String measurePointNumber, @Param("projectSn")String projectSn);
IPage<BigScreenHighFormworkVo> queryBigScreenPageList(Page<BigScreenHighFormworkVo> p,@Param("q") Map<String, Object> map);
}

12
src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml
View File

@ -38,5 +38,17 @@
order by collect_time desc
LIMIT 1
</select>
<select id="queryBigScreenPageList"
resultType="com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo">
SELECT
cd.*,
mp.measure_point_name,
mp.measure_point_number
FROM
high_formwork_measure_current_data cd
INNER JOIN high_formwork_measure_point mp ON mp.measure_point_number = cd.measure_point_number
WHERE
cd.project_sn = #{q.projectSn}
</select>
</mapper>

3
src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasureCurrentDataService.java
View File

@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import com.baomidou.mybatisplus.extension.service.IService;
import com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo;
import java.util.Map;
@ -18,4 +19,6 @@ public interface IHighFormworkMeasureCurrentDataService extends IService<HighFor
IPage<EntityMap> selectMeasureCurrentDataPage(Map<String, Object> map);
void saveHighFormworkMeasureCurrentData(HighFormworkMeasureCurrentData highFormworkMeasureCurrentData);
IPage<BigScreenHighFormworkVo> queryBigScreenPageList(Map<String, Object> map);
}

15
src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java
View File

@ -3,11 +3,13 @@ package com.zhgd.xmgl.modules.highformwork.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasureCurrentData;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePoint;
import com.zhgd.xmgl.modules.highformwork.entity.HighFormworkMeasurePointThreshold;
import com.zhgd.xmgl.modules.highformwork.entity.vo.BigScreenHighFormworkVo;
import com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkMeasureCurrentDataMapper;
import com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkMeasurePointMapper;
import com.zhgd.xmgl.modules.highformwork.mapper.HighFormworkMeasurePointThresholdMapper;
@ -16,8 +18,6 @@ import com.zhgd.xmgl.util.MessageUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
@ -131,11 +131,20 @@ public class HighFormworkMeasureCurrentDataServiceImpl extends ServiceImpl<HighF
highFormworkMeasureCurrentData.setProjectSn(point.getProjectSn());
highFormworkMeasureCurrentData.setAlarmState(alarmState);
highFormworkMeasureCurrentDataMapper.insert(highFormworkMeasureCurrentData);
HighFormworkMeasurePoint tempHighFormworkMeasurePoint=new HighFormworkMeasurePoint();
HighFormworkMeasurePoint tempHighFormworkMeasurePoint = new HighFormworkMeasurePoint();
tempHighFormworkMeasurePoint.setId(point.getId());
tempHighFormworkMeasurePoint.setRealTime(new Date());
tempHighFormworkMeasurePoint.setAlarmState(alarmState);
highFormworkMeasurePointMapper.updateById(tempHighFormworkMeasurePoint);
}
@Override
public IPage<BigScreenHighFormworkVo> queryBigScreenPageList(Map<String, Object> map) {
int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString());
int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString());
Page<BigScreenHighFormworkVo> p = new Page<>(pageNo, pageSize);
IPage<BigScreenHighFormworkVo> page = highFormworkMeasureCurrentDataMapper.queryBigScreenPageList(p, map);
return page;
}
}

23
src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java
View File

@ -1,12 +1,9 @@
package com.zhgd.xmgl.modules.worker.controller;
import com.baidubce.services.iotshc.model.deivce.DeviceInfo;
import com.zhgd.annotation.OperLog;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.worker.entity.UfaceDev;
import com.zhgd.xmgl.modules.worker.service.IUfaceDevService;
import com.zhgd.xmgl.util.MessageUtil;
import com.zhgd.xmgl.util.UniUbiUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@ -16,7 +13,7 @@ import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -151,8 +148,20 @@ public class UfaceDevController {
@ApiImplicitParam(name = "idcard", value = "身份证号", paramType = "query", required = false, dataType = "String"),
})
@GetMapping(value = "/retryNewJxJAttendance")
public Result retryNewJxJAttendance(String projectSn,String startTime,String endTime,String idcard) {
ufaceDevService.retryNewJxJAttendance(projectSn,startTime,endTime,idcard);
public Result retryNewJxJAttendance(String projectSn, String startTime, String endTime, String idcard) {
ufaceDevService.retryNewJxJAttendance(projectSn, startTime, endTime, idcard);
return Result.ok();
}
}
/**
* 统计设备在线离线的数量
*
* @return
*/
@GetMapping("/count/onoffline")
@ApiOperation(value = "统计设备在线离线的数量", notes = "统计设备在线离线的数量", httpMethod="GET")
@ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String")
public Result<HashMap<String, Object>> countUfaceDevOnOffline(@RequestParam String projectSn) {
return ufaceDevService.countUfaceDevOnOffline(projectSn);
}
}

3
src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java
View File

@ -1,5 +1,6 @@
package com.zhgd.xmgl.modules.worker.mapper;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -30,4 +31,6 @@ public interface UfaceDevMapper extends BaseMapper<UfaceDev> {
EntityMap selectUfaceDevBySn(Map<String, Object> map);
List<EntityMap> selectUfaceDevList(Map<String, Object> map);
HashMap<String, Object> countUfaceDevOnOffline(String projectSn);
}

9
src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml
View File

@ -95,4 +95,13 @@
from uface_dev
where project_sn=#{projectSn}
</select>
<select id="countUfaceDevOnOffline" resultType="java.util.HashMap">
SELECT
count(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(heart_beat_time))/60)<![CDATA[<=]]>30 then 1 else 0 end) as onlineNum,
count(case when round((UNIX_TIMESTAMP(now())-UNIX_TIMESTAMP(heart_beat_time))/60)<![CDATA[>=]]>30 then 0 else 1 end) as offlineNum
FROM
`uface_dev`
WHERE
project_sn = #{sn}
</select>
</mapper>

4
src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevService.java
View File

@ -1,8 +1,10 @@
package com.zhgd.xmgl.modules.worker.service;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.xmgl.modules.worker.entity.UfaceDev;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -33,4 +35,6 @@ public interface IUfaceDevService extends IService<UfaceDev> {
void retryAttendance(String projectSn, String startTime, String endTime, String personGuid);
void retryNewJxJAttendance(String projectSn, String startTime, String endTime, String idcard);
Result<HashMap<String, Object>> countUfaceDevOnOffline(String projectSn);
}

6
src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.worker.service.impl;
import com.baidubce.services.iotshc.model.deivce.DeviceInfo;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.zhgd.jeecg.common.api.vo.Result;
import com.zhgd.jeecg.common.execption.OpenAlertException;
import com.zhgd.jeecg.common.mybatis.EntityMap;
import com.zhgd.xmgl.async.AsyncWorker;
@ -202,4 +203,9 @@ public class UfaceDevServiceImpl extends ServiceImpl<UfaceDevMapper, UfaceDev> i
throw new OpenAlertException("项目配置不下发设备或未配置参数");
}
}
@Override
public Result<HashMap<String, Object>> countUfaceDevOnOffline(String projectSn) {
return Result.success(ufaceDevMapper.countUfaceDevOnOffline(projectSn));
}
}

20
src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java
View File

@ -49,16 +49,16 @@ public class JwtTokenFilter extends OncePerRequestFilter {
if (securityEnable) {
//三江统一认证
if ("sjjt-gsx".equals(activeProfile)) {
try {
//验证不通过不放行
boolean b = validateSjProfile(request, response, filterChain);
if (!b) {
return;
}
} catch (InvalidKeySpecException e) {
log.error("认证失败ex：：", e);
return;
}
//try {
// //验证不通过不放行
// boolean b = validateSjProfile(request, response, filterChain);
// if (!b) {
// return;
// }
//} catch (InvalidKeySpecException e) {
// log.error("认证失败ex：：", e);
// return;
//}
} else {
validateOtherProfile(request);