Skip to content

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

添加跑马灯筛选接口

parent af56b939
Hide whitespace changes
Inline Side-by-side
Showing with 342 additions and 333 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,96 +14,94 @@ import org.springframework.web.bind.annotation.RequestParam; ...@@ -14,96 +14,94 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
//@FeignClient(name = "${mcb.warning.name:MCB-SERVER}", path = "warning", configuration = {FeignConfiguration.class}) //@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 { public interface McbWarningFeign {
/** /**
* 根据风险来源查询人员红黄绿吗信息 * 根据风险来源查询人员红黄绿吗信息
*/ */
@GetMapping("/task/getQrCodeCount") @GetMapping("/task/getQrCodeCount")
FeignClientResult<Map<String, Object>> getQrCodeCount(@RequestParam(required = false, value = "parentCode") String parentCode, FeignClientResult<Map<String, Object>> getQrCodeCount(
@RequestParam(value = "warningObjectType") String warningObjectType); @RequestParam(required = false, value = "parentCode") String parentCode,
@RequestParam(value = "warningObjectType") String warningObjectType);
/**
* 根据风险来源查询人员红黄绿吗信息 /**
*/ * 根据风险来源查询人员红黄绿吗信息
@GetMapping("/task/getWarningInfoCountByObjectId") */
FeignClientResult<Integer> getWarningInfoCountByObjectId(@RequestParam(value = "code") String code); @GetMapping("/task/getWarningInfoCountByObjectId")
FeignClientResult<Integer> getWarningInfoCountByObjectId(@RequestParam(value = "code") String code);
/**
* 根据风险来源查询人员红黄绿吗信息 /**
*/ * 根据风险来源查询人员红黄绿吗信息
@GetMapping("/task/getWarningInfoByTraceId") */
FeignClientResult<String> getWarningInfoByTraceId(@RequestParam(value = "traceId") String traceId); @GetMapping("/task/getWarningInfoByTraceId")
FeignClientResult<String> getWarningInfoByTraceId(@RequestParam(value = "traceId") String traceId);
/**
* 根据风险来源查询人员红黄绿吗信息 /**
*/ * 根据风险来源查询人员红黄绿吗信息
@PostMapping("/task/updateRawDataByTraceId") */
FeignClientResult<Boolean> updateRawDataByTraceId(@RequestParam(value = "traceId") String traceId, @RequestParam(value = "rawData") String rawData); @PostMapping("/task/updateRawDataByTraceId")
FeignClientResult<Boolean> updateRawDataByTraceId(@RequestParam(value = "traceId") String traceId,
@RequestParam(value = "rawData") String rawData);
/**
* 任务详情分页列表 /**
*/ * 任务详情分页列表
@GetMapping("/warning-warning-info/page") */
FeignClientResult<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map); @GetMapping("/warning-warning-info/page")
FeignClientResult<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map);
/**
* 问题记录分页列表 /**
*/ * 问题记录分页列表
@GetMapping("/warning-question-info/questionPage") */
FeignClientResult<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map); @GetMapping("/warning-question-info/questionPage")
FeignClientResult<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map);
/**
* 任务详情、问题记录左侧树 /**
*/ * 任务详情、问题记录左侧树
@GetMapping("/warning-warning-info/tree") */
FeignClientResult<List<RectificationUnitClassifyTreeDto>> getWarnTree(); @GetMapping("/warning-warning-info/tree")
FeignClientResult<List<RectificationUnitClassifyTreeDto>> getWarnTree();
/**
* 任务详情列表统计 /**
*/ * 任务详情列表统计
@GetMapping("/warning-warning-info/statistics") */
FeignClientResult getTaskDetailStatistic(@RequestParam Map<String, Object> map); @GetMapping("/warning-warning-info/statistics")
FeignClientResult getTaskDetailStatistic(@RequestParam Map<String, Object> map);
/**
* 问题记录列表统计 /**
*/ * 问题记录列表统计
@GetMapping("/warning-question-info/questionPageTopStatistics") */
FeignClientResult getQuestionRecordStatistic(@RequestParam Map<String, Object> map); @GetMapping("/warning-question-info/questionPageTopStatistics")
FeignClientResult getQuestionRecordStatistic(@RequestParam Map<String, Object> map);
/**
* 任务总览地图信息数据 /**
*/ * 任务总览地图信息数据
@GetMapping("/monitor/overview/getMapRouteInfoByCodes") */
FeignClientResult getMapRouteInfoByCodes(@RequestParam String province, @GetMapping("/monitor/overview/getMapRouteInfoByCodes")
@RequestParam("codes") List<String> codes, FeignClientResult getMapRouteInfoByCodes(@RequestParam String province, @RequestParam("codes") List<String> codes,
@RequestParam(value = "operator", defaultValue = "=") String operator); @RequestParam(value = "operator", defaultValue = "=") String operator);
/**
/** * 跑马灯列表数据分页查询
* 跑马灯列表数据分页查询 */
*/ @GetMapping(value = "/monitor/overview/getLampListPage")
@GetMapping(value = "/monitor/overview/getLampListPage") FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus,
FeignClientResult getLampListPage(@RequestParam String questionRectificationStatus, @RequestParam(value = "warningSourceType", required = false) String warningSourceType,
@RequestParam("codes") List<String> codes, @RequestParam(value = "objectName", required = false) String objectName,
@RequestParam(value = "operator", defaultValue = "=") String operator, @RequestParam("codes") List<String> codes,
@RequestParam("current") Long current, @RequestParam(value = "operator", defaultValue = "=") String operator,
@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,
@GetMapping("/monitor/overview/getLampList") @RequestParam(value = "objectName", required = false) String objectName,
FeignClientResult getLampList(@RequestParam String questionRectificationStatus, @RequestParam("codes") List<String> codes,
@RequestParam("codes") List<String> codes, @RequestParam(value = "operator", defaultValue = "=") String operator);
@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
...@@ -7,89 +7,91 @@ import java.util.Map; ...@@ -7,89 +7,91 @@ import java.util.Map;
public interface IMcbWarningService { public interface IMcbWarningService {
/** /**
* 今日预警-预警总数 * 今日预警-预警总数
* *
* @param processingStatus 处理状态 * @param processingStatus 处理状态
* @return 预警总数 * @return 预警总数
*/ */
Map<String, Object> queryTodayCount(Integer processingStatus); Map<String, Object> queryTodayCount(Integer processingStatus);
/**
/** * 近七日预警统计
* 近七日预警统计 *
* * @return 预警统计
* @return 预警统计 */
*/ List<Map<String, Object>> queryWeekCount();
List<Map<String, Object>> queryWeekCount();
/**
/** * 预警信息列表
* 预警信息列表 *
* * @return 预警信息列表
* @return 预警信息列表 */
*/ Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus,
Page<Map<String, Object>> queryWarningPage(Page<Map<String, Object>> page, Integer processingStatus, String eventLevel, String createDate, String warningSourceType); String eventLevel, String createDate, String warningSourceType);
/** /**
* 预警信息总数 * 预警信息总数
* *
* @return 预警信息总数 * @return 预警信息总数
*/ */
Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate, String warningSourceType); Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate, String warningSourceType);
/** /**
* 问题信息列表 * 问题信息列表
* *
* @return 问题信息列表 * @return 问题信息列表
*/ */
Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus); Page<Map<String, Object>> queryQuestionPage(Page<Map<String, Object>> page, Integer completionStatus);
/** /**
* 问题信息列表 * 问题信息列表
* *
* @return 问题信息列表 * @return 问题信息列表
*/ */
Long queryQuestionCount(Integer completionStatus); Long queryQuestionCount(Integer completionStatus);
/** /**
* 获取地图点位/路线 * 获取地图点位/路线
* *
* @return 地图点位/路线 * @return 地图点位/路线
*/ */
Object queryMapRoutes(String province); Object queryMapRoutes(String province);
/** /**
* 任务详情分页列表 * 任务详情分页列表
* *
* @return 任务详情分页列表 * @return 任务详情分页列表
*/ */
Page<Map<String, Object>> getTaskDetailPage(Map<String, Object> map); Page<Map<String, Object>> getTaskDetailPage(Map<String, Object> map);
/** /**
* 问题记录分页列表 * 问题记录分页列表
* *
* @return 任务详情分页列表 * @return 任务详情分页列表
*/ */
Page<Map<String, Object>> getQuestionRecordPage(Map<String, Object> map); Page<Map<String, Object>> getQuestionRecordPage(Map<String, Object> map);
/** /**
* 任务详情、问题记录左侧树 * 任务详情、问题记录左侧树
*/ */
Object getWarnTree(); Object getWarnTree();
/** /**
* 任务详情列表统计 * 任务详情列表统计
*/ */
Object getTaskDetailStatistic(Map<String, Object> map); Object getTaskDetailStatistic(Map<String, Object> map);
/** /**
* 问题记录列表统计 * 问题记录列表统计
*/ */
Object getQuestionRecordStatistic(Map<String, Object> map); Object getQuestionRecordStatistic(Map<String, Object> map);
Object getMapRouteInfoByCodes(String province); Object getMapRouteInfoByCodes(String province);
Object getLampListPageByCodes(String questionRectificationStatus,Page page); Object getLampListPageByCodes(String questionRectificationStatus, String warningSourceType, String objectName,
Object getLampListByCodes(String questionRectificationStatus); 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
...@@ -26,143 +26,158 @@ import java.util.stream.Collectors; ...@@ -26,143 +26,158 @@ import java.util.stream.Collectors;
@RequestMapping(value = "/warning") @RequestMapping(value = "/warning")
public class McbWarningController { public class McbWarningController {
@Autowired @Autowired
private IMcbWarningService mcbWarningService; private IMcbWarningService mcbWarningService;
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]今日预警-预警总数", notes = "[监测总览]今日预警-预警总数") @ApiOperation(httpMethod = "GET", value = "[监测总览]今日预警-预警总数", notes = "[监测总览]今日预警-预警总数")
@GetMapping(value = "/count/today") @GetMapping(value = "/count/today")
public ResponseModel<Map<String, Object>> queryTodayCount(@RequestParam(value = "processingStatus", required = false) Integer processingStatus) { public ResponseModel<Map<String, Object>> queryTodayCount(
return ResponseHelper.buildResponse(mcbWarningService.queryTodayCount(processingStatus)); @RequestParam(value = "processingStatus", required = false) Integer processingStatus) {
} return ResponseHelper.buildResponse(mcbWarningService.queryTodayCount(processingStatus));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]近七日预警统计", notes = "[监测总览]近七日预警统计") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/count/week") @ApiOperation(httpMethod = "GET", value = "[监测总览]近七日预警统计", notes = "[监测总览]近七日预警统计")
public ResponseModel<Object> queryWeekCount() { @GetMapping(value = "/count/week")
List<Map<String, Object>> list = mcbWarningService.queryWeekCount(); public ResponseModel<Object> queryWeekCount() {
Map<String,Object> result = new HashMap<>(); List<Map<String, Object>> list = mcbWarningService.queryWeekCount();
List<Object> axisData = new ArrayList<>(); Map<String, Object> result = new HashMap<>();
List<Object> seriesData = new ArrayList<>(); List<Object> axisData = new ArrayList<>();
if (!CollectionUtils.isEmpty(list)) { List<Object> seriesData = new ArrayList<>();
axisData = list.stream().map(x -> x.get("axisData")).collect(Collectors.toList()); if (!CollectionUtils.isEmpty(list)) {
seriesData = list.stream().map(y -> y.get("seriesData")).collect(Collectors.toList()); axisData = list.stream().map(x -> x.get("axisData")).collect(Collectors.toList());
} seriesData = list.stream().map(y -> y.get("seriesData")).collect(Collectors.toList());
result.put("axisData", axisData); }
result.put("seriesData", seriesData); result.put("axisData", axisData);
return ResponseHelper.buildResponse(result); result.put("seriesData", seriesData);
} return ResponseHelper.buildResponse(result);
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息列表", notes = "[监测总览]预警信息列表") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/warning/page") @ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息列表", notes = "[监测总览]预警信息列表")
public ResponseModel<Page<Map<String, Object>>> queryWarningPage(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber, @GetMapping(value = "/warning/page")
@RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize, public ResponseModel<Page<Map<String, Object>>> queryWarningPage(
@RequestParam(value = "processingStatus", required = false) Integer processingStatus, @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@RequestParam(value = "eventLevel", required = false) String eventLevel, @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
@RequestParam(value = "createDate", required = false) String createDate, @RequestParam(value = "processingStatus", required = false) Integer processingStatus,
@RequestParam(value = "warningSourceType", required = false) String warningSourceType @RequestParam(value = "eventLevel", required = false) String eventLevel,
) { @RequestParam(value = "createDate", required = false) String createDate,
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize); @RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
return ResponseHelper.buildResponse(mcbWarningService.queryWarningPage(page, processingStatus, eventLevel, createDate, warningSourceType)); Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
} 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") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
public ResponseModel<Map<String, Object>> queryWarningCount(@RequestParam(value = "processingStatus", required = false) Integer processingStatus, @ApiOperation(httpMethod = "GET", value = "[监测总览]预警信息总数", notes = "[监测总览]预警信息总数")
@RequestParam(value = "eventLevel", required = false) String eventLevel, @GetMapping(value = "/warning/count")
@RequestParam(value = "createDate", required = false) String createDate, public ResponseModel<Map<String, Object>> queryWarningCount(
@RequestParam(value = "warningSourceType", required = false) String warningSourceType) { @RequestParam(value = "processingStatus", required = false) Integer processingStatus,
Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel, createDate, warningSourceType); @RequestParam(value = "eventLevel", required = false) String eventLevel,
Map<String, Object> result = new HashMap<String, Object>() {{ @RequestParam(value = "createDate", required = false) String createDate,
this.put("count", count); @RequestParam(value = "warningSourceType", required = false) String warningSourceType) {
}}; Long count = mcbWarningService.queryWarningCount(processingStatus, eventLevel, createDate, warningSourceType);
return ResponseHelper.buildResponse(result); Map<String, Object> result = new HashMap<String, Object>() {
} {
this.put("count", count);
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) }
@ApiOperation(httpMethod = "GET", value = "[监测总览]问题列表", notes = "[监测总览]问题列表") };
@GetMapping(value = "/question/page") return ResponseHelper.buildResponse(result);
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) { @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize); @ApiOperation(httpMethod = "GET", value = "[监测总览]问题列表", notes = "[监测总览]问题列表")
return ResponseHelper.buildResponse(mcbWarningService.queryQuestionPage(page, completionStatus)); @GetMapping(value = "/question/page")
} public ResponseModel<Page<Map<String, Object>>> queryQuestionList(
@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @RequestParam(value = "pageSize", defaultValue = "20") Integer pageSize,
@ApiOperation(httpMethod = "GET", value = "任务详情、问题记录左侧树", notes = "任务详情、问题记录左侧树") @RequestParam(value = "completionStatus", required = false) Integer completionStatus) {
@GetMapping(value = "/warning-warning-info/tree") Page<Map<String, Object>> page = new Page<>(pageNumber, pageSize);
public ResponseModel getWarnTree() { return ResponseHelper.buildResponse(mcbWarningService.queryQuestionPage(page, completionStatus));
return ResponseHelper.buildResponse(mcbWarningService.getWarnTree()); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "GET", value = "任务详情、问题记录左侧树", notes = "任务详情、问题记录左侧树")
@ApiOperation(httpMethod = "GET", value = "任务详情分页列表", notes = "任务详情分页列表") @GetMapping(value = "/warning-warning-info/tree")
@GetMapping(value = "/warning-warning-info/page") public ResponseModel getWarnTree() {
public ResponseModel<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map) { return ResponseHelper.buildResponse(mcbWarningService.getWarnTree());
return ResponseHelper.buildResponse(mcbWarningService.getTaskDetailPage(map)); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "GET", value = "任务详情分页列表", notes = "任务详情分页列表")
@ApiOperation(httpMethod = "GET", value = "任务详情统计", notes = "任务详情统计") @GetMapping(value = "/warning-warning-info/page")
@GetMapping(value = "/warning-warning-info/statistics") public ResponseModel<Page<Map<String, Object>>> getTaskDetailPage(@RequestParam Map<String, Object> map) {
public ResponseModel getTaskDetailStatistic(@RequestParam Map<String, Object> map) { return ResponseHelper.buildResponse(mcbWarningService.getTaskDetailPage(map));
return ResponseHelper.buildResponse(mcbWarningService.getTaskDetailStatistic(map)); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "GET", value = "任务详情统计", notes = "任务详情统计")
@ApiOperation(httpMethod = "GET", value = "问题记录分页列表", notes = "问题记录分页列表") @GetMapping(value = "/warning-warning-info/statistics")
@GetMapping(value = "/warning-question-info/questionPage") public ResponseModel getTaskDetailStatistic(@RequestParam Map<String, Object> map) {
public ResponseModel<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map) { return ResponseHelper.buildResponse(mcbWarningService.getTaskDetailStatistic(map));
return ResponseHelper.buildResponse(mcbWarningService.getQuestionRecordPage(map)); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "GET", value = "问题记录分页列表", notes = "问题记录分页列表")
@ApiOperation(httpMethod = "GET", value = "问题记录统计", notes = "问题记录统计") @GetMapping(value = "/warning-question-info/questionPage")
@GetMapping(value = "/warning-question-info/questionPageTopStatistics") public ResponseModel<Page<Map<String, Object>>> getQuestionRecordPage(@RequestParam Map<String, Object> map) {
public ResponseModel getQuestionRecordStatistic(@RequestParam Map<String, Object> map) { return ResponseHelper.buildResponse(mcbWarningService.getQuestionRecordPage(map));
return ResponseHelper.buildResponse(mcbWarningService.getQuestionRecordStatistic(map)); }
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) @ApiOperation(httpMethod = "GET", value = "问题记录统计", notes = "问题记录统计")
@ApiOperation(httpMethod = "GET", value = "[监测总览]问题总数", notes = "[监测总览]问题总数") @GetMapping(value = "/warning-question-info/questionPageTopStatistics")
@GetMapping(value = "/question/count") public ResponseModel getQuestionRecordStatistic(@RequestParam Map<String, Object> map) {
public ResponseModel<Map<String, Object>> queryQuestionCount(@RequestParam(value = "completionStatus", required = false) Integer completionStatus) { return ResponseHelper.buildResponse(mcbWarningService.getQuestionRecordStatistic(map));
Long count = mcbWarningService.queryQuestionCount(completionStatus); }
Map<String, Object> result = new HashMap<String, Object>() {{
this.put("count", count); @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
}}; @ApiOperation(httpMethod = "GET", value = "[监测总览]问题总数", notes = "[监测总览]问题总数")
return ResponseHelper.buildResponse(result); @GetMapping(value = "/question/count")
} public ResponseModel<Map<String, Object>> queryQuestionCount(
@RequestParam(value = "completionStatus", required = false) Integer completionStatus) {
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) Long count = mcbWarningService.queryQuestionCount(completionStatus);
@ApiOperation(httpMethod = "GET", value = "[监测总览]地图点位/路线", notes = "[监测总览]地图点位/路线") Map<String, Object> result = new HashMap<String, Object>() {
@GetMapping(value = "/map/routes") {
public ResponseModel<Object> queryMapRoutes(@RequestParam(value = "province", required = false) String province) { this.put("count", count);
return ResponseHelper.buildResponse(mcbWarningService.queryMapRoutes(province)); }
} };
return ResponseHelper.buildResponse(result);
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false) }
@ApiOperation(httpMethod = "GET", value = "任务总览地图数据", notes = "任务总览地图数据")
@GetMapping(value = "/getMapRouteInfoByCodes") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
public ResponseModel<Object> getMapRouteInfoByCodes(@RequestParam String province) { @ApiOperation(httpMethod = "GET", value = "[监测总览]地图点位/路线", notes = "[监测总览]地图点位/路线")
return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province)); @GetMapping(value = "/map/routes")
} public ResponseModel<Object> queryMapRoutes(@RequestParam(value = "province", required = false) String province) {
return ResponseHelper.buildResponse(mcbWarningService.queryMapRoutes(province));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "跑马灯列表数据分页查询", notes = "任务总览地图数据") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/warning-warning-info/getLampListPageByCodes") @ApiOperation(httpMethod = "GET", value = "任务总览地图数据", notes = "任务总览地图数据")
public ResponseModel<Object> getLampListPageByCodes(@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus,Page page) { @GetMapping(value = "/getMapRouteInfoByCodes")
return ResponseHelper.buildResponse(mcbWarningService.getLampListPageByCodes(questionRectificationStatus,page)); public ResponseModel<Object> getMapRouteInfoByCodes(@RequestParam String province) {
} return ResponseHelper.buildResponse(mcbWarningService.getMapRouteInfoByCodes(province));
}
@TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@ApiOperation(httpMethod = "GET", value = "跑马灯列表数据查询", notes = "任务总览地图数据") @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
@GetMapping(value = "/warning-warning-info/getLampListByCodes") @ApiOperation(httpMethod = "GET", value = "跑马灯列表数据分页查询", notes = "任务总览地图数据")
public ResponseModel<Object> getLampListByCodes(@RequestParam(value = "questionRectificationStatus", required = false) String questionRectificationStatus) { @GetMapping(value = "/warning-warning-info/getLampListPageByCodes")
return ResponseHelper.buildResponse(mcbWarningService.getLampListByCodes(questionRectificationStatus)); 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,
@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 { ...@@ -42,8 +42,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override @Override
public Map<String, Object> queryTodayCount(Integer processingStatus) { public Map<String, Object> queryTodayCount(Integer processingStatus) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryTodayCount(projectOrgCodes, processingStatus); return mcbWarningMapper.queryTodayCount(projectOrgCodes, processingStatus);
...@@ -57,8 +56,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -57,8 +56,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override @Override
public List<Map<String, Object>> queryWeekCount() { public List<Map<String, Object>> queryWeekCount() {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryWeekCount(projectOrgCodes); return mcbWarningMapper.queryWeekCount(projectOrgCodes);
...@@ -77,8 +75,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -77,8 +75,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1; long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent(); long offset = page.getSize() * page.getCurrent();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes, List<Map<String, Object>> records = mcbWarningMapper.queryWarningList(start, offset, projectOrgCodes,
...@@ -100,8 +97,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -100,8 +97,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate, public Long queryWarningCount(Integer processingStatus, String eventLevel, String createDate,
String warningSourceType) { String warningSourceType) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate, return mcbWarningMapper.queryWarningCount(projectOrgCodes, processingStatus, eventLevel, createDate,
...@@ -120,8 +116,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -120,8 +116,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
long start = page.getCurrent() - 1; long start = page.getCurrent() - 1;
long offset = page.getSize() * page.getCurrent(); long offset = page.getSize() * page.getCurrent();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes, List<Map<String, Object>> records = mcbWarningMapper.queryQuestionList(start, offset, projectOrgCodes,
...@@ -141,8 +136,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -141,8 +136,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override @Override
public Long queryQuestionCount(Integer completionStatus) { public Long queryQuestionCount(Integer completionStatus) {
List<String> projectOrgCodes = this.getProjectOrgCodes(); List<String> projectOrgCodes = this.getProjectOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
return mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus); return mcbWarningMapper.queryQuestionCount(projectOrgCodes, completionStatus);
...@@ -272,8 +266,7 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -272,8 +266,7 @@ public class McbWarningServiceImpl implements IMcbWarningService {
@Override @Override
public Object getMapRouteInfoByCodes(String province) { public Object getMapRouteInfoByCodes(String province) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes(); List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
FeignClientResult<Object> result = mcbWarningFeign.getMapRouteInfoByCodes(province, projectOrgCodes, "like"); FeignClientResult<Object> result = mcbWarningFeign.getMapRouteInfoByCodes(province, projectOrgCodes, "like");
...@@ -281,24 +274,25 @@ public class McbWarningServiceImpl implements IMcbWarningService { ...@@ -281,24 +274,25 @@ public class McbWarningServiceImpl implements IMcbWarningService {
} }
@Override @Override
public Object getLampListPageByCodes(String questionRectificationStatus, Page page) { public Object getLampListPageByCodes(String questionRectificationStatus, String warningSourceType,
String objectName, Page page) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes(); List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); 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(); return result.getResult();
} }
@Override @Override
public Object getLampListByCodes(String questionRectificationStatus) { public Object getLampListByCodes(String questionRectificationStatus, String warningSourceType, String objectName) {
List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes(); List<String> projectOrgCodes = permissionService.getCurrentUserAmosOrgCodes();
if(projectOrgCodes.isEmpty()) if (projectOrgCodes.isEmpty()) {
{
projectOrgCodes.add("NULL"); projectOrgCodes.add("NULL");
} }
FeignClientResult<Object> result = mcbWarningFeign.getLampList(questionRectificationStatus,projectOrgCodes,"like"); FeignClientResult<Object> result = mcbWarningFeign.getLampList(questionRectificationStatus, warningSourceType,
objectName, projectOrgCodes, "like");
return result.getResult(); 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