Skip to content

A
amos-boot-biz
Commit b5a0e298 authored by wujiang's avatar wujiang
Browse files
Options

添加跑马灯筛选接口

parent af56b939
Show whitespace changes
Inline Side-by-side
Showing with 67 additions and 58 deletions
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/feign/McbWarningFeign.java
View file @ b5a0e298
......@@ -14,16 +14,17 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
import java.util.Map;
//@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class})
@FeignClient(name = "mcb",url = "http://10.20.1.160:10005", path = "warning", configuration = {FeignConfiguration.class})
@FeignClient(name = "mcb", url = "http://10.20.1.160:10005", path = "warning", configuration = {
FeignConfiguration.class })
public interface McbWarningFeign {
/**
* 根据风险来源查询人员红黄绿吗信息
*/
@GetMapping("/task/getQrCodeCount")
FeignClientResult<Map<String, Object>> getQrCodeCount(@RequestParam(required = false, value = "parentCode") String parentCode,
FeignClientResult<Map<String, Object>> getQrCodeCount(
@RequestParam(required = false, value = "parentCode") String parentCode,
@RequestParam(value = "warningObjectType") String warningObjectType);
/**
......@@ -42,8 +43,8 @@ public interface McbWarningFeign {
* 根据风险来源查询人员红黄绿吗信息
*/
@PostMapping("/task/updateRawDataByTraceId")
FeignClientResult<Boolean> updateRawDataByTraceId(@RequestParam(value = "traceId") String traceId, @RequestParam(value = "rawData") String rawData);
FeignClientResult<Boolean> updateRawDataByTraceId(@RequestParam(value = "traceId") String traceId,
@RequestParam(value = "rawData") String rawData);
/**
* 任务详情分页列表
......@@ -79,31 +80,28 @@ public interface McbWarningFeign {
* 任务总览地图信息数据
*/
@GetMapping("/monitor/overview/getMapRouteInfoByCodes")
FeignClientResult getMapRouteInfoByCodes(@RequestParam String province,
@RequestParam("codes") List<String> codes,
FeignClientResult getMapRouteInfoByCodes(@RequestParam String province, @RequestParam("codes") List<String> codes,
@RequestParam(value = "operator", defaultValue = "=") String operator);
/**
* 跑马灯列表数据分页查询
*/
@GetMapping(value = "/monitor/overview/getLampListPage")
FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
@RequestParam(value = "objectName", required = false) String objectName,
@RequestParam("codes") List<String> codes,
@RequestParam(value = "operator", defaultValue = "=") String operator,
@RequestParam("current") Long current,
@RequestParam("size") Long size
);
@RequestParam("current") Long current, @RequestParam("size") Long size);
/**
* 跑马灯列表数据查询
*/
@GetMapping("/monitor/overview/getLampList")
FeignClientResult getLampList(@RequestParam String questionRectificationStatus,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
@RequestParam(value = "objectName", required = false) String objectName,
@RequestParam("codes") List<String> codes,
@RequestParam(value = "operator", defaultValue = "=") String operator);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IMcbWarningService.java
View file @ b5a0e298
......@@ -15,7 +15,6 @@ public interface IMcbWarningService {
*/
Map<String, Object> queryTodayCount(Integer processingStatus);
/**
* 近七日预警统计
*
......@@ -28,7 +27,8 @@ public interface IMcbWarningService {
*
* @return 预警信息列表
*/
Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus, String eventLevel, String createDate, String warningSourceType);
Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
String eventLevel, String createDate, String warningSourceType);
/**
* 预警信息总数
......@@ -89,7 +89,9 @@ public interface IMcbWarningService {
Object getMapRouteInfoByCodes(String province);
Object getLampListPageByCodes(String questionRectificationStatus,Page page);
Object getLampListByCodes(String questionRectificationStatus);
Object getLampListPageByCodes(String questionRectificationStatus, String warningSourceType, String objectName,
Page page);
Object getLampListByCodes(String questionRectificationStatus, String warningSourceType, String objectName);
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/McbWarningController.java
View file @ b5a0e298
......@@ -32,7 +32,8 @@ public class McbWarningController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]今日预警-预警总数", notes = "[监测总览]今日预警-预警总数")
@GetMapping(value = "/count/today")
public ResponseModel<Map<String, Object>> queryTodayCount(@RequestParam(value = "processingStatus", required = false) Integer processingStatus) {
public ResponseModel<Map<String, Object>> queryTodayCount(
@RequestParam(value = "processingStatus", required = false) Integer processingStatus) {
return ResponseHelper.buildResponse(mcbWarningService.queryTodayCount(processingStatus));
}
......@@ -41,7 +42,7 @@ public class McbWarningController {
@GetMapping(value = "/count/week")
public ResponseModel<Object> queryWeekCount() {
List<Map<String, Object>> list = mcbWarningService.queryWeekCount();
Map<String,Object> result = new HashMap<>();
Map<String, Object> result = new HashMap<>();
List<Object> axisData = new ArrayList<>();
List<Object> seriesData = new ArrayList<>();
if (!CollectionUtils.isEmpty(list)) {
......@@ -56,35 +57,40 @@ public class McbWarningController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息列表", notes = "[监测总览]预警信息列表")
@GetMapping(value = "/warning/page")
public ResponseModel<Page<Map<String, Object>>> queryWarningPage(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
public ResponseModel<Page<Map<String, Object>>> queryWarningPage(
@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
@RequestParam(value = "processingStatus", required = false) Integer processingStatus,
@RequestParam(value = "eventLevel", required = false) String eventLevel,
@RequestParam(value = "createDate", required = false) String createDate,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType
) {
@RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
return ResponseHelper.buildResponse(mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, warningSourceType));
return ResponseHelper.buildResponse(
mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, warningSourceType));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息总数", notes = "[监测总览]预警信息总数")
@GetMapping(value = "/warning/count")
public ResponseModel<Map<String, Object>> queryWarningCount(@RequestParam(value = "processingStatus", required = false) Integer processingStatus,
public ResponseModel<Map<String, Object>> queryWarningCount(
@RequestParam(value = "processingStatus", required = false) Integer processingStatus,
@RequestParam(value = "eventLevel", required = false) String eventLevel,
@RequestParam(value = "createDate", required = false) String createDate,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel, createDate, warningSourceType);
Map<String, Object> result = new HashMap<String, Object>() {{
Map<String, Object> result = new HashMap<String, Object>() {
{
this.put("count", count);
}};
}
};
return ResponseHelper.buildResponse(result);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]问题列表", notes = "[监测总览]问题列表")
@GetMapping(value = "/question/page")
public ResponseModel<Page<Map<String, Object>>> queryQuestionList(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
public ResponseModel<Page<Map<String, Object>>> queryQuestionList(
@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
@RequestParam(value = "completionStatus", required = false) Integer completionStatus) {
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
......@@ -129,11 +135,14 @@ public class McbWarningController {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]问题总数", notes = "[监测总览]问题总数")
@GetMapping(value = "/question/count")
public ResponseModel<Map<String, Object>> queryQuestionCount(@RequestParam(value = "completionStatus", required = false) Integer completionStatus) {
public ResponseModel<Map<String, Object>> queryQuestionCount(
@RequestParam(value = "completionStatus", required = false) Integer completionStatus) {
Long count = mcbWarningService.queryQuestionCount(completionStatus);
Map<String, Object> result = new HashMap<String, Object>() {{
Map<String, Object> result = new HashMap<String, Object>() {
{
this.put("count", count);
}};
}
};
return ResponseHelper.buildResponse(result);
}
......@@ -151,18 +160,24 @@ public class McbWarningController {
return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "跑马灯列表数据分页查询", notes = "任务总览地图数据")
@GetMapping(value = "/warning-warning-info/getLampListPageByCodes")
public ResponseModel<Object> getLampListPageByCodes(@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus,Page page) {
return ResponseHelper.buildResponse(mcbWarningService.getLampListPageByCodes(questionRectificationStatus,page));
public ResponseModel<Object> getLampListPageByCodes(
@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
@RequestParam(value = "objectName", required = false) String objectName, Page page) {
return ResponseHelper
.buildResponse(mcbWarningService.getLampListPageByCodes(questionRectificationStatus,warningSourceType,objectName, page));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "跑马灯列表数据查询", notes = "任务总览地图数据")
@GetMapping(value = "/warning-warning-info/getLampListByCodes")
public ResponseModel<Object> getLampListByCodes(@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus) {
return ResponseHelper.buildResponse(mcbWarningService.getLampListByCodes(questionRectificationStatus));
public ResponseModel<Object> getLampListByCodes(
@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType,
@RequestParam(value = "objectName", required = false) String objectName) {
return ResponseHelper.buildResponse(mcbWarningService.getLampListByCodes(questionRectificationStatus,warningSourceType,objectName));
}
}
amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/McbWarningServiceImpl.java
View file @ b5a0e298
......@@ -42,8 +42,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override
public Map<String, Object> queryTodayCount(Integer processingStatus) {
List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
return mcbWarningMapper.queryTodayCount(projectOrgCodes, processingStatus);
......@@ -57,8 +56,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override
public List<Map<String, Object>> queryWeekCount() {
List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
return mcbWarningMapper.queryWeekCount(projectOrgCodes);
......@@ -77,8 +75,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
......@@ -100,8 +97,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,
String warningSourceType) {
List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,
......@@ -120,8 +116,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes,
......@@ -141,8 +136,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override
public Long queryQuestionCount(Integer completionStatus) {
List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
return mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus);
......@@ -272,8 +266,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override
public Object getMapRouteInfoByCodes(String province) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
FeignClientResult<Object> result = mcbWarningFeign.getMapRouteInfoByCodes(province, projectOrgCodes, "like");
......@@ -281,24 +274,25 @@ public class McbWarningServiceImpl implements IMcbWarningService {
}
@Override
public Object getLampListPageByCodes(String questionRectificationStatus, Page page) {
public Object getLampListPageByCodes(String questionRectificationStatus, String warningSourceType,
String objectName, Page page) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
FeignClientResult<Object> result = mcbWarningFeign.getLampListPage(questionRectificationStatus,projectOrgCodes,"like",page.getCurrent(),page.getSize());
FeignClientResult<Object> result = mcbWarningFeign.getLampListPage(questionRectificationStatus,
warningSourceType, objectName, projectOrgCodes, "like", page.getCurrent(), page.getSize());
return result.getResult();
}
@Override
public Object getLampListByCodes(String questionRectificationStatus) {
public Object getLampListByCodes(String questionRectificationStatus, String warningSourceType, String objectName) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty())
{
if (projectOrgCodes.isEmpty()) {
projectOrgCodes.add("NULL");
}
FeignClientResult<Object> result = mcbWarningFeign.getLampList(questionRectificationStatus,projectOrgCodes,"like");
FeignClientResult<Object> result = mcbWarningFeign.getLampList(questionRectificationStatus, warningSourceType,
objectName, projectOrgCodes, "like");
return result.getResult();
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment