项目列表

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonAggFeignClient.java

@@ -2,11 +2,14 @@ package com.epmet.commons.tools.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.fallback.CommonAggFeignClientFallBackFactory;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 
 /**
@@ -24,4 +27,22 @@ public interface CommonAggFeignClient {
      */
     @PostMapping("/data/aggregator/epmetuser/getStaffInfo/{staffId}")
     Result<CustomerStaffInfoCache> getStaffInfo(@PathVariable("staffId") String staffId);
+
+    /**
+     * @Description  查询组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("/data/aggregator/org/agency")
+    Result<AgencyInfoCache> getAgencyInfo(@RequestParam("agencyId")String agencyId);
+
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 2:54 下午
+     */
+    @PostMapping("/data/aggregator/org/grid")
+    Result<GridInfoCache> getGridInfo(@RequestParam("gridId")String gridId);
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonAggFeignClientFallback.java

@@ -2,7 +2,9 @@ package com.epmet.commons.tools.feign.fallback;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.feign.CommonAggFeignClient;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import org.springframework.stereotype.Component;
@@ -20,4 +22,14 @@ public class CommonAggFeignClientFallback implements CommonAggFeignClient {
     public Result<CustomerStaffInfoCache> getStaffInfo(String staffId) {
         return  ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getStaffInfo", staffId);
     }
+
+    @Override
+    public Result<AgencyInfoCache> getAgencyInfo(String agencyId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getAgencyInfo", agencyId);
+    }
+
+    @Override
+    public Result<GridInfoCache> getGridInfo(String gridId) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "getGridInfo", gridId);
+    }
 }

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerOrgRedis.java

@@ -0,0 +1,93 @@
+package com.epmet.commons.tools.redis.common;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.feign.CommonAggFeignClient;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.redis.common.bean.*;
+import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.PostConstruct;
+import java.util.Map;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:29 下午
+ * @DESC
+ */
+@Slf4j
+@Component
+public class CustomerOrgRedis {
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    private CommonAggFeignClient commonAggFeignClient;
+
+    private static CustomerOrgRedis customerOrgRedis;
+    private static final String ROLE_MAP_KEY = "roleMap";
+
+    @PostConstruct
+    public void init() {
+        customerOrgRedis = this;
+        customerOrgRedis.redisUtils = this.redisUtils;
+        customerOrgRedis.commonAggFeignClient = this.commonAggFeignClient;
+    }
+
+    /**
+     * @Description  获取网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 3:12 下午
+     */
+    public static GridInfoCache getGridInfo(String gridId){
+        String key = RedisKeys.getGridInfoKey(gridId);
+        Map<String, Object> grid = customerOrgRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(grid)) {
+            return ConvertUtils.mapToEntity(grid, GridInfoCache.class);
+        }
+        Result<GridInfoCache> gridInfoResult = customerOrgRedis.commonAggFeignClient.getGridInfo(gridId);
+        if (!gridInfoResult.success()){
+            throw new RenException("查询网格信息失败...");
+        }
+        if (null == gridInfoResult.getData()){
+            throw new RenException("没有此网格信息...");
+        }
+        Map<String, Object> map = BeanUtil.beanToMap(gridInfoResult.getData(), false, true);
+        customerOrgRedis.redisUtils.hMSet(key, map);
+        return gridInfoResult.getData();
+    }
+
+    /**
+     * @Description  获取组织信息
+     * @param agencyId
+     * @author zxc
+     * @date 2021/11/5 3:12 下午
+     */
+    public static AgencyInfoCache getAgencyInfo(String agencyId){
+        String key = RedisKeys.getAgencyByIdKey(agencyId);
+        Map<String, Object> agency = customerOrgRedis.redisUtils.hGetAll(key);
+        if (!CollectionUtils.isEmpty(agency)) {
+            return ConvertUtils.mapToEntity(agency, AgencyInfoCache.class);
+        }
+        Result<AgencyInfoCache> agencyInfoResult = customerOrgRedis.commonAggFeignClient.getAgencyInfo(agencyId);
+        if (!agencyInfoResult.success()){
+            throw new RenException("查询组织信息失败...");
+        }
+        if (null == agencyInfoResult.getData()){
+            throw new RenException("没有此组织信息...");
+        }
+        Map<String, Object> map = BeanUtil.beanToMap(agencyInfoResult.getData(), false, true);
+        customerOrgRedis.redisUtils.hMSet(key, map);
+        return agencyInfoResult.getData();
+    }
+
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/AgencyInfoCache.java

@@ -0,0 +1,126 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:45 下午
+ * @DESC
+ */
+@Data
+public class AgencyInfoCache implements Serializable {
+
+    private static final long serialVersionUID = -1332373159954084159L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 上级组织机构ID
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织机构ID(以英文:隔开)
+     */
+    private String pids;
+
+    /**
+     * 所有上级名称,以-连接
+     */
+    private String allParentName;
+
+    /**
+     * 组织名称
+     */
+    private String organizationName;
+
+    /**
+     * 机关级别（社区级：community，
+     乡（镇、街道）级:street,
+     区县级: district,
+     市级: city
+     省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String level;
+
+    /**
+     * 地区编码
+     */
+    private String areaCode;
+
+    /**
+     * 删除标识
+     */
+    private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 省
+     */
+    private String province;
+
+    /**
+     * 市
+     */
+    private String city;
+
+    /**
+     * 区县
+     */
+    private String district;
+
+    /**
+     * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701
+     */
+    private String parentAreaCode;
+
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 社区
+     */
+    private String community;
+}

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/GridInfoCache.java

@@ -0,0 +1,111 @@
+package com.epmet.commons.tools.redis.common.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/11/5 2:24 下午
+ * @DESC
+ */
+@Data
+public class GridInfoCache implements Serializable {
+
+    private static final long serialVersionUID = -6159429894486235267L;
+
+
+    /**
+     * ID 唯一标识
+     */
+    private String id;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 网格名称
+     */
+    private String gridName;
+
+    /** 组织-网格 */
+    private String gridNamePath;
+
+    /**
+     * 中心位置经度
+     */
+    private String longitude;
+
+    /**
+     * 中心位置纬度
+     */
+    private String latitude;
+
+    /**
+     * 所属地区码（所属组织地区码）
+     */
+    private String areaCode;
+
+    /**
+     * 删除标识:0.未删除 1.已删除
+     */
+    private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+    private Integer revision;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updatedTime;
+
+    /**
+     * 管辖区域
+     */
+    private String manageDistrict;
+
+    /**
+     * 当前网格总人数
+     */
+    private Integer totalUser;
+
+    /**
+     * 所属组织机构ID（customer_organization.id）
+     */
+    private String pid;
+
+    /**
+     * 所有上级组织ID
+     */
+    private String pids;
+
+    /**
+     * 所属组织机构名
+     */
+    private String agencyName;
+
+    /**
+     * 所有上级组织名
+     */
+    private String allParentName;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -197,8 +197,8 @@ public class GovOrgController {
      * @date 2021/11/5 2:54 下午
      */
     @PostMapping("grid")
-    public Result<CustomerGridEntity> getGridInfo(@RequestParam("gridId")String gridId){
+    public Result<CustomerGridDTO> getGridInfo(@RequestParam("gridId")String gridId){
-        return new Result<CustomerGridEntity>().ok(govOrgService.getGridInfo(gridId));
+        return new Result<CustomerGridDTO>().ok(govOrgService.getGridInfo(gridId));
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java

@@ -76,4 +76,12 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      **/
     List<StaffAgencyGridListResultDTO.GridResultDTO> getGridListByAgencyId(@Param("agencyId") String agencyId);
 
+    /**
+     * @Description  查询网格信息
+     * @param gridId
+     * @author zxc
+     * @date 2021/11/5 3:39 下午
+     */
+    CustomerGridDTO getGridInfo(@Param("gridId") String gridId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -171,5 +171,5 @@ public interface GovOrgService {
      * @author zxc
      * @date 2021/11/5 2:57 下午
      */
-    CustomerGridEntity getGridInfo(String gridId);
+    CustomerGridDTO getGridInfo(String gridId);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -551,8 +551,8 @@ public class GovOrgServiceImpl implements GovOrgService {
      * @date 2021/11/5 2:57 下午
      */
     @Override
-    public CustomerGridEntity getGridInfo(String gridId) {
+    public CustomerGridDTO getGridInfo(String gridId) {
-        return customerGridDao.selectById(gridId);
+        return customerGridDao.getGridInfo(gridId);
     }
 
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml

@@ -163,4 +163,16 @@
         AND cg.pid = #{agencyId}
     </select>
 
+    <!-- 查询网格信息 -->
+    <select id="getGridInfo" resultType="com.epmet.dataaggre.dto.govorg.CustomerGridDTO">
+        SELECT
+            ca.ORGANIZATION_NAME AS agencyName,
+            CONCAT(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME) AS allParentName,
+            cg.*
+        FROM customer_grid cg
+        LEFT JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.DEL_FLAG = '0')
+        WHERE cg.DEL_FLAG = '0'
+          AND cg.ID = #{gridId}
+    </select>
+
 </mapper>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/dto/result/CategoryProjectListResultDTO.java

@@ -40,6 +40,11 @@ public class CategoryProjectListResultDTO implements Serializable {
      */
     private String createTime;
 
+    /**
+     * 项目ID
+     */
+    private String projectId;
+
     @JsonIgnore
     private String orgId;
 

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java

@@ -5,7 +5,10 @@ import com.epmet.commons.tools.constant.AppClientConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -364,20 +367,26 @@ public class ScreenProjectServiceImpl implements ScreenProjectService {
             formDTO.setOrgType(FactConstant.AGENCY);
         }
         PageCategoryProjectListResultDTO result = new PageCategoryProjectListResultDTO();
+        List<CategoryProjectListResultDTO> list;
         if (formDTO.getIsPage()){
             PageInfo<CategoryProjectListResultDTO> objectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus()));
-            List<CategoryProjectListResultDTO> list = objectPageInfo.getList();
+            list = objectPageInfo.getList();
             result.setTotal(Integer.valueOf(String.valueOf(objectPageInfo.getTotal())));
-            if (!CollectionUtils.isEmpty(list)){
+        }else {
-                list.forEach(l -> {
+            list = screenProjectDataDao.selectCategoryProjectList(tokenDto.getCustomerId(), formDTO.getOrgId(), formDTO.getCategoryCode(), formDTO.getStatus());
-                    if (l.getOrgType().equals(FactConstant.AGENCY)){
+        }
-
+        if (!CollectionUtils.isEmpty(list)){
-                    }else {
+            list.forEach(l -> {
-
+                if (l.getOrgType().equals(FactConstant.AGENCY)){
-                    }
+                    AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(l.getOrgId());
-                });
+                    l.setGridName(agencyInfo.getOrganizationName());
-            }
+                }else {
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(l.getOrgId());
+                    l.setGridName(gridInfo.getGridNamePath());
+                }
+            });
         }
+        result.setList(list);
         return result;
     }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml

@@ -167,7 +167,8 @@
             IFNULL(PROJECT_TITLE,'') AS projectTitle,
             DATE_FORMAT(PROJECT_CREATE_TIME,'%Y-%m-%d %h:%i:%s') AS createTime,
             ORG_ID,
-            ORG_TYPE
+            ORG_TYPE,
+            PROJECT_ID
         FROM screen_project_data
         WHERE DEL_FLAG = '0'
           <if test=' status == "closed" '>