Merge remote-tracking branch 'origin/dev0.2' into dev0.2

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -6,9 +6,9 @@ package com.epmet.commons.tools.exception;
  * @Description:
  */
 public enum EpmetErrorCode {
-	CANNOT_JOIN_GROUP(8001, "只有认证居民才可以加入小组？？？？？"),
+	CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组，请选择您的身份"),
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
-	GROUP_ALREADY_EXISTED(8003,"组名已存在？？？？？？");
+	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改");
 
 	private int value;
 	private String name;

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

@@ -76,6 +76,18 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-partymember-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>resi-partymember-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@@ -0,0 +1,26 @@
+package com.epmet.modules.feign;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.feign.fallback.ResiPartymemberFeignClientFallBack;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @Description 居民端陌生人导览  调用epmet-user服务
+ * @Author sun
+ */
+@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class,url="http://localhost:8096")
+public interface ResiPartymemberFeignClient {
+
+    /**
+     * @return com.epmet.dto.result.ResiWarmheartedResultDTO
+     * @Author sun
+     * @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     **/
+    @PostMapping(value = "resi/partymember/resiwarmheartedapply/init")
+    Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java

@@ -0,0 +1,33 @@
+package com.epmet.modules.feign.fallback;
+
+import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.utils.ModuleUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.ResiRegisterFormDTO;
+import com.epmet.dto.result.LatestGridInfoResultDTO;
+import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.feign.EpmetUserFeignClient;
+import com.epmet.modules.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Description 居民端-陌生人导览 调用epmet-user服务
+ * @Author sun
+ * @Date 2020/3/16
+ */
+@Component
+public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignClient {
+
+    /**
+     * @return com.epmet.dto.result.ResiWarmheartedResultDTO
+     * @Author sun
+     * @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     * @Date 2020/3/30
+     **/
+    @Override
+    public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", formDTO);
+    }
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java

@@ -0,0 +1,36 @@
+package com.epmet.modules.warmhearted.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.modules.warmhearted.service.ResiWarmheartedService;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @Description 居民端热心居民申请接口入口
+ * @Author sun
+ * @since v1.0.0
+ */
+@RestController
+@RequestMapping("warmhearted")
+public class ResiWarmheartedController {
+    @Autowired
+    private ResiWarmheartedService resiWarmheartedService;
+
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     **/
+    @PostMapping("init")
+    public Result<ResiWarmheartedResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
+        return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO);
+    }
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java

@@ -0,0 +1,24 @@
+package com.epmet.modules.warmhearted.service;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
+
+/**
+ * @Description 居民端居民注册信息service
+ * @Author sun
+ */
+public interface ResiWarmheartedService {
+
+
+    /**
+     * 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO);
+
+}

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@@ -0,0 +1,33 @@
+package com.epmet.modules.warmhearted.service.impl;
+
+import com.epmet.commons.tools.security.dto.TokenDto;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.modules.feign.ResiPartymemberFeignClient;
+import com.epmet.modules.utils.ModuleConstant;
+import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description 居民端居民注册信息service
+ * @Author sun
+ * @Date 2020/3/30
+ */
+@Service
+public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
+
+    @Autowired
+    private ResiPartymemberFeignClient resiPartymemberFeignClient;
+
+    @Override
+    public Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return resiPartymemberFeignClient.init(formDTO);
+    }
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java

@@ -0,0 +1,59 @@
+/**
+ * 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.resi.partymember.dto.warmhearted.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 居民端-居民注册页面初始化-居民访问记录表新增数据-配置入参
+ * @author sun
+ */
+@Data
+public class ResiWarmheartedFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id CUSTOMER.id
+     */
+    @NotBlank(message = "客户ID不能为空")
+    private String customerId;
+
+    /**
+     * 网格Id
+     */
+    @NotBlank(message = "网格ID不能为空")
+    private String gridId;
+
+    /**
+     * 访问来源 指的是用户点的那个功能进入到的注册页面，就是一个功能模块的Id（value:feature+action）
+     */
+    @NotBlank(message = "访问来源不能为空")
+    private String visitFrom;
+
+    /**
+     * 用户Id
+     */
+    @NotBlank(message = "用户ID不能为空")
+    private String userId;
+
+}

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java

@@ -0,0 +1,45 @@
+/**
+ * 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.resi.partymember.dto.warmhearted.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据-配置入参
+ * @author sun
+ */
+@Data
+public class ResiWarmheartedResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 是否已申请热心居民 0：否， 1：是
+     */
+    private String isApplied;
+
+    /**
+     * 热心居民申请访问记录表(resi_warmhearted_visit)Id
+     */
+    private String resiWarmheartedVisitId;
+
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2018 人人开源 All rights reserved.
+ * <p>
+ * https://www.renren.io
+ * <p>
+ * 版权所有，侵权必究！
+ */
+
+package com.epmet.modules.warmhearted.constant;
+
+/**
+ * 常量
+ * @author sun
+ * @since 1.0.0
+ */
+public interface ResiWarmheartedVisitConstant {
+
+    /**
+     * 最后一次操作行为-初始化
+     */
+    String INITIALIZE = "initialize";
+
+    /**
+     * 最后一次操作行为-提交成功
+     */
+    String SUCCESS = "success";
+
+    /**
+     * 最后一次操作行为-提交失败
+     */
+    String FAILD="faild";
+}

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java

@@ -28,6 +28,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -91,4 +93,9 @@ public class ResiWarmheartedApplyController {
         ExcelUtils.exportExcelToTarget(response, null, list, ResiWarmheartedApplyExcel.class);
     }
 
+    @PostMapping("init")
+    public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO){
+        return resiWarmheartedApplyService.getResiWarmheartedApply(resiWarmheartedFormDTO);
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java

@@ -19,6 +19,8 @@ package com.epmet.modules.warmhearted.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
+import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -30,4 +32,10 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEntity> {
 
+    /**
+     * 查询用户是否已存在热心居民申请
+     * @param formDTO
+     * @return
+     */
+    ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java

@@ -19,6 +19,7 @@ package com.epmet.modules.warmhearted.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
+import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -30,4 +31,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
+    void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java

@@ -19,8 +19,11 @@ package com.epmet.modules.warmhearted.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -92,4 +95,13 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java

@@ -19,8 +19,11 @@ package com.epmet.modules.warmhearted.service;
 
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -92,4 +95,13 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 居民端-热心居民申请访问记录表新增数据
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
 }

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

@@ -21,13 +21,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
 import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
+import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,6 +53,10 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
 
     @Autowired
     private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
+    @Autowired
+    private ResiWarmheartedVisitService resiWarmheartedVisitService;
+    @Autowired
+    private ResiWarmheartedApplyDao resiWarmheartedApplyDao;
 
     @Override
     public PageData<ResiWarmheartedApplyDTO> page(Map<String, Object> params) {
@@ -65,8 +74,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         return ConvertUtils.sourceToTarget(entityList, ResiWarmheartedApplyDTO.class);
     }
 
-    private QueryWrapper<ResiWarmheartedApplyEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<ResiWarmheartedApplyEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<ResiWarmheartedApplyEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +110,21 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO) {
+        //1:热心居民申请行为记录表新增数据
+        ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
+        //2:查询是否已申请热心居民
+        ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(formDTO);
+        if (null == resiWarmheartedApplyDTO || StringUtils.isEmpty(resiWarmheartedApplyDTO.getId())) {
+            //是否已申请热心居民 0：否， 1：是
+            resiWarmheartedResultDTO.setIsApplied(NumConstant.ZERO_STR);
+        } else {
+            resiWarmheartedResultDTO.setIsApplied(NumConstant.ONE_STR);
+        }
+        return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
+    }
+
+
 }

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

@@ -19,21 +19,27 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
 import com.epmet.modules.warmhearted.dao.ResiWarmheartedVisitDao;
 import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
 import com.epmet.modules.warmhearted.redis.ResiWarmheartedVisitRedis;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
 import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
+import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
+import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -48,6 +54,8 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
 
     @Autowired
     private ResiWarmheartedVisitRedis resiWarmheartedVisitRedis;
+    @Autowired
+    private ResiWarmheartedVisitDao resiWarmheartedVisitDao;
 
     @Override
     public PageData<ResiWarmheartedVisitDTO> page(Map<String, Object> params) {
@@ -101,4 +109,29 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) {
+        Date date = new Date();
+        ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
+        resiWarmheartedVisitDTO.setCustomerId(formDTO.getCustomerId());
+        resiWarmheartedVisitDTO.setGridId(formDTO.getGridId());
+        resiWarmheartedVisitDTO.setUserId(formDTO.getUserId());
+        resiWarmheartedVisitDTO.setVisitFrom(formDTO.getVisitFrom());
+        //最后一次操作行为（initialize:初始化 sms_code:获取验证码 success:提交成功  faild:提交失败）
+        resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE);
+        resiWarmheartedVisitDTO.setVisitTime(date);
+        //UUID
+        resiWarmheartedVisitDTO.setId(IdWorker.get32UUID());
+        resiWarmheartedVisitDTO.setDelFlag(NumConstant.ZERO);
+        resiWarmheartedVisitDTO.setRevision(NumConstant.ZERO);
+        resiWarmheartedVisitDTO.setCreatedBy(formDTO.getUserId());
+        resiWarmheartedVisitDTO.setCreatedTime(date);
+        resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
+        resiWarmheartedVisitDTO.setUpdatedTime(date);
+        resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
+        ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
+        resiWarmheartedResultDTO.setResiWarmheartedVisitId(resiWarmheartedVisitDTO.getId());
+        return resiWarmheartedResultDTO;
+    }
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberBaseInfoDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberBaseInfoDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity" id="partymemberBaseInfoMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberConfirmAutoDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberConfirmAutoDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberConfirmAutoDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberConfirmAutoEntity" id="partymemberConfirmAutoMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberConfirmManualDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberConfirmManualDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberConfirmManualDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberConfirmManualEntity" id="partymemberConfirmManualMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberInfoDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberInfoDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberInfoEntity" id="partymemberInfoMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberRegisterRelationDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberRegisterRelationDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberRegisterRelationDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberRegisterRelationEntity" id="partymemberRegisterRelationMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberVisitDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.PartymemberVisitDao">
+<mapper namespace="com.epmet.modules.partymember.dao.PartymemberVisitDao">
 
     <resultMap type="com.epmet.modules.partymember.entity.PartymemberVisitEntity" id="partymemberVisitMap">
         <result property="id" column="ID"/>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.ResiWarmheartedApplyDao">
+<mapper namespace="com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao">
 
     <resultMap type="com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity" id="resiWarmheartedApplyMap">
         <result property="id" column="ID"/>
@@ -20,5 +20,39 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <sql id="sql">
+        rw.id AS "id",
+        rw.customer_id AS "customerid",
+        rw.grid_id AS "gridid",
+        rw.user_id AS "userid",
+        rw.reason AS "reason",
+        rw.audit_status AS "auditstatus",
+        rw.refuse_reason AS "refusereason",
+        rw.resi_warm_visit_id AS "resiwarmvisitid",
+        rw.del_flag AS "delflag",
+        rw.revision AS "revision",
+        rw.created_by AS "createdby",
+        rw.created_time AS "createdtime",
+        rw.updated_by AS "updatedby",
+        rw.updated_time AS "updatedtime"
+    </sql>
+
+    <select id="selectResiWarmheartedApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO"
+            resultType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
+        SELECT
+        <include refid="sql"></include>
+        FROM resi_warmhearted_apply rw
+        WHERE rw.del_flag = '0'
+        <if test='customerId != "" and customerId != null'>
+            AND rw.customer_id = #{customerId}
+        </if>
+        <if test='gridId != "" and gridId != null'>
+            AND rw.grid_id = #{gridId}
+        </if>
+        <if test='userId != "" and userId != null'>
+            AND rw.user_id = #{userId}
+        </if>
+    </select>
+
 
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.dao.ResiWarmheartedVisitDao">
+<mapper namespace="com.epmet.modules.warmhearted.dao.ResiWarmheartedVisitDao">
 
     <resultMap type="com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity" id="resiWarmheartedVisitMap">
         <result property="id" column="ID"/>
@@ -19,5 +19,36 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <insert id="saveResiWarmheartedVisit" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
+        INSERT INTO resi_warmhearted_visit (
+            id,
+            customer_id,
+            grid_id,
+            user_id,
+            visit_from,
+            operate_visit,
+            visit_time,
+            del_flag,
+            revision,
+            created_by,
+            created_time,
+            updated_by,
+            updated_time
+        )VALUES(
+            #{id},
+            #{customerId},
+            #{gridId},
+            #{userId},
+            #{visitFrom},
+            #{operateVisit},
+            #{visitTime},
+            #{delFlag},
+            #{revision},
+            #{createdBy},
+            #{createdTime},
+            #{updatedBy},
+            #{updatedTime}
+        )
+    </insert>
 
 </mapper>

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

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -123,8 +124,8 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setVisitTime(date);
         //UUID
         userResiRegisterVisitDTO.setId(IdWorker.get32UUID());
-        userResiRegisterVisitDTO.setDelFlag(0);
-        userResiRegisterVisitDTO.setRevision(0);
+        userResiRegisterVisitDTO.setDelFlag(NumConstant.ZERO);
+        userResiRegisterVisitDTO.setRevision(NumConstant.ZERO);
         userResiRegisterVisitDTO.setCreatedBy(formDTO.getUserId());
         userResiRegisterVisitDTO.setCreatedTime(date);
         userResiRegisterVisitDTO.setUpdatedBy(formDTO.getUserId());