diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java index 9184969e62..a01181abda 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/CustomerGridDTO.java @@ -160,4 +160,6 @@ public class CustomerGridDTO implements Serializable { * 网格排序 */ private Integer sort; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java index ec7668c075..cf86d445ba 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyFormDTO.java @@ -102,4 +102,6 @@ public class AddAgencyFormDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index 0cbb5c1ab5..4cbc7edeee 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -118,4 +118,6 @@ public class AddAgencyV2FormDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java index 786980aa47..fb2a7b01d5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java @@ -77,5 +77,6 @@ public class AddDepartmentFormDTO implements Serializable { */ private String deptType; + private String description; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java index 9eab6ce157..a01ea0ad50 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddGridFormDTO.java @@ -69,4 +69,6 @@ public class AddGridFormDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddRootAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddRootAgencyFormDTO.java index d4fffc6ef3..babe66204e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddRootAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddRootAgencyFormDTO.java @@ -87,4 +87,5 @@ public class AddRootAgencyFormDTO implements Serializable { @Length(max=30,message = "区县级机关名称不能超过30个字", groups = AddRootAgencyGroup.class) private String district; + private String description; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index 57e535ad25..26038bb8c5 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -110,4 +110,9 @@ public class EditAgencyFormDTO implements Serializable { private String centerAddress; private String customerId; + + /** + * 简介 + */ + private String description; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java index 2f40bfa6e1..54590e5360 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditDepartmentFormDTO.java @@ -69,4 +69,6 @@ public class EditDepartmentFormDTO implements Serializable { */ private String mobile; + private String description; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java index 0159e3d4b0..8f208a924c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java @@ -83,4 +83,6 @@ public class EditGridFormDTO implements Serializable { * 网格排序 */ private Integer sort; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index 99028d23bb..1b389b746e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -133,4 +133,6 @@ public class AgencysResultDTO implements Serializable { * 中心点位位置 */ private String centerAddress; + + private String description; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java index c04e965569..08a5da31f8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/DepartmentDetailResultDTO.java @@ -80,4 +80,6 @@ public class DepartmentDetailResultDTO implements Serializable { */ private String deptType = ""; + private String description; + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java index 22d4951210..41e815e8ab 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/GridDetailResultDTO.java @@ -96,4 +96,5 @@ public class GridDetailResultDTO implements Serializable { */ private Integer gridSort = 0; + private String description; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index fda8070609..4b09225047 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -143,4 +143,6 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { * 联系电话 */ private String mobile; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java index e6a3dbf55f..e51f51ee1a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerDepartmentEntity.java @@ -87,4 +87,5 @@ public class CustomerDepartmentEntity extends BaseEpmetEntity { */ private String deptType; + private String description; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java index 70f73c89da..555a877b04 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerGridEntity.java @@ -114,4 +114,6 @@ public class CustomerGridEntity extends BaseEpmetEntity { * 弃用：1；正常使用：0 */ private Integer abandonFlag; + + private String description; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 9b7ee4e3ba..2e1637068a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -125,6 +125,7 @@ public class AgencyServiceImpl implements AgencyService { CustomerAgencyEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerAgencyEntity.class); entity.setOrganizationName(formDTO.getAgencyName()); entity.setTotalUser(NumConstant.ZERO); + entity.setDescription(formDTO.getDescription()); //1:查询上级机关信息 CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getParentAgencyId()); if (null == parentEntity) { @@ -167,6 +168,7 @@ public class AgencyServiceImpl implements AgencyService { originalEntity.setCode(formDTO.getCode()); originalEntity.setContacts(formDTO.getContacts()); originalEntity.setMobile(formDTO.getMobile()); + originalEntity.setDescription(formDTO.getDescription()); //利用mybatis 拦截器填充值 originalEntity.setUpdatedTime(null); originalEntity.setUpdatedBy(null); @@ -592,6 +594,7 @@ public class AgencyServiceImpl implements AgencyService { entity.setPid("0"); entity.setTotalUser(0); entity.setCustomerId(form.getCustomerId()); + entity.setDescription(form.getDescription()); customerAgencyDao.insert(entity); return entity.getId(); @@ -982,6 +985,7 @@ public class AgencyServiceImpl implements AgencyService { insertEntity.setOrganizationName(formDTO.getAgencyName()); insertEntity.setTotalUser(NumConstant.ZERO); insertEntity.setPid(parent.getId()); + insertEntity.setDescription(formDTO.getDescription()); insertEntity.setCustomerId(parent.getCustomerId()); insertEntity.setParentAreaCode(parent.getAreaCode()); if (StringUtils.isBlank(parent.getPid()) || NumConstant.ZERO_STR.equals(parent.getPid())) { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index e165811212..25aa910c2c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -301,6 +301,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl sort = #{sort}, + + description = #{description}, + UPDATED_TIME=NOW() where id = #{id} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index 80f8b2f938..906e984e35 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.Map; /** * @author yan Lu @@ -25,11 +24,21 @@ public class EventAnalysisResultDTO implements Serializable { /** * 网格化平台数量 */ - private Integer wangGeHua; + + /** + * 红灯占比 + */ + private Double daiChuLiRate; + + /** + * 黄灯占比 + */ + private Double chuLiZhongRate; + /** - * 分类统计数量 + * 蓝灯占比 */ - private Map categoryCount; + private Double yiJieAnRate; } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java index a931447009..bea7f93e10 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventRateResultDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @author yan Lu @@ -24,26 +25,53 @@ public class EventRateResultDTO implements Serializable { * 红灯数量 */ private Integer hongDeng; - /** - * 红灯占比 - */ - private Double hongDengRate; + /** * 黄灯数量 */ private Integer huangDeng; - /** - * 黄灯占比 - */ - private Double huangDengRate; + /** * 蓝灯数量 */ private Integer lanDeng; + + /** + * 红灯占比 + */ + private Double hongDengRate; + + /** + * 黄灯占比 + */ + private Double huangDengRate; + /** * 蓝灯占比 */ private Double lanDengRate; + /** + * 分类统计数量 + */ + private List category; + + @Data + public static class Category { + /** + * 分类编码 + */ + private String code; + + /** + * 分类名称 + */ + private String name; + + /** + * 分类数量 + */ + private Integer value; + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index 60e5b7b12c..dd31462f70 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -560,7 +560,7 @@ public class IcEventController { } /** - * @description 获取事件数量和占比率 + * @description 获取事件数量和分类数量 * @param * @param null * @return Result * @throws diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 73648097d0..0b2fbb6e0f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1925,21 +1925,43 @@ public class IcEventServiceImpl extends BaseServiceImpl> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 + Map temp = new HashMap<>(); + if (null != dataMap && dataMap.size() > 0) { + for (Map map : dataMap) { + temp.put(String.valueOf(map.get("code")), Integer.valueOf(String.valueOf(map.get("total")))); + } + } + Result> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId()); + if (null != categoryMap && categoryMap.getData().size() > 0) { + Map map = categoryMap.getData(); + List categoryList = new ArrayList<>(); + map.keySet().forEach(key -> { + EventRateResultDTO.Category category = new EventRateResultDTO.Category(); + if (null != temp.get(key)) { + category.setCode(key); + category.setName(map.get(key)); + category.setValue(Integer.valueOf(temp.get(key))); + } else { + category.setCode(key); + category.setName(map.get(key)); + category.setValue(0); + } + categoryList.add(category); + }); + erDto.setCategory(categoryList); + } + return erDto; } @Override public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType) { - EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId,orgType)); - Result> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId()); - if (null != categoryMap && categoryMap.getData().size() > 0) { - List> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType)); - if (null != dataMap && dataMap.size() > 0) { - Map merged = new HashMap<>(); - dataMap.forEach(merged::putAll); - dto.setCategoryCount(merged); - } - } + EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType));//事件总量和灯数量,占比 + EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId, orgType)); + dto.setDaiChuLiRate(erDto.getHongDengRate() == null ? 0 : erDto.getHongDengRate()); + dto.setChuLiZhongRate(erDto.getHuangDengRate() == null ? 0 : erDto.getHuangDengRate()); + dto.setYiJieAnRate(erDto.getLanDengRate() == null ? 0 : erDto.getLanDengRate()); return dto; }