From dbfe7243b0651fecb1e9d773166197b40e54eb13 Mon Sep 17 00:00:00 2001 From: Administrator <1923636941@qq.com> Date: Thu, 23 Mar 2023 18:51:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=AB=98=E6=94=AF=E6=A8=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UopModifyMessageReceiveListener.java | 2 +- .../TowerCurrentDataController.java | 6 ++-- .../mapper/TowerCurrentDataMapper.java | 2 +- .../mapper/xml/TowerCurrentDataMapper.xml | 2 +- .../service/ITowerCurrentDataService.java | 2 +- .../impl/TowerCurrentDataServiceImpl.java | 6 ++-- ...hFormworkMeasureCurrentDataController.java | 31 ++++++++++++++++--- .../HighFormworkMeasureCurrentData.java | 4 +++ .../entity/vo/BigScreenHighFormworkVo.java | 27 ++++++++++++++++ .../HighFormworkMeasureCurrentDataMapper.java | 4 +++ .../HighFormworkMeasureCurrentDataMapper.xml | 12 +++++++ ...HighFormworkMeasureCurrentDataService.java | 3 ++ ...FormworkMeasureCurrentDataServiceImpl.java | 15 +++++++-- .../worker/controller/UfaceDevController.java | 23 +++++++++----- .../modules/worker/mapper/UfaceDevMapper.java | 3 ++ .../worker/mapper/xml/UfaceDevMapper.xml | 9 ++++++ .../worker/service/IUfaceDevService.java | 4 +++ .../service/impl/UfaceDevServiceImpl.java | 6 ++++ .../zhgd/xmgl/security/JwtTokenFilter.java | 20 ++++++------ 19 files changed, 147 insertions(+), 34 deletions(-) create mode 100644 src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/BigScreenHighFormworkVo.java diff --git a/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java b/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java index dac332fa6..66bd6c071 100644 --- a/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java +++ b/src/main/java/com/zhgd/sjmq/listener/UopModifyMessageReceiveListener.java @@ -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("启动消费者"); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java index 7f5e4b788..171b40637 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/controller/TowerCurrentDataController.java @@ -57,9 +57,9 @@ public class TowerCurrentDataController { @ApiImplicitParam(name = "projectSn", value = "项目SN", paramType = "query", required = true, dataType = "String") }) @PostMapping(value = "/list") - public Result> queryPageList(@RequestBody Map map) { - Result> result = new Result>(); - IPage pageList = towerCurrentDataService.queryTowerCurrentDataPageList(map); + public Result> queryPageList(@RequestBody Map map) { + Result> result = new Result<>(); + IPage pageList = towerCurrentDataService.queryTowerCurrentDataPageList(map); result.setSuccess(true); result.setResult(pageList); return result; diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerCurrentDataMapper.java index 3b8aebf38..2d4c8440b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/TowerCurrentDataMapper.java @@ -27,7 +27,7 @@ public interface TowerCurrentDataMapper extends BaseMapper { TowerCurrentData selectNewestOneTowerCurrentData(Map map); - List queryTowerCurrentDataPageList(Page page, @Param("param") Map map); + List queryTowerCurrentDataPageList(Page page, @Param("param") Map map); List selectExcelTowerCurrentDataList(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml index a3b9ef991..b5cc9b948 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/mapper/xml/TowerCurrentDataMapper.xml @@ -41,7 +41,7 @@ ORDER BY a.recive_time DESC LIMIT 1 - SELECT a.* from tower_current_data a where a.project_sn=#{param.projectSn} diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java index d7f29b213..082e0e4f7 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/ITowerCurrentDataService.java @@ -28,7 +28,7 @@ public interface ITowerCurrentDataService extends IService { List selectProjectTowerNewestCurrentDataList(Map map); - IPage queryTowerCurrentDataPageList(Map map); + IPage queryTowerCurrentDataPageList(Map map); void exporExcelTowerCurrentData(HttpServletResponse response, Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java index 677c294ac..2b2718f35 100644 --- a/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/bigdevice/service/impl/TowerCurrentDataServiceImpl.java @@ -202,11 +202,11 @@ public class TowerCurrentDataServiceImpl extends ServiceImpl queryTowerCurrentDataPageList(Map map) { + public IPage queryTowerCurrentDataPageList(Map map) { int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); - Page page = new Page<>(pageNo, pageSize); - List list = towerCurrentDataMapper.queryTowerCurrentDataPageList(page, map); + Page page = new Page<>(pageNo, pageSize); + List list = towerCurrentDataMapper.queryTowerCurrentDataPageList(page, map); return page.setRecords(list); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java index 0095a85f7..7457b5e6f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/controller/HighFormworkMeasureCurrentDataController.java @@ -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 add(@RequestBody HighFormworkMeasureCurrentData highFormworkMeasureCurrentData) { Result result = new Result(); - 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> queryBigScreenPageList(@RequestBody Map map) { + return Result.success(highFormworkMeasureCurrentDataService.queryBigScreenPageList(map)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java index 5b359200e..06e9b7e33 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/HighFormworkMeasureCurrentData.java @@ -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) diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/BigScreenHighFormworkVo.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/BigScreenHighFormworkVo.java new file mode 100644 index 000000000..f4143c814 --- /dev/null +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/entity/vo/BigScreenHighFormworkVo.java @@ -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; +} diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java index 7bd9d1796..f32175183 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/HighFormworkMeasureCurrentDataMapper.java @@ -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 queryBigScreenPageList(Page p,@Param("q") Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml index 7519e32ae..308531189 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/mapper/xml/HighFormworkMeasureCurrentDataMapper.xml @@ -38,5 +38,17 @@ order by collect_time desc LIMIT 1 + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasureCurrentDataService.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasureCurrentDataService.java index 1696e4e62..ddeecc446 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasureCurrentDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/IHighFormworkMeasureCurrentDataService.java @@ -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 selectMeasureCurrentDataPage(Map map); void saveHighFormworkMeasureCurrentData(HighFormworkMeasureCurrentData highFormworkMeasureCurrentData); + + IPage queryBigScreenPageList(Map map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java index 9a674885a..2f1a849f8 100644 --- a/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/highformwork/service/impl/HighFormworkMeasureCurrentDataServiceImpl.java @@ -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 queryBigScreenPageList(Map map) { + int pageNo = Integer.parseInt(map.getOrDefault("pageNo", 1).toString()); + int pageSize = Integer.parseInt(map.getOrDefault("pageSize", 10).toString()); + Page p = new Page<>(pageNo, pageSize); + IPage page = highFormworkMeasureCurrentDataMapper.queryBigScreenPageList(p, map); + return page; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java index 0cf85d592..8cbef05be 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/UfaceDevController.java @@ -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> countUfaceDevOnOffline(@RequestParam String projectSn) { + return ufaceDevService.countUfaceDevOnOffline(projectSn); + } + } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java index f480c1417..0557dfb78 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/UfaceDevMapper.java @@ -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 { EntityMap selectUfaceDevBySn(Map map); List selectUfaceDevList(Map map); + + HashMap countUfaceDevOnOffline(String projectSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml index 1b43fc7f2..b56e498eb 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/UfaceDevMapper.xml @@ -95,4 +95,13 @@ from uface_dev where project_sn=#{projectSn} + \ No newline at end of file diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevService.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevService.java index bc7a19f62..fb85bee20 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/IUfaceDevService.java @@ -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 { void retryAttendance(String projectSn, String startTime, String endTime, String personGuid); void retryNewJxJAttendance(String projectSn, String startTime, String endTime, String idcard); + + Result> countUfaceDevOnOffline(String projectSn); } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java index bf250b264..4df76188a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/UfaceDevServiceImpl.java @@ -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 i throw new OpenAlertException("项目配置不下发设备或未配置参数"); } } + + @Override + public Result> countUfaceDevOnOffline(String projectSn) { + return Result.success(ufaceDevMapper.countUfaceDevOnOffline(projectSn)); + } } diff --git a/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java b/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java index a6db75d19..2aaf6b70b 100644 --- a/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java +++ b/src/main/java/com/zhgd/xmgl/security/JwtTokenFilter.java @@ -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);