Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

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

@@ -122,7 +122,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+          <!--  <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java

@@ -390,8 +390,11 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
 
         //1.获取话题基本信息
         ResiTopicEntity topicDetail = baseDao.selectById(topicId);
+        if(null == topicDetail || !StringUtils.equals(topicDetail.getId(),topicId)){
+            return new Result().error();
+        }
         ResiTopicDetailResultDTO resultDTO = new ResiTopicDetailResultDTO();
-
+        resultDTO.setTopicId(topicId);
         //2.查询话题附件
         QueryWrapper<ResiTopicAttachmentEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(TopicConstant.TOPIC_ID,topicId);
@@ -487,7 +490,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
             ResiGroupMemberDTO leaderVerify = resiGroupMemberDao.selectLeaderMember(topic.getGroupId());
             if(null != leaderVerify){
                 //1.2判断是否是组长
-                if(!StringUtils.equals(leaderVerify.getId(),userId)){
+                if(!StringUtils.equals(leaderVerify.getCustomerUserId(),userId)){
                     //非组长，无权限进行操作
                     return new Result().error();
                 }else{

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml

@@ -158,12 +158,10 @@
         <if test='null != delFlag and "" != delFlag'>
            DEL_FLAG = #{delFlag} ,
         </if>
-        <if test='null != updatedBy and "" != updatedBy'>
-           UPDATED_BY = #{updatedBy} ,
-        </if>
         <if test='null != topicContent and "" != topicContent'>
            TOPIC_CONTENT = #{topicContent} ,
         </if>
+        UPDATED_BY = #{updatedBy} ,
         UPDATED_DATE = NOW()
       </set>
       WHERE

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

@@ -134,7 +134,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+           <!-- <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java

@@ -3,7 +3,7 @@ package com.epmet.modules.resiregister.controller;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -43,8 +43,8 @@ public class ResiRegisterController {
      * @Description 居民端-居民注册信息提交
      **/
     @PostMapping("submit")
-    public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) {
-        return resiRegisterService.submit(tokenDTO, userResiInfoDTO);
+    public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) {
+        return resiRegisterService.submit(tokenDTO, resiInfoSubmitFormDTO);
     }
 
     /**

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java

@@ -2,7 +2,7 @@ package com.epmet.modules.resiregister.service;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -31,7 +31,7 @@ public interface ResiRegisterService {
      * @return void
      * @author sun
      */
-    Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO);
+    Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO);
 
     /**
      * 居民端-居民注册根据手机号获取验证码

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.modules.resiregister.service.impl;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
@@ -49,18 +50,22 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
      * @Description 居民端-居民注册信息提交
      **/
     @Override
-    public Result submit(TokenDto tokenDTO, UserResiInfoDTO formDTO) {
+    public Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
-            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-                || StringUtils.isBlank(formDTO.getGridId())
-                || StringUtils.isBlank(formDTO.getResiVisitId())) {
-            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
+                || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId())
+                || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) {
+            return new Result().error(ModuleConstant.PARAMETER_EXCEPTION);
         }
-        formDTO.setUserId(tokenDTO.getUserId());
-        formDTO.setApp(tokenDTO.getApp());
-        return epmetUserFeignClient.submit(formDTO);
+        UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo();
+        userResiInfoDTO.setUserId(tokenDTO.getUserId());
+        userResiInfoDTO.setApp(tokenDTO.getApp());
+        userResiInfoDTO.setCustomerId(resiInfoSubmitFormDTO.getCustomerId());
+        userResiInfoDTO.setGridId(resiInfoSubmitFormDTO.getGridId());
+        userResiInfoDTO.setResiVisitId(resiInfoSubmitFormDTO.getResiVisitId());
+        return epmetUserFeignClient.submit(userResiInfoDTO);
     }
 
     /**

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -47,9 +47,13 @@ public interface PartyMemberConstant {
 	String BENCHMARK = "110010";
 
 	/**
-	 * 比对结果大部分相同最低值
+	 * 比对结果相同
 	 */
+	Double EQUALS = 1.0;
 
+	/**
+	 * 比对结果大部分相同最低值
+	 */
 	Double MOST = 0.8;
 
 	/**

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

@@ -156,6 +156,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
 			//添加用户党员角色关系
 			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setCustomerId(partyMemberInfoDTO.getCustomerId());
 			userRole.setUserId(partyMemberInfoDTO.getUserId());
 			userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER);
 			userRole.setApp(partyMemberInfoDTO.getApp());

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

@@ -33,6 +33,7 @@ import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import info.debatty.java.stringsimilarity.JaroWinkler;
 import org.apache.commons.lang3.StringUtils;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -188,7 +189,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 	 * 生成返回结果
 	 *
 	 * @param baseInfo 基本信息
-	 * @param info 录入信息
+	 * @param info     录入信息
 	 * @return PartymemberConfirmAutoDTO
 	 */
 	private PartymemberConfirmAutoDTO getResult(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info) {
@@ -239,33 +240,29 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberB
 		JaroWinkler jw = new JaroWinkler();
 		double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
 		double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
-		double nameResult = jw.similarity(baseInfo.getName(), info.getName());
-		if (idCardResult > PartyMemberConstant.MOST) {
-			result.concat("10");
-		} else if (idCardResult < PartyMemberConstant.SMALL) {
-			result.concat("00");
-		} else {
-			result.concat("01");
-		}
+		double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName());
+		result = getString(result, idCardResult);
 
-		if (mobileResult > PartyMemberConstant.MOST) {
-			result.concat("10");
-		} else if (mobileResult < PartyMemberConstant.SMALL) {
-			result.concat("00");
-		} else {
-			result.concat("01");
-		}
+		result = getString(result, mobileResult);
 
-		if (nameResult > PartyMemberConstant.MOST) {
-			result.concat("10");
-		} else if (nameResult < PartyMemberConstant.SMALL) {
-			result.concat("00");
-		} else {
-			result.concat("01");
-		}
+		result = getString(result, nameResult);
 
 		return result;
 
 	}
 
+	@NotNull
+	private String getString(String result, double comparisonResult) {
+		if(comparisonResult == PartyMemberConstant.EQUALS) {
+			result = result + "11";
+		} else if (comparisonResult > PartyMemberConstant.MOST) {
+			result = result + "10";
+		} else if (comparisonResult < PartyMemberConstant.SMALL) {
+			result = result + "00";
+		} else {
+			result = result + "01";
+		}
+		return result;
+	}
+
 }

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

@@ -0,0 +1,60 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.form;
+
+import com.epmet.dto.UserResiInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 用户居民端注册接口
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-03-30
+ */
+@Data
+public class ResiInfoSubmitFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+	/**
+	 * 客户Id (customer.id)
+	 */
+	private String customerId;
+
+	/**
+	 * 网格Id (customer_grid.id)
+	 */
+	private String gridId;
+
+	/**
+	 * 居民注册行为记录表Id resi_visit.id
+	 */
+	private String resiVisitId;
+
+	/**
+	 * 用户在居民端完善的个人信息
+	 */
+	private UserResiInfoDTO resiInfo;
+
+
+}

epmet-user/epmet-user-server/pom.xml

@@ -130,7 +130,7 @@
         </profile>
         <profile>
             <id>test</id>
-            <!--<activation>
+          <!--  <activation>
                 <activeByDefault>true</activeByDefault>
             </activation>-->
             <properties>

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

@@ -126,6 +126,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEn
 		//获取角色ID
 		RoleDTO roleDTO = new RoleDTO();
 		roleDTO.setRoleKey(userRoleDTO.getRoleKey());
+		roleDTO.setApp(userRoleDTO.getApp());
 		RoleDTO role = roleService.getRoleByKey(roleDTO);
 		userRoleDTO.setRoleId(role.getId());
 		baseDao.insert(ConvertUtils.sourceToTarget(userRoleDTO, UserRoleEntity.class));