Commit e73ac1ba authored by 刘林's avatar 刘林

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into…

Merge remote-tracking branch 'origin/develop_tzs_register_to_0715' into develop_tzs_register_to_0715
parents 4ad5e27b 905b5cc4
......@@ -88,6 +88,4 @@ public class DPFilterParamForDetailDto {
*/
private String anomalyType;
private String cylinderVariety;
}
......@@ -8,7 +8,6 @@ import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto;
import com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamForDetailDto;
import com.yeejoin.amos.boot.module.statistcs.biz.service.impl.CylinderDPStatisticsServiceImpl;
import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
import io.swagger.annotations.Api;
......@@ -118,7 +117,7 @@ public class CylinderDPStatisticsController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "GET", value = "区域安全指数排名下钻树节点")
@GetMapping(value = "/securityIndexSubTree")
public ResponseModel<List<EquipmentCategoryDto>> securityIndexSubTree() {
public ResponseModel<SubTreeDto> securityIndexSubTree() {
return ResponseHelper.buildResponse(dpStatisticsService.securityIndexSubTree());
}
......@@ -174,7 +173,7 @@ public class CylinderDPStatisticsController extends BaseController {
@TycloudOperation(ApiLevel = UserType.AGENCY)
@ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻")
@ApiOperation(httpMethod = "POST", value = "区域气站对接率下钻列表")
@PostMapping(value = "/getStationRateSubPage")
public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> getStationRateSubPage(@RequestBody DPFilterParamForDetailDto dpFilterParamForDetailDto) {
return ResponseHelper.buildResponse(dpStatisticsService.getStationRateSubPage(dpFilterParamForDetailDto));
......
......@@ -16,7 +16,6 @@ import com.yeejoin.amos.boot.module.statistics.api.dto.SubTreeDto;
import com.yeejoin.amos.boot.module.statistics.api.enums.AnomalyTypeEnum;
import com.yeejoin.amos.boot.module.statistics.api.mapper.AQZSDPStatisticsMapper;
import com.yeejoin.amos.boot.module.statistics.api.mapper.CylinderStatisticsMapper;
import com.yeejoin.amos.boot.module.ymt.api.dto.EquipmentCategoryDto;
import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.ESCylinderFillingRecordDto;
import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
......@@ -468,13 +467,11 @@ public class CylinderDPStatisticsServiceImpl {
return result;
}
public List<EquipmentCategoryDto> securityIndexSubTree() {
List<EquipmentCategoryDto> equipmentCategory = new ArrayList<>();
EquipmentCategoryDto equipmentCategoryDto = new EquipmentCategoryDto();
equipmentCategoryDto.setCode(CylinderTypeEnum.CYLINDER.getCode());
equipmentCategoryDto.setName("气" + CylinderTypeEnum.CYLINDER.getName());
equipmentCategory.add(equipmentCategoryDto);
return equipmentCategory;
public SubTreeDto securityIndexSubTree() {
SubTreeDto subTreeDto = new SubTreeDto();
subTreeDto.setTitle(CylinderTypeEnum.CYLINDER.getCode());
subTreeDto.setValue("气" + CylinderTypeEnum.CYLINDER.getName());
return subTreeDto;
}
public Map<String, Object> securityIndexSubChart(DPFilterParamDto dpFilterParamDto) {
......@@ -524,7 +521,7 @@ public class CylinderDPStatisticsServiceImpl {
startTime = dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate();
endTime = dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate();
}
String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getCylinderVariety());
String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getTreeValue());
regionModels.forEach(r -> {
long fillingQuantity = cylinderInfoMapper.queryFillingRecordByOrgCode(r.getRegionCode().toString(), startTime, endTime).stream().map(e->e.getFillingQuantity()).collect(Collectors.toList()).stream().count();
......@@ -585,12 +582,21 @@ public class CylinderDPStatisticsServiceImpl {
boolMust.must(query);
}
//匹配气瓶类型(0:正常,1:异常)
if (!org.springframework.util.ObjectUtils.isEmpty(dpFilterParamForDetailDto.getCylinderVariety())) {
//匹配气瓶类型
if (ObjectUtils.isEmpty(dpFilterParamForDetailDto.getTreeValue()) && !CylinderTypeEnum.CYLINDER.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
flag = false;
BoolQueryBuilder query = QueryBuilders.boolQuery();
String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getCylinderVariety());
// 是车用气瓶,进行in查询(特种气瓶包含以下三个)
if (CylinderTypeEnum.SPECIAL_CYLINDER.getCode().equals(dpFilterParamForDetailDto.getTreeValue())) {
Collection<String> collections = new ArrayList<>();
collections.add("缠绕气瓶");
collections.add("绝热气瓶");
collections.add("内装填料气瓶");
query.must(QueryBuilders.termsQuery("cylinderVarietyName", collections.toArray()));
} else {
String cylinderVarietyName = CylinderTypeEnum.of(dpFilterParamForDetailDto.getTreeValue());
query.must(QueryBuilders.wildcardQuery("cylinderVarietyName", "*" + cylinderVarietyName + "*"));
}
boolMust.must(query);
}
......
......@@ -75,6 +75,7 @@
],
"content": {
"keyinfo": {
"title": "{useUnit}",
"status": [],
"qrcode": {
"title": "监管码",
......
......@@ -134,23 +134,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -138,46 +138,49 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams_default": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_2300_true": [
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"keyParams_2300_true": [
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_2300_false": [
{ "key": "EQU_TYPE", "label": "气瓶品种" },
{ "key": "PRODUCT_NAME", "label": "产品名称" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" },
{ "key": "CAR_NUMBER", "label": "车牌号" },
{ "key": "IDENTIFICATION_CODE", "label": "车辆VIN码" },
{ "key": "EQU_TYPE", "label": "气瓶品种" },
{ "key": "PRODUCT_NAME", "label": "产品名称" },
{ "key": "GAS_NUM", "label": "气瓶数量" },
{ "key": "FILLING_MEDIUM", "label": "充装介质" },
{ "key": "NEXT_INSPECTION_DATE", "label": "下次检验日期" }
{ "key": "FILLING_MEDIUM", "label": "充装介质" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -134,25 +134,27 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "ME_UNIT_NAME", "label": "维保单位名称" },
{ "key": "INFORM_END", "label": "维保备案有效期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -130,23 +130,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -126,23 +126,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -120,23 +120,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -126,31 +126,34 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams_default": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"keyParams_8300": [
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"keyParams_8300": [
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
],
"infoRecords": {
......
......@@ -126,23 +126,25 @@
],
"content": {
"keyinfo": {
"title": "{PRODUCT_NAME}",
"status": [],
"qrcode": {
"title": "监管码",
"problem": []
},
"keyParams": [
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "EQU_TYPE", "label": "设备种类", "source": "param" },
{ "key": "EQU_LIST", "label": "设备类别", "source": "param" },
{ "key": "EQU_CATEGORY", "label": "设备品种", "source": "param" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" },
{ "key": "PRODUCT_NAME", "label": "设备名称", "source": "param" },
{ "key": "PRODUCE_UNIT_CREDIT_CODE", "label": "设备代码" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" }
{ "key": "USE_UNIT_NAME", "label": "使用单位名称" },
{ "key": "ADDRESS", "label": "设备使用地点" },
{ "key": "USE_ORG_CODE", "label": "使用登记证编号" },
{ "key": "ORG_BRANCH_NAME", "label": "登记机关" },
{ "key": "REC_DATE", "label": "登记日期" },
{ "key": "NEXT_INSPECT_DATE", "label": "下一次检验日期" },
{ "key": "USE_INNER_CODE", "label": "单位内编号" }
],
"infoRecords": {
"title": "监管记录",
......
......@@ -76,6 +76,7 @@
],
"content": {
"keyinfo": {
"title": "{principalUnit}",
"keyParams": [
{ "key": "sourceType", "label": "隐患主体类型" },
{ "key": "problemType", "label": "隐患类型" },
......
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