diff --git a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java index 08bee7c..4689bc9 100644 --- a/src/main/java/org/springblade/modules/business/controller/CommonApiController.java +++ b/src/main/java/org/springblade/modules/business/controller/CommonApiController.java @@ -13,13 +13,18 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tenant.annotation.TenantDS; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.modules.business.entity.Article; +import org.springblade.modules.business.entity.CupImg; import org.springblade.modules.business.service.IArticleService; +import org.springblade.modules.business.service.ICupImgService; import org.springblade.modules.business.vo.ArticleVO; import org.springblade.modules.business.wrapper.ArticleWrapper; import org.springframework.web.bind.annotation.*; +import java.util.Map; + /** * 控制器 * @@ -31,6 +36,7 @@ import org.springframework.web.bind.annotation.*; @AllArgsConstructor @Api(value = "公共接口", tags = "公共接口") public class CommonApiController extends BladeController { + private final ICupImgService cupImgService; /** * 获取系统时间 @@ -42,8 +48,35 @@ public class CommonApiController extends BladeController { return R.data(CommonDateUtil.getNowString()); } -// @GetMapping("/test") -// public R test() { -// return R.data(DictBizCache.getDictValueWithOffset(BusinessConstant.DICT_KEY_BLACKLIST_OUTDATE)); -// } + /** + * 获取用户头像 + */ + @GetMapping("/get-cup-img") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "获取用户头像", notes = "获取用户头像") + public R getCupImg(String cupCardNo) { + CupImg cupImg = cupImgService.getByCupCard(cupCardNo); + + return Func.isNotEmpty(cupImg) ? R.data(cupImg.getCupImg()) : R.data(""); + } + + /** + * 保存用户头像 + */ + @PostMapping("/save-cup-img") + @ApiOperationSupport(order = 3) + @ApiOperation(value = "保存用户头像", notes = "保存用户头像") + public R saveCupImg(@RequestBody Map requestObj) { + CupImg cupImg = BeanUtil.copy(requestObj.get("data"), CupImg.class); + + CupImg cupImgCheck = cupImgService.getByCupCard(cupImg.getCupCardNo()); + + if (Func.isEmpty(cupImgCheck)) { + cupImgService.save(cupImg); + } else { + cupImgCheck.setCupImg(cupImg.getCupImg()); + cupImgService.saveOrUpdate(cupImgCheck); + } + return R.status(true); + } } diff --git a/src/main/java/org/springblade/modules/business/entity/CupImg.java b/src/main/java/org/springblade/modules/business/entity/CupImg.java new file mode 100644 index 0000000..55bc693 --- /dev/null +++ b/src/main/java/org/springblade/modules/business/entity/CupImg.java @@ -0,0 +1,45 @@ +package org.springblade.modules.business.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.springblade.core.mp.base.BaseEntity; + +/** + * 体检人照片表 + * + * @author Chill + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("ca_cup_img") +public class CupImg extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * 体检人用户名 + */ + @ApiModelProperty(value = "体检人用户名") + private String cupName; + + /** + * 体检人证件号 + */ + @ApiModelProperty(value = "体检人证件号") + private String cupCardNo; + + /** + * 体检人联系方式 + */ + @ApiModelProperty(value = "体检人联系方式") + private String cupPhone; + + /** + * 体检人头像, base64存储 + */ + @ApiModelProperty(value = "体检人头像, base64存储") + private String cupImg; + +} diff --git a/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.java b/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.java new file mode 100644 index 0000000..a60f85a --- /dev/null +++ b/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.java @@ -0,0 +1,13 @@ +package org.springblade.modules.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import org.springblade.modules.business.entity.CupImg; + +/** + * Mapper 接口 + * + * @author Chill + */ +public interface CupImgMapper extends BaseMapper { + +} diff --git a/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.xml b/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.xml new file mode 100644 index 0000000..f33a4bc --- /dev/null +++ b/src/main/java/org/springblade/modules/business/mapper/CupImgMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/springblade/modules/business/service/ICupImgService.java b/src/main/java/org/springblade/modules/business/service/ICupImgService.java new file mode 100644 index 0000000..b0cc6b2 --- /dev/null +++ b/src/main/java/org/springblade/modules/business/service/ICupImgService.java @@ -0,0 +1,16 @@ +package org.springblade.modules.business.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.springblade.core.mp.base.BaseService; +import org.springblade.modules.business.entity.Blacklist; +import org.springblade.modules.business.entity.CupImg; + +/** + * 服务类 + * + * @author Chill + */ +public interface ICupImgService extends BaseService { + + CupImg getByCupCard(String cupCard); +} diff --git a/src/main/java/org/springblade/modules/business/service/impl/CupImgServiceImpl.java b/src/main/java/org/springblade/modules/business/service/impl/CupImgServiceImpl.java new file mode 100644 index 0000000..12ffca1 --- /dev/null +++ b/src/main/java/org/springblade/modules/business/service/impl/CupImgServiceImpl.java @@ -0,0 +1,24 @@ +package org.springblade.modules.business.service.impl; + +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import org.springblade.core.mp.base.BaseServiceImpl; +import org.springblade.modules.business.entity.CupImg; +import org.springblade.modules.business.mapper.CupImgMapper; +import org.springblade.modules.business.service.ICupImgService; +import org.springframework.stereotype.Service; + +/** + * 服务实现类 + * + * @author Chill + */ +@Service +public class CupImgServiceImpl extends BaseServiceImpl implements ICupImgService { + + @Override + public CupImg getByCupCard(String cupCard) { + return baseMapper.selectOne(Wrappers.lambdaQuery() + .eq(CupImg::getIsDeleted, false) + .eq(CupImg::getCupCardNo, cupCard)); + } +}