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 694b8264de..74be9d037a 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 460b55162c..a7dca55ffc 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 @@ -27,21 +27,6 @@ public class SuperiorApiDevConfigPageReqVO extends PageParam { @Schema(description = "值") private String value; - @Schema(description = "是否必填") - private Boolean required; - - @Schema(description = "说明") - private String remarks; - - @Schema(description = "输入类型") - private Integer inputType; - - @Schema(description = "选项(逗号,分割)") - private String inputSelectValues; - - @Schema(description = "部门ID", example = "6005") - private Long deptId; - @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 070c75dc82..6bf81cc06b 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 @@ -43,19 +43,15 @@ public class SuperiorApiDevConfigRespVO { @ExcelProperty("说明") private String remarks; - @Schema(description = "输入类型", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "输入类型") @ExcelProperty(value = "输入类型", converter = DictConvert.class) @DictFormat("haoka_superior_api_input_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Integer inputType; - @Schema(description = "选项(逗号,分割)", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "选项(逗号,分割)") @ExcelProperty("选项(逗号,分割)") private String inputSelectValues; - @Schema(description = "部门ID", example = "6005") - @ExcelProperty("部门ID") - private Long deptId; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") 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/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 f77302a6c7..9ecae211bd 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 @@ -35,15 +35,10 @@ public class SuperiorApiDevConfigSaveReqVO { @Schema(description = "说明") private String remarks; - @Schema(description = "输入类型", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "输入类型不能为空") + @Schema(description = "输入类型") private Integer inputType; - @Schema(description = "选项(逗号,分割)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "选项(逗号,分割)不能为空") + @Schema(description = "选项(逗号,分割)") private String inputSelectValues; - @Schema(description = "部门ID", example = "6005") - private Long deptId; - } \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiPageReqVO.java index dd7280ad5f..466e48638f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiPageReqVO.java @@ -37,9 +37,6 @@ public class SuperiorApiPageReqVO extends PageParam { @Schema(description = "是否已配置产品") private Boolean isSkuConfined; - @Schema(description = "部门ID", example = "12247") - private Long deptId; - @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/SuperiorApiRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiRespVO.java index e29a1e09c9..60ab1d052f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiRespVO.java @@ -45,20 +45,16 @@ public class SuperiorApiRespVO { @ExcelProperty("API文档") private String apiDoc; - @Schema(description = "是否已配置开发", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否已配置开发") @ExcelProperty(value = "是否已配置开发", converter = DictConvert.class) @DictFormat("infra_boolean_string") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Boolean isDevConfined; - @Schema(description = "是否已配置产品", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否已配置产品") @ExcelProperty(value = "是否已配置产品", converter = DictConvert.class) @DictFormat("infra_boolean_string") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Boolean isSkuConfined; - @Schema(description = "部门ID", example = "12247") - @ExcelProperty("部门ID") - private Long deptId; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") 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/SuperiorApiSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSaveReqVO.java index ad63d7e674..e880d885da 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSaveReqVO.java @@ -39,15 +39,10 @@ public class SuperiorApiSaveReqVO { @Schema(description = "API文档") private String apiDoc; - @Schema(description = "是否已配置开发", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否已配置开发不能为空") + @Schema(description = "是否已配置开发") private Boolean isDevConfined; - @Schema(description = "是否已配置产品", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否已配置产品不能为空") + @Schema(description = "是否已配置产品") private Boolean isSkuConfined; - @Schema(description = "部门ID", example = "12247") - private Long deptId; - } \ No newline at end of file diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigPageReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigPageReqVO.java index f5fd8baefc..bbc5d4e8b4 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigPageReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigPageReqVO.java @@ -27,18 +27,6 @@ public class SuperiorApiSkuConfigPageReqVO extends PageParam { @Schema(description = "是否必填") private Boolean required; - @Schema(description = "说明") - private String remarks; - - @Schema(description = "输入类型", example = "1") - private Integer inputType; - - @Schema(description = "选项(逗号,分割)") - private String inputSelectValues; - - @Schema(description = "部门ID", example = "3735") - private Long deptId; - @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/SuperiorApiSkuConfigRespVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigRespVO.java index 551389c00b..55f65193b3 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigRespVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigRespVO.java @@ -35,23 +35,19 @@ public class SuperiorApiSkuConfigRespVO { @DictFormat("infra_boolean_string") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Boolean required; - @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "说明") @ExcelProperty("说明") private String remarks; - @Schema(description = "输入类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") + @Schema(description = "输入类型", example = "1") @ExcelProperty(value = "输入类型", converter = DictConvert.class) @DictFormat("haoka_superior_api_input_type") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Integer inputType; - @Schema(description = "选项(逗号,分割)", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "选项(逗号,分割)") @ExcelProperty("选项(逗号,分割)") private String inputSelectValues; - @Schema(description = "部门ID", example = "3735") - @ExcelProperty("部门ID") - private Long deptId; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") 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/SuperiorApiSkuConfigSaveReqVO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigSaveReqVO.java index b426f7d407..c66de93599 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigSaveReqVO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/controller/admin/superiorapi/vo/SuperiorApiSkuConfigSaveReqVO.java @@ -28,19 +28,13 @@ public class SuperiorApiSkuConfigSaveReqVO { @NotNull(message = "是否必填不能为空") private Boolean required; - @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "说明不能为空") + @Schema(description = "说明") private String remarks; - @Schema(description = "输入类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1") - @NotNull(message = "输入类型不能为空") + @Schema(description = "输入类型", example = "1") private Integer inputType; - @Schema(description = "选项(逗号,分割)", requiredMode = Schema.RequiredMode.REQUIRED) - @NotEmpty(message = "选项(逗号,分割)不能为空") + @Schema(description = "选项(逗号,分割)") private String inputSelectValues; - @Schema(description = "部门ID", example = "3735") - private Long deptId; - } \ No newline at end of file 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 e5e4dd8691..404783d341 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 = "7050") private Long haokaSuperiorApiId; - @Schema(description = "ID", example = "26555") + @Schema(description = "产品", example = "26555") private Long haokaProductId; @Schema(description = "是否已配置") @@ -33,9 +33,6 @@ public class SuperiorProductConfigPageReqVO extends PageParam { @Schema(description = "说明") private String remarks; - @Schema(description = "部门ID", example = "30274") - private Long deptId; - @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/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 87b98f4559..64b0c1b08b 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 @@ -18,12 +18,12 @@ public class SuperiorProductConfigRespVO { @ExcelProperty("ID") private Long id; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") - @ExcelProperty("ID") + @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") + @ExcelProperty("上游接口ID") private Long haokaSuperiorApiId; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") - @ExcelProperty("ID") + @Schema(description = "产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") + @ExcelProperty("产品") private Long haokaProductId; @Schema(description = "是否已配置", requiredMode = Schema.RequiredMode.REQUIRED) @@ -35,7 +35,7 @@ public class SuperiorProductConfigRespVO { @ExcelProperty("值") private String config; - @Schema(description = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "是否必填") @ExcelProperty(value = "是否必填", converter = DictConvert.class) @DictFormat("infra_boolean_string") // TODO 代码优化:建议设置到对应的 DictTypeConstants 枚举类中 private Boolean required; @@ -44,10 +44,6 @@ public class SuperiorProductConfigRespVO { @ExcelProperty("说明") private String remarks; - @Schema(description = "部门ID", example = "30274") - @ExcelProperty("部门ID") - private Long deptId; - @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED) @ExcelProperty("创建时间") private LocalDateTime createTime; 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 22972d4583..4325b08f4a 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 @@ -12,31 +12,23 @@ public class SuperiorProductConfigSaveReqVO { @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21785") private Long id; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") - @NotNull(message = "ID不能为空") + @Schema(description = "上游接口ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "7050") + @NotNull(message = "上游接口ID不能为空") private Long haokaSuperiorApiId; - @Schema(description = "ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") - @NotNull(message = "ID不能为空") + @Schema(description = "产品", requiredMode = Schema.RequiredMode.REQUIRED, example = "26555") + @NotNull(message = "产品不能为空") 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 = "是否必填", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "是否必填不能为空") + @Schema(description = "是否必填") private Boolean required; @Schema(description = "说明", requiredMode = Schema.RequiredMode.REQUIRED) @NotEmpty(message = "说明不能为空") private String remarks; - @Schema(description = "部门ID", example = "30274") - private Long deptId; - } \ 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/SuperiorApiDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDO.java index b266cb0ccc..d7a83401ab 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiDO.java @@ -26,7 +26,7 @@ public class SuperiorApiDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 名字 @@ -75,4 +75,4 @@ public class SuperiorApiDO extends BaseDO { */ private Long deptId; -} \ 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 9fc22509ec..37badac33f 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 @@ -25,7 +25,7 @@ public class SuperiorApiDevConfigDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * ID @@ -68,4 +68,4 @@ public class SuperiorApiDevConfigDO extends BaseDO { */ private Long deptId; -} \ 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/SuperiorApiSkuConfigDO.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiSkuConfigDO.java index fedef71452..ece130805f 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiSkuConfigDO.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/dataobject/superiorapi/SuperiorApiSkuConfigDO.java @@ -25,7 +25,7 @@ public class SuperiorApiSkuConfigDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** * ID @@ -64,4 +64,4 @@ public class SuperiorApiSkuConfigDO extends BaseDO { */ private Long deptId; -} \ 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/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 4194586bb4..50669f5219 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 @@ -25,14 +25,14 @@ public class SuperiorProductConfigDO extends BaseDO { /** * ID */ - @TableId + @TableId(type = IdType.ASSIGN_ID) private Long id; /** - * ID + * 上游接口ID */ private Long haokaSuperiorApiId; /** - * ID + * 产品 */ private Long haokaProductId; /** @@ -60,4 +60,4 @@ public class SuperiorProductConfigDO extends BaseDO { */ private Long deptId; -} \ 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/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 9baf63a43c..b2e7994dbc 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,14 +21,9 @@ public interface SuperiorApiDevConfigMapper extends BaseMapperX selectPage(SuperiorApiDevConfigPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(SuperiorApiDevConfigDO::getHaokaSuperiorApiId, reqVO.getHaokaSuperiorApiId()) - .eqIfPresent(SuperiorApiDevConfigDO::getCode, reqVO.getCode()) + .likeIfPresent(SuperiorApiDevConfigDO::getCode, reqVO.getCode()) .likeIfPresent(SuperiorApiDevConfigDO::getName, reqVO.getName()) .eqIfPresent(SuperiorApiDevConfigDO::getValue, reqVO.getValue()) - .eqIfPresent(SuperiorApiDevConfigDO::getRequired, reqVO.getRequired()) - .eqIfPresent(SuperiorApiDevConfigDO::getRemarks, reqVO.getRemarks()) - .eqIfPresent(SuperiorApiDevConfigDO::getInputType, reqVO.getInputType()) - .eqIfPresent(SuperiorApiDevConfigDO::getInputSelectValues, reqVO.getInputSelectValues()) - .eqIfPresent(SuperiorApiDevConfigDO::getDeptId, reqVO.getDeptId()) .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/superiorapi/SuperiorApiMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiMapper.java index 610289c236..1922811b00 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiMapper.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiMapper.java @@ -26,7 +26,6 @@ public interface SuperiorApiMapper extends BaseMapperX { .betweenIfPresent(SuperiorApiDO::getPublishTime, reqVO.getPublishTime()) .eqIfPresent(SuperiorApiDO::getIsDevConfined, reqVO.getIsDevConfined()) .eqIfPresent(SuperiorApiDO::getIsSkuConfined, reqVO.getIsSkuConfined()) - .eqIfPresent(SuperiorApiDO::getDeptId, reqVO.getDeptId()) .betweenIfPresent(SuperiorApiDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(SuperiorApiDO::getId)); } diff --git a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiSkuConfigMapper.java b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiSkuConfigMapper.java index b5c9c9cc78..4415f38a4a 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiSkuConfigMapper.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/main/java/cn/iocoder/yudao/module/haoka/dal/mysql/superiorapi/SuperiorApiSkuConfigMapper.java @@ -24,10 +24,6 @@ public interface SuperiorApiSkuConfigMapper 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 47b98f02aa..38ce8783ad 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,11 +114,6 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { o.setCode(null); o.setName(null); o.setValue(null); - o.setRequired(null); - o.setRemarks(null); - o.setInputType(null); - o.setInputSelectValues(null); - o.setDeptId(null); o.setCreateTime(null); }); superiorApiDevConfigMapper.insert(dbSuperiorApiDevConfig); @@ -130,16 +125,6 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setName(null))); // 测试 value 不匹配 superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setValue(null))); - // 测试 required 不匹配 - superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setRequired(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))); - // 测试 deptId 不匹配 - superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setDeptId(null))); // 测试 createTime 不匹配 superiorApiDevConfigMapper.insert(cloneIgnoreId(dbSuperiorApiDevConfig, o -> o.setCreateTime(null))); // 准备参数 @@ -148,11 +133,6 @@ public class SuperiorApiDevConfigServiceImplTest extends BaseDbUnitTest { reqVO.setCode(null); reqVO.setName(null); reqVO.setValue(null); - reqVO.setRequired(null); - reqVO.setRemarks(null); - reqVO.setInputType(null); - reqVO.setInputSelectValues(null); - reqVO.setDeptId(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/superiorapi/SuperiorApiServiceImplTest.java b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiServiceImplTest.java index 11993440cd..431d20c107 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiServiceImplTest.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiServiceImplTest.java @@ -117,7 +117,6 @@ public class SuperiorApiServiceImplTest extends BaseDbUnitTest { o.setPublishTime(null); o.setIsDevConfined(null); o.setIsSkuConfined(null); - o.setDeptId(null); o.setCreateTime(null); }); superiorApiMapper.insert(dbSuperiorApi); @@ -135,8 +134,6 @@ public class SuperiorApiServiceImplTest extends BaseDbUnitTest { superiorApiMapper.insert(cloneIgnoreId(dbSuperiorApi, o -> o.setIsDevConfined(null))); // 测试 isSkuConfined 不匹配 superiorApiMapper.insert(cloneIgnoreId(dbSuperiorApi, o -> o.setIsSkuConfined(null))); - // 测试 deptId 不匹配 - superiorApiMapper.insert(cloneIgnoreId(dbSuperiorApi, o -> o.setDeptId(null))); // 测试 createTime 不匹配 superiorApiMapper.insert(cloneIgnoreId(dbSuperiorApi, o -> o.setCreateTime(null))); // 准备参数 @@ -148,7 +145,6 @@ public class SuperiorApiServiceImplTest extends BaseDbUnitTest { reqVO.setPublishTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); reqVO.setIsDevConfined(null); reqVO.setIsSkuConfined(null); - reqVO.setDeptId(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/superiorapi/SuperiorApiSkuConfigServiceImplTest.java b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiSkuConfigServiceImplTest.java index 2214dc9e52..e62f2598de 100644 --- a/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiSkuConfigServiceImplTest.java +++ b/yudao-module-haoka/yudao-module-haoka-biz/src/test/java/cn/iocoder/yudao/module/haoka/service/superiorapi/SuperiorApiSkuConfigServiceImplTest.java @@ -114,10 +114,6 @@ public class SuperiorApiSkuConfigServiceImplTest extends BaseDbUnitTest { o.setCode(null); o.setName(null); o.setRequired(null); - o.setRemarks(null); - o.setInputType(null); - o.setInputSelectValues(null); - o.setDeptId(null); o.setCreateTime(null); }); superiorApiSkuConfigMapper.insert(dbSuperiorApiSkuConfig); @@ -129,14 +125,6 @@ public class SuperiorApiSkuConfigServiceImplTest extends BaseDbUnitTest { superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setName(null))); // 测试 required 不匹配 superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setRequired(null))); - // 测试 remarks 不匹配 - superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setRemarks(null))); - // 测试 inputType 不匹配 - superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setInputType(null))); - // 测试 inputSelectValues 不匹配 - superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setInputSelectValues(null))); - // 测试 deptId 不匹配 - superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setDeptId(null))); // 测试 createTime 不匹配 superiorApiSkuConfigMapper.insert(cloneIgnoreId(dbSuperiorApiSkuConfig, o -> o.setCreateTime(null))); // 准备参数 @@ -145,10 +133,6 @@ public class SuperiorApiSkuConfigServiceImplTest extends BaseDbUnitTest { reqVO.setCode(null); reqVO.setName(null); reqVO.setRequired(null); - reqVO.setRemarks(null); - reqVO.setInputType(null); - reqVO.setInputSelectValues(null); - reqVO.setDeptId(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 4ed0d59bca..2fab6ae02c 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 @@ -116,7 +116,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { o.setConfig(null); o.setRequired(null); o.setRemarks(null); - o.setDeptId(null); o.setCreateTime(null); }); superiorProductConfigMapper.insert(dbSuperiorProductConfig); @@ -132,8 +131,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setRequired(null))); // 测试 remarks 不匹配 superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setRemarks(null))); - // 测试 deptId 不匹配 - superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setDeptId(null))); // 测试 createTime 不匹配 superiorProductConfigMapper.insert(cloneIgnoreId(dbSuperiorProductConfig, o -> o.setCreateTime(null))); // 准备参数 @@ -144,7 +141,6 @@ public class SuperiorProductConfigServiceImplTest extends BaseDbUnitTest { reqVO.setConfig(null); reqVO.setRequired(null); reqVO.setRemarks(null); - reqVO.setDeptId(null); reqVO.setCreateTime(buildBetweenTime(2023, 2, 1, 2023, 2, 28)); // 调用