diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
index 587fcfe..409e345 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
@@ -3,10 +3,8 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.dao.GasFlowMapper;
-import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IGasFlowService;
@@ -16,10 +14,7 @@
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -103,12 +98,12 @@
 
     @Override
     public List<DataGasFlow> listByDevice(Page<DataGasFlow> page, String devcode, String beginTime, String endTime) {
-        EntityWrapper query = new EntityWrapper();
-        query.eq("DEVCODE", devcode);
+        EntityWrapper<DataGasFlow> queryWrapper = new EntityWrapper<>();
+        queryWrapper.eq("DEVCODE", devcode);
         if (!ToolUtil.isAllEmpty(beginTime, endTime)) {
-            query.between("UPTIME", beginTime, endTime);
+            queryWrapper.between("UPTIME", beginTime, endTime);
         }
-        List<DataGasFlow> list = baseMapper.selectPage(page, query);
+        List<DataGasFlow> list = baseMapper.selectPage(page, queryWrapper.orderBy("UPTIME",false));
         return list;
     }
 

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
index 587fcfe..409e345 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
@@ -3,10 +3,8 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.dao.GasFlowMapper;
-import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IGasFlowService;
@@ -16,10 +14,7 @@
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -103,12 +98,12 @@
 
     @Override
     public List<DataGasFlow> listByDevice(Page<DataGasFlow> page, String devcode, String beginTime, String endTime) {
-        EntityWrapper query = new EntityWrapper();
-        query.eq("DEVCODE", devcode);
+        EntityWrapper<DataGasFlow> queryWrapper = new EntityWrapper<>();
+        queryWrapper.eq("DEVCODE", devcode);
         if (!ToolUtil.isAllEmpty(beginTime, endTime)) {
-            query.between("UPTIME", beginTime, endTime);
+            queryWrapper.between("UPTIME", beginTime, endTime);
         }
-        List<DataGasFlow> list = baseMapper.selectPage(page, query);
+        List<DataGasFlow> list = baseMapper.selectPage(page, queryWrapper.orderBy("UPTIME",false));
         return list;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
index 8cfb5d1..3dccda1 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -73,13 +74,16 @@
      * 上传时间
      */
     @TableField("UPTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date uptime;
 
     /**
      * 记录时间
      */
     @NotEmpty(message = "记录时间不能为空")
+
     @TableField("LOGTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date logtime;
 
     /**

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
index 587fcfe..409e345 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
@@ -3,10 +3,8 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.dao.GasFlowMapper;
-import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IGasFlowService;
@@ -16,10 +14,7 @@
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -103,12 +98,12 @@
 
     @Override
     public List<DataGasFlow> listByDevice(Page<DataGasFlow> page, String devcode, String beginTime, String endTime) {
-        EntityWrapper query = new EntityWrapper();
-        query.eq("DEVCODE", devcode);
+        EntityWrapper<DataGasFlow> queryWrapper = new EntityWrapper<>();
+        queryWrapper.eq("DEVCODE", devcode);
         if (!ToolUtil.isAllEmpty(beginTime, endTime)) {
-            query.between("UPTIME", beginTime, endTime);
+            queryWrapper.between("UPTIME", beginTime, endTime);
         }
-        List<DataGasFlow> list = baseMapper.selectPage(page, query);
+        List<DataGasFlow> list = baseMapper.selectPage(page, queryWrapper.orderBy("UPTIME",false));
         return list;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
index 8cfb5d1..3dccda1 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -73,13 +74,16 @@
      * 上传时间
      */
     @TableField("UPTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date uptime;
 
     /**
      * 记录时间
      */
     @NotEmpty(message = "记录时间不能为空")
+
     @TableField("LOGTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date logtime;
 
     /**
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 5b74ebf..5f44732 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -53,7 +53,7 @@
         super.getSession().setAttribute(PermissionContant.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (ToolUtil.isOneEmpty(username, password)) {
-            username = "qdgq";
+            username = "qdgs";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();

diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
index 587fcfe..409e345 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/GasFlowServiceImpl.java
@@ -3,10 +3,8 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.dao.GasFlowMapper;
-import com.casic.missiles.modular.system.dto.DeviceDto;
 import com.casic.missiles.modular.system.model.DataGasFlow;
 import com.casic.missiles.modular.system.service.IDeviceService;
 import com.casic.missiles.modular.system.service.IGasFlowService;
@@ -16,10 +14,7 @@
 import javax.annotation.Resource;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * <p>
@@ -103,12 +98,12 @@
 
     @Override
     public List<DataGasFlow> listByDevice(Page<DataGasFlow> page, String devcode, String beginTime, String endTime) {
-        EntityWrapper query = new EntityWrapper();
-        query.eq("DEVCODE", devcode);
+        EntityWrapper<DataGasFlow> queryWrapper = new EntityWrapper<>();
+        queryWrapper.eq("DEVCODE", devcode);
         if (!ToolUtil.isAllEmpty(beginTime, endTime)) {
-            query.between("UPTIME", beginTime, endTime);
+            queryWrapper.between("UPTIME", beginTime, endTime);
         }
-        List<DataGasFlow> list = baseMapper.selectPage(page, query);
+        List<DataGasFlow> list = baseMapper.selectPage(page, queryWrapper.orderBy("UPTIME",false));
         return list;
     }
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
index 8cfb5d1..3dccda1 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/model/DataGasFlow.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.system.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.activerecord.Model;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
@@ -73,13 +74,16 @@
      * 上传时间
      */
     @TableField("UPTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date uptime;
 
     /**
      * 记录时间
      */
     @NotEmpty(message = "记录时间不能为空")
+
     @TableField("LOGTIME")
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date logtime;
 
     /**
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 5b74ebf..5f44732 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -53,7 +53,7 @@
         super.getSession().setAttribute(PermissionContant.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (ToolUtil.isOneEmpty(username, password)) {
-            username = "qdgq";
+            username = "qdgs";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();
diff --git a/casic-web/src/main/resources/config/export/corrodeData.xlsx b/casic-web/src/main/resources/config/export/corrodeData.xlsx
index 2bbeace..1edc7c7 100644
--- a/casic-web/src/main/resources/config/export/corrodeData.xlsx
+++ b/casic-web/src/main/resources/config/export/corrodeData.xlsx
Binary files differ