Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/common/dto/business/UpdateProductCategoryDTO.java

@@ -1,11 +1,11 @@
 package cn.cslg.pas.common.dto.business;
 
-import cn.hutool.core.date.DateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,10 +21,6 @@ public class UpdateProductCategoryDTO {
     private String name;
     @Schema(description = "参考许可费率")
     private Double licenseRate;
-    @Schema(description = "上市时间")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private DateTime marketTime;
     @Schema(description = "可见类型（0所有人可见、1本人可见、2仅选定人可见、3选定人不可见）")
     private Integer showType;
     @Schema(description = "描述")

src/main/java/cn/cslg/pas/common/dto/business/UpdateProductDTO.java

@@ -1,9 +1,9 @@
 package cn.cslg.pas.common.dto.business;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.joda.time.DateTime;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;

src/main/java/cn/cslg/pas/common/vo/business/ProductVO.java

@@ -27,7 +27,7 @@ public class ProductVO {
     @Schema(description = "上市时间")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
-    private DateTime marketTime;
+    private Date marketTime;
     @Schema(description = "所属产品类别")
     private Integer categoryId;
     @Schema(description = "可见类型(0所有人可见，1本人可见，2仅选定人可见，3选定人不可见)")

src/main/java/cn/cslg/pas/controller/ProductController.java

@@ -2,14 +2,17 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.dto.business.ProductDTO;
+import cn.cslg.pas.common.dto.business.UpdateProductDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringRequest;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.domain.business.Product;
 import cn.cslg.pas.exception.ConditionException;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
+import cn.cslg.pas.service.business.ProductService;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
@@ -34,6 +37,9 @@ public class ProductController {
     @Autowired
     private BusinessFactory businessFactory;
 
+    @Autowired
+    private ProductService productService;
+
     @Operation(summary = "查询产品")
     @PostMapping("/queryProduct")
     public Response queryProduct(@RequestBody StringRequest stringRequest) throws Exception {
@@ -70,9 +76,9 @@ public class ProductController {
     @PostMapping("/updateProduct")
     public Response updateProduct(String product, List<MultipartFile> files) throws Exception {
         if(product != null){
-            ProductDTO productDTO = JSONObject.parseObject(product, ProductDTO.class);
+            UpdateProductDTO updateProductDTO = JSONObject.parseObject(product, UpdateProductDTO.class);
             Business business = businessFactory.getClass("productService");
-            business.updateMessage(productDTO, files);
+            business.updateMessage(updateProductDTO, files);
             return Response.success(1);
         } else {
             return Response.error("网络异常");

src/main/java/cn/cslg/pas/domain/business/Product.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * 产品实体类
  * @Author xiexiang
@@ -14,7 +16,6 @@ import lombok.Data;
 @Data
 @TableName("product")
 public class Product extends BaseEntity<Product> {
-
     /**
      * 产品名称
      */
@@ -31,7 +32,7 @@ public class Product extends BaseEntity<Product> {
      * 上市时间
      */
     @TableField(value = "market_time")
-    private DateTime marketTime;
+    private Date marketTime;
 
     /**
      * 所属产品类别

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -9,10 +9,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.vo.business.PersonVO;
 import cn.cslg.pas.common.vo.business.ProductVO;
-import cn.cslg.pas.domain.business.AssoProductCategoryPerson;
-import cn.cslg.pas.domain.business.AssoProductFile;
-import cn.cslg.pas.domain.business.AssoProductPerson;
-import cn.cslg.pas.domain.business.Product;
+import cn.cslg.pas.domain.business.*;
 import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
@@ -226,7 +223,7 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
      */
     @Override
     public Object updateMessage(Object object, List<MultipartFile> files) {
-        //object to product
+        //object to updateProductDTO
         UpdateProductDTO updateProductDTO = (UpdateProductDTO) object;
         if(updateProductDTO == null || updateProductDTO.getId() == null){
             throw new XiaoShiException("参数错误");