diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index c67a350..9c3a4c3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String strength;
+    private String data;
     private String logtime;
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index c67a350..9c3a4c3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String strength;
+    private String data;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index f13f195..242dbfa 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 闸井服务支撑接口
@@ -24,6 +25,7 @@
      */
     List<BusWellInfoDto> getWellList(DataScope dataScope, String keywords, String wellType, String deptid);
 
+
     /**
      * 根据井主键查询井信息
      *

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index c67a350..9c3a4c3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String strength;
+    private String data;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index f13f195..242dbfa 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 闸井服务支撑接口
@@ -24,6 +25,7 @@
      */
     List<BusWellInfoDto> getWellList(DataScope dataScope, String keywords, String wellType, String deptid);
 
+
     /**
      * 根据井主键查询井信息
      *
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..6f76952 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,7 +43,6 @@
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
-
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index c67a350..9c3a4c3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String strength;
+    private String data;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index f13f195..242dbfa 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 闸井服务支撑接口
@@ -24,6 +25,7 @@
      */
     List<BusWellInfoDto> getWellList(DataScope dataScope, String keywords, String wellType, String deptid);
 
+
     /**
      * 根据井主键查询井信息
      *
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..6f76952 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,7 +43,6 @@
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
-
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fdabbf2..6e69581 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 42089e8..d7fa72a 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -50,17 +50,11 @@
      */
     @RequestMapping("/level/list")
     @ResponseBody
-    public Object levelList(Long tenantId) {
+    public Object levelList() {
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
-        if (ObjectUtil.isEmpty(tenantId)) {
-            if (StrUtil.isEmpty(currUser.getTenantId())) {
-                return ResponseData.error("无关联的项目id");
-            }
-            //当前用户所属组织机构关联的项目id
-            tenantId = Long.valueOf(currUser.getTenantId());
-        }
-
+        //当前用户所属组织机构关联的项目id
+        Long tenantId = Long.valueOf(currUser.getTenantId());
         DeptPermission deptPermission = deptPermissionService.selectDeptPermission(currUser.getDeptId());
         if (ObjectUtil.isEmpty(deptPermission)) {
             return levelList;
@@ -71,7 +65,7 @@
                 continue;
             }
             String deviceTypeName = EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum);
-            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId,deviceTypeNum);
+            List<Map<String, Object>> levels = alarmLevelService.getLevelList(tenantId, deviceTypeNum);
             levels.forEach(
                     levelMap -> {
                         levelMap.put("deviceType", deviceType);
@@ -134,10 +128,10 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add( AlarmLevelParam alarmLevelParam) {
-        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+    public Object add(AlarmLevelParam alarmLevelParam) {
+        if (ObjectUtils.isEmpty(alarmLevelParam.getTenantId())) {
             AuthUser currUser = permissionService.getAuthService().getLoginUser();
-            alarmLevelParam.setTenantId(currUser.getId());
+            alarmLevelParam.setTenantId(Long.valueOf(currUser.getTenantId()));
         }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
index 9d9f43c..e842023 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/BusMapOverviewController.java
@@ -17,6 +17,7 @@
 import com.casic.missiles.modular.system.service.IBusDeviceSupportService;
 import com.casic.missiles.modular.system.service.IBusWellInfoSupportService;
 import com.casic.missiles.modular.system.service.IDataAnalysisService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -49,7 +50,7 @@
     @Resource
     private IBusDeviceSupportService busDeviceSupportService;
 
-    /**
+    /*
      * 获取列表
      */
     @RequestMapping(value = "/wellList")
@@ -62,15 +63,10 @@
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<BusWellInfoDto> wellList = new ArrayList<BusWellInfoDto>();
 
-        if (null == isAlarm || isAlarm.equals("") == true) {
+        if (StringUtils.isEmpty(isAlarm)) {
             // isAlarm参数为空，查询所有的闸井
-
             // 查询并添加当前部门的闸井
-            List<BusWellInfoDto> myList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
-            if (null != myList && myList.isEmpty() == false) {
-                wellList.addAll(myList);
-            }
-
+            wellList = busWellInfoService.getWellList(dataScope, keywords, wellType, deptid);
             /**
              * 不需要了，由dataScope控制权限
              // 查询并添加下级部门的闸井
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index b1258a9..69d6d69 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -530,7 +530,6 @@
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
-
         deviceDataExcelDtoList.forEach(deviceDto -> {
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
@@ -560,13 +559,13 @@
         List<DeviceDataExcelDto> deviceDataExcelDtoList = deviceService.selectGasLiquidDataScopePage(dataScope, page, sensorType, deptid, beginTime, endTime, keywords);
         deviceDataExcelDtoList.forEach(deviceDataExcelDto -> {
                     if ("gas".equals(sensorType)) {
-                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        Double dValue = Double.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (dValue <= 20.0) {
-                            deviceDataExcelDto.setStrength(dValue + "%LEL");
+                            deviceDataExcelDto.setData(dValue + "%LEL");
                         } else {
                             DecimalFormat df = new DecimalFormat("0.00");
                             dValue = dValue / 20.0;
-                            deviceDataExcelDto.setStrength(df.format(dValue) + "%VOL");
+                            deviceDataExcelDto.setData(df.format(dValue) + "%VOL");
                         }
                     }
                 }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index d4837d3..7071ced 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -1317,7 +1317,7 @@
                 <property name="paramStr" value="#{endTime}"/>
             </include>
         </if>
-        ORDER BY dh.UPTIME DESC
+        ORDER BY dh.LOGTIME DESC
     </select>
 
     <select id="selectH2sListDataScopePage" resultType="com.casic.missiles.modular.system.dto.ExcelModel.H2SDataDto">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
index c4acf27..0309f59 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java
@@ -566,9 +566,9 @@
                     deviceDataExcelDto.setDeptName(permissionService.getDeptService().getDeptName(Convert.toLong(deviceDataExcelDto.getDeptid())));
 //                    setCompany(map);
                     if ("liquid".equals(sensorType)) {
-                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getStrength()) ? "0" : deviceDataExcelDto.getStrength());
+                        float liquiddata = Float.valueOf(StrUtil.isEmpty(deviceDataExcelDto.getData()) ? "0" : deviceDataExcelDto.getData());
                         if (liquiddata <= 0) {
-                            deviceDataExcelDto.setStrength("正常水位");
+                            deviceDataExcelDto.setData("正常水位");
                         }
                     }
                 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
index c67a350..9c3a4c3 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/DeviceDataExcelDto.java
@@ -51,6 +51,6 @@
     @ExcelProperty("电量")
     private String cell;
     @ExcelProperty("设备数据值")
-    private String strength;
+    private String data;
     private String logtime;
 }
diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
index f13f195..242dbfa 100644
--- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
+++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/service/IBusWellInfoSupportService.java
@@ -6,6 +6,7 @@
 import com.casic.missiles.modular.system.model.BusWellInfo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 闸井服务支撑接口
@@ -24,6 +25,7 @@
      */
     List<BusWellInfoDto> getWellList(DataScope dataScope, String keywords, String wellType, String deptid);
 
+
     /**
      * 根据井主键查询井信息
      *
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 3746665..6f76952 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -8,6 +8,7 @@
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -42,7 +43,6 @@
 
     List<BusWellInfoDto> getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid);
 
-
     void updateBatchBfcf(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("deptIds") List<Long> deptIds);
 
     void updateCoordinates(@Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("LNG_BAIDU") List<Long> deptIds);
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index fdabbf2..6e69581 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -4,7 +4,7 @@
 spring:
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://111.198.10.15:11336/smartwell_demo?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
+    url: jdbc:mysql://111.198.10.15:11336/smartwell?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&serverTimezone=UTC&&allowMultiQueries=true
     username: root
     password: Casic203
   redis:
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 85adf91..80c2da7 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -18,7 +18,7 @@
     enable-sql-runner: true
   configuration:
     # 配置结果集属性为空时 是否映射返回结果
-    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
+#    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl #打印sql语句,调试用
 #    log-impl: org.apache.ibatis.logging.nologging.NoLoggingImpl
 ###################  mybatis-plus配置  ###################
 ###################  casic配置  ###################