diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3d94d41..7b9b5e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -92,7 +92,8 @@
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = 1
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3d94d41..7b9b5e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -92,7 +92,8 @@
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = 1
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
index b49b8c0..0bd2016 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
@@ -7,7 +7,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -37,6 +37,8 @@
      */
     private String devcode;
 
+    private String deviceType;
+
     /**
      * 闸井编号
      */
@@ -104,6 +106,14 @@
     private String wellTypeName;
 
 
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public Long getAlarmId() {
         return alarmId;
     }
@@ -268,13 +278,13 @@
     @Override
     public String toString() {
         return "AlarmNowView{" +
-        "id=" + alarmId +
-        ", deviceId=" + deviceId +
-        ", wellId=" + wellId +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmTime=" + getAlarmTime() +
-        "}";
+                "id=" + alarmId +
+                ", deviceId=" + deviceId +
+                ", wellId=" + wellId +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmTime=" + getAlarmTime() +
+                "}";
     }
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3d94d41..7b9b5e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -92,7 +92,8 @@
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = 1
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
index b49b8c0..0bd2016 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
@@ -7,7 +7,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -37,6 +37,8 @@
      */
     private String devcode;
 
+    private String deviceType;
+
     /**
      * 闸井编号
      */
@@ -104,6 +106,14 @@
     private String wellTypeName;
 
 
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public Long getAlarmId() {
         return alarmId;
     }
@@ -268,13 +278,13 @@
     @Override
     public String toString() {
         return "AlarmNowView{" +
-        "id=" + alarmId +
-        ", deviceId=" + deviceId +
-        ", wellId=" + wellId +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmTime=" + getAlarmTime() +
-        "}";
+                "id=" + alarmId +
+                ", deviceId=" + deviceId +
+                ", wellId=" + wellId +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmTime=" + getAlarmTime() +
+                "}";
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
index 4af65bf..2a03171 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
@@ -89,7 +89,7 @@
 
 
     <select id="corrRateByDevice" resultType="map">
-        SELECT DEVCODE as devcode,CORRODE_RATE as  corrodeRate
+        SELECT DEVCODE as devcode,PROBELOSS as  corrodeRate
         FROM
             data_corrrate
         WHERE

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3d94d41..7b9b5e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -92,7 +92,8 @@
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = 1
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
index b49b8c0..0bd2016 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
@@ -7,7 +7,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -37,6 +37,8 @@
      */
     private String devcode;
 
+    private String deviceType;
+
     /**
      * 闸井编号
      */
@@ -104,6 +106,14 @@
     private String wellTypeName;
 
 
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public Long getAlarmId() {
         return alarmId;
     }
@@ -268,13 +278,13 @@
     @Override
     public String toString() {
         return "AlarmNowView{" +
-        "id=" + alarmId +
-        ", deviceId=" + deviceId +
-        ", wellId=" + wellId +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmTime=" + getAlarmTime() +
-        "}";
+                "id=" + alarmId +
+                ", deviceId=" + deviceId +
+                ", wellId=" + wellId +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmTime=" + getAlarmTime() +
+                "}";
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
index 4af65bf..2a03171 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
@@ -89,7 +89,7 @@
 
 
     <select id="corrRateByDevice" resultType="map">
-        SELECT DEVCODE as devcode,CORRODE_RATE as  corrodeRate
+        SELECT DEVCODE as devcode,PROBELOSS as  corrodeRate
         FROM
             data_corrrate
         WHERE
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
index 9d4b11f..7cb17ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
@@ -21,8 +21,8 @@
 public class CorrodeDataServiceImpl implements ICorrodeDataService {
 
 
-    private final  CorrodeDataMapper corrodeDataMapper;
-    private final  ICommonPermissionService permissionService;
+    private final CorrodeDataMapper corrodeDataMapper;
+    private final ICommonPermissionService permissionService;
     private final IDeviceService deviceService;
 
 //    @Override
@@ -41,7 +41,6 @@
     }
 
 
-
     @Override
     public List<Map<String, Object>> corrRateByDevice(String beginTime, String endTime, DataScope dataScope) {
         SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -54,10 +53,10 @@
             date.setTime(beginDate);
             while (date.getTime().compareTo(endDate) <= 0) {
                 String tmp = sdf1.format(date.getTime());
-                List<Map<String, Object>> List = corrodeDataMapper.corrRateByDevice(tmp);
-                Map<String,Object> dataMap=new HashMap<>();
+                List<Map<String, Object>> list = corrodeDataMapper.corrRateByDevice(tmp);
+                Map<String, Object> dataMap = new HashMap<>();
                 dataMap.put("date", sdf2.format(date.getTime()));
-                dataMap.put("data",List);
+                dataMap.put("data", list);
                 mapList.add(dataMap);
                 date.add(Calendar.DAY_OF_MONTH, 1);
             }
@@ -67,5 +66,6 @@
         return mapList;
     }
 
+
 }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 174f95f..47740b5 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -6,7 +6,7 @@
     <sql id="Base_Column_List">
         wellId AS wellId, deviceId AS deviceId, devcode as devcode, wellCode AS wellCode, alarmId AS alarmId, deptid AS deptid,wellType AS wellType,
         alarmType AS alarmType, alarmValue AS alarmValue, alarmContent AS alarmContent, alarmTimeDate AS alarmTimeDate,
-        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,
+        position AS position, coordinateX AS coordinateX, coordinateY AS coordinateY,deviceType,
         lngBaidu AS lngBaidu, latBaidu AS latBaidu, lngGaode AS lngGaode, latGaode AS latGaode
     </sql>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
index 3d94d41..7b9b5e7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRecordsMapper.xml
@@ -92,7 +92,8 @@
         LEFT JOIN bus_well_info bwi ON ar.WELL_CODE = bwi.WELL_CODE
         WHERE STATUS = 1
         <if test="keywords!='' and keywords!=null">
-            and ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            and (ar.WELL_CODE like concat('%',CONCAT(#{keywords},'%'))
+            OR ar.DEVCODE like concat('%',CONCAT(#{keywords},'%')))
         </if>
         <if test="alarmType!='' and alarmType!= null">
             AND ar.ALARM_TYPE = #{alarmType}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
index b49b8c0..0bd2016 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dto/AlarmNowView.java
@@ -7,7 +7,7 @@
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
  * @author casic123
@@ -37,6 +37,8 @@
      */
     private String devcode;
 
+    private String deviceType;
+
     /**
      * 闸井编号
      */
@@ -104,6 +106,14 @@
     private String wellTypeName;
 
 
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
     public Long getAlarmId() {
         return alarmId;
     }
@@ -268,13 +278,13 @@
     @Override
     public String toString() {
         return "AlarmNowView{" +
-        "id=" + alarmId +
-        ", deviceId=" + deviceId +
-        ", wellId=" + wellId +
-        ", wellCode=" + wellCode +
-        ", alarmType=" + alarmType +
-        ", alarmContent=" + alarmContent +
-        ", alarmTime=" + getAlarmTime() +
-        "}";
+                "id=" + alarmId +
+                ", deviceId=" + deviceId +
+                ", wellId=" + wellId +
+                ", wellCode=" + wellCode +
+                ", alarmType=" + alarmType +
+                ", alarmContent=" + alarmContent +
+                ", alarmTime=" + getAlarmTime() +
+                "}";
     }
 }
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
index 4af65bf..2a03171 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/CorrodeDataMapper.xml
@@ -89,7 +89,7 @@
 
 
     <select id="corrRateByDevice" resultType="map">
-        SELECT DEVCODE as devcode,CORRODE_RATE as  corrodeRate
+        SELECT DEVCODE as devcode,PROBELOSS as  corrodeRate
         FROM
             data_corrrate
         WHERE
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
index 9d4b11f..7cb17ad 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/CorrodeDataServiceImpl.java
@@ -21,8 +21,8 @@
 public class CorrodeDataServiceImpl implements ICorrodeDataService {
 
 
-    private final  CorrodeDataMapper corrodeDataMapper;
-    private final  ICommonPermissionService permissionService;
+    private final CorrodeDataMapper corrodeDataMapper;
+    private final ICommonPermissionService permissionService;
     private final IDeviceService deviceService;
 
 //    @Override
@@ -41,7 +41,6 @@
     }
 
 
-
     @Override
     public List<Map<String, Object>> corrRateByDevice(String beginTime, String endTime, DataScope dataScope) {
         SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd");
@@ -54,10 +53,10 @@
             date.setTime(beginDate);
             while (date.getTime().compareTo(endDate) <= 0) {
                 String tmp = sdf1.format(date.getTime());
-                List<Map<String, Object>> List = corrodeDataMapper.corrRateByDevice(tmp);
-                Map<String,Object> dataMap=new HashMap<>();
+                List<Map<String, Object>> list = corrodeDataMapper.corrRateByDevice(tmp);
+                Map<String, Object> dataMap = new HashMap<>();
                 dataMap.put("date", sdf2.format(date.getTime()));
-                dataMap.put("data",List);
+                dataMap.put("data", list);
                 mapList.add(dataMap);
                 date.add(Calendar.DAY_OF_MONTH, 1);
             }
@@ -67,5 +66,6 @@
         return mapList;
     }
 
+
 }
 
diff --git a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
index 5f44732..6eda48c 100644
--- a/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
+++ b/casic-web/src/main/java/com/casic/missiles/controller/MockController.java
@@ -53,7 +53,7 @@
         super.getSession().setAttribute(PermissionContant.IS_APP, false);
         SuccessResponseData resultData = new SuccessResponseData();
         if (ToolUtil.isOneEmpty(username, password)) {
-            username = "qdgs";
+            username = "wxy";
             password = "111111";
         }
         Subject currentUser = ShiroKit.getSubject();