加密后修改数据接口新增日志

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/FileController.java

@@ -289,6 +289,7 @@ public class FileController {
     @PostMapping("/updateFileData")
     public R updateFileData(@RequestBody RequestFile requestFile){
 
+        log.info("加密后获取到的数据:{}",requestFile);
         return fileService.updateFileData(requestFile);
     }
 

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/MallProductController.java

@@ -2,20 +2,20 @@ package com.mcwl.web.controller.resource;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.pagehelper.PageInfo;
+import com.mcwl.common.constant.HttpStatus;
 import com.mcwl.common.core.controller.BaseController;
 import com.mcwl.common.core.domain.AjaxResult;
 import com.mcwl.common.core.domain.R;
-import com.mcwl.common.core.page.PageDomain;
 import com.mcwl.common.core.page.TableDataInfo;
 import com.mcwl.common.utils.SecurityUtils;
 import com.mcwl.resource.domain.ModelProduct;
 import com.mcwl.resource.domain.ModelVersion;
 import com.mcwl.resource.domain.dto.ModelImagePageRes;
-import com.mcwl.resource.domain.response.ResponseModelProduct;
 import com.mcwl.resource.domain.request.RequestModel;
+import com.mcwl.resource.domain.response.ResponseModelProduct;
 import com.mcwl.resource.domain.vo.PageVo;
 import com.mcwl.resource.mapper.ModelVersionMapper;
-import com.mcwl.resource.service.*;
+import com.mcwl.resource.service.ModelService;
 import com.mcwl.system.service.impl.SysUserServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -95,6 +95,24 @@ public class MallProductController extends BaseController {
     @ApiOperation(value = "修改模型")
     @PostMapping("/update")
     public AjaxResult updateModel(@RequestBody RequestModel requestModel) {
+
+
+        for (ModelVersion modelVersion : requestModel.getModelVersionList()) {
+
+            //校验名字
+            ModelVersion modelVersion1 = modelVersionMapper.selectByFileName(modelVersion.getFileName());
+            if (modelVersion1 != null) {
+
+                return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
+            }
+            //校验hash
+            ModelVersion modelVersion2 = modelVersionMapper.selectByHash(modelVersion.getFileHash());
+            if (modelVersion2 != null){
+
+                return AjaxResult.error(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
+            }
+        }
+
         ModelProduct modelProduct = requestModel.getModelProduct();
 
         Long userId = SecurityUtils.getUserId();

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/WorkFlowController.java

@@ -2,13 +2,16 @@ package com.mcwl.web.controller.resource;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageInfo;
+import com.mcwl.common.constant.HttpStatus;
 import com.mcwl.common.core.controller.BaseController;
 import com.mcwl.common.core.domain.R;
 import com.mcwl.resource.domain.WorkFlow;
+import com.mcwl.resource.domain.WorkFlowVersion;
 import com.mcwl.resource.domain.dto.AddRequestWorkFlow;
 import com.mcwl.resource.domain.request.RequestWorkFlow;
 import com.mcwl.resource.domain.response.ResponseWorkFlow;
 import com.mcwl.resource.domain.vo.PageVo;
+import com.mcwl.resource.mapper.WorkFlowVersionMapper;
 import com.mcwl.resource.service.WorkFlowService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -40,6 +43,9 @@ public class WorkFlowController extends BaseController {
     @Autowired
     private WorkFlowService workFlowService;
 
+    @Autowired
+    private WorkFlowVersionMapper workFlowVersionMapper;
+
 
     /**
      * 设置工作流的置顶状态
@@ -94,6 +100,23 @@ public class WorkFlowController extends BaseController {
     @PostMapping("/updateWorkFlow")
     public R<Object> updateWorkFlow(@RequestBody RequestWorkFlow requestWorkFlow) {
 
+
+        for (WorkFlowVersion workFlowVersion : requestWorkFlow.getWorkFlowVersionList()) {
+
+            //校验名字
+            WorkFlowVersion workFlowVersion1 = workFlowVersionMapper.selectByFileName(workFlowVersion.getFileName());
+            if (workFlowVersion1 != null) {
+
+                return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件名字重复");
+            }
+            //校验hash
+            WorkFlowVersion workFlowVersion2 = workFlowVersionMapper.selectByHash(workFlowVersion.getFileHash());
+            if (workFlowVersion2 != null){
+
+                return R.fail(HttpStatus.SHOW_ERROR_MSG,"文件内容重复");
+            }
+        }
+
         workFlowService.updateWorkFlow(requestWorkFlow);
 
         return R.ok();

mcwl-admin/src/main/resources/application-dev.yml

@@ -178,3 +178,8 @@ mqtt:
   max-reconnect-attempts: 5
   clean-session: true
 
+#用户头像与背景
+mcwl:
+  user:
+    avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
+    backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png

mcwl-admin/src/main/resources/application.yml

@@ -13,10 +13,6 @@ mcwl:
   # 验证码类型 math 数字计算 char 字符验证
   captchaType: math
 
-  user:
-    avatar: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/7/53/3f5cc1d7-b062-4a22-9f7e-d442bc6dcf42.png
-    backgroundImg: https://ybl2112.oss-cn-beijing.aliyuncs.com/2025/MARCH/10/8/2/c8387681-8138-4a29-a1c9-4a143da34c5a.png
-
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080

mcwl-common/src/main/java/com/mcwl/common/core/domain/BaseEntity.java

@@ -1,17 +1,16 @@
 package com.mcwl.common.core.domain;
 
-import java.io.Serializable;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import lombok.Builder;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * Entity基类
@@ -42,7 +41,7 @@ public class BaseEntity implements Serializable
     private String updateBy;
 
     /** 更新时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @TableField(fill = FieldFill.UPDATE)
     private Date updateTime;
 

mcwl-memberCenter/src/main/java/com/mcwl/memberCenter/domain/vo/PromotionVo.java

@@ -1,14 +1,9 @@
 package com.mcwl.memberCenter.domain.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.mcwl.common.core.domain.BaseEntity;
-import com.mcwl.memberCenter.enums.PromotionEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 
 import java.util.Date;
 
@@ -48,14 +43,14 @@ public class PromotionVo {
      * 活动开始时间
      */
     @ApiModelProperty(value = "活动开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
 
     /**
      * 活动结束时间
      */
     @ApiModelProperty(value = "活动结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
 

mcwl-myInvitation/src/main/java/com/mcwl/myInvitation/domain/vo/ConsumeVo.java

@@ -33,6 +33,6 @@ public class ConsumeVo {
 
     // 消费时间
     @ApiModelProperty(value = "消费时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date consumeDate;
 }

mcwl-pay/src/main/java/com/mcwl/pay/domain/OrderTrade.java

@@ -64,7 +64,7 @@ public class OrderTrade extends BaseEntity {
     /**
      * 下单时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date orderTime;
     /**

mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletConsumeRecordVo.java

@@ -33,7 +33,7 @@ public class WalletConsumeRecordVo {
      * 消费时间
      */
     @ApiModelProperty(value = "消费时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 }

mcwl-pay/src/main/java/com/mcwl/pay/domain/vo/WalletRechargeRecordVo.java

@@ -32,7 +32,7 @@ public class WalletRechargeRecordVo {
      * 下单时间
      */
     @ApiModelProperty(value = "下单时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date orderTime;
 

mcwl-quartz/src/main/java/com/mcwl/quartz/domain/SysJob.java

@@ -15,7 +15,7 @@ import com.mcwl.quartz.util.CronUtils;
 
 /**
  * 定时任务调度表 sys_job
- * 
+ *
  * @author mcwl
  */
 public class SysJob extends BaseEntity
@@ -110,7 +110,7 @@ public class SysJob extends BaseEntity
         this.cronExpression = cronExpression;
     }
 
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     public Date getNextValidTime()
     {
         if (StringUtils.isNotEmpty(cronExpression))

mcwl-resource/src/main/java/com/mcwl/resource/domain/dto/ModelImagePageRes.java

@@ -6,9 +6,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -35,14 +33,14 @@ public class ModelImagePageRes extends PageDomain {
      * 开始时间
      */
     @ApiModelProperty(value = "开始时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date startTime;
 
     /**
      * 结束时间
      */
     @ApiModelProperty(value = "结束时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
 

mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AdviceVo.java

@@ -39,7 +39,7 @@ public class AdviceVo {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/AttentionAdviceVo.java

@@ -38,7 +38,7 @@ public class AttentionAdviceVo {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/CommentAdviceVo.java

@@ -57,7 +57,7 @@ public class CommentAdviceVo {
     /**
      * 创建时间
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiModelProperty(value = "创建时间")
     private Date createTime;
 

mcwl-system/src/main/java/com/mcwl/system/domain/SysLogininfor.java

@@ -48,7 +48,7 @@ public class SysLogininfor extends BaseEntity
     private String msg;
 
     /** 访问时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "访问时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date loginTime;
 

mcwl-system/src/main/java/com/mcwl/system/domain/SysOperLog.java

@@ -1,14 +1,15 @@
 package com.mcwl.system.domain;
 
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mcwl.common.annotation.Excel;
 import com.mcwl.common.annotation.Excel.ColumnType;
 import com.mcwl.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 操作日志记录表 oper_log
- * 
+ *
  * @author mcwl
  */
 public class SysOperLog extends BaseEntity
@@ -79,7 +80,7 @@ public class SysOperLog extends BaseEntity
     private String errorMsg;
 
     /** 操作时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @Excel(name = "操作时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date operTime;