设备管理-通信设备与电力监控设备相关接口上传

fiveep-controller/src/main/java/com/bizmatics/controller/web/DeviceAttributeController.java

@@ -4,6 +4,7 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.service.DeviceAttributeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -25,7 +26,8 @@ public class DeviceAttributeController {
     private DeviceAttributeService deviceAttributeService;
 
     /**
-     * 站点管理-监控设备-新增
+     * 站点管理/设备管理-监控设备-新增
+     *
      * @param deviceAttribute
      * @return
      */
@@ -37,7 +39,8 @@ public class DeviceAttributeController {
 
 
     /**
-     * 站点管理-监控设备-修改
+     * 站点管理/设备管理-监控设备-修改
+     *
      * @param deviceAttribute
      * @return
      */
@@ -48,23 +51,22 @@ public class DeviceAttributeController {
     }
 
     /**
-     * 站点管理-监控设备-列表查询
-     * @param deviceCode 设备编号
-     * @param id device_attribute表主键ID
-     * @param siteId 点位ID
-     * @param deviceType 设备类型
+     * 站点管理/设备管理-监控设备-设备列表查询
+     *
+     * @param id         device_attribute表主键ID
+     * @param siteId     点位ID
      * @return
      */
     @GetMapping("deviceNewsList")
-    public ApiResult <List<DeviceAttributeVo>> deviceNewsList(@RequestParam(required = false) String deviceCode,
-                                                              @RequestParam(value = "id", required = false, defaultValue = "0") int id,
-                                                              @RequestParam(value = "siteId", required = false, defaultValue = "0") int siteId,
-                                                              @RequestParam(value = "deviceType", required = false, defaultValue = "0") int deviceType) {
-        return ApiResult.success(deviceAttributeService.deviceNewsList(deviceCode, id, siteId,deviceType));
+    public ApiResult<List<DeviceAttribute>> deviceNewsList(@RequestParam int siteId,
+                                                           @RequestParam(value = "id", required = false, defaultValue = "0") int id
+    ) {
+        return ApiResult.success(deviceAttributeService.deviceNewsList(id, siteId));
     }
 
     /**
-     * 站点管理-监控设备-注销
+     * 站点管理/设备管理-监控设备-注销
+     *
      * @param id
      * @return
      */
@@ -73,5 +75,16 @@ public class DeviceAttributeController {
         deviceAttributeService.deviceNewsDel(id);
         return ApiResult.success();
     }
+
+    /**
+     * 站点管理/设备管理-监控设备-主页列表查询
+     *
+     * @param siteName 站点名称
+     * @return
+     */
+    @GetMapping("monitorDeviceList")
+    public ApiResult<List<MonitorDeviceListVO>> monitorDeviceList(@RequestParam(required = false) String siteName) {
+        return ApiResult.success(deviceAttributeService.monitorDeviceList(siteName));
+    }
 }
 

fiveep-model/src/main/java/com/bizmatics/model/DeviceAttribute.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -24,21 +26,23 @@ public class DeviceAttribute implements Serializable {
     private static final long serialVersionUID=1L;
 
     /**
-     * 设备动态属性id
+     * 监控设备id
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
-     * 设备id
+     * 监控设备编号
      */
-    private Integer deviceId;
-
+    private String monitorDeviceCode;
+    /**
+     * 监控设备名称
+     */
+    private String monitorDeviceName;
     /**
      * 回路表计地址
      */
     private Integer loopMeterAddress;
-
     /**
      * 额定电压（kv）
      */
@@ -48,22 +52,18 @@ public class DeviceAttribute implements Serializable {
      * 额定电流（A）
      */
     private Double ratedCurrent;
-
     /**
      * 电流负载率门限
      */
     private Double currentLoadRate;
-
     /**
-     * 监控设备编号
+     * 站点ID
      */
-    private String monitoringEquipmentNo;
-
+    private Integer siteId;
     /**
      * 变量列表id
      */
     private Integer variableListId;
-
     /**
      * 创建人
      */
@@ -72,8 +72,7 @@ public class DeviceAttribute implements Serializable {
     /**
      * 创建时间
      */
-    private LocalDateTime createTime;
-
+    private Date createTime;
     /**
      * 电能质量分析
      */
@@ -82,7 +81,5 @@ public class DeviceAttribute implements Serializable {
     /**
      * 1:启用、0：不启用
      */
-    private Integer enable;
-
-
+    private Integer status;
 }

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

@@ -1,11 +1,13 @@
 package com.bizmatics.model.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -13,10 +15,11 @@ import java.util.Date;
  * @date 2021/7/8 14:30
  * 公用的图标VO
  */
+@Builder
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-public class CorrespondDeviceVO implements Serializable {
+public class CorrespondDeviceVO{
 
     /**
      * 设备表主键ID
@@ -41,27 +44,29 @@ public class CorrespondDeviceVO implements Serializable {
     /**
      * 设备状态
      */
-    private Object deviceStatus;
+    private Integer deviceStatus;
     /**
      * 最后通信时间
      */
     private Date statusTime;
+
     /**
-     * 离线时长
+     * 站点ID
      */
-    private String offlineDuration;
+    private int siteId;
     /**
-     * 在线时长
+     * 站点名称
      */
-    private String onlineDuration;
+    private String siteName;
+
     /**
-     * 站点ID
+     * 离线时长
      */
-    private int siteId;
+    private Integer offlineDuration;
     /**
-     * 站点名称
+     * 在线时长
      */
-    private Object siteName;
+    private Integer onlineDuration;
 
 
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/DeviceAttributeVo.java

@@ -25,21 +25,23 @@ public class DeviceAttributeVo implements Serializable {
     private static final long serialVersionUID=1L;
 
     /**
-     * 设备动态属性id
+     * 监控设备id
      */
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
     /**
-     * 设备id
+     * 监控设备编号
      */
-    private Integer deviceId;
-
+    private String monitorDeviceCode;
+    /**
+     * 监控设备名称
+     */
+    private String monitorDeviceName;
     /**
      * 回路表计地址
      */
     private Integer loopMeterAddress;
-
     /**
      * 额定电压（kv）
      */
@@ -49,22 +51,18 @@ public class DeviceAttributeVo implements Serializable {
      * 额定电流（A）
      */
     private Double ratedCurrent;
-
     /**
      * 电流负载率门限
      */
     private Double currentLoadRate;
-
     /**
-     * 监控设备编号
+     * 站点ID
      */
-    private String monitoringEquipmentNo;
-
+    private Integer siteId;
     /**
      * 变量列表id
      */
     private Integer variableListId;
-
     /**
      * 创建人
      */
@@ -74,21 +72,13 @@ public class DeviceAttributeVo implements Serializable {
      * 创建时间
      */
     private LocalDateTime createTime;
-
     /**
      * 电能质量分析
      */
     private String qualityAnalysis;
 
-    /**
-     * 设备名称
-     */
-    private String deviceName;
-
     /**
      * 1:启用、0：不启用
      */
-    private Integer enable;
-
-
+    private Integer status;
 }

fiveep-model/src/main/java/com/bizmatics/model/vo/MonitorDeviceListVO.java

@@ -0,0 +1,45 @@
+package com.bizmatics.model.vo;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.Date;
+
+/**
+ * @author yq
+ * @date 2021/7/8 14:30
+ * 公用的图标VO
+ */
+@Builder
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MonitorDeviceListVO {
+
+    /**
+     * 设备表主键ID
+     */
+    private Integer id;
+    /**
+     * 站点名称
+     */
+    private String siteName;
+    /**
+     * 站点地址
+     */
+    private String siteAddress;
+    /**
+     * 站点联系人
+     */
+    private String userName;
+    /**
+     * 联系方式
+     */
+    private String phone;
+    /**
+     * 设备数量
+     */
+    private Integer deviceCount;
+}

fiveep-persistence/src/main/java/com/bizmatics/persistence/mapper/DeviceAttributeMapper.java

@@ -1,12 +1,10 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.Device;
-import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.common.mvc.base.CrudMapper;
-import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.vo.MonitorDeviceListVO;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,9 +16,5 @@ import java.util.List;
  * @since 2021-09-24
  */
 public interface DeviceAttributeMapper extends CrudMapper<DeviceAttribute> {
-
-    List<DeviceAttributeVo> deviceList(@Param("deviceCode") String deviceCode,
-                                       @Param("id") Integer id,
-                                       @Param("siteId") Integer siteId,
-                                       @Param("deviceType") Integer deviceType);
+    List<MonitorDeviceListVO> monitorDeviceList(@Param("siteName") String siteName);
 }

fiveep-persistence/src/main/resources/mapper/mysql/DeviceAttributeMapper.xml

@@ -5,41 +5,49 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.bizmatics.model.DeviceAttribute">
         <id column="id" property="id" />
-        <result column="device_id" property="deviceId" />
+        <result column="monitor_device_name" property="monitorDeviceName" />
         <result column="loop_meter_address" property="loopMeterAddress" />
         <result column="rated_voltage" property="ratedVoltage" />
         <result column="rated_current" property="ratedCurrent" />
         <result column="current_load_rate" property="currentLoadRate" />
-        <result column="monitoring_equipment_no" property="monitoringEquipmentNo" />
+        <result column="monitor_device_code" property="monitorDeviceCode" />
         <result column="variable_list_id" property="variableListId" />
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
         <result column="quality_analysis" property="qualityAnalysis" />
-        <result column="enable" property="enable" />
+        <result column="status" property="status" />
     </resultMap>
-    <select id="deviceList" resultType="com.bizmatics.model.vo.DeviceAttributeVo">
+
+    <select id="monitorDeviceList" resultType="com.bizmatics.model.vo.MonitorDeviceListVO">
+        SELECT
+        a.id,
+        a.site_name,
+        a.site_address,
+        a.user_name,
+        a.phone,
+        IF (
+        b.device_count &lt;&gt; '',
+        b.device_count,
+        0
+        ) AS device_count
+        FROM
+        site AS a
+        LEFT JOIN (
         SELECT
-        a.*,
-        b.device_name,
-        if(c.device_status=1,'离线','正常') AS device_status
+        site_id,
+        COUNT(*) AS device_count
         FROM
-        device_attribute AS a
-        JOIN device AS b ON a.device_id = b.id
-        join device_status as c on b.device_code=c.device_code
+        device_attribute
         <where>
-            b.enable =1
-            and a.enable =1
-            <if test="deviceCode != null and deviceCode !=''">
-                and a.monitoring_equipment_no = #{deviceCode}
-            </if>
-            <if test="id != null and id !=0">
-                and a.id = #{id}
-            </if>
-            <if test="siteId != null and siteId !=0">
-                and b.site_id = #{siteId}
-            </if>
-            <if test="deviceType != null and deviceType !=0">
-                and b.device_type = #{deviceType}
+            status=1
+        </where>
+        GROUP BY
+        site_id
+        ) AS b ON a.id = b.site_id
+        <where>
+            a.enable =1
+            <if test="siteName != null and siteName !=''">
+                and a.site_name LIKE CONCAT(CONCAT('%', #{siteName}), '%')
             </if>
         </where>
     </select>

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

@@ -81,7 +81,7 @@
         c.rated_voltage,
         c.rated_current,
         c.current_load_rate,
-        monitoring_equipment_no,
+        c.monitoring_equipment_no,
         c.variable_list_id,
         c.quality_analysis
         FROM
@@ -103,10 +103,20 @@
         a.device_name,
         a.device_address,
         a.install_time,
-        a.site_id,
         b.device_status,
         b.status_time,
-        c.site_name
+        a.site_id,
+        c.site_name,
+        if (b.device_status=1,timestampdiff(
+        HOUR,
+        b.status_time,
+        now()
+        ),null) as offlineDuration,
+        if(b.device_status!=1,timestampdiff(
+        HOUR,
+        a.install_time,
+        now()
+        ),null) as onlineDuration
         FROM
         device AS a
         JOIN device_status AS b ON a.device_code = b.device_code
@@ -118,7 +128,7 @@
             </if>
         </where>
         order by a.id desc
-        <if test="current != null and current != 0 and startCurrent != null and startCurrent != 0">
+        <if test="current != null and current != 0 and startCurrent != null">
             LIMIT #{startCurrent},#{current}
         </if>
 

fiveep-service/src/main/java/com/bizmatics/service/DeviceAttributeService.java

@@ -1,8 +1,9 @@
 package com.bizmatics.service;
 
-import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.model.vo.MonitorDeviceListVO;
 
 import java.util.List;
 
@@ -17,7 +18,12 @@ import java.util.List;
 public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
 
     void deviceNewsAdd(DeviceAttribute deviceAttribute);
+
     void deviceNewsUpdate(DeviceAttribute deviceAttribute);
-    List<DeviceAttributeVo> deviceNewsList(String deviceCode,int id,int siteId,int deviceType);
+
+    List<DeviceAttribute> deviceNewsList(int id, int siteId);
+
     void deviceNewsDel(int id);
+
+    List<MonitorDeviceListVO> monitorDeviceList(String siteName);
 }

fiveep-service/src/main/java/com/bizmatics/service/impl/DeviceAttributeServiceImpl.java

@@ -2,23 +2,24 @@ package com.bizmatics.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.bizmatics.common.core.exception.BusinessException;
-import com.bizmatics.model.*;
+import com.bizmatics.common.core.util.DateUtils;
+import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.model.vo.MonitorDeviceListVO;
 import com.bizmatics.persistence.mapper.DeviceAttributeMapper;
 import com.bizmatics.service.DeviceAttributeService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.service.DeviceService;
-import com.bizmatics.service.enums.DeviceStatusCode;
-import com.bizmatics.service.enums.PersonnelType;
 import com.bizmatics.service.util.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
-import java.sql.Wrapper;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -38,17 +39,10 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
     @Override
     public void deviceNewsAdd(DeviceAttribute deviceAttribute) {
-//        int deviceCount = 0;
-        LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.eq(Device::getDeviceCode, deviceAttribute.getMonitoringEquipmentNo());
-//        deviceCount=deviceService.count(queryWrapper);
-        List<Device> deviceList = deviceService.list(queryWrapper);
-        Device DeviceList = (Device) deviceList.get(0);
         SysUser user = SecurityUtils.getLoginUser().getUser();
-        deviceAttribute.setEnable(1);
-        deviceAttribute.setDeviceId(DeviceList.getId());
+        deviceAttribute.setStatus(1);
         deviceAttribute.setCreator(user.getUserName());
-        deviceAttribute.setCreateTime(LocalDateTime.now());
+        deviceAttribute.setCreateTime(new Date());
         this.save(deviceAttribute);
     }
 
@@ -58,17 +52,27 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
     }
 
     @Override
-    public List<DeviceAttributeVo> deviceNewsList(String deviceCode, int id, int siteId,int deviceType) {
-        List<DeviceAttributeVo> deviceAttributeVoList = null;
-        deviceAttributeVoList = baseMapper.deviceList(deviceCode, id, siteId,deviceType);
-        return deviceAttributeVoList;
+    public List<DeviceAttribute> deviceNewsList(int id, int siteId) {
+        LambdaQueryWrapper<DeviceAttribute> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DeviceAttribute::getStatus, 1).eq(DeviceAttribute::getSiteId,siteId);
+        if(id!=0){
+            queryWrapper.eq(DeviceAttribute::getId, id);
+        }
+        List<DeviceAttribute> deviceAttributeList = this.list(queryWrapper);
+        return deviceAttributeList;
     }
 
     @Override
     public void deviceNewsDel(int id) {
         DeviceAttribute deviceAttribute = new DeviceAttribute();
         deviceAttribute.setId(id);
-        deviceAttribute.setEnable(0);
+        deviceAttribute.setStatus(0);
         this.updateById(deviceAttribute);
     }
+
+    @Override
+    public List<MonitorDeviceListVO> monitorDeviceList(String siteName) {
+        List<MonitorDeviceListVO> monitorDeviceList = baseMapper.monitorDeviceList(siteName);
+        return monitorDeviceList;
+    }
 }

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

@@ -4,6 +4,7 @@ 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.core.util.DateUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceAnalogVariableList;

fiveep-service/src/main/java/com/bizmatics/service/impl/PlatformAreaServiceImpl.java

@@ -117,7 +117,7 @@ public class PlatformAreaServiceImpl extends AbstractCrudService<PlatformAreaMap
         device.setId(deviceId);
         device.setEnable(0);
         deviceAttribute.setId(deviceAttributeId);
-        deviceAttribute.setEnable(0);
+        deviceAttribute.setStatus(0);
         deviceService.updateById(device);
         deviceAttributeService.updateById(deviceAttribute);
     }