Merge branch 'feature/dangjian'

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java

@@ -207,6 +207,11 @@ public class ApiAppUserController {
         return appUserService.getInfoById(userDetail);
     }
 
+    @GetMapping("user/getNamInfoById")
+    public Result<EpdcUserInfoResultDTO> getNamInfoById(@LoginUser TokenDto userDetail) {
+        return appUserService.getNamInfoById(userDetail);
+    }
+
     @PostMapping("user/updateAvatar")
     public Result updateAvatar(@LoginUser TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO) {
         ValidatorUtils.validateEntity(fromDTO);

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

@@ -116,6 +116,9 @@ public interface UserFeignClient {
     @GetMapping(value = "app-user/epdc-app/user/getInfoById/{id}")
     Result<EpdcUserInfoResultDTO> getInfoById(@PathVariable("id") String id);
 
+    @GetMapping(value = "app-user/epdc-app/user/getNamInfoById/{id}")
+    Result<EpdcUserInfoResultDTO> getNamInfoById(@PathVariable("id") String id);
+
     /**
      * 修改手机号 或者头像
      *

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

@@ -66,6 +66,11 @@ public class UserFeignClientFallback implements UserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getInfoById", id);
     }
 
+    @Override
+    public Result<EpdcUserInfoResultDTO> getNamInfoById(String id) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "getNamInfoById", id);
+    }
+
     @Override
     public Result updateMobileOrAvatar(UserDTO userDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER, "updateMobileOrAvatar", userDTO);

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

@@ -64,6 +64,8 @@ public interface AppUserService {
      */
     Result<EpdcUserInfoResultDTO> getInfoById(TokenDto userDetail);
 
+    Result<EpdcUserInfoResultDTO> getNamInfoById(TokenDto userDetail);
+
     /***
      * @Description 修改头像
      * @Author qushutong

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

@@ -678,6 +678,25 @@ public class AppUserServiceImpl implements AppUserService {
         return new Result<EpdcUserInfoResultDTO>().ok(data);
     }
 
+    @Override
+    public Result<EpdcUserInfoResultDTO> getNamInfoById(TokenDto userDetail) {
+        PointLogFormDTO pointLogFormDTO = new PointLogFormDTO();
+        pointLogFormDTO.setType(BehaviorEnum.POINTS_SIGN_RULES.getValue());
+        pointLogFormDTO.setUserId(userDetail.getUserId());
+        String isSignIn = pointFeignClient.getIsSignIn(pointLogFormDTO).getData();
+        Result<EpdcUserInfoResultDTO> infoById = userFeignClient.getNamInfoById(userDetail.getUserId());
+        EpdcUserInfoResultDTO data = infoById.getData();
+        data.setIsSignUp(isSignIn);
+        //查询有无关联企业
+        Result<EnterpriseInfoResultDTO> enterInfo = customFeignClient.getEnterpriseInfoByUserId(data.getId());
+        if (enterInfo.success() && null != enterInfo.getData()) {
+            data.setHaveEnterprise(true);
+        } else {
+            data.setHaveEnterprise(false);
+        }
+        return new Result<EpdcUserInfoResultDTO>().ok(data);
+    }
+
     @Override
     public Result updateAvatar(TokenDto userDetail, EpdcUserUpdateAvatarFromDTO fromDTO) {
         UserDTO userDto = new UserDTO();

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

@@ -163,6 +163,11 @@ public class EpdcAppUserController {
         return userService.getInfoById(id);
     }
 
+    @GetMapping("getNamInfoById/{id}")
+    public Result<EpdcUserInfoResultDTO> getNamInfoById(@PathVariable("id") String id) {
+        return djylService.getInfoById(id);
+    }
+
     /***
      * @Description 修改手机号 或者手机号
      * @Author qushutong
@@ -195,7 +200,7 @@ public class EpdcAppUserController {
 
     @GetMapping("mpmVerify")
     public Result mpmVerify(@RequestBody EpdcUserRegistFormDTO formDto) {
-        return userService.mpmVerifyRegisterData(formDto);
+        return djylService.mpmVerifyRegisterData(formDto);
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.elink.esua.epdc.user.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.user.dto.UserDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.user.entity.UserDjylEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,4 +24,15 @@ public interface UserDjylDao extends BaseDao<UserDjylEntity> {
     List<UserDTO> selectUserByWxForLogin(@Param("wxOpenId") String wxOpenId, @Param("wxUnionId") String wxUnionId);
 
     CachingUserInfoDTO selectNpmCachingUserInfoDTO(@Param("openId") String openId, @Param("unionId") String unionId);
+
+    /**
+     * 获取个人用户信息
+     *
+     * @param id
+     * @return EpdcUserInfoResultDTO
+     * @author yujintao
+     * @date 2019/9/12 15:29
+     */
+    EpdcUserInfoResultDTO selectOneInfoById(String id);
+
 }

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

@@ -23,7 +23,9 @@ import com.elink.esua.epdc.user.dto.CachingUserInfoDTO;
 import com.elink.esua.epdc.user.dto.UserDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppQueryUserInfoFormDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcCheckUserRegisterFromDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserRegisterBindGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.user.entity.UserDjylEntity;
 
@@ -57,4 +59,8 @@ public interface UserDjylService extends BaseService<UserDjylEntity> {
     Result<EpdcUserRegisterInfoResultDTO> checkNamUserRegisterState(EpdcCheckUserRegisterFromDTO fromDto);
 
     Result<EpdcUserRegisterInfoResultDTO> namSaveUserOrBindGrid(EpdcUserRegisterBindGridFormDTO fromDto);
+
+    Result<EpdcUserInfoResultDTO> getInfoById(String id);
+
+    Result mpmVerifyRegisterData(EpdcUserRegistFormDTO formDto);
 }

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

@@ -169,7 +169,6 @@ public interface UserService extends BaseService<UserEntity> {
     @Deprecated
     Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto);
 
-    Result mpmVerifyRegisterData(EpdcUserRegistFormDTO formDto);
     /**
      * 登录前，获取用户信息
      *

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

@@ -17,6 +17,7 @@
 
 package com.elink.esua.epdc.user.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -37,7 +38,9 @@ import com.elink.esua.epdc.user.dto.UserDTO;
 import com.elink.esua.epdc.user.dto.UserGridRelationDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcAppQueryUserInfoFormDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcCheckUserRegisterFromDTO;
+import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserRegistFormDTO;
 import com.elink.esua.epdc.user.dto.epdc.form.EpdcUserRegisterBindGridFormDTO;
+import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO;
 import com.elink.esua.epdc.user.dto.epdc.result.EpdcUserRegisterInfoResultDTO;
 import com.elink.esua.epdc.user.entity.UserDjylEntity;
 import com.elink.esua.epdc.user.entity.UserGridRelationEntity;
@@ -246,6 +249,27 @@ public class UserDjylServiceImpl extends BaseServiceImpl<UserDjylDao, UserDjylEn
         return resultDTO;
     }
 
+    @Override
+    public Result<EpdcUserInfoResultDTO> getInfoById(String id) {
+        return new Result<EpdcUserInfoResultDTO>().ok(baseDao.selectOneInfoById(id));
+    }
+
+    @Override
+    public Result mpmVerifyRegisterData(EpdcUserRegistFormDTO formDto) {
+        // 身份证号查重
+        String identityNo = formDto.getIdentityNo();
+        if (StringUtils.isNotBlank(identityNo)) {
+            QueryWrapper<UserDjylEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo);
+            wrapper.ne(formDto.getUserId() != null, FieldConstant.ID, formDto.getUserId());
+            Integer count = this.baseDao.selectCount(wrapper);
+            if (count > NumConstant.ZERO) {
+                return new Result().error("身份证号已被注册");
+            }
+        }
+        return new Result();
+    }
+
     /**
      * 用户网格关系表，更新最后访问网格的时间
      *

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

@@ -495,42 +495,29 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     @Override
     public Result verifyUserRegisterData(EpdcUserRegistFormDTO formDto) {
         // 手机号查重
-//        String mobile = formDto.getMobile();
+        String mobile = formDto.getMobile();
-//        if (StringUtils.isNotBlank(mobile)) {
+        if (StringUtils.isNotBlank(mobile)) {
-//            QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-//            wrapper.eq(FieldConstant.MOBILE, mobile);
-//            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
-//            Integer count = this.baseDao.selectCount(wrapper);
-//            if (count > NumConstant.ZERO) {
-//                return new Result().error("手机号已被注册");
-//            }
-//        }
-
-        // 身份证号查重
-        String identityNo = formDto.getIdentityNo();
-        if (StringUtils.isNotBlank(identityNo)) {
             QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
-            wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo);
+            wrapper.eq(FieldConstant.MOBILE, mobile);
-            wrapper.ne(formDto.getUserId() != null, FieldConstant.ID, formDto.getUserId());
+            wrapper.ne(formDto.getUserId()!=null,FieldConstant.ID,formDto.getUserId());
             Integer count = this.baseDao.selectCount(wrapper);
             if (count > NumConstant.ZERO) {
-                return new Result().error("身份证号已被注册");
+                return new Result().error("手机号已被注册");
             }
         }
 
-        return new Result();
-    }
-
-    @Override
-    public Result mpmVerifyRegisterData(EpdcUserRegistFormDTO formDto) {
         // 身份证号查重
         String identityNo = formDto.getIdentityNo();
         if (StringUtils.isNotBlank(identityNo)) {
-            Integer count = baseDao.selectCountByIdentityNo(identityNo);
+            QueryWrapper<UserEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(UserFieldConsant.IDENTITY_NO, identityNo);
+            wrapper.ne(formDto.getUserId() != null, FieldConstant.ID, formDto.getUserId());
+            Integer count = this.baseDao.selectCount(wrapper);
             if (count > NumConstant.ZERO) {
                 return new Result().error("身份证号已被注册");
             }
         }
+
         return new Result();
     }
 

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

@@ -63,4 +63,34 @@
         ORDER BY ur.SWITCHED_TIME DESC
     </select>
 
+    <select id="selectOneInfoById" resultType="com.elink.esua.epdc.user.dto.epdc.result.EpdcUserInfoResultDTO">
+         SELECT
+            eu.ID AS id,
+            eu.NICKNAME AS nickname,
+            eu.FACE_IMG AS faceImg,
+            eu.MOBILE AS mobile,
+            eu.IDENTITY_NO AS identityNo,
+            eugr.ALL_DEPT_NAMES AS deptName,
+            eu.REAL_NAME AS realName,
+            eu.ROAD AS road,
+            eu.VILLAGE_NAME AS villageName,
+            eu.DWELLING_PLACE AS dwellingPlace,
+            eu.PARTY_FLAG AS partyFlag,
+            eu.SHIBEI AS shibei,
+            eu.WORK_UNIT AS workUnit,
+            eu.WORK_TYPE AS workType,
+            eu.WORK_INDUSTRY AS workIndustry,
+            eugr.GRID_ID AS gridId,
+            eugr.GRID AS gridName,
+            eugr.PARENT_DEPT_IDS AS parentDeptIds,
+            eugr.PARENT_DEPT_NAMES AS parentDeptNames,
+            eugr.ALL_DEPT_IDS AS allDeptIds,
+            eugr.ALL_DEPT_NAMES AS allDeptNames,
+            eu.COUPLING_COMMUNITY
+        FROM epdc_user_djyl eu
+        Left Join (select * from  epdc_user_grid_relation
+            where USER_ID = #{id} order by UPDATED_TIME desc limit 0,1) eugr on(eu.id=eugr.USER_ID)
+        WHERE eu.ID = #{id}
+    </select>
+
 </mapper>