diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index 3c527ac..c37d805 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -2,22 +2,20 @@
 
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
-import com.casic.missiles.core.common.service.ICommonPermissionService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constants.AlarmConstants;
 import com.casic.missiles.modular.system.service.IStatisticsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**
  * @author lwh
  */
+@Controller
 @RequestMapping(value = "/dataStatistic")
 public class DataStaticsController extends BaseController {
     @Resource

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index 3c527ac..c37d805 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -2,22 +2,20 @@
 
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
-import com.casic.missiles.core.common.service.ICommonPermissionService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constants.AlarmConstants;
 import com.casic.missiles.modular.system.service.IStatisticsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**
  * @author lwh
  */
+@Controller
 @RequestMapping(value = "/dataStatistic")
 public class DataStaticsController extends BaseController {
     @Resource
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 831a474..2f07c37 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
@@ -219,13 +219,13 @@
                                               inner join alarm_records ar on bdw.device_id = ar.device_id
         where bwi.VALID = '1' and  bdw.VALID='1' and bd.valid = '1'
         and bd.device_type = #{deviceType}
-        and bwi.AREA.like #{area}
+        and bwi.area like #{areaId}
         <if test="startTime != null and startTime != ''">
             AND ar.ALARM_TIME<![CDATA[ >= ]]>  #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
             AND ar.ALARM_TIME<![CDATA[ <= ]]>  #{endTime}
         </if>
-        GROUP BY bwi.AREA
+        GROUP BY bwi.area
     </select>
 </mapper>
\ No newline at end of file

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
index 3c527ac..c37d805 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/DataStaticsController.java
@@ -2,22 +2,20 @@
 
 import com.casic.missiles.core.base.controller.BaseController;
 import com.casic.missiles.core.base.response.ResponseData;
-import com.casic.missiles.core.common.service.ICommonPermissionService;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.ToolUtil;
 import com.casic.missiles.modular.system.constants.AlarmConstants;
 import com.casic.missiles.modular.system.service.IStatisticsService;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
-import java.util.List;
 import java.util.Map;
 
 /**
  * @author lwh
  */
+@Controller
 @RequestMapping(value = "/dataStatistic")
 public class DataStaticsController extends BaseController {
     @Resource
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 831a474..2f07c37 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
@@ -219,13 +219,13 @@
                                               inner join alarm_records ar on bdw.device_id = ar.device_id
         where bwi.VALID = '1' and  bdw.VALID='1' and bd.valid = '1'
         and bd.device_type = #{deviceType}
-        and bwi.AREA.like #{area}
+        and bwi.area like #{areaId}
         <if test="startTime != null and startTime != ''">
             AND ar.ALARM_TIME<![CDATA[ >= ]]>  #{startTime}
         </if>
         <if test="endTime != null and endTime != ''">
             AND ar.ALARM_TIME<![CDATA[ <= ]]>  #{endTime}
         </if>
-        GROUP BY bwi.AREA
+        GROUP BY bwi.area
     </select>
 </mapper>
\ No newline at end of file
diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml
index 0b1826d..eeb6b8a 100644
--- a/casic-web/src/main/resources/config/application-dev.yml
+++ b/casic-web/src/main/resources/config/application-dev.yml
@@ -33,11 +33,8 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
-
   nologin-urls: /user/login,/user/appLogin,/kaptcha/base64,/config/baseConfig,/route/mockToken,/job/updateSinkJob,/route/sync,/websocket/*,/gasflow/data/recv
-
   file-upload-path: D:\java\boot\guns-web-1.0.0-SNAPSHOT\upload
-
   spring-session-open: true #开启spring session
 smartcity:
   config: