12.21 陈宇

RMS/src/main/java/cn/cslg/report/pojo/dto/ProductDTO.java

@@ -1,4 +1,4 @@
-package cn.cslg.report.pojo.dto;
+package cn.cslg.report.common.model.dto;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

RMS/src/main/java/cn/cslg/report/pojo/vo/ProductStandardVO.java

@@ -1,10 +1,9 @@
-package cn.cslg.report.pojo.vo;
+package cn.cslg.report.common.model.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 

RMS/src/main/java/cn/cslg/report/pojo/vo/ReportFileStandardVO.java

@@ -1,4 +1,4 @@
-package cn.cslg.report.pojo.vo;
+package cn.cslg.report.common.model.vo;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

RMS/src/main/java/cn/cslg/report/controller/ProductController.java

@@ -2,8 +2,8 @@ package cn.cslg.report.controller;
 
 import cn.cslg.report.common.core.base.Constants;
 import cn.cslg.report.common.utils.Response;
-import cn.cslg.report.pojo.dto.ProductDTO;
-import cn.cslg.report.pojo.vo.ProductStandardVO;
+import cn.cslg.report.common.model.dto.ProductDTO;
+import cn.cslg.report.common.model.vo.ProductStandardVO;
 import cn.cslg.report.service.impl.ProductServiceImpl;
 import cn.cslg.report.web.JsonResult;
 import cn.cslg.report.web.ServiceCode;
@@ -55,7 +55,7 @@ public class ProductController {
         if (reportId != null) {
             ProductStandardVO queryResult = productService.getProduct(reportId);
             if (queryResult == null) {
-                return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "报告id不存在");
+                return JsonResult.fail(ServiceCode.ERROR_NOT_FOUND, "产品不存在");
             }
             return JsonResult.ok(queryResult);
         } else {

RMS/src/main/java/cn/cslg/report/pojo/entity/AssoProductFile.java

@@ -1,4 +1,4 @@
-package cn.cslg.report.pojo.entity;
+package cn.cslg.report.entity;
 
 import lombok.Data;
 import lombok.experimental.Accessors;

RMS/src/main/java/cn/cslg/report/entity/Product.java

@@ -1,71 +1,67 @@
 package cn.cslg.report.entity;
 
-import cn.cslg.report.common.model.BaseEntity;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
- * 产品表
+ * 产品表的实体类
+ *
+ * @Author chenyu
+ * @Data 2022/12/20 10:01
  */
-@Data
 @Accessors(chain = true)
-@EqualsAndHashCode(callSuper = true)
-@TableName(value = "PRODUCT")
-public class Product extends BaseEntity<Product> {
+@Data
+public class Product implements Serializable {
+    /**
+     * ID
+     */
+    private Integer id;
     /**
      * 产品名称
      */
-    @TableField(value = "PRODUCT_NAME")
     private String productName;
-
     /**
      * 产品标识
      */
-    @TableField(value = "PRODUCT_IDENTIFY")
     private String productIdentify;
-
     /**
      * 产品说明
      */
-    @TableField(value = "PRODUCT_DESCRIPTION")
     private String productDescription;
-
     /**
      * 调查区域
      */
-    @TableField(value = "SURVEY_AREA")
     private String surveyArea;
-
     /**
      * 产品图
      */
-    @TableField(value = "PRODUCT_IMAGE")
     private String productImage;
-
     /**
      * 检索策略
      */
-    @TableField(value = "SEARCH_POLICY")
     private String searchPolicy;
-
     /**
      * 检索截止日期
      */
-    @TableField(value = "DEADLINE")
-    private String deadline;
-
+    private LocalDateTime deadLine;
     /**
      * 关注企业/发明人/技术方向
      */
-    @TableField(value = "FOCUS_INFORMATION")
     private String focusInformation;
-
     /**
-     * 附件
+     * 报告ID
      */
-    @TableField(value = "ANNEX")
-    private String annex;
+    private Integer reportId;
+    /**
+     * 创建人姓名
+     */
+    private String createPersonName;
+    /**
+     * 创建人ID
+     */
+    private Integer createPersonId;
+
 }

RMS/src/main/java/cn/cslg/report/mapper/AssoProductFileMapper.java

@@ -1,7 +1,6 @@
 package cn.cslg.report.mapper;
 
 import cn.cslg.report.pojo.entity.AssoProductFile;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;

RMS/src/main/java/cn/cslg/report/mapper/ProductMapper.java

@@ -1,9 +1,7 @@
 package cn.cslg.report.mapper;
 
-import cn.cslg.report.pojo.entity.Product;
-import cn.cslg.report.pojo.vo.ProductStandardVO;
-import cn.cslg.report.pojo.vo.ReportFileStandardVO;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import cn.cslg.report.entity.Product;
+import cn.cslg.report.common.model.vo.ProductStandardVO;
 import org.springframework.stereotype.Repository;
 
 /**

RMS/src/main/java/cn/cslg/report/pojo/entity/Product.java

@@ -1,67 +0,0 @@
-package cn.cslg.report.pojo.entity;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * 产品表的实体类
- *
- * @Author chenyu
- * @Data 2022/12/20 10:01
- */
-@Accessors(chain = true)
-@Data
-public class Product implements Serializable {
-    /**
-     * ID
-     */
-    private Integer id;
-    /**
-     * 产品名称
-     */
-    private String productName;
-    /**
-     * 产品标识
-     */
-    private String productIdentify;
-    /**
-     * 产品说明
-     */
-    private String productDescription;
-    /**
-     * 调查区域
-     */
-    private String surveyArea;
-    /**
-     * 产品图
-     */
-    private String productImage;
-    /**
-     * 检索策略
-     */
-    private String searchPolicy;
-    /**
-     * 检索截止日期
-     */
-    private LocalDateTime deadLine;
-    /**
-     * 关注企业/发明人/技术方向
-     */
-    private String focusInformation;
-    /**
-     * 报告ID
-     */
-    private Integer reportId;
-    /**
-     * 创建人姓名
-     */
-    private String createPersonName;
-    /**
-     * 创建人ID
-     */
-    private Integer createPersonId;
-
-}

RMS/src/main/java/cn/cslg/report/service/IProductService.java

@@ -1,7 +1,7 @@
 package cn.cslg.report.service;
 
-import cn.cslg.report.pojo.dto.ProductDTO;
-import cn.cslg.report.pojo.vo.ProductStandardVO;
+import cn.cslg.report.common.model.dto.ProductDTO;
+import cn.cslg.report.common.model.vo.ProductStandardVO;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 

RMS/src/main/java/cn/cslg/report/service/impl/AssoProductFileServiceImpl.java

@@ -1,6 +1,5 @@
 package cn.cslg.report.service.impl;
 
-import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.mapper.AssoProductFileMapper;
 import cn.cslg.report.pojo.entity.AssoProductFile;
 import cn.cslg.report.service.IAssoProductFileService;

RMS/src/main/java/cn/cslg/report/service/impl/ProductServiceImpl.java

@@ -1,16 +1,15 @@
 package cn.cslg.report.service.impl;
 
 import cn.cslg.report.mapper.ProductMapper;
-import cn.cslg.report.pojo.dto.ProductDTO;
-import cn.cslg.report.pojo.entity.Product;
-import cn.cslg.report.pojo.vo.ProductStandardVO;
+import cn.cslg.report.common.model.dto.ProductDTO;
+import cn.cslg.report.entity.Product;
+import cn.cslg.report.common.model.vo.ProductStandardVO;
 import cn.cslg.report.service.IProductService;
 import cn.cslg.report.service.business.ReportFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;

RMS/src/main/resources/mapper/ProductMapper.xml

@@ -87,7 +87,7 @@
         where REPORT_ID = #{report_Id}
     </select>
 
-    <resultMap id="getStandardByReportIdResultMap" type="cn.cslg.report.pojo.vo.ProductStandardVO">
+    <resultMap id="getStandardByReportIdResultMap" type="cn.cslg.report.common.model.vo.ProductStandardVO">
         <result column="PRODUCT_NAME" property="productName"/>
         <result column="PRODUCT_IDENTIFY" property="productIdentify"/>
         <result column="PRODUCT_DESCRIPTION" property="productDescription"/>
@@ -99,7 +99,7 @@
         <result column="REPORT_ID" property="reportId"/>
         <result column="CREATE_PERSON_NAME" property="createPersonName"/>
         <result column="CREATE_PERSON_ID" property="create_person_id"/>
-        <collection property="reportFiles" ofType="cn.cslg.report.pojo.vo.ReportFileStandardVO">
+        <collection property="reportFiles" ofType="cn.cslg.report.common.model.vo.ReportFileStandardVO">
             <result column="NAME" property="name"/>
             <result column="ADDRESS" property="address"/>
             <result column="ZID" property="zid"/>