Merge remote-tracking branch 'origin/dev_personal_center' into dev_temp

# Conflicts:
#	epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/AddUserPartyBadgeFormDTO.java

@@ -0,0 +1,24 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/11/4 9:47
+ */
+@NoArgsConstructor
+@Data
+public class AddUserPartyBadgeFormDTO implements Serializable {
+
+	private static final long serialVersionUID = -6890701885153412660L;
+	/**
+	 * 用户Id
+	 */
+	@NotBlank(message = "用户Id不能为空")
+	private String userId;
+}

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

@@ -232,7 +232,7 @@ public interface EpmetUserOpenFeignClient {
      *
      * @param tokenDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.ResiUserBaseInfoResultDTO>
-     * @Author zhangyong
+     * @Author zhangyong  直接取的 user_base_info
      * @Date 14:10 2020-07-30
      **/
     @PostMapping("/epmetuser/userbaseinfo/selectuserbaseinfo")
@@ -317,7 +317,7 @@ public interface EpmetUserOpenFeignClient {
 
     /**
      * @Author sun
-     * @Description 居民端-查询用户基础信息
+     * @Description 居民端-查询用户基础信息  返回值只有userId 、openId
      **/
     @PostMapping(value = "epmetuser/user/getuserbasicinfo")
     Result<UserBasicInfo> getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO);

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

@@ -167,15 +167,29 @@ public class BadgeController {
     }
 
     /**
-     * @param gridIdList
+	 * @param gridIdList
-     * @author yinzuomei
+	 * @author yinzuomei
-     * @description 根据网格id, 查询每个网格有多少个徽章申请单
+	 * @description 根据网格id, 查询每个网格有多少个徽章申请单
-     * @Date 2020/11/12 15:51
+	 * @Date 2020/11/12 15:51
-     **/
+	 **/
-    @PostMapping("querygridauditingbadgecount")
+	@PostMapping("querygridauditingbadgecount")
-	public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList){
+	public Result<List<GridAuditingBadgeCountResultDTO>> queryGridAuditingBadgeCount(@RequestBody List<String> gridIdList) {
 		return new Result<List<GridAuditingBadgeCountResultDTO>>().ok(badgeService.queryGridAuditingBadgeCount(gridIdList));
 	}
 
-
+	/**
+	 * desc: 党员认证通过后，添加党员 徽章记录
+	 *
+	 * @param tokenDto
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result
+	 * @author LiuJanJun
+	 * @date 2020/11/18 10:28 上午
+	 */
+	@PostMapping("adduserpartybadgerecord")
+	public Result audit(@LoginUser TokenDto tokenDto, @RequestBody AddUserPartyBadgeFormDTO formDTO) {
+		ValidatorUtils.validateEntity(formDTO);
+		badgeService.addUserPartyBadgeRecord(tokenDto, formDTO);
+		return new Result();
+	}
 }

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

@@ -146,7 +146,7 @@ public class UserController {
 
 	/**
 	 * @Author sun
-	 * @Description 居民端-查询用户基础信息
+	 * @Description 居民端-查询用户基础信息  返回值只有userId 、openId
 	 **/
 	@PostMapping("getuserbasicinfo")
 	public  Result<UserBasicInfo> getUserBasicInfo(@RequestBody UserBasicInfoFormDTO formDTO){

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

@@ -166,5 +166,15 @@ public interface BadgeDao extends BaseDao<BadgeEntity> {
 	 * @description 根据网格id, 查询每个网格有多少个徽章申请
 	 * @Date 2020/11/12 15:59
 	 **/
-    List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(@Param("gridIdList") List<String> gridIdList);
+	List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(@Param("gridIdList") List<String> gridIdList);
+
+	/**
+	 * desc: 获取党员徽章Id
+	 *
+	 * @param customerId
+	 * @return java.lang.String
+	 * @author LiuJanJun
+	 * @date 2020/11/18 10:43 上午
+	 */
+	String getPartyBadgeId(@Param("customerId") String customerId);
 }

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

@@ -75,4 +75,6 @@ public interface UserWechatDao extends BaseDao<UserWechatEntity>{
     **/
     List<CustomerUser4PointResultDTO> selectResiAndStrangerInfo(@Param("userIds") List<String> userIds, @Param("realName")String realName);
 
+    //临时用下in
+    List<UserWechatDTO> selectNotInUserBaseInfoTemp();
 }

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

@@ -21,10 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.BadgeDTO;
-import com.epmet.dto.form.AddBadgeFormDTO;
+import com.epmet.dto.form.*;
-import com.epmet.dto.form.BadgeAuditFormDTO;
-import com.epmet.dto.form.BadgeFormDTO;
-import com.epmet.dto.form.EditBadgeFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.BadgeEntity;
 
@@ -187,4 +184,15 @@ public interface BadgeService extends BaseService<BadgeEntity> {
      * @Date 2020/11/12 15:56
      **/
     List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList);
+
+    /**
+     * desc: 添加用户党员徽章记录
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return java.lang.Boolean
+     * @author LiuJanJun
+     * @date 2020/11/18 10:32 上午
+     */
+    Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO);
 }

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

@@ -420,10 +420,25 @@ public class BadgeServiceImpl extends BaseServiceImpl<BadgeDao, BadgeEntity> imp
      **/
     @Override
     public List<GridAuditingBadgeCountResultDTO> queryGridAuditingBadgeCount(List<String> gridIdList) {
-        if(CollectionUtils.isEmpty(gridIdList)){
+        if (CollectionUtils.isEmpty(gridIdList)) {
             return new ArrayList<>();
         }
         return baseDao.queryGridAuditingBadgeCount(gridIdList);
     }
 
+    /**
+     * desc: 添加用户党员徽章记录
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return java.lang.Boolean
+     * @author LiuJanJun
+     * @date 2020/11/18 10:32 上午
+     */
+    @Override
+    public Boolean addUserPartyBadgeRecord(TokenDto tokenDto, AddUserPartyBadgeFormDTO formDTO) {
+        String badgeId = baseDao.getPartyBadgeId(tokenDto.getCustomerId());
+        return null;
+    }
+
 }

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

@@ -166,7 +166,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
      **/
     @Override
     public void initBaseInfo() {
-        List<UserWechatDTO> userWechatDTOList=userWechatDao.selectAll();
+        List<UserWechatDTO> userWechatDTOList=userWechatDao.selectNotInUserBaseInfoTemp();
         List<String> userIdList=new ArrayList<>();
         for(UserWechatDTO userWechatDTO:userWechatDTOList){
             userIdList.add(userWechatDTO.getUserId());
@@ -202,12 +202,12 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
                      break;
                  }
              }
-            UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userBaseInfoEntity.getUserId());
+            String userBaseInfoId=baseDao.selectIdByUserId(userBaseInfoEntity.getUserId());
-            if(null==userBaseInfoResultDTO){
+            if(StringUtils.isNotBlank(userBaseInfoId)){
-                insert(userBaseInfoEntity);
+                userBaseInfoEntity.setId(userBaseInfoId);
-            }else{
-                userBaseInfoEntity.setId(userBaseInfoResultDTO.getId());
                 updateById(userBaseInfoEntity);
+            }else{
+                insert(userBaseInfoEntity);
             }
         }
         return;

epmet-user/epmet-user-server/src/main/resources/bootstrap.yml

@@ -133,16 +133,15 @@ pagehelper:
   helper-dialect: mysql
   reasonable: false #分页合理化配置，例如输入页码为-1，则自动转化为最小页码1
 
+dingTalk:
+  robot:
+    webHook: @dingTalk.robot.webHook@
+    secret: @dingTalk.robot.secret@
+
 openapi:
   scan:
     server:
       url: @openapi.scan.server.url@
     method:
       imgSyncScan: /imgSyncScan
-      textSyncScan: /textSyncScan
+      textSyncScan: /textSyncScan
-
-
-dingTalk:
-  robot:
-    webHook: @dingTalk.robot.webHook@
-    secret: @dingTalk.robot.secret@

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

@@ -267,4 +267,15 @@
             </foreach>
             group by m.GRID_ID
     </select>
+
+    <select id="getPartyBadgeId" resultType="java.lang.String">
+        SELECT
+            ID
+        FROM
+            badge
+        WHERE
+            DEL_FLAG = '0'
+            AND (CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} OR CUSTOMER_ID = 'default')
+        order by CREATED_TIME desc  LIMIT 1
+    </select>
 </mapper>

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

@@ -28,28 +28,24 @@
     <!-- 根据用户id查询user_base_info基本信息  -->
     <select id="selectListByUserIdList" parameterType="java.lang.String" resultType="com.epmet.dto.result.UserBaseInfoResultDTO">
         SELECT
-        ubi.id,
+            ubi.id,
-        wechat.USER_ID,
+            ubi.USER_ID,
-        ubi.MOBILE,
+            ubi.MOBILE,
-        ubi.SURNAME,
+            ubi.SURNAME,
-        ubi.`NAME`,
+            ubi.`NAME`,
-        ubi.real_name,
+            ubi.real_name,
-        ubi.ID_NUM,
+            ubi.ID_NUM,
-        ubi.GENDER,
+            ubi.GENDER,
-        ubi.STREET,
+            ubi.STREET,
-        ubi.DISTRICT,
+            ubi.DISTRICT,
-        ubi.BUILDING_ADDRESS,
+            ubi.BUILDING_ADDRESS,
-        wechat.NICKNAME,
+            ubi.NICKNAME,
-        wechat.HEAD_IMG_URL
+            ubi.HEAD_IMG_URL
-    FROM
+        FROM
-        user_wechat wechat
+            user_base_info ubi
-        LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID
+        WHERE
-        AND wechat.DEL_FLAG = '0'
+            ubi.DEL_FLAG = '0'
-        AND ubi.DEL_FLAG = '0'
+            AND ubi.USER_ID = #{userId}
-        AND ubi.USER_ID = #{userId}
-    WHERE
-        wechat.USER_ID = #{userId}
-
     </select>
 
     <!-- 根据用户id获取user_wechat表微信用户基本信息   -->

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

@@ -52,34 +52,27 @@
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
             resultType="com.epmet.dto.result.UserResiInfoResultDTO">
         SELECT
-            uri.id,
+            ubi.USER_ID,
-            uc.USER_ID,
             uri.REG_MOBILE,
-            uri.SURNAME,
+            ubi.SURNAME,
-            uri.`NAME`,
+            ubi.`NAME`,
-            uri.STREET,
+            ubi.STREET,
-            uri.DISTRICT,
+            ubi.DISTRICT,
             uri.RESI_VISIT_ID,
-            uri.BUILDING_ADDRESS,
+            ubi.BUILDING_ADDRESS,
-            CONCAT(
+                CONCAT(
-            uri.STREET,
+                ubi.STREET,
-            '-',
+                '-',
-            uri.SURNAME,
+                ubi.SURNAME,
-            ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
+                ( CASE WHEN ubi.GENDER = '1' THEN '先生' WHEN ubi.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
-            uw.HEAD_IMG_URL AS head_photo
+            ubi.HEAD_IMG_URL AS head_photo
-
         FROM
-            user_customer uc
+            user_base_info ubi
-            LEFT JOIN user_resi_info uri ON ( uc.USER_ID = uri.USER_ID )
+            LEFT JOIN user_resi_info uri ON ( ubi.USER_ID = uri.USER_ID AND uri.DEL_FLAG = '0' )
-            LEFT JOIN user_wechat uw ON (uc.USER_ID = uw.USER_ID)
         WHERE
-            uc.DEL_FLAG = '0'
+            ubi.USER_ID =#{userId}
-            AND uri.DEL_FLAG = '0'
+            AND ubi.DEL_FLAG = '0'
-            AND uc.CUSTOMER_ID = #{customerId}
-            AND uc.USER_ID = #{userId}
-            AND uw.DEL_FLAG = '0'
-            AND uw.USER_ID = #{userId}
     </select>
 
     <!-- 查询用户注册信息 不按照客户Id查询  -->
@@ -131,13 +124,11 @@
             uri.STREET,
             '-',
             uri.SURNAME,
-            ( CASE WHEN uw.SEX = '1' THEN '先生' WHEN uw.SEX = '2' THEN '女士' ELSE '先生/女士' END )
+            ( CASE WHEN uri.GENDER = '1' THEN '先生' WHEN uri.GENDER = '2' THEN '女士' ELSE '先生/女士' END )
             ) AS show_name,
-            uw.HEAD_IMG_URL as head_photo
+            uri.HEAD_IMG_URL as head_photo
         FROM user_resi_info uri
-        left join  user_wechat uw on(uri.user_id=uw.USER_ID)
         WHERE uri.DEL_FLAG = '0'
-        and uw.DEL_FLAG='0'
         AND uri.USER_ID in
         <foreach item="userId" collection="userIdList" separator="," open="(" close=")" index="">
             #{userId}

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

@@ -115,4 +115,24 @@
         ORDER BY
            base.REAL_NAME , wechat.NICKNAME
     </select>
+
+    <!--    查询出注册了居民但是不在user_base_info表的-->
+    <select id="selectNotInUserBaseInfoTemp" resultType="com.epmet.dto.UserWechatDTO">
+        SELECT
+            *
+        FROM
+            user_wechat uw
+        WHERE
+            uw.USER_ID IN (
+            SELECT DISTINCT
+                uri.USER_ID
+            FROM
+                user_resi_info uri
+            WHERE
+                uri.USER_ID NOT IN ( SELECT uri.USER_ID FROM user_base_info uri where uri.DEL_FLAG='0')
+                AND uri.DEL_FLAG = '0'
+            )
+            AND uw.DEL_FLAG = '0'
+            and uw.NICKNAME is not null
+    </select>
 </mapper>