From e0feef8ebe36b7f51975c4ebad8f3c6d54e3a8cf Mon Sep 17 00:00:00 2001 From: guo Date: Wed, 27 Mar 2024 17:37:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E8=BE=B9=E9=98=B2=E6=8A=A4=E6=97=A0?= =?UTF-8?q?=E7=BD=91=E8=AE=BE=E5=A4=87=EF=BC=88=E5=9C=A8=E7=BA=BF=E3=80=81?= =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E3=80=81=E6=80=BB=E7=9A=84=EF=BC=89=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=92=8C=E6=8A=A5=E8=AD=A6=E8=B6=8B=E5=8A=BF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FrontierProtectionNoNetDataController.java | 33 +++++++++++++------ .../FrontierProtectionNoNetDevController.java | 27 ++++++++++----- .../FrontierProtectionNoNetDataMapper.java | 4 +++ .../FrontierProtectionNoNetDevMapper.java | 4 +++ .../xml/FrontierProtectionNoNetDataMapper.xml | 16 +++++++++ .../xml/FrontierProtectionNoNetDevMapper.xml | 16 ++++++++- .../IFrontierProtectionNoNetDataService.java | 3 ++ .../IFrontierProtectionNoNetDevService.java | 3 ++ ...rontierProtectionNoNetDataServiceImpl.java | 25 +++++++++++--- ...FrontierProtectionNoNetDevServiceImpl.java | 6 ++++ .../smoke/controller/SmokeDevController.java | 4 +-- .../vo/{CountSmokeDev.java => CountDev.java} | 2 +- .../modules/smoke/mapper/SmokeDevMapper.java | 4 +-- .../smoke/mapper/xml/SmokeDevMapper.xml | 2 +- .../smoke/service/ISmokeDevService.java | 4 +-- .../service/impl/SmokeDevServiceImpl.java | 4 +-- .../zhgd/xmgl/security/WebSecurityConfig.java | 2 ++ 17 files changed, 125 insertions(+), 34 deletions(-) rename src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/{CountSmokeDev.java => CountDev.java} (92%) diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java index ab569c1a9..ec13a7c3f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDataController.java @@ -1,5 +1,7 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.controller; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.base.entity.vo.TrendVo; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto; import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService; @@ -137,15 +139,26 @@ public class FrontierProtectionNoNetDataController { return result; } - @ApiOperation(value = "艾礼安云平台设备状态信息订阅", notes = "报警主机在发生状态改变、报警时，主动向第三方平台上传相关信息，响应 \n" + - "0：表示成功 \n" + - "1：表示失败", httpMethod = "POST") - @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), - }) - @PostMapping(value = "/alaDeviceSubscribe") - public Integer alaDeviceSubscribe(@RequestBody FrontierProtectionNoNetDataDto dto) { - return frontierProtectionNoNetDataService.alaDeviceSubscribe(dto); - } + @ApiOperation(value = "艾礼安云平台设备状态信息订阅", notes = "报警主机在发生状态改变、报警时，主动向第三方平台上传相关信息，响应 \n" + + "0：表示成功 \n" + + "1：表示失败", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/alaDeviceSubscribe") + public Integer alaDeviceSubscribe(@RequestBody FrontierProtectionNoNetDataDto dto) { + return frontierProtectionNoNetDataService.alaDeviceSubscribe(dto); + } + + @ApiOperation(value = "统计报警趋势图", notes = "统计报警趋势图", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "devSn", value = "设备sn", paramType = "body", required = false, dataType = "String"), + @ApiImplicitParam(name = "type", value = "1近7天", paramType = "body", required = true, dataType = "Integer"), + }) + @PostMapping(value = "/getTrendData") + public Result> getTrendData(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(frontierProtectionNoNetDataService.getTrendData(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDevController.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDevController.java index 87fcdfff4..3f2b341a3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/controller/FrontierProtectionNoNetDevController.java @@ -1,6 +1,7 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.controller; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -126,14 +127,22 @@ public class FrontierProtectionNoNetDevController { @GetMapping(value = "/queryById") public Result queryById(@RequestParam(name = "id", required = true) String id) { Result result = new Result(); - FrontierProtectionNoNetDev frontierProtectionNoNetDev = frontierProtectionNoNetDevService.getById(id); - if (frontierProtectionNoNetDev == null) { - result.error500("未找到对应实体"); - } else { - result.setResult(frontierProtectionNoNetDev); - result.setSuccess(true); - } - return result; - } + FrontierProtectionNoNetDev frontierProtectionNoNetDev = frontierProtectionNoNetDevService.getById(id); + if (frontierProtectionNoNetDev == null) { + result.error500("未找到对应实体"); + } else { + result.setResult(frontierProtectionNoNetDev); + result.setSuccess(true); + } + return result; + } + @ApiOperation(value = "统计临边防护(无网)-设备信息", notes = "统计临边防护(无网)-设备信息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), + }) + @PostMapping(value = "/countFrontierProtectionNoNetDev") + public Result countFrontierProtectionNoNetDev(@ApiIgnore @RequestBody HashMap paramMap) { + return Result.success(frontierProtectionNoNetDevService.countFrontierProtectionNoNetDev(paramMap)); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java index 355cba7d1..7eeaf81f0 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDataMapper.java @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,4 +25,6 @@ public interface FrontierProtectionNoNetDataMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + List getTrendData(HashMap map); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java index ebec40814..730036263 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/FrontierProtectionNoNetDevMapper.java @@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import org.apache.ibatis.annotations.Mapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; +import java.util.HashMap; import java.util.List; /** @@ -23,4 +25,6 @@ public interface FrontierProtectionNoNetDevMapper extends BaseMapper queryList(@Param(Constants.WRAPPER) QueryWrapper queryWrapper); IPage queryList(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); + + CountDev countFrontierProtectionNoNetDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml index ae342fafa..0e8d9c60e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDataMapper.xml @@ -8,4 +8,20 @@ left join system_user su on su.user_id=fpnnd.operate_id ${ew.customSqlSegment} + + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml index 822133a7e..ce2fd3733 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/mapper/xml/FrontierProtectionNoNetDevMapper.xml @@ -2,8 +2,22 @@ + + diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java index 660c13f7b..3aa3bce92 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDataService.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.service; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -25,4 +26,6 @@ public interface IFrontierProtectionNoNetDataService extends IService getTrendData(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java index bd34d5406..e48dad080 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/IFrontierProtectionNoNetDevService.java @@ -3,6 +3,7 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.service; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import java.util.HashMap; import java.util.List; @@ -22,4 +23,6 @@ public interface IFrontierProtectionNoNetDevService extends IService paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java index 8eecf932f..8edc620b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDataServiceImpl.java @@ -1,5 +1,6 @@ package com.zhgd.xmgl.modules.frontierprotectionnonet.service.impl; +import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -7,6 +8,8 @@ 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.system.query.QueryGenerator; +import com.zhgd.xmgl.base.entity.vo.TrendOneVo; +import com.zhgd.xmgl.modules.ammeter.entity.AmmeterRecordDetail; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetData; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.dto.FrontierProtectionNoNetDataDto; @@ -15,16 +18,16 @@ import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNo import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDataService; import com.zhgd.xmgl.security.entity.UserInfo; import com.zhgd.xmgl.security.util.SecurityUtils; +import com.zhgd.xmgl.util.DateUtils; import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.RefUtil; +import org.apache.commons.collections.MapUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** * @Description: 临边防护(无网)-数据 @@ -120,4 +123,18 @@ public class FrontierProtectionNoNetDataServiceImpl extends ServiceImpl getTrendData(HashMap map) { + Integer type = MapUtils.getInteger(map, "type"); + String projectSn = MapUtils.getString(map, "projectSn"); + String devSn = MapUtils.getString(map, "devSn"); + if (Objects.equals(type, 1)) { + //近7天 + List list = baseMapper.getTrendData(map); + List days = DateUtils.getDateTimeStrList(60, "yyyy-MM-dd"); + return TrendOneVo.fillTrendVos(list, days, "MM-dd"); + } + return null; + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java index e1614cc56..4406d6f15 100644 --- a/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/frontierprotectionnonet/service/impl/FrontierProtectionNoNetDevServiceImpl.java @@ -5,6 +5,7 @@ import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.xmgl.modules.frontierprotectionnonet.entity.FrontierProtectionNoNetDev; import com.zhgd.xmgl.modules.frontierprotectionnonet.mapper.FrontierProtectionNoNetDevMapper; import com.zhgd.xmgl.modules.frontierprotectionnonet.service.IFrontierProtectionNoNetDevService; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -80,4 +81,9 @@ public class FrontierProtectionNoNetDevServiceImpl extends ServiceImpl paramMap) { + return baseMapper.countFrontierProtectionNoNetDev(paramMap); + } } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java index 83cc110b0..706e7d75a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/controller/SmokeDevController.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.jeecg.common.api.vo.Result; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; -import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import com.zhgd.xmgl.modules.smoke.service.ISmokeDevService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -170,7 +170,7 @@ public class SmokeDevController { @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = true, dataType = "String"), }) @PostMapping(value = "/countSmokeDev") - public Result countSmokeDev(@ApiIgnore @RequestBody HashMap paramMap) { + public Result countSmokeDev(@ApiIgnore @RequestBody HashMap paramMap) { return Result.success(smokeDevService.countSmokeDev(paramMap)); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountDev.java similarity index 92% rename from src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java rename to src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountDev.java index 5e4853769..3b1e262bc 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountSmokeDev.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/entity/vo/CountDev.java @@ -4,7 +4,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -public class CountSmokeDev { +public class CountDev { @ApiModelProperty("设备总数") private Integer total; @ApiModelProperty("在线设备总数") diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java index ba8d03c30..2d08aaf88 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/SmokeDevMapper.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; -import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import org.apache.ibatis.annotations.Mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; @@ -23,5 +23,5 @@ public interface SmokeDevMapper extends BaseMapper { IPage queryWrapper(Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper); - CountSmokeDev countSmokeDev(HashMap paramMap); + CountDev countSmokeDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml index bfac4ab9b..b2f08d2a5 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/mapper/xml/SmokeDevMapper.xml @@ -11,7 +11,7 @@ ${ew.customSqlSegment} - select count(*) total, count(*) onlineNum, diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java index 766d0fb02..f0e776e3b 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/ISmokeDevService.java @@ -3,7 +3,7 @@ package com.zhgd.xmgl.modules.smoke.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import javax.servlet.http.HttpServletRequest; import java.util.HashMap; @@ -22,5 +22,5 @@ public interface ISmokeDevService extends IService { void edit(SmokeDev smokeDev); - CountSmokeDev countSmokeDev(HashMap paramMap); + CountDev countSmokeDev(HashMap paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java index 66065a28d..7cfc4abf3 100644 --- a/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/smoke/service/impl/SmokeDevServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; import com.zhgd.xmgl.modules.smoke.entity.SmokeDev; -import com.zhgd.xmgl.modules.smoke.entity.vo.CountSmokeDev; +import com.zhgd.xmgl.modules.smoke.entity.vo.CountDev; import com.zhgd.xmgl.modules.smoke.mapper.SmokeDevMapper; import com.zhgd.xmgl.modules.smoke.service.ISmokeDevService; import com.zhgd.xmgl.util.RefUtil; @@ -58,7 +58,7 @@ public class SmokeDevServiceImpl extends ServiceImpl i } @Override - public CountSmokeDev countSmokeDev(HashMap paramMap) { + public CountDev countSmokeDev(HashMap paramMap) { return smokeDevMapper.countSmokeDev(paramMap); } diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index cefe7d6f4..8a8ab0248 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -339,6 +339,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/xzRegistry/add").permitAll() .antMatchers("/xmgl/safetyHatData/updateStatus").permitAll() .antMatchers("/xmgl/frontierProtectionNoNetData/page").permitAll() + .antMatchers("/xmgl/frontierProtectionNoNetDev/countFrontierProtectionNoNetDev").permitAll() + .antMatchers("/xmgl/frontierProtectionNoNetData/getTrendData").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and()