基层治理-徽章审核红点提醒

epmet-module/gov-grid/gov-grid-server/pom.xml

@@ -63,6 +63,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/constant/WorkGrassRootsFunctionConstant.java

@@ -26,5 +26,12 @@ public class WorkGrassRootsFunctionConstant {
      * 议题管理
      */
     public static final String WORK_GRASSROOTS_ISSUE="work_grassroots_issue";
+
+    /**
+     * 徽章审核
+     */
+    public static final String WORK_GRASSROOTS_BADGE="work_grassroots_badge";
+
+
 }
 

epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/impl/RemindServiceImpl.java

@@ -1,19 +1,16 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.WorkGrassRootsFunctionConstant;
 import com.epmet.controller.TestFormDTO1;
 import com.epmet.controller.TestResultDTO1;
 import com.epmet.dto.form.RedDotFormDTO;
 import com.epmet.dto.result.CustomerGridByUserIdResultDTO;
+import com.epmet.dto.result.GridAuditingBadgeCountResultDTO;
 import com.epmet.dto.result.GridProcessingCountResultDTO;
 import com.epmet.dto.result.RedDotResultDTO;
-import com.epmet.feign.GovIssueFeignClient;
+import com.epmet.feign.*;
-import com.epmet.feign.GovOrgFeignClient;
-import com.epmet.feign.ResiGroupFeignClient;
-import com.epmet.feign.ResiPartymemberFeignClient;
 import com.epmet.service.RemindService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -44,6 +41,9 @@ public class RemindServiceImpl implements RemindService {
     @Autowired
     private GovIssueFeignClient govIssueFeignClient;
 
+    @Autowired
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
     @Override
     public RedDotResultDTO queryGridRedDot(RedDotFormDTO formDTO) {
         RedDotResultDTO redDotResultDTO = new RedDotResultDTO();
@@ -88,10 +88,14 @@ public class RemindServiceImpl implements RemindService {
         if (this.getWorkGrassRootsIssue(gridIdList)) {
             functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_ISSUE);
         }
+        if(this.getWorkGrassRootsBadge(gridIdList)){
+            functionList.add(WorkGrassRootsFunctionConstant.WORK_GRASSROOTS_BADGE);
+        }
         return functionList;
     }
 
 
+
     //群组管理: work_grassroots_group
     public Boolean getWorkGrassRootsGroup(List<String> gridIdList) {
         Result<List<GridProcessingCountResultDTO>> groupProcessingCountResult = resiGroupFeignClient.queryGroupProcessingCount(gridIdList);
@@ -104,8 +108,7 @@ public class RemindServiceImpl implements RemindService {
                 }
             }
         }else{
-            logger.error(String.format("调用%s服务,查询网格%s待审核小组数失败code%s,msg:", ServiceConstant.RESI_GROUP_SERVER, gridIdList.get(0), groupProcessingCountResult.getCode(),
+            logger.error(String.format("查询网格内待审核小组数失败,%s",groupProcessingCountResult.getMsg()));
-                    groupProcessingCountResult.getMsg()));
         }
         return false;
     }
@@ -123,8 +126,7 @@ public class RemindServiceImpl implements RemindService {
                 }
             }
         } else {
-            logger.error(String.format("调用%s服务,查询网格%s待审核热心居民数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), resiGroupProcessingCountResult.getCode(),
+            logger.error(String.format("查询网昂个内待审核热心居民数失败,%s",resiGroupProcessingCountResult.getMsg()));
-                    resiGroupProcessingCountResult.getMsg()));
         }
         return false;
     }
@@ -142,8 +144,7 @@ public class RemindServiceImpl implements RemindService {
                 }
             }
         }else{
-            logger.error(String.format("调用%s服务,查询网格%s待审核党员数失败code%s,msg:", ServiceConstant.RESI_PARTYMEMBER_SERVER, gridIdList.get(0), partyMemberProcessingCountResult.getCode(),
+            logger.error(String.format("查询网格内待审核党员总数失败,%s",partyMemberProcessingCountResult.getMsg()));
-                    partyMemberProcessingCountResult.getMsg()));
         }
         return false;
     }
@@ -161,12 +162,27 @@ public class RemindServiceImpl implements RemindService {
                 }
             }
         }else{
-            logger.error(String.format("调用%s服务,查询网格%s表决中议题总数失败code%s,msg:", ServiceConstant.GOV_ISSUE_SERVER, gridIdList.get(0), issueResult.getCode(),
+            logger.error("查询网格表决中议题总数失败,%s",issueResult.getMsg());
-                    issueResult.getMsg()));
         }
         return false;
     }
 
+    //徽章审核
+    private boolean getWorkGrassRootsBadge(List<String> gridIdList) {
+        Result<List<GridAuditingBadgeCountResultDTO>> badgeResult = epmetUserOpenFeignClient.queryGridAuditingBadgeCount(gridIdList);
+        if (badgeResult.success()) {
+            for (String gridId : gridIdList) {
+                for (GridAuditingBadgeCountResultDTO gridAuditingBadgeCountResultDTO : badgeResult.getData()) {
+                    if (gridId.equals(gridAuditingBadgeCountResultDTO.getGridId()) && gridAuditingBadgeCountResultDTO.getCount() > 0) {
+                        return true;
+                    }
+                }
+            }
+        }else{
+            logger.error(String.format("查询网格待审核徽章申请失败,%s",badgeResult.getMsg()));
+        }
+        return false;
+    }
     @Override
     public TestResultDTO1 test(TestFormDTO1 testFormDTO1) {
         Result<TestResultDTO1> resultDTO1Result = resiGroupFeignClient.test(testFormDTO1);

epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml

@@ -134,7 +134,7 @@
     </appender>
 
     <!-- 开发、测试环境 -->
-    <springProfile name="dev,test">
+    <springProfile name="dev,test,local">
         <logger name="org.springframework.web" level="INFO"/>
         <logger name="org.springboot.sample" level="INFO"/>
         <logger name="com.epmet.dao" level="INFO"/>

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/GridAuditingBadgeCountResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 网格待审核徽章总数
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/11/12 15:39
+ */
+@Data
+public class GridAuditingBadgeCountResultDTO implements Serializable {
+    private static final long serialVersionUID = 5685272249935546444L;
+
+    /**
+     * 网格id
+     */
+    private String gridId;
+
+    /**
+     * 待审核徽章申请单总数
+     */
+    private Long count;
+}

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -431,4 +431,13 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/badge/usershowbadge")
      Result<Map<String,List<UserBadgeUnitFormDTO>>> userShowBadge(@RequestBody UserGroupFormDTO param);
+
+    /**
+     * @param gridIdList
+     * @author yinzuomei
+     * @description 根据网格id,查询每个网格有多少个徽章申请
+     * @Date 2020/11/12 15:41
+     **/
+    @PostMapping(value = "/epmetuser/badge/querygridauditingbadgecount",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList);
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -300,4 +300,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<Map<String, List<UserBadgeUnitFormDTO>>> userShowBadge(UserGroupFormDTO param) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userShowBadge", param);
     }
+
+    /**
+     * @param gridIdList
+     * @author yinzuomei
+     * @description 根据网格id, 查询每个网格有多少个徽章申请
+     * @Date 2020/11/12 15:41
+     **/
+    @Override
+    public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(List<String> gridIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "queryGridAuditingBadgeCount", gridIdList);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/BadgeController.java

@@ -5,14 +5,14 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.BadgeAuditingResultDTO;
-import com.epmet.dto.result.BadgeDetailResultDTO;
-import com.epmet.dto.result.BadgeListResultDTO;
 import com.epmet.redis.UserBadgeRedis;
 import com.epmet.service.BadgeService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 import java.util.Map;
@@ -165,4 +165,17 @@ public class BadgeController {
         ValidatorUtils.validateEntity(param);
         return new Result<Map<String,List<UserBadgeUnitFormDTO>>>().ok(badgeRedis.batchObtainUserBadge(param.getCustomerId(),param.getUserIds()));
     }
+
+    /**
+     * @param gridIdList
+     * @author yinzuomei
+     * @description 根据网格id, 查询每个网格有多少个徽章申请单
+     * @Date 2020/11/12 15:51
+     **/
+    @PostMapping("querygridauditingbadgecount")
+	public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList){
+		return new Result<List<GridAuditingBadgeCountResultDTO>>().ok(badgeService.queryGridAuditingBadgeCount(gridIdList));
+	}
+
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/BadgeDao.java

@@ -159,4 +159,12 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @date 2020/11/6 14:46
 	 */
 	void insertBadge(BadgeDTO dto);
+
+	/**
+	 * @param gridIdList
+	 * @author yinzuomei
+	 * @description 根据网格id, 查询每个网格有多少个徽章申请
+	 * @Date 2020/11/12 15:59
+	 **/
+    List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(@Param("gridIdList") List<String> gridIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/BadgeService.java

@@ -25,10 +25,7 @@ import com.epmet.dto.form.AddBadgeFormDTO;
 import com.epmet.dto.form.BadgeAuditFormDTO;
 import com.epmet.dto.form.BadgeFormDTO;
 import com.epmet.dto.form.EditBadgeFormDTO;
-import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.BadgeAuditingResultDTO;
-import com.epmet.dto.result.BadgeDetailResultDTO;
-import com.epmet.dto.result.BadgeListResultDTO;
 import com.epmet.entity.BadgeEntity;
 
 import java.util.List;
@@ -182,4 +179,12 @@ public interface BadgeService extends BaseService<BadgeEntity> {
     void audit(TokenDto tokenDto, BadgeAuditFormDTO formDTO);
 
     void testCache();
+
+    /**
+     * @param gridIdList
+     * @author yinzuomei
+     * @description 根据网格id, 查询每个网格有多少个徽章申请
+     * @Date 2020/11/12 15:56
+     **/
+    List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/BadgeServiceImpl.java

@@ -39,10 +39,7 @@ import com.epmet.dto.BadgeDTO;
 import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.BadgeAuditRecordResultDTO;
+import com.epmet.dto.result.*;
-import com.epmet.dto.result.BadgeAuditingResultDTO;
-import com.epmet.dto.result.BadgeDetailResultDTO;
-import com.epmet.dto.result.BadgeListResultDTO;
 import com.epmet.entity.BadgeCertificationConfigEntity;
 import com.epmet.entity.BadgeEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
@@ -415,4 +412,18 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
         System.out.println(cache);
     }
 
+    /**
+     * @param gridIdList
+     * @author yinzuomei
+     * @description 根据网格id, 查询每个网格有多少个徽章申请
+     * @Date 2020/11/12 15:56
+     **/
+    @Override
+    public List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList) {
+        if(CollectionUtils.isEmpty(gridIdList)){
+            return new ArrayList<>();
+        }
+        return baseDao.queryGridAuditingBadgeCount(gridIdList);
+    }
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/BadgeDao.xml

@@ -252,4 +252,19 @@
         ) AS temp ORDER BY temp.UPDATED_TIME DESC
     </select>
 
+    <!--    根据网格id, 查询每个网格有多少个徽章申请 -->
+    <select id="queryGridAuditingBadgeCount" resultType="com.epmet.dto.result.GridAuditingBadgeCountResultDTO">
+        SELECT
+            m.GRID_ID as gridId,
+            count(1) as count
+        FROM
+            user_badge_certificate_record m
+        WHERE
+            m.DEL_FLAG = '0'
+            AND m.AUDIT_STATUS = 'auditing'
+            <foreach collection="gridIdList" item="gridId" open="AND ( " separator=" OR " close=" ) ">
+                m.GRID_ID =#{gridId}
+            </foreach>
+            group by m.GRID_ID
+    </select>
 </mapper>