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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 1036b7e..33e906e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -19,6 +19,6 @@
     private String openJob;
     private String highValue;
     private String lowValue;
-    private String level;
     //等级列表
+    private String level;
 }

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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 1036b7e..33e906e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -19,6 +19,6 @@
     private String openJob;
     private String highValue;
     private String lowValue;
-    private String level;
     //等级列表
+    private String level;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 85617c7..1662422 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -30,7 +30,7 @@
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
-    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevel);
 
     ResponseData updateAlarmLevel(AlarmLevelParam 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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 1036b7e..33e906e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -19,6 +19,6 @@
     private String openJob;
     private String highValue;
     private String lowValue;
-    private String level;
     //等级列表
+    private String level;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 85617c7..1662422 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -30,7 +30,7 @@
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
-    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevel);
 
     ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index bf0181c..59ae646 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -70,10 +70,10 @@
 
     @Override
     @Transactional
-    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
-            this.saveAlarmLevel(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevel);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -103,7 +103,7 @@
     private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
         QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
                 .eq("NAME", alarmLevelParam.getName())
-                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("DEVICE_TYPE", alarmLevelParam.getDeviceType())
                 .eq("TENANT_ID", alarmLevelParam.getTenantId());
         this.baseMapper.delete(queryWrapper);
         AlarmLevel alarmLevel = new AlarmLevel();

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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 1036b7e..33e906e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -19,6 +19,6 @@
     private String openJob;
     private String highValue;
     private String lowValue;
-    private String level;
     //等级列表
+    private String level;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 85617c7..1662422 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -30,7 +30,7 @@
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
-    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevel);
 
     ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index bf0181c..59ae646 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -70,10 +70,10 @@
 
     @Override
     @Transactional
-    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
-            this.saveAlarmLevel(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevel);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -103,7 +103,7 @@
     private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
         QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
                 .eq("NAME", alarmLevelParam.getName())
-                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("DEVICE_TYPE", alarmLevelParam.getDeviceType())
                 .eq("TENANT_ID", alarmLevelParam.getTenantId());
         this.baseMapper.delete(queryWrapper);
         AlarmLevel alarmLevel = new AlarmLevel();
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 dde4a34..9173324 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
@@ -1282,13 +1282,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{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 7f32013..7baf8cb 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
@@ -134,7 +134,7 @@
 
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
-    public Object add(@RequestBody AlarmLevelParam alarmLevelParam) {
+    public Object add( AlarmLevelParam alarmLevelParam) {
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 1036b7e..33e906e 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -19,6 +19,6 @@
     private String openJob;
     private String highValue;
     private String lowValue;
-    private String level;
     //等级列表
+    private String level;
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 85617c7..1662422 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -30,7 +30,7 @@
 
     ResponseData deleteByCondition(String deviceType, String name, String tenantId);
 
-    ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam);
+    ResponseData addAlarmLevel(AlarmLevelParam alarmLevel);
 
     ResponseData updateAlarmLevel(AlarmLevelParam alarmLevelParam);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index bf0181c..59ae646 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -70,10 +70,10 @@
 
     @Override
     @Transactional
-    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevelParam) {
+    public ResponseData addAlarmLevel(AlarmLevelParam alarmLevel) {
         ResponseData resultData = new ResponseData();
         try {
-            this.saveAlarmLevel(alarmLevelParam);
+            this.saveAlarmLevel(alarmLevel);
             resultData.setMessage("新增成功！");
             resultData.setCode(200);
         } catch (DataAccessException ex) {
@@ -103,7 +103,7 @@
     private void saveAlarmLevel(AlarmLevelParam alarmLevelParam) throws DataAccessException {
         QueryWrapper<AlarmLevel> queryWrapper = new QueryWrapper<AlarmLevel>()
                 .eq("NAME", alarmLevelParam.getName())
-                .eq("DEVICE_YPE", alarmLevelParam.getDeviceType())
+                .eq("DEVICE_TYPE", alarmLevelParam.getDeviceType())
                 .eq("TENANT_ID", alarmLevelParam.getTenantId());
         this.baseMapper.delete(queryWrapper);
         AlarmLevel alarmLevel = new AlarmLevel();
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 dde4a34..9173324 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
@@ -1282,13 +1282,14 @@
         AS logtime,dh.DESCN AS descn
         FROM data_hydrant dh
         JOIN bus_device bd ON bd.DEVCODE= dh.DEVCODE
-        JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE
+        JOIN bus_device_well bdw  ON bdw.device_id=bd.id
+        JOIN bus_well_info bwi ON bwi.id= bdw.well_id
         JOIN base_device_type bdt ON bd.DEVICE_TYPE=bdt.ID
         WHERE 1 = 1
         <if test="keywords != null and keywords !=''">
             AND (dh.DEVCODE LIKE
             <include refid="keywords_sql"/>
-            OR dh.WELL_CODE LIKE<include refid="keywords_sql"/>)
+            OR dh.WELL_CODE LIKE <include refid="keywords_sql"/>)
         </if>
         <if test="deptid != null and deptid != -1 ">
             and bwi.DEPTID = #{deptid}
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index e37a706..19c3484 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -196,8 +196,9 @@
         CELL AS cell,
         dl.WELL_CODE as "wellCode"
         FROM data_liquid dl
-        INNER JOIN bus_well_info bwi on dl.WELL_CODE = bwi.WELL_CODE
-        INNER JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        JOIN bus_device bd ON dl.DEVCODE = bd.DEVCODE
+        JOIN bus_device_well bdw ON bdw.device_id=bwi.id
+        JOIN bus_well_info bwi on bdw.well_id = bwi.id
         <where>
             bd.VALID = '1' AND bwi.VALID = '1'
             <if test="devcode != null and devcode !=''">