diff --git a/code_gen_history/V1_product1/codegen-SuperiorApi.zip b/code_gen_history/V1_product1/codegen-SuperiorApi.zip new file mode 100644 index 0000000000..9f17ba36dd Binary files /dev/null and b/code_gen_history/V1_product1/codegen-SuperiorApi.zip differ diff --git a/code_gen_history/V1_product1/codegen-SuperiorApiDevConfig.zip b/code_gen_history/V1_product1/codegen-SuperiorApiDevConfig.zip new file mode 100644 index 0000000000..e0fb3a074f Binary files /dev/null and b/code_gen_history/V1_product1/codegen-SuperiorApiDevConfig.zip differ diff --git a/code_gen_history/V1_product1/codegen-SuperiorApiSkuConfig.zip b/code_gen_history/V1_product1/codegen-SuperiorApiSkuConfig.zip new file mode 100644 index 0000000000..0a6c884930 Binary files /dev/null and b/code_gen_history/V1_product1/codegen-SuperiorApiSkuConfig.zip differ diff --git a/code_gen_history/V1_product1/codegen-SuperiorProductConfig.zip b/code_gen_history/V1_product1/codegen-SuperiorProductConfig.zip new file mode 100644 index 0000000000..8ce6602712 Binary files /dev/null and b/code_gen_history/V1_product1/codegen-SuperiorProductConfig.zip differ diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/SuperiorApiController.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/SuperiorApiController.java index 74be9d037a..694b8264de 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/SuperiorApiController.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/SuperiorApiController.java @@ -185,7 +185,7 @@ public class SuperiorApiController { @GetMapping("/superior-product-config/page") @Operation(summary = "获得产品对接上游配置分页") - @Parameter(name = "haokaSuperiorApiId", description = "上游接口ID") + @Parameter(name = "haokaSuperiorApiId", description = "ID") @PreAuthorize("@ss.hasPermission('haoka:superior-api:query')") public CommonResult> getSuperiorProductConfigPage(PageParam pageReqVO, @RequestParam("haokaSuperiorApiId") Long haokaSuperiorApiId) { diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigPageReqVO.java index a7dca55ffc..eb094860df 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigPageReqVO.java @@ -15,18 +15,27 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class SuperiorApiDevConfigPageReqVO extends PageParam { - @Schema(description = "ID", example = "2733") + @Schema(description = "ID", example = "627") private Long haokaSuperiorApiId; @Schema(description = "标识") private String code; - @Schema(description = "名字", example = "赵六") + @Schema(description = "名字", example = "王五") private String name; @Schema(description = "值") private String value; + @Schema(description = "说明") + private String remarks; + + @Schema(description = "输入类型", example = "2") + private Integer inputType; + + @Schema(description = "选项(逗号,分割)") + private String inputSelectValues; + @Schema(description = "创建时间") @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND) private LocalDateTime[] createTime; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigRespVO.java index 6bf81cc06b..68c7b1dce8 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigRespVO.java @@ -6,19 +6,17 @@ import java.util.*; import org.springframework.format.annotation.DateTimeFormat; import java.time.LocalDateTime; import com.alibaba.excel.annotation.*; -import cn.iocoder.yudao.framework.excel.core.annotations.DictFormat; -import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; @Schema(description = "管理后台 - 上游API接口开发配置 Response VO") @Data @ExcelIgnoreUnannotated public class SuperiorApiDevConfigRespVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10380") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4692") @ExcelProperty("ID") private Long id; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2733") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "627") @ExcelProperty("ID") private Long haokaSuperiorApiId; @@ -26,7 +24,7 @@ public class SuperiorApiDevConfigRespVO { @ExcelProperty("标识") private String code; - @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @ExcelProperty("名字") private String name; @@ -34,18 +32,12 @@ public class SuperiorApiDevConfigRespVO { @ExcelProperty("值") private String value; - @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty(value = "是否必填", converter = DictConvert.class) - @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Boolean required; - @Schema(description = "说明") @ExcelProperty("说明") private String remarks; - @Schema(description = "输入类型") - @ExcelProperty(value = "输入类型", converter = DictConvert.class) - @DictFormat("haoka_superior_api_input_type") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 + @Schema(description = "输入类型", example = "2") + @ExcelProperty("输入类型") private Integer inputType; @Schema(description = "选项(逗号,分割)") diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigSaveReqVO.java index 9ecae211bd..e3098270a5 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiDevConfigSaveReqVO.java @@ -9,10 +9,10 @@ import jakarta.validation.constraints.*; @Data public class SuperiorApiDevConfigSaveReqVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "10380") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "4692") private Long id; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "2733") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "627") @NotNull(message = "ID不能为空") private Long haokaSuperiorApiId; @@ -20,7 +20,7 @@ public class SuperiorApiDevConfigSaveReqVO { @NotEmpty(message = "标识不能为空") private String code; - @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "赵六") + @Schema(description = "名字", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五") @NotEmpty(message = "名字不能为空") private String name; @@ -28,14 +28,10 @@ public class SuperiorApiDevConfigSaveReqVO { @NotEmpty(message = "值不能为空") private String value; - @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否必填不能为空") - private Boolean required; - @Schema(description = "说明") private String remarks; - @Schema(description = "输入类型") + @Schema(description = "输入类型", example = "2") private Integer inputType; @Schema(description = "选项(逗号,分割)") diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigPageReqVO.java index 404783d341..bb2a8a6147 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigPageReqVO.java @@ -15,10 +15,10 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @ToString(callSuper = true) public class SuperiorProductConfigPageReqVO extends PageParam { - @Schema(description = "上游接口ID", example = "7050") + @Schema(description = "上游接口ID", example = "31755") private Long haokaSuperiorApiId; - @Schema(description = "产品", example = "26555") + @Schema(description = "产品ID", example = "320") private Long haokaProductId; @Schema(description = "是否已配置") @@ -27,9 +27,6 @@ public class SuperiorProductConfigPageReqVO extends PageParam { @Schema(description = "值") private String config; - @Schema(description = "是否必填") - private Boolean required; - @Schema(description = "说明") private String remarks; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigRespVO.java index 64b0c1b08b..50648768f1 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigRespVO.java @@ -14,16 +14,16 @@ import cn.iocoder.yudao.framework.excel.core.convert.DictConvert; @ExcelIgnoreUnannotated public class SuperiorProductConfigRespVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21785") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28128") @ExcelProperty("ID") private Long id; - @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") + @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31755") @ExcelProperty("上游接口ID") private Long haokaSuperiorApiId; - @Schema(description = "产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") - @ExcelProperty("产品") + @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "320") + @ExcelProperty("产品ID") private Long haokaProductId; @Schema(description = "是否已配置", requiredMode = Schema.RequiredMode.REQUIRED) @@ -35,12 +35,7 @@ public class SuperiorProductConfigRespVO { @ExcelProperty("值") private String config; - @Schema(description = "是否必填") - @ExcelProperty(value = "是否必填", converter = DictConvert.class) - @DictFormat("infra_boolean_string") // TODO 代码优化：建议设置到对应的 DictTypeConstants 枚举类中 - private Boolean required; - - @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "说明") @ExcelProperty("说明") private String remarks; diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigSaveReqVO.java index 4325b08f4a..ac830ac0f1 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorproductconfig/vo/SuperiorProductConfigSaveReqVO.java @@ -9,26 +9,26 @@ import jakarta.validation.constraints.*; @Data public class SuperiorProductConfigSaveReqVO { - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21785") + @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "28128") private Long id; - @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") + @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "31755") @NotNull(message = "上游接口ID不能为空") private Long haokaSuperiorApiId; - @Schema(description = "产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") - @NotNull(message = "产品不能为空") + @Schema(description = "产品ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "320") + @NotNull(message = "产品ID不能为空") private Long haokaProductId; + @Schema(description = "是否已配置", requiredMode = Schema.RequiredMode.REQUIRED) + @NotNull(message = "是否已配置不能为空") + private Boolean isConfined; + @Schema(description = "值", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "值不能为空") private String config; - @Schema(description = "是否必填") - private Boolean required; - - @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "说明不能为空") + @Schema(description = "说明") private String remarks; } \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDevConfigDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDevConfigDO.java index 37badac33f..03e4f6bae6 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDevConfigDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDevConfigDO.java @@ -43,20 +43,12 @@ public class SuperiorApiDevConfigDO extends BaseDO { * 值 */ private String value; - /** - * 是否必填 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean required; /** * 说明 */ private String remarks; /** * 输入类型 - * - * 枚举 {@link TODO haoka_superior_api_input_type 对应的类} */ private Integer inputType; /** diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorproductconfig/SuperiorProductConfigDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorproductconfig/SuperiorProductConfigDO.java index 50669f5219..eeff6adf7a 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorproductconfig/SuperiorProductConfigDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorproductconfig/SuperiorProductConfigDO.java @@ -32,7 +32,7 @@ public class SuperiorProductConfigDO extends BaseDO { */ private Long haokaSuperiorApiId; /** - * 产品 + * 产品ID */ private Long haokaProductId; /** @@ -45,12 +45,6 @@ public class SuperiorProductConfigDO extends BaseDO { * 值 */ private String config; - /** - * 是否必填 - * - * 枚举 {@link TODO infra_boolean_string 对应的类} - */ - private Boolean required; /** * 说明 */ diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiDevConfigMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiDevConfigMapper.java index b2e7994dbc..cb2f8e8f3f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiDevConfigMapper.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiDevConfigMapper.java @@ -21,9 +21,12 @@ public interface SuperiorApiDevConfigMapper extends BaseMapperX selectPage(SuperiorApiDevConfigPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(SuperiorApiDevConfigDO::getHaokaSuperiorApiId, reqVO.getHaokaSuperiorApiId()) - .likeIfPresent(SuperiorApiDevConfigDO::getCode, reqVO.getCode()) + .eqIfPresent(SuperiorApiDevConfigDO::getCode, reqVO.getCode()) .likeIfPresent(SuperiorApiDevConfigDO::getName, reqVO.getName()) .eqIfPresent(SuperiorApiDevConfigDO::getValue, reqVO.getValue()) + .eqIfPresent(SuperiorApiDevConfigDO::getRemarks, reqVO.getRemarks()) + .eqIfPresent(SuperiorApiDevConfigDO::getInputType, reqVO.getInputType()) + .eqIfPresent(SuperiorApiDevConfigDO::getInputSelectValues, reqVO.getInputSelectValues()) .betweenIfPresent(SuperiorApiDevConfigDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(SuperiorApiDevConfigDO::getId)); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorproductconfig/SuperiorProductConfigMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorproductconfig/SuperiorProductConfigMapper.java index 7edc59f0ce..690e4e5923 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorproductconfig/SuperiorProductConfigMapper.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorproductconfig/SuperiorProductConfigMapper.java @@ -24,7 +24,6 @@ public interface SuperiorProductConfigMapper extends BaseMapperX getSuperiorProductConfigPage(PageParam pageReqVO, Long haokaSuperiorApiId); diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiDevConfigServiceImplTest.java b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiDevConfigServiceImplTest.java index 38ce8783ad..ce0ff8c911 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiDevConfigServiceImplTest.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiDevConfigServiceImplTest.java @@ -114,6 +114,9 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { o.setCode(null); o.setName(null); o.setValue(null); + o.setRemarks(null); + o.setInputType(null); + o.setInputSelectValues(null); o.setCreateTime(null); }); superiorApiDevConfigMapper.insert(dbSuperiorApiDevConfig); @@ -125,6 +128,12 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setName(null))); // 测试 value 不匹配 superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setValue(null))); + // 测试 remarks 不匹配 + superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setRemarks(null))); + // 测试 inputType 不匹配 + superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setInputType(null))); + // 测试 inputSelectValues 不匹配 + superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setInputSelectValues(null))); // 测试 createTime 不匹配 superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setCreateTime(null))); // 准备参数 @@ -133,6 +142,9 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { reqVO.setCode(null); reqVO.setName(null); reqVO.setValue(null); + reqVO.setRemarks(null); + reqVO.setInputType(null); + reqVO.setInputSelectValues(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); // 调用 diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorproductconfig/SuperiorProductConfigServiceImplTest.java b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorproductconfig/SuperiorProductConfigServiceImplTest.java index 2fab6ae02c..5a04b7c5c3 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorproductconfig/SuperiorProductConfigServiceImplTest.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorproductconfig/SuperiorProductConfigServiceImplTest.java @@ -114,7 +114,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { o.setHaokaProductId(null); o.setIsConfined(null); o.setConfig(null); - o.setRequired(null); o.setRemarks(null); o.setCreateTime(null); }); @@ -127,8 +126,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setIsConfined(null))); // 测试 config 不匹配 superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setConfig(null))); - // 测试 required 不匹配 - superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setRequired(null))); // 测试 remarks 不匹配 superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setRemarks(null))); // 测试 createTime 不匹配 @@ -139,7 +136,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { reqVO.setHaokaProductId(null); reqVO.setIsConfined(null); reqVO.setConfig(null); - reqVO.setRequired(null); reqVO.setRemarks(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); diff --git a/yudao-server/src/main/resources/application.yaml b/yudao-server/src/main/resources/application.yaml index 1a4af4cbdc..3ae960181d 100644 --- a/yudao-server/src/main/resources/application.yaml +++ b/yudao-server/src/main/resources/application.yaml @@ -15,6 +15,9 @@ spring: max-file-size: 16MB # 单个文件大小 max-request-size: 32MB # 设置总上传的文件大小 + flyway: + out-of-order: true + # Jackson 配置项 jackson: serialization: diff --git a/yudao-server/src/main/resources/db/migration/V3.0.10__create_superior_product_config.sql b/yudao-server/src/main/resources/db/migration/V3.0.10__create_superior_product_config.sql index 1e88e1a67d..3bfe04115f 100644 --- a/yudao-server/src/main/resources/db/migration/V3.0.10__create_superior_product_config.sql +++ b/yudao-server/src/main/resources/db/migration/V3.0.10__create_superior_product_config.sql @@ -2,13 +2,12 @@ DROP TABLE IF EXISTS `haoka_superior_product_config`; CREATE TABLE `haoka_superior_product_config` ( `id` bigint(20) NOT NULL PRIMARY KEY COMMENT 'ID', - `haoka_superior_api_id` bigint(20) NOT NULL COMMENT 'ID', - `haoka_product_id` bigint(20) NOT NULL COMMENT 'ID', + `haoka_superior_api_id` bigint(20) NOT NULL COMMENT '上游接口ID', + `haoka_product_id` bigint(20) NOT NULL COMMENT '产品ID', `is_confined` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否已配置', `config` text NOT NULL COMMENT '值', - `required` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否必填', - `remarks` text NOT NULL COMMENT '说明', + `remarks` text COMMENT '说明', `dept_id` bigint(20) COMMENT '部门ID', `creator` varchar(64) NOT NULL DEFAULT '' COMMENT '创建者', diff --git a/yudao-server/src/main/resources/db/migration/V3.0.8__create_superior_api_dev_config.sql b/yudao-server/src/main/resources/db/migration/V3.0.8__create_superior_api_dev_config.sql index 5a3a044ae9..5184ab6d9c 100644 --- a/yudao-server/src/main/resources/db/migration/V3.0.8__create_superior_api_dev_config.sql +++ b/yudao-server/src/main/resources/db/migration/V3.0.8__create_superior_api_dev_config.sql @@ -6,7 +6,6 @@ CREATE TABLE `haoka_superior_api_dev_config` `code` varchar(512) NOT NULL DEFAULT '' COMMENT '标识', `name` varchar(512) NOT NULL DEFAULT '' COMMENT '名字', `value` varchar(1024) NOT NULL DEFAULT '' COMMENT '值', - `required` bit(1) NOT NULL DEFAULT b'0' COMMENT '是否必填', `remarks` text COMMENT '说明', `input_type` int(11) NOT NULL DEFAULT 1 COMMENT '输入类型', -- 枚举：haoka_superior_api_input_type：输入，单选，多选 `input_select_values` varchar(1024) NOT NULL DEFAULT '' COMMENT '选项(逗号,分割)',