xiaoguangbin/AnalysisSystemForRadionuclide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app微服务模块查询台站集合接口，查询ARR,RRR处理数据接口内容新增加app端接口区分

Browse Source
This commit is contained in:
qiaoqinzheng 2024-02-20 15:53:17 +08:00
parent 3bf4c3d0fc
commit 8b891c9461
4 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/RadionuclideClient.java
View File

@ -25,7 +25,7 @@ public interface RadionuclideClient {
* @param endTime
* @return
*/
@GetMapping("/findAutoPage")
@GetMapping("/findReviewedPageApp")
Result findAutoPage(@RequestParam("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds,
@RequestParam("qualifie") String qualifie,@RequestParam("sampleType") String sampleType,
@ -41,7 +41,7 @@ public interface RadionuclideClient {
* @param endTime
* @return
*/
@GetMapping("/findReviewedPage")
@GetMapping("/findReviewedPageApp")
Result findReviewedPage(@RequestParam("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds, @RequestParam("qualifie") String qualifie,
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,

2
jeecg-module-app/src/main/java/org/jeecg/modules/feignclient/WebStatisticsClient.java
View File

@ -16,6 +16,6 @@ import java.util.Date;
@FeignClient(value = "armd-web-statistics", path = "/webStatistics")
public interface WebStatisticsClient {
@GetMapping("/findStationList")
@GetMapping("/findStationListApp")
Result findStationList(@RequestParam String menuName);
}

24
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/RadionuclideController.java
View File

@ -7,9 +7,7 @@ import org.jeecg.modules.service.IAutoService;
import org.jeecg.modules.service.IReviewedService;
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 org.springframework.web.bind.annotation.*;
import java.util.Date;
@ -38,4 +36,24 @@ public class RadionuclideController {
@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
return reviewedService.findReviewedPage(queryRequest, stationIds, qualifie,startTime, endTime);
}
@GetMapping("findAutoPageApp")
@ApiOperation(value = "分页查询自动处理结果", notes = "分页查询自动处理结果")
public Result findAutoPageApp(@ModelAttribute("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds,
@RequestParam("qualifie") String qualifie, @RequestParam("sampleType") String sampleType,
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
return autoService.findAutoPage(queryRequest, stationIds, qualifie, sampleType,startTime, endTime);
}
@GetMapping("findReviewedPageApp")
@ApiOperation(value = "分页查询人工交互结果", notes = "分页查询人工交互结果")
public Result findReviewedPageApp(@ModelAttribute("queryRequest") QueryRequest queryRequest,
@RequestParam("stationIds") Integer[] stationIds,@RequestParam("qualifie") String qualifie,
@RequestParam("startTime") @DateTimeFormat(pattern = "yyyy-MM-dd")Date startTime,
@RequestParam("endTime") @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime){
return reviewedService.findReviewedPage(queryRequest, stationIds, qualifie,startTime, endTime);
}
}

10
jeecg-module-web-statistics/src/main/java/org/jeecg/modules/controller/WebStatisticsController.java
View File

@ -57,6 +57,16 @@ public class WebStatisticsController {
return result;
}
@GetMapping("findStationListApp")
@ApiOperation(value = "根据菜单名称查询对应的台站信息", notes = "根据菜单名称查询对应的台站信息")
public Result findStationListApp(@RequestParam String menuName){
Result result = new Result();
List<GardsStations> gardsStations = menuNameService.findStationListByMenuName(menuName);
result.setSuccess(true);
result.setResult(gardsStations);
return result;
}
@GetMapping("findParticulatePage")
@ApiOperation(value = "气溶胶分页查询", notes = "气溶胶分页查询")
public Result findParticulatePage(QueryRequest queryRequest, Integer[] stationIds, String dataType,