diff --git a/src/main/java/com/zcloud/controller/alarm/AlarmDictController.java b/src/main/java/com/zcloud/controller/alarm/AlarmDictController.java
new file mode 100644
index 00000000..a0181aee
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/alarm/AlarmDictController.java
@@ -0,0 +1,150 @@
+package com.zcloud.controller.alarm;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.alarm.AlarmDictService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.Tools;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：门口门禁区域
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/alarmDict")
+public class AlarmDictController extends BaseController {
+
+	@Autowired
+	private AlarmDictService alarmDictService;
+
+	/**新增
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/add")
+	@RequiresPermissions("alarmDict:add")
+	@ResponseBody
+	public Object add() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人
+		pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间
+		pd.put("ISDELETE", "0");	//是否删除
+		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间
+		return alarmDictService.save(pd);
+	}
+
+	/**删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/delete")
+	@RequiresPermissions("alarmDict:del")
+	@ResponseBody
+	public Object delete() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		return alarmDictService.delete(pd);
+	}
+
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	@RequiresPermissions("alarmDict:edit")
+	@ResponseBody
+	public Object edit() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间
+		return alarmDictService.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list")
+	@RequiresPermissions("alarmDict:list")
+	@ResponseBody
+	public Object list(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String KEYWORDS = pd.getString("KEYWORDS");						//关键词检索条件
+		if(Tools.notEmpty(KEYWORDS))pd.put("KEYWORDS", KEYWORDS.trim());
+		page.setPd(pd);
+		List<PageData>	varList = alarmDictService.list(page);	//列出Coursectk列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/listByType")
+	@RequiresPermissions("alarmDict:list")
+	@ResponseBody
+	public Object listByType(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		List<PageData>	varList = alarmDictService.listByType(pd);	//列出Coursectk列表
+		map.put("varList", varList);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	 /**去修改页面获取数据
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	@RequiresPermissions("alarmDict:edit")
+	@ResponseBody
+	public Object goEdit() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = alarmDictService.findById(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**定位
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/savePosition")
+	@ResponseBody
+	public Object savePosition() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		return alarmDictService.savePosition(pd);	//根据ID读取
+	}
+
+}
diff --git a/src/main/java/com/zcloud/controller/alarm/AlarmInfoController.java b/src/main/java/com/zcloud/controller/alarm/AlarmInfoController.java
new file mode 100644
index 00000000..beaa3cad
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/alarm/AlarmInfoController.java
@@ -0,0 +1,130 @@
+package com.zcloud.controller.alarm;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.alarm.AlarmInfoService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.Jurisdiction;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+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 java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：门口门禁区域
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/alarmInfo")
+public class AlarmInfoController extends BaseController {
+
+	@Autowired
+	private AlarmInfoService alarmInfoService;
+
+	/**新增
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/add")
+	@RequiresPermissions("alarmInfo:add")
+	@ResponseBody
+	public Object add() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID()); // 添加时间
+		pd.put("CREATOR", Jurisdiction.getUSER_ID()); // 添加人
+		pd.put("CREATTIME", DateUtil.date2Str(new Date())); // 添加时间
+		pd.put("ISDELETE", "0");	//是否删除
+		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间
+		return alarmInfoService.save(pd);
+	}
+
+	/**删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/delete")
+	@RequiresPermissions("mkmjDoor:del")
+	@ResponseBody
+	public Object delete() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		return alarmInfoService.delete(pd);
+	}
+
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	@RequiresPermissions("mkmjDoor:edit")
+	@ResponseBody
+	public Object edit() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("OPERATOR", Jurisdiction.getUsername());	//修改人
+		pd.put("OPERATTIME", DateUtil.date2Str(new Date()));//修改时间
+		return alarmInfoService.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/list")
+	@RequiresPermissions("mkmjDoor:list")
+	@ResponseBody
+	public Object list(Page page) throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		page.setPd(pd);
+		List<PageData>	varList = alarmInfoService.list(page);	//列出Coursectk列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	 /**去修改页面获取数据
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	@RequiresPermissions("mkmjDoor:edit")
+	@ResponseBody
+	public Object goEdit() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = alarmInfoService.findById(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**定位
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/savePosition")
+	@ResponseBody
+	public Object savePosition() throws Exception{
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		return alarmInfoService.savePosition(pd);	//根据ID读取
+	}
+
+}
diff --git a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
index 8fa77095..cc36aaf0 100644
--- a/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
+++ b/src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java
@@ -5,6 +5,7 @@ import java.util.*;
 
 import com.alibaba.fastjson.JSON;
 import com.zcloud.aspect.DockAnnotation;
+import com.zcloud.entity.system.Department;
 import com.zcloud.entity.system.Dictionaries;
 import com.zcloud.service.bus.ImgFilesService;
 import com.zcloud.service.system.DepartmentService;
@@ -25,6 +26,7 @@ import com.zcloud.entity.PageData;
 import com.zcloud.service.firemanager.FireDeviceService;
 import com.zcloud.util.*;
 import com.zcloud.util.logAop.LogOperation;
+import org.springframework.web.servlet.ModelAndView;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
@@ -79,6 +81,53 @@ public class FireDeviceController extends BaseController {
         return map;
     }
 
+    @RequestMapping(value = "/listAllForExcel")
+//    @ResponseBody
+    public ModelAndView listAllForExcel() throws Exception{
+        ModelAndView mv = new ModelAndView();
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        Map<String,Object> dataMap = new HashMap<String,Object>();
+        List<String> titles = new ArrayList<String>();
+        titles.add("序号");	//1
+        titles.add("器材类型");	//2
+        titles.add("器材编号");	//3
+        titles.add("消防区域名称");	//4
+        titles.add("消防点位名称");	//5
+        titles.add("消防区域编码");	//6
+        titles.add("消防点位编码");	//7
+        titles.add("有效期开始时间");	//8
+        titles.add("有效期结束时间");	//9
+        titles.add("存放地点");	//10
+        titles.add("负责部门");	//11
+        titles.add("点位负责人");	//12
+        dataMap.put("titles", titles);
+        List<PageData> varOList = fireDeviceService.listAllForExcel(pd);
+        List<PageData> varList = new ArrayList<PageData>();
+        for(int i=0;i<varOList.size();i++){
+            PageData vpd = new PageData();
+            vpd.put("var1", i + 1);	    //1
+            vpd.put("var2", Tools.isEmpty(varOList.get(i).getString("FIRE_DEVICE_TYPE_NAME")) ? "" : varOList.get(i).getString("FIRE_DEVICE_TYPE_NAME"));	    //2
+            vpd.put("var3", Tools.isEmpty(varOList.get(i).getString("FIRE_DEVICE_CODE")) ? "" : varOList.get(i).getString("FIRE_DEVICE_CODE"));	    //3
+            vpd.put("var4", Tools.isEmpty(varOList.get(i).getString("FIRE_REGION_NAME")) ? "" : varOList.get(i).getString("FIRE_REGION_NAME"));	    //4
+            vpd.put("var5", Tools.isEmpty(varOList.get(i).getString("FIRE_POINT_NAME")) ? "" : varOList.get(i).getString("FIRE_POINT_NAME"));	    //5
+            vpd.put("var6", Tools.isEmpty(varOList.get(i).getString("FIRE_REGION_CODE")) ? "" : varOList.get(i).getString("FIRE_REGION_CODE"));	    //6
+            vpd.put("var7", Tools.isEmpty(varOList.get(i).getString("FIRE_POINT_CODE")) ? "" : varOList.get(i).getString("FIRE_POINT_CODE"));	    //7
+            vpd.put("var8", Tools.isEmpty(varOList.get(i).getString("VALIDITY_START_TIME")) ? "" : varOList.get(i).getString("VALIDITY_START_TIME"));	    //8
+            vpd.put("var9", Tools.isEmpty(varOList.get(i).getString("VALIDITY_END_TIME")) ? "" : varOList.get(i).getString("VALIDITY_END_TIME"));	    //9
+            vpd.put("var10", Tools.isEmpty(varOList.get(i).getString("REMAKE")) ? "" : varOList.get(i).getString("REMAKE"));	    //10
+            vpd.put("var11", Tools.isEmpty(varOList.get(i).getString("DEPARTMENTNAME")) ? "" : varOList.get(i).getString("DEPARTMENTNAME"));	    //10
+            vpd.put("var12", Tools.isEmpty(varOList.get(i).getString("USERNAME")) ? "" : varOList.get(i).getString("USERNAME"));	    //10
+            varList.add(vpd);
+        }
+        dataMap.put("varList", varList);
+        dataMap.put("filename","消防器材");
+        ObjectExcelView erv = new ObjectExcelView();
+        mv = new ModelAndView(erv,dataMap);
+        return mv;
+    }
+
     /**
      * @Description: 消防设备单个信息
      * @Author: dearLin
diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjDockDeviceController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjDockDeviceController.java
index f3e8cd62..91ce9d7d 100644
--- a/src/main/java/com/zcloud/controller/mkmj/MkmjDockDeviceController.java
+++ b/src/main/java/com/zcloud/controller/mkmj/MkmjDockDeviceController.java
@@ -81,6 +81,24 @@ public class MkmjDockDeviceController extends BaseController {
 		return map;
 	}
 
+	/**列表
+	 * @param pd
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/listAll")
+	@RequiresPermissions("mkmjDoor:list")
+	@ResponseBody
+	public Object listAll() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		List<PageData>	varList = mkmjDockDeviceService.listAll(pd);	//列出Coursectk列表
+		map.put("varList", varList);
+		map.put("result", errInfo);
+		return map;
+	}
+
 	 /**去修改页面获取数据
 	 * @param
 	 * @throws Exception
diff --git a/src/main/java/com/zcloud/controller/mkmj/MkmjPathController.java b/src/main/java/com/zcloud/controller/mkmj/MkmjPathController.java
index 053b98ad..64c467f1 100644
--- a/src/main/java/com/zcloud/controller/mkmj/MkmjPathController.java
+++ b/src/main/java/com/zcloud/controller/mkmj/MkmjPathController.java
@@ -13,10 +13,7 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 说明：门口门禁区域
@@ -113,7 +110,12 @@ public class MkmjPathController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		page.setPd(pd);
-		List<PageData>	varList = mkmjPathService.getCarAndPeopleInfolistPage(page);	//列出Coursectk列表
+		List<PageData> varList = new ArrayList<>();
+		if (!Tools.isEmpty(pd.get("DOOR_TYPE")) && pd.get("DOOR_TYPE").equals("0")) {
+			varList = mkmjPathService.getPeopleInfolistPage(page);	//列出人闸机信息列表
+		}else {
+			varList = mkmjPathService.getCarInfolistPage(page);	//列出车闸机信息列表
+		}
 		map.put("varList", varList);
 		map.put("page", page);
 		map.put("result", errInfo);
diff --git a/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmDictMapper.java b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmDictMapper.java
new file mode 100644
index 00000000..1d2e4311
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmDictMapper.java
@@ -0,0 +1,73 @@
+package com.zcloud.mapper.datasource.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmDictMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	List<PageData> listByType(PageData pd);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+	/**.
+	 * 校验名称是否重复 修改时传入数据id
+	 * @param pageData
+	 * @return
+	 */
+	PageData findByOnly(PageData pageData);
+
+	/**
+	 * 定位
+	 * @param pd
+	 */
+	void savePosition(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmInfoMapper.java b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmInfoMapper.java
new file mode 100644
index 00000000..635f1a11
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmInfoMapper.java
@@ -0,0 +1,68 @@
+package com.zcloud.mapper.datasource.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmInfoMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+	/**
+	 * 定位
+	 * @param pd
+	 */
+	void savePosition(PageData pd);
+
+	void saveAll(PageData pd);
+
+	List<PageData> findThreshold(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmMapper.java b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmMapper.java
new file mode 100644
index 00000000..00a5f89d
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/alarm/AlarmMapper.java
@@ -0,0 +1,71 @@
+package com.zcloud.mapper.datasource.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmMapper {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	void save(PageData pd);
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	void delete(PageData pd);
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	void edit(PageData pd);
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	List<PageData> listAll(PageData pd);
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	PageData findById(PageData pd);
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	void deleteAll(String[] ArrayDATA_IDS);
+
+	/**.
+	 * 校验名称是否重复 修改时传入数据id
+	 * @param pageData
+	 * @return
+	 */
+	PageData findByOnly(PageData pageData);
+
+	/**
+	 * 定位
+	 * @param pd
+	 */
+	void savePosition(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java
index 2ff6a166..5d143111 100644
--- a/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/firemanager/FireDeviceMapper.java
@@ -21,6 +21,8 @@ public interface FireDeviceMapper {
      */
     public List<PageData> datalistPage(Page page);
 
+    public List<PageData> listAllForExcel(PageData pd);
+
     /**
      * @Description: 列表查询给点位扫码h5页面
      * @Author: dearLin
diff --git a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjPathMapper.java b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjPathMapper.java
index 6e33c3e6..e307868c 100644
--- a/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjPathMapper.java
+++ b/src/main/java/com/zcloud/mapper/datasource/mkmj/MkmjPathMapper.java
@@ -43,7 +43,9 @@ public interface MkmjPathMapper {
 	 */
 	List<PageData> listAll(PageData pd);
 
-	List<PageData> getCarAndPeopleInfolistPage(Page page);
+	List<PageData> getPeopleInfolistPage(Page page);
+
+	List<PageData> getCarInfolistPage(Page page);
 
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/main/java/com/zcloud/service/alarm/AlarmDictService.java b/src/main/java/com/zcloud/service/alarm/AlarmDictService.java
new file mode 100644
index 00000000..c0ae352f
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/AlarmDictService.java
@@ -0,0 +1,67 @@
+package com.zcloud.service.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmDictService {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception;
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+
+	public List<PageData> listByType(PageData pd)throws Exception;
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+	/**
+	 * 定位
+	 * @param pd
+	 * @return
+	 */
+	Object savePosition(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/service/alarm/AlarmInfoService.java b/src/main/java/com/zcloud/service/alarm/AlarmInfoService.java
new file mode 100644
index 00000000..ee6b4863
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/AlarmInfoService.java
@@ -0,0 +1,69 @@
+package com.zcloud.service.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmInfoService {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception;
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+	/**
+	 * 定位
+	 * @param pd
+	 * @return
+	 */
+	Object savePosition(PageData pd);
+
+	void saveAll(PageData pd);
+
+	List<PageData> findThreshold(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/service/alarm/AlarmService.java b/src/main/java/com/zcloud/service/alarm/AlarmService.java
new file mode 100644
index 00000000..93eb9867
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/AlarmService.java
@@ -0,0 +1,65 @@
+package com.zcloud.service.alarm;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+public interface AlarmService {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception;
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception;
+
+	/**
+	 * 定位
+	 * @param pd
+	 * @return
+	 */
+	Object savePosition(PageData pd);
+}
+
diff --git a/src/main/java/com/zcloud/service/alarm/impl/AlarmDictServiceImpl.java b/src/main/java/com/zcloud/service/alarm/impl/AlarmDictServiceImpl.java
new file mode 100644
index 00000000..f1c34b9c
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/impl/AlarmDictServiceImpl.java
@@ -0,0 +1,125 @@
+package com.zcloud.service.alarm.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.alarm.AlarmDictMapper;
+import com.zcloud.service.alarm.AlarmDictService;
+import com.zcloud.util.UuidUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class AlarmDictServiceImpl implements AlarmDictService {
+
+	@Autowired
+	private AlarmDictMapper alarmDictMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		pd.put("ALARM_DICT_ID", UuidUtil.get32UUID());
+		alarmDictMapper.save(pd);
+		map.put("result", errInfo);
+		map.put("msg", "保存成功");
+		return map;
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmDictMapper.delete(pd);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmDictMapper.edit(pd);
+		map.put("result", errInfo);
+		map.put("msg", "编辑成功");
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return alarmDictMapper.datalistPage(page);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> listByType(PageData pd)throws Exception{
+		return alarmDictMapper.listByType(pd);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return alarmDictMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return alarmDictMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmDictMapper.deleteAll(ArrayDATA_IDS);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	@Override
+	public Object savePosition(PageData pd) {
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmDictMapper.savePosition(pd);
+		map.put("result", errInfo);
+		map.put("msg", "定位成功");
+		return map;
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/alarm/impl/AlarmInfoServiceImpl.java b/src/main/java/com/zcloud/service/alarm/impl/AlarmInfoServiceImpl.java
new file mode 100644
index 00000000..d22a86b0
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/impl/AlarmInfoServiceImpl.java
@@ -0,0 +1,128 @@
+package com.zcloud.service.alarm.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.alarm.AlarmInfoMapper;
+import com.zcloud.service.alarm.AlarmInfoService;
+import com.zcloud.util.UuidUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class AlarmInfoServiceImpl implements AlarmInfoService {
+
+	@Autowired
+	private AlarmInfoMapper alarmInfoMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		pd.put("ALARM_INFO_ID", UuidUtil.get32UUID());
+		alarmInfoMapper.save(pd);
+		map.put("result", errInfo);
+		map.put("msg", "保存成功");
+		return map;
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.delete(pd);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.edit(pd);
+		map.put("result", errInfo);
+		map.put("msg", "编辑成功");
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return alarmInfoMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return alarmInfoMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return alarmInfoMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.deleteAll(ArrayDATA_IDS);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	@Override
+	public Object savePosition(PageData pd) {
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.savePosition(pd);
+		map.put("result", errInfo);
+		map.put("msg", "定位成功");
+		return map;
+	}
+
+	@Override
+	public List<PageData> findThreshold(PageData pd) {
+		List<PageData> threshold = alarmInfoMapper.findThreshold(pd);
+		return threshold;
+	}
+
+	@Override
+	public void saveAll(PageData pd) {
+		alarmInfoMapper.saveAll(pd);
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/alarm/impl/AlarmServiceImpl.java b/src/main/java/com/zcloud/service/alarm/impl/AlarmServiceImpl.java
new file mode 100644
index 00000000..3320f010
--- /dev/null
+++ b/src/main/java/com/zcloud/service/alarm/impl/AlarmServiceImpl.java
@@ -0,0 +1,117 @@
+package com.zcloud.service.alarm.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.alarm.AlarmMapper;
+import com.zcloud.service.alarm.AlarmService;
+import com.zcloud.util.UuidUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：门口门禁区域闸机
+ * 作者：zhaoyu
+ * 时间：2024-01-16
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class AlarmServiceImpl implements AlarmService {
+
+	@Autowired
+	private AlarmMapper alarmInfoMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object save(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		pd.put("ALARM_ID", UuidUtil.get32UUID());
+		alarmInfoMapper.save(pd);
+		map.put("result", errInfo);
+		map.put("msg", "保存成功");
+		return map;
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object delete(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.delete(pd);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public Object edit(PageData pd)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.edit(pd);
+		map.put("result", errInfo);
+		map.put("msg", "编辑成功");
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return alarmInfoMapper.datalistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return alarmInfoMapper.listAll(pd);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return alarmInfoMapper.findById(pd);
+	}
+
+	/**批量删除
+	 * @param ArrayDATA_IDS
+	 * @throws Exception
+	 */
+	public Object deleteAll(String[] ArrayDATA_IDS)throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.deleteAll(ArrayDATA_IDS);
+		map.put("result", errInfo);
+		map.put("msg", "删除成功");
+		return map;
+	}
+
+	@Override
+	public Object savePosition(PageData pd) {
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		alarmInfoMapper.savePosition(pd);
+		map.put("result", errInfo);
+		map.put("msg", "定位成功");
+		return map;
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java
index ae0e4b44..e27b86fe 100644
--- a/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java
+++ b/src/main/java/com/zcloud/service/firemanager/FireDeviceService.java
@@ -13,6 +13,8 @@ import com.zcloud.entity.PageData;
 public interface FireDeviceService {
     List<PageData> list(Page page);
 
+    List<PageData> listAllForExcel(PageData pd);
+
     PageData findById(PageData pd);
 
     void updFireDeviceById(PageData pd);
diff --git a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java
index 4717e555..d33037a9 100644
--- a/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java
+++ b/src/main/java/com/zcloud/service/firemanager/impl/FireDeviceServiceImpl.java
@@ -51,6 +51,11 @@ public class FireDeviceServiceImpl implements FireDeviceService {
         return fireDeviceMapper.datalistPage(page);
     }
 
+    @Override
+    public List<PageData> listAllForExcel(PageData pd) {
+        return fireDeviceMapper.listAllForExcel(pd);
+    }
+
     @Override
     public PageData findById(PageData pd) {
         return fireDeviceMapper.findById(pd);
diff --git a/src/main/java/com/zcloud/service/mkmj/MkmjPathService.java b/src/main/java/com/zcloud/service/mkmj/MkmjPathService.java
index 33cb632f..7c722dab 100644
--- a/src/main/java/com/zcloud/service/mkmj/MkmjPathService.java
+++ b/src/main/java/com/zcloud/service/mkmj/MkmjPathService.java
@@ -43,7 +43,9 @@ public interface MkmjPathService {
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
 
-	public List<PageData> getCarAndPeopleInfolistPage(Page page)throws Exception;
+	public List<PageData> getPeopleInfolistPage(Page page)throws Exception;
+
+	public List<PageData> getCarInfolistPage(Page page)throws Exception;
 
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/main/java/com/zcloud/service/mkmj/impl/MkmjPathServiceImpl.java b/src/main/java/com/zcloud/service/mkmj/impl/MkmjPathServiceImpl.java
index 0e608f66..b594bf8b 100644
--- a/src/main/java/com/zcloud/service/mkmj/impl/MkmjPathServiceImpl.java
+++ b/src/main/java/com/zcloud/service/mkmj/impl/MkmjPathServiceImpl.java
@@ -103,8 +103,16 @@ public class MkmjPathServiceImpl implements MkmjPathService {
 	 * @param pd
 	 * @throws Exception
 	 */
-	public List<PageData> getCarAndPeopleInfolistPage(Page page)throws Exception{
-		return mkmjPathMapper.getCarAndPeopleInfolistPage(page);
+	public List<PageData> getPeopleInfolistPage(Page page)throws Exception{
+		return mkmjPathMapper.getPeopleInfolistPage(page);
+	}
+
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> getCarInfolistPage(Page page)throws Exception{
+		return mkmjPathMapper.getCarInfolistPage(page);
 	}
 
 	/**通过id获取数据
diff --git a/src/main/java/com/zcloud/util/AnemometerScheduled.java b/src/main/java/com/zcloud/util/AnemometerScheduled.java
deleted file mode 100644
index f4c405ee..00000000
--- a/src/main/java/com/zcloud/util/AnemometerScheduled.java
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.zcloud.util;
-
-import com.zcloud.entity.PageData;
-import com.zcloud.service.announcement.AnemometerService;
-import com.zcloud.service.bus.SysDateService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-/**
- * 风速仪定时器
- */
-@Component
-public class AnemometerScheduled {
-	@Autowired
-	private AnemometerService anemometerService;
-
-
-	//@Scheduled(cron ="0 5 0 * * ?")//每天12点05
-	@Scheduled(cron ="0 30 0 * * ?")//每天12点30
-
-	//@Scheduled(cron ="*/20 * * * * ?")//测试
-    public void scheduled(){
-		try {
-			System.out.println("============同步风速仪==========");
-			PageData pd = new PageData();
-			pd.put("SYSDATE_ID", this.get32UUID());	//主键
-			pd.put("DATE", DateUtil.getDay());
-			pd.put("DAY_START", DateUtil.getDay()+" 00:00:00");
-			pd.put("DAY_END", DateUtil.getDay()+" 23:59:59");
-			pd.put("WEEK_START", DateUtil.getWeekStart());
-			pd.put("WEEK_END", DateUtil.getWeekEnd());
-			String year = DateUtil.getYear().toString();
-			String month = DateUtil.getMonth().toString();
-			Integer day = Integer.parseInt(DateUtil.getOnlyDay().toString());
-			String xunStartTime = year + "-" + month + "-";
-			String xunEndTime = year + "-" + month + "-";
-			if(day <= 10) {
-				xunStartTime = xunStartTime+"01 00:00:00";
-				xunEndTime = xunEndTime+"10 23:59:59";
-			} else if(day > 10 && day <= 20) {
-				xunStartTime = xunStartTime+"11 00:00:00";
-				xunEndTime = xunEndTime+"20 23:59:59";
-			} else {
-				xunStartTime = xunStartTime+"21 00:00:00";
-				xunEndTime = DateUtil.getMonthEndDay()+" 23:59:59";
-			}
-			pd.put("XUN_START", xunStartTime);
-			pd.put("XUN_END", xunEndTime);
-			pd.put("MONTH_START", DateUtil.getMonthFirstDay()+" 00:00:00");
-			pd.put("MONTH_END", DateUtil.getMonthEndDay()+" 23:59:59");
-			pd.put("QUARTER_START", DateUtil.quarterStart()+" 00:00:00");
-			pd.put("QUARTER_END", DateUtil.quarterEnd()+" 23:59:59");
-			String HalfYearStartTime = DateUtil.getYear().toString();
-			String HalfYearEndTime = DateUtil.getYear().toString();
-			Integer bmonth = Integer.parseInt(DateUtil.getMonth().toString());
-
-			if(bmonth <= 6) {
-				HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00";
-				HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59";
-			} else if(bmonth > 6) {
-				HalfYearStartTime = HalfYearStartTime+"-07-01 00:00:00";
-				HalfYearEndTime = HalfYearEndTime+"-12-31 23:59:59";
-			}
-			pd.put("HALFYEAR_START", HalfYearStartTime);
-			pd.put("HALFYEAR_END", HalfYearEndTime);
-			pd.put("YEAR_START", DateUtil.getCurrYearFirst()+" 00:00:00");
-			pd.put("YEAR_END", DateUtil.getCurrYearLast()+" 23:59:59");
-//			sysdateService.save(pd);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-    }
-
-	/**
-	 * 数据初始化：bus_sysdate表时使用
-	 */
-   /* public void scheduled(){
-		try {
-			System.out.println("============定时增加日期==========");
-			for(int i=0;i < 730;i++) {
-				PageData pd = new PageData();
-				pd.put("SYSDATE_ID", this.get32UUID());	//主键
-				pd.put("DATE", DateSysUtil.getDay(i));
-				pd.put("DAY_START", DateSysUtil.getDay(i)+" 00:00:00");
-				pd.put("DAY_END", DateSysUtil.getDay(i)+" 23:59:59");
-				pd.put("WEEK_START", DateSysUtil.getWeekStart(i));
-				pd.put("WEEK_END", DateSysUtil.getWeekEnd(i));
-				String year = DateSysUtil.getYear(i).toString();
-				String month = DateSysUtil.getMonth(i).toString();
-				Integer day = Integer.parseInt(DateSysUtil.getOnlyDay(i).toString());
-				String xunStartTime = year + "-" + month + "-";
-				String xunEndTime = year + "-" + month + "-";
-				if(day <= 10) {
-					xunStartTime = xunStartTime+"01 00:00:00";
-					xunEndTime = xunEndTime+"10 23:59:59";
-				} else if(day > 10 && day <= 20) {
-					xunStartTime = xunStartTime+"11 00:00:00";
-					xunEndTime = xunEndTime+"20 23:59:59";
-				} else {
-					xunStartTime = xunStartTime+"21 00:00:00";
-					xunEndTime = DateSysUtil.getMonthEndDay(i)+" 23:59:59";
-				}
-				pd.put("XUN_START", xunStartTime);
-				pd.put("XUN_END", xunEndTime);
-				pd.put("MONTH_START", DateSysUtil.getMonthFirstDay(i)+" 00:00:00");
-				pd.put("MONTH_END", DateSysUtil.getMonthEndDay(i)+" 23:59:59");
-				pd.put("QUARTER_START", DateSysUtil.quarterStart(i)+" 00:00:00");
-				pd.put("QUARTER_END", DateSysUtil.quarterEnd(i)+" 23:59:59");
-				String HalfYearStartTime = DateSysUtil.getYear(i).toString();
-				String HalfYearEndTime = DateSysUtil.getYear(i).toString();
-				Integer bmonth = Integer.parseInt(DateSysUtil.getMonth(i).toString());
-
-				if(bmonth <= 6) {
-					HalfYearStartTime = HalfYearStartTime+"-01-01 00:00:00";
-					HalfYearEndTime = HalfYearEndTime+"-06-30 23:59:59";
-				} else if(bmonth > 6) {
-					HalfYearStartTime = HalfYearStartTime+"-07-01 00:00:00";
-					HalfYearEndTime = HalfYearEndTime+"-12-31 23:59:59";
-				}
-				pd.put("HALFYEAR_START", HalfYearStartTime);
-				pd.put("HALFYEAR_END", HalfYearEndTime);
-				pd.put("YEAR_START", DateSysUtil.getCurrYearFirst(i)+" 00:00:00");
-				pd.put("YEAR_END", DateSysUtil.getCurrYearLast(i)+" 23:59:59");
-				sysdateService.save(pd);
-			}
-
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-    }*/
-	/**得到32位的uuid
-	 * @return
-	 */
-	public String get32UUID(){
-		return UuidUtil.get32UUID();
-	}
-}
diff --git a/src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java b/src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java
index 00372972..1d793ae2 100644
--- a/src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java
+++ b/src/main/java/com/zcloud/util/SaveAnemometerInfoScheduled.java
@@ -1,6 +1,7 @@
 package com.zcloud.util;
 
 import com.zcloud.entity.PageData;
+import com.zcloud.service.alarm.AlarmInfoService;
 import com.zcloud.service.announcement.AnemometerLocalService;
 import com.zcloud.service.announcement.AnemometerMachineService;
 import com.zcloud.service.announcement.AnemometerService;
@@ -10,10 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Component
 public class SaveAnemometerInfoScheduled {
@@ -23,8 +21,10 @@ public class SaveAnemometerInfoScheduled {
 	private AnemometerLocalService anemometerLocalService;
 	@Autowired
 	private AnemometerMachineService anemometerMachineService;
+	@Autowired
+	private AlarmInfoService alarmInfoService;
 
-//	@Scheduled(cron ="*/5 * * * * ? ")
+	@Scheduled(cron ="*/15 * * * * ? ")
     public void scheduled() throws Exception{
 		saveAnemometerInfo();
 	}
@@ -61,6 +61,44 @@ public class SaveAnemometerInfoScheduled {
 				}
 			}
 		});
+		List<Object> alarmList = new ArrayList<>();
+		//查询风速仪报警阈值
+		PageData tPd = new PageData();
+		tPd.put("DICT_NAME","风速仪");
+		List<PageData> levelList = alarmInfoService.findThreshold(tPd);
+		for (PageData codeData : anemometerList) {
+			//若风速大于阈值则存储报警信息
+			for (PageData data : levelList) {
+				if (Double.parseDouble(codeData.getString("FVALUE")) > Double.parseDouble(data.getString("LEVELVALUE"))) {
+					PageData alarmPd = new PageData();
+					alarmPd.put("ALARM_INFO_ID",UuidUtil.get32UUID());
+					alarmPd.put("ALARM_VALUE",codeData.getString("FVALUE"));
+					alarmPd.put("ALARM_TIME",DateUtil.date2Str(new Date()));
+					alarmPd.put("LEVEL",data.getString("LEVELNAME"));
+					alarmPd.put("CREATOR","c5187fb9565649a89267f9adf6b0fab6");
+					alarmPd.put("CREATTIME",DateUtil.date2Str(new Date()));
+					alarmPd.put("OPERATOR","c5187fb9565649a89267f9adf6b0fab6");
+					alarmPd.put("OPERATTIME",DateUtil.date2Str(new Date()));
+					alarmPd.put("ISDELETE","0");
+					alarmPd.put("LOG",data.getString("LOG"));
+					if (anemometerMachineMap.containsKey(codeData.getString("FNAME"))) {
+						for (PageData machinePd : anemometerMachineList) {
+							if (machinePd.getString("FNAME").equals(codeData.getString("FNAME"))) {
+								alarmPd.put("ANEMOMETER_ID",machinePd.getString("FID"));
+							}
+						}
+					}
+					alarmList.add(alarmPd);
+					break;
+				}
+			}
+		}
+		if (alarmList.size() > 0) {
+			PageData alarmSavePd = new PageData();
+			alarmSavePd.put("list",alarmList);
+			alarmInfoService.saveAll(alarmSavePd);
+		}
+		System.out.println(anemometerList);
 		//保存获取的风速数据到本地
 		anemometerLocalService.BatchinsertInfo(anemometerList);
 	}
diff --git a/src/main/resources/mybatis/datasource/alarm/AlarmDictMapper.xml b/src/main/resources/mybatis/datasource/alarm/AlarmDictMapper.xml
new file mode 100644
index 00000000..7bf7dde0
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/alarm/AlarmDictMapper.xml
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.alarm.AlarmDictMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_ALARM_DICT
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.ALARM_DICT_ID,
+		f.PARENT_ID,
+		f.DICT_NAME,
+		f.DICT_TYPE,
+		f.CONTENT,
+		f.DICT_VALUE,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		ALARM_DICT_ID,
+		PARENT_ID,
+		DICT_NAME,
+		DICT_TYPE,
+		CONTENT,
+		DICT_VALUE,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{ALARM_DICT_ID},
+		#{PARENT_ID},
+		#{DICT_NAME},
+		#{DICT_TYPE},
+		#{CONTENT},
+		#{DICT_VALUE},
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+		ALARM_DICT_ID = #{ALARM_DICT_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ALARM_DICT_ID = ALARM_DICT_ID
+		<if test="DICT_NAME!='' and DICT_NAME != null">
+			,DICT_NAME = #{DICT_NAME}
+		</if>
+		<if test="PARENT_ID!='' and PARENT_ID != null">
+			,PARENT_ID = #{PARENT_ID}
+		</if>
+		<if test="DICT_TYPE!='' and DICT_TYPE != null">
+			,DICT_TYPE = #{DICT_TYPE}
+		</if>
+		<if test="CONTENT!='' and CONTENT != null">
+			,CONTENT = #{CONTENT}
+		</if>
+		<if test="DICT_VALUE!='' and DICT_VALUE != null">
+			,DICT_VALUE = #{DICT_VALUE}
+		</if>
+		<if test="CREATOR!='' and CREATOR != null">
+			,CREATOR = #{CREATOR}
+		</if>
+		<if test="CREATTIME!='' and CREATTIME != null">
+			,CREATTIME = #{CREATTIME}
+		</if>
+		<if test="OPERATOR!='' and OPERATOR != null">
+			,OPERATOR = #{OPERATOR}
+		</if>
+		<if test="OPERATTIME!='' and OPERATTIME != null">
+			,OPERATTIME = #{OPERATTIME}
+		</if>
+		<if test="ISDELETE!='' and ISDELETE != null">
+			,ISDELETE = #{ISDELETE}
+		</if>
+		where
+			ALARM_DICT_ID=#{ALARM_DICT_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+			f.ALARM_DICT_ID=#{ALARM_DICT_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="pd.DICT_NAME!='' and pd.DICT_NAME != null">
+			and f.DICT_NAME  LIKE CONCAT(CONCAT('%', #{pd.DICT_NAME}),'%')
+		</if>
+		<if test="pd.DICT_TYPE!='' and pd.DICT_TYPE != null">
+			and f.DICT_TYPE = #{pd.DICT_TYPE}
+		</if>
+		<if test="pd.PARENT_ID!='' and pd.PARENT_ID != null">
+			and f.PARENT_ID = #{pd.PARENT_ID}
+		</if>
+		ORDER BY
+			CAST( f.DICT_VALUE AS UNSIGNED ) ASC
+	</select>
+
+	<!-- 列表 -->
+	<select id="listByType" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where f.ISDELETE = '0'
+		<if test="DICT_TYPE!='' and DICT_TYPE != null">
+			and f.DICT_TYPE = #{DICT_TYPE}
+		</if>
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		SELECT
+			*
+		FROM
+			MKMJ_DOOR f
+		WHERE
+			f.ISDELETE = '0'
+		<if test="ALARM_DICT_ID!='' and ALARM_DICT_ID != null">
+			and f.ALARM_DICT_ID = #{ALARM_DICT_ID}
+		</if>
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+		ALARM_DICT_ID  in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/alarm/AlarmInfoMapper.xml b/src/main/resources/mybatis/datasource/alarm/AlarmInfoMapper.xml
new file mode 100644
index 00000000..c4273ec7
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/alarm/AlarmInfoMapper.xml
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.alarm.AlarmInfoMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_ALARM_INFO
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.ALARM_INFO_ID,
+		f.ALARM_VALUE,
+		f.ALARM_TIME,
+		f.LEVEL,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE,
+		f.LOG,
+		f.ANEMOMETER_ID
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		ALARM_INFO_ID,
+		ALARM_VALUE,
+		ALARM_TIME,
+		LEVEL,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE,
+		LOG,
+		ANEMOMETER_ID
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{ALARM_INFO_ID},
+		#{ALARM_VALUE},
+		#{ALARM_TIME},
+		#{LEVEL},
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE},
+		#{LOG},
+		#{ANEMOMETER_ID}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+		<include refid="tableName"></include>
+		(
+		<include refid="Field2"></include>
+		) values (
+		<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		ISDELETE = '1'
+		where
+		ALARM_INFO_ID = #{ALARM_INFO_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+		ALARM_INFO_ID = ALARM_INFO_ID
+		<if test="ALARM_VALUE!='' and ALARM_VALUE != null">
+			,ALARM_VALUE = #{ALARM_VALUE}
+		</if>
+		<if test="ALARM_TIME!='' and ALARM_TIME != null">
+			,ALARM_TIME = #{ALARM_TIME}
+		</if>
+		<if test="LEVEL!='' and LEVEL != null">
+			,LEVEL = #{LEVEL}
+		</if>
+		<if test="CREATOR!='' and CREATOR != null">
+			,CREATOR = #{CREATOR}
+		</if>
+		<if test="CREATTIME!='' and CREATTIME != null">
+			,CREATTIME = #{CREATTIME}
+		</if>
+		<if test="OPERATOR!='' and OPERATOR != null">
+			,OPERATOR = #{OPERATOR}
+		</if>
+		<if test="ISDELETE!='' and ISDELETE != null">
+			,ISDELETE = #{ISDELETE}
+		</if>
+		where
+		ALARM_INFO_ID=#{ALARM_INFO_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+		f.ALARM_INFO_ID=#{ALARM_INFO_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		m.FNAME ANEMOMETER_NAME
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN bus_anemometer_machine m ON m.FID = f.ANEMOMETER_ID
+		where f.ISDELETE = '0'
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		SELECT
+		*
+		FROM
+		MKMJ_DOOR f
+		WHERE
+		f.ISDELETE = '0'
+		<if test="ALARM_INFO_ID!='' and ALARM_INFO_ID != null">
+			and f.ALARM_INFO_ID = #{ALARM_INFO_ID}
+		</if>
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+		ISDELETE = '1'
+		where
+		ALARM_INFO_ID  in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+			#{item}
+		</foreach>
+	</delete>
+
+	<!--  批量存储 -->
+	<insert id="saveAll" parameterType="pd">
+		insert into
+		<include refid="tableName"></include>
+		(
+		ALARM_INFO_ID,
+		ALARM_VALUE,
+		ALARM_TIME,
+		LEVEL,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE,
+		LOG,
+		ANEMOMETER_ID
+		)
+		values
+		<foreach item="item" index="index" collection="list" separator=",">
+			(
+			#{item.ALARM_INFO_ID},
+			#{item.ALARM_VALUE},
+			#{item.ALARM_TIME},
+			#{item.LEVEL},
+			#{item.CREATOR},
+			#{item.CREATTIME},
+			#{item.OPERATOR},
+			#{item.OPERATTIME},
+			#{item.ISDELETE},
+			#{item.LOG},
+			#{item.ANEMOMETER_ID}
+			)
+		</foreach>
+	</insert>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findThreshold" parameterType="pd" resultType="pd">
+		SELECT
+			t.DICT_NAME LEVELNAME,
+			t.DICT_VALUE LEVELVALUE,
+			t.CONTENT LOG
+		FROM
+			`bus_alarm_dict` f
+				LEFT JOIN bus_alarm_dict t ON t.PARENT_ID = f.ALARM_DICT_ID and t.ISDELETE = '0'
+		where
+			f.DICT_NAME=#{DICT_NAME}
+		  and
+			f.ISDELETE = '0'
+		ORDER BY
+			CAST( t.DICT_VALUE AS UNSIGNED ) DESC
+	</select>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/alarm/AlarmMapper.xml b/src/main/resources/mybatis/datasource/alarm/AlarmMapper.xml
new file mode 100644
index 00000000..eec72626
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/alarm/AlarmMapper.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zcloud.mapper.datasource.alarm.AlarmMapper">
+
+	<!--表名 -->
+	<sql id="tableName">
+		BUS_ALARM
+	</sql>
+
+	<!-- 字段 -->
+	<sql id="Field">
+		f.ALARM_ID,
+		f.ALARM_NAME,
+		f.ALARM_TYPE,
+		f.ALARM_LEVELS,
+		f.CREATOR,
+		f.CREATTIME,
+		f.OPERATOR,
+		f.OPERATTIME,
+		f.ISDELETE
+	</sql>
+
+	<!-- 字段用于新增 -->
+	<sql id="Field2">
+		ALARM_ID,
+		ALARM_NAME,
+		ALARM_TYPE,
+		ALARM_LEVELS,
+		CREATOR,
+		CREATTIME,
+		OPERATOR,
+		OPERATTIME,
+		ISDELETE
+	</sql>
+
+	<!-- 字段值 -->
+	<sql id="FieldValue">
+		#{ALARM_ID},
+		#{ALARM_NAME},
+		#{ALARM_TYPE},
+		#{ALARM_LEVELS},
+		#{CREATOR},
+		#{CREATTIME},
+		#{OPERATOR},
+		#{OPERATTIME},
+		#{ISDELETE}
+	</sql>
+
+	<!-- 新增-->
+	<insert id="save" parameterType="pd">
+		insert into
+	<include refid="tableName"></include>
+		(
+	<include refid="Field2"></include>
+		) values (
+	<include refid="FieldValue"></include>
+		)
+	</insert>
+
+	<!-- 删除-->
+	<delete id="delete" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+		ALARM_ID = #{ALARM_ID}
+	</delete>
+
+	<!-- 修改 -->
+	<update id="edit" parameterType="pd">
+		update
+		<include refid="tableName"></include>
+		set
+			ALARM_ID = ALARM_ID
+		<if test="ALARM_NAME!='' and ALARM_NAME != null">
+			,ALARM_NAME = #{ALARM_NAME}
+		</if>
+		<if test="ALARM_TYPE!='' and ALARM_TYPE != null">
+			,ALARM_TYPE = #{ALARM_TYPE}
+		</if>
+		<if test="ALARM_LEVELS!='' and ALARM_LEVELS != null">
+			,ALARM_LEVELS = #{ALARM_LEVELS}
+		</if>
+		<if test="CREATOR!='' and CREATOR != null">
+			,CREATOR = #{CREATOR}
+		</if>
+		<if test="CREATTIME!='' and CREATTIME != null">
+			,CREATTIME = #{CREATTIME}
+		</if>
+		<if test="OPERATOR!='' and OPERATOR != null">
+			,OPERATOR = #{OPERATOR}
+		</if>
+		<if test="ISDELETE!='' and ISDELETE != null">
+			,ISDELETE = #{ISDELETE}
+		</if>
+		where
+		ALARM_ID=#{ALARM_ID}
+	</update>
+
+	<!-- 通过ID获取数据 -->
+	<select id="findById" parameterType="pd" resultType="pd">
+		select
+		<include refid="Field"></include>
+		from
+		<include refid="tableName"></include> f
+		where
+			f.ALARM_ID=#{ALARM_ID}
+	</select>
+
+	<!-- 列表 -->
+	<select id="datalistPage" parameterType="page" resultType="pd">
+		select
+		<include refid="Field"></include>,
+		t.DICT_NAME TYPE_NAME,
+		GROUP_CONCAT(l.DICT_NAME SEPARATOR ',') LEVELNAMES
+		from
+		<include refid="tableName"></include> f
+		LEFT JOIN bus_alarm_dict t ON t.ALARM_DICT_ID  = f.ALARM_TYPE
+		LEFT JOIN bus_alarm_dict l ON FIND_IN_SET(l.ALARM_DICT_ID,f.ALARM_LEVELS)
+		where f.ISDELETE = '0'
+	</select>
+
+	<!-- 列表(全部) -->
+	<select id="listAll" parameterType="pd" resultType="pd">
+		SELECT
+			*
+		FROM
+			MKMJ_DOOR f
+		WHERE
+			f.ISDELETE = '0'
+		<if test="ALARM_ID!='' and ALARM_ID != null">
+			and f.ALARM_ID = #{ALARM_ID}
+		</if>
+	</select>
+
+	<!-- 批量删除 -->
+	<delete id="deleteAll" parameterType="String">
+		update
+		<include refid="tableName"></include>
+		set
+			ISDELETE = '1'
+		where
+		ALARM_ID  in
+		<foreach item="item" index="index" collection="ArrayDATA_IDS" open="(" separator="," close=")">
+                 #{item}
+		</foreach>
+	</delete>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
index 4d6bfc1d..9de846c0 100644
--- a/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
+++ b/src/main/resources/mybatis/datasource/firemanager/FireDeviceMapper.xml
@@ -131,6 +131,57 @@
         DESC
     </select>
 
+    <select id="listAllForExcel" parameterType="pd" resultType="pd">
+        SELECT
+        fp.USER_ID,
+        fp.DEPARTMENT_ID,
+        fp.FIRE_POINT_NAME,
+        fp.FIRE_POINT_CODE,
+        fp.FIRE_POINT_ID,
+        fr.FIRE_REGION_NAME,
+        fr.FIRE_REGION_ID,
+        fr.FIRE_REGION_CODE,
+        fd.FIRE_DEVICE_CODE,
+        fd.FIRE_DEVICE_TYPE_ID,
+        fd.VALIDITY_START_TIME,
+        fd.VALIDITY_END_TIME,
+        fd.REMAKE,
+        fd.FIRE_DEVICE_ID,
+        su.`NAME` AS USERNAME,
+        p.`NAME` POSTNAME,
+        d.`NAME` AS DEPARTMENTNAME,
+        sys_dictionaries.`NAME` AS FIRE_DEVICE_TYPE_NAME
+        FROM
+        bus_fire_point AS fp
+        left JOIN bus_fire_device AS fd ON fp.FIRE_POINT_ID = fd.FIRE_POINT_ID
+        left JOIN bus_fire_region AS fr ON fd.FIRE_REGION_ID = fr.FIRE_REGION_ID
+        left JOIN sys_user AS su ON fp.USER_ID = su.USER_ID
+        LEFT JOIN sys_post p on su.POST_ID = p.POST_ID
+        left JOIN oa_department AS d ON fd.DEPARTMENT_ID = d.DEPARTMENT_ID
+        left JOIN sys_dictionaries ON fd.FIRE_DEVICE_TYPE_ID = sys_dictionaries.BIANMA
+        WHERE
+        fp.ISDELETE = 0 and fd.ISDELETE = 0
+        and fd.CORPINFO_ID = #{CORPINFO_ID}
+        <if test="FIRE_POINT_ID != null and FIRE_POINT_ID !='' ">
+            and fp.FIRE_POINT_ID = #{FIRE_POINT_ID}
+        </if>
+        <if test="FIRE_DEVICE_TYPE_ID != null and FIRE_DEVICE_TYPE_ID !='' ">
+            and fd.FIRE_DEVICE_TYPE_ID = #{FIRE_DEVICE_TYPE_ID}
+        </if>
+        <if test="FIRE_REGION_ID != null and FIRE_REGION_ID !='' ">
+            and fr.FIRE_REGION_ID = #{pd.FIRE_REGION_ID}
+        </if>
+        <if test="FIRE_DEVICE_CODE != null and FIRE_DEVICE_CODE !='' ">
+            and fd.FIRE_DEVICE_CODE like concat('%',#{FIRE_DEVICE_CODE,jdbcType=VARCHAR},'%')
+        </if>
+        <if test="FIRE_POINT_NAME != null and FIRE_POINT_NAME !='' ">
+            and fp.FIRE_POINT_NAME like concat('%',#{FIRE_POINT_NAME},'%')
+        </if>
+        ORDER BY
+        fr.FIRE_REGION_ID,fr.CREATTIME,fp.FIRE_POINT_ID,fp.CREATTIME,fd.FIRE_DEVICE_TYPE_ID,fd.CREATTIME, fd.OPERATTIME
+        DESC
+    </select>
+
     <select id="findById" resultType="com.zcloud.entity.PageData">
         SELECT d.FIRE_DEVICE_ID,
                d.FIRE_DEVICE_CODE,
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjDeviceMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjDeviceMapper.xml
index 4f8edffd..d47c98cd 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjDeviceMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjDeviceMapper.xml
@@ -16,6 +16,7 @@
 	<sql id="Field">
 		f.DEVICE_ID,
 		f.DOCK_DEVICE_ID,
+		f.DOOR_ID,
 		f.PATH_ID,
 		f.DEVICE_NAME,
 		f.DEVICE_TYPE,
@@ -32,6 +33,7 @@
 	<sql id="Field2">
 		DEVICE_ID,
 		DOCK_DEVICE_ID,
+		DOOR_ID,
 		PATH_ID,
 		DEVICE_NAME,
 		DEVICE_TYPE,
@@ -48,6 +50,7 @@
 	<sql id="FieldValue">
 		#{DEVICE_ID},
 		#{DOCK_DEVICE_ID},
+		#{DOOR_ID},
 		#{PATH_ID},
 		#{DEVICE_NAME},
 		#{DEVICE_TYPE},
@@ -87,6 +90,7 @@
 		<include refid="tableName"></include>
 		set
 			DOCK_DEVICE_ID = #{DOCK_DEVICE_ID},
+			DOOR_ID = #{DOOR_ID},
 			PATH_ID = #{PATH_ID},
 			DEVICE_NAME = #{DEVICE_NAME},
 			DEVICE_TYPE = #{DEVICE_TYPE},
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjDookDeviceMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjDookDeviceMapper.xml
index 59d1babe..476a83ac 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjDookDeviceMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjDookDeviceMapper.xml
@@ -182,6 +182,9 @@
 		MKMJ_DOCK_DEVICE f
 		WHERE
 		f.ISDELETE = '0'
+		<if test="DOOR_TYPE != null and DOOR_TYPE != ''"><!-- 关键词检索 -->
+			and f.DEVICE_TYPE = #{DOOR_TYPE}
+		</if>
 	</select>
 
 	<!-- 批量删除 -->
diff --git a/src/main/resources/mybatis/datasource/mkmj/MkmjPathMapper.xml b/src/main/resources/mybatis/datasource/mkmj/MkmjPathMapper.xml
index a4167599..7d5c5227 100644
--- a/src/main/resources/mybatis/datasource/mkmj/MkmjPathMapper.xml
+++ b/src/main/resources/mybatis/datasource/mkmj/MkmjPathMapper.xml
@@ -144,48 +144,64 @@
 		</if>
 	</select>
 
-	<!-- 列表(全部) -->
-	<select id="getCarAndPeopleInfolistPage" parameterType="page" resultType="pd">
+	<!-- 列表(人闸机记录) -->
+	<select id="getPeopleInfolistPage" parameterType="page" resultType="pd">
 		SELECT
-			*
+			p.personName NAME,
+			( CASE WHEN p.devName LIKE CONCAT( CONCAT( '%', '入' ), '%' ) THEN '进' WHEN p.devName LIKE CONCAT( CONCAT( '%', '出' ), '%' ) THEN '出' END ) STATUS,
+			p.eventTime TIME,
+			p.readerDevName BAYNAME,
+			p.devName DOORNAME
 		FROM
-			(
-				SELECT
-					c.carsign NAME,
-					c.entrystatus STATUS,
-					c.chtime TIME,
-	c.bayonetname BAYNAME,
-	c.accessname DOORNAME
-				FROM
-					mkmj_door f
-					LEFT JOIN dj_car_log c ON f.SOURCE_ID = c.accId
-				WHERE
-					f.DOOR_ID = #{pd.DOOR_ID}
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			c.carsign LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-				UNION ALL
-				SELECT
-					p.username NAME,
-					p.entrystatus STATUS,
-					p.chtime TIME,
-					p.bayonetname BAYNAME,
-					p.accessname DOORNAME
-				FROM
-					mkmj_door f
-					LEFT JOIN dj_person_log p ON f.SOURCE_ID = p.accId
-				WHERE
-					f.DOOR_ID = #{pd.DOOR_ID}
-		<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
-			and
-			(
-			p.username LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
-			)
-		</if>
-			) info where NAME IS NOT NULL
+			mkmj_door f
+			LEFT JOIN (
+			SELECT
+			GROUP_CONCAT( d.DEVICE_NAME SEPARATOR ',' ) devNames,
+			f.DOOR_ID
+			FROM
+			mkmj_device f
+			LEFT JOIN mkmj_dock_device d ON f.DOCK_DEVICE_ID = d.DOCK_DEVICE_ID
+			WHERE
+			f.ISDELETE = '0'
+			GROUP BY
+			f.DOOR_ID) d ON d.DOOR_ID = f.DOOR_ID
+			LEFT JOIN mk_gate_person_machine_info p ON FIND_IN_SET(p.devName,d.devNames)
+		WHERE p.ISDELETE = '0' AND f.DOOR_ID = #{pd.DOOR_ID}
+		GROUP BY p.MACHINE_INFO_ID
+		ORDER BY p.eventTime
+	</select>
+
+	<!-- 列表(车闸机记录) -->
+	<select id="getCarInfolistPage" parameterType="page" resultType="pd">
+		SELECT
+			c.PLATENO NAME,
+			( CASE WHEN c.ROADWAYNAME LIKE CONCAT( CONCAT( '%', '入' ), '%' ) THEN '进' WHEN c.ROADWAYNAME LIKE CONCAT( CONCAT( '%', '出' ), '%' ) THEN '出' END ) STATUS,
+			DATE_FORMAT(c.CROSSTIME, '%Y-%m-%d %H:%i:%s') TIME,
+			c.ENTRANCENAME BAYNAME,
+			c.ROADWAYNAME DOORNAME
+		FROM
+			mkmj_door f
+			LEFT JOIN (
+			SELECT
+			GROUP_CONCAT( d.DEVICE_NAME SEPARATOR ',' ) devNames,
+			f.DOOR_ID
+			FROM
+			mkmj_device f
+			LEFT JOIN mkmj_dock_device d ON f.DOCK_DEVICE_ID = d.DOCK_DEVICE_ID
+			WHERE
+			f.ISDELETE = '0'
+			GROUP BY
+			f.DOOR_ID
+			) d ON d.DOOR_ID = f.DOOR_ID
+			LEFT JOIN mk_gate_car_machine_info c ON FIND_IN_SET( c.ROADWAYNAME, d.devNames )
+		WHERE
+			c.ISDELETE = '0'
+			AND
+			f.DOOR_ID = #{pd.DOOR_ID}
+		GROUP BY
+			c.CAR_MACHINE_INFO_ID
+		ORDER BY
+			TIME DESC
 	</select>
 
 	<!-- 批量删除 -->