视频中心数量对接，

首页视频监控、电子围栏对接
设备类别及状态进行操作功能时好时不好修复
添加任务信息模块

yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/Device.java

@@ -92,4 +92,8 @@ public class Device extends EntityWithId {
     @TableField(exist = false)
     @ApiModelProperty("维修状态")
     private String maintenanceCount;
+
+    @TableField(exist = false)
+    @ApiModelProperty("统计数量")
+    private String total;
 }

yxt-supervise-monitor-api/src/main/java/com/yxt/supervise/monitor/api/entity/YInfo.java

@@ -0,0 +1,50 @@
+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_info")
+public class YInfo 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 isDelete;
+
+    @ApiModelProperty("修改时间")
+    private String modifyTime;
+
+    @ApiModelProperty("是否可用")
+    private String isEnable;
+
+    @ApiModelProperty("创建人")
+    private String createBySid;
+
+    @ApiModelProperty("更新人")
+    private String updateBySid;
+
+    @ApiModelProperty("信息内容")
+    private String content;
+
+    @ApiModelProperty("消息标题")
+    private String title;
+
+}

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/callpolice/CallRest.java

@@ -8,7 +8,7 @@ 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.messaging.simp.SimpMessagingTemplate;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -171,10 +171,13 @@ public class CallRest {
 
     @ApiOperation("临时测试")
     @GetMapping("/callTempFunc")
-    public void callTempFunc() throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
+    public String callTempFunc() throws NoSuchAlgorithmException, KeyStoreException, IOException, KeyManagementException {
+//        SimpMessagingTemplate simpMessagingTemplate = new SimpMessagingTemplate();
 //        String errorMessage = "这是一条新的报警消息。";
-//        messagingTemplate.convertAndSendToUser("ee533a0427b74da79d307a77c989c2d1", "/queue/subscribe", errorMessage);
-//        messagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息");
+//        simpMessagingTemplate.convertAndSend("/topic/subscribe", "您收到了新的系统消息");
+        String url = "https://api2.hik-cloud.com/api/v1/open/basic/devices/get?deviceSerial=L20560109";
+        String result = HttpUtils.sendGet(url, "35ad3e80-1de4-4477-827e-0473320cf644");
+        return result;
     }
 
 }

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceRest.java

@@ -45,9 +45,9 @@ public class YDeviceRest {
 
     @ApiOperation("获取指定设备列表")
     @GetMapping("/getOtherList")
-    public ResultBean getOtherList(String type,String ckId) {
+    public ResultBean getOtherList(String type, String ckId) {
         ResultBean rb = ResultBean.fireSuccess();
-        rb.setData(yDeviceService.getOtherList(type,ckId));
+        rb.setData(yDeviceService.getOtherList(type, ckId));
         return rb;
     }
 
@@ -60,6 +60,14 @@ public class YDeviceRest {
         return rb;
     }
 
+    @ApiOperation("获取状态数量")
+    @GetMapping("/getStatusCount")
+    public ResultBean getStatusCount(String deviceType, String statusType) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yDeviceService.getStatusCount(deviceType, statusType));
+        return rb;
+    }
+
     @ApiOperation("添加设备组")
     @PostMapping("/createDeviceGroup")
     public ResultBean createDeviceGroup(Device device) {

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/device/YDeviceService.java

@@ -63,11 +63,11 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     }
 
 
-    public List<Device> getOtherList(String type,String ckId) {
+    public List<Device> getOtherList(String type, String ckId) {
         QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
 
         queryWrapper.eq("type", type);   //1 摄像头
-        if(ckId != null){
+        if (ckId != null) {
             queryWrapper.eq("ckId", ckId);
         }
         queryWrapper.eq("isDelete", 0);
@@ -83,6 +83,37 @@ public class YDeviceService extends ServiceImpl<YDeviceMapper, Device> {
     }
 
 
+    public Map<String, String> getStatusCount(String deviceType, String statusType) {
+        Map<String, String> map = new HashMap<>();
+        QueryWrapper<Device> queryWrapper = new QueryWrapper<>();
+
+        if (deviceType != null) {
+            queryWrapper.eq("type", deviceType);
+        }
+        queryWrapper.eq("isDelete", 0);
+        queryWrapper.isNotNull("status");
+        queryWrapper.select("status", "count(status) as total");
+        queryWrapper.groupBy("status");
+
+        List<Device> athleteBOIPage = null;
+        try {
+            athleteBOIPage = this.list(queryWrapper);
+        } catch (Exception e) {
+            System.out.println(e);
+            athleteBOIPage = null;
+        }
+
+        for (Device device : athleteBOIPage) {
+            if ("0".equals(device.getStatus())) {   // 离线
+                map.put("offline", device.getTotal());
+            } else if ("1".equals(device.getStatus())) { // 在线
+                map.put("online", device.getTotal());
+            }
+        }
+        return map;
+    }
+
+
     public List<WareHouse> getWareHouseList() {
 
         List<WareHouse> athleteBOIPage = null;

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/info/YInfoMapper.java

@@ -0,0 +1,11 @@
+package com.yxt.supervise.monitor.biz.info;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.supervise.monitor.api.entity.DeviceLog;
+import com.yxt.supervise.monitor.api.entity.YInfo;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface YInfoMapper extends BaseMapper<YInfo> {
+
+}

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/info/YInfoRest.java

@@ -0,0 +1,39 @@
+package com.yxt.supervise.monitor.biz.info;
+
+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.info.YInfoRest")
+@RequestMapping("/yInfo")
+public class YInfoRest {
+
+    @Autowired
+    private YInfoService yInfoService;
+
+
+    @ApiOperation("分页获取消息列表")
+    @GetMapping("/getInfoPage")
+    public ResultBean getInfoPage(@RequestParam Map<String, String> searchVo,
+                                  @ModelAttribute PageVo pageVo) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yInfoService.getInfoPage(searchVo, pageVo));
+        return rb;
+    }
+
+    @ApiOperation("单条获取消息")
+    @GetMapping("/getInfoById")
+    public ResultBean getInfoById(String id) {
+        ResultBean rb = ResultBean.fireSuccess();
+        rb.setData(yInfoService.getById(id));
+        return rb;
+    }
+
+
+}

yxt-supervise-monitor-biz/src/main/java/com/yxt/supervise/monitor/biz/info/YInfoService.java

@@ -0,0 +1,38 @@
+package com.yxt.supervise.monitor.biz.info;
+
+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.DeviceLog;
+import com.yxt.supervise.monitor.api.entity.YInfo;
+import com.yxt.supervise.monitor.api.vo.PageVo;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+@Service
+public class YInfoService extends ServiceImpl<YInfoMapper, YInfo> {
+
+    public IPage<YInfo> getInfoPage(Map<String, String> searchVo, PageVo pageVo) {
+        IPage<YInfo> page = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>();
+        page.setSize(pageVo.getSize());
+        page.setCurrent((long) pageVo.getCurrent());
+
+        QueryWrapper<YInfo> queryWrapper = new QueryWrapper<>();
+
+        if (StrUtil.isNotBlank(searchVo.get("content"))) {
+            queryWrapper.like("content", searchVo.get("content"));
+        }
+        queryWrapper.eq("isDelete", 0);
+
+        IPage<YInfo> athleteBOIPage = null;
+        try {
+            athleteBOIPage = baseMapper.selectPage(page, queryWrapper);
+        } catch (Exception e) {
+            System.out.println(e);
+            athleteBOIPage = null;
+        }
+        return athleteBOIPage;
+    }
+}

yxt-supervise-monitor-biz/src/main/resources/application-test.yml

@@ -30,6 +30,6 @@ image:
 
 scheduleTime:
   cron: 0 59 * * * ?
-  folder: D:\resources\download
-#  folder: /root/huirong/monitor-java/imagesDownload
+#  folder: D:\resources\download
+  folder: /root/huirong/monitor-java/imagesDownload
 

yxt-supervise-monitor-biz/src/main/resources/application.yml

@@ -3,8 +3,8 @@ spring:
     name: yxt-supervise-monitor
   profiles:
 #    active: devv
-#    active: test
-    active: pro
+    active: test
+#    active: pro
   messages:
     # 国际化资源文件路径
     basename: i18n/messages