From 1f54fa41a712e89bd475728f46378a5de00c93b5 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 14 Jun 2023 15:47:49 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=8A=A5?= =?UTF-8?q?=E8=AD=A6=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8E=86=E5=8F=B2=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysDatabaseController.java | 9 +++++++ .../controller/SysEmailController.java | 9 +++++++ .../modules/mapper/SysDatabaseMapper.java | 8 ++++++ .../jeecg/modules/mapper/SysEmailMapper.java | 8 ++++++ .../modules/mapper/xml/SysEmailMapper.xml | 23 ++++++++++++++++ .../modules/mapper/xml/sysDatabaseMapper.xml | 23 ++++++++++++++++ .../modules/service/ISysDatabaseService.java | 5 ++++ .../modules/service/ISysEmailService.java | 4 +++ .../service/impl/SysDatabaseServiceImpl.java | 27 +++++++++++++++++++ .../service/impl/SysEmailServiceImpl.java | 27 +++++++++++++++++++ 10 files changed, 143 insertions(+) create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java index 860687d7..ad50f156 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java @@ -6,8 +6,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysDatabase; import org.jeecg.modules.service.ISysDatabaseService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @RestController @RequestMapping("sysDatabase") @Api(value = "数据库配置管理", tags = "数据库配置管理") @@ -41,4 +44,10 @@ public class SysDatabaseController { return sysDatabaseService.deleteById(id); } + @GetMapping("findAlarmHistory") + public Result findAlarmHistory(String databaseId, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ + return sysDatabaseService.findAlarmHistory(databaseId, startTime, endTime); + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 5b6733e0..3d51fea1 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -7,8 +7,11 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysEmail; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; +import java.util.Date; + @RestController @RequestMapping("sysEmail") @Api(value = "邮箱配置信息管理", tags = "邮箱配置信息管理") @@ -47,4 +50,10 @@ public class SysEmailController { return sysEmailService.deleteById(id); } + @GetMapping("findAlarmHistory") + public Result findAlarmHistory(String emailId, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ + return sysEmailService.findAlarmHistory(emailId, startTime, endTime); + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java index e58a3770..c3be5b15 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysDatabaseMapper.java @@ -1,7 +1,15 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.entity.SysDatabase; +import java.util.Date; +import java.util.List; + public interface SysDatabaseMapper extends BaseMapper { + + List findAlarmHistory(@Param("databaseId") String databaseId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index 8ce3adf4..ed46c7d8 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -1,7 +1,15 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.apache.ibatis.annotations.Param; +import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.entity.SysEmail; +import java.util.Date; +import java.util.List; + public interface SysEmailMapper extends BaseMapper { + + List findAlarmHistory( @Param("emailId") String emailId, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml new file mode 100644 index 00000000..5d471498 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/SysEmailMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml new file mode 100644 index 00000000..66c94989 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/xml/sysDatabaseMapper.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java index 075b4b0e..f5d6ced3 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysDatabaseService.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysDatabase; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; public interface ISysDatabaseService extends IService { @@ -17,4 +20,6 @@ public interface ISysDatabaseService extends IService { Result deleteById(String id); + Result findAlarmHistory(String databaseId, Date startTime, Date endTime); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index bf36aca2..6e34062e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -5,6 +5,8 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysEmail; +import java.util.Date; + public interface ISysEmailService extends IService { Result findPage(QueryRequest queryRequest, SysEmail sysEmail); @@ -17,4 +19,6 @@ public interface ISysEmailService extends IService { Result deleteById(String id); + Result findAlarmHistory(String emailId, Date startTime, Date endTime); + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java index 5ac62f4c..ffd20088 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysDatabaseServiceImpl.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.entity.SysDatabase; import org.jeecg.modules.mapper.SysDatabaseMapper; import org.jeecg.modules.service.ISysDatabaseService; @@ -15,7 +17,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.util.Date; +import java.util.List; import java.util.Objects; @Service("sysDatabaseService") @@ -101,4 +105,27 @@ public class SysDatabaseServiceImpl extends ServiceImpl alarmHistory = this.baseMapper.findAlarmHistory(databaseId, startDate, endDate); + result.setSuccess(true); + result.setResult(alarmHistory); + } catch (ParseException e) { + throw new RuntimeException(e); + } + return result; + } + } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 672851b4..32639935 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; +import org.jeecg.modules.entity.AlarmHistory; import org.jeecg.modules.entity.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; @@ -15,7 +17,9 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; +import java.text.ParseException; import java.util.Date; +import java.util.List; import java.util.Objects; @Service("sysEmailService") @@ -105,4 +109,27 @@ public class SysEmailServiceImpl extends ServiceImpl i return result; } + @Override + public Result findAlarmHistory(String emailId, Date startTime, Date endTime) { + Result result = new Result(); + try { + if (Objects.isNull(startTime)){ + result.error500("开始时间不能为空"); + return result; + } + if (Objects.isNull(endTime)){ + result.error500("结束时间不能为空"); + return result; + } + Date startDate = DateUtils.parseDate(DateUtils.formatDate(startTime, "yyyy-MM-dd") + " 00:00:00", "yyyy-MM-dd HH:mm:ss"); + Date endDate = DateUtils.parseDate(DateUtils.formatDate(endTime, "yyyy-MM-dd") + " 23:59:59", "yyyy-MM-dd HH:mm:ss"); + List alarmHistory = this.baseMapper.findAlarmHistory(emailId, startDate, endDate); + result.setSuccess(true); + result.setResult(alarmHistory); + } catch (ParseException e) { + throw new RuntimeException(e); + } + return result; + } + } From 61ee4370522cabe7453e55ea0b8da547adaea3fc Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Wed, 14 Jun 2023 18:11:29 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E5=8F=B0=E7=AB=99?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=A2=9E=E5=8A=A0=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E7=9B=B8=E5=85=B3=E8=BF=94=E5=9B=9E=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/entity/SysUserFocusStation.java | 6 ++++++ .../impl/SysUserFocusStationServiceImpl.java | 20 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java index 0b20e647..394e13b9 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/SysUserFocusStation.java @@ -39,4 +39,10 @@ public class SysUserFocusStation implements Serializable { @TableField(value = "create_by") private String createBy; + @TableField(exist = false) + private Double lon; + + @TableField(exist = false) + private Double lat; + } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java index 00df0993..6d8c6ce0 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/SysUserFocusStationServiceImpl.java @@ -6,32 +6,44 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.util.JwtUtil; +import org.jeecg.common.util.RedisUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.entity.SysUser; import org.jeecg.modules.entity.SysUserFocusStation; import org.jeecg.modules.mapper.SysUserFocusStationMapper; import org.jeecg.modules.mapper.SysUserMapper; import org.jeecg.modules.service.ISysUserFocusStationService; +import org.jeecg.modules.system.entity.GardsStations; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.Objects; +import java.util.*; @Service("sysUserFocusStationService") public class SysUserFocusStationServiceImpl extends ServiceImpl implements ISysUserFocusStationService { + @Autowired + private RedisUtil redisUtil; @Autowired private SysUserMapper sysUserMapper; @Override public List findList() { + //查询全部台站信息 + HashMap stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); List sysUserFocusStations = this.baseMapper.selectList(new LambdaQueryWrapper<>()); if (CollectionUtils.isNotEmpty(sysUserFocusStations)){ + sysUserFocusStations.stream().forEach(item->{ + if (CollectionUtils.isNotEmpty(stationInfoMap)){ + if (Objects.nonNull(stationInfoMap.get(item.getStationId()))){ + GardsStations stations = (GardsStations) stationInfoMap.get(item.getStationId()); + item.setLon(stations.getLon()); + item.setLat(stations.getLat()); + } + } + }); return sysUserFocusStations; } return Collections.emptyList(); From 6447eaa2078e765398996b1ba2c3cae5c1d50729 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 15 Jun 2023 08:56:08 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AFw=E6=88=96s=E7=BB=93=E5=B0=BE=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E9=9C=80=E8=A6=81=E4=B9=98-1=20=E5=8F=B0?= =?UTF-8?q?=E7=AB=99/=E6=A0=B8=E8=AE=BE=E6=96=BD=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=BF=94=E5=9B=9E=E5=86=85=E5=AE=B9=EF=BC=8C?= =?UTF-8?q?=E6=B5=B7=E6=8B=94=E5=8E=BB=E6=8E=89=E5=8D=95=E4=BD=8D=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=20=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A4=84=E7=90=86=E7=BB=93=E6=9E=9C=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=B7=A5=E4=BA=A4=E4=BA=92?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=20=E6=9F=A5=E8=AF=A2=E5=8F=B0=E7=AB=99=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E7=BB=93=E6=9E=84=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/common/PointUtil.java | 3 +++ .../jeecg/modules/controller/StationOperationController.java | 2 ++ .../modules/service/impl/StationOperationServiceImpl.java | 2 +- .../org/jeecg/modules/controller/RadionuclideController.java | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java index 38289024..379bfa94 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/PointUtil.java @@ -25,6 +25,9 @@ public class PointUtil { } if (Objects.nonNull(Degrees) || Objects.nonNull(minutes) || Objects.nonNull(seconds)){ Double result = Degrees + minutes/60+seconds/3600; + if (pointValue.indexOf("W")>0 || pointValue.indexOf("S")>0){ + result = -1 * result; + } pointValue = String.valueOf(result); } } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java index 765820f2..2e4503ea 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java @@ -13,6 +13,7 @@ import org.jeecg.modules.system.entity.GardsNuclearfacility; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; @RestController @@ -38,6 +39,7 @@ public class StationOperationController { } @GetMapping("findTree") + @ApiOperation(value = "查询台站树形结构", notes = "查询台站树形结构") public Result findTree(){ Result result = stationOperationService.findTree(); return result; diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 101396cc..9b89643e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -50,7 +50,7 @@ public class StationOperationServiceImpl extends ServiceImpl Date: Thu, 15 Jun 2023 09:02:31 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E6=B5=B7=E6=8B=94=E9=AB=98=E5=BA=A6?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeecg/modules/service/impl/StationOperationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 9b89643e..7e374f0e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -50,7 +50,7 @@ public class StationOperationServiceImpl extends ServiceImpl Date: Thu, 15 Jun 2023 14:02:04 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3=20=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=85=8D=E7=BD=AE=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=20=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3=20=E6=8A=A5=E8=AD=A6=E6=97=A5=E5=BF=97=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=B3=A8=E8=A7=A3=20=E6=8A=A5=E8=AD=A6=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E7=BB=84=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=9B=B8=E5=85=B3=E6=B3=A8=E8=A7=A3=20=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=90=AF=E5=8A=A8=E7=B1=BB=E5=A2=9E=E5=8A=A0controlle?= =?UTF-8?q?r=E5=B1=82=EF=BC=8C=E6=8A=A5=E8=AD=A6=E8=81=94=E7=B3=BB?= =?UTF-8?q?=E4=BA=BA=E7=BB=84=E5=A3=B0=E6=98=8E=E6=8E=A5=E5=8F=A3=E4=BD=BF?= =?UTF-8?q?=E7=94=A8feignClient=E8=B0=83=E7=94=A8=20=E5=8F=B0=E7=AB=99?= =?UTF-8?q?=E8=BF=90=E8=A1=8C=E7=AE=A1=E7=90=86=E6=A0=B8=E8=AE=BE=E6=96=BD?= =?UTF-8?q?=E7=BB=8F=E7=BA=AC=E5=BA=A6=E4=BF=A1=E6=81=AF=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=EF=BC=8C=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E4=BA=A4=E6=8D=A2=E5=AD=97=E6=AE=B5=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-module-abnormal-alarm/pom.xml | 5 + .../AlarmContactGroupController.java | 6 ++ .../controller/AlarmLogController.java | 6 ++ .../controller/AlarmRuleController.java | 7 ++ .../controller/SysDatabaseController.java | 8 ++ .../controller/SysEmailController.java | 1 + .../controller/SysServerController.java | 1 + .../modules/entity/AlarmContactGroup.java | 4 + .../modules/entity/AlarmContactGroupVo.java | 27 ------ .../org/jeecg/modules/entity/SysUserRole.java | 52 ----------- .../mapper/AlarmContactGroupVoMapper.java | 7 -- .../jeecg/modules/mapper/SysRoleMapper.java | 7 -- .../jeecg/modules/mapper/SysUserMapper.java | 7 -- .../modules/mapper/SysUserRoleMapper.java | 7 -- .../modules/service/IAlarmSysUserService.java | 17 ++++ .../modules/service/ISysUserService.java | 13 --- .../impl/AlarmContactGroupServiceImpl.java | 20 ++-- .../service/impl/AlarmRuleServiceImpl.java | 2 + .../service/impl/SysUserServiceImpl.java | 61 ------------- .../StationOperationController.java | 6 ++ .../service/IStationOperationService.java | 8 ++ .../impl/StationOperationServiceImpl.java | 40 ++++++-- .../src/main/resources/application.yml | 2 +- .../controller/AlarmSysUserController.java | 91 +++++++++++++++++++ 24 files changed, 203 insertions(+), 202 deletions(-) delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupVo.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUserRole.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupVoMapper.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysRoleMapper.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserMapper.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserRoleMapper.java create mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmSysUserService.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysUserService.java delete mode 100644 jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysUserServiceImpl.java create mode 100644 jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java diff --git a/jeecg-module-abnormal-alarm/pom.xml b/jeecg-module-abnormal-alarm/pom.xml index ca43b195..c82cf444 100644 --- a/jeecg-module-abnormal-alarm/pom.xml +++ b/jeecg-module-abnormal-alarm/pom.xml @@ -17,6 +17,11 @@ jeecg-boot-base-core + + + org.springframework.cloud + spring-cloud-starter-openfeign + \ No newline at end of file diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java index fb0a46c8..74c26810 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.controller; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.AlarmContactGroup; @@ -15,26 +16,31 @@ public class AlarmContactGroupController { private IAlarmContactGroupService alarmContactGroupService; @GetMapping("findPage") + @ApiOperation(value = "分页查询报警联系人组信息", notes = "分页查询报警联系人组信息") public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup){ return alarmContactGroupService.findPage(queryRequest, alarmContactGroup); } @GetMapping("findInfo") + @ApiOperation(value = "查询报警联系人组信息详情", notes = "查询报警联系人组信息详情") public Result findPage(String id){ return alarmContactGroupService.findInfo(id); } @PostMapping("create") + @ApiOperation(value = "新增报警人联系人组", notes = "新增报警联系人组") public Result findPage(@RequestBody AlarmContactGroup alarmContactGroup){ return alarmContactGroupService.create(alarmContactGroup); } @PutMapping("update") + @ApiOperation(value = "修改报警人联系人组", notes = "修改报警联系人组") public Result update(@RequestBody AlarmContactGroup alarmContactGroup){ return alarmContactGroupService.update(alarmContactGroup); } @DeleteMapping("deleteById") + @ApiOperation(value = "删除报警人联系人组", notes = "删除报警联系人组") public Result deleteById(String id){ return alarmContactGroupService.deleteById(id); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java index b56a8882..e6961dbd 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmLogController.java @@ -1,5 +1,6 @@ package org.jeecg.modules.controller; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.AlarmLog; @@ -15,26 +16,31 @@ public class AlarmLogController { private IAlarmLogService alarmLogService; @GetMapping("findPage") + @ApiOperation(value = "分页查询报警日志信息", notes = "分页查询报警日志信息") public Result findPage(QueryRequest queryRequest, AlarmLog alarmLog){ return alarmLogService.findPage(queryRequest, alarmLog); } @GetMapping("findInfo") + @ApiOperation(value = "查询报警日志信息详情", notes = "查询报警日志信息详情") public Result findPage(String id){ return alarmLogService.findInfo(id); } @PostMapping("create") + @ApiOperation(value = "新增报警日志", notes = "新增报警日志") public Result findPage(@RequestBody AlarmLog alarmLog){ return alarmLogService.create(alarmLog); } @PutMapping("update") + @ApiOperation(value = "修改报警日志", notes = "修改报警日志") public Result update(@RequestBody AlarmLog alarmLog){ return alarmLogService.update(alarmLog); } @DeleteMapping("deleteById") + @ApiOperation(value = "删除报警日志", notes = "删除报警日志") public Result deleteById(String id){ return alarmLogService.deleteById(id); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java index 7f30fe65..f8ced280 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java @@ -1,11 +1,13 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.AlarmRule; import org.jeecg.modules.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @RestController @@ -17,26 +19,31 @@ public class AlarmRuleController { private IAlarmRuleService alarmRuleService; @GetMapping("findPage") + @ApiOperation(value = "分页查询报警规则信息", notes = "分页查询报警规则信息") public Result findPage(QueryRequest queryRequest, AlarmRule alarmRule){ return alarmRuleService.findPage(queryRequest, alarmRule); } @GetMapping("findInfo") + @ApiOperation(value = "查看规则信息详情", notes = "查看规则信息详情") public Result findPage(String id){ return alarmRuleService.findInfo(id); } @PostMapping("create") + @ApiOperation(value = "新增规则信息", notes = "新增规则信息") public Result findPage(@RequestBody AlarmRule alarmRule){ return alarmRuleService.create(alarmRule); } @PutMapping("update") + @ApiOperation(value = "修改规则信息", notes = "修改规则信息") public Result update(@RequestBody AlarmRule alarmRule){ return alarmRuleService.update(alarmRule); } @DeleteMapping("deleteById") + @ApiOperation(value = "删除规则信息", notes = "删除规则信息") public Result deleteById(String id){ return alarmRuleService.deleteById(id); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java index ad50f156..b98a6045 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysDatabaseController.java @@ -1,6 +1,7 @@ package org.jeecg.modules.controller; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.SysDatabase; @@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.Date; @RestController @@ -20,31 +22,37 @@ public class SysDatabaseController { private ISysDatabaseService sysDatabaseService; @GetMapping("findPage") + @ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息") public Result findPage(QueryRequest queryRequest, SysDatabase sysDatabase){ return sysDatabaseService.findPage(queryRequest, sysDatabase); } @GetMapping("findInfo") + @ApiOperation(value = "查询数据库配置信息详情", notes = "查询数据库配置信息详情") public Result findInfo(String id){ return sysDatabaseService.findInfo(id); } @PostMapping("create") + @ApiOperation(value = "新增数据库配置信息", notes = "新增数据库配置信息") public Result create(@RequestBody SysDatabase sysDatabase){ return sysDatabaseService.create(sysDatabase); } @PutMapping("update") + @ApiOperation(value = "修改数据库配置信息", notes = "修改数据库配置信息") public Result update(@RequestBody SysDatabase sysDatabase){ return sysDatabaseService.update(sysDatabase); } @DeleteMapping("deleteById") + @ApiOperation(value = "删除数据库配置信息", notes = "删除数据库配置信息") public Result deleteById(String id){ return sysDatabaseService.deleteById(id); } @GetMapping("findAlarmHistory") + @ApiOperation(value = "查询数据库历史报警信息", notes = "查询数据库历史报警信息") public Result findAlarmHistory(String databaseId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ return sysDatabaseService.findAlarmHistory(databaseId, startTime, endTime); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 3d51fea1..78fdd27c 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -51,6 +51,7 @@ public class SysEmailController { } @GetMapping("findAlarmHistory") + @ApiOperation(value = "查询邮箱历史报警信息", notes = "查询邮箱历史报警信息") public Result findAlarmHistory(String emailId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ return sysEmailService.findAlarmHistory(emailId, startTime, endTime); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java index ba358a87..73e45938 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysServerController.java @@ -51,6 +51,7 @@ public class SysServerController { } @GetMapping("findAlarmHistory") + @ApiOperation(value = "查询服务器历史报警信息", notes = "查询服务器历史报警信息") public Result findAlarmHistory(String serverId, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ return sysServerService.findAlarmHistory(serverId, startTime, endTime); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java index 308e47f2..5fbff4d4 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroup.java @@ -44,6 +44,10 @@ public class AlarmContactGroup implements Serializable { @TableField(exist = false) List userIds; + @TableField(exist = false) + List users; + @TableField(exist = false) + Integer personNumber; } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupVo.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupVo.java deleted file mode 100644 index d7676989..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/AlarmContactGroupVo.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.jeecg.modules.entity; - -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.Data; -import org.springframework.format.annotation.DateTimeFormat; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; - -@Data -public class AlarmContactGroupVo implements Serializable { - - private String id; - - private String name; - - - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; - - List users; - - Integer personNumber; - -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUserRole.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUserRole.java deleted file mode 100644 index 68cf50e5..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysUserRole.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.jeecg.modules.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -import java.io.Serializable; - -/** - *

- * 用户角色表 - *

- * - * @Author scott - * @since 2018-12-21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class SysUserRole implements Serializable { - - private static final long serialVersionUID = 1L; - - @TableId(type = IdType.ASSIGN_ID) - private String id; - - /** - * 用户id - */ - private String userId; - - /** - * 角色id - */ - private String roleId; - - /**租户ID*/ - private Integer tenantId; - - public SysUserRole() { - } - - public SysUserRole(String userId, String roleId) { - this.userId = userId; - this.roleId = roleId; - } - - - -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupVoMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupVoMapper.java deleted file mode 100644 index ed4fa6f5..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupVoMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.AlarmContactGroupVo; - -public interface AlarmContactGroupVoMapper extends BaseMapper { -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysRoleMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysRoleMapper.java deleted file mode 100644 index f795b5bb..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysRoleMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysRole; - -public interface SysRoleMapper extends BaseMapper { -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserMapper.java deleted file mode 100644 index 9c11087e..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysUser; - -public interface SysUserMapper extends BaseMapper { -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserRoleMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserRoleMapper.java deleted file mode 100644 index ef2415b1..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysUserRoleMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.jeecg.modules.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysUserRole; - -public interface SysUserRoleMapper extends BaseMapper { -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmSysUserService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmSysUserService.java new file mode 100644 index 00000000..93f23705 --- /dev/null +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmSysUserService.java @@ -0,0 +1,17 @@ +package org.jeecg.modules.service; + +import org.jeecg.modules.entity.SysUser; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.Map; + +@Component +@FeignClient(value = "jeecg-system") +public interface IAlarmSysUserService { + + @RequestMapping("/alarmSysUser/findUserMap") + Map findUserMap(); + +} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysUserService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysUserService.java deleted file mode 100644 index f5a390d5..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysUserService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.jeecg.modules.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.entity.SysUser; - -import java.util.List; -import java.util.Map; - -public interface ISysUserService extends IService { - - Map findUserList(); - -} diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java index c373d552..7b0f53ee 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/AlarmContactGroupServiceImpl.java @@ -11,13 +11,11 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.entity.AlarmContactGroup; import org.jeecg.modules.entity.AlarmContactGroupMember; -import org.jeecg.modules.entity.AlarmContactGroupVo; import org.jeecg.modules.entity.SysUser; import org.jeecg.modules.mapper.AlarmContactGroupMapper; import org.jeecg.modules.mapper.AlarmContactGroupMemberMapper; -import org.jeecg.modules.mapper.AlarmContactGroupVoMapper; import org.jeecg.modules.service.IAlarmContactGroupService; -import org.jeecg.modules.service.ISysUserService; +import org.jeecg.modules.service.IAlarmSysUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,24 +26,22 @@ import java.util.stream.Collectors; @Service("alarmContactGroupService") public class AlarmContactGroupServiceImpl extends ServiceImpl implements IAlarmContactGroupService { - @Autowired - private AlarmContactGroupVoMapper alarmContactGroupVoMapper; @Autowired private AlarmContactGroupMemberMapper alarmContactGroupMemberMapper; @Autowired - private ISysUserService sysUserService; + private IAlarmSysUserService alarmSysUserService; @Override public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup) { Result result = new Result(); //获取用户信息 - Map userList = sysUserService.findUserList(); - Page page = new Page<>(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Page alarmContactGroupVoPage = alarmContactGroupVoMapper.selectPage(page, queryWrapper); + Map userList = alarmSysUserService.findUserMap(); + Page page = new Page<>(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Page alarmContactGroupPage = this.baseMapper.selectPage(page, queryWrapper); LambdaQueryWrapper contactGroupMemberQueryWrapper = new LambdaQueryWrapper<>(); List alarmContactGroupMembers = alarmContactGroupMemberMapper.selectList(contactGroupMemberQueryWrapper); - alarmContactGroupVoPage.getRecords().forEach(item->{ + alarmContactGroupPage.getRecords().forEach(item->{ List sysUsers = new LinkedList<>(); //联系人组对应联系人信息不为空 if (CollectionUtils.isNotEmpty(alarmContactGroupMembers)){ @@ -66,7 +62,7 @@ public class AlarmContactGroupServiceImpl extends ServiceImpl page = new Page<>(queryRequest.getPageNo(), queryRequest.getPageSize()); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(Objects.nonNull(alarmRule.getEnabled()), AlarmRule::getEnabled, alarmRule.getEnabled()); + queryWrapper.eq(StringUtils.isNotBlank(alarmRule.getSourceId()), AlarmRule::getSourceId, alarmRule.getSourceId()); Page alarmRulePage = this.baseMapper.selectPage(page, queryWrapper); result.setSuccess(true); result.setResult(alarmRulePage); diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysUserServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysUserServiceImpl.java deleted file mode 100644 index 2e4af4af..00000000 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysUserServiceImpl.java +++ /dev/null @@ -1,61 +0,0 @@ -package org.jeecg.modules.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.entity.SysRole; -import org.jeecg.modules.entity.SysUser; -import org.jeecg.modules.entity.SysUserRole; -import org.jeecg.modules.mapper.SysRoleMapper; -import org.jeecg.modules.mapper.SysUserMapper; -import org.jeecg.modules.mapper.SysUserRoleMapper; -import org.jeecg.modules.service.ISysUserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -@Service("sysUserService") -public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { - - @Autowired - private SysUserRoleMapper sysUserRoleMapper; - @Autowired - private SysRoleMapper sysRoleMapper; - - @Override - public Map findUserList() { - Map map = new HashMap<>(); - LambdaQueryWrapper userQueryWrapper = new LambdaQueryWrapper<>(); - List sysUsers = this.baseMapper.selectList(userQueryWrapper); - LambdaQueryWrapper userRoleQueryWrapper = new LambdaQueryWrapper<>(); - List sysUserRoles = sysUserRoleMapper.selectList(userRoleQueryWrapper); - LambdaQueryWrapper roleQueryWrapper = new LambdaQueryWrapper<>(); - List sysRoles = sysRoleMapper.selectList(roleQueryWrapper); - List roles = new LinkedList<>(); - //遍历所有用户信息 - if (CollectionUtils.isNotEmpty(sysUsers)){ - for (SysUser sysUser:sysUsers) { - if (CollectionUtils.isNotEmpty(sysUserRoles)){ - //获取各用户匹配的权限集合 - List userRoles = sysUserRoles.stream().filter(item -> item.getUserId().equals(sysUser.getId())).collect(Collectors.toList()); - List roleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(sysRoles)){ - for (SysRole role:sysRoles) { - if (roleIds.contains(role.getId())){ - roles.add(role); - } - } - } - sysUser.setRoles(roles); - } - map.put(sysUser.getId(), sysUser); - } - } - return map; - } -} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java index 2e4503ea..b678d849 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/controller/StationOperationController.java @@ -52,4 +52,10 @@ public class StationOperationController { return result; } + @GetMapping("getDataReceivingStatus") + @ApiOperation(value = "查询台站监测数据信息", notes = "查询台站监测数据信息") + public void getDataReceivingStatus(List stationIds){ + stationOperationService.getDataReceivingStatus(stationIds); + } + } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/IStationOperationService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/IStationOperationService.java index c0441306..d978c305 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/IStationOperationService.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/IStationOperationService.java @@ -38,4 +38,12 @@ public interface IStationOperationService extends IService { * @return */ Result getHitEquList(PointVo pointVo); + + /** + * 查询台站监测数据 + * @param stationIds + * @return + */ + Result getDataReceivingStatus(List stationIds); + } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 7e374f0e..2287088c 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -10,6 +10,7 @@ import com.spatial4j.core.shape.Rectangle; import io.swagger.models.auth.In; import org.jeecg.common.PointUtil; import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.entity.Point; import org.jeecg.modules.entity.PointVo; @@ -22,6 +23,9 @@ import org.jeecg.modules.service.IStationOperationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.ParseException; +import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.List; import java.util.stream.Collectors; @@ -66,8 +70,8 @@ public class StationOperationServiceImpl extends ServiceImpl nuclearFacilityMap = (HashMap) redisUtil.get("nuclearFacilityMap"); GardsNuclearfacility nuclearfacility = nuclearFacilityMap.get(stationId); if (Objects.nonNull(nuclearfacility)){ - nuclearfacility.setLongitude(PointUtil.calculate(nuclearfacility.getLongitude())); - nuclearfacility.setLatitude(PointUtil.calculate(nuclearfacility.getLatitude())); + nuclearfacility.setLongitude(PointUtil.calculate(nuclearfacility.getLatitude())); + nuclearfacility.setLatitude(PointUtil.calculate(nuclearfacility.getLongitude())); result.setResult(nuclearfacility); result.setSuccess(true); }else { @@ -177,13 +181,13 @@ public class StationOperationServiceImpl extends ServiceImpl stationIds) { + if (CollectionUtils.isNotEmpty(stationIds)){ + //获取当前日期时间 + LocalDate endDate = LocalDate.now(); + //将当前日期换算成 +// endDate.minusDays(); + + + + //根据台站id + + + + + + } + return null; + } + /** * 获取外接正方形的最大最小经纬度 * diff --git a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml b/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml index 8a462b69..faa36051 100644 --- a/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml +++ b/jeecg-server-cloud/jeecg-station-operation-start/src/main/resources/application.yml @@ -15,4 +15,4 @@ spring: config: import: - optional:nacos:jeecg.yaml - - optional:nacos:jeecg-station-operation-@profile.name@.yaml \ No newline at end of file + - optional:nacos:jeecg-@profile.name@.yaml \ No newline at end of file diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java new file mode 100644 index 00000000..6226dc44 --- /dev/null +++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java @@ -0,0 +1,91 @@ +package org.jeecg.modules.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import org.jeecg.modules.system.entity.SysDictItem; +import org.jeecg.modules.system.entity.SysRole; +import org.jeecg.modules.system.entity.SysUser; +import org.jeecg.modules.system.entity.SysUserRole; +import org.jeecg.modules.system.mapper.SysDictItemMapper; +import org.jeecg.modules.system.mapper.SysRoleMapper; +import org.jeecg.modules.system.mapper.SysUserMapper; +import org.jeecg.modules.system.mapper.SysUserRoleMapper; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@RestController +@RequestMapping("alarmSysUser") +public class AlarmSysUserController { + + @Resource + private SysUserMapper sysUserMapper; + @Resource + private SysUserRoleMapper sysUserRoleMapper; + @Resource + private SysRoleMapper sysRoleMapper; + @Resource + private SysDictItemMapper sysDictItemMapper; + + @GetMapping("findUserMap") + public Map findUserMap(){ + Map map = new HashMap<>(); + LambdaQueryWrapper userQueryWrapper = new LambdaQueryWrapper<>(); + List sysUsers = sysUserMapper.selectList(userQueryWrapper); + LambdaQueryWrapper userRoleQueryWrapper = new LambdaQueryWrapper<>(); + List sysUserRoles = sysUserRoleMapper.selectList(userRoleQueryWrapper); + LambdaQueryWrapper roleQueryWrapper = new LambdaQueryWrapper<>(); + List sysRoles = sysRoleMapper.selectList(roleQueryWrapper); + List roles = new LinkedList<>(); + //遍历所有用户信息 + if (CollectionUtils.isNotEmpty(sysUsers)){ + for (SysUser sysUser:sysUsers) { + if (CollectionUtils.isNotEmpty(sysUserRoles)){ + //获取各用户匹配的权限集合 + List userRoles = sysUserRoles.stream().filter(item -> item.getUserId().equals(sysUser.getId())).collect(Collectors.toList()); + List roleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(sysRoles)){ + for (SysRole role:sysRoles) { + if (roleIds.contains(role.getId())){ + roles.add(role); + } + } + } + sysUser.setRoles(roles); + } + map.put(sysUser.getId(), sysUser); + } + } + return map; + } + + + + @RequestMapping("findCacheTime") + public void findCacheTime(){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List sysDictItems = sysDictItemMapper.selectList(queryWrapper); + //获取缓存时间对应的值 + Map cacheTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Cache time")) + .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + //获取实际分度值 + Map scaleInterval = sysDictItems.stream().filter(item -> item.getItemText().equals("Scale interval")) + .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + //获取时间线长度 + Map timelineLength = sysDictItems.stream().filter(item -> item.getItemText().equals("Timeline length")) + .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + //获取更新间隔时间 + Map updateIntervalTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Update interval time")) + .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + + } + + +} From e43fec651bd2cd51f9522085cbb7a45cb593bd35 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Thu, 15 Jun 2023 14:27:08 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=85=B3=E9=97=ADftp=E8=BF=9E=E6=8E=A5=20=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/common/util/FTPUtil.java | 47 ++++++++++++++++--- .../controller/LogManageController.java | 35 ++++---------- 2 files changed, 49 insertions(+), 33 deletions(-) diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java index bd5f49e5..6ca68c24 100644 --- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/FTPUtil.java @@ -8,8 +8,11 @@ import org.apache.commons.net.ftp.FTPReply; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; +import java.net.URLEncoder; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; @@ -60,14 +63,15 @@ public class FTPUtil { return ftp; } - public InputStream downloadFTPFile(String localPath, String fileName){ + public void downloadFTPFile(String localPath, String fileName, HttpServletResponse response) { InputStream in = null; + ServletOutputStream out = null; + FTPClient ftpClient = this.LoginFTP(); + if (Objects.isNull(ftpClient)){ + throw new RuntimeException("ftp连接失败!"); + } //传输模式 try { - FTPClient ftpClient = this.LoginFTP(); - if (Objects.isNull(ftpClient)){ - throw new RuntimeException("ftp连接失败!"); - } List paths = Arrays.asList(localPath.split("/")); if (CollectionUtils.isNotEmpty(paths)){ for (String workPath:paths) { @@ -88,10 +92,41 @@ public class FTPUtil { } } } + //重置响应信息 + response.reset(); + //设置响应类型 + response.setContentType("application/download"); + //解决中文不能生成文件 + response.setHeader("Content-Disposition", "attachment; fileName=" + URLEncoder.encode(fileName,"UTF-8")); + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + //获取输出流 + out = response.getOutputStream(); + //声明一个长度参数 + int len; + //声明字节数组 + byte[] bytes = new byte[1024]; + //判断如果输入流的字节长度不等于-1，进行字节数组内容的读取 + while ((len = in.read(bytes)) != -1) { + out.write(bytes, 0, len); + } } catch (IOException e) { throw new RuntimeException(e); + } finally { + try { + out.flush(); + if (out != null) { + out.close(); + } + if (in != null) { + in.close(); + } + if (ftpClient != null){ + ftpClient.disconnect(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } } - return in; } } diff --git a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java index 4c663b7c..a009ee50 100644 --- a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java +++ b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java @@ -62,6 +62,9 @@ public class LogManageController { } result.addAll(list); } + if (ftpClient != null){ + ftpClient.disconnect(); + } } catch (IOException e) { throw new RuntimeException(e); } @@ -178,6 +181,9 @@ public class LogManageController { } } } + if (ftpClient != null){ + ftpClient.disconnect(); + } } catch (IOException e) { throw new RuntimeException(e); } @@ -186,36 +192,11 @@ public class LogManageController { @PostMapping("downloadFile") @ApiOperation(value = "ftp文件下载", notes = "ftp文件下载") - public void downloadFile(String localPath, String fileName, HttpServletResponse response) throws IOException { + public void downloadFile(String localPath, String fileName, HttpServletResponse response) { if (localPath.contains(fileName)){ localPath=localPath.substring(0,localPath.indexOf(fileName)-1); } - //重置响应信息 - response.reset(); - //设置响应类型 - response.setContentType("application/download"); - //解决中文不能生成文件 - response.setHeader("Content-Disposition", "attachment; fileName=" + URLEncoder.encode(fileName,"UTF-8")); - response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); - //获取文件的输入流 - InputStream in = ftpUtil.downloadFTPFile(localPath, fileName); - //获取输出流 - ServletOutputStream out = response.getOutputStream(); - //声明一个长度参数 - int len; - //声明字节数组 - byte[] bytes = new byte[1024]; - //判断如果输入流的字节长度不等于-1，进行字节数组内容的读取 - while ((len = in.read(bytes)) != -1) { - out.write(bytes, 0, len); - } - out.flush(); - if (out != null) { - out.close(); - } - if (in != null) { - in.close(); - } + ftpUtil.downloadFTPFile(localPath, fileName,response); } } From 7a055994f3b07a9630f8b40c44c4276192965881 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 16 Jun 2023 08:49:30 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E6=B0=94=E8=B1=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E7=8A=B6=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E6=A0=B7=E5=93=81?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB?= =?UTF-8?q?=E7=A7=BB=E5=88=B0=E5=85=AC=E7=94=A8=E6=A8=A1=E5=9D=97=E4=B8=8B?= =?UTF-8?q?=20=E5=8F=B0=E7=AB=99=E8=BF=90=E8=A1=8C=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=86=85=E5=AE=B9=E4=BF=AE=E6=94=B9=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E6=A0=91=E5=BD=A2=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E5=90=8E=E5=85=B3=E9=97=ADftp=E8=BF=9E=E6=8E=A5=20=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=86=85=E5=AE=B9=E4=BF=A1=E6=81=AF=E5=90=8E?= =?UTF-8?q?=E5=85=B3=E9=97=ADftp=E8=BF=9E=E6=8E=A5=20=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E8=BD=BD=E6=96=87=E4=BB=B6=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=8B=E8=BD=BD=E5=90=8E?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=B5=81=E4=BB=A5=E5=8F=8Aftp=E8=BF=9E?= =?UTF-8?q?=E6=8E=A5=20=E5=A2=9E=E5=8A=A0=E9=9D=99=E6=80=81=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E5=B7=A5=E5=85=B7=E7=B1=BB=20system=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=93=E5=AD=98=E4=BF=A1=E6=81=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95=20system=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E5=8F=B0=E7=AB=99id=E6=9F=A5=E8=AF=A2=E6=8E=A2?= =?UTF-8?q?=E6=B5=8B=E5=99=A8=E4=BF=A1=E6=81=AF=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/base}/entity/GardsMetData.java | 2 +- .../modules/base}/entity/GardsSampleData.java | 18 +- .../modules/base}/entity/GardsSohData.java | 2 +- .../controller/LogManageController.java | 151 +-------------- .../modules/service/ILogManageService.java | 24 +++ .../service/impl/LogManageServiceImpl.java | 177 ++++++++++++++++++ jeecg-module-station-operation/pom.xml | 5 + .../main/java/org/jeecg/common/CacheName.java | 15 ++ .../org/jeecg/modules/entity/StationTree.java | 2 +- .../modules/mapper/StationMetDataMapper.java | 7 + .../mapper/StationSampleDataMapper.java | 8 + .../modules/mapper/StationSohDataMapper.java | 7 + .../modules/mapper/xml/gardsMetDataMapper.xml | 7 + .../mapper/xml/gardsSampleDataMapper.xml | 7 + .../modules/mapper/xml/gardsSohDataMapper.xml | 7 + .../modules/service/ICacheTimeService.java | 21 +++ .../impl/StationOperationServiceImpl.java | 102 +++++++--- .../modules/system/entity/GardsDetectors.java | 73 ++++++++ .../controller/WebStatisticsController.java | 6 +- .../modules/mapper/GardsMetDataMapper.java | 2 +- .../modules/mapper/GardsSampleDataMapper.java | 2 +- .../modules/mapper/GardsSohDataMapper.java | 2 +- .../modules/service/impl/AutoServiceImpl.java | 2 +- .../controller/AlarmSysUserController.java | 63 +++++-- 24 files changed, 504 insertions(+), 208 deletions(-) rename {jeecg-module-web-statistics/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base}/entity/GardsMetData.java (97%) rename {jeecg-module-web-statistics/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base}/entity/GardsSampleData.java (94%) rename {jeecg-module-web-statistics/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base}/entity/GardsSohData.java (97%) create mode 100644 jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/ILogManageService.java create mode 100644 jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/impl/LogManageServiceImpl.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSampleDataMapper.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsMetDataMapper.xml create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSampleDataMapper.xml create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSohDataMapper.xml create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java create mode 100644 jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java similarity index 97% rename from jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java index 4af992d2..f28f9d49 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsMetData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsMetData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java similarity index 94% rename from jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java index 0167ffe5..632dd833 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSampleData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSampleData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; @@ -10,7 +10,7 @@ import java.io.Serializable; import java.util.Date; @Data -@TableName(value = "gards_sample_data") +@TableName("GARDS_SAMPLE_DATA") public class GardsSampleData implements Serializable { @TableField(value = "SITE_DET_CODE") @@ -41,28 +41,28 @@ public class GardsSampleData implements Serializable { private String spectralQualifie; @TableField(value = "TRANSMIT_DTG") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date transmitDtg; @TableField(value = "COLLECT_START") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date collectStart; @TableField(value = "COLLECT_STOP") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date collectStop; @TableField(value = "ACQUISITION_START") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date acquisitionStart; @TableField(value = "ACQUISITION_STOP") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date acquisitionStop; @TableField(value = "ACQUISITION_REAL_SEC") @@ -78,11 +78,13 @@ public class GardsSampleData implements Serializable { private String status; @TableField(value = "MODDATE") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date moddate; @TableField(exist = false) private String stationName; + @TableField(exist = false) + private String detectorsName; + } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohData.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java similarity index 97% rename from jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohData.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java index 453498a3..85c07e67 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/entity/GardsSohData.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/GardsSohData.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java index a009ee50..bc142853 100644 --- a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java +++ b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/controller/LogManageController.java @@ -9,6 +9,7 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.FTPUtil; import org.jeecg.modules.entity.FileInfo; import org.jeecg.modules.entity.LogManage; +import org.jeecg.modules.service.ILogManageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -28,122 +29,13 @@ public class LogManageController { @Autowired private FTPUtil ftpUtil; + @Autowired + private ILogManageService logManageService; @GetMapping("findFtpFolders") @ApiOperation(value = "查询日志文件夹树形结构", notes = "查询日志文件夹树形结构") public List findFtpFolders(String workPath){ - List result = new ArrayList<>(); - try { - FTPClient ftpClient = ftpUtil.LoginFTP(); - if(Objects.isNull(ftpClient)){ - throw new RuntimeException("ftp连接失败!"); - } - //切换工作文件路径 - ftpClient.changeWorkingDirectory(workPath); - ftpClient.enterLocalPassiveMode(); - List ftpFiles = Arrays.asList(ftpClient.listDirectories()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - int num =1; - for (FTPFile ftpFile:ftpFiles) { - LogManage logManage = new LogManage(); - logManage.setName(ftpFile.getName()); - logManage.setOrderNum(num); - logManage.setParentNum(0); - logManage.setPath(workPath + "/" + ftpFile.getName()); - result.add(logManage); - num++; - } - } - if (CollectionUtils.isNotEmpty(result)){ - List list = new LinkedList<>(); - for (LogManage logManage:result) { - list = this.findDirectory(ftpClient, list, logManage.getOrderNum(), workPath + "/" + logManage.getName()); - ftpClient.changeToParentDirectory(); - } - result.addAll(list); - } - if (ftpClient != null){ - ftpClient.disconnect(); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - result = this.LogManageTree(result); - return result; - } - - /** - * 遍历查询当前路径下的文件夹信息 - * @param ftp - * @param list - * @param filePath 以"/"开始和结束 - * @return - */ - public List findDirectory(FTPClient ftp,List list,Integer parentNum,String filePath){ - try { - if (filePath.indexOf("/")>0){ - List paths = Arrays.asList(filePath.split("/")); - for (String path:paths) { - ftp.changeWorkingDirectory(path); - } - } - List ftpFiles = Arrays.asList(ftp.listDirectories()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - int num =1; - for (FTPFile file : ftpFiles) { - if (file.isDirectory()) { - LogManage logManage = new LogManage(); - logManage.setName(file.getName()); - logManage.setOrderNum(num); - logManage.setParentNum(parentNum); - logManage.setPath(filePath +"/"+ file.getName()); - list.add(logManage); - num++; - // 需要加此判断。否则，ftp默认将‘项目文件所在目录之下的目录（./）’与‘项目文件所在目录向上一级目录下的目录（../）’都纳入递归，这样下去就陷入一个死循环了。需将其过滤掉。 - if (!".".equals(file.getName()) && !"..".equals(file.getName())) { - findDirectory(ftp,list,num,filePath +"/"+ file.getName()); - ftp.changeToParentDirectory(); - } - } - } - } - } catch (IOException e) { - throw new RuntimeException(e); - } - return list; - } - - /** - * 将当前的文件夹转换成树形结构 - * @param logManages - * @return - */ - public List LogManageTree(List logManages){ - if (logManages == null) { - return null; - } - List result = new LinkedList<>(); - Integer TOP_NODE_ID = 0; - logManages.forEach(logManage -> { - Integer pid = logManage.getParentNum(); - if (pid == null || TOP_NODE_ID.equals(pid)) { - result.add(logManage); - return; - } - for (LogManage manage : logManages) { - Integer id = manage.getOrderNum(); - if (id != null && id.equals(pid)) { - if (manage.getChildren() == null) { - manage.initChildren(); - } - logManage.setHashParent(true); - manage.getChildren().add(logManage); - manage.setHashChild(true); - return; - } - } - }); - return result; + return logManageService.findFtpFolders(workPath); } /** @@ -154,40 +46,7 @@ public class LogManageController { @GetMapping("findFiles") @ApiOperation(value = "查询目录下文件内容", notes = "查询目录下文件内容") public List findFiles(String path){ - List result = new ArrayList<>(); - try { - FTPClient ftpClient = ftpUtil.LoginFTP(); - if (Objects.isNull(ftpClient)){ - throw new RuntimeException("ftp连接失败!"); - } - List paths = Arrays.asList(path.split("/")); - if (CollectionUtils.isNotEmpty(paths)){ - for (String workPath:paths) { - //切换工作文件路径 - ftpClient.changeWorkingDirectory(workPath); - } - } - ftpClient.enterLocalPassiveMode(); - List ftpFiles = Arrays.asList(ftpClient.listFiles()); - if (CollectionUtils.isNotEmpty(ftpFiles)){ - for (FTPFile ftpFile:ftpFiles) { - if (ftpFile.isFile()){ - FileInfo fileInfo = new FileInfo(); - fileInfo.setFileName(ftpFile.getName()); - fileInfo.setFilePath(path +"/"+ ftpFile.getName()); - fileInfo.setFileSize(String.format("%.2f", Double.valueOf(Double.valueOf(ftpFile.getSize())/1024)) + "KB"); - fileInfo.setFileDate(DateUtils.formatDate(ftpFile.getTimestamp(),"yyyy-MM-dd")); - result.add(fileInfo); - } - } - } - if (ftpClient != null){ - ftpClient.disconnect(); - } - } catch (IOException e) { - throw new RuntimeException(e); - } - return result; + return logManageService.findFiles(path); } @PostMapping("downloadFile") diff --git a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/ILogManageService.java b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/ILogManageService.java new file mode 100644 index 00000000..bab2dce0 --- /dev/null +++ b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/ILogManageService.java @@ -0,0 +1,24 @@ +package org.jeecg.modules.service; + +import org.jeecg.modules.entity.FileInfo; +import org.jeecg.modules.entity.LogManage; + +import java.util.List; + +public interface ILogManageService { + + /** + * 查询日志文件夹树形结构 + * @param workPath + * @return + */ + List findFtpFolders(String workPath); + + /** + * 查询目录下文件内容 + * @param path + * @return + */ + List findFiles(String path); + +} diff --git a/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/impl/LogManageServiceImpl.java b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/impl/LogManageServiceImpl.java new file mode 100644 index 00000000..562aebea --- /dev/null +++ b/jeecg-module-log-manage/src/main/java/org/jeecg/modules/service/impl/LogManageServiceImpl.java @@ -0,0 +1,177 @@ +package org.jeecg.modules.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import org.apache.commons.net.ftp.FTPClient; +import org.apache.commons.net.ftp.FTPFile; +import org.jeecg.common.util.DateUtils; +import org.jeecg.common.util.FTPUtil; +import org.jeecg.modules.entity.FileInfo; +import org.jeecg.modules.entity.LogManage; +import org.jeecg.modules.service.ILogManageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.IOException; +import java.util.*; + +@Service("logManageService") +public class LogManageServiceImpl implements ILogManageService { + + @Autowired + private FTPUtil ftpUtil; + + @Override + public List findFtpFolders(String workPath) { + List result = new ArrayList<>(); + try { + FTPClient ftpClient = ftpUtil.LoginFTP(); + if(Objects.isNull(ftpClient)){ + throw new RuntimeException("ftp连接失败!"); + } + //切换工作文件路径 + ftpClient.changeWorkingDirectory(workPath); + ftpClient.enterLocalPassiveMode(); + List ftpFiles = Arrays.asList(ftpClient.listDirectories()); + if (CollectionUtils.isNotEmpty(ftpFiles)){ + int num =1; + for (FTPFile ftpFile:ftpFiles) { + LogManage logManage = new LogManage(); + logManage.setName(ftpFile.getName()); + logManage.setOrderNum(num); + logManage.setParentNum(0); + logManage.setPath(workPath + "/" + ftpFile.getName()); + result.add(logManage); + num++; + } + } + if (CollectionUtils.isNotEmpty(result)){ + List list = new LinkedList<>(); + for (LogManage logManage:result) { + list = this.findDirectory(ftpClient, list, logManage.getOrderNum(), workPath + "/" + logManage.getName()); + ftpClient.changeToParentDirectory(); + } + result.addAll(list); + } + if (ftpClient != null){ + ftpClient.disconnect(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + result = this.LogManageTree(result); + return result; + } + + @Override + public List findFiles(String path) { + List result = new ArrayList<>(); + try { + FTPClient ftpClient = ftpUtil.LoginFTP(); + if (Objects.isNull(ftpClient)){ + throw new RuntimeException("ftp连接失败!"); + } + List paths = Arrays.asList(path.split("/")); + if (CollectionUtils.isNotEmpty(paths)){ + for (String workPath:paths) { + //切换工作文件路径 + ftpClient.changeWorkingDirectory(workPath); + } + } + ftpClient.enterLocalPassiveMode(); + List ftpFiles = Arrays.asList(ftpClient.listFiles()); + if (CollectionUtils.isNotEmpty(ftpFiles)){ + for (FTPFile ftpFile:ftpFiles) { + if (ftpFile.isFile()){ + FileInfo fileInfo = new FileInfo(); + fileInfo.setFileName(ftpFile.getName()); + fileInfo.setFilePath(path +"/"+ ftpFile.getName()); + fileInfo.setFileSize(String.format("%.2f", Double.valueOf(Double.valueOf(ftpFile.getSize())/1024)) + "KB"); + fileInfo.setFileDate(DateUtils.formatDate(ftpFile.getTimestamp(),"yyyy-MM-dd")); + result.add(fileInfo); + } + } + } + if (ftpClient != null){ + ftpClient.disconnect(); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + return result; + } + + /** + * 遍历查询当前路径下的文件夹信息 + * @param ftp + * @param list + * @param filePath 以"/"开始和结束 + * @return + */ + public List findDirectory(FTPClient ftp,List list,Integer parentNum,String filePath){ + try { + if (filePath.indexOf("/")>0){ + List paths = Arrays.asList(filePath.split("/")); + for (String path:paths) { + ftp.changeWorkingDirectory(path); + } + } + List ftpFiles = Arrays.asList(ftp.listDirectories()); + if (CollectionUtils.isNotEmpty(ftpFiles)){ + int num =1; + for (FTPFile file : ftpFiles) { + if (file.isDirectory()) { + LogManage logManage = new LogManage(); + logManage.setName(file.getName()); + logManage.setOrderNum(num); + logManage.setParentNum(parentNum); + logManage.setPath(filePath +"/"+ file.getName()); + list.add(logManage); + num++; + // 需要加此判断。否则，ftp默认将‘项目文件所在目录之下的目录（./）’与‘项目文件所在目录向上一级目录下的目录（../）’都纳入递归，这样下去就陷入一个死循环了。需将其过滤掉。 + if (!".".equals(file.getName()) && !"..".equals(file.getName())) { + findDirectory(ftp,list,num,filePath +"/"+ file.getName()); + ftp.changeToParentDirectory(); + } + } + } + } + } catch (IOException e) { + throw new RuntimeException(e); + } + return list; + } + + /** + * 将当前的文件夹转换成树形结构 + * @param logManages + * @return + */ + public List LogManageTree(List logManages){ + if (logManages == null) { + return null; + } + List result = new LinkedList<>(); + Integer TOP_NODE_ID = 0; + logManages.forEach(logManage -> { + Integer pid = logManage.getParentNum(); + if (pid == null || TOP_NODE_ID.equals(pid)) { + result.add(logManage); + return; + } + for (LogManage manage : logManages) { + Integer id = manage.getOrderNum(); + if (id != null && id.equals(pid)) { + if (manage.getChildren() == null) { + manage.initChildren(); + } + logManage.setHashParent(true); + manage.getChildren().add(logManage); + manage.setHashChild(true); + return; + } + } + }); + return result; + } + +} diff --git a/jeecg-module-station-operation/pom.xml b/jeecg-module-station-operation/pom.xml index ad2f458f..e61718e1 100644 --- a/jeecg-module-station-operation/pom.xml +++ b/jeecg-module-station-operation/pom.xml @@ -23,6 +23,11 @@ spatial4j 0.5 + + + org.springframework.cloud + spring-cloud-starter-openfeign + \ No newline at end of file diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java new file mode 100644 index 00000000..8addb981 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/common/CacheName.java @@ -0,0 +1,15 @@ +package org.jeecg.common; + +import org.springframework.stereotype.Component; + +public class CacheName { + + public static final String cacheTime = "Cache time"; + + public static final String scaleInterval = "Scale interval"; + + public static final String timelineLength = "Timeline length "; + + public static final String updateIntervalTime = "Update interval time"; + +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java index c812b8b4..a0b972af 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/entity/StationTree.java @@ -12,6 +12,6 @@ public class StationTree { private String code; - List children; + List children; } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java new file mode 100644 index 00000000..103ae065 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationMetDataMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.GardsMetData; + +public interface StationMetDataMapper extends BaseMapper { +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSampleDataMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSampleDataMapper.java new file mode 100644 index 00000000..28248bf3 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSampleDataMapper.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.GardsSampleData; + +public interface StationSampleDataMapper extends BaseMapper { + +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java new file mode 100644 index 00000000..b2e2d34d --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/StationSohDataMapper.java @@ -0,0 +1,7 @@ +package org.jeecg.modules.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.jeecg.modules.base.entity.GardsSohData; + +public interface StationSohDataMapper extends BaseMapper { +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsMetDataMapper.xml b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsMetDataMapper.xml new file mode 100644 index 00000000..948514e5 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsMetDataMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSampleDataMapper.xml b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSampleDataMapper.xml new file mode 100644 index 00000000..74405da1 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSampleDataMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSohDataMapper.xml b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSohDataMapper.xml new file mode 100644 index 00000000..a9372e53 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/mapper/xml/gardsSohDataMapper.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java new file mode 100644 index 00000000..a293957e --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/ICacheTimeService.java @@ -0,0 +1,21 @@ +package org.jeecg.modules.service; + +import org.jeecg.modules.system.entity.GardsDetectors; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.List; +import java.util.Map; + +@Component +@FeignClient(value = "jeecg-system") +public interface ICacheTimeService { + + @RequestMapping("/alarmSysUser/findCacheTime") + List> findCacheTime(); + + @RequestMapping("/alarmSysUser/findStationDetectors") + Map> findStationDetectors(List stationIds); + +} diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java index 2287088c..f917d57e 100644 --- a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/service/impl/StationOperationServiceImpl.java @@ -1,6 +1,7 @@ package org.jeecg.modules.service.impl; import com.baomidou.dynamic.datasource.annotation.DS; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,6 +9,7 @@ import com.spatial4j.core.context.SpatialContext; import com.spatial4j.core.distance.DistanceUtils; import com.spatial4j.core.shape.Rectangle; import io.swagger.models.auth.In; +import org.jeecg.common.CacheName; import org.jeecg.common.PointUtil; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; @@ -15,6 +17,8 @@ import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.entity.Point; import org.jeecg.modules.entity.PointVo; import org.jeecg.modules.entity.StationTree; +import org.jeecg.modules.service.ICacheTimeService; +import org.jeecg.modules.system.entity.GardsDetectors; import org.jeecg.modules.system.entity.GardsNuclearfacility; import org.jeecg.modules.system.entity.GardsStations; import org.jeecg.modules.entity.StationOperation; @@ -31,10 +35,12 @@ import java.util.List; import java.util.stream.Collectors; @Service("stationOperationService") -@DS("ora") +@DS("ori") public class StationOperationServiceImpl extends ServiceImpl implements IStationOperationService { @Autowired private RedisUtil redisUtil; + @Autowired + private ICacheTimeService cacheTimeService; private final SpatialContext spatialContext = SpatialContext.GEO; @@ -53,7 +59,13 @@ public class StationOperationServiceImpl extends ServiceImpl200 && gardsStation.getStationId()<=300){ + stationOperation.setStationType("IMS STATION(G)"); + }else if(gardsStation.getStationId()>300){ + stationOperation.setStationType("NRL"); + } stationOperation.setAltitude(Objects.isNull(gardsStation.getElevation())?"":gardsStation.getElevation()+"m"); stationOperation.setLon(String.valueOf(gardsStation.getLon())); stationOperation.setLat(String.valueOf(gardsStation.getLat())); @@ -86,7 +98,7 @@ public class StationOperationServiceImpl extends ServiceImpl stationInfoMap = (HashMap) redisUtil.get("stationInfoMap"); GardsStations stations = stationInfoMap.get(stationId); if (Objects.nonNull(stations)){ @@ -128,20 +140,45 @@ public class StationOperationServiceImpl extends ServiceImpl countryCodes = gardsStationsList.stream().map(GardsStations::getCountryCode).distinct().sorted().collect(Collectors.toList()); - for (String countryCode:countryCodes) { - //声明一个数组存储城市编码对应的数组信息 - List stationsList = new LinkedList<>(); - StationTree stationTree = new StationTree(); - stationTree.setStationId(countryCodes.indexOf(countryCode)+1); - stationTree.setCode(countryCode); - for (GardsStations stations:gardsStationsList) { - if (stations.getCountryCode().equals(countryCode)){ - stationsList.add(stations); + List countryCodes = gardsStationsList.stream().map(GardsStations::getCountryCode).distinct().sorted().collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(countryCodes)){ + for (int i=0; i<3; i++){ + //树形结构子级 用于存储城市及城市下的台站信息 + List stationChildTreeList = new LinkedList<>(); + StationTree stationTree = new StationTree(); + stationTree.setStationId(i); + if (i == 0){ + stationTree.setCode("Particulate Station"); + }else if (i == 1){ + stationTree.setCode("Noble Gas Station"); + }else if (i == 2){ + stationTree.setCode("NRL"); } + for (Object countryCode:countryCodes) { + //用于存储城市下对应的台站信息 + List stations = new LinkedList<>(); + String country = String.valueOf(countryCode); + //声明一个数组存储城市编码对应的数组信息 + StationTree stationChildTree = new StationTree(); + stationChildTree.setStationId(countryCodes.indexOf(countryCode)+1); + stationChildTree.setCode(country); + List stationsList = gardsStationsList.stream().filter(station-> station.getCountryCode().equals(countryCode)).collect(Collectors.toList()); + if (i == 0){ + stationsList = stationsList.stream().filter(item-> item.getStationId()<=200).collect(Collectors.toList()); + stations.addAll(stationsList); + }else if(i == 1){ + stationsList = stationsList.stream().filter(item-> item.getStationId()>200 && item.getStationId()<=300).collect(Collectors.toList()); + stations.addAll(stationsList); + }else if(i == 2){ + stationsList = stationsList.stream().filter(item-> item.getStationId()>300).collect(Collectors.toList()); + stations.addAll(stationsList); + } + stationChildTree.setChildren(stations); + stationChildTreeList.add(stationChildTree); + stationTree.setChildren(stationChildTreeList); + } + stationTreeList.add(stationTree); } - stationTree.setChildren(stationsList); - stationTreeList.add(stationTree); } } } @@ -234,7 +271,7 @@ public class StationOperationServiceImpl extends ServiceImpl stationIds) { + //获取四项缓存数据的对应内容 + List> cacheList = cacheTimeService.findCacheTime(); + String cacheTime = ""; + String scaleInterval = ""; + String timelineLength = ""; + String updateIntervalTime = ""; + for (int i=0; i< cacheList.size(); i++){ + if ( StringUtils.isNotBlank(cacheList.get(i).get(CacheName.cacheTime)) ){ + cacheTime = cacheList.get(i).get(CacheName.cacheTime); + }else if ( StringUtils.isNotBlank(cacheList.get(i).get(CacheName.scaleInterval)) ){ + scaleInterval = cacheList.get(i).get(CacheName.scaleInterval); + }else if ( StringUtils.isNotBlank(cacheList.get(i).get(CacheName.timelineLength)) ){ + timelineLength = cacheList.get(i).get(CacheName.timelineLength); + }else if ( StringUtils.isNotBlank(cacheList.get(i).get(CacheName.updateIntervalTime)) ){ + updateIntervalTime = cacheList.get(i).get(CacheName.updateIntervalTime); + } + } + //遍历台站id if (CollectionUtils.isNotEmpty(stationIds)){ - //获取当前日期时间 + //获取当前日期时间 作为结束查询时间 LocalDate endDate = LocalDate.now(); - //将当前日期换算成 -// endDate.minusDays(); - - - - //根据台站id - - - + //根据缓存日期 得到开始查询时间 + LocalDate startDate = endDate.minusDays(Integer.valueOf(cacheTime)); + //根据台站id查询出当前台站下处于运行状态的数据 + Map> stationDetectors = cacheTimeService.findStationDetectors(stationIds); } diff --git a/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java new file mode 100644 index 00000000..c6e2e0a0 --- /dev/null +++ b/jeecg-module-station-operation/src/main/java/org/jeecg/modules/system/entity/GardsDetectors.java @@ -0,0 +1,73 @@ +package org.jeecg.modules.system.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.jeecg.config.valid.InsertGroup; +import org.jeecg.config.valid.UpdateGroup; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +@Data +@TableName("GARDS_DETECTORS") +public class GardsDetectors implements Serializable { + + @TableField(value = "DETECTOR_ID") + private Integer detectorId; + + @TableField(value = "DETECTOR_CODE") + private String detectorCode; + + @TableField(value = "LON") + private Double lon; + + @TableField(value = "LAT") + private Double lat; + + @TableField(value = "TYPE") + private String type; + + @TableField(value = "CHANNELS") + private Double channels; + + @TableField(value = "RATED_EFFICIENCY") + private Double ratedEfficiency; + + @TableField(value = "RATED_RESOLUTION") + private Double ratedResolution; + + @TableField(value = "ECAL_RANGE_MAX") + private Double ecalRangeMax; + + @TableField(value = "DATE_BEGIN") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dateBegin; + + @TableField(value = "DATE_END") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date dateEnd; + + @TableField(value = "STATUS") + private String status; + + @TableField(value = "DESCRIPTION") + private String description; + + @TableField(value = "MODDATE") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date moddate; + + @TableField(value = "STATION_ID") + private Integer stationId; + + @TableField(exist = false) + private String stationName; + +} diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java index 20b0f81d..def3c856 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -4,9 +4,9 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsMetData; -import org.jeecg.modules.entity.GardsSampleData; -import org.jeecg.modules.entity.GardsSohData; +import org.jeecg.modules.base.entity.GardsMetData; +import org.jeecg.modules.base.entity.GardsSampleData; +import org.jeecg.modules.base.entity.GardsSohData; import org.jeecg.modules.service.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java index 85e6c432..41a19fc0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsMetDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsMetData; +import org.jeecg.modules.base.entity.GardsMetData; public interface GardsMetDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataMapper.java index 4f12f430..35071cf0 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSampleDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSampleData; +import org.jeecg.modules.base.entity.GardsSampleData; public interface GardsSampleDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java index 21c14556..268c980d 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/mapper/GardsSohDataMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.GardsSohData; +import org.jeecg.modules.base.entity.GardsSohData; public interface GardsSohDataMapper extends BaseMapper { } diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java index c8a33fb8..b3913992 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/AutoServiceImpl.java @@ -7,7 +7,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.entity.GardsAnalyses; -import org.jeecg.modules.entity.GardsSampleData; +import org.jeecg.modules.base.entity.GardsSampleData; import org.jeecg.modules.mapper.GardsAnalysesMapper; import org.jeecg.modules.service.IAutoService; import org.jeecg.modules.service.IGardsSampleDataService; diff --git a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java index 6226dc44..67cd1f7d 100644 --- a/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java +++ b/jeecg-server-cloud/jeecg-system-cloud-start/src/main/java/org/jeecg/modules/controller/AlarmSysUserController.java @@ -1,15 +1,10 @@ package org.jeecg.modules.controller; +import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; -import org.jeecg.modules.system.entity.SysDictItem; -import org.jeecg.modules.system.entity.SysRole; -import org.jeecg.modules.system.entity.SysUser; -import org.jeecg.modules.system.entity.SysUserRole; -import org.jeecg.modules.system.mapper.SysDictItemMapper; -import org.jeecg.modules.system.mapper.SysRoleMapper; -import org.jeecg.modules.system.mapper.SysUserMapper; -import org.jeecg.modules.system.mapper.SysUserRoleMapper; +import org.jeecg.modules.system.entity.*; +import org.jeecg.modules.system.mapper.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -21,6 +16,8 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static org.apache.commons.collections.CollectionUtils.collect; + @RestController @RequestMapping("alarmSysUser") public class AlarmSysUserController { @@ -33,6 +30,8 @@ public class AlarmSysUserController { private SysRoleMapper sysRoleMapper; @Resource private SysDictItemMapper sysDictItemMapper; + @Resource + private GardsDetectorsMapper gardsDetectorsMapper; @GetMapping("findUserMap") public Map findUserMap(){ @@ -69,23 +68,51 @@ public class AlarmSysUserController { @RequestMapping("findCacheTime") - public void findCacheTime(){ + public List> findCacheTime(){ LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); List sysDictItems = sysDictItemMapper.selectList(queryWrapper); + List> result = new LinkedList<>(); //获取缓存时间对应的值 - Map cacheTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Cache time")) - .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + List cacheTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Cache time")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(cacheTime)){ + Map cacheTimeMap = cacheTime.stream().collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + result.add(cacheTimeMap); + } //获取实际分度值 - Map scaleInterval = sysDictItems.stream().filter(item -> item.getItemText().equals("Scale interval")) - .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + List scaleInterval = sysDictItems.stream().filter(item -> item.getItemText().equals("Scale interval")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(scaleInterval)){ + Map scaleIntervalMap = scaleInterval.stream().collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + result.add(scaleIntervalMap); + } //获取时间线长度 - Map timelineLength = sysDictItems.stream().filter(item -> item.getItemText().equals("Timeline length")) - .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + List timelineLength = sysDictItems.stream().filter(item -> item.getItemText().equals("Timeline length")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(timelineLength)){ + Map timelineLengthMap = timelineLength.stream().collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + result.add(timelineLengthMap); + } //获取更新间隔时间 - Map updateIntervalTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Update interval time")) - .collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); - + List updateIntervalTime = sysDictItems.stream().filter(item -> item.getItemText().equals("Update interval time")).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(updateIntervalTime)){ + Map updateIntervalTimeMap = updateIntervalTime.stream().collect(Collectors.toMap(SysDictItem::getItemText, SysDictItem::getItemValue)); + result.add(updateIntervalTimeMap); + } + return result; } + @RequestMapping("findStationDetectors") + @DS("ora") + public Map> findStationDetectors(List stationIds){ + Map> map = new HashMap<>(); + if (CollectionUtils.isNotEmpty(stationIds)){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + List detectorsList = gardsDetectorsMapper.selectList(queryWrapper); + for (String stationId:stationIds) { + List detectors = detectorsList.stream().filter(item -> item.getStationId().equals(stationId) && item.getStatus().equals("Operating")).collect(Collectors.toList()); + map.put(stationId, detectors); + } + } + return map; + } + } From c872270c37aceb69e2abe90877d4ab1a1d717e03 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 16 Jun 2023 08:50:53 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=8C=85=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/service/IGardsSampleDataService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataService.java index 641e2037..8571ef02 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSampleDataService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsSampleData; +import org.jeecg.modules.base.entity.GardsSampleData; import java.util.Date; import java.util.List; From 7520a944a74464a13358c5c81b7243be6ac340e7 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 16 Jun 2023 08:52:45 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=BC=95=E5=85=A5=E5=8C=85=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/service/IGardsMetDataService.java | 2 +- .../java/org/jeecg/modules/service/IGardsSohDataService.java | 2 +- .../org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java | 2 +- .../jeecg/modules/service/impl/GardsSampleDataServiceImpl.java | 2 +- .../org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java index ad235020..5241c1ec 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsMetDataService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsMetData; +import org.jeecg.modules.base.entity.GardsMetData; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java index 11f6206a..2e0d2f5b 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/IGardsSohDataService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.GardsSohData; +import org.jeecg.modules.base.entity.GardsSohData; import java.util.Date; import java.util.List; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java index ce992dee..45dd932a 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsMetDataServiceImpl.java @@ -8,7 +8,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; -import org.jeecg.modules.entity.GardsMetData; +import org.jeecg.modules.base.entity.GardsMetData; import org.jeecg.modules.mapper.GardsMetDataMapper; import org.jeecg.modules.service.IGardsMetDataService; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataServiceImpl.java index b32566d2..500e3f80 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSampleDataServiceImpl.java @@ -12,7 +12,7 @@ import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; import org.jeecg.modules.entity.GardsCalibrationPairsOrig; import org.jeecg.modules.entity.GardsSampleAux; -import org.jeecg.modules.entity.GardsSampleData; +import org.jeecg.modules.base.entity.GardsSampleData; import org.jeecg.modules.mapper.GardsCalibrationPairsOrigMapper; import org.jeecg.modules.mapper.GardsSampleAuxMapper; import org.jeecg.modules.mapper.GardsSampleDataMapper; diff --git a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java index ac9727a5..3526df39 100644 --- a/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java +++ b/jeecg-module-web-statistics/src/main/java/org/jeecg/modules/service/impl/GardsSohDataServiceImpl.java @@ -10,7 +10,7 @@ import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.RedisUtil; -import org.jeecg.modules.entity.GardsSohData; +import org.jeecg.modules.base.entity.GardsSohData; import org.jeecg.modules.mapper.GardsSohDataMapper; import org.jeecg.modules.service.IGardsSohDataService; import org.springframework.beans.factory.annotation.Autowired; From 04c5347e7328bf93a59dd5df80b4848804c65876 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 16 Jun 2023 08:55:02 +0800 Subject: [PATCH 10/11] =?UTF-8?q?pom=E6=96=87=E4=BB=B6=E5=BC=95=E5=85=A5ba?= =?UTF-8?q?se-core=E5=8C=85=E7=A7=BB=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml | 5 ----- jeecg-server-cloud/jeecg-log-manage-start/pom.xml | 5 ----- jeecg-server-cloud/jeecg-station-operation-start/pom.xml | 5 ----- jeecg-server-cloud/jeecg-web-statistics-start/pom.xml | 5 ----- 4 files changed, 20 deletions(-) diff --git a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml index f6ee4d68..b3a7c381 100644 --- a/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml +++ b/jeecg-server-cloud/jeecg-abnormal-alarm-start/pom.xml @@ -17,11 +17,6 @@ jeecg-boot-starter-cloud - - org.jeecgframework.boot - jeecg-boot-base-core - - org.jeecgframework.boot jeecg-module-abnormal-alarm diff --git a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml b/jeecg-server-cloud/jeecg-log-manage-start/pom.xml index b38d04f5..edfe991f 100644 --- a/jeecg-server-cloud/jeecg-log-manage-start/pom.xml +++ b/jeecg-server-cloud/jeecg-log-manage-start/pom.xml @@ -18,11 +18,6 @@ jeecg-boot-starter-cloud - - org.jeecgframework.boot - jeecg-boot-base-core - - org.jeecgframework.boot jeecg-module-log-manage diff --git a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml b/jeecg-server-cloud/jeecg-station-operation-start/pom.xml index eabb4b15..47018223 100644 --- a/jeecg-server-cloud/jeecg-station-operation-start/pom.xml +++ b/jeecg-server-cloud/jeecg-station-operation-start/pom.xml @@ -18,11 +18,6 @@ jeecg-boot-starter-cloud - - org.jeecgframework.boot - jeecg-boot-base-core - - org.jeecgframework.boot jeecg-module-station-operation diff --git a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml b/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml index 6441bf98..aef458eb 100644 --- a/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml +++ b/jeecg-server-cloud/jeecg-web-statistics-start/pom.xml @@ -18,11 +18,6 @@ jeecg-boot-starter-cloud - - org.jeecgframework.boot - jeecg-boot-base-core - - org.jeecgframework.boot jeecg-module-web-statistics From a29efbca0cd3cc253ab487f2a04f1091e58d92e7 Mon Sep 17 00:00:00 2001 From: qiaoqinzheng Date: Fri, 16 Jun 2023 08:58:39 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=EF=BC=8C=E9=82=AE=E7=AE=B1=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=A7=BB=E5=8A=A8=E5=88=B0?= =?UTF-8?q?base-core=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/org/jeecg/modules/base}/entity/SysEmail.java | 2 +- .../main/java/org/jeecg/modules/base}/entity/SysEmailLog.java | 2 +- .../java/org/jeecg/modules/controller/SysEmailController.java | 2 +- .../main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java | 2 +- .../src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java | 2 +- .../java/org/jeecg/modules/service/ISysEmailLogService.java | 2 +- .../main/java/org/jeecg/modules/service/ISysEmailService.java | 2 +- .../org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java | 2 +- .../org/jeecg/modules/service/impl/SysEmailServiceImpl.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename {jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base}/entity/SysEmail.java (97%) rename {jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules => jeecg-boot-base-core/src/main/java/org/jeecg/modules/base}/entity/SysEmailLog.java (97%) diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java index 32def11e..3ab7ba01 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmail.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmail.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java similarity index 97% rename from jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java rename to jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java index d1d677ff..3d29f926 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/entity/SysEmailLog.java +++ b/jeecg-boot-base-core/src/main/java/org/jeecg/modules/base/entity/SysEmailLog.java @@ -1,4 +1,4 @@ -package org.jeecg.modules.entity; +package org.jeecg.modules.base.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java index 78fdd27c..cc5bc3fa 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/SysEmailController.java @@ -4,7 +4,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import org.jeecg.modules.service.ISysEmailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.format.annotation.DateTimeFormat; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java index 49f5317b..fb25392b 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailLogMapper.java @@ -1,7 +1,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; public interface SysEmailLogMapper extends BaseMapper { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java index ed46c7d8..69ea7234 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/SysEmailMapper.java @@ -3,7 +3,7 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import java.util.Date; import java.util.List; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java index 33ebea2b..1b2816ef 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailLogService.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; public interface ISysEmailLogService extends IService { } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java index 6e34062e..4253a0fc 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/ISysEmailService.java @@ -3,7 +3,7 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import java.util.Date; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java index 6df2a581..06e9cb66 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailLogServiceImpl.java @@ -1,7 +1,7 @@ package org.jeecg.modules.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.jeecg.modules.entity.SysEmailLog; +import org.jeecg.modules.base.entity.SysEmailLog; import org.jeecg.modules.mapper.SysEmailLogMapper; import org.jeecg.modules.service.ISysEmailLogService; import org.springframework.stereotype.Service; diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java index 32639935..e8bb086e 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/impl/SysEmailServiceImpl.java @@ -10,7 +10,7 @@ import org.jeecg.common.system.util.JwtUtil; import org.jeecg.common.util.DateUtils; import org.jeecg.common.util.SpringContextUtils; import org.jeecg.modules.entity.AlarmHistory; -import org.jeecg.modules.entity.SysEmail; +import org.jeecg.modules.base.entity.SysEmail; import org.jeecg.modules.mapper.SysEmailMapper; import org.jeecg.modules.service.ISysEmailService; import org.springframework.stereotype.Service;