From d48af4d520a108a3a6b7388ce4970c04ab2f7c82 Mon Sep 17 00:00:00 2001 From: yangzongjia Date: Thu, 8 Jun 2023 17:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E8=A7=86=E9=A2=91=E5=8F=AF=E5=9B=9E?= =?UTF-8?q?=E6=94=BE=20=E6=91=84=E5=83=8F=E5=A4=B4=E7=BB=91=E5=AE=9A?= =?UTF-8?q?=E5=9C=A8nvr=E4=B8=8B=20nvr=E7=BB=91=E5=AE=9A=E5=9C=A8=E4=BB=93?= =?UTF-8?q?=E5=BA=93=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supervise/monitor/api/entity/Device.java | 14 +++- .../monitor/api/entity/DeviceLog.java | 2 +- .../monitor/api/entity/MessageInfo.java | 2 +- .../supervise/monitor/api/entity/YTask.java | 68 ++++++++++++++++++ ...YDeviceImageMapper.xml => YTaskMapper.xml} | 0 ...YDeviceImageMapper.xml => YTaskMapper.xml} | 0 .../monitor/biz/device/YDeviceRest.java | 8 +-- .../monitor/biz/device/YDeviceService.java | 10 ++- .../biz/deviceImage/YDeviceImageRest.java | 72 ++++++++++++++++++- .../biz/deviceImage/YDeviceImageService.java | 22 ++++-- .../monitor/biz/scheduled/SyncService.java | 8 ++- .../monitor/biz/scheduled/SyncUpdater.java | 70 +++++++++++++++++- .../monitor/biz/task/YTaskMapper.java | 11 +++ .../supervise/monitor/biz/task/YTaskRest.java | 28 ++++++++ .../monitor/biz/task/YTaskService.java | 29 ++++++++ .../src/main/resources/task-config.properties | 4 +- 16 files changed, 326 insertions(+), 22 deletions(-) create mode 100644 yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java rename yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/{YDeviceImageMapper.xml => YTaskMapper.xml} (100%) rename yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/{YDeviceImageMapper.xml => YTaskMapper.xml} (100%) create mode 100644 yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskMapper.java create mode 100644 yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskRest.java create mode 100644 yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskService.java 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 2be0233..3e30b54 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 @@ -25,7 +25,7 @@ public class Device extends EntityWithId { @ApiModelProperty("名称") private String name; // 名称 - @ApiModelProperty("类型") + @ApiModelProperty("设备类型(1摄像头 2电子围栏 3门禁 4机器人 5nvr)") private String type; @ApiModelProperty("状态") @@ -66,4 +66,16 @@ public class Device extends EntityWithId { @ApiModelProperty("组号") private String channelNo; + + @ApiModelProperty("nvr序列号") + private String nvrSerial; + + @ApiModelProperty("nvr验证码") + private String nvrCode; + + @ApiModelProperty("nvrID") + private Integer nvrId; + + @ApiModelProperty("仓库ID") + private Integer ckId; } 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 6291711..65b2141 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 @@ -29,7 +29,7 @@ public class DeviceLog extends EntityWithId { private String state; @ApiModelProperty("是否删除") - private String isDelte; + private String isDelete; @ApiModelProperty("修改时间") private String modifyTime; 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 index 6b62f44..0ef4abc 100644 --- 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 @@ -26,7 +26,7 @@ public class MessageInfo extends EntityWithId { private String state; @ApiModelProperty("是否删除") - private String isDelte; + private String isDelete; @ApiModelProperty("修改时间") private String modifyTime; diff --git a/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java new file mode 100644 index 0000000..18d8f7b --- /dev/null +++ b/yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/YTask.java @@ -0,0 +1,68 @@ +package com.yxt.supervise.monitor.api.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +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_task") +public class YTask 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 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 second; + + @ApiModelProperty("分") + private String divide; + + @ApiModelProperty("时") + private String hour; + + @ApiModelProperty("天") + private String day; + + @ApiModelProperty("月") + private String month; + + @ApiModelProperty("年") + private String year; + + @TableField(exist = false) + @ApiModelProperty("多少秒") + private String seconds; +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YDeviceImageMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YTaskMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YDeviceImageMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demobaseentity/YTaskMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YDeviceImageMapper.xml b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YTaskMapper.xml similarity index 100% rename from yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YDeviceImageMapper.xml rename to yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/demoidentity/YTaskMapper.xml diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java index 1450e21..858417f 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java @@ -38,11 +38,11 @@ public class YDeviceRest { } - @ApiOperation("获取摄像头列表") - @GetMapping("/getSxtList") - public ResultBean getSxtList() { + @ApiOperation("获取指定设备列表") + @GetMapping("/getOtherList") + public ResultBean getOtherList(String type) { ResultBean rb = ResultBean.fireSuccess(); - rb.setData(yDeviceService.getSxtList()); + rb.setData(yDeviceService.getOtherList(type)); return rb; } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java index 2a283b2..8e60934 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java @@ -58,10 +58,10 @@ public class YDeviceService extends ServiceImpl { } - public List getSxtList() { + public List getOtherList(String type) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("type", "1"); //1 摄像头 + queryWrapper.eq("type", type); //1 摄像头 queryWrapper.eq("isDelete", 0); List athleteBOIPage = null; @@ -74,7 +74,6 @@ public class YDeviceService extends ServiceImpl { return athleteBOIPage; } - public IPage getDeviceStatusPage(Map searchVo, PageVo pageVo) { String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/list?groupNo=A1181&pageNo=" + pageVo.getCurrent() + "&pageSize=" + pageVo.getSize(); String result = ""; @@ -113,6 +112,11 @@ public class YDeviceService extends ServiceImpl { public ResultBean createDevice(Device device) { ResultBean rb = ResultBean.fireSuccess(); + if("1".equals(device.getType())){ //摄像头 + Device nvrDevice = this.getById(device.getNvrId()); + device.setNvrCode(nvrDevice.getVCode()); + device.setNvrSerial(nvrDevice.getSerialNumber()); + } return rb.setData(this.save(device)); // // 先给海康接口添加设备 如果失败直接返回失败 // String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/create"; 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 index 09aa4c3..72dca24 100644 --- 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 @@ -1,8 +1,11 @@ package com.yxt.supervise.monitor.biz.deviceImage; +import cn.hutool.core.date.DateUtil; import com.alibaba.fastjson.JSONObject; 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.device.YDeviceService; import com.yxt.supervise.monitor.biz.scheduled.SyncService; import com.yxt.supervise.monitor.biz.util.HttpUtils; import io.swagger.annotations.Api; @@ -22,6 +25,10 @@ public class YDeviceImageRest { private YDeviceImageService yDeviceImageService; + @Autowired + private YDeviceService yDeviceService; + + @ApiOperation("分页获取设备抓拍列表") @GetMapping("/getDeviceImagePage") public ResultBean getDeviceImagePage(@RequestParam Map searchVo, @@ -41,9 +48,9 @@ public class YDeviceImageRest { } - @ApiOperation("单条获取抓拍信息") - @GetMapping("/getShiPinByChannelNo") - public ResultBean getShiPinByChannelNo(@RequestParam String channelNo) { + @ApiOperation("质物检测获取正常视频流") + @GetMapping("/getShiPinNormalByChannelNo") + public ResultBean getShiPinByChannelNo(@RequestParam String channelNo) { String spToken = ""; String url = "https://api2.hik-cloud.com/v1/ezviz/account/info"; try { @@ -70,4 +77,63 @@ public class YDeviceImageRest { } + @ApiOperation("获取回放视频流") + @GetMapping("/getVedioPcLiveById") + public ResultBean getVedioPcLiveById(@RequestParam String id) { + Device device = yDeviceService.getById(id); + String spToken = ""; + String url = "https://api2.hik-cloud.com/v1/ezviz/account/info"; + try { + String result = HttpUtils.sendGet(url, SyncService.haiKangToken); + JSONObject jsonObject = JSONObject.parseObject(result); + JSONObject dataJson = (JSONObject) jsonObject.get("data"); + String appKey = dataJson.get("appKey").toString(); + spToken = dataJson.get("token").toString(); + } catch (Exception e) { + System.out.println(e); + } + + String spUrl = "https://open.ys7.com/console/jssdk/pc.html?url=ezopen://" + + device.getNvrCode() + "@open.ys7.com/" + + device.getNvrSerial() + "/" + + device.getChannelNo() + ".hd.live&accessToken=" + + spToken + "&themeId=pcLive"; + + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(spUrl); + return rb; + } + + + @ApiOperation("获取回放视频流") + @GetMapping("/getVedioPcRecById") + public ResultBean getVedioPcRecById(@RequestParam String id) { + Device device = yDeviceService.getById(id); + String spToken = ""; + String url = "https://api2.hik-cloud.com/v1/ezviz/account/info"; + try { + String result = HttpUtils.sendGet(url, SyncService.haiKangToken); + JSONObject jsonObject = JSONObject.parseObject(result); + JSONObject dataJson = (JSONObject) jsonObject.get("data"); + String appKey = dataJson.get("appKey").toString(); + spToken = dataJson.get("token").toString(); + } catch (Exception e) { + System.out.println(e); + } + + String beginTime = DateUtil.format(DateUtil.yesterday(), "yyyyMMdd") + "235959"; + String endTime = DateUtil.format(DateUtil.date(), "yyyyMMdd") + "235959"; + + String spUrl = "https://open.ys7.com/console/jssdk/pc.html?url=ezopen://" + + device.getNvrCode() + "@open.ys7.com/" + + device.getNvrSerial() + "/" + + device.getChannelNo() + ".rec&accessToken=" + + spToken + "&begin=" + beginTime + "&end=" + endTime + "&themeId=pcRec"; + + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(spUrl); + 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 index 30a1ee2..bb018f2 100644 --- 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 @@ -16,6 +16,7 @@ import com.yxt.supervise.monitor.biz.scheduled.SyncService; import com.yxt.supervise.monitor.biz.util.HttpUtils; import com.yxt.supervise.monitor.biz.util.ImageCompareUtil; import com.yxt.supervise.monitor.biz.util.ImageDownloadUtil; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -28,6 +29,8 @@ import java.util.Map; @Service public class YDeviceImageService extends ServiceImpl { + @Value("${image.folder}") + private String filePath; public IPage getDeviceImagePage(Map searchVo, PageVo pageVo) { IPage page = new Page<>(); @@ -49,6 +52,15 @@ public class YDeviceImageService extends ServiceImpl athleteBOIPage = null; try { athleteBOIPage = baseMapper.selectPage(page, queryWrapper); + athleteBOIPage.getRecords().forEach(oo->{ + String replaceBeforePath = oo.getImgBefore(); + replaceBeforePath = replaceBeforePath.replaceAll("\\\\", "\\\\\\\\"); + oo.setImgBefore(replaceBeforePath); + + String replaceAfterPath = oo.getImgAfter(); + replaceAfterPath = replaceAfterPath.replaceAll("\\\\", "\\\\\\\\"); + oo.setImgAfter(replaceAfterPath); + }); } catch (Exception e) { System.out.println(e); athleteBOIPage = null; @@ -73,7 +85,7 @@ public class YDeviceImageService extends ServiceImpl 0) { deviceImage.setSimilarity(similarSplit[0] + "%"); @@ -110,8 +122,8 @@ public class YDeviceImageService extends ServiceImpl consumerParam = new HashMap<>(); // String consumerResult = HttpUtils.sendPostMap(consumerUrl, consumerParam, SyncService.haiKangToken); @@ -65,6 +70,7 @@ public class SyncService { // System.out.println("Get MessageConsumer Error"); // log.error("Get MessageConsumer Error"); // } + } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncUpdater.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncUpdater.java index fd04776..7848333 100644 --- a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncUpdater.java +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/scheduled/SyncUpdater.java @@ -1,22 +1,90 @@ package com.yxt.supervise.monitor.biz.scheduled; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.entity.YTask; +import com.yxt.supervise.monitor.biz.task.YTaskService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.PostConstruct; +import java.util.List; + @Slf4j @RestController @RequiredArgsConstructor public class SyncUpdater { + @Autowired + YTaskService yTaskService; + private final SyncDetection scheduleTask; @GetMapping("/updateCron") - public void updateCron(String cron) { + public ResultBean updateCron(YTask yTask) { + // 0/30 * * * * ? + String cron = parseCronStr(yTask); log.info("new cron :{}", cron); scheduleTask.setCron(cron); + + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yTaskService.refreshTask(yTask)); + return rb; + } + + @PostConstruct + public void initTask() { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("status", "1"); + List list = yTaskService.list(wrapper); + if (list.size() > 0) { + String cron = parseCronStr(list.get(0)); + scheduleTask.setCron(cron); + } + } + + private String parseCronStr(YTask yTask) { + String cron = ""; + if (yTask.getSecond() != null) { + cron += yTask.getSecond() + " "; + } else { + cron += "* "; + } + + if (yTask.getDivide() != null) { + cron += yTask.getDivide() + " "; + } else { + cron += "* "; + } + + if (yTask.getHour() != null) { + cron += yTask.getHour() + " "; + } else { + cron += "* "; + } + + if (yTask.getDay() != null) { + cron += yTask.getDay() + " "; + } else { + cron += "* "; + } + + if (yTask.getMonth() != null) { + cron += yTask.getMonth() + " "; + } else { + cron += "* "; + } + + if (yTask.getYear() != null) { + cron += yTask.getYear(); + } else { + cron += "?"; + } + return cron; } } diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskMapper.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskMapper.java new file mode 100644 index 0000000..dc0d3c3 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskMapper.java @@ -0,0 +1,11 @@ +package com.yxt.supervise.monitor.biz.task; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.supervise.monitor.api.entity.DeviceLog; +import com.yxt.supervise.monitor.api.entity.YTask; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface YTaskMapper extends BaseMapper { + +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskRest.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskRest.java new file mode 100644 index 0000000..b9f1073 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskRest.java @@ -0,0 +1,28 @@ +package com.yxt.supervise.monitor.biz.task; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.supervise.monitor.api.entity.YTask; +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.task.YTaskRest") +@RequestMapping("/yTask") +public class YTaskRest { + + @Autowired + YTaskService yTaskService; + + @ApiOperation("手动修改定时") + @GetMapping("/refreshTask") + public ResultBean refreshTask(YTask yTask) { + ResultBean rb = ResultBean.fireSuccess(); + rb.setData(yTaskService.refreshTask(yTask)); + return rb; + } +} diff --git a/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskService.java b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskService.java new file mode 100644 index 0000000..d9de250 --- /dev/null +++ b/yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/task/YTaskService.java @@ -0,0 +1,29 @@ +package com.yxt.supervise.monitor.biz.task; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.supervise.monitor.api.entity.DeviceLog; +import com.yxt.supervise.monitor.api.entity.YTask; +import com.yxt.supervise.monitor.api.vo.PageVo; +import com.yxt.supervise.monitor.biz.scheduled.SyncDetection; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Map; + +@Service +public class YTaskService extends ServiceImpl { + + public boolean refreshTask(YTask yTask) { + UpdateWrapper wrapper = new UpdateWrapper<>(); + wrapper.set("status", "0"); + this.update(wrapper); + + yTask.setStatus("1"); + return this.save(yTask); + } + +} diff --git a/yxt-supervise-monitor-biz/src/main/resources/task-config.properties b/yxt-supervise-monitor-biz/src/main/resources/task-config.properties index 722947e..91e7a93 100644 --- a/yxt-supervise-monitor-biz/src/main/resources/task-config.properties +++ b/yxt-supervise-monitor-biz/src/main/resources/task-config.properties @@ -1,3 +1,3 @@ -scheduleTime.cron=0/30 * * * * ? +scheduleTime.cron=0/59 0/2 * * * ? -scheduleTime.timer=15000 \ No newline at end of file +image.folder=D:\\resources\\download\\ \ No newline at end of file