Forráskód Böngészése

设备管理-通信模块相关接口上传

jichaobo 3 éve
szülő
commit
a7b44564ad

+ 75 - 17
fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceController.java

@@ -2,23 +2,20 @@ package com.bizmatics.controller.web;
 
 
 import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.core.util.DateUtils;
-import com.bizmatics.model.Device;
-import com.bizmatics.model.DeviceList;
-import com.bizmatics.model.HtAnalogData;
-import com.bizmatics.model.TemplateData;
+import com.bizmatics.model.*;
+import com.bizmatics.model.vo.CorrespondDeviceListVO;
+import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.DeviceService;
+import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
 import lombok.Synchronized;
 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.RequestMapping;
-
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -46,35 +43,37 @@ public class DeviceController {
 
     /**
      * 查询设备总数
+     *
      * @param startTime
      * @param endTime
      * @return
      */
     @GetMapping("/count")
-    public ApiResult<DeviceCountVO> count(@RequestParam Date startTime, @RequestParam Date endTime){
-        return ApiResult.success(deviceService.selectDeviceCount(startTime,endTime));
+    public ApiResult<DeviceCountVO> count(@RequestParam Date startTime, @RequestParam Date endTime) {
+        return ApiResult.success(deviceService.selectDeviceCount(startTime, endTime));
     }
 
 
     /**
      * 查询不同类型的设备数量
+     *
      * @param site 站点id
      * @return
      */
     @GetMapping("/deviceTypeCount")
-    public ApiResult<DeviceCountVO> selectDeviceCountByType(@RequestParam Integer site){
+    public ApiResult<DeviceCountVO> selectDeviceCountByType(@RequestParam Integer site) {
         return ApiResult.success(deviceService.selectDeviceCountByType(site));
     }
 
     @GetMapping("/test")
-    public List<String> test(){
+    public List<String> test() {
         List<Device> list = deviceMapper.list(1, null, null, null, null, null);
         List<String> list1 = new ArrayList<>();
-        for (Device device:list) {
+        for (Device device : list) {
             long l = System.currentTimeMillis();
             List<HtAnalogData> list2 = htAnalogDataMapper.list(DateUtils.addYears(new Date(), -10), new Date(), device.getDeviceCode());
             long e = System.currentTimeMillis();
-            log.info("一个站点的数据获取时间"+(e-l));
+            log.info("一个站点的数据获取时间" + (e - l));
         }
         return list1;
     }
@@ -87,14 +86,73 @@ public class DeviceController {
 
     /**
      * 数据管理-同比分析报表-右侧设备查询
-     * @param siteId 站点ID
+     *
+     * @param siteId     站点ID
      * @param deviceType 设备类型 默认1、用电设备
      * @return
      */
     @GetMapping("dataManagementDeviceList")
     public ApiResult<List<Device>> dataManagementDeviceList(@RequestParam int siteId,
                                                             @RequestParam(value = "deviceType", required = false, defaultValue = "1") int deviceType) {
-        return ApiResult.success(deviceService.dataManagementDeviceList(siteId,deviceType));
+        return ApiResult.success(deviceService.dataManagementDeviceList(siteId, deviceType));
+    }
+
+
+    /**
+     * 设备管理-通信设备-新增
+     * @param correspondDeviceVOT
+     * @return
+     */
+    @GetMapping("correspondDeviceAdd")
+    public ApiResult<Void> correspondDeviceAdd(@RequestBody CorrespondDeviceVOT correspondDeviceVOT) {
+        deviceService.correspondDeviceAdd(correspondDeviceVOT);
+        return ApiResult.success();
+    }
+
+    /**
+     * 设备管理-通信设备-修改
+     * @param correspondDeviceVOT
+     * @return
+     */
+    @GetMapping("correspondDeviceUpdate")
+    public ApiResult<Void> correspondDeviceUpdate(@RequestBody CorrespondDeviceVOT correspondDeviceVOT) {
+        deviceService.correspondDeviceUpdate(correspondDeviceVOT);
+        return ApiResult.success();
+    }
+
+    /**
+     * 设备管理-通信设备-注销
+     * @param id
+     * @return
+     */
+    @GetMapping("correspondDeviceDel")
+    public ApiResult<Void> correspondDeviceDel(@RequestParam int id) {
+        deviceService.correspondDeviceDel(id);
+        return ApiResult.success();
+    }
+
+    /**
+     * 设备管理-通信设备-查询
+     * @param deviceName 设备名称
+     * @param size 页数
+     * @param current 条数
+     * @return
+     */
+    @GetMapping("correspondDeviceList")
+    public ApiResult<CommonPage<CorrespondDeviceVO>> correspondDeviceList(@RequestParam(required = false) String deviceName,
+                                                                          @RequestParam(value = "size", required = false, defaultValue = "1") int size,
+                                                                          @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
+        return ApiResult.success(deviceService.correspondDeviceList(deviceName, size, current));
+    }
+
+    /**
+     * 设备管理-通信设备-修改回显
+     * @param id 通信设备表主键ID
+     * @return
+     */
+    @GetMapping("correspondDeviceListEcho")
+    public ApiResult<List<CorrespondDeviceListVO>> correspondDeviceListEcho(@RequestParam int id) {
+        return ApiResult.success(deviceService.correspondDeviceListEcho(id));
     }
 }
 

+ 10 - 0
fiveep-model/src/main/java/com/bizmatics/model/Device.java

@@ -67,6 +67,16 @@ public class Device implements Serializable {
      */
     private String creator;
 
+    /**
+     * sim卡号
+     */
+    private String sim;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+
     /**
      * 使能标识(0 不生效,1生效)
      */

+ 3 - 3
fiveep-model/src/main/java/com/bizmatics/model/DeviceAnalogVariableList.java

@@ -47,12 +47,12 @@ public class DeviceAnalogVariableList implements Serializable {
     /**
      * 监控设备
      */
-    private String monitoringEquipment;
+    private int monitoringEquipment;
 
     /**
      * 通信设备
      */
-    private String communicationEquipment;
+    private int communicationEquipment;
 
     /**
      * 数据地址
@@ -87,5 +87,5 @@ public class DeviceAnalogVariableList implements Serializable {
     /**
      * 1:启用、0:不启用
      */
-    private Integer enable;
+    private Integer status;
 }

+ 89 - 0
fiveep-model/src/main/java/com/bizmatics/model/vo/CorrespondDeviceListVO.java

@@ -0,0 +1,89 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/7/8 14:30
+ * 公用的图标VO
+ */
+@Builder
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CorrespondDeviceListVO implements Serializable {
+
+    /**
+     * 设备信息表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 所属站点
+     */
+    private Integer siteId;
+
+    /**
+     * 设备安装位置
+     */
+    private String deviceAddress;
+
+    /**
+     * 1:183用电设备,2:视频监控设备,3:171用电设备,4:173用电设备,5:158智能网关,6:其他
+     */
+    private String deviceType;
+
+    /**
+     * 安装时间
+     */
+    private Date installTime;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * sim卡号
+     */
+    private String sim;
+
+    /**
+     * 楼层
+     */
+    private String floor;
+
+    /**
+     * 使能标识(0 不生效,1生效)
+     */
+    private Integer enable;
+
+
+    /**
+     *变量列表
+     */
+    @TableField(exist = false)
+    private Object deviceAnalogVariableList;
+
+}

+ 67 - 0
fiveep-model/src/main/java/com/bizmatics/model/vo/CorrespondDeviceVO.java

@@ -0,0 +1,67 @@
+package com.bizmatics.model.vo;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/7/8 14:30
+ * 公用的图标VO
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class CorrespondDeviceVO implements Serializable {
+
+    /**
+     * 设备表主键ID
+     */
+    private Integer id;
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+    /**
+     * 设备地址
+     */
+    private String deviceAddress;
+    /**
+     * 安装时间
+     */
+    private Date installTime;
+    /**
+     * 设备状态
+     */
+    private Object deviceStatus;
+    /**
+     * 最后通信时间
+     */
+    private Date statusTime;
+    /**
+     * 离线时长
+     */
+    private String offlineDuration;
+    /**
+     * 在线时长
+     */
+    private String onlineDuration;
+    /**
+     * 站点ID
+     */
+    private int siteId;
+    /**
+     * 站点名称
+     */
+    private Object siteName;
+
+
+}

+ 5 - 0
fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceMapper.java

@@ -3,6 +3,7 @@ package com.bizmatics.persistence.mapper;
 import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.DeviceList;
+import com.bizmatics.model.vo.CorrespondDeviceVO;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
@@ -44,5 +45,9 @@ public interface DeviceMapper extends CrudMapper<Device> {
                       @Param("type") String type);
     List<DeviceList> DeviceList(@Param("siteId") Integer siteId);
 
+    List<CorrespondDeviceVO> CorrespondDeviceList(@Param("deviceName") String deviceName,
+                                                  @Param("startCurrent") Integer startCurrent,
+                                                  @Param("current") Integer current);
+
 
 }

+ 3 - 3
fiveep-persistence/src/main/resources/mapper/mysql/DeviceAnalogVariableListMapper.xml

@@ -16,7 +16,7 @@
         <result column="save_cycle" property="saveCycle" />
         <result column="create_time" property="createTime" />
         <result column="creator" property="creator" />
-        <result column="enable" property="enable" />
+        <result column="enable" property="status" />
     </resultMap>
     <select id="variableList" resultType="com.bizmatics.model.DeviceAnalogVariableList">
         SELECT
@@ -26,7 +26,7 @@
          inner JOIN device AS b ON a.device_code = b.device_code
         <where>
             b.enable =1
-            and a.enable =1
+            and a.status =1
             <if test="siteId != null and siteId !=0">
                 and b.site_id = #{siteId}
             </if>
@@ -45,7 +45,7 @@
             </if>
         </where>
          order by a.id
-        <if test="startCurrent != null and startCurrent !=0 and current != null and current !=0">
+        <if test="startCurrent != null and current != null and current !=0">
             LIMIT  #{startCurrent},#{current}
         </if>
     </select>

+ 28 - 0
fiveep-persistence/src/main/resources/mapper/mysql/DeviceMapper.xml

@@ -96,4 +96,32 @@
         </where>
     </select>
 
+    <select id="CorrespondDeviceList" resultType="com.bizmatics.model.vo.CorrespondDeviceVO">
+        SELECT
+        a.id,
+        a.device_code,
+        a.device_name,
+        a.device_address,
+        a.install_time,
+        a.site_id,
+        b.device_status,
+        b.status_time,
+        c.site_name
+        FROM
+        device AS a
+        JOIN device_status AS b ON a.device_code = b.device_code
+        JOIN site AS c ON a.site_id = c.id
+        <where>
+            a.enable =1
+            <if test="deviceName != null and deviceName != ''">
+                and a.device_name LIKE CONCAT(CONCAT('%', #{deviceName}), '%')
+            </if>
+        </where>
+        order by a.id desc
+        <if test="current != null and current != 0 and startCurrent != null and startCurrent != 0">
+            LIMIT #{startCurrent},#{current}
+        </if>
+
+    </select>
+
 </mapper>

+ 14 - 0
fiveep-service/src/main/java/com/bizmatics/service/DeviceService.java

@@ -1,9 +1,13 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.TemplateData;
+import com.bizmatics.model.vo.CorrespondDeviceListVO;
+import com.bizmatics.model.vo.CorrespondDeviceVO;
+import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
 
 import java.util.Date;
@@ -36,4 +40,14 @@ public interface DeviceService extends CrudService<Device> {
     List<DeviceList> deviceList(String siteId);
 
     List<Device> dataManagementDeviceList(int siteId,int deviceType);
+
+    void correspondDeviceAdd(CorrespondDeviceVOT correspondDeviceVOT);
+
+    void correspondDeviceUpdate(CorrespondDeviceVOT correspondDeviceVOT);
+
+    void correspondDeviceDel(int id);
+
+    CommonPage<CorrespondDeviceVO> correspondDeviceList(String deviceName, int size, int current);
+
+    List<CorrespondDeviceListVO> correspondDeviceListEcho(int id);
 }

+ 3 - 3
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAnalogVariableListServiceImpl.java

@@ -47,7 +47,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         deviceAnalogVariableList.setDeviceCode(DeviceList.getDeviceCode());
         deviceAnalogVariableList.setCreateTime(LocalDateTime.now());
         deviceAnalogVariableList.setCreator(user.getUserName());
-        deviceAnalogVariableList.setEnable(1);
+        deviceAnalogVariableList.setStatus(1);
         this.save(deviceAnalogVariableList);
     }
 
@@ -60,7 +60,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     public void variableListDel(int id) {
         DeviceAnalogVariableList deviceAnalogVariableList = new DeviceAnalogVariableList();
         deviceAnalogVariableList.setId(id);
-        deviceAnalogVariableList.setEnable(0);
+        deviceAnalogVariableList.setStatus(0);
         this.updateById(deviceAnalogVariableList);
     }
 
@@ -68,7 +68,7 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     public CommonPage<DeviceAnalogVariableList> variableList(String deviceCode, String screen, int size, int current) {
         IPage<DeviceAnalogVariableList> page = new Page<DeviceAnalogVariableList>(size, current);
         LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(DeviceAnalogVariableList::getDeviceCode, deviceCode).eq(DeviceAnalogVariableList::getEnable, 1);
+        queryWrapper.eq(DeviceAnalogVariableList::getDeviceCode, deviceCode).eq(DeviceAnalogVariableList::getStatus, 1);
         if (screen != null && screen.equals("")) {
             queryWrapper.and(wq -> wq
                     .like(DeviceAnalogVariableList::getVariableName, screen)

+ 95 - 5
fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceServiceImpl.java

@@ -1,21 +1,30 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceList;
-import com.bizmatics.model.PowerQualityConfig;
-import com.bizmatics.model.TemplateData;
+import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.CorrespondDeviceListVO;
+import com.bizmatics.model.vo.CorrespondDeviceVO;
 import com.bizmatics.persistence.mapper.DeviceMapper;
+import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.enums.DeviceStatusCode;
 import com.bizmatics.service.enums.DeviceType;
 import com.bizmatics.service.util.SecurityUtils;
+import com.bizmatics.service.vo.CommonIcoVO;
+import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.sql.Wrapper;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Optional;
@@ -32,6 +41,9 @@ import java.util.Optional;
 public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device> implements DeviceService {
 
 
+    @Autowired
+    private DeviceAnalogVariableListService deviceAnalogVariableListService;
+
     @Override
     public DeviceCountVO selectDeviceCount(Date startTime, Date endTime) {
         Integer userId = SecurityUtils.getLoginUser().getUser().getUserId().intValue();
@@ -78,18 +90,96 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public List<DeviceList> deviceList(String siteId){
+    public List<DeviceList> deviceList(String siteId) {
         List<DeviceList> DeviceList = null;
         DeviceList = baseMapper.DeviceList(Integer.parseInt(siteId));
         return DeviceList;
     }
 
     @Override
-    public List<Device> dataManagementDeviceList(int siteId,int deviceType){
+    public List<Device> dataManagementDeviceList(int siteId, int deviceType) {
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getEnable, 1).eq(Device::getSiteId, siteId);
         List<Device> deviceList = this.list(queryWrapper);
         return deviceList;
     }
 
+    @Override
+    public void correspondDeviceAdd(CorrespondDeviceVOT correspondDeviceVOT) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        Device device = correspondDeviceVOT.getDevice();
+        device.setEnable(1);
+        device.setInstallTime(new Date());
+        device.setCreator(user.getUserName());
+        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
+        this.save(device);
+        int ID = device.getId();
+        if (DeviceAnalogVariableList.size() > 0) {
+            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
+                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
+                DeviceAnalogVariableList.get(i).setCreateTime(LocalDateTime.now());
+                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
+                DeviceAnalogVariableList.get(i).setStatus(1);
+                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
+            }
+        }
+    }
+
+    @Override
+    public void correspondDeviceUpdate(CorrespondDeviceVOT correspondDeviceVOT) {
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        List<DeviceAnalogVariableList> DeviceAnalogVariableList = correspondDeviceVOT.getDeviceAnalogVariableList();
+        this.updateById(correspondDeviceVOT.getDevice());
+        int ID = correspondDeviceVOT.getDevice().getId();
+        if (DeviceAnalogVariableList.size() > 0) {
+            for (int i = 0; i < DeviceAnalogVariableList.size(); i++) {
+                DeviceAnalogVariableList.get(i).setCommunicationEquipment(ID);
+                DeviceAnalogVariableList.get(i).setCreateTime(LocalDateTime.now());
+                DeviceAnalogVariableList.get(i).setCreator(user.getUserName());
+                DeviceAnalogVariableList.get(i).setStatus(1);
+                deviceAnalogVariableListService.save(DeviceAnalogVariableList.get(i));
+            }
+        }
+    }
+
+    @Override
+    public void correspondDeviceDel(int id) {
+        Device device = new Device();
+        device.setId(id);
+        device.setEnable(0);
+        this.updateById(device);
+    }
+
+    @Override
+    public CommonPage<CorrespondDeviceVO> correspondDeviceList(String deviceName, int size, int current) {
+        List<CorrespondDeviceVO> correspondDeviceListOne = baseMapper.CorrespondDeviceList(deviceName, null, null);
+        int total=0;
+        if (correspondDeviceListOne.size()>0){
+            total= correspondDeviceListOne.size();
+        }
+        int startCurrent = (size - 1) * current;
+        List<CorrespondDeviceVO> correspondDeviceList = baseMapper.CorrespondDeviceList(deviceName, startCurrent, current);
+        return new CommonPage<>(correspondDeviceList, total, current, size);
+    }
+
+    @Override
+    public List<CorrespondDeviceListVO> correspondDeviceListEcho(int id){
+        LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Device::getEnable, 1).eq(Device::getId, id);
+        List<Device> deviceList = this.list(queryWrapper);
+        LambdaQueryWrapper<DeviceAnalogVariableList>  queryWrapperOne = Wrappers.lambdaQuery();
+        queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getCommunicationEquipment, deviceList.get(0).getId());
+        List<DeviceAnalogVariableList> deviceAnalogVariableList = deviceAnalogVariableListService.list(queryWrapperOne);
+
+        List<CorrespondDeviceListVO> list = new ArrayList<>();
+        list.add(CorrespondDeviceListVO.builder().deviceCode(deviceList.get(0).getDeviceCode()).deviceName(deviceList.get(0).getDeviceName())
+                .deviceType(deviceList.get(0).getDeviceType()).deviceAddress(deviceList.get(0).getDeviceAddress())
+                .creator(deviceList.get(0).getCreator()).enable(deviceList.get(0).getEnable()).floor(deviceList.get(0).getFloor())
+                .id(deviceList.get(0).getId()).sim(deviceList.get(0).getSim()).siteId(deviceList.get(0).getSiteId())
+                .installTime(deviceList.get(0).getInstallTime()).deviceAnalogVariableList(deviceAnalogVariableList).build());
+        return list;
+    }
+
+
+
 }

+ 16 - 0
fiveep-service/src/main/java/com/bizmatics/service/vo/CorrespondDeviceVOT.java

@@ -0,0 +1,16 @@
+package com.bizmatics.service.vo;
+
+import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceAnalogVariableList;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CorrespondDeviceVOT {
+
+    private Device device;
+
+    private List<DeviceAnalogVariableList> deviceAnalogVariableList;
+
+}