diff --git a/src/main/java/com/zcloud/controller/map/CmtMapController.java b/src/main/java/com/zcloud/controller/map/CmtMapController.java
index d1a04577..30b828e5 100644
--- a/src/main/java/com/zcloud/controller/map/CmtMapController.java
+++ b/src/main/java/com/zcloud/controller/map/CmtMapController.java
@@ -356,7 +356,7 @@ public class CmtMapController extends BaseController {
      */
     @RequestMapping(value = "person/allPerson/listPage")
     @ResponseBody
-    public Object getCzksOnlinePersion() throws Exception {
+    public Object getCmtOnlinePersion() throws Exception {
         ReturnMap online = new ReturnMap();
         PageData pageData = this.getPageData();
         JSONObject request = new JSONObject();
diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 7815872d..e9e83379 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -1,5 +1,8 @@
 package com.zcloud.controller.map;
 
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
@@ -16,12 +19,10 @@ import com.zcloud.service.map.BiMapService;
 import com.zcloud.service.map.MapService;
 import com.zcloud.service.system.DepartmentService;
 import com.zcloud.service.system.UsersService;
-import com.zcloud.util.HttpRequestUtil;
-import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.ReturnMap;
-import com.zcloud.util.Tools;
+import com.zcloud.util.*;
 import com.zcloud.util.hk.HKUtil;
 import com.zcloud.util.ys.YSUtil;
+import org.apache.http.NameValuePair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
@@ -510,4 +511,30 @@ public class MapController extends BaseController {
         map.put("result", errInfo);
         return map;
     }
+    @RequestMapping("/findWorkCardLocation")
+    @ResponseBody
+    public Object findWorkCardLocation() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        String errInfo = "success";
+        HashMap<String, Object> param = new HashMap<>();
+        String result = HttpUtil.get("https://badge.hongchuankeji.com:7812/mapi/v1/queryWorkCardLocation", param);
+        Map<String,Object> resultMap = (Map<String, Object>) JSON.parse(result);
+        String data = resultMap.get("data").toString();
+        List<PageData> dataList = JSONArray.parseArray(data,PageData.class);
+        int onlineCount = 0;
+        int notonlineCount = 0;
+        for (int i = 0;i<dataList.size();i++){
+            if (Boolean.parseBoolean(dataList.get(i).getString("onlineornot"))) {
+                onlineCount+=1;
+            }else {
+                notonlineCount+=1;
+            }
+        }
+        map.put("list",dataList);
+        map.put("onlineCount",onlineCount);
+        map.put("notonlineCount",notonlineCount);
+        map.put("result", errInfo);
+        return map;
+    }
 }
diff --git a/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
new file mode 100644
index 00000000..7b3f5160
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/map/MapKeyProjectController.java
@@ -0,0 +1,121 @@
+package com.zcloud.controller.map;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.map.MapEightService;
+import com.zcloud.service.map.MapKetProjectService;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：实时地图八项工作内容
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/map/keyProject")
+public class MapKeyProjectController extends BaseController {
+
+    @Autowired
+    private MapKetProjectService mapKetProjectService;
+
+    @Autowired
+    private MapEightService mapEightService;
+
+    @Value("${cfd.prevention.api.url}")
+    private String cfdUrl;
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * 可视化首页统计数据
+     * 重点工程开工数量：STATE_COUNT
+     * 视频总数：VIDEO_COUNT
+     * 安全环保检查总数：CHECK_COUNT
+     * 隐患总数：HIDDEN_COUNT
+     * 处罚总数：PUNISH_COUNT
+     * 处罚金额：AMOUT_SUM
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/findFormCount")
+    @ResponseBody
+    public Object findFormCount() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        return mapKetProjectService.findFormCount(pd);
+    }
+
+    /**
+     * 隐患处理记录（最新18条）
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/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();
+        //根据条件增加参数或减少参数   都没有 直接返回空
+        if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) {
+            List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
+            if (ArrayDATA_IDS.size() == 0) {
+                map.put("result", errInfo);
+                return map;
+            }
+            pd.put("ids", ArrayDATA_IDS);
+            pd.remove("CORPINFO_ID");
+        }
+        page.setPd(pd);
+        return mapKetProjectService.list(page);
+    }
+
+    /**
+     * 获取所有数据的位置坐标（有坐标数据） 根据type区分是视频还是工程
+     *
+     * @param
+     * @throws Exception
+     */
+    @RequestMapping(value = "/listAllLocation")
+    @ResponseBody
+    public Object listAllLocation(@RequestParam(value = "CORPINFO_ID") String CORPINFO_ID, @RequestParam("TYPE") String type, @RequestParam("GANGKOU") String GANGKOU, @RequestParam("AREA") String AREA) throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pd = new PageData();
+        pd = this.getPageData();
+        return mapKetProjectService.listAllLocation(pd);
+    }
+
+
+    /**
+     * 根据id以及类型获取数据
+     *
+     * @param id   数据id
+     * @param type 数据类型  重点工程 视频
+     * @return
+     */
+    @RequestMapping(value = "/getById")
+    @ResponseBody
+    public Object getById(@RequestParam(value = "id") String id, @RequestParam("TYPE") String type) throws Exception {
+        PageData pd = this.getPageData();
+        return mapKetProjectService.getById(pd);
+
+    }
+
+}
diff --git a/src/main/java/com/zcloud/controller/sync/SyncGateVideoController.java b/src/main/java/com/zcloud/controller/sync/SyncGateVideoController.java
new file mode 100644
index 00000000..8cfbbab5
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/sync/SyncGateVideoController.java
@@ -0,0 +1,226 @@
+package com.zcloud.controller.sync;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.gatemachine.GateVideoService;
+import com.zcloud.util.DateUtil;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.Tools;
+import com.zcloud.util.hk.HKUtil;
+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;
+
+/**
+ * 说明：视频管理
+ * 作者：luoxiaobao
+ * 时间：2021-05-10
+ * 官网：www.zcloudchina.com
+ */
+@Controller
+@RequestMapping("/sync/gateVideo")
+public class SyncGateVideoController extends BaseController {
+
+	@Autowired
+	private GateVideoService gateVideoService;
+
+	/**新增
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/add")
+	@ResponseBody
+	public Object add() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("GATEVIDEO_ID", this.get32UUID());	//主键
+		pd.put("OPDATE", DateUtil.date2Str(new Date()));	//操作日期
+		pd.put("OPUSER", Jurisdiction.getUsername());	//操作人
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+		pd.put("ISDELETE", "0");	//是否删除
+		gateVideoService.save(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**删除
+	 * @param out
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/delete")
+	@ResponseBody
+	public Object delete() throws Exception{
+		Map<String,String> map = new HashMap<String,String>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		gateVideoService.delete(pd);
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
+
+	/**修改
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/edit")
+	@ResponseBody
+	public Object edit() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		gateVideoService.edit(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**定位
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/savePosition")
+	@ResponseBody
+	public Object savePosition() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		gateVideoService.savePosition(pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	@RequestMapping(value="/goAllVideo")
+	@ResponseBody
+	public Object goAllVideo() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+
+		String DATA_IDS = pd.getString("DATA_IDS");
+		if(Tools.notEmpty(DATA_IDS)){
+			String ArrayDATA_IDS[] = DATA_IDS.split(",");
+			pd.put("ArrayDATA_IDS", ArrayDATA_IDS);
+		}
+		List<PageData>	videoList = gateVideoService.listBo(pd);	//根据ID读取
+		for (PageData video : videoList) {
+			if(video.get("INDEXCODE")!=null && !"".equals(video.getString("INDEXCODE"))){
+				Map<String, Object> data = HKUtil.camerasPreviewURLs(video.getString("INDEXCODE"), "hls");
+				video.put("HLSVIDEOURL", data);
+				Map<String, Object> resData = (Map<String, Object>) data.get("data");
+				video.put("GBSVIDEOURL",resData.get("url"));
+			}
+		}
+		map.put("videoList", videoList);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/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());
+
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+		page.setPd(pd);
+
+		List<PageData>	varList = gateVideoService.list(page);	//列出VideoManager列表
+		map.put("varList", varList);
+		map.put("page", page);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	@RequestMapping(value="/listAllForMap")
+	@ResponseBody
+	public Object listAllForMap() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+		List<PageData>	videoList = gateVideoService.listAllForMap(pd);	//根据ID读取
+		map.put("varList", videoList);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	@RequestMapping(value="/editIsShow")
+	@ResponseBody
+	public Object editIsShow() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		PageData epd = new PageData();
+		epd.put("ISSHOW", '0');
+		epd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+		gateVideoService.editIsShowBycorpinfoid(epd);	//根据ID读取
+
+		pd.put("ISSHOW", '1');
+		gateVideoService.editIsShow(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+	 /**去修改页面获取数据
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/goEdit")
+	@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 = gateVideoService.findById(pd);	//根据ID读取
+		map.put("pd", pd);
+		map.put("result", errInfo);
+		return map;
+	}
+
+	 /**批量删除
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/deleteAll")
+	@ResponseBody
+	public Object deleteAll() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String DATA_IDS = pd.getString("DATA_IDS");
+		if(Tools.notEmpty(DATA_IDS)){
+			String ArrayDATA_IDS[] = DATA_IDS.split(",");
+			gateVideoService.deleteAll(ArrayDATA_IDS);
+			errInfo = "success";
+		}else{
+			errInfo = "error";
+		}
+		map.put("result", errInfo);				//返回结果
+		return map;
+	}
+
+
+}
diff --git a/src/main/java/com/zcloud/controller/sync/SyncMapController.java b/src/main/java/com/zcloud/controller/sync/SyncMapController.java
index 6f47f19f..6f74c43a 100644
--- a/src/main/java/com/zcloud/controller/sync/SyncMapController.java
+++ b/src/main/java/com/zcloud/controller/sync/SyncMapController.java
@@ -1,5 +1,8 @@
 package com.zcloud.controller.sync;
 
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
@@ -27,6 +30,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.client.RestTemplate;
 
+import java.sql.Array;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -347,11 +351,47 @@ public class SyncMapController extends BaseController {
     @RequestMapping(value = "/getPerpleCarGateMachineCount")
     @ResponseBody
     public Object getPerpleCarGateMachineCount() {
-        Map<String, Object> map = new HashMap<String, Object>();
-        String errInfo = "success";
-        PageData pd = this.getPageData();
-        map.put("result", errInfo);
-        return map;
+        ReturnMap returnMap = new ReturnMap();
+        ArrayList<Object> varList = new ArrayList<>();
+        varList.add(new Object());
+        ArrayList<PageData> list = new ArrayList<>();
+        PageData data = new PageData();
+        PageData pageData = this.getPageData();
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        String fendDate = format.format(new Date());
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(Calendar.HOUR_OF_DAY, 0); // 将时设置为0
+        calendar.set(Calendar.MINUTE, 0);      // 将分设置为0
+        calendar.set(Calendar.SECOND, 0);      // 将秒设置为0
+        calendar.set(Calendar.MILLISECOND, 0); // 将毫秒设置为0
+        Date currDay = calendar.getTime();
+        String fstartDate = format.format(currDay);
+        pageData.put("eventTime",fstartDate);
+        //人闸机
+        PageData personCount = gateMachineInfoService.peopleCount(pageData);
+        if (personCount!=null){
+            data.put("personInCount", personCount.get("inCount"));
+            data.put("personOutCount", personCount.get("outCount"));
+            data.put("personUnkownCount", personCount.get("noCount"));
+        }
+        //车闸机
+        pageData.put("GATE_AREA_TYPE", 1);
+        PageData carCount = gateCarMachineInfoService.carCount(pageData);
+        if (carCount!=null){
+            data.put("carInCount", carCount.get("inCount"));
+            data.put("carOutCount", carCount.get("outCount"));
+        }
+        //场内车辆数
+        DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
+        String endDate = dft.format(new Date())+"+08:00";
+        String startDate = dft.format(currDay)+"+08:00";
+        Map<String, Object> carOnSiteCount = HKUtil.getCarOnSiteCount("1","1000",startDate, endDate);
+        if (carOnSiteCount!=null) {
+            JSONObject datas = (JSONObject)carOnSiteCount.get("data");
+            data.put("carOnSiteCount",datas.get("total"));
+        }
+        returnMap.put("data", data);
+        return returnMap;
     }
 
     @RequestMapping(value = "/getMachineTodayInOutCount")
@@ -381,6 +421,52 @@ public class SyncMapController extends BaseController {
         return map;
     }
 
+    /**
+     * 获取人员、车辆进出记录
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/getPersonPositioningCount")
+    @ResponseBody
+    public Object getPersonPositioningCount() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        String errInfo = "success";
+        PageData pageData = this.getPageData();
+        JSONObject request = new JSONObject();
+        request.put("pageNum", 1);
+        request.put("pageSize", 10);
+        request.put("online", "true");
+        pageData.put("CORPINFO_ID", pageData.get("CORPINFO_ID"));
+        // 系统人员数
+        int userCount = usersService.getUserCount(pageData);
+        // 系统部门数
+        int departCount = departmentService.getDepartmentCount(pageData);
+        HashMap<String, Object> param = new HashMap<>();
+        String result = HttpUtil.get("https://badge.hongchuankeji.com:7812/mapi/v1/queryWorkCardLocation", param);
+        Map<String,Object> resultMap = (Map<String, Object>) JSON.parse(result);
+        String data = resultMap.get("data").toString();
+        List<PageData> dataList = JSONArray.parseArray(data,PageData.class);
+        //在线数
+        int onlineCount = 0;
+        //离线数
+        int notonlineCount = 0;
+        for (int i = 0;i<dataList.size();i++){
+            if (Boolean.parseBoolean(dataList.get(i).getString("onlineornot"))) {
+                onlineCount+=1;
+            }else {
+                notonlineCount+=1;
+            }
+        }
+        ArrayList<String> personPositioningCount = new ArrayList<>();
+        personPositioningCount.add(String.valueOf(userCount));
+        personPositioningCount.add(String.valueOf(departCount));
+        personPositioningCount.add(String.valueOf(onlineCount));
+        map.put("personPositioningCount",personPositioningCount);
+        map.put("result", errInfo);
+        return map;
+    }
+
     // 获取人员定位信息 根据定位卡编码
     @RequestMapping(value = "/getPersonByCardNo")
     @ResponseBody
@@ -393,6 +479,52 @@ public class SyncMapController extends BaseController {
         return map;
     }
 
+    @RequestMapping("/findEightsByUserId")
+    @ResponseBody
+    public Object findEightsByUserId() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        String errInfo = "success";
+        pd.put("CARDNO",pd.getString("cardNo"));
+        PageData byCardNo = usersService.findByCardNo(pd);
+        if (byCardNo != null) {
+            pd.put("USER_ID", byCardNo.getString("USER_ID"));
+            List<PageData> varList = new ArrayList<>();
+            varList = usersService.findEightsByUserId(pd);
+            map.put("info",byCardNo);
+            map.put("varList", varList);
+        }
+        map.put("result", errInfo);
+        return map;
+    }
+
+    @RequestMapping("/findWorkCardLocation")
+    @ResponseBody
+    public Object findWorkCardLocation() throws Exception {
+        Map<String, Object> map = new HashMap<String, Object>();
+        PageData pd = this.getPageData();
+        String errInfo = "success";
+        HashMap<String, Object> param = new HashMap<>();
+        String result = HttpUtil.get("https://badge.hongchuankeji.com:7812/mapi/v1/queryWorkCardLocation", param);
+        Map<String,Object> resultMap = (Map<String, Object>) JSON.parse(result);
+        String data = resultMap.get("data").toString();
+        List<PageData> dataList = JSONArray.parseArray(data,PageData.class);
+        int onlineCount = 0;
+        int notonlineCount = 0;
+        for (int i = 0;i<dataList.size();i++){
+            if (Boolean.parseBoolean(dataList.get(i).getString("onlineornot"))) {
+                onlineCount+=1;
+            }else {
+                notonlineCount+=1;
+            }
+        }
+        map.put("list",dataList);
+        map.put("onlineCount",onlineCount);
+        map.put("notonlineCount",notonlineCount);
+        map.put("result", errInfo);
+        return map;
+    }
+
     /**
      * 获取摄像头播放路径(曹妃甸使用）
      *
diff --git a/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java b/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java
new file mode 100644
index 00000000..fadcdac0
--- /dev/null
+++ b/src/main/java/com/zcloud/mapper/datasource/map/MapKeyProjectMapper.java
@@ -0,0 +1,59 @@
+package com.zcloud.mapper.datasource.map;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+import java.util.List;
+
+/**
+ * 说明：重点工程处罚
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+public interface MapKeyProjectMapper {
+
+	/**
+	 * 获取统计数数据
+	 * @param pd
+	 * @return
+	 */
+	PageData findFormCount(PageData pd);
+
+	/**
+	 * 获取列表
+	 * @param page
+	 * @return
+	 */
+	List<PageData> datalistPage(Page page);
+
+	/**
+	 * 获取重点工程有坐标数据
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> getProjectLocation(PageData pd);
+
+	/**
+	 * 获取视频有坐标数据
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> getVideoLocation(PageData pd);
+
+	/**
+	 * 通过重点工程id获取重点工程详细信息
+	 * @param pd
+	 * @return
+	 */
+	PageData getProjectById(PageData pd);
+
+	/**
+	 * 通过摄像头id 获取摄像头详细信息
+	 * @param pd
+	 * @return
+	 */
+	PageData getVideoById(PageData pd);
+
+}
+
diff --git a/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java b/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java
deleted file mode 100644
index 8bc15d35..00000000
--- a/src/main/java/com/zcloud/mapper/dsno2/system/Department2Mapper.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.zcloud.mapper.dsno2.system;
-
-import com.zcloud.entity.Page;
-import com.zcloud.entity.PageData;
-import com.zcloud.entity.system.Department;
-
-import java.util.List;
-
-/**
- * 说明： 组织机构接Mapper
- * 作者：luoxiaobao
- * 官网：www.qdkjchina.com
- */
-public interface Department2Mapper {
-
-	/**新增
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void save(PageData pd)throws Exception;
-
-	/**删除
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void delete(PageData pd)throws Exception;
-
-	/**修改
-	 * @param pd
-	 * @throws Exception
-	 */
-	public void edit(PageData pd)throws Exception;
-
-	/**列表
-	 * @param page
-	 * @throws Exception
-	 */
-	public List<PageData> datalistPage(Page page)throws Exception;
-
-	/**通过id获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findById(PageData pd)throws Exception;
-
-	/**通过编码获取数据
-	 * @param pd
-	 * @throws Exception
-	 */
-	public PageData findByBianma(PageData pd)throws Exception;
-
-	/**
-	 * 通过ID获取其子级列表
-	 * @param parentId
-	 * @return
-	 * @throws Exception
-	 */
-	public List<Department> listSubDepartmentByParentId(String parentId) throws Exception;
-
-	/**
-	 * 通过ID获取其子级列表
-	 * @param parentId
-	 * @return
-	 * @throws Exception
-	 */
-	public List<Department> listByCorpInfoId(String parentId,String CORPINFO_ID) throws Exception;
-	List<PageData> deptinformation(PageData pageData) throws Exception;
-
-	/**
-	 * 获取所有数据并填充每条数据的子级列表(递归处理)
-	 * @param MENU_ID
-	 * @return
-	 * @throws Exception
-	 */
-	public List<Department> listAllDepartment(String parentId) throws Exception;
-
-	/**
-	 * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
-	 * @param MENU_ID
-	 * @return
-	 * @throws Exception
-	 */
-	public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
-
-	/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
-	 * @param DEPARTMENT_ID
-	 * @return
-	 * @throws Exception
-	 */
-	public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
-
-	public List<PageData> listAll(PageData pd);
-
-	public List<PageData> listAllMent (PageData pd);
-
-	public List<Department> listAllDepartmentByType(PageData pd) throws Exception;
-
-    void saveCorpdept(PageData pd);
-
-    List<PageData> saftpersonlist(PageData pd) throws Exception;
-
-    List<PageData> saftmanagelist(PageData pd);
-
-    List<PageData> findbyCorpIdtoDeptlistPage(Page page);
-
-	List<PageData> findByDeptIdlistPage(Page page);
-
-	public PageData  findCorpDeptDetail(PageData pd);
-
-	void editNameBDId(PageData deptPageData);
-
-	//从管理端修改部门 新
-	void editCorpdeptNew(PageData pd);
-
-    List<PageData> listTreeCorpDept(PageData pd);
-}
-
diff --git a/src/main/java/com/zcloud/service/bus/CorpDepartmentService.java b/src/main/java/com/zcloud/service/bus/CorpDepartmentService.java
new file mode 100644
index 00000000..8cac3817
--- /dev/null
+++ b/src/main/java/com/zcloud/service/bus/CorpDepartmentService.java
@@ -0,0 +1,164 @@
+package com.zcloud.service.bus;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.entity.system.Department;
+
+import java.util.List;
+
+/**
+ * 说明： 组织机构接接口
+ * 创建人：FH Q313596790
+ * 官网：
+ */
+public interface CorpDepartmentService {
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception;
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception;
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception;
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception;
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception;
+	/**通过名称获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByName(PageData pd)throws Exception;
+
+	/**通过编码获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByBianma(PageData pd)throws Exception;
+
+	/**
+	 * 通过ID获取其子级列表
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listSubDepartmentByParentId(String parentId) throws Exception;
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listAllDepartment(String parentId) throws Exception;
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listAllDepartment(String parentId,String url) throws Exception;
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listAllDepartmentToSelect(String parentId, List<PageData> zdepartmentPdList) throws Exception;
+
+	/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式)
+	 * @param DEPARTMENT_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception;
+
+	/**通过条件获取全部
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception;
+
+	/**通过企业主部门
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCorpId(PageData pd)throws Exception;
+	/**列表 关联 部门级别名称
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> listForLevelName(Page page)throws Exception;
+
+	/**
+	 * 向下递归查询企业部门
+	 * @param pd
+	 * @return
+	 */
+	List<PageData> listTreeCorpDept(PageData pd)throws Exception;
+
+	/**
+	 * 向下递归查询企业部门（集团部门+子公司部门）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> listTreeManageAndCorp(PageData pd)throws Exception;
+
+	/**
+	 * pc新增需求，重点工程中添加处罚人功能所用的 根据企业ID查询部门的service
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+    List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd)throws Exception;
+	/**
+	 * 向下递归查询企业部门（只查监管端部门）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> listTreeManageAndCorp1(PageData pd)throws Exception;
+	/**
+	 * 向下递归查询企业部门（只查企业端部门）
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	List<PageData> listTreeManageAndCorp2(PageData pd)throws Exception;
+
+	List<PageData> listTreeManageAndCorpHasOrder(PageData pd)throws Exception;
+    List<PageData> listDept(PageData pd)throws Exception;
+
+	public List<Department> listTreeCorp(String s)throws Exception;
+
+	/**
+	 * 使用数据库中的函数
+	 * 获取pid下的所有子集id
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> getSonIdsByParid(PageData pd)throws Exception;
+}
+
diff --git a/src/main/java/com/zcloud/service/bus/impl/CorpDepartmentServiceImpl.java b/src/main/java/com/zcloud/service/bus/impl/CorpDepartmentServiceImpl.java
new file mode 100644
index 00000000..26079752
--- /dev/null
+++ b/src/main/java/com/zcloud/service/bus/impl/CorpDepartmentServiceImpl.java
@@ -0,0 +1,270 @@
+package com.zcloud.service.bus.impl;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.entity.system.Department;
+import com.zcloud.mapper.datasource.system.DepartmentMapper;
+import com.zcloud.service.bus.CorpDepartmentService;
+import com.zcloud.util.Tools;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 说明： 组织机构
+ * 创建人：FH Q313596790
+ * 官网：
+ */
+@Service(value="corpDepartmentService")
+@Transactional //开启事物
+public class CorpDepartmentServiceImpl implements CorpDepartmentService{
+
+	@Autowired
+	private DepartmentMapper departmentMapper;
+
+	/**新增
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void save(PageData pd)throws Exception{
+		departmentMapper.save(pd);
+	}
+
+	/**删除
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void delete(PageData pd)throws Exception{
+		departmentMapper.delete(pd);
+	}
+
+	/**修改
+	 * @param pd
+	 * @throws Exception
+	 */
+	public void edit(PageData pd)throws Exception{
+		departmentMapper.edit(pd);
+	}
+
+	/**列表
+	 * @param page
+	 * @throws Exception
+	 */
+	public List<PageData> list(Page page)throws Exception{
+		return (List<PageData>)departmentMapper.datalistPage(page);
+	}
+
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findById(PageData pd)throws Exception{
+		return (PageData)departmentMapper.findById(pd);
+	}
+	/**通过名称获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByName(PageData pd)throws Exception{
+		List<PageData> dept = departmentMapper.findByName(pd);
+		if(dept != null && dept.size() > 0) {
+			return dept.get(0);
+		} else {
+			return null;
+		}
+
+	}
+
+	/**通过编码获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByBianma(PageData pd)throws Exception{
+		return (PageData)departmentMapper.findByBianma(pd);
+	}
+
+	/**
+	 * 通过ID获取其子级列表
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listSubDepartmentByParentId(String parentId) throws Exception {
+		return (List<Department>)departmentMapper.listSubDepartmentByParentId(parentId);
+	}
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listAllDepartment(String parentId) throws Exception {
+		List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
+		for(Department depar : departmentList){
+			depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID());
+			depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID()));
+			depar.setTarget("treeFrame");
+			depar.setIcon("../../../assets/images/user.gif");
+		}
+		return departmentList;
+	}
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listAllDepartment(String parentId,String url) throws Exception {
+		List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
+		for(Department depar : departmentList){
+			depar.setTreeurl(url+depar.getDEPARTMENT_ID());
+			depar.setSubDepartment(this.listAllDepartment(depar.getDEPARTMENT_ID(),url));
+			depar.setTarget("treeFrame");
+			depar.setIcon("../../../assets/images/user.gif");
+		}
+		return departmentList;
+	}
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)下拉ztree用
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> listAllDepartmentToSelect(String parentId,List<PageData> zdepartmentPdList) throws Exception {
+		List<PageData>[] arrayDep = this.listAllbyPd(parentId,zdepartmentPdList);
+		List<PageData> departmentPdList = arrayDep[1];
+		for(PageData pd : departmentPdList){
+			this.listAllDepartmentToSelect(pd.getString("id"),arrayDep[0]);
+		}
+		return arrayDep[0];
+	}
+
+	/**下拉ztree用
+	 * @param parentId
+	 * @return
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData>[] listAllbyPd(String parentId,List<PageData> zdepartmentPdList) throws Exception {
+		List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
+		List<PageData> departmentPdList = new ArrayList<PageData>();
+		for(Department depar : departmentList){
+			PageData pd = new PageData();
+			pd.put("id", depar.getDEPARTMENT_ID());
+			pd.put("parentId", depar.getPARENT_ID());
+			pd.put("name", depar.getNAME());
+			pd.put("icon", "../../../assets/images/user.gif");
+			departmentPdList.add(pd);
+			zdepartmentPdList.add(pd);
+		}
+		List<PageData>[] arrayDep = new List[2];
+		arrayDep[0] = zdepartmentPdList;
+		arrayDep[1] = departmentPdList;
+		return arrayDep;
+	}
+
+	/**获取某个部门所有下级部门ID(返回拼接字符串 in的形式， ('a','b','c'))
+	 * @param DEPARTMENT_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public String getDEPARTMENT_IDS(String DEPARTMENT_ID) throws Exception {
+		DEPARTMENT_ID = Tools.notEmpty(DEPARTMENT_ID)?DEPARTMENT_ID:"0";
+		List<PageData> zdepartmentPdList = new ArrayList<PageData>();
+		zdepartmentPdList = this.listAllDepartmentToSelect(DEPARTMENT_ID,zdepartmentPdList);
+		StringBuffer sb = new StringBuffer();
+		sb.append("");
+		for(PageData dpd : zdepartmentPdList){
+			sb.append(dpd.getString("id"));
+			sb.append(",");
+		}
+		sb.append("'fh'");
+		return sb.toString();
+	}
+
+	/**通过条件获取全部
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> listAll(PageData pd)throws Exception{
+		return (List<PageData>)departmentMapper.listAll(pd);
+	}
+
+	/**通过企业主部门
+	 * @param pd
+	 * @throws Exception
+	 */
+	public PageData findByCorpId(PageData pd)throws Exception{
+		return departmentMapper.findByCorpId(pd);
+	}
+	/**列表 关联 部门级别名称
+	 * @param page
+	 * @throws Exception
+	 */
+	@Override
+	public List<PageData> listForLevelName(Page page) throws Exception {
+		// TODO Auto-generated method stub
+		return departmentMapper.forLevelNamedatalistPage(page);
+	}
+
+	@Override
+	public List<PageData> listTreeCorpDept(PageData pd) throws Exception {
+		return departmentMapper.listTreeCorpDept(pd);
+	}
+
+	@Override
+	public List<PageData> listTreeManageAndCorp(PageData pd) throws Exception {
+		return departmentMapper.listTreeManageAndCorp(pd);
+	}
+	@Override
+	public List<PageData> listTreeManageAndCorpForPcPunishThePerson(PageData pd) throws Exception {
+		return departmentMapper.listTreeManageAndCorpForPcPunishThePerson(pd);
+	}
+	@Override
+	public List<PageData> listTreeManageAndCorp1(PageData pd) throws Exception {
+		return departmentMapper.listTreeManageAndCorp1(pd);
+	}
+	@Override
+	public List<PageData> listTreeManageAndCorp2(PageData pd) throws Exception {
+		return departmentMapper.listTreeManageAndCorp2(pd);
+	}
+	@Override
+	public List<PageData> listTreeManageAndCorpHasOrder(PageData pd) throws Exception {
+		return departmentMapper.listTreeManageAndCorpHasOrder(pd);
+	}
+
+
+	@Override
+	public List<PageData> listDept(PageData pd) throws Exception {
+		return departmentMapper.listDept(pd);
+	}
+
+	/**
+	 * 获取所有数据并填充每条数据的子级列表(递归处理)
+	 * @param MENU_ID
+	 * @return
+	 * @throws Exception
+	 */
+	public List<Department> listTreeCorp(String parentId) throws Exception {
+		List<Department> departmentList = this.listSubDepartmentByParentId(parentId);
+		for(Department depar : departmentList){
+			depar.setTreeurl("department_list.html?DEPARTMENT_ID="+depar.getDEPARTMENT_ID());
+			depar.setSubDepartment(this.listTreeCorp(depar.getDEPARTMENT_ID()));
+			depar.setTarget("treeFrame");
+			depar.setIcon("../../../assets/images/user.gif");
+		}
+		return departmentList;
+	}
+
+	public List<PageData> getSonIdsByParid(PageData pd) throws Exception {
+		return departmentMapper.getSonIdsByParid(pd);
+	}
+
+}
+
diff --git a/src/main/java/com/zcloud/service/map/MapKetProjectService.java b/src/main/java/com/zcloud/service/map/MapKetProjectService.java
new file mode 100644
index 00000000..c9ed7187
--- /dev/null
+++ b/src/main/java/com/zcloud/service/map/MapKetProjectService.java
@@ -0,0 +1,23 @@
+package com.zcloud.service.map;
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+
+/**
+ * 说明：实施地图八项作业
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+public interface MapKetProjectService {
+
+	Object findFormCount(PageData pd);
+
+	Object listAllLocation(PageData pd);
+
+	Object getById(PageData pd) throws Exception ;
+
+	Object list(Page page);
+
+}
+
diff --git a/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
new file mode 100644
index 00000000..4b008dc6
--- /dev/null
+++ b/src/main/java/com/zcloud/service/map/impl/MapKeyProjectServiceImpl.java
@@ -0,0 +1,144 @@
+package com.zcloud.service.map.impl;
+
+
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.mapper.datasource.map.MapKeyProjectMapper;
+import com.zcloud.service.bus.CorpDepartmentService;
+import com.zcloud.service.bus.ImgFilesService;
+import com.zcloud.service.map.MapEightService;
+import com.zcloud.service.map.MapKetProjectService;
+import com.zcloud.service.system.UsersService;
+import com.zcloud.util.Tools;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 说明：实时地图八项工作
+ * 作者：luoxiaobao
+ * 时间：2022-09-21
+ * 官网：www.zcloudchina.com
+ */
+@Service
+@Transactional //开启事物
+public class MapKeyProjectServiceImpl implements MapKetProjectService {
+
+	@Autowired
+	private MapKeyProjectMapper keyProjectMapper;
+
+	@Autowired
+	private CorpDepartmentService corpDepartmentService;
+
+	@Autowired
+	private UsersService usersService;
+
+	@Autowired
+	private ImgFilesService imgfilesService;
+
+	@Autowired
+	private MapEightService mapEightService;
+
+
+	@Override
+	public Object findFormCount(PageData pd) {
+		Map<String,Object> returnMap = new HashMap<>();
+		String errInfo = "success";
+		//根据条件增加参数或减少参数   都没有 直接返回空
+		if(StringUtils.isBlank(pd.getString("CORPINFO_ID"))){
+			List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
+			if(ArrayDATA_IDS.size()==0){
+				returnMap.put("result", errInfo);
+				return returnMap;
+			}else {
+				pd.put("ids",ArrayDATA_IDS);
+				pd.remove("CORPINFO_ID");
+			}
+		}
+		PageData pageData = keyProjectMapper.findFormCount(pd);
+		returnMap.put("pd", pageData);
+		returnMap.put("result", errInfo);
+		return returnMap;
+	}
+
+	@Override
+	public Object listAllLocation(PageData pd) {
+		Map<String,Object> returnMap = new HashMap<>();
+		String errInfo = "success";
+		//根据条件增加参数或减少参数   都没有 直接返回空
+		if (StringUtils.isBlank(pd.getString("CORPINFO_ID"))) {
+			List<String> ArrayDATA_IDS = mapEightService.getCorpinfoIds(pd);
+			if (ArrayDATA_IDS.size() == 0) {
+				returnMap.put("result", errInfo);
+				return returnMap;
+			}
+			ArrayDATA_IDS.add("1");
+			pd.put("ids", ArrayDATA_IDS);
+			pd.remove("CORPINFO_ID");
+		}
+		String typeStr = pd.getString("TYPE");
+		List<PageData> r = new ArrayList<>();
+		//重点工程
+		if(StringUtils.equals(typeStr,"PROJECT")){
+			r = keyProjectMapper.getProjectLocation(pd);
+			//视频
+		}else if(StringUtils.equals(typeStr,"VIDEO")){
+			r = keyProjectMapper.getVideoLocation(pd);
+		}
+		returnMap.put("varList", r);
+		returnMap.put("result", errInfo);
+		return returnMap;
+	}
+
+	@Override
+	public Object getById(PageData pd) throws Exception  {
+		Map<String,Object> returnMap = new HashMap<>();
+		String errInfo = "success";
+		String typeStr = pd.getString("TYPE");
+		//重点工程
+		if(StringUtils.equals(typeStr,"PROJECT")){
+			pd = keyProjectMapper.getProjectById(pd);
+			PageData selectPageData = new PageData();
+
+			selectPageData.put("CORPINFO_ID",pd.get("PUNISH_THE_PERSON"));
+			List<PageData> deptList = corpDepartmentService.listTreeManageAndCorpForPcPunishThePerson(selectPageData);    //根据ID读取
+
+
+			String userStr = pd.getString("PUNISH_THE_PERSON");
+			if (!Tools.isEmpty(userStr)) {
+				String[] split = userStr.split(",");
+				selectPageData.put("ids",split);
+				List<PageData> pageData = usersService.selectUserListByUserIds(selectPageData);
+				returnMap.put("punishThePerson", pageData);
+			}
+			PageData pd3 = new PageData();
+			pd3.put("TYPE", 300);
+			pd3.put("FOREIGN_KEY", pd.getString("OUTSOURCED_ID"));
+			List<PageData> file9 =  imgfilesService.listAll(pd3);
+			returnMap.put("file9", file9);
+			//视频
+		}else if(StringUtils.equals(typeStr,"VIDEO")){
+			pd = keyProjectMapper.getVideoById(pd);
+		}
+		returnMap.put("pd", pd);
+		returnMap.put("result", errInfo);
+		return returnMap;
+	}
+
+	@Override
+	public Object list(Page page) {
+		Map<String,Object> returnMap = new HashMap<>();
+		String errInfo = "success";
+		List<PageData> varList =  keyProjectMapper.datalistPage(page);
+		returnMap.put("varList", varList);
+		returnMap.put("result", errInfo);
+		return returnMap;
+	}
+}
+
diff --git a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
index 78ab0053..a20f1a1b 100644
--- a/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
+++ b/src/main/java/com/zcloud/service/system/impl/DepartmentServiceImpl.java
@@ -4,13 +4,7 @@ import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import com.zcloud.entity.system.Menu;
-import com.zcloud.mapper.datasource.system.SupervisionDepartmentMapper;
-import com.zcloud.mapper.dsno2.system.Department2Mapper;
-import com.zcloud.util.DateUtil;
 import com.zcloud.util.Jurisdiction;
-import com.zcloud.util.UuidUtil;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,8 +29,6 @@ public class DepartmentServiceImpl implements DepartmentService{
 	@Resource
 	private DepartmentMapper departmentMapper;
 
-	@Resource
-	private Department2Mapper department2Mapper;
 	/**新增
 	 * @param pd
 	 * @throws Exception
diff --git a/src/main/java/com/zcloud/util/PositioningScheduled.java b/src/main/java/com/zcloud/util/PositioningScheduled.java
index e1641351..9d35fe09 100644
--- a/src/main/java/com/zcloud/util/PositioningScheduled.java
+++ b/src/main/java/com/zcloud/util/PositioningScheduled.java
@@ -29,7 +29,7 @@ public class PositioningScheduled {
     }
 
 //    @Scheduled(cron ="0 0 2 * * ? ") // 凌晨两点
-    @Scheduled(cron = "0/10 * * * * ?")
+//    @Scheduled(cron = "0/10 * * * * ?")
     public void syncCardNo(){
         try {
             System.out.println("==========定时同步定位卡号==========");
diff --git a/src/main/resources/mybatis/datasource/bus/MapKeyProjectMapper.xml b/src/main/resources/mybatis/datasource/bus/MapKeyProjectMapper.xml
new file mode 100644
index 00000000..9dae7d39
--- /dev/null
+++ b/src/main/resources/mybatis/datasource/bus/MapKeyProjectMapper.xml
@@ -0,0 +1,177 @@
+<?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.map.MapKeyProjectMapper">
+
+
+	<select id="findFormCount" parameterType="pd" resultType="pd">
+		SELECT
+			SUM( STATE_COUNT ) STATE_COUNT,
+			SUM( VIDEOKG_COUNT ) VIDEO_COUNT,
+			SUM( CHECK_COUNT ) CHECK_COUNT,
+			SUM( HIDDEN_COUNT ) HIDDEN_COUNT,
+			SUM( PUNISH_COUNT ) PUNISH_COUNT,
+			SUM( AMOUT_SUM ) AMOUT_SUM
+		FROM
+		`qa-cmt-regulatory`.vi_keyproj_count
+		where 1=1
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND  CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+
+	<select id="datalistPage" parameterType="pd" resultType="pd">
+		SELECT
+	  		v.OUTSOURCED_COUNT,
+			v.CHECK_COUNT,
+			v.HIDDEN_COUNT,
+			c.CORP_NAME
+		FROM
+		`qa-cmt-regulatory`.vi_keyproj_count v
+		LEFT JOIN `qa-cmt-prevention`.bus_corp_info c on v.CORPINFO_ID=c.CORPINFO_ID
+		where 1=1
+		<if test="pd.CORPINFO_ID!= null and pd.CORPINFO_ID!=''">
+			and v.CORPINFO_ID = #{pd.CORPINFO_ID}
+		</if>
+		<if test="pd.ids!= null and pd.ids.size()>0">
+			AND  v.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="pd.ids" open="(" separator="," close=")">
+				#{pd.ids[${index}]}
+			</foreach>
+		</if>
+		order by v.CHECK_COUNT desc
+	</select>
+
+	<select id="getProjectLocation" parameterType="pd" resultType="pd">
+		SELECT
+		'PROJECT' TYPE,
+		o.OUTSOURCED_ID id,
+		o.WORK_LONGITUDE LONGITUDE,
+		o.WORK_LATITUDE LATITUDE,
+		u.CORPINFO_ID,
+		o.OUTSOURCED_NAME as MAP_POINT_NAME
+		FROM
+		`qa-cmt-regulatory`.bus_outsourced o
+		LEFT JOIN `qa-cmt-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
+		WHERE
+		o.ISDELETE = '0'
+		AND o.STATE = '1'
+		AND o.WORK_LONGITUDE IS NOT NULL
+		AND o.WORK_LONGITUDE != ''
+		AND o.WORK_LATITUDE IS NOT NULL
+		AND o.WORK_LATITUDE != ''
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and u.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND u.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+
+
+	<select id="getVideoLocation" parameterType="pd" resultType="pd">
+		SELECT
+		'VIDEO' TYPE,
+		v.VIDEOMANAGER_ID id,
+		v.LONGITUDE,
+		v.LATITUDE,
+		u.CORPINFO_ID,
+		v.VIDEONAME as MAP_POINT_NAME
+		FROM
+		`qa-cmt-regulatory`.bus_videomanager v
+		LEFT JOIN `qa-cmt-regulatory`.bus_outsourced o on v.OUTSOURCED_ID = o.OUTSOURCED_ID
+		LEFT JOIN `qa-cmt-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
+		WHERE
+		v.ISDELETE = '0'
+		AND o.STATE = '1'
+		AND o.ISDELETE = '0'
+		AND v.LONGITUDE IS NOT NULL
+		AND v.LONGITUDE != ''
+		AND v.LATITUDE IS NOT NULL
+		AND v.LATITUDE != ''
+		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
+			and u.CORPINFO_ID = #{CORPINFO_ID}
+		</if>
+		<if test="ids!= null and ids.size()>0">
+			AND u.CORPINFO_ID IN
+			<foreach item="item" index="index" collection="ids" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+	</select>
+
+
+	<!-- 通过ID获取数据 -->
+	<select id="getProjectById" parameterType="pd" resultType="pd">
+	select
+	f.*,
+	(select GROUP_CONCAT(t.CORP_NAME) from `qa-cmt-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.GROUP_UNIT)) as GROUP_UNIT_NAME,
+	( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-cmt-prevention`.oa_department t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.INVOLVING_CORPS_DEPART_ID ) ) AS INVOLVING_CORPS_DEPART_NAME,
+	( SELECT GROUP_CONCAT( t.NAME ) FROM `qa-cmt-prevention`.vi_department_all t WHERE FIND_IN_SET( t.DEPARTMENT_ID, f.DEPARTMENT_ID ) ) AS DEPARTMENT_NAME,
+	(select GROUP_CONCAT(t.NAME) from (
+	SELECT
+	CONCAT( CONCAT( c.CORP_NAME, '-' ), t.NAME ) NAME  ,t.DEPARTMENT_ID
+	FROM
+	`qa-cmt-prevention`.OA_DEPARTMENT t
+	LEFT JOIN `qa-cmt-prevention`.bus_corp_info c ON c.CORPINFO_ID = t.CORPINFO_ID
+	) t where FIND_IN_SET(t.DEPARTMENT_ID, f.JURISDICTION_UNIT)) as JURISDICTION_UNIT_NAME,
+	(select GROUP_CONCAT(t.CORP_NAME) from `qa-cmt-prevention`.BUS_CORP_INFO t where FIND_IN_SET(t.CORPINFO_ID, f.MANAGE_NAME)) as MANAGE_CORPS_NAME,
+	-- isd.NAME DEPARTMENT_NAME,
+	isdd.NAME MANAGER_DEPARTMENT_NAME,
+	isu.NAME USER_NAME,
+	pci.NAME Q_COMPETENT_DEPT_NAME,
+	pcij.NAME Q_DEPARTMENT_NAME,
+	pcijd.NAME Q_INVOLVING_CORPS_DEPART_NAME,
+	b.UNITS_NAME as UNITS_ID,
+	b.UNITS_NAME as UNITS_NAME,
+	p.`NAME` as UNITS_PIC_NAME
+	from
+	`qa-cmt-regulatory`.bus_outsourced f
+	-- LEFT JOIN `qa-cmt-regulatory`.SYS_DEPARTMENT isd ON isd.DEPARTMENT_ID = f.DEPARTMENT_ID
+	LEFT JOIN `qa-cmt-regulatory`.SYS_DEPARTMENT isdd ON isdd.DEPARTMENT_ID = f.MANAGER_DEPARTMENT_ID
+	LEFT JOIN `qa-cmt-regulatory`.SYS_USER isu ON isu.USER_ID = f.CONTRACT_PIC
+	LEFT JOIN `qa-cmt-prevention`.oa_department pci ON pci.DEPARTMENT_ID = f.COMPETENT_DEPT_ID
+	LEFT JOIN `qa-cmt-prevention`.oa_department pcij ON pcij.DEPARTMENT_ID = f.DEPARTMENT_ID
+	LEFT JOIN `qa-cmt-prevention`.oa_department pcijd ON pcijd.DEPARTMENT_ID = f.INVOLVING_CORPS_DEPART_ID
+	left join `qa-cmt-regulatory`.bus_units b using (UNITS_ID)
+	left join  `qa-cmt-regulatory`.bus_personnelmanagement p on p.PERSONNELMANAGEMENT_ID = f.UNITS_PIC
+	where
+	f.OUTSOURCED_ID = #{id}
+	</select>
+
+	<!-- 通过ID获取数据 -->
+	<select id="getVideoById" parameterType="pd" resultType="pd">
+		select
+		f.OUTSOURCED_ID,
+		f.VIDEONAME,
+		f.VIDEOURL,
+		f.OPDATE,
+		f.OPUSER,
+		f.ISDELETE,
+		f.CODE,
+		f.VIDEO_RESOURCES_ID,
+		f.PLATFORMVIDEOMANAGEMENT_ID,
+		f.VIDEOMANAGER_ID,
+		f.LATITUDE,
+		f.LONGITUDE,
+		o.OUTSOURCED_NAME,
+		c.CORP_NAME,
+		pv.INDEXCODE
+		from
+		`qa-cmt-regulatory`.BUS_VIDEOMANAGER f
+		LEFT JOIN `qa-cmt-regulatory`.bus_outsourced o on o.OUTSOURCED_ID = f.OUTSOURCED_ID
+		LEFT JOIN `qa-cmt-prevention`.vi_user_all u on o.CREATOR = u.USER_ID
+		LEFT JOIN `qa-cmt-prevention`.bus_corp_info c on u.CORPINFO_ID=c.CORPINFO_ID
+		left join `qa-cmt-regulatory`.bus_platformvideomanagement pv on pv.PLATFORMVIDEOMANAGEMENT_ID = f.PLATFORMVIDEOMANAGEMENT_ID
+		where
+		f.VIDEOMANAGER_ID = #{id}
+	</select>
+</mapper>
diff --git a/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml
index abf8186c..504c8f73 100644
--- a/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml
+++ b/src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml
@@ -202,7 +202,7 @@
 			ResCode = #{ResCode}
 	</select>
 
-	<select id="listAllForMap" resultType="com.zcloud.entity.PageData">
+	<select id="listAllForMap" parameterType="pd" resultType="pd">
 		select
 		VIDEORECEIVE_ID as id,
 		ResName as NAME,
@@ -212,9 +212,5 @@
 		ResCode
 		from
 		<include refid="tableName"></include> f
-		where  1 = 1
-		<if test="CORPINFO_ID!= null and CORPINFO_ID!=''">
-			and CORPINFO_ID = #{CORPINFO_ID}
-		</if>
 	</select>
 </mapper>