diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index d034f07265..fbb6686ec6 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.modules.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -35,4 +36,11 @@ public interface EpmetUserFeignClient { **/ @PostMapping(value = "epmetuser/userresiregistervisit/init") Result init(ResiRegisterFormDTO formDTO); + + /** + * @Author sun + * @Description 居民端-居民注册信息提交 + **/ + @PostMapping(value = "epmetuser/userresiinfo/submit") + Result submit(UserResiInfoDTO userResiInfoDTO); } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java index 37f65911b8..d22948a183 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java @@ -13,7 +13,7 @@ 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") +@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = ResiPartymemberFeignClientFallBack.class) public interface ResiPartymemberFeignClient { /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java index 190298d177..fddff4a777 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java @@ -3,6 +3,7 @@ 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.UserResiInfoDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.result.LatestGridInfoResultDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -39,4 +40,16 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient { public Result init(ResiRegisterFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO); } + + /** + * @Author sun + * @Description 居民端-居民注册信息提交 + * @Date 2020/3/30 + **/ + @Override + public Result submit(UserResiInfoDTO userResiInfoDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO); + } + + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java index 58128b7e19..2bb24c3a1f 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java @@ -3,9 +3,11 @@ 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.ResiRegisterFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.resiregister.service.ResiRegisterService; +import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; @RequestMapping("resiregister") public class ResiRegisterController { @Autowired - private ResiRegisterService resiMineGridService; + private ResiRegisterService resiRegisterService; /** * @param @@ -32,7 +34,18 @@ public class ResiRegisterController { **/ @PostMapping("init") public Result init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) { - return resiMineGridService.init(tokenDTO, resiRegisterFormDTO); + return resiRegisterService.init(tokenDTO, resiRegisterFormDTO); } + /** + * @param + * @Author sun + * @Description 居民端-居民注册信息提交 + **/ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) { + return resiRegisterService.submit(tokenDTO, userResiInfoDTO); + } + + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java index 1b439f38db..5c4780b0f1 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java @@ -2,6 +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.ResiRegisterFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -22,4 +23,13 @@ public interface ResiRegisterService { */ Result init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO); + /** + * 居民端-居民注册信息提交 + * + * @param + * @return void + * @author sun + */ + Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO); + } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index 7b7f1fd0d0..f7324d7c42 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java @@ -2,6 +2,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.ResiRegisterFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.modules.feign.EpmetUserFeignClient; @@ -30,4 +31,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.init(formDTO); } + + @Override + public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) { + if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { + return new Result().error(ModuleConstant.USER_NOT_NULL); + } + userResiInfoDTO.setUserId(tokenDTO.getUserId()); + return epmetUserFeignClient.submit(userResiInfoDTO); + } } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java index b7a16ec445..b3d79d599e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java @@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable { private static final long serialVersionUID = 1L; + /** + * 唯一标识 + */ + private String id; + /** * 用户Id(主键) user.id */ @@ -108,4 +113,20 @@ public class UserResiInfoDTO implements Serializable { */ private String showName; + /** + * 客户Id (customer.id) + */ + private String customerId; + + /** + * 网格Id (customer_grid.id) + */ + private String gridId; + + /** + * 手机验证码 + */ + private String mobileCode; + + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java index 81496ffcfc..b84f59a51f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java @@ -34,7 +34,7 @@ public class ResiRegisterResultDTO implements Serializable { /** * 用户居民端注册访问记录表(user_resi_register_visit)Id */ - private String userResiRegisterVisitId; + private String resiVisitId; } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java index bb00c84ef9..3d883da630 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -34,4 +34,9 @@ public interface UserResiRegisterConstant { * 最后一次操作行为-提交失败 */ String FAILD="faild"; + + /** + * 最后一次操作行为-提交失败 + */ + String MOBILECODE_EXCEPTION="手机验证码输入错误！"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java index 9a032ce2b2..17b7e93685 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java @@ -51,19 +51,19 @@ public class UserResiInfoController { private UserResiInfoService userResiInfoService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = userResiInfoService.page(params); return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ + public Result get(@PathVariable("id") String id) { UserResiInfoDTO data = userResiInfoService.get(id); return new Result().ok(data); } @PostMapping - public Result save(@RequestBody UserResiInfoDTO dto){ + public Result save(@RequestBody UserResiInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); userResiInfoService.save(dto); @@ -71,7 +71,7 @@ public class UserResiInfoController { } @PutMapping - public Result update(@RequestBody UserResiInfoDTO dto){ + public Result update(@RequestBody UserResiInfoDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); userResiInfoService.update(dto); @@ -79,7 +79,7 @@ public class UserResiInfoController { } @DeleteMapping - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); userResiInfoService.delete(ids); @@ -104,4 +104,14 @@ public class UserResiInfoController { ValidatorUtils.validateEntity(userResiInfoFormDTO); return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO); } + + /** + * @param userResiInfoDTO + * @Author sun + * @Description 居民端-居民注册信息提交 + **/ + @PostMapping("submit") + public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) { + return userResiInfoService.submit(userResiInfoDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java index 2b18303846..14bcacd481 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java @@ -18,6 +18,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.RegisterRelationDTO; import com.epmet.entity.RegisterRelationEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,6 +35,6 @@ import java.util.List; public interface RegisterRelationDao extends BaseDao { List getListByUserId(@Param("userId") String userId); - + boolean saveRegisterRelation(RegisterRelationDTO registerRelationDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java index f4b9ac73d0..aa058b6350 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java @@ -40,4 +40,10 @@ public interface UserResiInfoDao extends BaseDao { * @Date 2020/3/30 11:10 **/ UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + + /** + * @Author sun + * @Description 用户居民端注册信息表新增数据 + **/ + void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java index e1a13706dc..7c4a768bce 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java @@ -36,4 +36,6 @@ public interface UserResiRegisterVisitDao extends BaseDao selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); + + void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java index 2ba4b0b66d..e40e9ea607 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.form.EnterGridFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.entity.RegisterRelationEntity; @@ -104,4 +105,11 @@ public interface RegisterRelationService extends BaseService getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO); + + /** + * @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 + * @Param userResiInfoDTO + * @Author sun + **/ + Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java index 8049e21039..db50e3c714 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java @@ -103,4 +103,13 @@ public interface UserResiInfoService extends BaseService { * @Date 2020/3/30 11:07 **/ Result getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO); + + /** + * 居民端-居民注册信息提交 + * + * @param userResiInfoDTO + * @return void + * @author sun + */ + Result submit(UserResiInfoDTO userResiInfoDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index 1a9c0e2b6b..9ec73fec91 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java @@ -21,8 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.entity.UserResiRegisterVisitEntity; @@ -105,4 +107,13 @@ public interface UserResiRegisterVisitService extends BaseService saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO); + + /** + * 居民端-居民注册信息提交-更新访问行为记录表数据 + * + * @param bl userResiInfoDTO + * @return void + * @author sun + */ + Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index df9d5a7ede..507147a3ef 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -19,7 +19,9 @@ package com.epmet.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.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; @@ -78,6 +80,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl page(Map params) { @@ -249,4 +254,34 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl page(Map params) { @@ -67,8 +79,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -120,4 +132,42 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl().ok(userResiInfoDTO); } + @Override + public Result submit(UserResiInfoDTO userResiInfoDTO) { + Result result = new Result(); + //1:手机验证码数据校验//TODO + + //2:验证码校验失败则更新行为记录表数据 返回前台结果 + if (false) { + userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO); + result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION); + return result; + } + //3:校验成功 数据存入居民注册表 更新行为记录表数据 + saveUserResiInfo(userResiInfoDTO); + result = userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO); + //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一 + result = registerRelationService.saveRegisterRelation(userResiInfoDTO); + return result; + } + + /** + * 居民注册信息表新增数据 + * + * @param userResiInfoDTO + * @Author sun + */ + @Transactional(rollbackFor = Exception.class) + public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) { + 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); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index 38438ec41f..1f2e8efde9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java @@ -28,8 +28,10 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserResiRegisterConstant; import com.epmet.dao.UserResiRegisterVisitDao; +import com.epmet.dto.UserResiInfoDTO; import com.epmet.dto.UserResiRegisterVisitDTO; import com.epmet.dto.form.ResiRegisterFormDTO; +import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; import com.epmet.entity.UserResiRegisterVisitEntity; import com.epmet.redis.UserResiRegisterVisitRedis; @@ -132,8 +134,26 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl().ok(resiRegisterResultDTO); } + @Override + @Transactional(rollbackFor = Exception.class) + public Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) { + UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO(); + if (bl) { + //最后一次操作行为-提交成功 + userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.SUCCESS); + } else { + //最后一次操作行为-提交失败 + userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.FAILD); + } + userResiRegisterVisitDTO.setId(userResiInfoDTO.getResiVisitId()); + userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId()); + userResiRegisterVisitDTO.setUpdatedTime(new Date()); + userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml index 7398491796..b84364b43d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml @@ -19,6 +19,40 @@ + + 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} + ) + + + + UPDATE user_resi_register_visit + SET last_operate_visit = #{lastOperateVisit}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime} + WHERE id = #{id} + \ No newline at end of file