徽章修改

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

@@ -0,0 +1,19 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/11/18 下午1:47
+ */
+@Data
+public class PartyMemberUserIdsResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -6932505684417996587L;
+
+    private String userId;
+
+    private Boolean reStatus;
+}

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

@@ -18,8 +18,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.ResiUserBadgeDTO;
 import com.epmet.entity.ResiUserBadgeEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户徽章关系表
@@ -30,4 +34,13 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiUserBadgeDao extends BaseDao<ResiUserBadgeEntity> {
 
+    /**
+     * @Description  初始化党员徽章插入
+     * @Param userIds
+     * @Param badgeId
+     * @author zxc
+     * @date 2020/11/18 上午10:56
+     */
+    void insertResiUserBadge(@Param("badges")List<ResiUserBadgeDTO> badges);
+
 }

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

@@ -72,4 +72,12 @@ public interface UserRoleDao extends BaseDao<UserRoleEntity> {
      * @Description  居民端-查询用户角色key列表
      **/
     List<String> selectUserRoleKeyList(GetRoleKeyListFormDTO formDTO);
+
+    /**
+     * @Description  查询所有党员UserId
+     * @Param
+     * @author zxc
+     * @date 2020/11/18 上午10:50
+     */
+    List<String> selectPartyMemberUserIds();
 }

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

@@ -10,7 +10,10 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.PhoneValidatorUtils;
 import com.epmet.constant.BadgeConstant;
 import com.epmet.constant.SmsTemplateConstant;
+import com.epmet.dao.BadgeDao;
+import com.epmet.dao.ResiUserBadgeDao;
 import com.epmet.dao.UserBadgeDao;
+import com.epmet.dao.UserRoleDao;
 import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -49,6 +52,12 @@ public class UserBadgeServiceImpl implements UserBadgeService {
     private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
     @Autowired
     private EpmetMessageOpenFeignClient messageFeignClient;
+    @Autowired
+    private UserRoleDao userRoleDao;
+    @Autowired
+    private ResiUserBadgeDao resiUserBadgeDao;
+    @Autowired
+    private BadgeDao badgeDao;
 
     /**
      * @Description  查询已经点亮的徽章
@@ -104,27 +113,31 @@ public class UserBadgeServiceImpl implements UserBadgeService {
             });
             return userOperListResultDTOS;
         }
-        List<UserOperListResultDTO> badgeIsOpenedList = userBadgeDao.selectBadgeByUserId(userOperListFormDTO.getUserId());
         userOperListResultDTOS.forEach(ub -> {
             userAuthBadgeList.forEach(u -> {
                 if (ub.getBadgeId().equals(u.getBadgeId())){
                     ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED) ? true : false);
                     ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO);
+                    ub.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
                 }
             });
-            if (CollectionUtils.isEmpty(badgeIsOpenedList)){
-                ub.setIsLighted(BadgeConstant.NO);
-            }else {
-                badgeIsOpenedList.forEach(b -> {
-                    if (ub.getBadgeId().equals(b.getBadgeId())){
-                        ub.setIsLighted(b.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
-                    }
-                });
-            }
         });
         return userOperListResultDTOS;
     }
 
+    public void initPartyMemberBadge(){
+        List<String> userIds = userRoleDao.selectPartyMemberUserIds();
+        if (CollectionUtils.isEmpty(userIds)){
+            return;
+        }
+        List<UserBaseInfoResultDTO> userBaseInfoResultDTOS = userBaseInfoService.queryUserBaseInfo(userIds);
+        if (CollectionUtils.isEmpty(userBaseInfoResultDTOS)){
+            log.error("未查询到党员基本信息......");
+            throw new RenException("未查询到党员基本信息......");
+        }
+//        badgeDao.getPartyBadgeId()
+    }
+
     /**
      * @Description  个人中心-提交徽章认证
      * @Param certificationAddFormDTO

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

@@ -276,6 +276,7 @@
         WHERE
             DEL_FLAG = '0'
             AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default')
+            AND FIXATION_BADGE_TYPE = 'party'
         order by CREATED_TIME desc  LIMIT 1
     </select>
 </mapper>

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

@@ -3,21 +3,43 @@
 
 <mapper namespace="com.epmet.dao.ResiUserBadgeDao">
 
-    <resultMap type="com.epmet.entity.ResiUserBadgeEntity" id="resiUserBadgeMap">
+    <!-- 初始化党员徽章插入 -->
-        <result property="id" column="ID"/>
+    <insert id="insertResiUserBadge">
-        <result property="customerId" column="CUSTOMER_ID"/>
+        INSERT INTO resi_user_badge
-        <result property="gridId" column="GRID_ID"/>
+        (
-        <result property="userId" column="USER_ID"/>
+            ID,
-        <result property="badgeId" column="BADGE_ID"/>
+            CUSTOMER_ID,
-        <result property="isOpened" column="IS_OPENED"/>
+            GRID_ID,
-        <result property="certificationAutidStatus" column="CERTIFICATION_AUTID_STATUS"/>
+            USER_ID,
-        <result property="delFlag" column="DEL_FLAG"/>
+            BADGE_ID,
-        <result property="revision" column="REVISION"/>
+            IS_OPENED,
-        <result property="createdBy" column="CREATED_BY"/>
+            CERTIFICATION_AUTID_STATUS,
-        <result property="createdTime" column="CREATED_TIME"/>
+            DEL_FLAG,
-        <result property="updatedBy" column="UPDATED_BY"/>
+            REVISION,
-        <result property="updatedTime" column="UPDATED_TIME"/>
+            CREATED_BY,
-    </resultMap>
+            CREATED_TIME,
+            UPDATED_BY,
+            UPDATED_TIME
+        )
+        VALUES
+        <foreach collection="badges" item="b" index="b" separator=",">
+            (
+                  REPLACE(UUID(),'-',''),
+                  #{b.customerId},
+                  #{b.gridId},
+                  #{b.userId},
+                  #{b.badgeId},
+                  #{b.isOpened},
+                  #{b.certificationAutidStatus},
+                  #{b.delFlag},
+                  #{b.revision},
+                  #{b.createdBy},
+                  NOW(),
+                  #{b.updatedBy},
+                  NOW(),
+              )
+        </foreach>
+    </insert>
 
 
 </mapper>

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

@@ -64,12 +64,12 @@
         SELECT
             CUSTOMER_ID,
             BADGE_ID,
-            CERTIFICATION_IMG,
+            CERTIFICATION_AUTID_STATUS AS auditStatus,
-            AUDIT_STATUS
+            IS_OPENED
-        FROM user_badge_certificate_record
+        FROM resi_user_badge
         WHERE DEL_FLAG = 0
-            AND IS_LAST = 'yes'
+          AND CERTIFICATION_AUTID_STATUS = 'approved'
-            AND USER_ID = #{userId}
+          AND USER_ID = #{userId}
     </select>
 
     <!-- 根据UserId查询个人徽章点亮信息 -->

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

@@ -100,4 +100,15 @@
         AND ur.user_id = #{userId}
         AND ( ur.grid_id = #{gridId} OR ur.grid_id = 'all' )
     </select>
+
+    <!-- 查询所有党员UserId -->
+    <select id="selectPartyMemberUserIds" resultType="java.lang.String">
+        SELECT
+            ur.USER_ID
+        FROM user_role ur
+        LEFT JOIN epmet_role er ON er.ID = ur.ROLE_ID
+        WHERE ur.DEL_FLAG = 0
+          AND er.DEL_FLAG = 0
+          AND er.ROLE_KEY = 'partymember'
+    </select>
 </mapper>