Merge remote-tracking branch 'origin/lingshan_master' into lingshan_master

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;
 }

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;
 }

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;
 }

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;
 
 }

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;
 }

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;
 }

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;
 }

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;
+
 }

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;
 }

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;
 }

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;
+
 }

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;
 }

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;
 }

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;
 }

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;
 }

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())) {

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<CustomerGridDao, Cu
         customerGridEntity.setLatitude(addGridFormDTO.getLatitude());
         customerGridEntity.setLongitude(addGridFormDTO.getLongitude());
         customerGridEntity.setCenterAddress(addGridFormDTO.getCenterAddress());
+        customerGridEntity.setDescription(addGridFormDTO.getDescription());
         //新增area_code,部门的area_code=所属组织的area_code
         customerGridEntity.setAreaCode(null != customerAgencyDTO && StringUtils.isNotBlank(customerAgencyDTO.getAreaCode()) ? customerAgencyDTO.getAreaCode() : StrConstant.EPMETY_STR);
 
@@ -347,6 +348,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridDTO.setContacts(editGridFormDTO.getContacts());
         customerGridDTO.setMobile(editGridFormDTO.getMobile());
         customerGridDTO.setSort(editGridFormDTO.getSort());
+        customerGridDTO.setDescription(editGridFormDTO.getDescription());
         if(StringUtils.isNotBlank(editGridFormDTO.getLongitude())){
             customerGridDTO.setLongitude(editGridFormDTO.getLongitude());
         }

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -197,7 +197,8 @@
             grid_type AS 'gridType',
             contacts AS 'contacts',
             mobile AS 'mobile',
-            sort AS gridSort
+            sort AS gridSort,
+            description as description
         FROM
             customer_grid
         WHERE
@@ -260,6 +261,9 @@
             <if test="sort != null and sort != ''">
                 sort = #{sort},
             </if>
+            <if test="description != null and description != ''">
+                description = #{description},
+            </if>
             UPDATED_TIME=NOW()
         where
             id = #{id}

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<String, Integer> categoryCount;
+    private Double yiJieAnRate;
 
 }

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<EventRateResultDTO.Category> category;
+
+    @Data
+    public static class Category {
+        /**
+         * 分类编码
+         */
+        private String code;
+
+        /**
+         * 分类名称
+         */
+        private String name;
+
+        /**
+         * 分类数量
+         */
+        private Integer value;
+    }
 
 }

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

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<IcEventDao, IcEventEntit
 
     @Override
     public EventRateResultDTO getEventRate(String orgId, String orgType) {
-        return baseDao.getEventRate(getOrgPath(orgId, orgType));
+        EventRateResultDTO erDto = baseDao.getEventRate(getOrgPath(orgId, orgType));//事件总量和灯数量,占比
+        List<Map<String, Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量
+        Map<String, Integer> temp = new HashMap<>();
+        if (null != dataMap && dataMap.size() > 0) {
+            for (Map<String, Integer> map : dataMap) {
+                temp.put(String.valueOf(map.get("code")), Integer.valueOf(String.valueOf(map.get("total"))));
+            }
         }
-
-    @Override
-    public EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType) {
-        EventAnalysisResultDTO dto = baseDao.getEventAnalysis(getOrgPath(orgId,orgType));
         Result<Map<String, String>> categoryMap = govIssueOpenFeignClient.getCategoryMap(EpmetRequestHolder.getLoginUserCustomerId());
         if (null != categoryMap && categoryMap.getData().size() > 0) {
-            List<Map<String,Integer>> dataMap = baseDao.getAnalysis(getOrgPath(orgId,orgType));
+            Map<String, String> map = categoryMap.getData();
-            if (null != dataMap && dataMap.size() > 0) {
+            List<EventRateResultDTO.Category> categoryList = new ArrayList<>();
-                Map<String, Integer> merged = new HashMap<>();
+            map.keySet().forEach(key -> {
-                dataMap.forEach(merged::putAll);
+                EventRateResultDTO.Category category = new EventRateResultDTO.Category();
-                dto.setCategoryCount(merged);
+                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) {
+        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;
     }