diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java index ddef18f..a4069d7 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/CallPolice.java @@ -42,4 +42,13 @@ public class CallPolice extends EntityWithId { @ApiModelProperty("设备ID") private String deviceId; + + @ApiModelProperty("信息ID") + private String msgId; + + @ApiModelProperty("信息类型") + private String msgType; + + @ApiModelProperty("信息内容") + private String content; } diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java index 6b644d1..b09d8d7 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java @@ -54,4 +54,7 @@ public class Device extends EntityWithId { @ApiModelProperty("位置") private String position; + + @ApiModelProperty("序列号") + private String deviceSerial; } diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java new file mode 100644 index 0000000..9e01de8 --- /dev/null +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceImage.java @@ -0,0 +1,66 @@ +package com.yxt.supervise.monitor.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "有ID的实体", description = "有ID的实体") +@TableName("y_device_image") +public class DeviceImage extends EntityWithId { + // `id`使用继承的 + + @ApiModelProperty("记录创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间 + + @ApiModelProperty("备注说明") + private String remarks; // 备注说明 + + @ApiModelProperty("名称") + private String name; // 名称 + + @ApiModelProperty("类型") + private String type; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("信息状态") + private String state; + + @ApiModelProperty("是否删除") + private String isDelete; + + @ApiModelProperty("修改时间") + private String modifyTime; + + @ApiModelProperty("是否可用") + private String isEnable; + + @ApiModelProperty("创建人") + private String createBySid; + + @ApiModelProperty("更新人") + private String updateBySid; + + @ApiModelProperty("验证码") + private String vCode; + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("序列号") + private String deviceSerial; + + @ApiModelProperty("拍照前") + private String imgBefore; + + @ApiModelProperty("拍照后") + private String imgAfter; +} diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java index f666ee5..6291711 100644 --- a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/DeviceLog.java @@ -48,4 +48,7 @@ public class DeviceLog extends EntityWithId { @ApiModelProperty("日志内容") private String content; + + @ApiModelProperty("消息ID") + private String msgId; } diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/MessageInfo.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/MessageInfo.java new file mode 100644 index 0000000..6b62f44 --- /dev/null +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/MessageInfo.java @@ -0,0 +1,54 @@ +package com.yxt.supervise.monitor.api.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.domain.EntityWithId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel(value = "有ID的实体", description = "有ID的实体") +@TableName("y_message_info") +public class MessageInfo extends EntityWithId { + // `id`使用继承的 + + @ApiModelProperty("记录创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") + private Date createTime = new Date(); // 记录创建时间 + + @ApiModelProperty("备注说明") + private String remarks; // 备注说明 + + @ApiModelProperty("信息状态") + private String state; + + @ApiModelProperty("是否删除") + private String isDelte; + + @ApiModelProperty("修改时间") + private String modifyTime; + + @ApiModelProperty("是否可用") + private String isEnable; + + @ApiModelProperty("创建人") + private String createBySid; + + @ApiModelProperty("更新人") + private String updateBySid; + + @ApiModelProperty("设备ID") + private String deviceId; + + @ApiModelProperty("信息ID") + private String msgId; + + @ApiModelProperty("信息类型") + private String msgType; + + @ApiModelProperty("信息内容") + private String content; +} diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/vo/MessageVo.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/vo/MessageVo.java new file mode 100644 index 0000000..39c3307 --- /dev/null +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/vo/MessageVo.java @@ -0,0 +1,26 @@ +package com.yxt.supervise.monitor.api.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * @author Exrickx + */ +@Data +public class MessageVo { + + @ApiModelProperty(value = "消息ID,每条消息的唯一ID,消费者可根据此ID进行去重处理") + private String msgId; + + @ApiModelProperty(value = "消息类型") + private String msgType; + + @ApiModelProperty(value = "消息内容") + private String content; + + @ApiModelProperty(value = "消息发送到消息通道时的时间戳") + private String timestamp; + +} diff --git a/yxt-supervise-monitor-biz/pom.xml b/yxt-supervise-monitor-biz/pom.xml index dbc75af..1e5eec9 100644 --- a/yxt-supervise-monitor-biz/pom.xml +++ b/yxt-supervise-monitor-biz/pom.xml @@ -84,6 +84,11 @@ 2.4 jdk15 + + + org.projectlombok + lombok + diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java similarity index 99% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java index efcbb8c..3cb6481 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/CallRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.monitor.biz.controller; +package com.yxt.supervise.monitor.biz.callpolice; import com.alibaba.fastjson.JSONObject; import com.yxt.common.core.result.ResultBean; diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YCallPoliceMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceMapper.java similarity index 71% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YCallPoliceMapper.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceMapper.java index 8490a44..80110c1 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YCallPoliceMapper.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceMapper.java @@ -1,14 +1,17 @@ -package com.yxt.supervise.monitor.biz.mapper; +package com.yxt.supervise.monitor.biz.callpolice; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.supervise.monitor.api.entity.CallPolice; import com.yxt.supervise.monitor.api.entity.Device; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; @Mapper public interface YCallPoliceMapper extends BaseMapper { IPage getDevicePage(); + + Integer getByMsgId(@Param("msgId") String msgId); } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceRest.java new file mode 100644 index 0000000..8b10c16 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceRest.java @@ -0,0 +1,30 @@ +package com.yxt.supervise.monitor.biz.callpolice; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.vo.PageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@Api(tags = "报警控制器") +@RestController("com.yxt.supervise.monitor.biz.callpolice.YCallPoliceRest") +@RequestMapping("/callPolice") +public class YCallPoliceRest { + + @Autowired + private YCallPoliceService yCallPoliceService; + + + @ApiOperation("分页获取报警列表") + @GetMapping("/getCallPolicePage") + public ResultBean getCallPolicePage(@RequestParam Map searchVo, + @ModelAttribute PageVo pageVo) { + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yCallPoliceService.getCallPolicePage(searchVo, pageVo)); + return rb; + } + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceService.java new file mode 100644 index 0000000..3b395bd --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YCallPoliceService.java @@ -0,0 +1,55 @@ +package com.yxt.supervise.monitor.biz.callpolice; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.entity.CallPolice; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.api.entity.DeviceLog; +import com.yxt.supervise.monitor.api.entity.MessageInfo; +import com.yxt.supervise.monitor.api.vo.MessageVo; +import com.yxt.supervise.monitor.api.vo.PageVo; +import com.yxt.supervise.monitor.biz.devicelog.YDeviceLogMapper; +import com.yxt.supervise.monitor.biz.messageInfo.YMessageInfoMapper; +import com.yxt.supervise.monitor.biz.scheduled.SyncService; +import com.yxt.supervise.monitor.biz.util.HttpUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class YCallPoliceService extends ServiceImpl { + + public IPage getCallPolicePage(Map searchVo, PageVo pageVo) { + IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(); + page.setSize(pageVo.getSize()); + page.setCurrent((long) pageVo.getCurrent()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (StrUtil.isNotBlank(searchVo.get("name"))) { + queryWrapper.like("name", searchVo.get("name")); + } + if (StrUtil.isNotBlank(searchVo.get("type"))) { + queryWrapper.eq("type", searchVo.get("type")); + } + queryWrapper.eq("isDelete", 0); + + IPage athleteBOIPage = null; + try { + athleteBOIPage = baseMapper.selectPage(page, queryWrapper); + } catch (Exception e) { + System.out.println(e); + athleteBOIPage = null; + } + return athleteBOIPage; + } +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YDeviceImageMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YDeviceImageMapper.xml new file mode 100644 index 0000000..4a6d4d6 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/YDeviceImageMapper.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceLogRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceLogRest.java deleted file mode 100644 index 7b50fe3..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceLogRest.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.yxt.supervise.monitor.biz.controller; - -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.biz.service.YDeviceLogService; -import com.yxt.supervise.monitor.biz.service.YDeviceService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.util.Map; - -@Api(tags = "设备日志控制器") -@RestController("com.yxt.supervise.monitor.biz.controller.YDeviceLogRest") -@RequestMapping("/deviceLog") -public class YDeviceLogRest { - - @Autowired - private YDeviceLogService yDeviceLogService; - - - @ApiOperation("分页获取设备日志列表") - @GetMapping("/getDevicePage") - public String getDevicePage(@RequestParam Map searchVo) { - yDeviceLogService.getDevicePage(searchVo); - return null; - } - - -} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/DemoBaseentityMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YDeviceImageMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/DemoBaseentityMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YDeviceImageMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/DemoIdentityMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YDeviceImageMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/DemoIdentityMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YDeviceImageMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java similarity index 73% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java index 4c16601..a46526f 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceMapper.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceMapper.java @@ -1,14 +1,11 @@ -package com.yxt.supervise.monitor.biz.mapper; +package com.yxt.supervise.monitor.biz.device; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.supervise.monitor.api.demoidentity.DemoIdentity; import com.yxt.supervise.monitor.api.entity.Device; import org.apache.ibatis.annotations.Mapper; @Mapper public interface YDeviceMapper extends BaseMapper { - - IPage getDevicePage(); } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java similarity index 75% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java index e4fb03e..a824f4b 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YDeviceRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java @@ -1,27 +1,17 @@ -package com.yxt.supervise.monitor.biz.controller; +package com.yxt.supervise.monitor.biz.device; -import com.alibaba.fastjson.JSONObject; import com.yxt.common.core.result.ResultBean; -import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.vo.PageVo; -import com.yxt.supervise.monitor.biz.demobaseentity.DemoBaseentityService; -import com.yxt.supervise.monitor.biz.service.YDeviceService; -import com.yxt.supervise.monitor.biz.util.HttpUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.io.IOException; -import java.security.KeyManagementException; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.util.HashMap; import java.util.Map; @Api(tags = "设备控制器") -@RestController("com.yxt.supervise.monitor.biz.controller.YDeviceRest") +@RestController("com.yxt.supervise.monitor.biz.device.YDeviceRest") @RequestMapping("/device") public class YDeviceRest { @@ -68,4 +58,10 @@ public class YDeviceRest { rb.setData(yDeviceService.getById(id)); return rb; } + + @ApiOperation("删除设备") + @GetMapping("/removeDeviceByIds") + public ResultBean removeDeviceByIds(String ids) { + return yDeviceService.removeDeviceByIds(ids); + } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java similarity index 52% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index 7acb9b7..f175b98 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceServiceImpl.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java @@ -1,4 +1,4 @@ -package com.yxt.supervise.monitor.biz.service.impl; +package com.yxt.supervise.monitor.biz.device; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; @@ -9,8 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.yxt.common.core.result.ResultBean; import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.vo.PageVo; -import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper; -import com.yxt.supervise.monitor.biz.service.YDeviceService; +import com.yxt.supervise.monitor.biz.scheduled.SyncService; import com.yxt.supervise.monitor.biz.util.HttpUtils; import org.springframework.stereotype.Service; import springfox.documentation.spring.web.json.Json; @@ -20,13 +19,11 @@ import java.util.HashMap; import java.util.Map; @Service -public class IYDeviceServiceImpl extends ServiceImpl implements YDeviceService { +public class YDeviceService extends ServiceImpl { @Resource YDeviceMapper yDeviceMapper; - - @Override public IPage getDevicePage(Map searchVo, PageVo pageVo) { IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(); page.setSize(pageVo.getSize()); @@ -52,38 +49,57 @@ public class IYDeviceServiceImpl extends ServiceImpl impl return athleteBOIPage; } - @Override public ResultBean createDevice(Device device) { ResultBean rb = ResultBean.fireSuccess(); + return rb.setData(this.save(device)); - // 先给海康接口添加设备 如果失败直接返回失败 - String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/create"; - Map param = new HashMap<>(); - param.put("deviceSerial", "Q16362484"); // 设备序列号 string - param.put("groupNo", "A1181"); // 组编号 string - param.put("validateCode", device.getVCode()); // 验证码 string - String paramJson = JSONObject.toJSONString(param); - String result = HttpUtils.sendPostJson(url, paramJson, "35ad3e80-1de4-4477-827e-0473320cf644"); - JSONObject jsonObject = JSONObject.parseObject(result); - if ("200".equals(jsonObject.get("code").toString())) { - return rb.setData(this.save(device)); - } else { - rb.setData(jsonObject.get("message")); - return rb; - } + +// // 先给海康接口添加设备 如果失败直接返回失败 +// String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/create"; +// Map param = new HashMap<>(); +// param.put("deviceSerial", device.getDeviceSerial()); // 设备序列号 string +// param.put("groupNo", "A1181"); // 组编号 string +// param.put("validateCode", device.getVCode()); // 验证码 string +// String paramJson = JSONObject.toJSONString(param); +// String result = HttpUtils.sendPostJson(url, paramJson, SyncService.haiKangToken); +// JSONObject jsonObject = JSONObject.parseObject(result); +// if ("200".equals(jsonObject.get("code").toString())) { +// return rb.setData(this.save(device)); +// } else { +// rb.setData(jsonObject.get("message")); +// return rb; +// } } - @Override public ResultBean createDeviceGroup(Device device) { ResultBean rb = ResultBean.fireFail(); - String url = "https://api2.hik-cloud.com/api/v1/open/basic/groups/create"; Map param = new HashMap<>(); - param.put("groupName", "测试添加"); // 设备序列号 string + param.put("groupName", "设备组"); // 设备序列号 string param.put("groupNo", "A1181"); // 组编号 string String paramJson = JSONObject.toJSONString(param); - String result = HttpUtils.sendPostJson(url, paramJson, "35ad3e80-1de4-4477-827e-0473320cf644"); + String result = HttpUtils.sendPostJson(url, paramJson, SyncService.haiKangToken); rb.setData(result); return rb; } + + + public ResultBean removeDeviceByIds(String idStr) { + ResultBean rb = ResultBean.fireFail(); + String[] ids = idStr.split(","); + + for (String id : ids) { + String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/delete"; + Map param = new HashMap<>(); + param.put("deviceSerial", id); // 设备序列号 string +// String paramJson = JSONObject.toJSONString(param); + String result = HttpUtils.sendPostMap(url, param, SyncService.haiKangToken); + JSONObject jsonObject = JSONObject.parseObject(result); + if ("200".equals(jsonObject.get("code").toString())) { + rb.setData(this.removeById(id)); + } + } + + return rb; + } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java new file mode 100644 index 0000000..00f0c18 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageMapper.java @@ -0,0 +1,12 @@ +package com.yxt.supervise.monitor.biz.deviceImage; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.api.entity.DeviceImage; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface YDeviceImageMapper extends BaseMapper { + IPage getDevicePage(); +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java new file mode 100644 index 0000000..4d3042b --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageRest.java @@ -0,0 +1,33 @@ +package com.yxt.supervise.monitor.biz.deviceImage; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.vo.PageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@Api(tags = "设备控制器") +@RestController("com.yxt.supervise.monitor.biz.deviceImage.YDeviceImageRest") +@RequestMapping("/deviceImage") +public class YDeviceImageRest { + + @Autowired + private YDeviceImageService yDeviceService; + + + @ApiOperation("分页获取设备抓拍列表") + @GetMapping("/getDeviceImagePage") + public ResultBean getDeviceImagePage(@RequestParam Map searchVo, + @ModelAttribute PageVo pageVo) { + yDeviceService.getDeviceImageBefore(); + ResultBean rb = ResultBean.fireSuccess(); +// rb.setData(yDeviceService.getDeviceImagePage(searchVo, pageVo)); + return rb; + } + + + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java new file mode 100644 index 0000000..2ae9a1d --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/deviceImage/YDeviceImageService.java @@ -0,0 +1,62 @@ +package com.yxt.supervise.monitor.biz.deviceImage; + +import cn.hutool.core.util.StrUtil; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.api.entity.DeviceImage; +import com.yxt.supervise.monitor.api.vo.PageVo; +import com.yxt.supervise.monitor.biz.scheduled.SyncService; +import com.yxt.supervise.monitor.biz.util.HttpUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.Map; + +@Service +public class YDeviceImageService extends ServiceImpl { + + + public IPage getDeviceImagePage(Map searchVo, PageVo pageVo) { + IPage page = new Page<>(); + page.setSize(pageVo.getSize()); + page.setCurrent((long) pageVo.getCurrent()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (StrUtil.isNotBlank(searchVo.get("name"))) { + queryWrapper.like("name", searchVo.get("name")); + } + if (StrUtil.isNotBlank(searchVo.get("type"))) { + queryWrapper.eq("type", searchVo.get("type")); + } + queryWrapper.eq("isDelete", 0); + + IPage athleteBOIPage = null; + try { + athleteBOIPage = baseMapper.selectPage(page, queryWrapper); + } catch (Exception e) { + System.out.println(e); + athleteBOIPage = null; + } + return athleteBOIPage; + } + + + public void getDeviceImageBefore() { + String url = "https://api2.hik-cloud.com/api/v1/open/basic/channels/actions/capture"; + Map param = new HashMap<>(); + param.put("deviceSerial", "Q16362484"); // 设备序列号 string + param.put("channelNo", "1"); // 组编号 string + String paramJson = JSONObject.toJSONString(param); + String result = HttpUtils.sendPostJson(url, paramJson, SyncService.haiKangToken); + JSONObject jsonObject = JSONObject.parseObject(result); + System.out.println(jsonObject); + } + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceLogMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogMapper.java similarity index 55% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceLogMapper.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogMapper.java index 2677f89..c7c05d8 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/mapper/YDeviceLogMapper.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogMapper.java @@ -1,14 +1,10 @@ -package com.yxt.supervise.monitor.biz.mapper; +package com.yxt.supervise.monitor.biz.devicelog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.yxt.supervise.monitor.api.entity.Device; import com.yxt.supervise.monitor.api.entity.DeviceLog; import org.apache.ibatis.annotations.Mapper; @Mapper public interface YDeviceLogMapper extends BaseMapper { - - IPage getDevicePage(); } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogRest.java new file mode 100644 index 0000000..bc5f1f1 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogRest.java @@ -0,0 +1,31 @@ +package com.yxt.supervise.monitor.biz.devicelog; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.vo.PageVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@Api(tags = "设备日志控制器") +@RestController("com.yxt.supervise.monitor.biz.devicelog.YDeviceLogRest") +@RequestMapping("/deviceLog") +public class YDeviceLogRest { + + @Autowired + private YDeviceLogService yDeviceLogService; + + + @ApiOperation("分页获取设备日志列表") + @GetMapping("/getDeviceLogPage") + public ResultBean getDeviceLogPage(@RequestParam Map searchVo, + @ModelAttribute PageVo pageVo) { + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yDeviceLogService.getDeviceLogPage(searchVo, pageVo)); + return rb; + } + + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogService.java new file mode 100644 index 0000000..a1b8baa --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/devicelog/YDeviceLogService.java @@ -0,0 +1,41 @@ +package com.yxt.supervise.monitor.biz.devicelog; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.supervise.monitor.api.entity.CallPolice; +import com.yxt.supervise.monitor.api.entity.DeviceLog; +import com.yxt.supervise.monitor.api.vo.PageVo; +import org.springframework.stereotype.Service; + +import java.util.Map; + +@Service +public class YDeviceLogService extends ServiceImpl { + + public IPage getDeviceLogPage(Map searchVo, PageVo pageVo) { + IPage page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(); + page.setSize(pageVo.getSize()); + page.setCurrent((long) pageVo.getCurrent()); + + QueryWrapper queryWrapper = new QueryWrapper<>(); + + if (StrUtil.isNotBlank(searchVo.get("name"))) { + queryWrapper.like("name", searchVo.get("name")); + } + if (StrUtil.isNotBlank(searchVo.get("type"))) { + queryWrapper.eq("type", searchVo.get("type")); + } + queryWrapper.eq("isDelete", 0); + + IPage athleteBOIPage = null; + try { + athleteBOIPage = baseMapper.selectPage(page, queryWrapper); + } catch (Exception e) { + System.out.println(e); + athleteBOIPage = null; + } + return athleteBOIPage; + } +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoMapper.java new file mode 100644 index 0000000..f64d13a --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoMapper.java @@ -0,0 +1,15 @@ +package com.yxt.supervise.monitor.biz.messageInfo; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.supervise.monitor.api.entity.CallPolice; +import com.yxt.supervise.monitor.api.entity.Device; +import com.yxt.supervise.monitor.api.entity.MessageInfo; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface YMessageInfoMapper extends BaseMapper { + + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YCallPoliceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoRest.java similarity index 58% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YCallPoliceRest.java rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoRest.java index 81fe581..1cf5dac 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/controller/YCallPoliceRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoRest.java @@ -1,8 +1,5 @@ -package com.yxt.supervise.monitor.biz.controller; +package com.yxt.supervise.monitor.biz.messageInfo; -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.biz.service.YCallPoliceService; -import com.yxt.supervise.monitor.biz.service.YDeviceService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -14,18 +11,18 @@ import org.springframework.web.bind.annotation.RestController; import java.util.Map; @Api(tags = "报警控制器") -@RestController("com.yxt.supervise.monitor.biz.controller.YCallPoliceRest") -@RequestMapping("/callPolice") -public class YCallPoliceRest { +@RestController("com.yxt.supervise.monitor.biz.messageInfo.YMessageInfoRest") +@RequestMapping("/messageInfo") +public class YMessageInfoRest { @Autowired - private YCallPoliceService yCallPoliceService; + private YMessageInfoService yCallPoliceService; @ApiOperation("分页获取报警列表") @GetMapping("/getDevicePage") public String getDevicePage(@RequestParam Map searchVo) { - yCallPoliceService.getDevicePage(searchVo); +// yCallPoliceService.getDevicePage(searchVo); return null; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoService.java new file mode 100644 index 0000000..a2ead38 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/messageInfo/YMessageInfoService.java @@ -0,0 +1,83 @@ +package com.yxt.supervise.monitor.biz.messageInfo; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.supervise.monitor.api.entity.CallPolice; +import com.yxt.supervise.monitor.api.entity.DeviceLog; +import com.yxt.supervise.monitor.api.entity.MessageInfo; +import com.yxt.supervise.monitor.api.vo.MessageVo; +import com.yxt.supervise.monitor.biz.callpolice.YCallPoliceMapper; +import com.yxt.supervise.monitor.biz.devicelog.YDeviceLogMapper; +import com.yxt.supervise.monitor.biz.scheduled.SyncService; +import com.yxt.supervise.monitor.biz.util.HttpUtils; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Service +public class YMessageInfoService extends ServiceImpl { + + @Resource + YCallPoliceMapper yCallPoliceMapper; + + @Resource + YDeviceLogMapper yDeviceLogMapper; + + + public List saveMessageInfo() { + String url = "https://api2.hik-cloud.com/api/v1/mq/consumer/messages"; + Map param = new HashMap<>(); + param.put("consumerId", SyncService.haiKangMessageConsumer); // 消费者id string + String result = HttpUtils.sendPostMap(url, param, SyncService.haiKangToken); + JSONObject jsonObject = JSONObject.parseObject(result); + if ("200".equals(jsonObject.get("code").toString())) { + JSONArray jsonArray = (JSONArray) jsonObject.get("data"); + String jsonStr = jsonArray.toJSONString(); + List messageList = JSONObject.parseArray(jsonStr, MessageVo.class); + for (MessageVo messageVo : messageList) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("msgId", messageVo.getMsgId()); + int msgCount = this.count(wrapper); + if (msgCount < 1) { + // 先添加到消息表 + MessageInfo messageInfo = new MessageInfo(); + messageInfo.setMsgId(messageVo.getMsgId()); + messageInfo.setMsgType(messageVo.getMsgType()); + messageInfo.setContent(messageVo.getContent()); + messageInfo.setCreateTime(new Date()); + this.save(messageInfo); + + // 判断是日志信息，添加到日志表 + if ("open_device_onoffline".equals(messageVo.getMsgType()) // 设备上下线消息 + || "open_device_drop".equals(messageVo.getMsgType()) // 设备坠落事件 + ) { + DeviceLog deviceLog = new DeviceLog(); + deviceLog.setMsgId(messageVo.getMsgId()); + deviceLog.setContent(messageVo.getContent()); + deviceLog.setCreateTime(new Date()); + yDeviceLogMapper.insert(deviceLog); + } + + + // 判断是报警信息，添加到报警表 + if ("open_device_alarm".equals(messageVo.getMsgType())) { + // 判断是日志信息，添加到日志表 + CallPolice callPolice = new CallPolice(); + callPolice.setMsgId(messageVo.getMsgId()); + callPolice.setMsgType(messageVo.getMsgType()); + callPolice.setContent(messageVo.getContent()); + callPolice.setCreateTime(new Date()); + yCallPoliceMapper.insert(callPolice); + } + } + } + } + return null; + } +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java index acb4575..7cf68bf 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncService.java @@ -1,60 +1,77 @@ package com.yxt.supervise.monitor.biz.scheduled; +import com.alibaba.fastjson.JSONObject; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.biz.callpolice.YCallPoliceService; +import com.yxt.supervise.monitor.biz.messageInfo.YMessageInfoService; +import com.yxt.supervise.monitor.biz.util.HttpUtils; +import lombok.extern.slf4j.Slf4j; +import org.apache.http.conn.ssl.SSLConnectionSocketFactory; +import org.apache.http.ssl.SSLContextBuilder; +import org.apache.http.ssl.TrustStrategy; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import javax.annotation.PostConstruct; import javax.annotation.Resource; +import java.security.KeyManagementException; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import lombok.extern.slf4j.Slf4j; + +import java.util.HashMap; +import java.util.Map; @Service +@Slf4j public class SyncService { -// @Scheduled(fixedDelay = 1000 * 60 * 120) //间隔120分钟执行一次 -// public void pushPersonHospital() { -// try { -// System.out.println("推送老人出入院记录和评估照片"); -// iCityPlatformService.pushPersonHospital(); -// } catch (Exception ex) { -// log.error("推送老人出入院记录和评估照片出错:" + ex); -// } -// } -// -// -// /** -// * 删除三个月前的日志 (每月1号执行一次) -// */ -// @Async -// @Scheduled(cron = "0 0 0 1 * ?") -// public void removeLog() { -// try { -// System.out.println("删除三个月前的日志"); -// iCityPlatformService.removeLog(); -// } catch (Exception ex) { -// log.error("删除三个月前的日志出错:" + ex); + @Autowired + YMessageInfoService yMessageInfoService; + + public static String haiKangToken = ""; + public static String haiKangMessageConsumer = ""; + + @PostConstruct + public void getMessageConsumer() { + // 先登录 + String loginUrl = "https://api2.hik-cloud.com/oauth/token"; + Map tokenParam = new HashMap<>(); + tokenParam.put("client_id", "e8e655dfcb154be6962f270fe375edc1"); // 客户端ID String + tokenParam.put("client_secret", "3ca20239398c4b86b27c6a080d8345e1"); //访问密钥 String + tokenParam.put("grant_type", "client_credentials"); //认证模式 String 目前仅支持client_credentials + String tokenResult = HttpUtils.sendPostMap(loginUrl, tokenParam, ""); + JSONObject tokenObject = JSONObject.parseObject(tokenResult); + SyncService.haiKangToken = tokenObject.get("access_token").toString(); + + +// String consumerUrl = "https://api2.hik-cloud.com/api/v1/mq/consumer/group1"; +// Map consumerParam = new HashMap<>(); +// String consumerResult = HttpUtils.sendPostMap(consumerUrl, consumerParam, SyncService.haiKangToken); +// JSONObject consumerObject = JSONObject.parseObject(consumerResult); +// if ("200".equals(consumerObject.get("code").toString())) { +// JSONObject dataObject = (JSONObject) consumerObject.get("data"); +// SyncService.haiKangMessageConsumer = dataObject.get("consumerId").toString(); +// System.out.println("Get MessageConsumer Success"); +// log.info("Get MessageConsumer Success"); +// } else { +// System.out.println("Get MessageConsumer Error"); +// log.error("Get MessageConsumer Error"); // } -// } -// - - @Async - @Scheduled(fixedDelay = 1000 * 20 * 1) //间隔20秒一次 -// @Scheduled(cron = "0 10 9 * * ?") - public void pushEmail() { - try { - System.out.println(1111); - } catch (Exception ex) { - ex.printStackTrace(); - } } // @Async -// @Scheduled(fixedDelay = 1000 * 60 * 1) //间隔1分钟执行一次 -//// @Scheduled(cron = "0 10 9 * * ?") -// public void tempPush() { +// @Scheduled(fixedDelay = 1000 * 20 * 1) //20秒拉取一次报警信息 +// public void pushEmail() { // try { -// iCityPlatformService.pushEmail(); +// yMessageInfoService.saveMessageInfo(); // } catch (Exception ex) { -// log.error("临时同步" + ex); // ex.printStackTrace(); // } // } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YCallPoliceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YCallPoliceService.java deleted file mode 100644 index cf06383..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YCallPoliceService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.monitor.biz.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.yxt.supervise.monitor.api.entity.CallPolice; -import com.yxt.supervise.monitor.api.entity.Device; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public interface YCallPoliceService extends IService { - - IPage getDevicePage(Map searchVo); - - - String createDevice(Device device); -} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceLogService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceLogService.java deleted file mode 100644 index 7088155..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceLogService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.yxt.supervise.monitor.biz.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.api.entity.DeviceLog; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public interface YDeviceLogService extends IService { - - IPage getDevicePage(Map searchVo); - - - String createDevice(Device device); -} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java deleted file mode 100644 index 9d6829f..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/YDeviceService.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.yxt.supervise.monitor.biz.service; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.IService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.common.core.result.ResultBean; -import com.yxt.supervise.monitor.api.demoidentity.DemoIdentity; -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.api.vo.PageVo; -import com.yxt.supervise.monitor.biz.demoidentity.DemoIdentityMapper; -import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper; -import com.yxt.supervise.monitor.biz.service.impl.IYDeviceServiceImpl; -import org.springframework.stereotype.Service; - -import java.util.Map; - -@Service -public interface YDeviceService extends IService { - - IPage getDevicePage(Map searchVo, PageVo pageVo); - - ResultBean createDevice(Device device); - - ResultBean createDeviceGroup(Device device); -} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYCallPoliceServiceImpl.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYCallPoliceServiceImpl.java deleted file mode 100644 index 57d7689..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYCallPoliceServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.supervise.monitor.biz.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.supervise.monitor.api.entity.CallPolice; -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.biz.mapper.YCallPoliceMapper; -import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper; -import com.yxt.supervise.monitor.biz.service.YCallPoliceService; -import com.yxt.supervise.monitor.biz.service.YDeviceService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Map; - -@Service -public class IYCallPoliceServiceImpl extends ServiceImpl implements YCallPoliceService { - - @Resource YDeviceMapper yDeviceMapper; - - - @Override - public IPage getDevicePage(Map searchVo){ - return yDeviceMapper.getDevicePage(); - } - - @Override - public String createDevice(Device device){ - return null; - } -} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceLogServiceImpl.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceLogServiceImpl.java deleted file mode 100644 index 3fa0b9e..0000000 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/service/impl/IYDeviceLogServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.yxt.supervise.monitor.biz.service.impl; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.yxt.supervise.monitor.api.entity.Device; -import com.yxt.supervise.monitor.api.entity.DeviceLog; -import com.yxt.supervise.monitor.biz.mapper.YDeviceLogMapper; -import com.yxt.supervise.monitor.biz.mapper.YDeviceMapper; -import com.yxt.supervise.monitor.biz.service.YDeviceLogService; -import com.yxt.supervise.monitor.biz.service.YDeviceService; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import java.util.Map; - -@Service -public class IYDeviceLogServiceImpl extends ServiceImpl implements YDeviceLogService { - - @Resource YDeviceMapper yDeviceMapper; - - - @Override - public IPage getDevicePage(Map searchVo){ - return yDeviceMapper.getDevicePage(); - } - - @Override - public String createDevice(Device device){ - return null; - } -} diff --git a/yxt-supervise-monitor-biz/src/main/resources/mapper/DemoIdentityMapper.xml b/yxt-supervise-monitor-biz/src/main/resources/mapper/YDeviceImageMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/resources/mapper/DemoIdentityMapper.xml rename to yxt-supervise-monitor-biz/src/main/resources/mapper/YDeviceImageMapper.xml