diff --git a/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java
index 6bea592d..399e8935 100644
--- a/src/main/java/com/zcloud/controller/anemometer/AnemometerController.java
+++ b/src/main/java/com/zcloud/controller/anemometer/AnemometerController.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.announcement.AnemometerMachineService;
+import com.zcloud.service.announcement.AnemometerService;
import com.zcloud.service.gatemachine.GateAreaService;
import com.zcloud.util.ReturnMap;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -23,6 +24,8 @@ public class AnemometerController extends BaseController {
@Resource
private AnemometerMachineService anemometerMachineService;
+ @Resource
+ private AnemometerService anemometerService;
@RequestMapping(value = "/page")
@@ -50,7 +53,7 @@ public class AnemometerController extends BaseController {
ReturnMap returnMap = new ReturnMap();
PageData pd = this.getPageData();
PageData data = anemometerMachineService.getDetailById(pd);
- returnMap.put("varList", data);
+ returnMap.put("pd", data);
return returnMap;
}
@@ -60,4 +63,14 @@ public class AnemometerController extends BaseController {
anemometerMachineService.edit(pd);
return ReturnMap.ok();
}
+
+ @RequestMapping(value = "/listAnemometerForMap")
+ public ReturnMap anemometerCount() throws Exception {
+ ReturnMap returnMap = new ReturnMap();
+ PageData pd = this.getPageData();
+ List<PageData> dataList = anemometerService.listAll(pd);
+ returnMap.put("anemometerCount",dataList.size());
+ returnMap.put("varList",dataList);
+ return returnMap;
+ }
}
diff --git a/src/main/java/com/zcloud/controller/map/CmtMapController.java b/src/main/java/com/zcloud/controller/map/CmtMapController.java
index 37220b8d..a739ed04 100644
--- a/src/main/java/com/zcloud/controller/map/CmtMapController.java
+++ b/src/main/java/com/zcloud/controller/map/CmtMapController.java
@@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
-import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.czksbimap.CzksBiMapService;
+import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.fireresources.CmtFireResourcesService;
import com.zcloud.service.gatemachine.GateMachineService;
import com.zcloud.service.keyProjects.PlatformvideomanagementService;
@@ -33,7 +33,7 @@ import java.util.Map;
* 官网：www.zcloudchina.com
*/
@Controller
-@RequestMapping("/czks/map")
+@RequestMapping("/cmt/map")
public class CmtMapController extends BaseController {
@Resource
@@ -347,6 +347,32 @@ public class CmtMapController extends BaseController {
return returnMap;
}
+ /**
+ * @Description: 人员定位信息
+ * @Author: dearLin
+ * @Date: 2024/1/6/006 17:33
+ * @Param: [] []
+ * @Return: java.lang.Object
+ */
+ @RequestMapping(value = "person/allPerson/listPage")
+ @ResponseBody
+ public Object getCzksOnlinePersion() throws Exception {
+ ReturnMap online = new ReturnMap();
+ PageData pageData = this.getPageData();
+ JSONObject request = new JSONObject();
+ request.put("pageNum", 1);
+ request.put("pageSize", 10);
+ request.put("online", "true");
+ pageData.put("CORPINFO_ID", Jurisdiction.getCORPINFO_ID());
+ // 系统人员数
+ int userCount = usersService.getUserCount(pageData);
+ // 系统部门数
+ int departCount = departmentService.getDepartmentCount(pageData);
+ online.put("userCount",userCount);
+ online.put("departCount",departCount);
+ return online;
+ }
+
/**
* @Description: 获取摄像头定位
* @Author: dearLin
@@ -364,6 +390,23 @@ public class CmtMapController extends BaseController {
returnMap.put("varList",dataList);
return returnMap;
}
+ /**
+ * @Description: 设备在线情况
+ * @Author: dearLin
+ * @Date: 2024/1/6/006 11:15
+ * @Param: [] []
+ * @Return: java.lang.Object
+ */
+ @RequestMapping(value = "/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;
+ }
/**
* 沧州矿石人员定位结束 定位基础信息
diff --git a/src/main/java/com/zcloud/controller/map/CmtObtainDisplayDataController.java b/src/main/java/com/zcloud/controller/map/CmtObtainDisplayDataController.java
new file mode 100644
index 00000000..c436233e
--- /dev/null
+++ b/src/main/java/com/zcloud/controller/map/CmtObtainDisplayDataController.java
@@ -0,0 +1,36 @@
+package com.zcloud.controller.map;
+
+import com.zcloud.controller.base.BaseController;
+import com.zcloud.entity.PageData;
+import com.zcloud.service.bus.RiskUnitService;
+import com.zcloud.service.keyProjects.PlatformvideomanagementService;
+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;
+
+@Controller
+@RequestMapping("/cmt/ObtainDisplayData")
+public class CmtObtainDisplayDataController extends BaseController {
+
+ @Autowired
+ private RiskUnitService riskUnitService;
+ @Autowired
+ private PlatformvideomanagementService platformvideomanagementService;
+
+ @RequestMapping(value="/getRiskList")
+ @ResponseBody
+ public Object getRiskList() throws Exception{
+ PageData pd = this.getPageData();
+ return riskUnitService.listAllForMap(pd);
+ }
+
+ @RequestMapping(value="/listAllCameraForMap")
+ @ResponseBody
+ public Object listAllCameraForMap() throws Exception{
+ PageData pd = this.getPageData();
+ return platformvideomanagementService.listAllForMap(pd);
+ }
+
+
+}
diff --git a/src/main/java/com/zcloud/controller/map/MapController.java b/src/main/java/com/zcloud/controller/map/MapController.java
index 7ee6776f..76de7b1a 100644
--- a/src/main/java/com/zcloud/controller/map/MapController.java
+++ b/src/main/java/com/zcloud/controller/map/MapController.java
@@ -1,5 +1,6 @@
package com.zcloud.controller.map;
+import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
@@ -214,6 +215,15 @@ public class MapController extends BaseController {
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;
}
diff --git a/src/main/java/com/zcloud/util/hk/HKUtil.java b/src/main/java/com/zcloud/util/hk/HKUtil.java
index c069ca7b..05f3f712 100644
--- a/src/main/java/com/zcloud/util/hk/HKUtil.java
+++ b/src/main/java/com/zcloud/util/hk/HKUtil.java
@@ -159,7 +159,7 @@ public class HKUtil {
public static Map<String,Object> getCarDoorComeAndOutInfo(String ids, String pageNo, String pageSize,String currDay, String before ) {
JSONObject jsonBody = new JSONObject();
if (ids != null)
- jsonBody.put("entranceSyscode","1bb725001c8d4660a96350ffbfe77c3a");
+ jsonBody.put("entranceSyscode",ids);
if (pageNo != null)
jsonBody.put("pageNo",pageNo);
if (pageSize != null)
@@ -172,6 +172,25 @@ public class HKUtil {
return returnMap;
}
+ /**
+ *
+ * @param currDay before 设备编号
+ * @return
+ */
+ public static Map<String,Object> getCarOnSiteCount(String pageNo,String pageSize,String startTime, String endTime ) {
+ JSONObject jsonBody = new JSONObject();
+ if (pageNo != null)
+ jsonBody.put("pageNo",pageNo);
+ if (pageSize != null)
+ jsonBody.put("pageSize",pageSize);
+ if (startTime != null)
+ jsonBody.put("startTime",startTime);
+ if (endTime != null)
+ jsonBody.put("endTime",endTime);
+ Map<String,Object> returnMap = publicHkInterface(jsonBody,"/api/pms/v1/tempCarInRecords/page");
+ return returnMap;
+ }
+
/**
* 获取监控点预览取流URL
* @param id 设备编号
diff --git a/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
index 2aa864f1..da4aae49 100644
--- a/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
+++ b/src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
@@ -101,10 +101,13 @@
f.LATITUDE,
f.LONGITUDE,
ba.FVALUE,
- ba.FTIME
+ ba.FTIME,
+ ba.FVALUE as WINDSPEED,
+ f.FNAME AS EQUIPMENTNAME,
+ ba.FTIME as OPERATTIME
FROM
bus_anemometer_machine f
- LEFT JOIN (select *,MAX(FTIME) from bus_anemometer_local GROUP BY FNAME) ba on f.FNAME =ba.FNAME
+ LEFT JOIN ( SELECT FNAME,FVALUE, MAX( FTIME ) as FTIME FROM bus_anemometer_local GROUP BY FNAME ) ba on f.FNAME =ba.FNAME
WHERE
f.FNAME = #{FNAME}
</select>
diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
index 86d52e3f..93b3d9de 100644
--- a/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
+++ b/src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
@@ -72,7 +72,7 @@
FROM
mk_gate_area
WHERE
- isdelete = 0 and GATE_AREA_TYPE = #{GATE_AREA_TYPE}
+ isdelete = 0 and GATE_AREA_TYPE = #{GATE_AREA_TYPE} and LONGITUDE is not null and LATITUDE is not null
<if test="AREA != null and AREA != ''">
and CORPINFO_ID in (select CORPINFO_ID from bus_corp_info where AREA = #{AREA} and ISDELETE = 0)
</if>
diff --git a/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml
index ff4901c4..f9a13081 100644
--- a/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml
+++ b/src/main/resources/mybatis/datasource/gatemachine/GateCarMachineInfoMapper.xml
@@ -60,7 +60,7 @@
#{item.plateColor},
#{item.carCategory},
#{item.carCategoryName},
- #{item.crossTime},
+ #{item.CROSSTIME},
#{item.CREATTIME},
#{item.OPERATTIME},
#{item.ISDELETE}