fix:alarm 和 web

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 io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RestController;
+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);
+    }
 }

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);
+    }
+}

jeecg-module-app/src/main/java/org/jeecg/modules/controller/WebController.java

@@ -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 {
-
-
-}

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);
+    }
+}

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);
+}

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/AlarmService.java

@@ -1,4 +0,0 @@
-package org.jeecg.modules.feignclient;
-
-public interface AlarmService {
-}

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);
+
+
+}

jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebService.java

@@ -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<JSONObject> findStationList();
-}

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<JSONObject> findStationList(String menuName);
+}