Merge remote-tracking branch 'origin/czks1.0' into czks1.0

src/main/java/com/zcloud/controller/app/AppHiddenExamineController.java

@@ -318,18 +318,19 @@ public class AppHiddenExamineController extends BaseController {
 	@RequestMapping(value = "/special")
 	@ResponseBody
 	@Transactional
+	@DockAnnotation
 	public Object special() throws Exception {
 		Map<String, Object> map = new HashMap<String, Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
-
 		PageData examine = new PageData();
 		examine.put("TYPE","1");
 		examine.put("STATE","-1");
 		examine.put("EXAMINE",pd.getString("disposalPlan")); //临时措施
 		examine.put("HIDDEN_ID",pd.getString("HIDDEN_ID"));
 		examine = hiddenexamineService.saveApp(examine);
+		pd.put("examine",JSON.toJSONString(examine));
 		hiddenService.updateStateByHidden("7",pd.getString("HIDDEN_ID"));
 		PageData mes = new PageData();
 		PageData hiddenPd = hiddenService.findById(examine);
@@ -339,6 +340,7 @@ public class AppHiddenExamineController extends BaseController {
 
 		map.put("result", errInfo);
 		map.put("msg", "隐患特殊处理申请成功。请通知隐患确认人进行特殊处理确认操作！");
+		map.put("dockData",JSON.toJSONString(pd));
 		return map;
 	}
 
@@ -429,6 +431,7 @@ public class AppHiddenExamineController extends BaseController {
 		}
 		map.put("pd", pd);
 		map.put("result", errInfo);
+		map.put("dockData",JSON.toJSONString(pd));
 		return map;
 	}
 }

src/main/java/com/zcloud/controller/app/AppIdentificationPartsController.java

@@ -328,7 +328,7 @@ public class AppIdentificationPartsController extends BaseController {
 		 * @throws Exception
 		 */
 		@RequestMapping(value="/readExcel")
-		@RequiresPermissions("fromExcel")
+		// @RequiresPermissions("fromExcel")
 		@SuppressWarnings("unchecked")
 		@ResponseBody
 		@Transactional

src/main/java/com/zcloud/controller/app/highriskwork/AppHotWorkApplicationController.java

@@ -7,7 +7,6 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.entity.system.Dictionaries;
-import com.zcloud.entity.system.User;
 import com.zcloud.service.bus.*;
 import com.zcloud.service.highriskwork.HotWorkApplicationService;
 import com.zcloud.service.highriskwork.HotWorkApplicationUserService;
@@ -17,11 +16,8 @@ import com.zcloud.service.system.DictionariesService;
 import com.zcloud.service.system.FHlogService;
 import com.zcloud.util.*;
 import com.zcloud.util.message.MessageService;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.crypto.hash.SimpleHash;
-import org.apache.xpath.SourceTree;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -31,7 +27,6 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.io.File;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -236,7 +231,9 @@ public class AppHotWorkApplicationController extends BaseController {
 		PageData confinedPageData = new PageData(); // pd对接数据
 		confinedPageData.putAll(pd);
 		dockData.put("dockData", JSON.toJSONString(confinedPageData));
-		hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd);
+		Map<String, String> hotuserMap = new HashMap<>();
+		hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd,hotuserMap);
+		dockData.put("hotuserMap", JSON.toJSONString(hotuserMap));
 		hotworkapplicationService.save(pd);
 		this.sendNotice(pd); //发送通知公告
 		map.put("dockData", JSON.toJSONString(dockData));
@@ -356,7 +353,9 @@ public class AppHotWorkApplicationController extends BaseController {
 		confinedPageData.putAll(pd);
 		dockData.put("dockData", JSON.toJSONString(confinedPageData));
 		hotworkapplicationService.edit(pd);
-		hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd);
+		Map<String, String> hotuserMap = new HashMap<>();
+		hotWorkApplicationUserService.saveUserByHot(pd.getString("HOTWORKAPPLICATION_ID"),pd, hotuserMap);
+		dockData.put("hotuserMap", JSON.toJSONString(hotuserMap));
 		this.sendNotice(pd);
 		map.put("dockData", JSON.toJSONString(dockData));
 		map.put("result", errInfo);

src/main/java/com/zcloud/controller/bus/IdentificationPartsController.java

@@ -501,7 +501,7 @@ public class IdentificationPartsController extends BaseController {
 		 * @throws Exception
 		 */
 		@RequestMapping(value="/readExcel")
-		@RequiresPermissions("fromExcel")
+		// @RequiresPermissions("fromExcel")
 		@SuppressWarnings("unchecked")
 		@ResponseBody
 		@Transactional

src/main/java/com/zcloud/controller/bus/LimitSpaceController.java

@@ -211,7 +211,7 @@ public class LimitSpaceController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel2")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/bus/RestrictedSpaceController.java

@@ -306,7 +306,7 @@ public class RestrictedSpaceController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/bus/RiskPointController.java

@@ -592,7 +592,7 @@ public class RiskPointController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional
@@ -804,7 +804,7 @@ public class RiskPointController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel2")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/bus/RiskPointTemporaryController.java

@@ -501,7 +501,7 @@ public class RiskPointTemporaryController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional
@@ -717,7 +717,7 @@ public class RiskPointTemporaryController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel2")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/bus/RiskUnitController.java

@@ -402,7 +402,7 @@ public class RiskUnitController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value = "/readExcel")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/bus/SpecialUserController.java

@@ -6,6 +6,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.alibaba.fastjson.JSON;
+import com.zcloud.aspect.DockAnnotation;
 import com.zcloud.service.system.UsersService;
 import com.zcloud.util.Jurisdiction;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,18 +47,25 @@ public class SpecialUserController extends BaseController {
 	@RequestMapping(value="/add")
 	@RequiresPermissions("specialuser:add")
 	@ResponseBody
+	@DockAnnotation(isAdd = true)
 	public Object add() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		PageData dockData = new PageData(); // 主要对接数据
+
+		PageData blindPageData = new PageData(); // pd对接数据
 		pd.put("SPECIALUSER_ID", this.get32UUID());	//主键
 		pd.put("CREATOR", Jurisdiction.getUSER_ID());
 		pd.put("CREATTIME", DateUtil.date2Str(new Date()));
 		pd.put("OPERATOR",Jurisdiction.getUSER_ID());
 		pd.put("OPERATTIME",DateUtil.date2Str(new Date()));
 		pd.put("ISDELETE","0");
+		blindPageData.putAll(pd);
+		dockData.put("dockData", JSON.toJSONString(blindPageData));
 		specialuserService.save(pd);
+		map.put("dockData", JSON.toJSONString(dockData));
 		map.put("result", errInfo);
 		return map;
 	}
@@ -68,11 +77,14 @@ public class SpecialUserController extends BaseController {
 	@RequestMapping(value="/delete")
 	@RequiresPermissions("specialuser:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object delete() throws Exception{
 		Map<String,String> map = new HashMap<String,String>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		PageData dockData = new PageData(); // 主要对接数据
+
 		// 修改与删除功能仅企业主账号可操作，并仅可修改与删除本单位添加的特种人员信息
 		String corpID = Jurisdiction.getCORPINFO_ID(); // 登录企业信息
 
@@ -103,7 +115,11 @@ public class SpecialUserController extends BaseController {
 		pd.put("OPERATOR",Jurisdiction.getUSER_ID());
 		pd.put("ISDELETE","0");
 		pd = this.getPageData();
+		PageData blindPageData = new PageData(); // pd对接数据
+		blindPageData.putAll(pd);
+		dockData.put("dockData", JSON.toJSONString(blindPageData));
 		specialuserService.delete(pd);
+		map.put("dockData", JSON.toJSONString(dockData));
 		map.put("result", errInfo);				//返回结果
 		return map;
 	}
@@ -115,11 +131,13 @@ public class SpecialUserController extends BaseController {
 	@RequestMapping(value="/edit")
 	@RequiresPermissions("specialuser:edit")
 	@ResponseBody
+	@DockAnnotation
 	public Object edit() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		PageData dockData = new PageData();
 		// 修改与删除功能仅企业主账号可操作，并仅可修改与删除本单位添加的特种人员信息
 		String corpID = Jurisdiction.getCORPINFO_ID(); // 登录企业信息
 
@@ -145,7 +163,11 @@ public class SpecialUserController extends BaseController {
 			map.put("msg", "您不是企业主账号！请联系企业主账号进行修改！");
 			return map;
 		}
+		PageData blindPageData = new PageData(); // pd对接数据
+		blindPageData.putAll(pd);
+		dockData.put("dockData", JSON.toJSONString(blindPageData));
 		specialuserService.edit(pd);
+		map.put("dockData", JSON.toJSONString(dockData));
 		map.put("result", errInfo);
 		return map;
 	}
@@ -198,11 +220,16 @@ public class SpecialUserController extends BaseController {
 	@RequestMapping(value="/deleteAll")
 	@RequiresPermissions("specialuser:del")
 	@ResponseBody
+	@DockAnnotation
 	public Object deleteAll() throws Exception{
 		Map<String,Object> map = new HashMap<String,Object>();
 		String errInfo = "success";
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		PageData dockData = new PageData();
+		PageData blindPageData = new PageData(); // pd对接数据
+		blindPageData.putAll(pd);
+		dockData.put("dockData", JSON.toJSONString(blindPageData));
 		String DATA_IDS = pd.getString("DATA_IDS");
 		if(Tools.notEmpty(DATA_IDS)){
 			String ArrayDATA_IDS[] = DATA_IDS.split(",");
@@ -211,6 +238,7 @@ public class SpecialUserController extends BaseController {
 		}else{
 			errInfo = "fail";
 		}
+		map.put("dockData", JSON.toJSONString(dockData));
 		map.put("result", errInfo);				//返回结果
 		return map;
 	}

src/main/java/com/zcloud/controller/firemanager/FireDeviceController.java

@@ -231,7 +231,7 @@ public class FireDeviceController extends BaseController {
         return map;
     }
     // @RequestMapping(value="/readExcel")
-    // @RequiresPermissions("fromExcel")
+    // // @RequiresPermissions("fromExcel")
     // @SuppressWarnings("unchecked")
     // @ResponseBody
     // public Object readExcel(@RequestParam(value="excel",required=false) MultipartFile file) throws Exception {

src/main/java/com/zcloud/controller/gatemachine/GateAreaController.java

@@ -0,0 +1,57 @@
+package com.zcloud.controller.gatemachine;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.gatemachine.GateAreaService;
+import com.zcloud.util.ReturnMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@RestController
+@RequestMapping("/gateArea")
+public class GateAreaController extends BaseController {
+
+    @Resource
+    private GateAreaService gateAreaService;
+
+
+    @RequestMapping(value = "/page")
+    public ReturnMap page(Page page) {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pageData = this.getPageData();
+        page.setPd(pageData);
+        List<PageData> data = gateAreaService.getDatalistpage(page);
+        returnMap.put("varList", data);
+        returnMap.put("page", page);
+        return returnMap;
+    }
+
+    @RequestMapping(value = "/edit")
+    public ReturnMap edit() {
+        PageData pd = this.getPageData();
+        gateAreaService.edit(pd);
+        return ReturnMap.ok();
+    }
+    @RequestMapping(value = "/removeByIds")
+    public ReturnMap removeByIds() {
+        PageData pageData = this.getPageData();
+        gateAreaService.removeByIds(pageData);
+        return ReturnMap.ok();
+    }
+    @RequestMapping(value = "/add")
+    public ReturnMap add() {
+        PageData pageData = this.getPageData();
+        gateAreaService.save(pageData);
+        return ReturnMap.ok();
+    }
+
+}

src/main/java/com/zcloud/controller/gatemachine/GateMachineController.java

@@ -0,0 +1,61 @@
+package com.zcloud.controller.gatemachine;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.Page;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.gatemachine.GateMachineService;
+import com.zcloud.util.Jurisdiction;
+import com.zcloud.util.ReturnMap;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+
+/**
+ * 说明：TODO
+ * 作者：wangxuan
+ * 官网：www.zcloudchina.com
+ */
+@RestController
+@RequestMapping("/gateMachine")
+public class GateMachineController extends BaseController {
+
+    @Resource
+    private GateMachineService gateMachineService;
+
+
+
+    @RequestMapping(value = "/page")
+    public ReturnMap page(Page page) {
+        PageData pageData = this.getPageData();
+        page.setPd(pageData);
+        ArrayList<PageData> data = gateMachineService.getDatalistpage(page);
+        ReturnMap returnMap = new ReturnMap();
+        returnMap.put("varList", data);
+        returnMap.put("page", page);
+        return returnMap;
+    }
+
+
+    @RequestMapping(value = "/edit")
+    public ReturnMap edit() {
+        PageData pd = this.getPageData();
+        gateMachineService.edit(pd);
+        return ReturnMap.ok();
+    }
+    @RequestMapping(value = "/removeByIds")
+    public ReturnMap removeByIds() {
+        PageData pageData = this.getPageData();
+        gateMachineService.removeByIds(pageData);
+        return ReturnMap.ok();
+    }
+    @RequestMapping(value = "/add")
+    public ReturnMap add() {
+        PageData pageData = this.getPageData();
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        gateMachineService.save(pageData);
+        return ReturnMap.ok();
+    }
+
+}

src/main/java/com/zcloud/controller/gatemachine/GateVideoController.java

@@ -0,0 +1,226 @@
+package com.zcloud.controller.gatemachine;
+
+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("/gateVideo")
+public class GateVideoController 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();
+
+		List<PageData>	videoList = gateVideoService.listAllForMap(pd);	//根据ID读取
+		map.put("videoList", 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;
+	}
+
+
+}

src/main/java/com/zcloud/controller/gf/GFLimitSpaceController.java

@@ -194,7 +194,7 @@ public class GFLimitSpaceController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel2")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/keyProjects/PlatformvideomanagementController.java

@@ -4,6 +4,7 @@ import com.zcloud.controller.base.BaseController;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.service.keyProjects.PlatformvideomanagementService;
+import com.zcloud.util.Jurisdiction;
 import com.zcloud.util.Tools;
 import com.zcloud.util.hk.HKUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +30,35 @@ public class PlatformvideomanagementController extends BaseController {
 	@Autowired
 	private PlatformvideomanagementService platformvideomanagementService;
 
+
+	@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();
+		if(pd.get("PLATFORMVIDEOMANAGEMENT_ID") != null){
+			platformvideomanagementService.edit(pd);
+		}else{
+			pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID());	//主键
+			platformvideomanagementService.save(pd);
+		}
+
+		map.put("result", errInfo);
+		return map;
+	}
+	@RequestMapping(value="/delLocation")
+	@ResponseBody
+	public Object delLocation() throws Exception{
+		Map<String,Object> map = new HashMap<String,Object>();
+		String errInfo = "success";
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		platformvideomanagementService.delLocation(pd);
+		map.put("result", errInfo);
+		return map;
+	}
 	/**新增
 	 * @param
 	 * @throws Exception
@@ -41,6 +71,7 @@ public class PlatformvideomanagementController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("PLATFORMVIDEOMANAGEMENT_ID", this.get32UUID());	//主键
+		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());	//主键
 		platformvideomanagementService.save(pd);
 		map.put("result", errInfo);
 		return map;
@@ -55,7 +86,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"hls");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -71,7 +102,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.camerasPreviewURLs(pd.getString("INDEXCODE"),"rtsp");
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");
@@ -87,7 +118,7 @@ public class PlatformvideomanagementController extends BaseController {
 		Map<String,Object> map = new HashMap<String,Object>();
 		PageData pd =this.getPageData();
 		map = HKUtil.cameraSearch(pd);
-		if(!ObjectUtils.isEmpty(map)){
+		if(ObjectUtils.isEmpty(map)){
 			map = new HashMap<String,Object>();
 		}
 		map.put("result", "success");

src/main/java/com/zcloud/controller/map/MapController.java

@@ -10,6 +10,7 @@ import com.zcloud.service.fireresources.FireResourcesService;
 import com.zcloud.service.gatemachine.GateMachineService;
 //import com.zcloud.service.keyProjects.MeteorologicalService;
 //import com.zcloud.service.keyProjects.MeteorologicalinfoService;
+import com.zcloud.service.keyProjects.PlatformvideomanagementService;
 import com.zcloud.service.keyProjects.VideoManagerService;
 import com.zcloud.service.system.DepartmentService;
 import com.zcloud.service.system.UsersService;
@@ -46,6 +47,8 @@ public class MapController extends BaseController {
     @Autowired
     private CorpInfoService corpInfoService;
 
+    @Autowired
+    private PlatformvideomanagementService platformvideomanagementService;
     @Autowired
     private UsersService usersService;
 
@@ -348,6 +351,27 @@ public class MapController extends BaseController {
     public Object getCzksBasicLocationInfoData() {
         return HttpRequestUtil.getPeopleApi("/statistics/personStatistics/todayPerson", "");
     }
+
+    @RequestMapping("/czks/getGatePosition")
+    @ResponseBody
+    public ReturnMap getCzksGatePosition() {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pageData = this.getPageData();
+        //
+        pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+        List<PageData> value = gateMachineService.getGatePosition(pageData);
+        // 添加标点上的统一的title
+        for (PageData data : value) {
+            if (Tools.notEmpty(data.getString("GATE_AREA_NAME"))) {
+                data.put("MAP_POINT_NAME", data.getString("GATE_AREA_NAME"));
+            } else {
+                data.put("MAP_POINT_NAME", data.getString("NAME"));
+            }
+        }
+        returnMap.put("varList", value);
+        return returnMap;
+    }
+
     /**
      * @Description: 人员定位信息
      * @Author: dearLin
@@ -375,12 +399,80 @@ public class MapController extends BaseController {
         return online;
     }
     /**
-     * @Description: 标签卡状态
+     * @Description: 电子围栏报警  Electronic fence
      * @Author: dearLin
      * @Date: 2024/1/6/006 11:15
      * @Param: [] []
      * @Return: java.lang.Object
      */
+    @RequestMapping(value = "/czks/getFenceAlarmList")
+    @ResponseBody
+    public Object getFenceAlarmList() {
+        PageData pageData = this.getPageData();
+        JSONObject request = new JSONObject();
+        request.put("pageNum", pageData.getString("currentPage"));
+        request.put("pageSize", pageData.getString("showCount"));
+        request.put("beginTime", pageData.getString("beginTime"));
+        request.put("endTime", pageData.getString("endTime"));
+        request.put("alarmType", pageData.getString("alarmType"));
+        request.put("alarmStatus", pageData.getString("alarmStatus"));
+        request.put("realName", pageData.getString("realName"));
+        // 标签卡
+        return HttpRequestUtil.getPeopleApi("/system/alarm/person/listPage", request.toString());
+    }
+    /**
+     * @Description: 电子围栏报警  Electronic fence
+     * @Author: dearLin
+     * @Date: 2024/1/6/006 11:15
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/czks/getElectronicFenceList")
+    @ResponseBody
+    public Object getElectronicFenceList() {
+        PageData pageData = this.getPageData();
+        JSONObject request = new JSONObject();
+        request.put("pageNum", pageData.getString("currentPage"));
+        request.put("pageSize", pageData.getString("showCount"));
+        request.put("railName", pageData.getString("railName"));
+        // 标签卡
+        return HttpRequestUtil.getPeopleApi("/system/rail/listPage", request.toString());
+    }
+
+    /**
+     * @Description: 获取摄像头定位
+     * @Author: dearLin
+     * @Date: 2024/1/6/006 11:15
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/czks/getCameraPositioning")
+    @ResponseBody
+    public Object getCameraPositioning() {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pageData = new PageData();
+        pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        List<PageData> dataList = platformvideomanagementService.listAllForMap(pageData);
+        returnMap.put("varList",dataList);
+        return returnMap;
+    }
+    /**
+     * @Description: 设备在线情况
+     * @Author: dearLin
+     * @Date: 2024/1/6/006 11:15
+     * @Param: [] []
+     * @Return: java.lang.Object
+     */
+    @RequestMapping(value = "/czks/getListMapSluiceCount")
+    @ResponseBody
+    public Object getListMapSluiceCount() {
+        ReturnMap returnMap = new ReturnMap();
+        PageData pageData = new PageData();
+        pageData.put("CORPINFO_ID",Jurisdiction.getCORPINFO_ID());
+        List<PageData> dataList = platformvideomanagementService.getListMapSluiceCount(pageData);
+        returnMap.put("varList",dataList);
+        return returnMap;
+    }
     @RequestMapping(value = "/czks/person/staff/listPage")
     @ResponseBody
     public Object getCzksPersonStaffListPage() {

src/main/java/com/zcloud/controller/onlinexxks/QuestionController.java

@@ -306,7 +306,7 @@ public class QuestionController extends BaseController {
 	 * @throws Exception
 	 */
 	@RequestMapping(value="/readExcel")
-	@RequiresPermissions("fromExcel")
+	// @RequiresPermissions("fromExcel")
 	@SuppressWarnings("unchecked")
 	@ResponseBody
 	@Transactional

src/main/java/com/zcloud/controller/system/UsersController.java

@@ -1238,7 +1238,7 @@ public class UsersController extends BaseController {
      * @throws Exception
      */
     @RequestMapping(value = "/readExcel")
-    @RequiresPermissions("fromExcel")
+    // @RequiresPermissions("fromExcel")
     @SuppressWarnings("unchecked")
     @ResponseBody
     public Object readExcel(@RequestParam(value = "excel", required = false) MultipartFile file) throws Exception {
@@ -1452,7 +1452,7 @@ public class UsersController extends BaseController {
      * @throws Exception
      */
     @RequestMapping(value = "/readExcel2")
-    @RequiresPermissions("fromExcel")
+    // @RequiresPermissions("fromExcel")
     @SuppressWarnings("unchecked")
     @ResponseBody
     @Transactional
@@ -1946,7 +1946,7 @@ public class UsersController extends BaseController {
      * @throws Exception
      */
     @RequestMapping(value = "/readExcel3")
-    @RequiresPermissions("fromExcel")
+    // @RequiresPermissions("fromExcel")
     @SuppressWarnings("unchecked")
     @ResponseBody
     public Object readExcel3(@RequestParam(value = "FFILE", required = false) MultipartFile file) throws Exception {

src/main/java/com/zcloud/mapper/datasource/keyProjects/PlatformvideomanagementMapper.java

@@ -58,5 +58,8 @@ public interface PlatformvideomanagementMapper {
 	List<PageData> listAllForMap(PageData pd);
 
 
+	void delLocation(PageData pd);
+
+    List<PageData> getListMapSluiceCount(PageData pageData);
 }
 

src/main/java/com/zcloud/service/gatemachine/impl/GateMachineServiceImpl.java

@@ -2,7 +2,9 @@ package com.zcloud.service.gatemachine.impl;
 
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
-import com.zcloud.mapper.datasource.gatemachine.*;
+import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper;
+import com.zcloud.mapper.datasource.gatemachine.GateMachineMapper;
+import com.zcloud.mapper.datasource.gatemachine.GateVideoMapper;
 import com.zcloud.service.gatemachine.GateMachineService;
 import com.zcloud.service.keyProjects.VideoManagerService;
 import com.zcloud.util.InitPageDataUtil;
@@ -80,17 +82,16 @@ public class GateMachineServiceImpl implements GateMachineService {
 
     @Override
     public List<PageData> getGatePosition(PageData pageData) {
-        // todo 需求变更，现在闸机变成了区域
-        if (pageData.getString("TYPE").equals("PERSON")) {
+        if ("PERSON".equals(pageData.getString("TYPE"))) {
             pageData.put("GATE_AREA_TYPE", 0);
             // 人闸机定位
         }
 
-        if (pageData.getString("TYPE").equals("CAR")) {
+        if ("CAR".equals(pageData.getString("TYPE"))) {
             // 车闸机定位
             pageData.put("GATE_AREA_TYPE", 1);
         }
-        if (pageData.getString("TYPE").equals("CAMERA")) {
+        if ("camera".equals(pageData.getString("TYPE"))) {
             // 摄像头定位
            return gateVideoMapper.getCameraPosition(pageData);
         }

src/main/java/com/zcloud/service/highriskwork/HotWorkApplicationUserService.java

@@ -1,6 +1,8 @@
 package com.zcloud.service.highriskwork;
 
 import java.util.List;
+import java.util.Map;
+
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 
@@ -73,7 +75,7 @@ public interface HotWorkApplicationUserService{
 	/**新增
 	 * @throws Exception
 	 */
-	public void saveUserByHot(String hotID, PageData hotPd)throws Exception;
+	public void saveUserByHot(String hotID, PageData hotPd, Map<String, String> syncMap)throws Exception;
 
 	/**
 	 * 延时监火转发前删除

src/main/java/com/zcloud/service/highriskwork/impl/HotWorkApplicationUserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.zcloud.service.highriskwork.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.zcloud.entity.Page;
 import com.zcloud.entity.PageData;
 import com.zcloud.mapper.datasource.highriskwork.HotWorkApplicationUserMapper;
@@ -107,10 +108,13 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 	/**新增
 	 * @throws Exception
 	 */
-	public void saveUserByHot(String hotID, PageData hotPd)throws Exception{
+	public void saveUserByHot(String hotID, PageData hotPd, Map<String,String> syncMap)throws Exception{
 		if(!Tools.isEmpty(hotID)){
 			PageData del = new PageData();
 			del.put("FOREIGN_KEY",hotID);
+			PageData dockDatadel = new PageData(); // pd对接数据
+			dockDatadel.putAll(del);
+			syncMap.put("dockDatadel", JSON.toJSONString(dockDatadel));
 			hotworkapplicationuserMapper.delete(del); // 删除 项目相关人员
 
 			/**
@@ -127,6 +131,8 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 					"HOT_WORK_USER_ID","PROJECT_UNIT_LEADER_ID","UNIT_LEADER_ID",
 					"ISSUING_USER_ID","SAFETY_DIRECTOR_USER_ID",
 					"SITE_LEADER_ID" };
+			Map<String,String> userMap = new HashMap<>();
+			int count = 1;
 			for (int i = 0;i<userKey.length;i++){
 				if(!Tools.isEmpty(hotPd.get(userKey[i]))){
 					if(i == 2 && !"1".equals(hotPd.getString("JOB_TYPE_INDEX"))){
@@ -147,6 +153,7 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 						siteUesr.put("CREATTIME",DateUtil.date2Str(new Date()));
 						siteUesr.put("OPERATOR",hotPd.getString("loginUserId"));
 						siteUesr.put("OPERATTIME",DateUtil.date2Str(new Date()));
+						userMap.put("other1" + count,JSON.toJSONString(siteUesr));
 						hotworkapplicationuserMapper.save(siteUesr);
 					}
 					PageData siteUesr = new PageData();
@@ -160,9 +167,12 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 					siteUesr.put("CREATTIME",DateUtil.date2Str(new Date()));
 					siteUesr.put("OPERATOR",hotPd.getString("loginUserId"));
 					siteUesr.put("OPERATTIME",DateUtil.date2Str(new Date()));
+					userMap.put("other2" + count,JSON.toJSONString(siteUesr));
 					hotworkapplicationuserMapper.save(siteUesr);
 				}
+				count++;
 			}
+			syncMap.put("userMap", JSON.toJSONString(userMap));
 			/** 添加 动火操作人 **/
 			if(!Tools.isEmpty(hotPd.get("operatorUser"))){
 				String [] workOperators = hotPd.get("operatorUser").toString().split(";");
@@ -178,6 +188,9 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 					workOperator.put("CREATTIME",DateUtil.date2Str(new Date()));
 					workOperator.put("OPERATOR",hotPd.getString("loginUserId"));
 					workOperator.put("OPERATTIME",DateUtil.date2Str(new Date()));
+					PageData dockData3 = new PageData(); // pd对接数据
+					dockData3.putAll(workOperator);
+					syncMap.put("dockData3", JSON.toJSONString(dockData3));
 					hotworkapplicationuserMapper.save(workOperator); // 添加  动火操作人
 				}
 			}
@@ -194,6 +207,9 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 				workOperator.put("CREATTIME",DateUtil.date2Str(new Date()));
 				workOperator.put("OPERATOR",hotPd.getString("loginUserId"));
 				workOperator.put("OPERATTIME",DateUtil.date2Str(new Date()));
+				PageData dockData4 = new PageData(); // pd对接数据
+				dockData4.putAll(workOperator);
+				syncMap.put("dockData4", JSON.toJSONString(dockData4));
 				hotworkapplicationuserMapper.save(workOperator); //
 			}
 			if("1".equals(hotPd.getString("IS_GAS_TESTING"))){ //气体检测
@@ -208,6 +224,9 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 				hotUser.put("CREATTIME",DateUtil.date2Str(new Date()));
 				hotUser.put("OPERATOR",hotPd.getString("loginUserId"));
 				hotUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+				PageData dockData5 = new PageData(); // pd对接数据
+				dockData5.putAll(hotUser);
+				syncMap.put("dockData5", JSON.toJSONString(dockData5));
 				hotworkapplicationuserMapper.save(hotUser);
 			}
 			// 特级动火
@@ -223,6 +242,9 @@ public class HotWorkApplicationUserServiceImpl implements HotWorkApplicationUser
 				hotUser.put("CREATTIME",DateUtil.date2Str(new Date()));
 				hotUser.put("OPERATOR",hotPd.getString("loginUserId"));
 				hotUser.put("OPERATTIME",DateUtil.date2Str(new Date()));
+				PageData dockData6 = new PageData(); // pd对接数据
+				dockData6.putAll(hotUser);
+				syncMap.put("dockData6", JSON.toJSONString(dockData6));
 				hotworkapplicationuserMapper.save(hotUser);
 			}
 		}

src/main/java/com/zcloud/service/keyProjects/PlatformvideomanagementService.java

@@ -54,7 +54,10 @@ public interface PlatformvideomanagementService {
 	 * @throws Exception
 	 */
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception;
-	Object listAllForMap(PageData pd);
+	List<PageData> listAllForMap(PageData pd);
 
+	void delLocation(PageData pd);
+
+	List<PageData> getListMapSluiceCount(PageData pageData);
 }
 

src/main/java/com/zcloud/service/keyProjects/impl/PlatformvideomanagementServiceImpl.java

@@ -21,76 +21,94 @@ import java.util.Map;
  */
 @Service
 @Transactional //开启事物
-public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService{
+public class PlatformvideomanagementServiceImpl implements PlatformvideomanagementService {
 
     @Autowired
     private PlatformvideomanagementMapper platformvideomanagementMapper;
 
-	/**新增
+    /**
+     * 新增
+     *
      * @param pd
      * @throws Exception
      */
-	public void save(PageData pd)throws Exception{
+    public void save(PageData pd) throws Exception {
         platformvideomanagementMapper.save(pd);
     }
 
-	/**删除
+    /**
+     * 删除
+     *
      * @param pd
      * @throws Exception
      */
-	public void delete(PageData pd)throws Exception{
+    public void delete(PageData pd) throws Exception {
         platformvideomanagementMapper.delete(pd);
     }
 
-	/**修改
+    /**
+     * 修改
+     *
      * @param pd
      * @throws Exception
      */
-	public void edit(PageData pd)throws Exception{
+    public void edit(PageData pd) throws Exception {
         platformvideomanagementMapper.edit(pd);
     }
 
-	/**列表
+    /**
+     * 列表
+     *
      * @param page
      * @throws Exception
      */
-	public List<PageData> list(Page page)throws Exception{
+    public List<PageData> list(Page page) throws Exception {
         return platformvideomanagementMapper.datalistPage(page);
     }
 
-	/**列表(全部)
+    /**
+     * 列表(全部)
+     *
      * @param pd
      * @throws Exception
      */
-	public List<PageData> listAll(PageData pd)throws Exception{
+    public List<PageData> listAll(PageData pd) throws Exception {
         return platformvideomanagementMapper.listAll(pd);
     }
 
-	/**通过id获取数据
+    /**
+     * 通过id获取数据
+     *
      * @param pd
      * @throws Exception
      */
-	public PageData findById(PageData pd)throws Exception{
+    public PageData findById(PageData pd) throws Exception {
         return platformvideomanagementMapper.findById(pd);
     }
 
-	/**批量删除
+    /**
+     * 批量删除
+     *
      * @param ArrayDATA_IDS
      * @throws Exception
      */
-	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
+    public void deleteAll(String[] ArrayDATA_IDS) throws Exception {
         platformvideomanagementMapper.deleteAll(ArrayDATA_IDS);
     }
 
     @Override
-	public Object listAllForMap(PageData pd) {
-		Map<String,Object> map = new HashMap<String,Object>();
-		String errInfo = "success";
-		pd.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
-		List<PageData> varList = platformvideomanagementMapper.listAllForMap(pd);
-		map.put("varList", varList);
-		map.put("result", errInfo);
-		return map;
+    public List<PageData> listAllForMap(PageData pd) {
+        return platformvideomanagementMapper.listAllForMap(pd);
+    }
+
+    @Override
+    public void delLocation(PageData pd) {
+        platformvideomanagementMapper.delLocation(pd);
+    }
+
+    @Override
+    public List<PageData> getListMapSluiceCount(PageData pageData) {
+       return   platformvideomanagementMapper.getListMapSluiceCount(pageData);
     }
 
 }

src/main/java/com/zcloud/util/hk/HKUtil.java

@@ -15,11 +15,11 @@ import java.util.Map;
 public class HKUtil {
     static {
         // 代理API网关nginx服务器ip端口
-        ArtemisConfig.host = "192.168.150.80:5443";
+        ArtemisConfig.host = "172.17.100.1:443";
         // 秘钥appkey
-        ArtemisConfig.appKey = "25448524";
+        ArtemisConfig.appKey = "29806794";
         // 秘钥appSecret
-        ArtemisConfig.appSecret = "DoHeB3gR2dxgaEvANqNr";
+        ArtemisConfig.appSecret = "LyM1zaj3YpjwrWQEhi0u";
     }
     /**
      * 能力开放平台的网站路径
@@ -49,14 +49,14 @@ public class HKUtil {
      */
     public static Map<String,Object> camerasPreviewURLs(String id,String type){
         JSONObject jsonBody = new JSONObject();
-        jsonBody.put("indexCode", id);
+        jsonBody.put("cameraIndexCode", id);
         jsonBody.put("netZoneCode", "1");
         jsonBody.put("transmode", 1);
         jsonBody.put("streamType", 0);
         jsonBody.put("protocol",type);
         jsonBody.put("expireTime", -1);
         jsonBody.put("expand","transcode=1&streamform=rtp");
-        Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/vnsc/mls/v1/preview/openApi/getPreviewParam");
+        Map<String,Object> returnMap=publicHkInterface(jsonBody,"/api/video/v1/cameras/previewURLs");
         return returnMap;
     }
 

src/main/resources/application-master.properties

@@ -1,12 +1,13 @@
-#???
 datasource.no1.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no1.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no1.url=jdbc:mysql://39.101.130.96:33068/qa-czks-prevention?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no1.username=root
-datasource.no1.password=gwjsjkzcloud888888
+datasource.no1.password=Mysql@zcloud88888
+
+
 datasource.no2.driver-class-name: com.mysql.cj.jdbc.Driver
-datasource.no2.url=jdbc:mysql://192.168.192.202:33068/qa-gwj-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
+datasource.no2.url=jdbc:mysql://39.101.130.96:33068/qa-czks-regulatory?serverTimezone=UTC&useSSL=false&useUnicode=true&characterEncoding=utf-8
 datasource.no2.username=root
-datasource.no2.password=gwjsjkzcloud888888
+datasource.no2.password=Mysql@zcloud88888
 
 #druid???
 spring.datasource.type: com.alibaba.druid.pool.DruidDataSource
@@ -31,9 +32,6 @@ spring.datasource.testOnReturn: false
 #?????????filters????????sql?????,'wall'?????
 filters: stat, wall, log4j
 
-#????????????
-baseimgpath = https://qgqy.qhdsafety.com/
-
 #????????
 spring.cache.ehcache.cofnig=ehcache.xml
 
@@ -53,38 +51,50 @@ spring.http.encoding.force=true
 spring.http.encoding.enabled=true
 # ??springboot????banner
 spring.main.banner-mode=off
-#jar????????
-#web.upload-path=h:/
-#web.front-path=h:/
-#spring.resources.static-locations=file:${web.upload-path},file:${web.front-path}
-#???
-preventionxgf.api.url=http://192.168.192.201:8993/qa-prevention-xgf/
-#???
-qa-regulatory-gwj.api.url=http://192.168.192.201:8092/qa-regulatory-gwj/
 
+preventionxgf.api.url=http://192.168.0.31:8992/qa-prevention-xgf/
+qa-regulatory-gwj.api.url=http://192.168.0.31:8992/qa-regulatory-gwj/
+
+#preventionxgf.api.url=https://qgxgf.qhdsafety.com/qa-prevention-xgf/
+#qa-regulatory-gwj.api.url=https://qgjg.qhdsafety.com/qa-regulatory-gwj/
 #?????
-smb.host=192.168.192.201
+smb.host=39.101.130.96
 smb.port=22
 smb.user=root
-smb.password=SJSKAQHBGLXT@20220311
-smb.basePath=/mnt/qask/file/czks
+smb.password=Zcloud@zcloud88888
+smb.basePath=/mnt/wwag/file/
+
+#Mq\u914D\u7F6E
+rocketmq.consumer.group2=edu-admin-edit
+rocketmq.consumer.group1=edu-admin-add
+#rocketmq.name-server=10.0.140.141:9876
+#rocketmq.name-server=192.168.0.70:9876
+rocketmq.name-server=39.101.130.96:9876
+rocketmq.producer.group=libmiddle
+rocketmq.producer.send-message-timeout=300000
+rocketmq.producer.compress-message-body-threshold=4096
+rocketmq.producer.max-message-size=4194304
+rocketmq.producer.retry-times-when-send-failed=3
+rocketmq.producer.retry-next-server=true
+rocketmq.producer.retry-times-when-send-async-failed=3
+## topic \u524D\u7F00
+
+mq.topic.info=info
+mq.topic.eightWork=eightWork
+mq.group.info=scheduled_tasks
+mq.group.eightWork=scheduled_tasks_eightWork
 
-# ????????
-czks-useridentity=CZKS
-czks-baseimgpath=https://qgqy.qhdsafety.com/file/
-czks-backendaddr=http://192.168.0.31:7811/qa-regulatory-czks/
-# ???????
-gwj-useridentity=GWJ
-gwj-baseimgpath=https://qgqy.qhdsafety.com/file/
-gwj-backendaddr=http://192.168.0.31:8991/qa-prevention-gwj/
-#??????
-perLoc.url=http://192.168.210.32:8084
-perLoc.userName=qaaqadmin
-perLoc.pwd=Cfd2023@
 #????
 mq.topic.docking=docking
+mq.topic.dockingPicture=dockingPicture
 mq.group.docking=scheduled_tasks_docking
 
-base.info.USER_IDENTITY=GWJ
-base.info.baseImgPath=https://qgqy.qhdsafety.com/file/
-base.info.BACKENDADDR=http://192.168.0.31:8992/qa-regulatory-gwj/
+perLoc.url=http://172.16.130.86/gateway-service
+perLoc.userName=qaaqadmin
+perLoc.pwd=Cfd2023@
+corp.default.pic-path=https://qgqy.qhdsafety.com/
+corp.default.back-end-path=https://qgqy.qhdsafety.com/file/
+
+http.file.url=https://qgqy.qhdsafety.com/file/
+#????????????
+baseimgpath =https://wwag.qhdsafety.com/file/

src/main/resources/application.properties

@@ -4,9 +4,9 @@ server.port=8091
 #??
 #spring.profiles.active=local
 #<23><><EFBFBD><EFBFBD>31ʱʹ<CAB1><CAB9>
-spring.profiles.active=dev
+#spring.profiles.active=dev
 #??
-#spring.profiles.active=master
+spring.profiles.active=master
 
 
 

src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml

@@ -37,6 +37,7 @@
 	    PLATFORMVIDEOMANAGEMENT_ID,
 		GATEVIDEO_ID,
 		LATITUDE,
+		CORPINFO_ID,
 		LONGITUDE
 	</sql>
 
@@ -51,6 +52,7 @@
 		#{PLATFORMVIDEOMANAGEMENT_ID},
 		#{GATEVIDEO_ID},
 		#{LATITUDE},
+		#{CORPINFO_ID},
 		#{LONGITUDE}
 	</sql>
 
@@ -243,7 +245,6 @@
 		SELECT
 		GATEVIDEO_ID AS id,
 		VIDEONAME AS `NAME`,
-		'CAMERA' AS TYPE,
 		v.LATITUDE,
 		v.LONGITUDE
 		FROM
@@ -258,6 +259,7 @@
 		<if test="CORPINFO_ID != null and CORPINFO_ID != ''">
 			and o.CORPINFO_ID = #{CORPINFO_ID}
 		</if>
+		GROUP BY v.GATEVIDEO_ID
 	</select>
 
 </mapper>

src/main/resources/mybatis/datasource/keyProjects/PlatformvideomanagementMapper.xml

@@ -57,6 +57,7 @@
 		REGIONNAME,
 		REGIONPATH,
 		REGIONPATHNAME,
+		CORPINFO_ID,
 		PLATFORMVIDEOMANAGEMENT_ID
 	</sql>
 
@@ -81,6 +82,7 @@
 		#{REGIONNAME},
 		#{REGIONPATH},
 		#{REGIONPATHNAME},
+		#{CORPINFO_ID},
 		#{PLATFORMVIDEOMANAGEMENT_ID}
 	</sql>
 
@@ -181,6 +183,37 @@
 			and f.CORPINFO_ID = #{CORPINFO_ID}
 		</if>
 	</select>
+	<select id="getListMapSluiceCount" resultType="com.zcloud.entity.PageData">
+		SELECT
+			0 AS PER_GATE_COUNT,
+			( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS CAR_GATE_COUNT,
+			0 AS VIDEO_COUNT
+		FROM
+			mk_gate_area f
+		WHERE
+			f.ISDELETE = 0
+		  AND f.GATE_AREA_TYPE = 1
+		  AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
+		SELECT
+			( SELECT count( 1 ) FROM mk_gate_machine m WHERE m.GATE_AREA_ID = f.GATE_AREA_ID AND m.ISDELETE = '0' ) AS PER_GATE_COUNT,
+			0 AS CAR_GATE_COUNT,
+			0 AS VIDEO_COUNT
+		FROM
+			mk_gate_area f
+		WHERE
+			f.ISDELETE = 0
+		  AND f.GATE_AREA_TYPE = 0
+		  AND f.CORPINFO_ID = #{CORPINFO_ID} UNION
+		SELECT
+			0 AS PER_GATE_COUNT,
+			0 AS CAR_GATE_COUNT,
+			COUNT( 1 ) AS VIDEO_COUNT
+		FROM
+			bus_gatevideo f
+		WHERE
+			f.ISDELETE = 0
+		  AND f.CORPINFO_ID = #{CORPINFO_ID}
+	</select>
 
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
@@ -194,5 +227,14 @@
                  #{item}
 		</foreach>
 	</delete>
-
+		<update id="delLocation" parameterType="pd">
+			update
+			<include refid="tableName"></include>
+			set
+			LONGITUDE = null,
+			LATITUDE = null,
+			CORPINFO_ID = null
+			where
+			PLATFORMVIDEOMANAGEMENT_ID = #{PLATFORMVIDEOMANAGEMENT_ID}
+		</update>
 </mapper>