修改调试问题

esua-epdc/doc/branch/dev_1118/db/esua_epdc_user.sql

@@ -50,6 +50,7 @@ CREATE TABLE epdc_user_invitation_record(
     GRID VARCHAR(128) NOT NULL   COMMENT '网格' ,
     GRID_ID BIGINT NOT NULL   COMMENT '网格ID' ,
     REGISTER_TIME DATETIME NOT NULL   COMMENT '注册时间' ,
+    REVISION INT NULL   COMMENT '乐观锁' ,
     CREATED_BY VARCHAR(32) NOT NULL   COMMENT '创建人' ,
     CREATED_TIME DATETIME NOT NULL   COMMENT '创建时间' ,
     UPDATED_BY VARCHAR(32) NOT NULL   COMMENT '更新人' ,

esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAppUserRegisterFormDTO.java

@@ -26,7 +26,6 @@ public class EpdcAppUserRegisterFormDTO implements Serializable {
     /**
      * 网格ID
      */
-    @NotNull(message = "网格ID不能为空")
     private Long gridId;
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java

@@ -258,6 +258,18 @@ public interface UserFeignClient {
     @GetMapping("app-user/epdc-app/user/residentDetail/{userId}")
     Result<EpdcResidentDetailResultDTO> residentDetail(@PathVariable("userId") String userId);
 
+    /**
+     *
+     * 获取用户最后一次切换的网格信息
+     *
+     * @params [openId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @author liuchuang
+     * @since 2019/12/6 11:04
+     */
+    @GetMapping("app-user/epdc-app/user/lastSwitchGrid/{openId}")
+    Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGrid(@PathVariable("openId") String openId);
+
     /**
      * 认证用户（用户信息审核）
      *

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java

@@ -136,6 +136,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "authenticateResident", formDTO);
     }
 
+    @Override
+    public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGrid(String openId) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getUserLastSwitchGrid", openId);
+    }
+
     @Override
     public Result<List<EpdcWorkUserResultDTO>> getWorkUserList(EpdcWorkUserFromDTO workUserFromDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getWorkUserList", workUserFromDto);

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java

@@ -639,12 +639,26 @@ public class AppUserServiceImpl implements AppUserService {
         return authorization;
     }
 
-
     @Override
     public Result<EpdcAppAuthorizationDTO> getMaV2Token(EpdcAppUserRegisterFormDTO formDto) {
         WxMaJscode2SessionResult wxMaResult = this.getWxMaUser(formDto.getWxCode());
         String openId = wxMaResult.getOpenid();
         String unionId = wxMaResult.getUnionid();
+        if (null == formDto.getGridId()) {
+            // 获取用户绑定网格信息
+            Result<EpdcUserRegisterInfoResultDTO> dtoResult = userFeignClient.getUserLastSwitchGrid(openId);
+            if (!dtoResult.success()) {
+                return new Result<EpdcAppAuthorizationDTO>().error(dtoResult.getMsg());
+            }
+            EpdcUserRegisterInfoResultDTO userDto = dtoResult.getData();
+            if (userDto.getRegisterState() != NumConstant.TWO) {
+                EpdcAppAuthorizationDTO resultDto = new EpdcAppAuthorizationDTO();
+                resultDto.setUserState(NumConstant.FIVE_STR);
+                return new Result<EpdcAppAuthorizationDTO>().ok(resultDto);
+            } else {
+                formDto.setGridId(userDto.getGridId());
+            }
+        }
         // 查询当前微信注册状态
         EpdcCheckUserRegisterFromDTO checkFromDto = new EpdcCheckUserRegisterFromDTO();
         checkFromDto.setOpenId(openId);

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/constant/GroupNoticeConstant.java

@@ -12,22 +12,22 @@ public interface GroupNoticeConstant {
     /**
      * 社群审核未通过
      */
-    String NOTICE_GROUP_NOT_PASSED = "你创建的社群【审核未通过】";
+    String NOTICE_GROUP_NOT_PASSED = "您创建的社群【审核未通过】";
 
     /**
      * 社群审核通过
      */
-    String NOTICE_GROUP_PASSED = "你创建的社群【审核通过】";
+    String NOTICE_GROUP_PASSED = "您创建的社群【审核通过】";
 
     /**
      * 社群解散
      */
-    String NOTICE_GROUP_DISBAND = "你加入的社群已被解散";
+    String NOTICE_GROUP_DISBAND = "您加入的社群已被解散";
 
     /**
      * 删除社群成员
      */
-    String NOTICE_GROUP_USER_REMOVED_MEMBER = "你已被群主移除社群";
+    String NOTICE_GROUP_USER_REMOVED_MEMBER = "您已被群主移除社群";
 
     /**
      * 邀请入群

esua-epdc/epdc-module/epdc-group/epdc-group-client/src/main/java/com.elink.esua.epdc/dto/topic/form/TopicSubmitFormDTO.java

@@ -35,6 +35,7 @@ public class TopicSubmitFormDTO implements Serializable {
      * 话题地址
      */
     @NotBlank(message = "话题地址不能为空")
+    @Size(min = 1, max = 100, message = "话题地址在100个字以内")
     private String topicAddress;
 
     /**

esua-epdc/epdc-module/epdc-group/epdc-group-server/src/main/resources/mapper/group/UserGroupDao.xml

@@ -41,10 +41,11 @@
             AND STATE = #{state}
             AND GROUP_ID = #{groupId}
         ORDER BY
+            LORD_FLAG DESC,
         <if test="state == 10">
             CONVERT(NICKNAME USING gbk) ASC,
         </if>
-         CREATED_TIME DESC
+            CREATED_TIME DESC
     </select>
 
     <select id="selectOneOfLordInfoByGroupId" resultType="com.elink.esua.epdc.dto.group.UserGroupDTO">

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/EpdcAppUserController.java

@@ -326,4 +326,18 @@ public class EpdcAppUserController {
         List<UserInvitationRecordResultDTO> data = userInvitationRecordService.invitationRecord(SecurityUser.getUserId());
         return new Result<List<UserInvitationRecordResultDTO>>().ok(data);
     }
+
+    /**
+     *
+     * 获取用户最后一次切换的网格信息
+     *
+     * @params [openId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @author liuchuang
+     * @since 2019/12/6 11:01
+     */
+    @GetMapping("lastSwitchGrid/{openId}")
+    public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(@PathVariable("openId") String openId) {
+        return userService.getUserLastSwitchGird(openId);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserGridRelationDao.java

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.entity.UserGridRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -29,5 +30,16 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface UserGridRelationDao extends BaseDao<UserGridRelationEntity> {
-	
+
+
+    /**
+     *
+     * 获取用户最后一次切换的网格信息
+     *
+     * @params [userId]
+     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     * @author liuchuang
+     * @since 2019/12/6 10:45
+     */
+    UserGridRelationDTO selectOneOfGird(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserGridRelationService.java

@@ -165,4 +165,15 @@ public interface UserGridRelationService extends BaseService<UserGridRelationEnt
      * @Date 2019/11/22 14:31
      **/
     Result removeGrid(EpdcAppRemoveGridFormDTO formDto);
+
+    /**
+     *
+     * 获取用户最后一次切换的网格信息
+     *
+     * @params [userId]
+     * @return com.elink.esua.epdc.dto.UserGridRelationDTO
+     * @author liuchuang
+     * @since 2019/12/6 10:47
+     */
+    UserGridRelationDTO getUserLastSwitchGird(String userId);
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java

@@ -239,4 +239,15 @@ public interface UserService extends BaseService<UserEntity> {
      */
     Result<Integer> getUnauthorizedAmount(EpdcUnauthorizedAmountFromDTO fromDto);
 
+    /**
+     *
+     * 获取用户最后一次切换的网格信息
+     *
+     * @params [openId]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO>
+     * @author liuchuang
+     * @since 2019/12/6 10:59
+     */
+    Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(String openId);
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserGridRelationServiceImpl.java

@@ -206,4 +206,9 @@ public class UserGridRelationServiceImpl extends BaseServiceImpl<UserGridRelatio
         }
         return new Result();
     }
+
+    @Override
+    public UserGridRelationDTO getUserLastSwitchGird(String userId) {
+        return baseDao.selectOneOfGird(userId);
+    }
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -666,4 +666,29 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         return new Result<Integer>().ok(baseDao.selectCountUnauthorizedAmount(fromDto));
     }
 
+    @Override
+    public Result<EpdcUserRegisterInfoResultDTO> getUserLastSwitchGird(String openId) {
+        QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq(UserFieldConsant.WX_OPEN_ID, openId)
+                .select(FieldConstant.ID, UserFieldConsant.NICKNAME, UserFieldConsant.FACE_IMG,
+                        FieldConstant.MOBILE, UserFieldConsant.REAL_NAME,
+                        FieldConstant.STATE, UserFieldConsant.PARTY_FLAG, UserFieldConsant.REMARK)
+                .orderByDesc(FieldConstant.CREATED_TIME);
+        List<UserEntity> userEntityList = this.baseDao.selectList(wrapper);
+
+        EpdcUserRegisterInfoResultDTO resultDto = new EpdcUserRegisterInfoResultDTO();
+        if (null != userEntityList && userEntityList.size() > 0) {
+            UserGridRelationDTO dto = userGridRelationService.getUserLastSwitchGird(userEntityList.get(NumConstant.ZERO).getId());
+            if (null == dto) {
+                resultDto.setRegisterState(NumConstant.ONE);
+            } else {
+                resultDto.setRegisterState(NumConstant.TWO);
+                resultDto.setGridId(dto.getGridId());
+            }
+        } else {
+            resultDto.setRegisterState(NumConstant.ZERO);
+        }
+        return new Result<EpdcUserRegisterInfoResultDTO>().ok(resultDto);
+    }
+
 }

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -157,7 +157,7 @@
             #{userId}
         </foreach>
         <if test="mobile != null and mobile != ''">
-            and u.MOBILE = #{mobile}
+            and u.MOBILE like concat('%', #{mobile}, '%')
         </if>
         <if test="road != null and road != ''">
             and u.ROAD like concat('%', #{road}, '%')

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserGridRelationDao.xml

@@ -3,6 +3,17 @@
 
 <mapper namespace="com.elink.esua.epdc.dao.UserGridRelationDao">
 
-
+    <select id="selectOneOfGird" resultType="com.elink.esua.epdc.dto.UserGridRelationDTO">
+        SELECT
+            *
+        FROM
+            `epdc_user_grid_relation`
+        WHERE
+            USER_ID = #{userId}
+            AND DEL_FLAG = '0'
+        ORDER BY
+            SWITCHED_TIME DESC
+            LIMIT 1
+    </select>
 
 </mapper>