szz
/
ShiShiYiBan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Damonny 2025-03-07 11:19:31 +08:00
parent f7abead0e5 2e24e0c508
commit 37dcf068f3
15 changed files with 674 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
yudao-module-haoka/yudao-module-haoka-api/src/main/java/cn/iocoder/yudao/module/haoka/enums/ErrorCodeConstants.java
View File

@ -53,4 +53,8 @@ public interface ErrorCodeConstants {
ErrorCode PRODUCT_EXITS = new ErrorCode(1_827_001_021, "产品已经存在");
ErrorCode ADDRESS_MAPPER_NOT_EXISTS = new ErrorCode(1_822_022_021, "地址关系不存在");
ErrorCode ADDRESS_MAPPER_NOT_CF = new ErrorCode(1_822_022_021, "地址关系重复");
}

95
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/addressmapper/AddressMapperController.java Normal file
View File

@ -0,0 +1,95 @@
package cn.iocoder.yudao.module.haoka.controller.admin.addressmapper;
import org.springframework.web.bind.annotation.*;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
import jakarta.validation.constraints.*;
import jakarta.validation.*;
import jakarta.servlet.http.*;
import java.util.*;
import java.io.IOException;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo.*;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import cn.iocoder.yudao.module.haoka.service.addressmapper.AddressMapperService;
@Tag(name = "管理后台 - 打卡记录")
@RestController
@RequestMapping("/haoka/address-mapper")
@Validated
public class AddressMapperController {
@Resource
private AddressMapperService addressMapperService;
@PostMapping("/create")
@Operation(summary = "创建打卡记录")
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:create')")
public CommonResult<Long> createAddressMapper(@Valid @RequestBody AddressMapperSaveReqVO createReqVO) {
return success(addressMapperService.createAddressMapper(createReqVO));
}
@PutMapping("/update")
@Operation(summary = "更新打卡记录")
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:update')")
public CommonResult<Boolean> updateAddressMapper(@Valid @RequestBody AddressMapperSaveReqVO updateReqVO) {
addressMapperService.updateAddressMapper(updateReqVO);
return success(true);
}
@DeleteMapping("/delete")
@Operation(summary = "删除打卡记录")
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:delete')")
public CommonResult<Boolean> deleteAddressMapper(@RequestParam("id") Long id) {
addressMapperService.deleteAddressMapper(id);
return success(true);
}
@GetMapping("/get")
@Operation(summary = "获得打卡记录")
@Parameter(name = "id", description = "编号", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:query')")
public CommonResult<AddressMapperRespVO> getAddressMapper(@RequestParam("id") Long id) {
AddressMapperDO addressMapper = addressMapperService.getAddressMapper(id);
return success(BeanUtils.toBean(addressMapper, AddressMapperRespVO.class));
}
@GetMapping("/page")
@Operation(summary = "获得打卡记录分页")
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:query')")
public CommonResult<PageResult<AddressMapperRespVO>> getAddressMapperPage(@Valid AddressMapperPageReqVO pageReqVO) {
PageResult<AddressMapperDO> pageResult = addressMapperService.getAddressMapperPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, AddressMapperRespVO.class));
}
@GetMapping("/export-excel")
@Operation(summary = "导出打卡记录 Excel")
@PreAuthorize("@ss.hasPermission('haoka:address-mapper:export')")
@ApiAccessLog(operateType = EXPORT)
public void exportAddressMapperExcel(@Valid AddressMapperPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
List<AddressMapperDO> list = addressMapperService.getAddressMapperPage(pageReqVO).getList();
// 导出 Excel
ExcelUtils.write(response, "打卡记录.xls", "数据", AddressMapperRespVO.class,
BeanUtils.toBean(list, AddressMapperRespVO.class));
}
}

31
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/addressmapper/vo/AddressMapperPageReqVO.java Normal file
View File

@ -0,0 +1,31 @@
package cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo;
import lombok.*;
import java.util.*;
import io.swagger.v3.oas.annotations.media.Schema;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@Schema(description = "管理后台 - 打卡记录分页 Request VO")
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class AddressMapperPageReqVO extends PageParam {
@Schema(description = "API来源", example = "22385")
private Long apiId;
@Schema(description = "通用地址编码")
private String commonAddressCode;
@Schema(description = "AIP地址编码")
private String apiAddressCode;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
}

39
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/addressmapper/vo/AddressMapperRespVO.java Normal file
View File

@ -0,0 +1,39 @@
package cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@Schema(description = "管理后台 - 打卡记录 Response VO")
@Data
@ExcelIgnoreUnannotated
public class AddressMapperRespVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11232")
@ExcelProperty("ID")
private Long id;
@Schema(description = "API来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "22385")
@ExcelProperty("API来源")
private Long apiId;
@Schema(description = "通用地址编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("通用地址编码")
private String commonAddressCode;
@Schema(description = "AIP地址编码", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("AIP地址编码")
private String apiAddressCode;
@Schema(description = "部门ID", example = "23824")
@ExcelProperty("部门ID")
private Long deptId;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;
}

27
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/addressmapper/vo/AddressMapperSaveReqVO.java Normal file
View File

@ -0,0 +1,27 @@
package cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
import jakarta.validation.constraints.*;
@Schema(description = "管理后台 - 打卡记录新增/修改 Request VO")
@Data
public class AddressMapperSaveReqVO {
@Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "11232")
private Long id;
@Schema(description = "API来源", requiredMode = Schema.RequiredMode.REQUIRED, example = "22385")
@NotNull(message = "API来源不能为空")
private Long apiId;
@Schema(description = "通用地址编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "通用地址编码不能为空")
private String commonAddressCode;
@Schema(description = "AIP地址编码", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "AIP地址编码不能为空")
private String apiAddressCode;
}

47
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/addressmapper/AddressMapperDO.java Normal file
View File

@ -0,0 +1,47 @@
package cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
/**
* 打卡记录 DO
*
* @author 超级管理员
*/
@TableName("haoka_address_mapper")
@KeySequence("haoka_address_mapper_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class AddressMapperDO extends BaseDO {
/**
* ID
*/
@TableId
private Long id;
/**
* API来源
*/
private Long apiId;
/**
* 通用地址编码
*/
private String commonAddressCode;
/**
* AIP地址编码
*/
private String apiAddressCode;
/**
* 部门ID
*/
private Long deptId;
}

29
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/addressmapper/AddressMapperMapper.java Normal file
View File

@ -0,0 +1,29 @@
package cn.iocoder.yudao.module.haoka.dal.mysql.addressmapper;
import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import org.apache.ibatis.annotations.Mapper;
import cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo.*;
/**
* 打卡记录 Mapper
*
* @author 超级管理员
*/
@Mapper
public interface AddressMapperMapper extends BaseMapperX<AddressMapperDO> {
default PageResult<AddressMapperDO> selectPage(AddressMapperPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<AddressMapperDO>()
.eqIfPresent(AddressMapperDO::getApiId, reqVO.getApiId())
.eqIfPresent(AddressMapperDO::getCommonAddressCode, reqVO.getCommonAddressCode())
.eqIfPresent(AddressMapperDO::getApiAddressCode, reqVO.getApiAddressCode())
.betweenIfPresent(AddressMapperDO::getCreateTime, reqVO.getCreateTime())
.orderByDesc(AddressMapperDO::getId));
}
}

57
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/addressmapper/AddressMapperService.java Normal file
View File

@ -0,0 +1,57 @@
package cn.iocoder.yudao.module.haoka.service.addressmapper;
import java.util.*;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.*;
import cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo.*;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
/**
* 打卡记录 Service 接口
*
* @author 超级管理员
*/
public interface AddressMapperService extends IService<AddressMapperDO> {
/**
* 创建打卡记录
*
* @param createReqVO 创建信息
* @return 编号
*/
Long createAddressMapper(@Valid AddressMapperSaveReqVO createReqVO);
/**
* 更新打卡记录
*
* @param updateReqVO 更新信息
*/
void updateAddressMapper(@Valid AddressMapperSaveReqVO updateReqVO);
/**
* 删除打卡记录
*
* @param id 编号
*/
void deleteAddressMapper(Long id);
/**
* 获得打卡记录
*
* @param id 编号
* @return 打卡记录
*/
AddressMapperDO getAddressMapper(Long id);
/**
* 获得打卡记录分页
*
* @param pageReqVO 分页查询
* @return 打卡记录分页
*/
PageResult<AddressMapperDO> getAddressMapperPage(AddressMapperPageReqVO pageReqVO);
}

90
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/addressmapper/AddressMapperServiceImpl.java Normal file
View File

@ -0,0 +1,90 @@
package cn.iocoder.yudao.module.haoka.service.addressmapper;
import cn.hutool.core.collection.CollectionUtil;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.haoka.api.ApiFrom;
import cn.iocoder.yudao.module.haoka.utils.SnowflakeId;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
import cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo.*;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.pojo.PageParam;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.haoka.dal.mysql.addressmapper.AddressMapperMapper;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*;
/**
* 打卡记录 Service 实现类
*
* @author 超级管理员
*/
@Service
@Validated
public class AddressMapperServiceImpl extends ServiceImpl<AddressMapperMapper,AddressMapperDO> implements AddressMapperService {
@Resource
private AddressMapperMapper addressMapperMapper;
@Override
public Long createAddressMapper(AddressMapperSaveReqVO createReqVO) {
List<AddressMapperDO> addressMapperDOS = addressMapperMapper.selectList(new LambdaQueryWrapperX<AddressMapperDO>()
.eq(AddressMapperDO::getApiId, createReqVO.getApiId())
.eq(AddressMapperDO::getCommonAddressCode, createReqVO.getCommonAddressCode())
.eq(AddressMapperDO::getApiAddressCode, createReqVO.getApiAddressCode())
);
if (CollectionUtil.isNotEmpty(addressMapperDOS)){
throw exception(ADDRESS_MAPPER_NOT_CF);
}
// 插入
AddressMapperDO addressMapper = BeanUtils.toBean(createReqVO, AddressMapperDO.class);
addressMapper.setId(SnowflakeId.generate());
addressMapperMapper.insert(addressMapper);
// 返回
return addressMapper.getId();
}
@Override
public void updateAddressMapper(AddressMapperSaveReqVO updateReqVO) {
// 校验存在
validateAddressMapperExists(updateReqVO.getId());
// 更新
AddressMapperDO updateObj = BeanUtils.toBean(updateReqVO, AddressMapperDO.class);
addressMapperMapper.updateById(updateObj);
}
@Override
public void deleteAddressMapper(Long id) {
// 校验存在
validateAddressMapperExists(id);
// 删除
addressMapperMapper.deleteById(id);
}
private void validateAddressMapperExists(Long id) {
if (addressMapperMapper.selectById(id) == null) {
throw exception(ADDRESS_MAPPER_NOT_EXISTS);
}
}
@Override
public AddressMapperDO getAddressMapper(Long id) {
return addressMapperMapper.selectById(id);
}
@Override
public PageResult<AddressMapperDO> getAddressMapperPage(AddressMapperPageReqVO pageReqVO) {
return addressMapperMapper.selectPage(pageReqVO);
}
}

6
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/ApiDealServiceImpl.java
View File

@ -12,6 +12,7 @@ import cn.iocoder.yudao.module.haoka.service.onsaleproduct.OnSaleProductService;
import cn.iocoder.yudao.module.haoka.service.superiorapi.SuperiorApiService;
import cn.iocoder.yudao.module.haoka.service.superiorapilog.SuperiorApiLogService;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
import org.springframework.stereotype.Component;
@ -19,6 +20,7 @@ import org.springframework.stereotype.Component;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@Slf4j
@Component(ApiFrom.ApiDealStrategyImpl)
public class ApiDealServiceImpl implements ApiDealStrategyService {
@ -156,7 +158,9 @@ public class ApiDealServiceImpl implements ApiDealStrategyService {
&& onSaleProductPreOrder.getSuperiorApiRespVO().getApiFrom() != null
&& ApiFrom.fromId(onSaleProductPreOrder.getSuperiorApiRespVO().getApiFrom()) == ApiFrom.LianTong) {
} else {
superiorApiLogService.createSuperiorApiLog(logVO);
if (!"OrdersDO 本地不存在该订单".equals(logVO.getErrorInfo())){
superiorApiLogService.createSuperiorApiLog(logVO);
}
}
}
}

44
yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/service/api/strategy/LianTongApiDealStrategy.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.haoka.service.api.strategy;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.haoka.api.ApiFrom;
import cn.iocoder.yudao.module.haoka.api.ApiLianTongService;
import cn.iocoder.yudao.module.haoka.api.hainandianxin.HaiNanDianXinApi;
@ -19,9 +20,11 @@ import cn.iocoder.yudao.module.haoka.controller.admin.address.vo.AddressVo;
import cn.iocoder.yudao.module.haoka.controller.admin.onsaleproduct.vo.OnSaleProductPreOrderRespVO;
import cn.iocoder.yudao.module.haoka.controller.admin.superiorapilog.vo.SuperiorApiLogSaveReqVO;
import cn.iocoder.yudao.module.haoka.controller.admin.superiorproductconfig.vo.SuperiorProductConfigRespVO;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import cn.iocoder.yudao.module.haoka.dal.dataobject.superiorapi.SuperiorApiDO;
import cn.iocoder.yudao.module.haoka.dal.dataobject.superiorproductconfig.SuperiorProductConfigDO;
import cn.iocoder.yudao.module.haoka.service.address.HaoKaAddressService;
import cn.iocoder.yudao.module.haoka.service.addressmapper.AddressMapperService;
import cn.iocoder.yudao.module.haoka.service.api.*;
import cn.iocoder.yudao.module.haoka.service.api.models.*;
import cn.iocoder.yudao.module.haoka.service.onsaleproduct.OnSaleProductService;
@ -55,9 +58,29 @@ public class LianTongApiDealStrategy implements ApiDealStrategy {
@Resource
private HaoKaAddressService haoKaAddressService;
private LianTongArea getAddress(String code) {
@Resource
private AddressMapperService addressMapperService;
private LianTongArea getAddress( String code) {
try {
return LianTongAreaUtils.getArea(code);
LianTongArea area = LianTongAreaUtils.getArea(code);
if (area == null) {
AddressMapperDO mapperDO = addressMapperService.getOne(new LambdaQueryWrapperX<AddressMapperDO>()
.eq(AddressMapperDO::getApiId, ApiFrom.LianTong.getId())
.eq(AddressMapperDO::getCommonAddressCode, code));
if (mapperDO == null) {
return null;
}
if (StringUtils.isEmpty(mapperDO.getApiAddressCode())) {
return null;
}
return LianTongAreaUtils.getArea(mapperDO.getApiAddressCode());
}
return area;
} catch (Exception e) {
log.error("获取联通地址失败:{}--ErrL{}", code, e.getMessage());
}
@ -162,9 +185,6 @@ public class LianTongApiDealStrategy implements ApiDealStrategy {
}
// 自动选号接口----开始
if (StringUtils.isEmpty(param.getPlanMobile())) {
KingAutoNumSyncRequest autoNumSyncRequest = new KingAutoNumSyncRequest();
@ -221,18 +241,6 @@ public class LianTongApiDealStrategy implements ApiDealStrategy {
// 自动选号接口结束
// 2、提交预订单 得到token lianTongPreOrderSync
KingPreOrderSyncRequest preOrder = new KingPreOrderSyncRequest();
preOrder.setGoodsId(skuConfigVO.getSuperiorCode());
@ -263,7 +271,7 @@ public class LianTongApiDealStrategy implements ApiDealStrategy {
// 填充 preOrder 的其他字段
String orderTotalFee = configs.getString("ApiPrefix_orderTotalFee");
preOrder.setOrderTotalFee(orderTotalFee);
if (orderTotalFee==null){
if (orderTotalFee == null) {
preOrder.setOrderTotalFee("0");
}
preOrder.setIsOpenCF(configs.getString("ApiPrefix_isOpenCF"));

12
yudao-module-haoka/yudao-module-haoka-biz/src/main/resources/mapper/addressmapper/AddressMapperMapper.xml Normal file
View File

@ -0,0 +1,12 @@
<?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="cn.iocoder.yudao.module.haoka.dal.mysql.addressmapper.AddressMapperMapper">
<!--
一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
-->
</mapper>

142
yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/addressmapper/AddressMapperServiceImplTest.java Normal file
View File

@ -0,0 +1,142 @@
package cn.iocoder.yudao.module.haoka.service.addressmapper;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.mock.mockito.MockBean;
import jakarta.annotation.Resource;
import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
import cn.iocoder.yudao.module.haoka.controller.admin.addressmapper.vo.*;
import cn.iocoder.yudao.module.haoka.dal.dataobject.addressmapper.AddressMapperDO;
import cn.iocoder.yudao.module.haoka.dal.mysql.addressmapper.AddressMapperMapper;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Import;
import java.util.*;
import java.time.LocalDateTime;
import static cn.hutool.core.util.RandomUtil.*;
import static cn.iocoder.yudao.module.haoka.enums.ErrorCodeConstants.*;
import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.*;
import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.*;
import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.*;
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.Mockito.*;
/**
* {@link AddressMapperServiceImpl} 的单元测试类
*
* @author 超级管理员
*/
@Import(AddressMapperServiceImpl.class)
public class AddressMapperServiceImplTest extends BaseDbUnitTest {
@Resource
private AddressMapperServiceImpl addressMapperService;
@Resource
private AddressMapperMapper addressMapperMapper;
@Test
public void testCreateAddressMapper_success() {
// 准备参数
AddressMapperSaveReqVO createReqVO = randomPojo(AddressMapperSaveReqVO.class).setId(null);
// 调用
Long addressMapperId = addressMapperService.createAddressMapper(createReqVO);
// 断言
assertNotNull(addressMapperId);
// 校验记录的属性是否正确
AddressMapperDO addressMapper = addressMapperMapper.selectById(addressMapperId);
assertPojoEquals(createReqVO, addressMapper, "id");
}
@Test
public void testUpdateAddressMapper_success() {
// mock 数据
AddressMapperDO dbAddressMapper = randomPojo(AddressMapperDO.class);
addressMapperMapper.insert(dbAddressMapper);// @Sql: 先插入出一条存在的数据
// 准备参数
AddressMapperSaveReqVO updateReqVO = randomPojo(AddressMapperSaveReqVO.class, o -> {
o.setId(dbAddressMapper.getId()); // 设置更新的 ID
});
// 调用
addressMapperService.updateAddressMapper(updateReqVO);
// 校验是否更新正确
AddressMapperDO addressMapper = addressMapperMapper.selectById(updateReqVO.getId()); // 获取最新的
assertPojoEquals(updateReqVO, addressMapper);
}
@Test
public void testUpdateAddressMapper_notExists() {
// 准备参数
AddressMapperSaveReqVO updateReqVO = randomPojo(AddressMapperSaveReqVO.class);
// 调用, 并断言异常
assertServiceException(() -> addressMapperService.updateAddressMapper(updateReqVO), ADDRESS_MAPPER_NOT_EXISTS);
}
@Test
public void testDeleteAddressMapper_success() {
// mock 数据
AddressMapperDO dbAddressMapper = randomPojo(AddressMapperDO.class);
addressMapperMapper.insert(dbAddressMapper);// @Sql: 先插入出一条存在的数据
// 准备参数
Long id = dbAddressMapper.getId();
// 调用
addressMapperService.deleteAddressMapper(id);
// 校验数据不存在了
assertNull(addressMapperMapper.selectById(id));
}
@Test
public void testDeleteAddressMapper_notExists() {
// 准备参数
Long id = randomLongId();
// 调用, 并断言异常
assertServiceException(() -> addressMapperService.deleteAddressMapper(id), ADDRESS_MAPPER_NOT_EXISTS);
}
@Test
@Disabled // TODO 请修改 null 为需要的值，然后删除 @Disabled 注解
public void testGetAddressMapperPage() {
// mock 数据
AddressMapperDO dbAddressMapper = randomPojo(AddressMapperDO.class, o -> { // 等会查询到
o.setApiId(null);
o.setCommonAddressCode(null);
o.setApiAddressCode(null);
o.setCreateTime(null);
});
addressMapperMapper.insert(dbAddressMapper);
// 测试 apiId 不匹配
addressMapperMapper.insert(cloneIgnoreId(dbAddressMapper, o -> o.setApiId(null)));
// 测试 commonAddressCode 不匹配
addressMapperMapper.insert(cloneIgnoreId(dbAddressMapper, o -> o.setCommonAddressCode(null)));
// 测试 apiAddressCode 不匹配
addressMapperMapper.insert(cloneIgnoreId(dbAddressMapper, o -> o.setApiAddressCode(null)));
// 测试 createTime 不匹配
addressMapperMapper.insert(cloneIgnoreId(dbAddressMapper, o -> o.setCreateTime(null)));
// 准备参数
AddressMapperPageReqVO reqVO = new AddressMapperPageReqVO();
reqVO.setApiId(null);
reqVO.setCommonAddressCode(null);
reqVO.setApiAddressCode(null);
reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28));
// 调用
PageResult<AddressMapperDO> pageResult = addressMapperService.getAddressMapperPage(reqVO);
// 断言
assertEquals(1, pageResult.getTotal());
assertEquals(1, pageResult.getList().size());
assertPojoEquals(dbAddressMapper, pageResult.getList().get(0));
}
}

15
yudao-server/src/main/resources/db/migration/V6.0.1__address_mapp.sql Normal file
View File

@ -0,0 +1,15 @@
CREATE TABLE `haoka_address_mapper`
(
`id` bigint(20) NOT NULL COMMENT 'ID',
`api_id` bigint(20) DEFAULT NULL COMMENT '打卡类型',
`common_address_code` varchar(100) NOT NULL COMMENT '用户ID',
`api_address_code` varchar(11) DEFAULT NULL COMMENT '店铺ID',
`dept_id` bigint(20) DEFAULT NULL COMMENT '部门ID',
`creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者',
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
`updater` varchar(64) NOT NULL DEFAULT '' COMMENT '更新者',
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
`deleted` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否删除',
`tenant_id` bigint(20) NOT NULL DEFAULT '0' COMMENT '租户编号',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='打卡记录表';

55
yudao-server/src/main/resources/db/migration/V6.0.2__addresmp_menu.sql Normal file
View File

@ -0,0 +1,55 @@
-- 菜单 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status, component_name
)
VALUES (
'打卡记录管理', '', 2, 0, 1,
'address-mapper', '', 'haoka/addressmapper/index', 0, 'AddressMapper'
);
-- 按钮父菜单ID
-- 暂时只支持 MySQL。如果你是 Oracle、PostgreSQL、SQLServer 的话，需要手动修改 @parentId 的部分的代码
SELECT @parentId := LAST_INSERT_ID();
-- 按钮 SQL
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'打卡记录查询', 'haoka:address-mapper:query', 3, 1, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'打卡记录创建', 'haoka:address-mapper:create', 3, 2, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'打卡记录更新', 'haoka:address-mapper:update', 3, 3, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'打卡记录删除', 'haoka:address-mapper:delete', 3, 4, @parentId,
'', '', '', 0
);
INSERT INTO system_menu(
name, permission, type, sort, parent_id,
path, icon, component, status
)
VALUES (
'打卡记录导出', 'haoka:address-mapper:export', 3, 5, @parentId,
'', '', '', 0
);