diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/CardAuthRecordController.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/CardAuthRecordController.java index 6816466..1bb58d3 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/CardAuthRecordController.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/controller/CardAuthRecordController.java @@ -11,6 +11,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.xq.domain.CardAuthRecord; +import com.ruoyi.xq.dto.admin.authRecord.CardAuthRecordAdminVo; import com.ruoyi.xq.service.CardAuthRecordService; import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; @@ -39,8 +40,8 @@ public class CardAuthRecordController extends BaseController { */ @SaCheckPermission("xq:cardAuthRecord:list") @GetMapping("/list") - public TableDataInfo list(CardAuthRecord bo, PageQuery pageQuery) { - Page page = cardAuthRecordService.page(pageQuery.build(), Wrappers.lambdaQuery(bo)); + public TableDataInfo list(CardAuthRecordAdminVo bo, PageQuery pageQuery) { + Page page = cardAuthRecordService.pageAdmin(pageQuery, bo); return TableDataInfo.build(page); } @@ -75,7 +76,7 @@ public class CardAuthRecordController extends BaseController { @RepeatSubmit() @PutMapping() public R edit(@RequestBody CardAuthRecord bo) { - return toAjax(cardAuthRecordService.updateById(bo)); + return toAjax(cardAuthRecordService.refreshUserCardByAdmin(bo.getId())); } /** diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/Dynamic.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/Dynamic.java index b401f3d..a05e86d 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/Dynamic.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/domain/Dynamic.java @@ -44,11 +44,11 @@ public class Dynamic implements Serializable { /** * 城市ID */ - private Integer cityId; + private Integer cityCode; /** * 城市 */ - private String city; + private String cityName; /** * 是否有附件 0 没有 1 有 */ diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/authRecord/CardAuthRecordAdminVo.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/authRecord/CardAuthRecordAdminVo.java new file mode 100644 index 0000000..31c918e --- /dev/null +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/dto/admin/authRecord/CardAuthRecordAdminVo.java @@ -0,0 +1,13 @@ +package com.ruoyi.xq.dto.admin.authRecord; + +import com.ruoyi.xq.domain.CardAuthRecord; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class CardAuthRecordAdminVo extends CardAuthRecord implements Serializable { + private String nickname; + private String mobile; + private String avatar; +} diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/CardAuthRecordMapper.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/CardAuthRecordMapper.java index 2872e8b..3e88bfc 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/CardAuthRecordMapper.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/mapper/CardAuthRecordMapper.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.xq.domain.CardAuthRecord; +import com.ruoyi.xq.dto.admin.authRecord.CardAuthRecordAdminVo; +import org.apache.ibatis.annotations.Param; /** * 实名认证管理Mapper接口 @@ -11,4 +14,5 @@ import com.ruoyi.xq.domain.CardAuthRecord; */ public interface CardAuthRecordMapper extends BaseMapper { + Page pageAdmin(@Param("build") Page build, @Param("bo") CardAuthRecordAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/CardAuthRecordService.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/CardAuthRecordService.java index dd9be96..5657607 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/CardAuthRecordService.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/CardAuthRecordService.java @@ -1,7 +1,10 @@ package com.ruoyi.xq.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.xq.domain.CardAuthRecord; +import com.ruoyi.xq.dto.admin.authRecord.CardAuthRecordAdminVo; import com.ruoyi.xq.dto.common.faceauth.CommitAuthRecordResp; import com.ruoyi.xq.tencent.CreateAuthResp; import com.tencentcloudapi.faceid.v20180301.models.GetDetectInfoEnhancedResponse; @@ -22,4 +25,6 @@ public interface CardAuthRecordService extends IService { boolean refreshUserCardByAdmin(Long authRecordId); boolean updateCardRecordSuccess(CardAuthRecord cardAuthRecord, GetDetectInfoEnhancedResponse detectInfo); + + Page pageAdmin(PageQuery pageQuery, CardAuthRecordAdminVo bo); } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java index 803b17e..69b3cc8 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/CardAuthRecordServiceImpl.java @@ -3,7 +3,9 @@ package com.ruoyi.xq.service.impl; import cn.hutool.core.codec.Base64; import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.common.core.domain.PageQuery; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.spring.SpringUtils; @@ -15,6 +17,7 @@ import com.ruoyi.xq.domain.AuthOrder; import com.ruoyi.xq.domain.CardAuthRecord; import com.ruoyi.xq.domain.UserAuth; import com.ruoyi.xq.domain.UserInfo; +import com.ruoyi.xq.dto.admin.authRecord.CardAuthRecordAdminVo; import com.ruoyi.xq.dto.common.faceauth.CommitAuthRecordResp; import com.ruoyi.xq.enums.common.AuditEnum; import com.ruoyi.xq.enums.face.TokenStatusEnum; @@ -238,4 +241,9 @@ public class CardAuthRecordServiceImpl extends ServiceImpl pageAdmin(PageQuery pageQuery, CardAuthRecordAdminVo bo) { + return baseMapper.pageAdmin(pageQuery.build(), bo); + } } diff --git a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java index fdaacec..e5b9d72 100644 --- a/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java +++ b/ruoyi-xq/src/main/java/com/ruoyi/xq/service/impl/DynamicServiceImpl.java @@ -62,6 +62,8 @@ public class DynamicServiceImpl extends ServiceImpl imple dynamic.setUserId(user.getId()); dynamic.setUsercode(user.getUsercode()); dynamic.setContent(req.getContent()); + dynamic.setCityCode(user.getResidenceCityCode()); + dynamic.setCityName(user.getResidenceCityName()); dynamic.setAuditStatus(AuditEnum.AUDITING.getCode()); this.save(dynamic); List imagesList = req.getImageList(); diff --git a/ruoyi-xq/src/main/resources/mapper/xq/CardAuthRecordMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/CardAuthRecordMapper.xml index 543f169..1e61fd3 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/CardAuthRecordMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/CardAuthRecordMapper.xml @@ -19,6 +19,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + diff --git a/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml b/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml index 3c97d05..79519bf 100644 --- a/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml +++ b/ruoyi-xq/src/main/resources/mapper/xq/DynamicMapper.xml @@ -3,27 +3,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - - - - - - - - - - - - - - - - -