guoyuepeng
/
qa-prevention-gwj
1
0
Fork 3
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

地图代码

pull/15/head
songwenxuan 2024-01-24 09:50:08 +08:00
parent 50a8f7b24f
commit 27786297e9
20 changed files with 903 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zcloud/aspect/DockingAspect.java
View File

@ -26,8 +26,8 @@ import java.util.Date;
import java.util.HashMap;
import java.util.Map;
//@Component
//@Aspect
@Component
@Aspect
public class DockingAspect {
@Autowired
private DockSendMessageService sendMessageService;

1
src/main/java/com/zcloud/config/ShiroConfiguration.java
View File

@ -81,6 +81,7 @@ public class ShiroConfiguration {
filterChainMap.put("/openApi/**/**", "anon");
filterChainMap.put("/Api**/**", "anon");
filterChainMap.put("/api/**/**", "anon");
filterChainMap.put("/sync/**/**", "anon");
filterChainMap.put("/**", "authc");
factoryBean.setFilterChainDefinitionMap(filterChainMap);
}

19
src/main/java/com/zcloud/controller/map/MapController.java
View File

@ -16,6 +16,7 @@ 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;
@ -490,4 +491,22 @@ public class MapController extends BaseController {
map.put("varList", data);
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";
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;
}
}

75
src/main/java/com/zcloud/controller/sync/SyncAnemometerController.java Normal file
View File

@ -0,0 +1,75 @@
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.announcement.AnemometerMachineService;
import com.zcloud.service.announcement.AnemometerService;
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("/sync/anemometer")
public class SyncAnemometerController extends BaseController {
@Resource
private AnemometerMachineService anemometerMachineService;
@Resource
private AnemometerService anemometerService;
@RequestMapping(value = "/page")
public ReturnMap page(Page page) {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
page.setPd(pageData);
List<PageData> data = anemometerMachineService.getDatalistpage(page);
returnMap.put("varList", data);
returnMap.put("page", page);
return returnMap;
}
@RequestMapping(value = "/anemometerList")
public ReturnMap anemometerList(Page page) throws Exception{
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
List<PageData> data = anemometerMachineService.listAll(pageData);
returnMap.put("varList", data);
return returnMap;
}
@RequestMapping(value = "/getDetailByName")
public ReturnMap getDetailById() throws Exception{
ReturnMap returnMap = new ReturnMap();
PageData pd = this.getPageData();
PageData data = anemometerMachineService.getDetailById(pd);
returnMap.put("pd", data);
return returnMap;
}
@RequestMapping(value = "/edit")
public ReturnMap edit() throws Exception{
PageData pd = this.getPageData();
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;
}
}

490
src/main/java/com/zcloud/controller/sync/SyncMapController.java Normal file
View File

@ -0,0 +1,490 @@
package com.zcloud.controller.sync;
import com.alibaba.fastjson.JSONObject;
import com.zcloud.controller.base.BaseController;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.gatemachine.GateAreaMapper;
import com.zcloud.service.bus.CorpInfoService;
import com.zcloud.service.fireresources.CmtFireResourcesService;
import com.zcloud.service.gatemachine.GateCarMachineInfoService;
import com.zcloud.service.gatemachine.GateMachineInfoService;
import com.zcloud.service.gatemachine.GateMachineService;
import com.zcloud.service.gatemachine.GateVideoService;
import com.zcloud.service.keyProjects.VideoManagerService;
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.Jurisdiction;
import com.zcloud.util.ReturnMap;
import com.zcloud.util.Tools;
import com.zcloud.util.hk.HKUtil;
import com.zcloud.util.ys.YSUtil;
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 org.springframework.web.client.RestTemplate;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
/**
* 说明：实时地图
* 官网：www.zcloudchina.com
*/
@Controller
@RequestMapping("/sync/map")
public class SyncMapController extends BaseController {
@Autowired
private BiMapService biMapService;
@Autowired
private VideoManagerService videomanagerService;
@Autowired
private CorpInfoService corpInfoService;
@Autowired
private CmtFireResourcesService fireResourcesService;
@Autowired
private UsersService usersService;
// @Autowired
// private MeteorologicalinfoService meteorologicalinfoService;
@Autowired
private RestTemplate restTemplate;
@Autowired
private DepartmentService departmentService;
@Autowired
private GateMachineService gateMachineService;
@Autowired
private MapService mapService;
@Autowired
private YSUtil ysUtil;
@Autowired
private GateAreaMapper gateAreaMapper;
@Autowired
private GateMachineInfoService gateMachineInfoService;
@Autowired
private GateCarMachineInfoService gateCarMachineInfoService;
@Autowired
private GateVideoService gateVideoService;
/**
* 气象信息对接接口
*
* @return
* @throws Exception
*/
// @RequestMapping(value = "/tongMeteorologicalinfoList")
// @ResponseBody
// public ReturnMap tongMeteorologicalinfoList(@RequestBody List<PageData> list) throws Exception {
// ReturnMap r = new ReturnMap();
// r = meteorologicalinfoService.tongbuMeteorologicalinfo(list);
// return r;
// }
/**
* @Description: 闸机设备在线情况 只有人车闸机
* @Author: dearLin
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getOnlineGateEquipment")
@ResponseBody
public ReturnMap getOnlineGateEquipment() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
PageData value = gateMachineService.getOnlineGateMachine(pageData);
returnMap.put("pd", value);
return returnMap;
}
/**
* @Description: 闸机位置
* @Author: dearLin
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getGatePosition")
@ResponseBody
public ReturnMap getGatePosition() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
//
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
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/listGateMachine")
@ResponseBody
public ReturnMap listGateMachine() {
ReturnMap returnMap = new ReturnMap();
PageData pageData = this.getPageData();
List<PageData> dataList = new ArrayList<>();
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);
if (pageData.get("TYPE").equals("0")) {
pageData.put("eventTime",fstartDate);
dataList = gateMachineInfoService.findByIds(pageData);
}else {
pageData.put("CROSSTIME",fstartDate);
dataList = gateCarMachineInfoService.findByIds(pageData);
}
returnMap.put("varList", dataList);
return returnMap;
}
/**
* @Description: 闸机位置
* @Author: dearLin
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getPersonAndCarGateInAndOutCount")
@ResponseBody
public ReturnMap getPersonAndCarGateInAndOutCount() {
ReturnMap returnMap = new ReturnMap();
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;
}
/**
* @Description: 闸机位置
* @Author: dearLin
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getGatePositionCount")
@ResponseBody
public ReturnMap getGatePositionCount() throws Exception {
ReturnMap returnMap = new ReturnMap();
PageData data = new PageData();
PageData pageData = this.getPageData();
//人闸机
pageData.put("GATE_AREA_TYPE", 0);
List<PageData> personMachine = gateAreaMapper.getGatePosition(pageData);
data.put("personMachineCount", personMachine.size());
//车闸机
pageData.put("GATE_AREA_TYPE", 1);
List<PageData> carMachine = gateAreaMapper.getGatePosition(pageData);
data.put("carMachineCount", carMachine.size());
//摄像头数
List<PageData> camera = gateVideoService.listAllForMap(pageData);
data.put("cameraCount", camera.size());
returnMap.put("data", data);
return returnMap;
}
/**
* @Description: 闸机进出车、人的数量
* @Author: dearLin
* @Date: 2023/9/23/023 9:04
* @Param:
* @Return:
*/
@RequestMapping("/getGatesInAndOutNumById")
@ResponseBody
public ReturnMap getGatesInAndOutNumById() {
ReturnMap returnMap = new ReturnMap();
PageData pd = this.getPageData();
DateFormat dft = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
String fendDate = dft.format(new Date());
String fstartDate = "";
if (pd.getString("status").equals("0")) {
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();
fstartDate = dft.format(currDay);
} else {
Calendar now = Calendar.getInstance();
now.add(Calendar.MINUTE, -1);
Date before = now.getTime();
fstartDate = dft.format(before);
}
String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd);
Map<String, Object> doorComeAndOutInfo = new HashMap<>();
if (pd.getString("TYPE").equals("PERSON_MACHINE")){
doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo(gateIdsByGateAreaId, pd.getString("pageNo"), pd.getString("pageSize"),fstartDate,fendDate);
}else {
List<PageData> infoByArea = gateCarMachineInfoService.findInfoByArea(pd);
Map<String,Object> data = new HashMap<>();
data.put("list", infoByArea);
doorComeAndOutInfo.put("data", data);
doorComeAndOutInfo.put("code", 0);
doorComeAndOutInfo.put("msg", "success");
}
returnMap.put("doorInfo", doorComeAndOutInfo);
return returnMap;
}
// /**
// * @Description: 闸机进出车、人的数量
// * @Author: dearLin
// * @Date: 2023/9/23/023 9:04
// * @Param:
// * @Return:
// */
// @RequestMapping("/test")
// @ResponseBody
// public ReturnMap test() {
// ReturnMap returnMap = new ReturnMap();
// PageData pd = this.getPageData();
// String[] gateIdsByGateAreaId = mapService.getGateIdsByGateAreaId(pd);
// Map<String, Object> doorComeAndOutInfo = HKUtil.getDoorComeAndOutInfo();
// returnMap.put("doorInfo", doorComeAndOutInfo);
// return returnMap;
// }
/**
* 人员进出记录列表
*
* @return
*/
@RequestMapping("/getGatesInAndOutListById")
@ResponseBody
public ReturnMap getGatesInAndOutListById(Page page) {
ReturnMap returnMap = new ReturnMap();
PageData pd = this.getPageData();
page.setPd(pd);
List<PageData> recordAllList = gateMachineService.getPersonRecordListAllByEId(page);
returnMap.put("recordAllList", recordAllList);
return returnMap;
}
/**
* 获取人员、车辆进出记录
*
* @param
* @return
*/
@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;
}
@RequestMapping(value = "/getMachineTodayInOutCount")
@ResponseBody
public Object getMachineTodayInOutCount() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pd = this.getPageData();
List<PageData> value = gateMachineService.getTodayInOutCount(pd);
map.put("varList", value);
map.put("result", errInfo);
return map;
}
/**
* 获取人员、车辆进出记录
*
* @param
* @return
*/
@RequestMapping(value = "/getCurrentLocationOnline")
@ResponseBody
public Object getCurrentLocationOnline() {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
map.put("result", errInfo);
return map;
}
// 获取人员定位信息 根据定位卡编码
@RequestMapping(value = "/getPersonByCardNo")
@ResponseBody
public Object getPersonByCardNo() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
PageData value = usersService.getPersonByCardNo(pd);
map.put("result", "success");
map.put("pd", value);
return map;
}
/**
* 获取摄像头播放路径(曹妃甸使用）
*
* @throws Exception
*/
@RequestMapping(value = "/getHlsPath")
@ResponseBody
public Object getHlsPath() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
return map;
}
/**
* 查询人员在线及统计数据(曹妃甸使用）
*
* @throws Exception
*/
@RequestMapping(value = "/getCurrentPersonnelData")
@ResponseBody
public Object getCurrentPersonnelData() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pd = this.getPageData();
return map;
}
@RequestMapping("/getUserMapInfo")
@ResponseBody
public ReturnMap getUserMapInfo() throws Exception {
PageData pd = this.getPageData();
pd = usersService.findByCardNo(pd); //列出HotWorkApplicationDelayed列表
ReturnMap r = ReturnMap.ok();
r.put("pd", pd);
return r;
}
/**
* @Description: 消防管控
* @Author: dearLin
* @Date: 2023/9/20/020 15:30
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping("/getFireControl")
@ResponseBody
public Object getFireControl() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = this.getPageData();
LinkedList<PageData> value = biMapService.getFireControl(pageData);
for (PageData data : value) {
data.put("MAP_POINT_NAME", data.getString("NAME"));
}
map.put("result", "success");
map.put("varList", value);
return map;
}
/**
* @Description: 消防资源
* @Author: dearLin
* @Date: 2023/9/26/026 17:36
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping("/getFireResourceById")
@ResponseBody
public Object getFireResourceById() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
String errInfo = "success";
PageData pddata = this.getPageData();
//获取当前人的公司id
PageData pd = fireResourcesService.getDataById(pddata);
map.put("pd", pd);
map.put("result", errInfo);
return map;
}
/**
* @Description: 消防救援队
* @Author: dearLin
* @Date: 2023/9/20/020 15:30
* @Param: [] []
* @Return: java.lang.Object
*/
@RequestMapping("/getFireRescueTeam")
@ResponseBody
public Object getFireRescueTeam() throws Exception {
Map<String, Object> map = new HashMap<String, Object>();
PageData pageData = this.getPageData();
LinkedList<PageData> data = biMapService.getFireRescueTeam(pageData);
map.put("result", "success");
map.put("varList", data);
return map;
}
}

59
src/main/java/com/zcloud/controller/videoreceive/VideoReceiveController.java
View File

@ -3,8 +3,11 @@ package com.zcloud.controller.videoreceive;
import com.alibaba.fastjson.JSONArray;
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.receive.VideoReceiveService;
import com.zcloud.util.Jurisdiction;
import com.zcloud.util.Tools;
import com.zcloud.util.ys.YSUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
@ -64,6 +67,30 @@ public class VideoReceiveController extends BaseController {
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 = videoReceiveService.list(page); //列出VideoManager列表
map.put("varList", varList);
map.put("page", page);
map.put("result", errInfo);
return map;
}
/**列表
* @throws Exception
*/
@ -145,6 +172,22 @@ public class VideoReceiveController extends BaseController {
map.put("result", errInfo);
return map;
}
/**新增
* @param
* @throws Exception
*/
@RequestMapping(value="/addVideo")
@ResponseBody
public Object addVideo() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
videoReceiveService.edit(pd);
map.put("pd",pd);
map.put("result", errInfo);
return map;
}
/**新增
* @param
@ -198,6 +241,22 @@ public class VideoReceiveController extends BaseController {
return map;
}
/**删除
* @throws Exception
*/
@RequestMapping(value="/deleteGateVideo")
@ResponseBody
public Object deleteGateVideo() throws Exception{
Map<String,Object> map = new HashMap<String,Object>();
String errInfo = "success";
PageData pd = new PageData();
pd = this.getPageData();
pd.put("ISBINDING","0");
videoReceiveService.deleteGateVideo(pd);
map.put("result", errInfo);
return map;
}
@RequestMapping(value="/listAllCameraForMap")
@ResponseBody
public Object listAllCameraForMap() throws Exception{

4
src/main/java/com/zcloud/mapper/datasource/system/UsersMapper.java
View File

@ -309,6 +309,8 @@ public interface UsersMapper {
PageData countAllByArea(PageData pd);
PageData findByCardNo(PageData pd);
void updateCardNoByPhone(String phone, String cardId);
List<PageData> findEightsByUserId(PageData pd);
void updateCardNoByPhone(String phone, String devidno);
}

9
src/main/java/com/zcloud/mapper/datasource/videoreceive/VideoReceiveMapper.java
View File

@ -1,5 +1,6 @@
package com.zcloud.mapper.datasource.videoreceive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import org.apache.ibatis.annotations.Mapper;
@ -41,4 +42,12 @@ public interface VideoReceiveMapper {
PageData findVideoByResCode(PageData pd);
List<PageData> listAllForMap(PageData pd);
/**列表
* @param page
* @throws Exception
*/
List<PageData> datalistPage(Page page);
void deleteGateVideo(PageData pd);
}

4
src/main/java/com/zcloud/service/bus/impl/PositioningServiceImpl.java
View File

@ -43,9 +43,9 @@ public class PositioningServiceImpl implements PositioningService {
JSONObject jsonObject = jsonArray.getJSONObject(i);
if (
StringUtils.isNotBlank(jsonObject.getString("phone"))
&& StringUtils.isNotBlank(jsonObject.getString("cardId"))
&& StringUtils.isNotBlank(jsonObject.getString("devidno"))
) {
usersService.updateCardNoByPhone(jsonObject.getString("phone"), jsonObject.getString("cardId"));
usersService.updateCardNoByPhone(jsonObject.getString("phone"), jsonObject.getString("devidno"));
}
}
}

9
src/main/java/com/zcloud/service/receive/VideoReceiveService.java
View File

@ -1,5 +1,6 @@
package com.zcloud.service.receive;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import java.util.List;
@ -35,7 +36,15 @@ public interface VideoReceiveService {
*/
void deleteVideo(PageData pd);
void deleteGateVideo(PageData pd);
public PageData findVideoByResCode(PageData pd)throws Exception;
Object listAllForMap(PageData pd);
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception;
}

13
src/main/java/com/zcloud/service/receive/impl/VideoReceiveServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.zcloud.service.receive.impl;
import com.zcloud.entity.Page;
import com.zcloud.entity.PageData;
import com.zcloud.mapper.datasource.videoreceive.VideoReceiveMapper;
import com.zcloud.service.receive.VideoReceiveService;
@ -46,6 +47,11 @@ public class VideoReceiveServiceImpl implements VideoReceiveService {
videoReceiveMapper.deleteVideo(pd);
}
@Override
public void deleteGateVideo(PageData pd) {
videoReceiveMapper.deleteGateVideo(pd);
}
@Override
public PageData findVideoByResCode(PageData pd) throws Exception {
return videoReceiveMapper.findVideoByResCode(pd);
@ -61,4 +67,11 @@ public class VideoReceiveServiceImpl implements VideoReceiveService {
return map;
}
/**列表
* @param page
* @throws Exception
*/
public List<PageData> list(Page page)throws Exception{
return videoReceiveMapper.datalistPage(page);
}
}

1
src/main/java/com/zcloud/service/system/UsersService.java
View File

@ -368,6 +368,7 @@ public interface UsersService {
PageData findByCardNo(PageData pd) throws Exception;
List<PageData> findEightsByUserId(PageData pd);
void updateCardNoByPhone(String phone, String cardId);
}

9
src/main/java/com/zcloud/service/system/impl/UsersServiceImpl.java
View File

@ -505,8 +505,13 @@ public class UsersServiceImpl implements UsersService {
}
@Override
public void updateCardNoByPhone(String phone, String cardId) {
usersMapper.updateCardNoByPhone(phone, cardId);
public List<PageData> findEightsByUserId(PageData pd) {
return usersMapper.findEightsByUserId(pd);
}
@Override
public void updateCardNoByPhone(String phone, String devidno) {
usersMapper.updateCardNoByPhone(phone, devidno);
}
@Override
public Object getCurrentLocation(PageData pd) {

5
src/main/java/com/zcloud/util/PositioningScheduled.java
View File

@ -17,7 +17,7 @@ public class PositioningScheduled {
@Autowired
private PositioningService positioningService;
@Scheduled(cron ="0/10 * * * * ? ")
@Scheduled(cron ="0/10 * * * * ?")
public void syncPositioning(){
try {
System.out.println("==========定时发送人员定位信息==========");
@ -28,7 +28,8 @@ public class PositioningScheduled {
}
}
@Scheduled(cron ="0 0 2 * * ? ") // 凌晨两点
// @Scheduled(cron ="0 0 2 * * ? ") // 凌晨两点
@Scheduled(cron = "0/10 * * * * ?")
public void syncCardNo(){
try {
System.out.println("==========定时同步定位卡号==========");

9
src/main/java/com/zcloud/util/SaveMachineInfo.java
View File

@ -23,7 +23,8 @@ public class SaveMachineInfo {
@Autowired
private GateCarMachineInfoService gateCarMachineInfoService;
@Scheduled(cron ="*/30 * * * * ? ")
@Scheduled(cron ="0 0 0/1 * * ?")
// @Scheduled(cron ="*/5 * * * * ?")
public void scheduled() {
//存储人员进出记录信息
savePersonMachineInfo();
@ -38,7 +39,8 @@ public class SaveMachineInfo {
String fendDate = dft.format(new Date())+"+08:00";
String fstartDate = "";
Calendar now = Calendar.getInstance();
now.add(Calendar.SECOND, -30);
now.add(Calendar.HOUR, -1);
// now.add(Calendar.SECOND, -30);
Date before = now.getTime();
fstartDate = dft.format(before)+"+08:00";
int pageNo = 1; //第几页
@ -82,7 +84,8 @@ public class SaveMachineInfo {
String fendDate = dft.format(new Date())+"+08:00";
String fstartDate = "";
Calendar now = Calendar.getInstance();
now.add(Calendar.SECOND, -30);
now.add(Calendar.HOUR, -1);
// now.add(Calendar.SECOND, -30);
Date before = now.getTime();
fstartDate = dft.format(before)+"+08:00";
int pageNo = 1; //第几页

2
src/main/resources/mybatis/datasource/anemometer/AnemometerMachineMapper.xml
View File

@ -70,7 +70,7 @@
<!--查询所有 -->
<select id="listAll" parameterType="pd" resultType="pd">
select
<include refid="Field"></include>,FNAME as MAP_POINT_NAME,FNAME as NAME
<include refid="Field"></include>,FNAME as MAP_POINT_NAME,FNAME as NAME,'风速仪' as EQUIPMENTTYPE_NAME
from
<include refid="tableName"></include>
</select>

2
src/main/resources/mybatis/datasource/gatemachine/GateAreaMapper.xml
View File

@ -47,7 +47,7 @@
</insert>
<select id="getDatalistPage" resultType="com.zcloud.entity.PageData">
select <include refid="filed"></include>, CONCAT_WS('--', f.LATITUDE,f.LONGITUDE) LONGTITUDEANDLATITUDE,
(select count(1) from BUS_GATEVIDEO v where v.GATE_AREA_ID = f.GATE_AREA_ID and v.ISDELETE = '0') as VIDEO_COUNT,
(select count(1) from bus_videoreceive v where v.GATE_AREA_ID = f.GATE_AREA_ID and v.ISDELETE = '0') as VIDEO_COUNT,
(select count(1) from mk_gate_machine m where m.GATE_AREA_ID = f.GATE_AREA_ID and m.ISDELETE = '0') as GATE_COUNT
from
<include refid="table"></include> f where f.ISDELETE = 0

4
src/main/resources/mybatis/datasource/gatemachine/GateVideoMapper.xml
View File

@ -234,9 +234,7 @@
where f.ISDELETE = '0'
and f.LATITUDE is not null
and f.LONGITUDE is not null
<if test="CORPINFO_ID != null and CORPINFO_ID != ''"><!-- 关键词检索 -->
and f.CORPINFO_ID=#{CORPINFO_ID}
</if>
and f.CORPINFO_ID is not null
</select>
<!-- 消防点位已定位 -->

159
src/main/resources/mybatis/datasource/system/UsersMapper.xml
View File

@ -1421,17 +1421,170 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.NAME as POST_NAME
from
`qa-cmt-prevention`.sys_user u
left join `qa-cmt-prevention`oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
left join `qa-cmt-prevention`sys_post p on p.POST_ID = u.POST_ID
left join `qa-cmt-prevention`.oa_department d on d.DEPARTMENT_ID = u.DEPARTMENT_ID
left join `qa-cmt-prevention`.sys_post p on p.POST_ID = u.POST_ID
where
u.CARDNO = #{CARDNO}
</select>
<select id="findEightsByUserId" parameterType="pd" resultType="pd">
select * from (SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.HOTWORK_ID ID,
f.CHECK_NO WORK_NUMBER,
'动火作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_hotwork f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '8'
and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.ELECTRICITY_ID ID,
f.CHECK_NO WORK_NUMBER,
'用电作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_electricity f
WHERE
f.ISDELETE = '0'
AND f.APPLY_STATUS != '5'
AND FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.blindboard_ID ID,
f.CHECK_NO WORK_NUMBER,
'盲板作业' WORK_TYPE,
f.NAME as WORK_CONTENT
FROM
bus_blindboard f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.HIGHWORK_ID ID,
f.CHECK_NO WORK_NUMBER,
'高处作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_highwork f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
and FIND_IN_SET(#{USER_ID},PROJECT_MANAGER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.confinedspace_ID ID,
f.CHECK_NO WORK_NUMBER,
'有限空间作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_confinedspace f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.hoisting_ID ID,
f.CHECK_NO WORK_NUMBER,
'吊装作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_hoisting f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
and FIND_IN_SET(#{USER_ID},WORK_USER_IDS)
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.BREAKGROUND_ID ID,
f.CHECK_NO WORK_NUMBER,
'破土作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_breakground f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
) f UNION ALL
SELECT
f.ID,
f.WORK_NUMBER,
f.WORK_TYPE,
f.WORK_CONTENT
FROM
(
SELECT
f.CUTROAD_ID ID,
f.CHECK_NO WORK_NUMBER,
'断路作业' WORK_TYPE,
f.WORK_CONTENT
FROM
bus_cutroad f
WHERE
f.ISDELETE = '0'
and f.APPLY_STATUS != '6'
) f) AS A
order by WORK_TYPE
</select>
<update id="updateCardNoByPhone">
update sys_user
set CARDNO = #{cardId}
set CARDNO = #{devidno}
where USERNAME = #{phone}
</update>

54
src/main/resources/mybatis/datasource/videoreceive/VideoReceiveMapper.xml
View File

@ -77,14 +77,36 @@
update
<include refid="tableName"></include>
set
ResCode = #{ResCode},
OrgCode = #{OrgCode},
ResName = #{ResName},
ResType = #{ResType},
ResSubType = #{ResSubType},
ISDELETE = #{ISDELETE},
LONGITUDE = #{LONGITUDE},
LATITUDE = #{LATITUDE},
<if test="ResCode != null and ResCode != ''"><!-- 门禁区域 -->
ResCode=#{ResCode},
</if>
<if test="OrgCode != null and OrgCode != ''"><!-- 门禁区域 -->
OrgCode=#{OrgCode},
</if>
<if test="ResName != null and ResName != ''"><!-- 门禁区域 -->
ResName=#{ResName},
</if>
<if test="ResType != null and ResType != ''"><!-- 门禁区域 -->
ResType=#{ResType},
</if>
<if test="ResSubType != null and ResSubType != ''"><!-- 门禁区域 -->
ResSubType=#{ResSubType},
</if>
<if test="ISDELETE != null and ISDELETE != ''"><!-- 门禁区域 -->
ISDELETE=#{ISDELETE},
</if>
<if test="LONGITUDE != null and LONGITUDE != ''"><!-- 门禁区域 -->
LONGITUDE=#{LONGITUDE},
</if>
<if test="LATITUDE != null and LATITUDE != ''"><!-- 门禁区域 -->
LATITUDE=#{LATITUDE},
</if>
<if test="ISBINDING != null and ISBINDING != ''"><!-- 门禁区域 -->
ISBINDING=#{ISBINDING},
</if>
<if test="GATE_AREA_ID != null and GATE_AREA_ID != ''"><!-- 门禁区域 -->
GATE_AREA_ID=#{GATE_AREA_ID},
</if>
VIDEORECEIVE_ID = VIDEORECEIVE_ID
where
VIDEORECEIVE_ID = #{VIDEORECEIVE_ID}
@ -107,10 +129,13 @@
from
<include refid="tableName"></include> f
where 1=1
<if test="pd.GATE_AREA_ID != null and pd.GATE_AREA_ID != ''"><!-- 门禁区域 -->
and f.GATE_AREA_ID=#{pd.GATE_AREA_ID}
</if>
<if test="pd.KEYWORDS != null and pd.KEYWORDS != ''"><!-- 关键词检索 -->
and
(
f.NAME LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
f.ResName LIKE CONCAT(CONCAT('%', #{pd.KEYWORDS}),'%')
)
</if>
</select>
@ -156,6 +181,17 @@
VIDEORECEIVE_ID = #{VIDEORECEIVE_ID}
</delete>
<update id="deleteGateVideo" parameterType="pd">
update
<include refid="tableName"></include>
set
GATE_AREA_ID = #{GATE_AREA_ID},
ISBINDING = #{ISBINDING},
VIDEORECEIVE_ID = VIDEORECEIVE_ID
where
VIDEORECEIVE_ID = #{VIDEORECEIVE_ID}
</update>
<!-- 清空坐标 -->
<select id="findVideoByResCode" parameterType="pd" resultType="pd">
SELECT