居民端-居民注册、热心申请模块insert语句修改 使用系统insert方法

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

@@ -40,5 +40,4 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
      */
     ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
 
-    boolean saveResiWarmApply(ResiWarmheartedApplyDTO entity);
 }

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

@@ -34,6 +34,5 @@ import javax.management.relation.RelationSupport;
 @Mapper
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
-    boolean saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
     boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
 }

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

@@ -155,24 +155,14 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
      */
     public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
         Date date = new Date();
-        ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
-        resiWarmheartedApplyDTO.setCustomerId(formDTO.getCustomerId());
-        resiWarmheartedApplyDTO.setGridId(formDTO.getGridId());
-        resiWarmheartedApplyDTO.setUserId(formDTO.getUserId());
-        resiWarmheartedApplyDTO.setReason(formDTO.getReason());
-        resiWarmheartedApplyDTO.setResiWarmVisitId(formDTO.getResiWarmVisitId());
-        resiWarmheartedApplyDTO.setAuditStatus(ResiWarmheartedVisitConstant.UNDER_AUDITTING);
-        //UUID
-        resiWarmheartedApplyDTO.setId(IdWorker.get32UUID());
-        resiWarmheartedApplyDTO.setDelFlag(NumConstant.ZERO);
-        resiWarmheartedApplyDTO.setRevision(NumConstant.ZERO);
-        resiWarmheartedApplyDTO.setCreatedBy(formDTO.getUserId());
-        resiWarmheartedApplyDTO.setCreatedTime(date);
-        resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
-        resiWarmheartedApplyDTO.setUpdatedTime(date);
-        if(!resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO)){
-            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
-        }
+        ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setGridId(formDTO.getGridId());
+        entity.setUserId(formDTO.getUserId());
+        entity.setReason(formDTO.getReason());
+        entity.setResiWarmVisitId(formDTO.getResiWarmVisitId());
+        entity.setAuditStatus(ResiWarmheartedVisitConstant.UNDER_AUDITTING);
+        baseDao.insert(entity);
     }
 
 }

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

@@ -116,28 +116,17 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
 
     @Override
     public Result<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());
+        ResiWarmheartedVisitEntity entity = new ResiWarmheartedVisitEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setGridId(formDTO.getGridId());
+        entity.setUserId(formDTO.getUserId());
+        entity.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);
-        if(!resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO)){
-            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
-        }
+        entity.setOperateVisit(ResiWarmheartedVisitConstant.INITIALIZE);
+        entity.setVisitTime(new Date());
+        baseDao.insert(entity);
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
-        resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
+        resiWarmheartedResultDTO.setResiWarmVisitId(entity.getId());
         return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
     }
 

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

@@ -37,40 +37,6 @@
         rw.updated_time AS "updatedtime"
     </sql>
 
-    <insert id="saveResiWarmApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
-        INSERT INTO resi_warmhearted_apply (
-            id,
-            customer_id,
-            grid_id,
-            user_id,
-            reason,
-            audit_status,
-            refuse_reason,
-            resi_warm_visit_id,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        )VALUES(
-            #{id},
-            #{customerId},
-            #{gridId},
-            #{userId},
-            #{reason},
-            #{auditStatus},
-            #{refuseReason},
-            #{resiWarmVisitId},
-            #{delFlag},
-            #{revision},
-            #{createdBy},
-            #{createdTime},
-            #{updatedBy},
-            #{updatedTime}
-        )
-    </insert>
-
     <select id="selectResiWarmheartedApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO"
             resultType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
         SELECT

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

@@ -19,38 +19,6 @@
         <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>
     <update id="updateResiWarmVisitById"
             parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
         UPDATE resi_warmhearted_visit

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

@@ -35,6 +35,5 @@ import java.util.List;
 public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
 
     List<RegisterRelationEntity> getListByUserId(@Param("userId") String userId);
-    boolean saveRegisterRelation(RegisterRelationDTO registerRelationDTO);
 
 }

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

@@ -43,12 +43,6 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 **/
 	UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
-	/**
-	 * @Author sun
-	 * @Description 用户居民端注册信息表新增数据
-	 **/
-	boolean saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
-
 	/**
 	 * @Author sun
 	 * @Description 根据手机号查询居民注册信息(user_resi_info)表数据

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

@@ -33,8 +33,6 @@ import java.util.List;
 @Mapper
 public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitEntity> {
 
-    void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
-
     List<UserResiRegisterVisitDTO> selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 
     boolean updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);

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

@@ -40,6 +40,7 @@ import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.RegisterRelationEntity;
 import com.epmet.entity.UserCustomerEntity;
+import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgFeignClient;
 import com.epmet.redis.RegisterRelationRedis;
@@ -271,25 +272,18 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO) {
-        Date date = new Date();
-        RegisterRelationDTO registerRelationDTO = new RegisterRelationDTO();
-        registerRelationDTO.setCustomerId(userResiInfoDTO.getCustomerId());
-        registerRelationDTO.setGridId(userResiInfoDTO.getGridId());
-        registerRelationDTO.setUserId(userResiInfoDTO.getUserId());
+        RegisterRelationEntity entity = new RegisterRelationEntity();
+        entity.setCustomerId(userResiInfoDTO.getCustomerId());
+        entity.setGridId(userResiInfoDTO.getGridId());
+        entity.setUserId(userResiInfoDTO.getUserId());
         //首次注册用户 (0表示不参与计数  1表示参与计数)
-        registerRelationDTO.setFirstRegister(NumConstant.ONE_STR);
+        entity.setFirstRegister(NumConstant.ONE_STR);
         //注册用户 (0表示不参与计数  1表示参与计数)
-        registerRelationDTO.setRegister(NumConstant.ONE_STR);
+        entity.setRegister(NumConstant.ONE_STR);
         //参与用户 (0表示不参与计数  1表示参与计数)
-        registerRelationDTO.setParticipation(NumConstant.ONE_STR);
-        registerRelationDTO.setId(IdWorker.get32UUID());
-        registerRelationDTO.setDelFlag(NumConstant.ZERO);
-        registerRelationDTO.setRevision(NumConstant.ZERO);
-        registerRelationDTO.setCreatedBy(userResiInfoDTO.getUserId());
-        registerRelationDTO.setCreatedTime(date);
-        registerRelationDTO.setUpdatedBy(userResiInfoDTO.getUserId());
-        registerRelationDTO.setUpdatedTime(date);
-        registerRelationDao.saveRegisterRelation(registerRelationDTO);
+        entity.setParticipation(NumConstant.ONE_STR);
+        //居民注册关系表新增数据
+        insert(entity);
         return new Result();
     }
 

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

@@ -35,6 +35,7 @@ import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.entity.UserResiInfoEntity;
+import com.epmet.entity.UserRoleEntity;
 import com.epmet.redis.UserResiInfoRedis;
 import com.epmet.service.RegisterRelationService;
 import com.epmet.service.UserResiInfoService;
@@ -171,15 +172,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 	@Transactional(rollbackFor = Exception.class)
 	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
         //1:注册信息表新增数据
-        Date date = new Date();
-        userResiInfoDTO.setId(IdWorker.get32UUID());
-        userResiInfoDTO.setDelFlag(NumConstant.ZERO);
-        userResiInfoDTO.setRevision(NumConstant.ZERO);
-        userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
-        userResiInfoDTO.setCreatedTime(date);
-        userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
-        userResiInfoDTO.setUpdatedTime(date);
-        userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+		baseDao.insert(ConvertUtils.sourceToTarget(userResiInfoDTO, UserResiInfoEntity.class));
         //2:角色表新增角色数据
         UserRoleDTO userRoleDTO = new UserRoleDTO();
         userRoleDTO.setCustomerId(userResiInfoDTO.getCustomerId());

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

@@ -33,6 +33,7 @@ import com.epmet.dto.UserResiRegisterVisitDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.entity.UserResiInfoEntity;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 import com.epmet.redis.UserResiRegisterVisitRedis;
 import com.epmet.service.UserResiRegisterVisitService;
@@ -119,25 +120,18 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
     @Transactional(rollbackFor = Exception.class)
     public Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO) {
         Date date = new Date();
-        UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
-        userResiRegisterVisitDTO.setCustomerId(formDTO.getCustomerId());
-        userResiRegisterVisitDTO.setGridId(formDTO.getGridId());
-        userResiRegisterVisitDTO.setUserId(formDTO.getUserId());
-        userResiRegisterVisitDTO.setVisitFrom(formDTO.getVisitFrom());
+        UserResiRegisterVisitEntity entity = new UserResiRegisterVisitEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setGridId(formDTO.getGridId());
+        entity.setUserId(formDTO.getUserId());
+        entity.setVisitFrom(formDTO.getVisitFrom());
         //最后一次操作行为（initialize:初始化 sms_code:获取验证码 success:提交成功  faild:提交失败）
-        userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.INITIALIZE);
-        userResiRegisterVisitDTO.setVisitTime(date);
-        //UUID
-        userResiRegisterVisitDTO.setId(IdWorker.get32UUID());
-        userResiRegisterVisitDTO.setDelFlag(NumConstant.ZERO);
-        userResiRegisterVisitDTO.setRevision(NumConstant.ZERO);
-        userResiRegisterVisitDTO.setCreatedBy(formDTO.getUserId());
-        userResiRegisterVisitDTO.setCreatedTime(date);
-        userResiRegisterVisitDTO.setUpdatedBy(formDTO.getUserId());
-        userResiRegisterVisitDTO.setUpdatedTime(date);
-        userResiRegisterVisitDao.saveUserResiRegisterVisit(userResiRegisterVisitDTO);
+        entity.setLastOperateVisit(UserResiRegisterConstant.INITIALIZE);
+        entity.setVisitTime(date);
+        //居民注册行为记录表新增数据
+        insert(entity);
         ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
-        resiRegisterResultDTO.setResiVisitId(userResiRegisterVisitDTO.getId());
+        resiRegisterResultDTO.setResiVisitId(entity.getId());
         return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
     }
 

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

@@ -19,41 +19,6 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <insert id="saveRegisterRelation" parameterType="com.epmet.dto.RegisterRelationDTO">
-        INSERT INTO register_relation (
-            id,
-            customer_id,
-            grid_id,
-            user_id,
-            first_register,
-            register,
-            participation,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        )
-        VALUES
-            (
-                #{id},
-                #{customerId},
-                #{gridId},
-                #{userId},
-                #{firstRegister},
-                #{register},
-                #{participation},
-                #{delFlag},
-                #{revision},
-                #{createdBy},
-                #{createdTime},
-                #{updatedBy},
-                #{updatedTime}
-            )
-    </insert>
-
-
     <select id="getListByUserId" parameterType="string" resultType="com.epmet.entity.RegisterRelationEntity">
         SELECT *
 

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

@@ -38,44 +38,6 @@
         uri.updated_time AS "updatedtime"
     </sql>
 
-    <insert id="saveUserResiInfo" parameterType="com.epmet.dto.UserResiInfoDTO">
-        INSERT INTO user_resi_info (
-            id,
-            user_id,
-            reg_mobile,
-            surname,
-            `name`,
-            street,
-            district,
-            building_address,
-            resi_visit_id,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        )
-        VALUES
-            (
-                #{id},
-                #{userId},
-                #{regMobile},
-                #{surname},
-                #{name},
-                #{street},
-                #{district},
-                #{buildingAddress},
-                #{resiVisitId},
-                #{delFlag},
-                #{revision},
-                #{createdBy},
-                #{createdTime},
-                #{updatedBy},
-                #{updatedTime}
-            )
-    </insert>
-
     <!-- 查询用户注册信息   -->
     <select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"
             resultType="com.epmet.dto.UserResiInfoDTO">

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

@@ -19,37 +19,6 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-    <insert id="saveUserResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
-        INSERT INTO user_resi_register_visit (
-            id,
-            customer_id,
-            grid_id,
-            user_id,
-            visit_from,
-            last_operate_visit,
-            visit_time,
-            del_flag,
-            revision,
-            created_by,
-            created_time,
-            updated_by,
-            updated_time
-        )VALUES(
-            #{id},
-            #{customerId},
-            #{gridId},
-            #{userId},
-            #{visitFrom},
-            #{lastOperateVisit},
-            #{visitTime},
-            #{delFlag},
-            #{revision},
-            #{createdBy},
-            #{createdTime},
-            #{updatedBy},
-            #{updatedTime}
-        )
-    </insert>
     <update id="updateResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
         UPDATE user_resi_register_visit
         SET last_operate_visit = #{lastOperateVisit},