Merge remote-tracking branch 'origin/dev' into dev

epmet-gateway/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-gateway-server:
     container_name: epmet-gateway-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.29
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.28
     ports:
       - "8080:8080"
     network_mode: host # 使用现有网络

epmet-gateway/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.29</version>
+    <version>0.3.28</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

epmet-gateway/src/main/java/com/epmet/filter/UserTokenFilter.java

@@ -16,7 +16,8 @@ public interface UserTokenFilter {
         //是否过期
         Claims claims = jwtTokenUtils.getClaimByToken(token);
         if (claims == null || jwtTokenUtils.isTokenExpired(claims.getExpiration())) {
-            throw new RenException(EpmetErrorCode.ERR401.getCode());
+//            throw new RenException(EpmetErrorCode.ERR401.getCode());
+            return null;
         }
         //获取用户ID
         String app = (String) claims.get("app");

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActContentFormDTO.java

@@ -31,16 +31,4 @@ public class ResiActContentFormDTO implements Serializable {
      */
     @NotBlank(message = "活动Id不能为空", groups = { AddUserInternalGroup.class })
     private String actId;
-
-    /**
-     * 页码，从1开始
-     */
-    @Min(value = 1, message = "页码必须大于0", groups = { AddUserInternalGroup.class })
-    private Integer pageNo;
-
-    /**
-     * 页容量，默认20页
-     */
-    @Min(value = 1, message = "每页条数必须大于必须大于0", groups = { ResiActBaseFormDTO.AddUserInternalGroup.class })
-    private Integer pageSize;
 }

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.9
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.10
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.9</version>
+    <version>0.0.10</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/ActSummaryServiceImpl.java

@@ -107,8 +107,6 @@ public class ActSummaryServiceImpl extends BaseServiceImpl<ActSummaryDao, ActSum
 
     @Override
     public Result<ResiActSummaryResultDTO> summaryList(ResiActContentFormDTO formDto) {
-        int pageIndex = (formDto.getPageNo() - NumConstant.ONE) * formDto.getPageSize();
-        formDto.setPageNo(pageIndex);
         return new Result<ResiActSummaryResultDTO>().ok(baseDao.selectListSummary(formDto));
     }
 

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -316,9 +316,9 @@
             i.ID actId,
             CASE
             WHEN <![CDATA[DATE_SUB(i.ACT_START_TIME, INTERVAL 1 HOUR) <= ]]> NOW() AND <![CDATA[i.ACT_START_TIME > ]]> NOW() THEN
-            CONCAT('您报名的 "',i.TITLE,'" 活动还有',TIMESTAMPDIFF(MINUTE, NOW(), i.ACT_START_TIME),'分钟开始。')
+            '您报名的活动即将开始'
             ELSE
-            CONCAT('正在进行中的活动："',i.TITLE,'"。。。')
+            '活动进行中'
             END title
         FROM act_info i LEFT JOIN act_user_relation r ON i.ID = r.ACT_ID
         WHERE i.DEL_FLAG = '0'

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActSummaryDao.xml

@@ -29,6 +29,5 @@
         WHERE s.DEL_FLAG = '0'
             AND s.ACT_ID = #{actId}
             ORDER BY s.ORDER_NUM ASC
-        LIMIT #{pageNo}, #{pageSize}
     </select>
 </mapper>

epmet-module/epmet-third/epmet-third-client/src/main/java/com/epmet/dto/result/CategoryResultDTO.java

@@ -0,0 +1,40 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/7/29 13:36
+ */
+@Data
+public class CategoryResultDTO implements Serializable {
+	private static final long serialVersionUID = -5691303280428707533L;
+
+	/**
+	 * 一级类目名称
+	 */
+	private String firstClass;
+	/**
+	 * 二级类目名称
+	 */
+	private String secondClass;
+	/**
+	 * 三级类目名称
+	 */
+	private String thirdClass;
+	/**
+	 * 一级类目的ID编号
+	 */
+	private String firstId;
+	/**
+	 * 二级类目的ID编号
+	 */
+	private String secondId;
+	/**
+	 * 三级类目的ID编号
+	 */
+	private String thirdId;
+}

epmet-module/epmet-third/epmet-third-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.76
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.77
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.76</version>
+    <version>0.0.77</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/CodeController.java

@@ -1,12 +1,10 @@
 package com.epmet.controller;
 
-import com.baomidou.mybatisplus.extension.api.R;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.service.CodeService;
-import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -179,4 +177,30 @@ public class CodeController {
 		String result = codeService.mediaUpload(formDTO);
 		return new Result<String>().ok(result);
 	}
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 15:45
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<java.lang.String>>
+	 */
+	@PostMapping("getpage")
+	public Result<List<String>> getPage(@RequestBody CodeCommonFormDTO formDTO){
+		List<String> result = codeService.getPage(formDTO);
+		return new Result<List<String>>().ok(result);
+	}
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 15:45
+	 * @param formDTO
+	 * @return com.epmet.commons.tools.utils.Result<java.util.List<com.epmet.dto.result.CategoryResultDTO>>
+	 */
+	@PostMapping("getcategory")
+	public Result<List<CategoryResultDTO>> getCategory(@RequestBody CodeCommonFormDTO formDTO) {
+		List<CategoryResultDTO> result = codeService.getCategory(formDTO);
+		return new Result<List<CategoryResultDTO>>().ok(result);
+	}
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/CodeService.java

@@ -1,9 +1,11 @@
 package com.epmet.service;
 
 import com.epmet.commons.tools.page.PageData;
-import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.*;
-import com.epmet.dto.result.*;
+import com.epmet.dto.result.CategoryResultDTO;
+import com.epmet.dto.result.QrCodeResultDTO;
+import com.epmet.dto.result.ReasonResultDTO;
+import com.epmet.dto.result.TemplateListResultDTO;
 
 import java.util.List;
 
@@ -118,4 +120,22 @@ public interface CodeService {
 	 * @date 2020/7/17 11:20
 	 */
 	String mediaUpload(MediaUploadFormDTO formDTO);
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 13:34
+	 * @param formDTO
+	 * @return java.util.List<java.lang.String>
+	 */
+	List<String> getPage(CodeCommonFormDTO formDTO);
+
+	/**
+	 * 获取小程序的第三方提交代码的页面配置
+	 * @author zhaoqifeng
+	 * @date 2020/7/29 13:34
+	 * @param formDTO
+	 * @return java.util.List<java.lang.String>
+	 */
+	List<CategoryResultDTO> getCategory(CodeCommonFormDTO formDTO);
 }

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -425,6 +425,34 @@ public class CodeServiceImpl implements CodeService {
 		}
 	}
 
+	@Override
+	public List<String> getPage(CodeCommonFormDTO formDTO) {
+		//获取上传代码信息
+		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		//调用微信API获取获取体验版二维码
+		WxResult<List<String>> wxResult = wxMaCodeService.getPage(authInfo.getAuthorizerAccessToken());
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		return wxResult.getData();
+	}
+
+	@Override
+	public List<CategoryResultDTO> getCategory(CodeCommonFormDTO formDTO) {
+		//获取上传代码信息
+		CodeCustomerDTO codeCustomerDTO = codeCustomerService.get(formDTO.getCodeId());
+		//获取小程序调用令牌
+		AuthorizationInfoDTO authInfo = authorizationInfoDao.getAuthInfoByCustomer(codeCustomerDTO.getCustomerId(), codeCustomerDTO.getClientType());
+		//调用微信API获取获取体验版二维码
+		WxResult<List<WxMaCategoryResult>> wxResult = wxMaCodeService.getCategory(authInfo.getAuthorizerAccessToken());
+		if (!wxResult.success()) {
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
+		return ConvertUtils.sourceToTarget(wxResult.getData(), CategoryResultDTO.class);
+	}
+
 	private void saveOperation(String customerId, String codeId, String version, String operation, String describe) {
 		CodeOperationHistoryDTO operationDTO = new CodeOperationHistoryDTO();
 		operationDTO.setCustomerId(customerId);

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserServiceImpl.java

@@ -34,14 +34,12 @@ import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.PaUserDTO;
 import com.epmet.dto.PaUserVisitedDTO;
 import com.epmet.dto.PaUserWechatDTO;
-import com.epmet.dto.form.SaveUserVisitedFormDTO;
 import com.epmet.dto.result.CustomerUserResultDTO;
 import com.epmet.dto.result.SaveUserResultDTO;
 import com.epmet.entity.PaUserEntity;
 import com.epmet.entity.PaUserWechatEntity;
 import com.epmet.redis.PaUserRedis;
 import com.epmet.service.PaUserService;
-import com.epmet.service.PaUserVisitedService;
 import com.epmet.service.PaUserWechatService;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 import org.apache.commons.lang3.StringUtils;
@@ -74,8 +72,6 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
     private PaUserWechatDao paUserWechatDao;
     @Autowired
     private PaUserVisitedDao paUserVisitedDao;
-    @Autowired
-    private PaUserVisitedService paUserVisitedService;
 
     @Override
     public PageData<PaUserDTO> page(Map<String, Object> params) {
@@ -160,15 +156,10 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             wechatEntity.setCity(null == wxMpUser.getCity() ? "" : wxMpUser.getCity());
             wechatEntity.setLanguage(null == wxMpUser.getLanguage() ? "" : wxMpUser.getLanguage());
             paUserWechatService.insert(wechatEntity);
-            //2.3、pa_user_visited表新增访问记录数据
-            SaveUserVisitedFormDTO visited = new SaveUserVisitedFormDTO();
-            visited.setUserId(userEntity.getId());
-            visited.setLogonUserId(userEntity.getId());
-            paUserVisitedService.saveUserVisited(visited);
 
             resultDTO.setUserId(userEntity.getId());
         } else {
-            //2.4、批量更新user_wechat表数据
+            //2.3、批量更新user_wechat表数据
             List<PaUserWechatEntity> wechatEntity = ConvertUtils.sourceToTarget(wechatDTO, PaUserWechatEntity.class);
             for(PaUserWechatEntity entity : wechatEntity){
                 entity.setGender(wxMpUser.getSex().toString());
@@ -181,7 +172,7 @@ public class PaUserServiceImpl extends BaseServiceImpl<PaUserDao, PaUserEntity>
             }
             paUserWechatService.updateBatchById(wechatEntity);
 
-            //2.5、根据openid查询用户登陆访问记录表数据，按登陆时间倒序
+            //2.4、根据openid查询用户登陆访问记录表数据，按登陆时间倒序
             PaUserVisitedDTO visitedDTO = paUserVisitedDao.selectByOpenId(wxMpUser.getOpenId());
             if (null == visitedDTO || "".equals(visitedDTO.getUserId())) {
                 logger.error("根据openid查询用户访问记录表数据失败，openid->"+wxMpUser.getOpenId());

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/PaUserVisitedServiceImpl.java

@@ -134,9 +134,7 @@ public class PaUserVisitedServiceImpl extends BaseServiceImpl<PaUserVisitedDao,
         entity.setUserId(visited.getUserId());
         entity.setWxOpenId(userEntity.getWxOpenId());
         entity.setOpenId(openId);
-        if (null != visited.getPhone()) {
+        entity.setPhone(visited.getPhone());
-            entity.setPhone(visited.getPhone());
-        }
         baseDao.insert(entity);
     }
 

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/result/WxMaCategoryResult.java

@@ -12,6 +12,7 @@ import java.io.Serializable;
  */
 @Data
 public class WxMaCategoryResult implements Serializable {
+	private static final long serialVersionUID = 2504852726988873959L;
 	/**
 	 * 一级类目名称
 	 */
@@ -37,16 +38,4 @@ public class WxMaCategoryResult implements Serializable {
 	 */
 	private String thirdId;
 
-	/**
+}
-	 * 小程序的页面，可通过“获取小程序的第三方提交代码的页面配置”接口获得
-	 */
-	private String address;
-	/**
-	 * 小程序的标签，多个标签用空格分隔，标签不能多于10个，标签长度不超过20
-	 */
-	private String tag;
-	/**
-	 * 小程序页面的标题,标题长度不超过32
-	 */
-	private String title;
-}

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/WxMaCodeService.java

@@ -56,7 +56,7 @@ public interface WxMaCodeService {
 	 * @param accessToken 提交审核参数
 	 * @return List<WxMaCategory>
 	 */
-	WxResult getCategory(String accessToken);
+	WxResult<List<WxMaCategoryResult>> getCategory(String accessToken);
 
 	/**
 	 * 获取小程序的第三方提交代码的页面配置（仅供第三方开发者代小程序调用）.
@@ -64,7 +64,7 @@ public interface WxMaCodeService {
 	 * @param accessToken 提交审核参数
 	 * @return page_list 页面配置列表
 	 */
-	WxResult getPage(String accessToken);
+	WxResult<List<String>> getPage(String accessToken);
 
 	/**
 	 * 将第三方提交的代码包提交审核（仅供第三方开发者代小程序调用）.

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxLoginServiceImpl.java

@@ -52,7 +52,6 @@ public class WxLoginServiceImpl implements WxLoginService {
 		HashMap<String, String> hashMap = JSON.parseObject(resultStr, HashMap.class);
 		if (null != hashMap.get("errcode")) {
 			logger.error("wxcode换取openid接口调用失败");
-			logger.error("对应参数:小程序appId->"+appId+"第三方component_appid->"+componentAppId+",第三方component_access_token->"+componentAccessToken);
 			throw new RenException(hashMap.get("errmsg"));
 		}
 		String openid = hashMap.get("openid");

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java

@@ -97,7 +97,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult getCategory(String accessToken) {
+	public WxResult<List<WxMaCategoryResult>> getCategory(String accessToken) {
 		WxResult<List<WxMaCategoryResult>> result = new WxResult<>();
 		String url = WxMaCodeConstant.GET_CATEGORY_URL + "?" + "access_token=" + accessToken;
 		Result<String> getCategoryResult = HttpClientManager.getInstance().sendGet(url, null);
@@ -115,7 +115,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService {
 	}
 
 	@Override
-	public WxResult getPage(String accessToken) {
+	public WxResult<List<String>> getPage(String accessToken) {
 		WxResult<List<String>> result = new WxResult<>();
 		String url = WxMaCodeConstant.GET_PAGE_URL + "?" + "access_token=" + accessToken;
 		Result<String> getPageResult = HttpClientManager.getInstance().sendGet(url, null);

epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-org-server:
     container_name: gov-org-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.80
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.79
     ports:
       - "8092:8092"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.80</version>
+    <version>0.3.79</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>gov-org</artifactId>

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java

@@ -32,7 +32,7 @@ public class VerificationCodeFromDTO implements Serializable {
 	private String mobile;
 
 	/**
-	 * 行为记录表ID partymember_visit.id
+	 * 行为记录表ID
 	 */
 	@NotBlank(message = "行为记录表ID不能为空")
 	private String visitId;

epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-partymember-server:
     container_name: resi-partymember-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.57
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.55
     ports:
       - "8096:8096"
     network_mode: host # 使用现有网络

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.57</version>
+    <version>0.3.55</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-partymember</artifactId>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java

@@ -445,7 +445,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		resultDTO.setMobile(partyMemberInfo.getMobile());
 		resultDTO.setAddress(partyMemberInfo.getStreet() + partyMemberInfo.getEstate() + partyMemberInfo.getBuilding());
 		List<String> failedReason = new ArrayList<>();
-		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()&& !("null").equals(fromDTO.getAutoId())) {
+		if (null != fromDTO.getAutoId() && !fromDTO.getAutoId().isEmpty()) {
 			PartymemberConfirmAutoEntity autoEntity = partymemberConfirmAutoService.selectById(fromDTO.getAutoId());
 			resultDTO.setCertifyTime(autoEntity.getContrastTime().getTime());
 			if (PartyMemberConstant.SAME.equals(autoEntity.getMobileResult())) {
@@ -560,7 +560,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());
 			userResiInfoDTO.setDistrict(partyMemberInfoDTO.getEstate());
 			userResiInfoDTO.setBuildingAddress(partyMemberInfoDTO.getBuilding());
-			userResiInfoDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
 			epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
 		}
 	}

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java

@@ -17,11 +17,9 @@
 
 package com.epmet.dto;
 
-import lombok.Data;
-
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
+import lombok.Data;
 
 
 /**
@@ -53,8 +51,7 @@ public class UserResiInfoDTO implements Serializable {
     /**
      * 手机号(注册手机号)
      */
-    @NotBlank(message = "手机号不能为空")
+	private String regMobile;
-    private String regMobile;
 
     /**
      * 姓氏
@@ -124,7 +121,6 @@ public class UserResiInfoDTO implements Serializable {
 	/**
 	 * 客户Id (customer.id)
 	 */
-	@NotBlank(message = "客户Id不能为空")
 	private String customerId;
 
 	/**

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

@@ -149,7 +149,6 @@ public class UserResiInfoController {
      **/
     @PostMapping("saveResiInfo")
     public Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO) {
-        ValidatorUtils.validateEntity(userResiInfoDTO);
         return userResiInfoService.saveResiInfo(userResiInfoDTO);
     }
 

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

@@ -3,7 +3,6 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.UserCustomerEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @Description 客户用户关系表
@@ -12,14 +11,6 @@ import org.apache.ibatis.annotations.Param;
  * @date 2020.03.31 13:53
  */
 @Mapper
-public interface UserCustomerDao extends BaseDao<UserCustomerEntity> {
+public interface UserCustomerDao extends BaseDao<UserCustomerEntity>{
 
-	/**
-	 * desc:修改客户的用户的注册状态为已注册
-	 *
-	 * @param customerId
-	 * @param userId
-	 * @return
-	 */
-	int updateRegistered(@Param("customerId") String customerId, @Param("userId") String userId);
 }

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

@@ -39,8 +39,8 @@ import java.util.List;
 public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 
 	/**
-	 * @param userResiInfoFormDTO
 	 * @return com.epmet.dto.UserResiInfoDTO
+	 * @param userResiInfoFormDTO
 	 * @Author yinzuomei
 	 * @Description 查询用户注册信息
 	 * @Date 2020/3/30 11:10
@@ -48,23 +48,23 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	UserResiInfoResultDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
-	 * @param userResiInfoFormDTO
-	 * @return UserResiInfoResultDTO
 	 * @Description 查询用户注册信息 不按照客户Id查询
+	 * @param userResiInfoFormDTO
+	 * @return  UserResiInfoResultDTO
 	 * @author wangc
 	 * @date 2020.05.21 13:18
-	 **/
+	**/
 	UserResiInfoResultDTO selectUserResiInfoNotByCustId(UserResiInfoFormDTO userResiInfoFormDTO);
 
 	/**
 	 * @Author sun
 	 * @Description 根据手机号查询居民注册信息(user_resi_info)表数据
 	 **/
-	List<UserResiInfoDTO> selectResiInfoByMobile(@Param("regMobile") String regMobile, @Param("customerId") String customerId);
+	List<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
 
 	/**
-	 * @param userIdList
 	 * @return java.util.List<com.epmet.dto.UserResiInfoDTO>
+	 * @param userIdList
 	 * @Author yinzuomei
 	 * @Description 根据userId集合查询用户注册信息
 	 * @Date 2020/4/7 18:26
@@ -72,8 +72,8 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	List<UserResiInfoResultDTO> selectListUserResiInfoDTO(@Param("userIdList") List<String> userIdList);
 
 	/**
+	 * @Description  根据userId查询议题发起人
 	 * @param formDTO
-	 * @Description 根据userId查询议题发起人
 	 * @author zxc
 	 * @date 2020/5/11 11:18
 	 */

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

@@ -19,7 +19,6 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.epmet.common.token.util.UserUtil;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
 import com.epmet.commons.tools.constant.FieldConstant;
@@ -31,11 +30,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.SmsTemplateConstant;
 import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserRoleConstant;
-import com.epmet.dao.UserCustomerDao;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dao.UserWechatDao;
 import com.epmet.dto.UserResiInfoDTO;
-import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.IssueInitiatorResultDTO;
@@ -85,8 +82,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	private UserBaseInfoService userBaseInfoService;
 	@Autowired
 	private UserWechatDao userWechatService;
-	@Autowired
-	private UserCustomerDao userCustomerDao;
 
 	@Override
 	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@@ -169,8 +164,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
 		}*/
-		//2:再次判断手机号是否在客户下可用
+		//2:再次判断手机号是否可用
-		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
+		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
 			//手机号验证失败则更新行为记录表数据 返回前台结果
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
@@ -226,17 +221,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		//1:更新居民注册访问记录表数据
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
-		//2020-07-29 根据要注册的网格获取客户Id
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
-		UserResiRegisterVisitDTO registerVisitDTO = userResiRegisterVisitService.get(verificationCodeFormDTO.getResiVisitId());
-		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile(), registerVisitDTO.getCustomerId())) {
 			return new Result().error(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
 		}
 		//3:调用短信服务 生成验证码发送短信
-		SendVerificationCodeFormDTO sendVerificationCodeFormDTO = new SendVerificationCodeFormDTO();
+		SendVerificationCodeFormDTO sendVerificationCodeFormDTO=new SendVerificationCodeFormDTO();
 		sendVerificationCodeFormDTO.setMobile(verificationCodeFormDTO.getMobile());
 		sendVerificationCodeFormDTO.setAliyunTemplateCode(SmsTemplateConstant.USER_REGISTER);
 		Result<SendVerificationCodeResultDTO> result = epmetMessageOpenFeignClient.sendVerificationCode(sendVerificationCodeFormDTO);
-		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getCode())) {
+		if(!result.success()||null==result.getData()||StringUtils.isBlank(result.getData().getCode())){
 			return new Result().error(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
 		}
 		//4:删除缓存中可能存在的旧验证码
@@ -247,12 +240,11 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
 	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
 		Result result = new Result();
 
 		//判断手机号是否可用
-		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile(), userResiInfoDTO.getCustomerId())) {
+		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
 			//数据存入居民注册表
 			saveUserResiInfo(userResiInfoDTO);
 			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
@@ -262,8 +254,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 			userRole.setUserId(userResiInfoDTO.getUserId());
 			userRole.setRoleKey(UserConstant.ROLE_RESI);
 			userRoleService.saveUserRole(userRole);
-			//更新该用户在该客户下的注册状态
-			userCustomerDao.updateRegistered(userResiInfoDTO.getCustomerId(), userResiInfoDTO.getUserId());
 		}
 
 		return result;
@@ -290,17 +280,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
 	 *
 	 * @param mobile
-	 * @param customerId
 	 * @return
 	 * @Author sun
 	 */
-	private Boolean getResiInfoByMobile(String mobile, String customerId) {
+	private Boolean getResiInfoByMobile(String mobile) {
-		if (StringUtils.isBlank(customerId)) {
-			customerId = UserUtil.getCurrentUser().getCustomerId();
-			log.info("getResiInfoByMobile UserUtil.getCustomerId:{}", customerId);
-		}
 		Boolean bl = true;
-		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile, customerId);
+		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile);
 		if (list.size() > 0) {
 			bl = false;
 		}

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

@@ -3,8 +3,18 @@
 
 <mapper namespace="com.epmet.dao.UserCustomerDao">
 
-    <update id="updateRegistered">
+
-        update set IS_REGISTER = 1 where CUSTOMER_ID = #{customerId,jdbcType=VARCHAR} and USER_ID = #{userId,jdbcType=VARCHAR}
+    <resultMap type="com.epmet.entity.UserCustomerEntity" id="userCustomerMap">
-    </update>
+        <result property="id" column="ID"/>
+        <result property="app" column="APP"/>
+        <result property="roleName" column="ROLE_NAME"/>
+        <result property="roleKey" column="ROLE_KEY"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
 
 </mapper>

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

@@ -98,12 +98,8 @@
         SELECT
         <include refid="sql"></include>
         FROM user_resi_info uri
-        LEFT JOIN user_customer uc ON uri.USER_ID = uc.USER_ID
+        WHERE uri.del_flag = '0'
-        WHERE
+        AND uri.reg_mobile = #{regMobile}
-        uri.DEL_FLAG = '0'
-        AND uri.REG_MOBILE = #{regMobile,jdbcType=VARCHAR}
-        AND uc.CUSTOMER_ID = #{customerId,jdbcType=VARCHAR}
-        AND uc.IS_REGISTER = 1
     </select>
 
     <!-- 根据userId集合查询用户注册信息   -->