Commit dd322395 authored by 刘林's avatar 刘林

fix(Statistics):监管接口迁移

parent bbd589a1
......@@ -359,7 +359,7 @@ public class JGDPStatisticsController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/page")
@GetMapping(value = "/equipment-register/page")
@ApiOperation(httpMethod = "GET", value = "设备注册信息分页查询", notes = "设备注册信息分页查询")
public ResponseModel<Page<JSONObject>> queryForPage(@RequestParam Map<String, Object> map) {
JSONObject jsonObject = new JSONObject(map);
......@@ -373,14 +373,14 @@ public class JGDPStatisticsController {
* @return 返回由页签的key包裹详情对象
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{record}")
@GetMapping(value = "/equipment-register/{record}")
@ApiOperation(httpMethod = "GET", value = "根据record查询设备注册信息详情", notes = "根据record查询设备注册信息详情")
public ResponseModel<Object> selectOne(@PathVariable String record, @RequestParam(required = false) String isCopy) {
return ResponseHelper.buildResponse(statisticsService.getEquipmentRegisterByRecord(record, isCopy));
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equOnJgServiceOperationRecords")
@GetMapping(value = "common/equOnJgServiceOperationRecords")
@ApiOperation(httpMethod = "GET", value = "查询设备在jg业务中的记录", notes = "查询设备在jg业务中的记录")
public ResponseModel<List<Map<String, String>>> equOnJgServiceOperationRecords(@RequestParam(value = "record") String record) {
return ResponseHelper.buildResponse(statisticsService.equOnJgServiceOperationRecords(record));
......@@ -394,7 +394,7 @@ public class JGDPStatisticsController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/equipId/page")
@GetMapping(value = "/safety-problem-tracing/equipId/page")
@ApiOperation(httpMethod = "GET",value = "设备问题列表分页查询", notes = "设备问题列表分页查询")
public ResponseModel<Page<SafetyProblemTracingDto>> queryProblemPageByEquipId(@RequestParam(value = "current") int current, @RequestParam
(value = "size") int size, @RequestParam(value = "record") String equipId) {
......@@ -412,7 +412,7 @@ public class JGDPStatisticsController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/{sequenceNbr}")
@GetMapping(value = "/safety-problem-tracing/{sequenceNbr}")
@ApiOperation(httpMethod = "GET",value = "根据sequenceNbr查询单个安全追溯问题", notes = "根据sequenceNbr查询单个安全追溯问题")
public ResponseModel<SafetyProblemTracingDto> selectSafetyProblem(@PathVariable Long sequenceNbr) {
return ResponseHelper.buildResponse(statisticsService.selectSafetyProblem(sequenceNbr));
......@@ -426,7 +426,7 @@ public class JGDPStatisticsController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据问题ID及问题类型查询关联设备列表", notes = "根据问题ID及问题类型查询关联设备列表")
@GetMapping(value = "/equip/list")
@GetMapping(value = "/safety-problem-tracing/equip/list")
public ResponseModel<Page<Map<String, Object>>> queryEquipListProblemById(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size, @RequestParam(value = "sequenceNbr") String problemId) {
Page<Map<String, Object>> page = new Page<>();
......@@ -443,7 +443,7 @@ public class JGDPStatisticsController {
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET",value = "根据问题ID及问题类型查询关联企业", notes = "根据问题ID及问题类型查询关联企业")
@GetMapping(value = "/unit/list")
@GetMapping(value = "/safety-problem-tracing/unit/list")
public ResponseModel<Page<Map<String, Object>>> queryPrincipalUnitByProblemId(@RequestParam(value = "current") int current,@RequestParam
(value = "size") int size, @RequestParam(value = "sequenceNbr") String problemId) {
Page<Map<String, Object>> page = new Page<>();
......@@ -459,7 +459,7 @@ public class JGDPStatisticsController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/detail/dp")
@GetMapping(value = "/jg-use-registration-manage/detail/dp")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询---大屏使用", notes = "根据sequenceNbr查询---大屏使用")
public ResponseModel<Object> getRegistrationDetail(@RequestParam(value = "sequenceNbr") String sequenceNbr) {
return ResponseHelper.buildResponse(statisticsService.getRegistrationDetail(sequenceNbr));
......@@ -473,7 +473,7 @@ public class JGDPStatisticsController {
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/detail/equList")
@GetMapping(value = "/jg-use-registration-manage/detail/equList")
@ApiOperation(httpMethod = "GET", value = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用", notes = "根据sequenceNbr查询使用登记证对应设备列表---使用登记证详情用")
public ResponseModel<Page<JSONObject>> certificateEquList(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
......@@ -481,4 +481,23 @@ public class JGDPStatisticsController {
return ResponseHelper.buildResponse(statisticsService.certificateEquList(current, size, sequenceNbr));
}
/**
* 列表分页查询-大屏使用
*
* @param current 当前页
* @param current 每页大小
* @return
*/
@TycloudOperation(ApiLevel = UserType.AGENCY)
@PostMapping(value = "/safety-problem-tracing/page/dp")
@ApiOperation(httpMethod = "POST",value = "分页查询安全追溯问题-大屏使用", notes = "分页查询安全追溯问题-大屏使用")
public ResponseModel<Page<SafetyProblemTracingDto>> getProblemRecords(@RequestParam(value = "current") int current,
@RequestParam(value = "size") int size,
@RequestBody(required = false) SafetyProblemTracingDto problemModel) {
Page<SafetyProblemTracingDto> page = new Page<>();
page.setCurrent(current);
page.setSize(size);
return ResponseHelper.buildResponse(statisticsService.getProblemRecords(page, problemModel));
}
}
......@@ -13,6 +13,8 @@ import com.google.common.collect.Lists;
import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.biz.common.dto.CountDto;
import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
......@@ -76,6 +78,7 @@ import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadLocalRandom;
import java.util.function.Function;
import java.util.stream.Collectors;
......@@ -234,6 +237,8 @@ public class JGDPStatisticsServiceImpl {
private IdxBizJgTechParamsLiftingMapper idxBizJgTechParamsLiftingMapper;
private final DataDictionaryServiceImpl iDataDictionaryService;
public JGDPStatisticsServiceImpl(JgUseRegistrationMapper useRegistrationMapper, JgEnableDisableMapper enableDisableMapper,
JgScrapCancelMapper scrapCancelMapper, RestHighLevelClient restHighLevelClient,
TzBaseEnterpriseInfoMapper enterpriseInfoMapper, CommonMapper commonMapper,
......@@ -262,6 +267,7 @@ public class JGDPStatisticsServiceImpl {
IdxBizJgTechParamsVesselMapper idxBizJgTechParamsVesselMapper,
IdxBizJgTechParamsPipelineMapper idxBizJgTechParamsPipelineMapper,
IdxBizJgTechParamsElevatorMapper idxBizJgTechParamsElevatorMapper,
DataDictionaryServiceImpl iDataDictionaryService,
SafetyProblemTracingMapper safetyProblemTracingMapper) {
this.useRegistrationMapper = useRegistrationMapper;
this.enableDisableMapper = enableDisableMapper;
......@@ -296,6 +302,8 @@ public class JGDPStatisticsServiceImpl {
this.idxBizJgTechParamsVesselMapper = idxBizJgTechParamsVesselMapper;
this.idxBizJgTechParamsPipelineMapper = idxBizJgTechParamsPipelineMapper;
this.idxBizJgTechParamsLiftingMapper = iIdxBizJgTechParamsLiftingMapper;
this.idxBizJgTechParamsElevatorMapper = idxBizJgTechParamsElevatorMapper;
this.iDataDictionaryService = iDataDictionaryService;
}
private List<LegendDataDto> buildLegendDataList() {
......@@ -3185,4 +3193,23 @@ public class JGDPStatisticsServiceImpl {
result.setTotal(totle);
return result;
}
public Page<SafetyProblemTracingDto> getProblemRecords(Page<SafetyProblemTracingDto> page, SafetyProblemTracingDto problemModel) {
String orgCode = stCommonService.getAndSetOrgCode(problemModel.getCityCode());
if (com.baomidou.mybatisplus.core.toolkit.ObjectUtils.isEmpty(orgCode)){
return new Page<>();
}
problemModel.setGoverningBodyOrgCode(orgCode);
// 使用orgCode过滤
// 将单位类型从code转化为value
if (!ValidationUtil.isEmpty(problemModel.getPrincipalUnitType())){
Collection<DataDictionary> unitTypeList = iDataDictionaryService.list(new QueryWrapper<DataDictionary>()
.eq("type", "UNIT_TYPE_NEW")
.eq("is_delete", false)
.orderByAsc("sort_num"));
Map<String, String> unitTypeMap = unitTypeList.stream().collect(Collectors.toMap(DataDictionary::getCode, DataDictionary::getName));
problemModel.setPrincipalUnitType(unitTypeMap.getOrDefault(problemModel.getPrincipalUnitType(),null));
}
return safetyProblemTracingMapper.queryForSafetyProblemTracingPage(page, problemModel);
}
}
......@@ -49,7 +49,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/page",
"apiPath":"/statistics/dp/jg/equipment-register/page",
"params": {
"number": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -91,7 +91,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -110,7 +110,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -95,7 +95,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -114,7 +114,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -91,7 +91,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -110,7 +110,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -87,7 +87,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -106,7 +106,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -83,7 +83,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -102,7 +102,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -77,7 +77,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -96,7 +96,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -83,7 +83,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -102,7 +102,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -26,7 +26,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -59,7 +59,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/equipment-register/{record}",
"apiPath":"/statistics/dp/jg/equipment-register/{record}",
"params": {
"record": "{record}"
},
......@@ -83,7 +83,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/common/equOnJgServiceOperationRecords",
"apiPath":"/statistics/dp/jg/common/equOnJgServiceOperationRecords",
"params": {
"record": "{record}"
},
......@@ -102,7 +102,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equipId/page",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equipId/page",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/{sequenceNbr}",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/{sequenceNbr}",
"params": {
"sequenceNbr": "{sequenceNbr}"
}
......@@ -23,7 +23,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/equip/list",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/equip/list",
"params": {
"current": 1,
"size": 10,
......@@ -52,7 +52,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/safety-problem-tracing/unit/list",
"apiPath":"/statistics/dp/jg/safety-problem-tracing/unit/list",
"params": {
"current": 1,
"size": 10,
......
......@@ -8,7 +8,7 @@
"dataConfig": {
"api": {
"httpMethod":"GET",
"apiPath":"/jg/jg-use-registration-manage/detail/dp",
"apiPath":"/statistics/dp/jg/jg-use-registration-manage/detail/dp",
"params": {
"sequenceNbr": "{sequenceNbr}"
}
......
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