From 83b07054a104998cc4a639383575b24104bafc79 Mon Sep 17 00:00:00 2001 From: ChenYan <3139166962@qq.com> Date: Wed, 15 Jan 2025 19:00:30 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Afeat(resource):=20=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=A8=A1=E5=9E=8B=E7=89=88=E6=9C=AC=E9=AB=98=E6=B8=85?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pay/AliPay/AliPayIntegration.java | 6 ----- .../resource/MallProductController.java | 3 +-- .../resource/ModelCommentController.java | 2 +- .../resource/ModelVersionController.java | 23 ++++++++++++++++++- .../resource/ToActivityController.java | 2 +- .../mcwl/common/constant/DictConstants.java | 5 ++++ .../mcwl/resource/domain/ModelVersion.java | 6 +++++ 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java index 771ac62..ddee02f 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/pay/AliPay/AliPayIntegration.java @@ -10,14 +10,11 @@ import com.alipay.api.AlipayConfig; import com.alipay.api.DefaultAlipayClient; import com.alipay.api.diagnosis.DiagnosisUtils; import com.alipay.api.domain.AlipayFundAccountQueryModel; -import com.alipay.api.domain.AlipayFundTransToaccountTransferModel; import com.alipay.api.domain.AlipayFundTransUniTransferModel; import com.alipay.api.domain.Participant; import com.alipay.api.request.AlipayFundAccountQueryRequest; -import com.alipay.api.request.AlipayFundTransToaccountTransferRequest; import com.alipay.api.request.AlipayFundTransUniTransferRequest; import com.alipay.api.response.AlipayFundAccountQueryResponse; -import com.alipay.api.response.AlipayFundTransToaccountTransferResponse; import com.alipay.api.response.AlipayFundTransUniTransferResponse; import com.alipay.easysdk.factory.Factory; import com.alipay.easysdk.kernel.Config; @@ -25,14 +22,11 @@ import com.alipay.easysdk.payment.facetoface.models.AlipayTradePrecreateResponse import com.mcwl.common.core.redis.RedisCache; import com.mcwl.common.exception.ServiceException; import com.mcwl.common.utils.SecurityUtils; -import com.mcwl.common.utils.StringUtils; import com.mcwl.memberCenter.domain.MemberLevel; import com.mcwl.memberCenter.service.MemberLevelService; -import com.mcwl.memberCenter.service.MemberService; import com.mcwl.pay.config.AliConfig; import com.mcwl.pay.domain.OrderTrade; import com.mcwl.pay.domain.OrderTradeDto; -import com.mcwl.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java index 85cdf95..b44a203 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java @@ -25,8 +25,7 @@ import java.util.List; /** - * 商品 - * + *模型 * @Author：ChenYan * @Project：McWl * @Package：com.mcwl.web.controller.resource diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java index eac3cba..07e5994 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelCommentController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.*; import javax.validation.constraints.NotNull; import java.util.List; -/** +/**模型评论 * @Author：ChenYan * @Project：McWl * @Package：com.mcwl.web.controller.resource diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java index b4ec12a..82e77c2 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ModelVersionController.java @@ -1,15 +1,21 @@ package com.mcwl.web.controller.resource; +import cn.hutool.core.lang.Dict; +import com.mcwl.common.constant.DictConstants; import com.mcwl.common.core.controller.BaseController; import com.mcwl.common.core.domain.AjaxResult; import com.mcwl.common.core.page.TableDataInfo; +import com.mcwl.resource.domain.ModelProduct; import com.mcwl.resource.domain.ModelVersion; import com.mcwl.resource.service.ModelVersionService; +import com.mcwl.system.init.DictInit; import com.mcwl.web.controller.common.OssUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.util.ArrayList; +import java.util.Date; import java.util.List; /** 模型版本 @@ -87,19 +93,33 @@ public class ModelVersionController extends BaseController { @PostMapping("finbyid") public AjaxResult finbyid(@RequestBody ModelVersion modelVersion) { + + ModelVersion modelVersion1 = modelVersionService.getById(modelVersion.getId()); + + ArrayList arrayList = new ArrayList<>(); + + //获取 + String[] split = modelVersion1.getHigh().split(","); + + for (String s : split) { + arrayList.add(DictInit.getDictValue(DictConstants.DICT_TYPE_MODEL_VERSION_HIGH,s)); + } + return AjaxResult.success(modelVersion1); } + @PostMapping("insert") public AjaxResult insert(@RequestBody ModelVersion modelVersion) { - modelVersionService.save(modelVersion); return AjaxResult.success(); } + + @PostMapping("update") public AjaxResult update(@RequestBody ModelVersion modelVersion) { @@ -107,6 +127,7 @@ public class ModelVersionController extends BaseController { return AjaxResult.success(); } + @PostMapping("delete") public AjaxResult delete(@RequestBody ModelVersion modelVersion) { diff --git a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ToActivityController.java b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ToActivityController.java index 0ea61d0..bb7e43d 100644 --- a/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ToActivityController.java +++ b/mcwl-admin/src/main/java/com/mcwl/web/controller/resource/ToActivityController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; -/** +/**活动 * @Author：ChenYan * @Project：McWl * @Package：com.mcwl.web.controller.resource diff --git a/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java b/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java index 304c39e..59688d1 100644 --- a/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java +++ b/mcwl-common/src/main/java/com/mcwl/common/constant/DictConstants.java @@ -15,6 +15,11 @@ public class DictConstants { */ public static final String MALL_PRODUCT_STATUS = "mall_product_status"; + /** + * 高清修复 + */ + public static final String DICT_TYPE_MODEL_VERSION_HIGH = "dict_type_model_version_high"; + /** * 类型模型 */ diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java index a49c2aa..ec38873 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelVersion.java @@ -1,5 +1,6 @@ package com.mcwl.resource.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.mcwl.common.core.domain.BaseEntity; @@ -7,6 +8,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.ArrayList; + /** * 模型版本 * @Author：ChenYan @@ -121,4 +124,7 @@ public class ModelVersion extends BaseEntity { private String delFlag; + @TableField(exist = false) + private ArrayList highList; + }