From 47a4eaba095726f1610b606527c871333e4cf46b Mon Sep 17 00:00:00 2001
From: xusd <hugeinfo123>
Date: Sun, 22 Sep 2024 22:30:34 +0800
Subject: [PATCH] 调整静态文件读取位置
---
dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 48 insertions(+), 47 deletions(-)
diff --git a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
index e43b8c0..4ff5c88 100644
--- a/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
+++ b/dyh-service/dyh-mediate/src/main/java/cn/huge/module/cases/service/CaseInfoService.java
@@ -932,18 +932,18 @@
public CaseStatisticsBaseDTO statistics(Map<String, Object> terms) throws IOException {
//基础数据统计
CaseStatisticsBaseDTO caseStatisticsBaseDTO = mapper.statisticsBase(terms);
- Integer baseTotalNum = dellNull(caseStatisticsBaseDTO.getResolveNum()) + dellNull(caseStatisticsBaseDTO.getUnResolveNum())+ dellNull(caseStatisticsBaseDTO.getResolveingNum());
- caseStatisticsBaseDTO.setResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveNum()*100, baseTotalNum,1));
- caseStatisticsBaseDTO.setUnResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getUnResolveNum()*100, baseTotalNum,1));
- caseStatisticsBaseDTO.setResolveingRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveingNum()*100, baseTotalNum,1));
+ Integer baseTotalNum = dellNull(caseStatisticsBaseDTO.getResolveNum()) + dellNull(caseStatisticsBaseDTO.getUnResolveNum()) + dellNull(caseStatisticsBaseDTO.getResolveingNum());
+ caseStatisticsBaseDTO.setResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveNum() * 100, baseTotalNum, 1));
+ caseStatisticsBaseDTO.setUnResolveRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getUnResolveNum() * 100, baseTotalNum, 1));
+ caseStatisticsBaseDTO.setResolveingRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getResolveingNum() * 100, baseTotalNum, 1));
Integer levelTotalNum = caseStatisticsBaseDTO.getOneLevelNum() + caseStatisticsBaseDTO.getTwoLevelNum() + caseStatisticsBaseDTO.getThreeLevelNum();
- caseStatisticsBaseDTO.setOneLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getOneLevelNum()*100, levelTotalNum,1));
- caseStatisticsBaseDTO.setTwoLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getTwoLevelNum()*100, levelTotalNum,1));
- caseStatisticsBaseDTO.setThreeLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getThreeLevelNum()*100, levelTotalNum,1));
+ caseStatisticsBaseDTO.setOneLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getOneLevelNum() * 100, levelTotalNum, 1));
+ caseStatisticsBaseDTO.setTwoLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getTwoLevelNum() * 100, levelTotalNum, 1));
+ caseStatisticsBaseDTO.setThreeLevelRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsBaseDTO.getThreeLevelNum() * 100, levelTotalNum, 1));
//区域数据统计
- terms.put("isArea","1");
+ terms.put("isArea", "1");
List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS = mapper.statisticsArea(terms);
- if(ObjectUtils.isEmpty(caseStatisticsAreaDTOS)){
+ if (ObjectUtils.isEmpty(caseStatisticsAreaDTOS)) {
caseStatisticsAreaDTOS = new ArrayList<>();
}
CaseStatisticsAreaDTO allArea = new CaseStatisticsAreaDTO();
@@ -959,9 +959,9 @@
}
caseStatisticsAreaDTOS.add(allArea);
List<CaseAreaDTO> queArea = listAreaByType(terms.get("areaType"), terms.get("queArea"));
- log.info("listAreaByType {}",JSON.toJSONString(queArea));
+ log.info("listAreaByType {}", JSON.toJSONString(queArea));
for (CaseAreaDTO caseAreaDTO : queArea) {
- if(!areaCodeList.contains(caseAreaDTO.getAreaCode())){
+ if (!areaCodeList.contains(caseAreaDTO.getAreaCode())) {
CaseStatisticsAreaDTO areaChild = new CaseStatisticsAreaDTO();
areaChild.setAreaCode(caseAreaDTO.getAreaCode());
areaChild.setAreaName(caseAreaDTO.getAreaName());
@@ -973,14 +973,14 @@
}
}
- if(ObjectUtils.isNotEmpty(caseStatisticsAreaDTOS)){
+ if (ObjectUtils.isNotEmpty(caseStatisticsAreaDTOS)) {
sortArea(caseStatisticsAreaDTOS);
}
caseStatisticsBaseDTO.setAreaList(caseStatisticsAreaDTOS);
terms.remove("isArea");
//纠纷类型统计
List<CaseStatisticsTypeDTO> caseStatisticsTypeDTOS = mapper.statisticsType(terms);
- if(ObjectUtils.isNotEmpty(caseStatisticsTypeDTOS)){
+ if (ObjectUtils.isNotEmpty(caseStatisticsTypeDTOS)) {
sortType(caseStatisticsTypeDTOS);
}
Integer typeTotalNum = 0;
@@ -989,35 +989,35 @@
List<CaseStatisticsTypeDTO> typeList = new ArrayList<>();
for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : caseStatisticsTypeDTOS) {
typeTotalNum = typeTotalNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- if(i > 5){
+ if (i > 5) {
otherCaseNum = otherCaseNum + dellNull(caseStatisticsTypeDTO.getCaseNum());
- }else{
+ } else {
typeList.add(caseStatisticsTypeDTO);
}
i++;
}
for (CaseStatisticsTypeDTO caseStatisticsTypeDTO : typeList) {
- caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum()*100, typeTotalNum,1));
+ caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
}
CaseStatisticsTypeDTO caseStatisticsTypeDTO = new CaseStatisticsTypeDTO();
caseStatisticsTypeDTO.setCaseTypeName("其他");
caseStatisticsTypeDTO.setCaseNum(otherCaseNum);
- caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum()*100, typeTotalNum,1));
+ caseStatisticsTypeDTO.setCaseRate(BigDecimalUtil.integerDivideDelZero(caseStatisticsTypeDTO.getCaseNum() * 100, typeTotalNum, 1));
typeList.add(caseStatisticsTypeDTO);
caseStatisticsBaseDTO.setTypeList(typeList);
//事项来源
- terms.put("canal",CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
+ terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_1.getIndex());
CaseStatisticsSourceDTO oneSource = mapper.statisticsSource(terms);
oneSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_1.getDes());
- terms.put("canal",CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
+ terms.put("canal", CaseBaseConstsEnum.CASE_CANAL_2.getIndex());
CaseStatisticsSourceDTO twoSource = mapper.statisticsSource(terms);
twoSource.setCanalName(CaseBaseConstsEnum.CASE_CANAL_2.getDes());
Integer sourceTotalNum = dellNull(oneSource.getCaseNum()) + dellNull(oneSource.getCaseNum());
- oneSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(oneSource.getCaseNum()*100, sourceTotalNum,1));
- oneSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(oneSource.getResolveNum()*100, oneSource.getCaseNum(),1));
- twoSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(twoSource.getCaseNum()*100, sourceTotalNum,1));
- twoSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(twoSource.getResolveNum()*100, twoSource.getCaseNum(),1));
+ oneSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(oneSource.getCaseNum() * 100, sourceTotalNum, 1));
+ oneSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(oneSource.getResolveNum() * 100, oneSource.getCaseNum(), 1));
+ twoSource.setCaseRate(BigDecimalUtil.integerDivideDelZero(twoSource.getCaseNum() * 100, sourceTotalNum, 1));
+ twoSource.setResolveRate(BigDecimalUtil.integerDivideDelZero(twoSource.getResolveNum() * 100, twoSource.getCaseNum(), 1));
CaseStatisticsSourceDTO threeSource = new CaseStatisticsSourceDTO();
threeSource.setCanalName("自行排查");
@@ -1036,46 +1036,47 @@
Sort sort = Sort.by(Sort.Direction.DESC, "a.create_time");
PageRequest pageRequest = PageRequest.of(0, 5, sort);
Page<CasePageDTO> casePageDTOS = pageQueryAll(pageRequest, terms);
- if(ObjectUtils.isNotEmpty(casePageDTOS.getContent())){
+ if (ObjectUtils.isNotEmpty(casePageDTOS.getContent())) {
caseStatisticsBaseDTO.setCaseList(casePageDTOS.getContent());
- }else{
+ } else {
caseStatisticsBaseDTO.setCaseList(new ArrayList<>());
}
return caseStatisticsBaseDTO;
}
- public List<CaseStatisticsTypeDTO> sortType(List<CaseStatisticsTypeDTO> caseStatisticsTypeDTOS){
- caseStatisticsTypeDTOS.sort((o1, o2)->{
+ public List<CaseStatisticsTypeDTO> sortType(List<CaseStatisticsTypeDTO> caseStatisticsTypeDTOS) {
+ caseStatisticsTypeDTOS.sort((o1, o2) -> {
Integer totalScore1 = o1.getCaseNum();
Integer totalScore2 = o2.getCaseNum();
- if(totalScore1 < totalScore2) {
+ if (totalScore1 < totalScore2) {
return 1;
- }else if (totalScore1.equals(totalScore2)){
+ } else if (totalScore1.equals(totalScore2)) {
return 0;
- }else{
+ } else {
return -1;
}
});
return caseStatisticsTypeDTOS;
}
- public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS){
- caseStatisticsAreaDTOS.sort((o1, o2)->{
+ public List<CaseStatisticsAreaDTO> sortArea(List<CaseStatisticsAreaDTO> caseStatisticsAreaDTOS) {
+ caseStatisticsAreaDTOS.sort((o1, o2) -> {
+ log.info("xsd:{},{}",o1,o2);
Integer totalScore1 = Integer.valueOf(o1.getAreaCode());
Integer totalScore2 = Integer.valueOf(o2.getAreaCode());
- if(totalScore1 > totalScore2) {
+ if (totalScore1 > totalScore2) {
return 1;
- }else if (totalScore1.equals(totalScore2)){
+ } else if (totalScore1.equals(totalScore2)) {
return 0;
- }else{
+ } else {
return -1;
}
});
return caseStatisticsAreaDTOS;
}
- public Integer dellNull(Integer number){
- if(ObjectUtils.isEmpty(number)){
+ public Integer dellNull(Integer number) {
+ if (ObjectUtils.isEmpty(number)) {
return 0;
}
return number;
@@ -1083,12 +1084,12 @@
/**
* 根据json文件获取区域信息
- * */
+ */
public CaseAreaDTO getArea() throws IOException {
Class<?> clazz = CaseAreaDTO.class;
- String path = clazz.getProtectionDomain().getCodeSource().getLocation().getPath();
ObjectMapper mapper = new ObjectMapper();
- File file = new File(path+ "cn"+File.separator+"huge"+File.separator+"module"+File.separator+"cases"+File.separator+"domain"+File.separator+"json"+File.separator+"Area.json");
+
+ File file = new File("area/Area.json");
CaseAreaDTO obj = mapper.readValue(file, CaseAreaDTO.class);
return obj;
}
@@ -1096,19 +1097,19 @@
/**
* 根据不同的等级获取不同区域子集合
+ *
* @param areaType 1-市级 2-区
- * */
- public List<CaseAreaDTO> listAreaByType(Object areaType,Object areaCode) throws IOException {
- log.info("listAreaByType {},{}",areaType,areaCode);
+ */
+ public List<CaseAreaDTO> listAreaByType(Object areaType, Object areaCode) throws IOException {
+ log.info("listAreaByType {},{}", areaType, areaCode);
CaseAreaDTO area = getArea();
- log.info("listAreaByType area {}",JSON.toJSONString(area));
- if(ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")){
+ if (ObjectUtils.isEmpty(areaType) || areaType.equals("") || areaType.equals("1")) {
return area.getChildren();
}
- if(areaType.equals("2")){
+ if (areaType.equals("2")) {
List<CaseAreaDTO> children = area.getChildren();
for (CaseAreaDTO child : children) {
- if(child.getAreaCode().equals(areaCode)){
+ if (child.getAreaCode().equals(areaCode)) {
return child.getChildren();
}
}
--
Gitblit v1.8.0