V1.1.3

src/main/java/com/fdkankan/agent/request/CameraIncrementParam.java

@@ -1,7 +1,7 @@
 package com.fdkankan.agent.request;
 
 import com.fdkankan.agent.common.RequestBase;
-import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.DateUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -20,15 +20,15 @@ public class CameraIncrementParam extends RequestBase {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

src/main/java/com/fdkankan/agent/request/CameraParam.java

@@ -1,7 +1,6 @@
 package com.fdkankan.agent.request;
 
 import com.fdkankan.agent.common.RequestBase;
-import com.fdkankan.agent.util.Dateutils;
 import lombok.Data;
 import lombok.ToString;
 

src/main/java/com/fdkankan/agent/request/SceneParam.java

@@ -1,7 +1,7 @@
 package com.fdkankan.agent.request;
 
 import com.fdkankan.agent.common.RequestBase;
-import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.DateUtils;
 import com.fdkankan.agent.util.FiledUtil;
 import jodd.util.StringUtil;
 import lombok.Data;
@@ -34,16 +34,16 @@ public class SceneParam extends RequestBase {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 
 

src/main/java/com/fdkankan/agent/request/TimeBase.java

@@ -1,7 +1,7 @@
 package com.fdkankan.agent.request;
 
 
-import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.DateUtils;
 import lombok.Data;
 
 import java.util.List;
@@ -18,15 +18,15 @@ public class TimeBase {
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getStartTime(timeList.get(0));
+            return DateUtils.getStartTime(timeList.get(0));
         }
-        return Dateutils.getStartTime(startTime);
+        return DateUtils.getStartTime(startTime);
     }
 
     public String getEndTime() {
         if(timeList != null && timeList.size() >1){
-            return Dateutils.getEndTime(timeList.get(1));
+            return DateUtils.getEndTime(timeList.get(1));
         }
-        return Dateutils.getEndTime(endTime);
+        return DateUtils.getEndTime(endTime);
     }
 }

src/main/java/com/fdkankan/agent/service/impl/DownloadOrderMgServiceImpl.java

@@ -1,15 +1,12 @@
 package com.fdkankan.agent.service.impl;
-import java.math.BigDecimal;
-import java.util.Date;
 
-import com.fdkankan.agent.entity.AgentNew;
 import com.fdkankan.agent.entity.DownloadOrderMg;
 import com.fdkankan.agent.entity.User;
 import com.fdkankan.agent.mapper.IDownloadOrderMgMapper;
 import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.service.IDownloadOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.DateUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -26,7 +23,7 @@ public class DownloadOrderMgServiceImpl extends ServiceImpl<IDownloadOrderMgMapp
     @Override
     public void addOrder(User user, Integer count, AgentNewVo agent) {
         DownloadOrderMg orderMg = new DownloadOrderMg();
-        orderMg.setOrderSn(Dateutils.getOrderSn());
+        orderMg.setOrderSn(DateUtils.getOrderSn());
         orderMg.setPayStatus(1);
         orderMg.setUserId(user.getId());
         orderMg.setCount(count);

src/main/java/com/fdkankan/agent/service/impl/IncrementOrderMgServiceImpl.java

@@ -1,6 +1,4 @@
 package com.fdkankan.agent.service.impl;
-import java.math.BigDecimal;
-import java.util.Date;
 
 import com.fdkankan.agent.entity.IncrementOrderMg;
 import com.fdkankan.agent.entity.User;
@@ -9,7 +7,7 @@ import com.fdkankan.agent.request.IncrementParam;
 import com.fdkankan.agent.response.AgentNewVo;
 import com.fdkankan.agent.service.IIncrementOrderMgService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.agent.util.Dateutils;
+import com.fdkankan.agent.util.DateUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -25,7 +23,7 @@ public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMa
     @Override
     public IncrementOrderMg addOrder(User user, IncrementParam param, AgentNewVo agentNewVo) {
         IncrementOrderMg orderMg = new IncrementOrderMg();
-        orderMg.setOrderSn(Dateutils.getOrderSn());
+        orderMg.setOrderSn(DateUtils.getOrderSn());
         orderMg.setPayStatus(1);
         orderMg.setUserId(user.getId());
         orderMg.setIncrementId(param.getId());

src/main/java/com/fdkankan/agent/service/impl/UserIncrementServiceImpl.java

@@ -27,7 +27,6 @@ import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.*;