站点管理-监控设备和变量列表-增、删、改、查相关接口

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

@@ -1,10 +1,19 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.common.core.bean.CommonPage;
+import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.service.DeviceAnalogVariableListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
 import org.springframework.stereotype.Controller;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备变量列表 前端控制器
@@ -13,9 +22,37 @@ import org.springframework.stereotype.Controller;
  * @author ya
  * @since 2021-09-24
  */
-@Controller
+@RestController
 @RequestMapping("/deviceAnalogVariableList")
 public class DeviceAnalogVariableListController {
 
+    @Autowired
+    private DeviceAnalogVariableListService deviceAnalogVariableListService;
+
+    @GetMapping("variableListAdd")
+    public ApiResult<Void> variableListAdd(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
+        deviceAnalogVariableListService.variableListAdd(deviceAnalogVariableList);
+        return ApiResult.success();
+    }
+
+    @GetMapping("variableListUpdate")
+    public ApiResult<Void> variableListUpdate(@RequestBody DeviceAnalogVariableList deviceAnalogVariableList) {
+        deviceAnalogVariableListService.variableListUpdate(deviceAnalogVariableList);
+        return ApiResult.success();
+    }
+
+    @GetMapping("variableListDel")
+    public ApiResult<Void> variableListDel(@RequestParam int id) {
+        deviceAnalogVariableListService.variableListDel(id);
+        return ApiResult.success();
+    }
+
+    @GetMapping("variableList")
+    public ApiResult<CommonPage<DeviceAnalogVariableList>> variableList(@RequestParam(required = false) String deviceCode,
+                                                                        @RequestParam(required = false) String screen,
+                                                                        @RequestParam(value = "size", required = false, defaultValue = "1") int size,
+                                                                        @RequestParam(value = "current", required = false, defaultValue = "10") int current) {
+        return ApiResult.success(deviceAnalogVariableListService.variableList(deviceCode, screen,size,current));
+    }
 }
 

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

@@ -1,9 +1,14 @@
 package com.bizmatics.controller.web;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.bizmatics.common.core.bean.ApiResult;
+import com.bizmatics.model.DeviceAttribute;
+import com.bizmatics.model.vo.DeviceAttributeVo;
+import com.bizmatics.service.DeviceAttributeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.stereotype.Controller;
+import java.util.List;
 
 /**
  * <p>
@@ -13,9 +18,58 @@ import org.springframework.stereotype.Controller;
  * @author ya
  * @since 2021-09-24
  */
-@Controller
+@RestController
 @RequestMapping("/deviceAttribute")
 public class DeviceAttributeController {
+    @Autowired
+    private DeviceAttributeService deviceAttributeService;
 
+    /**
+     * 站点管理-监控设备-新增
+     * @param deviceAttribute
+     * @return
+     */
+    @GetMapping("deviceNewsAdd")
+    public ApiResult<Void> deviceNewsAdd(@RequestBody DeviceAttribute deviceAttribute) {
+        deviceAttributeService.deviceNewsAdd(deviceAttribute);
+        return ApiResult.success();
+    }
+
+
+    /**
+     * 站点管理-监控设备-修改
+     * @param deviceAttribute
+     * @return
+     */
+    @GetMapping("deviceNewsUpdate")
+    public ApiResult<Void> deviceNewsUpdate(@RequestBody DeviceAttribute deviceAttribute) {
+        deviceAttributeService.deviceNewsUpdate(deviceAttribute);
+        return ApiResult.success();
+    }
+
+    /**
+     * 站点管理-监控设备-列表查询
+     * @param deviceCode 设备编号
+     * @param id device_attribute表主键ID
+     * @param siteId 点位ID
+     * @return
+     */
+    @GetMapping("deviceNewsList")
+    public ApiResult <List<DeviceAttributeVo>> deviceNewsList(@RequestParam(required = false) String deviceCode,
+                                                              @RequestParam(required = false) String id,
+                                                              @RequestParam(required = false) String siteId) {
+        return ApiResult.success(deviceAttributeService.deviceNewsList(deviceCode, Integer.parseInt(id), Integer.parseInt(siteId)));
+    }
+
+    /**
+     * 站点管理-监控设备-注销
+     * @param id
+     * @return
+     */
+    @GetMapping("deviceNewsDel")
+    public ApiResult<Void> deviceNewsDel(@RequestParam int id) {
+        deviceAttributeService.deviceNewsDel(id);
+        return ApiResult.success();
+    }
 }
 

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

@@ -79,8 +79,8 @@ public class DeviceController {
         return list1;
     }
 
-    @GetMapping("DeviceList")
-    public ApiResult<List<DeviceList>> DeviceList(@RequestParam String siteId) {
+    @GetMapping("deviceList")
+    public ApiResult<List<DeviceList>> deviceList(@RequestParam String siteId) {
         return ApiResult.success(deviceService.deviceList(siteId));
     }
 }

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

@@ -3,7 +3,6 @@ package com.bizmatics.controller.web;
 
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.model.Site;
-import com.bizmatics.model.SiteList;
 import com.bizmatics.model.TemplateData;
 import com.bizmatics.service.SiteService;
 import com.bizmatics.service.vo.DeviceCountVO;
@@ -85,7 +84,7 @@ public class SiteController {
 
 
     /**
-     *
+     *站点管理-基础信息-新增修改
      * @param siteVOT
      * @return
      */
@@ -99,6 +98,11 @@ public class SiteController {
         return ApiResult.success();
     }
 
+    /**
+     * 站点管理-基础信息-站点注销
+     * @param id
+     * @return
+     */
     @GetMapping("siteDel")
     public ApiResult<Void> siteDel(@RequestParam(required = false) String id) {
             siteService.sitedel(id);

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

@@ -84,5 +84,8 @@ public class DeviceAnalogVariableList implements Serializable {
      */
     private String creator;
 
-
+    /**
+     * 1:启用、0：不启用
+     */
+    private Integer enable;
 }

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

@@ -14,7 +14,7 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author ya
- * @since 2021-09-24
+ * @since 2021-09-26
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -79,5 +79,10 @@ public class DeviceAttribute implements Serializable {
      */
     private String qualityAnalysis;
 
+    /**
+     * 1:启用、0：不启用
+     */
+    private Integer enable;
+
 
 }

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

@@ -0,0 +1,94 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 设备属性
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceAttributeVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备动态属性id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备id
+     */
+    private Integer deviceId;
+
+    /**
+     * 回路表计地址
+     */
+    private Integer loopMeterAddress;
+
+    /**
+     * 额定电压（kv）
+     */
+    private Double ratedVoltage;
+
+    /**
+     * 额定电流（A）
+     */
+    private Double ratedCurrent;
+
+    /**
+     * 电流负载率门限
+     */
+    private Double currentLoadRate;
+
+    /**
+     * 监控设备编号
+     */
+    private String monitoringEquipmentNo;
+
+    /**
+     * 变量列表id
+     */
+    private Integer variableListId;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 电能质量分析
+     */
+    private String qualityAnalysis;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 1:启用、0：不启用
+     */
+    private Integer enable;
+
+
+}

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

@@ -1,7 +1,13 @@
 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 org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,7 @@ import com.bizmatics.common.mvc.base.CrudMapper;
  */
 public interface DeviceAttributeMapper extends CrudMapper<DeviceAttribute> {
 
+    List<DeviceAttributeVo> deviceList(@Param("deviceCode") String deviceCode,
+                                       @Param("id") Integer id,
+                                       @Param("siteId") Integer siteId);
 }

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

@@ -15,6 +15,29 @@
         <result column="creator" property="creator" />
         <result column="create_time" property="createTime" />
         <result column="quality_analysis" property="qualityAnalysis" />
+        <result column="enable" property="enable" />
     </resultMap>
-
+    <select id="deviceList" resultType="com.bizmatics.model.vo.DeviceAttributeVo">
+        SELECT
+        a.*,
+        b.device_name,
+        if(c.device_status=1,'离线','正常') AS device_status
+        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
+        <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>
+        </where>
+    </select>
 </mapper>

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

@@ -1,8 +1,11 @@
 package com.bizmatics.service;
 
+import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.common.mvc.base.CrudService;
 
+import java.util.List;
+
 /**
  * <p>
  * 设备变量列表 服务类
@@ -12,5 +15,10 @@ import com.bizmatics.common.mvc.base.CrudService;
  * @since 2021-09-24
  */
 public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalogVariableList> {
+    void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList);
+    void variableListUpdate(DeviceAnalogVariableList deviceAnalogVariableList);
+    void variableListDel(int id);
+    CommonPage<DeviceAnalogVariableList> variableList(String deviceCode, String screen,int size,int current);
+
 
 }

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

@@ -2,6 +2,9 @@ package com.bizmatics.service;
 
 import com.bizmatics.model.DeviceAttribute;
 import com.bizmatics.common.mvc.base.CrudService;
+import com.bizmatics.model.vo.DeviceAttributeVo;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,8 @@ import com.bizmatics.common.mvc.base.CrudService;
  */
 public interface DeviceAttributeService extends CrudService<DeviceAttribute> {
 
+    void deviceNewsAdd(DeviceAttribute deviceAttribute);
+    void deviceNewsUpdate(DeviceAttribute deviceAttribute);
+    List<DeviceAttributeVo> deviceNewsList(String deviceCode,int id,int siteId);
+    void deviceNewsDel(int id);
 }

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

@@ -1,11 +1,24 @@
 package com.bizmatics.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+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.system.SysUser;
 import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
-import com.bizmatics.common.mvc.base.AbstractCrudService;
+import com.bizmatics.service.DeviceService;
+import com.bizmatics.service.util.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 设备变量列表 服务实现类
@@ -16,5 +29,54 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<DeviceAnalogVariableListMapper, DeviceAnalogVariableList> implements DeviceAnalogVariableListService {
+    @Autowired
+    private DeviceAnalogVariableListService deviceAnalogVariableListService;
+    @Autowired
+    private DeviceService deviceService;
+
+    @Override
+    public void variableListAdd(DeviceAnalogVariableList deviceAnalogVariableList) {
+
+        LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(Device::getDeviceCode, deviceAnalogVariableList.getDeviceCode());
+        List<Device> deviceList = deviceService.list(queryWrapper);
+        Device DeviceList = (Device) deviceList.get(0);
+        SysUser user = SecurityUtils.getLoginUser().getUser();
+        deviceAnalogVariableList.setDeviceCode(DeviceList.getDeviceCode());
+        deviceAnalogVariableList.setCreateTime(LocalDateTime.now());
+        deviceAnalogVariableList.setCreator(user.getUserName());
+        deviceAnalogVariableList.setEnable(1);
+        this.save(deviceAnalogVariableList);
+    }
+
+    @Override
+    public void variableListUpdate(DeviceAnalogVariableList deviceAnalogVariableList) {
+        this.updateById(deviceAnalogVariableList);
+    }
+
+    @Override
+    public void variableListDel(int id) {
+        DeviceAnalogVariableList deviceAnalogVariableList = new DeviceAnalogVariableList();
+        deviceAnalogVariableList.setId(id);
+        deviceAnalogVariableList.setEnable(0);
+        this.updateById(deviceAnalogVariableList);
+    }
+
+    @Override
+    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);
+        if (screen != null && screen.equals("")) {
+            queryWrapper.and(wq -> wq
+                    .like(DeviceAnalogVariableList::getVariableName, screen)
+                    .or()
+                    .like(DeviceAnalogVariableList::getVariableCoding, screen));
+        }
+
+        page = this.page(page, queryWrapper);
+        this.ToCommonPage(page);
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
+    }
 
 }

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

@@ -1,11 +1,26 @@
 package com.bizmatics.service.impl;
 
-import com.bizmatics.model.DeviceAttribute;
+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.model.system.SysUser;
+import com.bizmatics.model.vo.DeviceAttributeVo;
 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.LocalDateTime;
+import java.util.List;
+
 /**
  * <p>
  * 设备属性 服务实现类
@@ -14,7 +29,46 @@ import org.springframework.stereotype.Service;
  * @author ya
  * @since 2021-09-24
  */
+@SuppressWarnings("unused")
 @Service
 public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttributeMapper, DeviceAttribute> implements DeviceAttributeService {
 
+    @Autowired
+    private DeviceService deviceService;
+
+    @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.setCreator(user.getUserName());
+        deviceAttribute.setCreateTime(LocalDateTime.now());
+        this.save(deviceAttribute);
+    }
+
+    @Override
+    public void deviceNewsUpdate(DeviceAttribute deviceAttribute) {
+        this.updateById(deviceAttribute);
+    }
+
+    @Override
+    public List<DeviceAttributeVo> deviceNewsList(String deviceCode, int id, int siteId) {
+        List<DeviceAttributeVo> deviceAttributeVoList = null;
+        deviceAttributeVoList = baseMapper.deviceList(deviceCode, id, siteId);
+        return deviceAttributeVoList;
+
+    }
+
+    @Override
+    public void deviceNewsDel(int id) {
+        DeviceAttribute deviceAttribute = new DeviceAttribute();
+        deviceAttribute.setEnable(0);
+        this.updateById(deviceAttribute);
+    }
 }

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

@@ -73,6 +73,7 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 .count();
     }
 
+    @Override
     public List<DeviceList> deviceList(String siteId){
         List<DeviceList> DeviceList = null;
         DeviceList = baseMapper.DeviceList(Integer.parseInt(siteId));