浏览代码

date类型修改为String类型

lyhzzz 2 年之前
父节点
当前提交
815aba12af
共有 24 个文件被更改,包括 49 次插入45 次删除
  1. 2 2
      src/main/java/com/fdkankan/manage/entity/Agent.java
  2. 2 2
      src/main/java/com/fdkankan/manage/entity/AgentNewLog.java
  3. 2 2
      src/main/java/com/fdkankan/manage/entity/CameraOut.java
  4. 3 3
      src/main/java/com/fdkankan/manage/entity/DownloadOrder.java
  5. 2 2
      src/main/java/com/fdkankan/manage/entity/FolderScene.java
  6. 3 3
      src/main/java/com/fdkankan/manage/entity/IncrementOrder.java
  7. 2 2
      src/main/java/com/fdkankan/manage/entity/Invoice.java
  8. 2 2
      src/main/java/com/fdkankan/manage/entity/InvoiceRegister.java
  9. 4 4
      src/main/java/com/fdkankan/manage/entity/News.java
  10. 1 1
      src/main/java/com/fdkankan/manage/entity/Order.java
  11. 2 2
      src/main/java/com/fdkankan/manage/entity/OrderItem.java
  12. 2 2
      src/main/java/com/fdkankan/manage/entity/Scene3dNum.java
  13. 2 2
      src/main/java/com/fdkankan/manage/entity/SceneEditControls.java
  14. 2 2
      src/main/java/com/fdkankan/manage/entity/SceneEditInfo.java
  15. 2 2
      src/main/java/com/fdkankan/manage/entity/SceneEditInfoExt.java
  16. 2 2
      src/main/java/com/fdkankan/manage/entity/ScenePlusExt.java
  17. 1 1
      src/main/java/com/fdkankan/manage/entity/SpaceSdk.java
  18. 1 1
      src/main/java/com/fdkankan/manage/entity/User.java
  19. 2 1
      src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java
  20. 4 1
      src/main/java/com/fdkankan/manage/service/impl/NewsServiceImpl.java
  21. 1 1
      src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java
  22. 2 2
      src/main/java/com/fdkankan/manage/vo/InvoiceVO.java
  23. 2 2
      src/main/java/com/fdkankan/manage/vo/PageNewsVO.java
  24. 1 1
      src/main/java/com/fdkankan/manage/vo/request/SpaceSdkParam.java

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/Agent.java

@@ -86,13 +86,13 @@ public class Agent implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 记录的状态,A: 生效,I: 禁用

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/AgentNewLog.java

@@ -57,10 +57,10 @@ public class AgentNewLog implements Serializable {
     private Integer count;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
 
 }

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/CameraOut.java

@@ -50,10 +50,10 @@ public class CameraOut implements Serializable {
     private Integer type;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")

+ 3 - 3
src/main/java/com/fdkankan/manage/entity/DownloadOrder.java

@@ -69,7 +69,7 @@ public class DownloadOrder implements Serializable {
      * 交易时间
      */
     @TableField("trade_time")
-    private Date tradeTime;
+    private String tradeTime;
 
     /**
      * 用户表t_user的id
@@ -93,7 +93,7 @@ public class DownloadOrder implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 记录的状态,A: 生效,I: 禁用
@@ -106,7 +106,7 @@ public class DownloadOrder implements Serializable {
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 场景码

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/FolderScene.java

@@ -39,10 +39,10 @@ public class FolderScene implements Serializable {
     private String recStatus;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
 
 }

+ 3 - 3
src/main/java/com/fdkankan/manage/entity/IncrementOrder.java

@@ -69,7 +69,7 @@ public class IncrementOrder implements Serializable {
      * 交易时间
      */
     @TableField("trade_time")
-    private Date tradeTime;
+    private String tradeTime;
 
     /**
      * 用户表t_user的id
@@ -99,7 +99,7 @@ public class IncrementOrder implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 记录的状态,A: 生效,I: 禁用
@@ -112,7 +112,7 @@ public class IncrementOrder implements Serializable {
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
 
 }

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/Invoice.java

@@ -67,7 +67,7 @@ public class Invoice implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 公司名称
@@ -140,7 +140,7 @@ public class Invoice implements Serializable {
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 收货地址

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/InvoiceRegister.java

@@ -59,7 +59,7 @@ public class InvoiceRegister {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 修改人id
@@ -71,7 +71,7 @@ public class InvoiceRegister {
      * 修改时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 0-有效,1-删除, 2-禁用

+ 4 - 4
src/main/java/com/fdkankan/manage/entity/News.java

@@ -78,20 +78,20 @@ public class News  {
      * 发布时间
      */
     @TableField("public_time")
-    private Date publicTime;
+    private String publicTime;
 
     /**
      * 置顶时间
      */
     @TableField("top_time")
-    private Date topTime;
+    private String topTime;
 
 
     /**
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 修改人id
@@ -108,7 +108,7 @@ public class News  {
      * 修改时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 0-有效,1-删除, 2-禁用

+ 1 - 1
src/main/java/com/fdkankan/manage/entity/Order.java

@@ -36,7 +36,7 @@ public class Order implements Serializable {
      * 下单时间
      */
     @TableField("order_time")
-    private Date orderTime;
+    private String orderTime;
 
     /**
      * 交易号

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/OrderItem.java

@@ -93,7 +93,7 @@ public class OrderItem implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 记录的状态,A: 生效,I: 禁用
@@ -106,7 +106,7 @@ public class OrderItem implements Serializable {
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
 
 }

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/Scene3dNum.java

@@ -48,13 +48,13 @@ public class Scene3dNum implements Serializable {
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
 
 }

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/SceneEditControls.java

@@ -95,13 +95,13 @@ public class SceneEditControls implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 0-有效,1-删除, 2-禁用

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/SceneEditInfo.java

@@ -173,13 +173,13 @@ public class SceneEditInfo implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 修改时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 0-有效,1-删除, 2-禁用

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/SceneEditInfoExt.java

@@ -89,13 +89,13 @@ public class SceneEditInfoExt implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 修改时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     /**
      * 0-有效,1-删除, 2-禁用

+ 2 - 2
src/main/java/com/fdkankan/manage/entity/ScenePlusExt.java

@@ -140,13 +140,13 @@ public class ScenePlusExt implements Serializable {
      * 创建时间
      */
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     /**
      * 更新时间
      */
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     @TableField("rec_status")
     @TableLogic(value = "A",delval = "I")

+ 1 - 1
src/main/java/com/fdkankan/manage/entity/SpaceSdk.java

@@ -47,7 +47,7 @@ public class SpaceSdk implements Serializable {
      * 发布时间
      */
     @TableField("publish_time")
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 是否置顶 1 -置顶  0-不置顶

+ 1 - 1
src/main/java/com/fdkankan/manage/entity/User.java

@@ -47,7 +47,7 @@ public class User implements Serializable {
      * 注册时间
      */
     @TableField("register_time")
-    private Date registerTime;
+    private String registerTime;
 
     /**
      * 用户名

+ 2 - 1
src/main/java/com/fdkankan/manage/service/impl/InvoiceServiceImpl.java

@@ -13,6 +13,7 @@ import com.fdkankan.manage.service.*;
 import com.fdkankan.manage.common.Dict;
 import com.fdkankan.manage.mapper.IInvoiceMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.InvoicePageParamVO;
 import com.fdkankan.manage.vo.InvoiceRegisterDetailVO;
 import com.fdkankan.manage.vo.InvoiceVO;
@@ -103,7 +104,7 @@ public class InvoiceServiceImpl extends ServiceImpl<IInvoiceMapper, Invoice> imp
             invoiceRegister.setCreaterId(userId);
         }else{
             invoiceRegister.setUpdaterId(userId);
-            invoiceRegister.setUpdateTime(new Date());
+            invoiceRegister.setUpdateTime(Dateutils.getDate(new Date()));
         }
         //普通发票
         if(InvoiceType.ORDINARY.code().equals(type)){

+ 4 - 1
src/main/java/com/fdkankan/manage/service/impl/NewsServiceImpl.java

@@ -12,6 +12,7 @@ import com.fdkankan.manage.entity.News;
 import com.fdkankan.manage.mapper.INewsMapper;
 import com.fdkankan.manage.service.INewsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.vo.BaseParamVO;
 import com.fdkankan.manage.vo.NewsDisplayParamVO;
 import com.fdkankan.manage.vo.NewsPublicParamVO;
@@ -21,6 +22,8 @@ import com.fdkankan.manage.vo.PageNewsVO;
 import com.fdkankan.manage.vo.SaveNewsParamVO;
 import com.fdkankan.manage.vo.UpdateNewsParamVO;
 import java.util.Calendar;
+import java.util.Date;
+
 import org.springframework.stereotype.Service;
 
 /**
@@ -109,7 +112,7 @@ public class NewsServiceImpl extends ServiceImpl<INewsMapper, News> implements I
     @Override
     public ResultData updateNews(Long userId, UpdateNewsParamVO param) {
         News news = BeanUtil.copyProperties(param, News.class);
-        news.setUpdateTime(Calendar.getInstance().getTime());
+        news.setUpdateTime(Dateutils.getDate(new Date()));
         news.setUpdaterId(userId);
         this.updateById(news);
         return ResultData.ok();

+ 1 - 1
src/main/java/com/fdkankan/manage/service/impl/UserServiceImpl.java

@@ -193,7 +193,7 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
             user.setPassword(passwordMd5);
             user.setStatus(1);
             user.setIsNotice(1);
-            user.setRegisterTime(new Date());
+            user.setRegisterTime(Dateutils.getDate(new Date()));
             user.setUserName(param.getUserName());
             user.setNickName(param.getNickName());
             user.setCountry("86");

+ 2 - 2
src/main/java/com/fdkankan/manage/vo/InvoiceVO.java

@@ -39,14 +39,14 @@ public class InvoiceVO {
      */
     @ColumnWidth(20)
     @ExcelProperty("支付时间")
-    private Date payTime;
+    private String payTime;
 
     /**
      * 开票时间
      */
     @ColumnWidth(20)
     @ExcelProperty("开票申请时间")
-    private Date invoiceTime;
+    private String invoiceTime;
 
     /**
      * 开票金额

+ 2 - 2
src/main/java/com/fdkankan/manage/vo/PageNewsVO.java

@@ -56,12 +56,12 @@ public class PageNewsVO{
     /**
      * 发布时间
      */
-    private Date publicTime;
+    private String publicTime;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+    private String createTime;
 
     /**
      * 创建人

+ 1 - 1
src/main/java/com/fdkankan/manage/vo/request/SpaceSdkParam.java

@@ -22,7 +22,7 @@ public class SpaceSdkParam extends RequestBase implements Serializable {
     private String imprint;
 
 
-    private Date publishTime;
+    private String publishTime;
 
     /**
      * 是否置顶 1 -置顶  0-不置顶