From 5402d4b89cb04c12dd3356740b28ff78e2e520c7 Mon Sep 17 00:00:00 2001 From: orgin Date: Mon, 5 Feb 2024 13:36:13 +0800 Subject: [PATCH] =?UTF-8?q?fix:alarm=20=E5=92=8C=20web?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/controller/AlarmController.java | 45 ++++++++++++++++-- .../controller/RadionuclideController.java | 37 +++++++++++++++ .../modules/controller/WebController.java | 11 ----- .../controller/WebStatisticsController.java | 29 ++++++++++++ .../modules/feignclient/AlarmClient.java | 29 ++++++++++++ .../modules/feignclient/AlarmService.java | 4 -- .../feignclient/RadionuclideClient.java | 47 +++++++++++++++++++ .../jeecg/modules/feignclient/WebService.java | 15 ------ .../feignclient/WebStatisticsClient.java | 20 ++++++++ 9 files changed, 204 insertions(+), 33 deletions(-) create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/controller/RadionuclideController.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmClient.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java delete mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java create mode 100644 jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java index 23f7cdc4..397e0320 100644 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/AlarmController.java @@ -1,11 +1,50 @@ package org.jeecg.modules.controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +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.base.bizVo.AlarmVo; +import org.jeecg.modules.base.bizVo.AnalysisLogVo; +import org.jeecg.modules.feignclient.AlarmClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("") +@RequestMapping() +@Api(value = "报警日志服务", tags = "报警日志服务") public class AlarmController { + @Autowired + private AlarmClient alarmClient; + @ApiOperation(value="报警日志分页查询", notes="报警日志分页查询") + @GetMapping(value = "/alarmAnalysisLog/findPage") + public Result analysisLogFindPage(AnalysisLogVo analysisLogVo) { + return alarmClient.analysisLogFindPage(analysisLogVo); + } + + @ApiOperation("分页查询报警日志信息") + @PostMapping("/alarmLog/findPage") + public Result alarmLogFindPage(@RequestBody AlarmVo alarmVo){ + return alarmClient.alarmLogFindPage(alarmVo); + } + + @GetMapping("/sysServer/findPage") + @ApiOperation(value = "分页查询服务器配置信息", notes = "分页查询服务器配置信息") + public Result serverFindPage(QueryRequest query){ + return alarmClient.serverFindPage(query); + } + + @GetMapping("/sysDatabase/findPage") + @ApiOperation(value = "分页查询数据库配置信息", notes = "分页查询数据库配置信息") + public Result databaseFindPage(QueryRequest query){ + return alarmClient.databaseFindPage(query); + } + + @GetMapping("/sysEmail/findPage") + @ApiOperation(value = "分页查询邮箱配置信息", notes = "分页查询邮箱配置信息") + public Result emailFindPage(QueryRequest query){ + return alarmClient.emailFindPage(query); + } } diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/RadionuclideController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/RadionuclideController.java new file mode 100644 index 00000000..01031440 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/RadionuclideController.java @@ -0,0 +1,37 @@ +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.feignclient.RadionuclideClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; + +@RestController +@RequestMapping("radionuclide") +public class RadionuclideController { + + @Autowired + private RadionuclideClient radionuclideClient; + @GetMapping("findAutoPage") + @ApiOperation(value = "分页查询自动处理结果", notes = "分页查询自动处理结果") + public Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds, + String qualifie, String sampleType, + @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ + return radionuclideClient.findAutoPage(queryRequest, stationIds, qualifie, sampleType,startTime, endTime); + } + + @GetMapping("findReviewedPage") + @ApiOperation(value = "分页查询人工交互结果", notes = "分页查询人工交互结果") + public Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, String qualifie, + @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){ + return radionuclideClient.findReviewedPage(queryRequest, stationIds, qualifie,startTime, endTime); + } +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java deleted file mode 100644 index acfee84f..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.jeecg.modules.controller; - -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("") -public class WebController { - - -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java new file mode 100644 index 00000000..d1922780 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java @@ -0,0 +1,29 @@ +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.base.entity.configuration.GardsStations; +import org.jeecg.modules.feignclient.WebStatisticsClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Date; +import java.util.List; + +@RestController +@RequestMapping("webStatistics") +public class WebStatisticsController { + + @Autowired + private WebStatisticsClient webStatisticsClient; + + @GetMapping("/findStationList") + @ApiOperation(value = "根据菜单名称查询对应的台站信息", notes = "根据菜单名称查询对应的台站信息") + public Result findStationList(String menuName){ + return webStatisticsClient.findStationList(menuName); + } +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmClient.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmClient.java new file mode 100644 index 00000000..c9baf0ba --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmClient.java @@ -0,0 +1,29 @@ +package org.jeecg.modules.feignclient; + +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.base.bizVo.AlarmVo; +import org.jeecg.modules.base.bizVo.AnalysisLogVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; + +@Component +@FeignClient(value = "") +public interface AlarmClient { + + @GetMapping(value = "/alarmAnalysisLog/findPage") + Result analysisLogFindPage(AnalysisLogVo analysisLogVo); + + @GetMapping(value = "/alarmLog/findPage") + Result alarmLogFindPage(AlarmVo alarmVo); + + @GetMapping(value = "/sysEmail/findPage") + Result emailFindPage(QueryRequest query); + + @GetMapping(value = "/sysServer/findPage") + Result serverFindPage(QueryRequest query); + + @GetMapping(value = "/sysDatabase/findPage") + Result databaseFindPage(QueryRequest query); +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java deleted file mode 100644 index 47cd76a7..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.jeecg.modules.feignclient; - -public interface AlarmService { -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java new file mode 100644 index 00000000..8077819b --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java @@ -0,0 +1,47 @@ +package org.jeecg.modules.feignclient; + +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.Date; + +@Component +@FeignClient(value = "armd-web-statistics", path = "/radionuclide") +public interface RadionuclideClient { + + /** + * 分页查询自动处理结果 + * @param queryRequest + * @param stationIds + * @param qualifie + * @param sampleType + * @param startTime + * @param endTime + * @return + */ + @GetMapping("/findStationList") + Result findAutoPage(QueryRequest queryRequest, Integer[] stationIds, + String qualifie, String sampleType, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime); + + /** + * 分页查询人工交互结果 + * @param queryRequest + * @param stationIds + * @param qualifie + * @param startTime + * @param endTime + * @return + */ + @GetMapping("findReviewedPage") + Result findReviewedPage(QueryRequest queryRequest, Integer[] stationIds, String qualifie, + @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime, + @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime); + + +} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java deleted file mode 100644 index 94bc614d..00000000 --- a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.jeecg.modules.feignclient; - -import com.alibaba.fastjson.JSONObject; -import org.jeecg.common.api.vo.Result; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; - -@Component -@FeignClient(value = "armd-web-statistics", path = "/sys") -public interface WebService { - - @GetMapping("/webStatistics/findStationList") - Result findStationList(); -} diff --git a/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java new file mode 100644 index 00000000..fdc87e42 --- /dev/null +++ b/jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java @@ -0,0 +1,20 @@ +package org.jeecg.modules.feignclient; + +import com.alibaba.fastjson.JSONObject; +import io.swagger.annotations.ApiOperation; +import org.jeecg.common.api.QueryRequest; +import org.jeecg.common.api.vo.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.format.annotation.DateTimeFormat; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; + +import java.util.Date; + +@Component +@FeignClient(value = "armd-web-statistics", path = "/webStatistics") +public interface WebStatisticsClient { + + @GetMapping("/findStationList") + Result findStationList(String menuName); +}