diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 6e94b5d..d213f42 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -162,12 +162,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id as "id",pid AS "pid"
         FROM  sys_dept
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 6e94b5d..d213f42 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -162,12 +162,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id as "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..f0a395f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -11,7 +11,7 @@
 
     <!-- 通用查询结果列 -->
     <select id="getListPage" resultType="MAP">
-        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        SELECT id AS "id",deptid AS "deptid",communication,well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
         FROM config_dept_permission
         WHERE 1=1
         <if test="deptid != -1  and deptid !=''">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 6e94b5d..d213f42 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -162,12 +162,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id as "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..f0a395f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -11,7 +11,7 @@
 
     <!-- 通用查询结果列 -->
     <select id="getListPage" resultType="MAP">
-        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        SELECT id AS "id",deptid AS "deptid",communication,well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
         FROM config_dept_permission
         WHERE 1=1
         <if test="deptid != -1  and deptid !=''">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
index 320caa9..32800ab 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
@@ -15,7 +15,7 @@
     </sql>
 
     <select id="getDeptList" resultType="Map">
-       SELECT  id,pid
+       SELECT  id AS "id",pid AS "pid"
 	   FROM   sys_dept
     </select>
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 6e94b5d..d213f42 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -162,12 +162,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id as "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..f0a395f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -11,7 +11,7 @@
 
     <!-- 通用查询结果列 -->
     <select id="getListPage" resultType="MAP">
-        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        SELECT id AS "id",deptid AS "deptid",communication,well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
         FROM config_dept_permission
         WHERE 1=1
         <if test="deptid != -1  and deptid !=''">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
index 320caa9..32800ab 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
@@ -15,7 +15,7 @@
     </sql>
 
     <select id="getDeptList" resultType="Map">
-       SELECT  id,pid
+       SELECT  id AS "id",pid AS "pid"
 	   FROM   sys_dept
     </select>
 
diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml
new file mode 100644
index 0000000..85de3cb
--- /dev/null
+++ b/casic-web/src/main/resources/config/application-dm.yml
@@ -0,0 +1,62 @@
+server:
+  port: 11308
+###################  spring配置  ###################
+spring:
+  datasource:
+    url: jdbc:dm://111.198.10.15:11211/schema=SMARTWELL?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: dm.jdbc.driver.DmDriver
+    username: SMARTWELL
+    password: Casic20311
+  session:
+    store-type: redis
+  redis:
+    host: 111.198.10.15
+    port: 11412
+    password: ew5T4K3#203lwh
+    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+  jms:
+    pub-sub-domain: true
+  #  session:
+  #   store-type: redis
+  redis-config:
+    host: 127.0.0.1
+    port: 6379
+    password:
+  activemq:
+    user:
+    password:
+    broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+  kaptcha-open: false #是否开启登录时验证码 (true/false)
+  #kaptcha-open: false #是否开启登录时验证码 (true/false)
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
+  db:
+    init:
+      enable: false
+  file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+  spring-session-open: false #开启spring session
+smartcity:
+  config:
+    export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export\
+    #export-path: D:\export\
+    image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    download-path: D:\v1.0\download\
+  device:
+    redis:
+      invalid-time: 86400
+      host: 127.0.0.1
+      port: 6379
+      password: ew5T4K3#203lwh
+      config-prefix: 'Casic:'
+  getui:
+    appId: HKv8K9qARd6WckZ1o2Vbu4
+    appKey: 5cV2rugxAb8o28WK6RSFU6
+    masterSecret: fQsKrOaFZy5tvKb3Vd3vv5
+logging:
+  level.root: info
+  level.com.casic: debug
+  file:
+    path: logs/
+    name: missiles.log
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
index 8a9e3d6..d4bbc6c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmRuleController.java
@@ -80,6 +80,7 @@
     private void alarmRuleWrapper(Map<String, Object> map) {
         String deviceType = map.get("deviceType") == null ? "" : map.get("deviceType").toString();
         long deptid = Long.parseLong(map.get("deptid").toString());
+        deviceType= deviceType.replaceAll(" ","");
         Long deviceTypeNum = StrUtil.isEmpty(deviceType) ? 0 : Long.valueOf(deviceType);
         map.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(deviceTypeNum));
         map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
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 da52d0f..d7f5fa9 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
@@ -2,31 +2,20 @@
 
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
-import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.alarm.model.AlarmLevelParam;
 import com.casic.missiles.modular.alarm.service.IAlarmLevelService;
 import com.casic.missiles.modular.system.dao.AlarmLevelMapper;
 import com.casic.missiles.modular.system.model.AlarmLevel;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.sun.javafx.collections.MappingChange;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.nio.channels.AcceptPendingException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Stream;
 
 /**
  * <p>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index c235877..d735cd9 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -82,7 +82,7 @@
     </sql>
 
     <sql id="data_diff" databaseId="oracle">
-         and date_part(now(),aj.create_time) <![CDATA[< ]]>  ${paramDay}
+        AND   SYSDATE -  aj.create_time  <![CDATA[< ]]>  ${paramDay}
     </sql>
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
index 322945c..768fa5f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmRuleMapper.xml
@@ -48,8 +48,8 @@
         SELECT ar.ID as id,ar.HIGHVALUE as "highValue",ar.LOWVALUE as "lowValue",
         bd.ID AS "devId",bd.DEVCODE as "devcode",
         bd.DEVICE_TYPE as "deviceType",bwi.ID AS "wellId",bwi.WELL_NAME as "wellName",
-        COALESCE (ar.OPERATOR,'') AS user,
-        bwi.WELL_CODE as "wellCode",bwi.DEEP as deep,bwi.DEPTID as deptid,
+        COALESCE (ar.OPERATOR,'') AS "user",
+        bwi.WELL_CODE as "wellCode",bwi.DEEP as "deep",bwi.DEPTID as "deptid",
         COALESCE (<include refid="tsdate_toChar"/>,'') AS ts
         FROM alarm_rule ar
         LEFT JOIN bus_device bd ON ar.DEVCODE = bd.DEVCODE
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index b6f4372..2f5affe 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -341,12 +341,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id AS "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
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 c85cefc..91bfcba 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
@@ -87,7 +87,7 @@
     </sql>
 
     <sql id="char_toDate" databaseId="oracle">
-        TO_DATE(${paramStr},'yyyy-mm-dd hh24:mi')
+       ${paramStr}
     </sql>
 
     <sql id="wellCode_sql" databaseId="oracle">
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index 6e94b5d..d213f42 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -162,12 +162,12 @@
     </select>
 
     <select id="getDeviceType" resultType="Map">
-        SELECT  DEVICE_TYPE AS  "deviceType",deptid
+        SELECT  DEVICE_TYPE AS  "deviceType",deptid AS "deptid"
         FROM config_dept_permission
     </select>
 
     <select id="getDeptList" resultType="Map">
-        SELECT  id,pid
+        SELECT  id as "id",pid AS "pid"
         FROM  sys_dept
     </select>
 
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..f0a395f 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -11,7 +11,7 @@
 
     <!-- 通用查询结果列 -->
     <select id="getListPage" resultType="MAP">
-        SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
+        SELECT id AS "id",deptid AS "deptid",communication,well_type AS "wellType",device_type AS "deviceType",area AS "area",map AS "map",lng as "lng",lat AS "lat"
         FROM config_dept_permission
         WHERE 1=1
         <if test="deptid != -1  and deptid !=''">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
index 320caa9..32800ab 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/TenantDeptMapper.xml
@@ -15,7 +15,7 @@
     </sql>
 
     <select id="getDeptList" resultType="Map">
-       SELECT  id,pid
+       SELECT  id AS "id",pid AS "pid"
 	   FROM   sys_dept
     </select>
 
diff --git a/casic-web/src/main/resources/config/application-dm.yml b/casic-web/src/main/resources/config/application-dm.yml
new file mode 100644
index 0000000..85de3cb
--- /dev/null
+++ b/casic-web/src/main/resources/config/application-dm.yml
@@ -0,0 +1,62 @@
+server:
+  port: 11308
+###################  spring配置  ###################
+spring:
+  datasource:
+    url: jdbc:dm://111.198.10.15:11211/schema=SMARTWELL?autoReconnect=true&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&zeroDateTimeBehavior=convertToNull
+    driver-class-name: dm.jdbc.driver.DmDriver
+    username: SMARTWELL
+    password: Casic20311
+  session:
+    store-type: redis
+  redis:
+    host: 111.198.10.15
+    port: 11412
+    password: ew5T4K3#203lwh
+    redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer
+  jms:
+    pub-sub-domain: true
+  #  session:
+  #   store-type: redis
+  redis-config:
+    host: 127.0.0.1
+    port: 6379
+    password:
+  activemq:
+    user:
+    password:
+    broker-url: tcp://192.168.0.203:61616
+#flowable数据源和多数据源配置
+casic:
+  kaptcha-open: false #是否开启登录时验证码 (true/false)
+  #kaptcha-open: false #是否开启登录时验证码 (true/false)
+  no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
+  db:
+    init:
+      enable: false
+  file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
+  spring-session-open: false #开启spring session
+smartcity:
+  config:
+    export-path: D:\cz\203\管网\升级\2.0\casic-smartcity\casic-web\src\main\resources\config\export\
+    #export-path: D:\export\
+    image-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\image\
+    config-path: D:\workspace\server\well\2.0\casic-smartcity\casic-web\src\main\resources\config\temp\
+    download-path: D:\v1.0\download\
+  device:
+    redis:
+      invalid-time: 86400
+      host: 127.0.0.1
+      port: 6379
+      password: ew5T4K3#203lwh
+      config-prefix: 'Casic:'
+  getui:
+    appId: HKv8K9qARd6WckZ1o2Vbu4
+    appKey: 5cV2rugxAb8o28WK6RSFU6
+    masterSecret: fQsKrOaFZy5tvKb3Vd3vv5
+logging:
+  level.root: info
+  level.com.casic: debug
+  file:
+    path: logs/
+    name: missiles.log
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application.yml b/casic-web/src/main/resources/config/application.yml
index 0cf0abf..578276c 100644
--- a/casic-web/src/main/resources/config/application.yml
+++ b/casic-web/src/main/resources/config/application.yml
@@ -3,7 +3,7 @@
 ##########################################################
 spring:
   profiles:
-    active: dev
+    active: dm
   servlet:
     multipart:
       max-file-size: 50MB