变量列表-下拉框接口添加

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

@@ -4,11 +4,14 @@ package com.bizmatics.controller.web;
 import com.bizmatics.common.core.bean.ApiResult;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 设备变量列表
  *
@@ -85,14 +88,15 @@ public class DeviceAnalogVariableListController {
      * @return
      */
     @PostMapping("variableListone")
-    public ApiResult<CommonPage<DeviceAnalogVariableList>> variableListone(@RequestBody DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
+    public ApiResult<CommonPage<DeviceAnalogVariableListOneVo>> variableListone(@RequestBody DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
         return ApiResult.success(deviceAnalogVariableListService.variableListone(deviceAnalogVariableListVo));
     }
 
     /**
      * 站点管理-变量列表-新增
+     *
      * @param deviceAnalogVariableListId 变量列表ID 英文逗号隔开
-     * @param monitoringEquipmentId 监控设备ID
+     * @param monitoringEquipmentId      监控设备ID
      * @return
      */
     @GetMapping("variableListAddOne")
@@ -101,5 +105,16 @@ public class DeviceAnalogVariableListController {
         deviceAnalogVariableListService.variableListAddOne(deviceAnalogVariableListId, monitoringEquipmentId);
         return ApiResult.success();
     }
+
+    /**
+     * 站点管理-变量列表-（监控设备为零）变量下拉框
+     * @return
+     */
+    @GetMapping("variableListDroplist")
+    public ApiResult<List<DeviceAnalogVariableList>> variableListDroplist() {
+
+        return ApiResult.success(deviceAnalogVariableListService.variableListDroplist());
+    }
+
 }
 

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

@@ -53,15 +53,15 @@ public class DeviceAttributeController {
      *
      * @param id     device_attribute表主键ID
      * @param siteId 点位ID
-     * @param size 页数
-     * @param current 条数
+     * @param size 条数
+     * @param current 页数
      * @return
      */
     @GetMapping("deviceNewsList")
     public ApiResult<CommonPage<DeviceAttribute>> deviceNewsList(@RequestParam int siteId,
                                                                  @RequestParam(value = "id", required = false, defaultValue = "0") int id,
-                                                                 @RequestParam(value = "size", required = false, defaultValue = "1") int size,
-                                                                 @RequestParam(value = "current", required = false, defaultValue = "15") int current
+                                                                 @RequestParam(value = "size", required = false, defaultValue = "15") int size,
+                                                                 @RequestParam(value = "current", required = false, defaultValue = "1") int current
     ) {
         return ApiResult.success(deviceAttributeService.deviceNewsList(id, siteId, size, current));
     }

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

@@ -90,14 +90,6 @@ public class DeviceAnalogVariableList implements Serializable {
      * 1:启用、0：不启用
      */
     private Integer status;
-    /**
-     *  通信设备
-     */
-    private String deviceName;
-    /**
-     *  电力监控设备
-     */
-    private String monitorDeviceName;
 
     /**
      * 1.模拟量 2.状态量 3.参数量

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

@@ -0,0 +1,105 @@
+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.util.Date;
+
+/**
+ * <p>
+ * 设备变量列表
+ * </p>
+ *
+ * @author ya
+ * @since 2021-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceAnalogVariableListOneVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 变量列表id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 变量名
+     */
+    private String variableName;
+
+    /**
+     * 变量编码
+     */
+    private String variableCoding;
+
+    /**
+     * 监控设备
+     */
+    private Integer monitoringEquipment;
+
+    /**
+     * 通信设备
+     */
+    private Integer communicationEquipment;
+
+    /**
+     * 数据地址
+     */
+    private String dataAddress;
+
+    /**
+     * 数据类型
+     */
+    private String dataType;
+
+    /**
+     * 系数
+     */
+    private Float coefficient;
+
+    /**
+     * 存盘周期（分钟）
+     */
+    private Integer saveCycle;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 创建人
+     */
+    private String creator;
+
+    /**
+     * 1:启用、0：不启用
+     */
+    private Integer status;
+    /**
+     *  通信设备
+     */
+    private String deviceName;
+    /**
+     *  电力监控设备
+     */
+    private String monitorDeviceName;
+
+    /**
+     * 1.模拟量 2.状态量 3.参数量
+     */
+    private Integer dataArea;
+}

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

@@ -2,6 +2,7 @@ package com.bizmatics.persistence.mapper;
 
 import com.bizmatics.common.mvc.base.CrudMapper;
 import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -15,13 +16,13 @@ import java.util.List;
  * @since 2021-09-24
  */
 public interface DeviceAnalogVariableListMapper extends CrudMapper<DeviceAnalogVariableList> {
-    List<DeviceAnalogVariableList> variableList(@Param("siteId") Integer siteId,
-                                                @Param("id") Integer id,
-                                                @Param("variableName") String variableName,
-                                                @Param("startCurrent") Integer startCurrent,
-                                                @Param("current") Integer current,
-                                                @Param("dataArea") Integer dataArea,
-                                                @Param("monitoringEquipment")Integer monitoringEquipment);
+    List<DeviceAnalogVariableListOneVo> variableList(@Param("siteId") Integer siteId,
+                                                     @Param("id") Integer id,
+                                                     @Param("variableName") String variableName,
+                                                     @Param("startCurrent") Integer startCurrent,
+                                                     @Param("current") Integer current,
+                                                     @Param("dataArea") Integer dataArea,
+                                                     @Param("monitoringEquipment")Integer monitoringEquipment);
 
 
 }

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

@@ -18,7 +18,7 @@
         <result column="creator" property="creator" />
         <result column="enable" property="status" />
     </resultMap>
-    <select id="variableList" resultType="com.bizmatics.model.DeviceAnalogVariableList">
+    <select id="variableList" resultType="com.bizmatics.model.vo.DeviceAnalogVariableListOneVo">
         SELECT
         a.*, b.device_name,
         c.monitor_device_name

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

@@ -3,8 +3,11 @@ package com.bizmatics.service;
 import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.CrudService;
 import com.bizmatics.model.DeviceAnalogVariableList;
+import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 
+import java.util.List;
+
 /**
  * 设备变量列表 服务类
  *
@@ -20,9 +23,11 @@ public interface DeviceAnalogVariableListService extends CrudService<DeviceAnalo
 
     CommonPage<DeviceAnalogVariableList> variableList(String deviceCode, String screen, int size, int current);
 
-    CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo);
+    CommonPage<DeviceAnalogVariableListOneVo> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo);
 
     void variableListAddOne(String deviceAnalogVariableListId, Integer monitoringEquipmentId);
 
+    List<DeviceAnalogVariableList> variableListDroplist();
+
 
 }

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

@@ -8,6 +8,7 @@ import com.bizmatics.common.core.bean.CommonPage;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.system.SysUser;
+import com.bizmatics.model.vo.DeviceAnalogVariableListOneVo;
 import com.bizmatics.model.vo.DeviceAnalogVariableListVo;
 import com.bizmatics.persistence.mapper.DeviceAnalogVariableListMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
@@ -66,15 +67,15 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
     }
 
     @Override
-    public CommonPage<DeviceAnalogVariableList> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
+    public CommonPage<DeviceAnalogVariableListOneVo> variableListone(DeviceAnalogVariableListVo deviceAnalogVariableListVo) {
         int start_current = (deviceAnalogVariableListVo.getSize() - 1) * deviceAnalogVariableListVo.getCurrent();
-        List<DeviceAnalogVariableList> deviceAnalogVariableListOne = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
+        List<DeviceAnalogVariableListOneVo> deviceAnalogVariableListOne = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
                 deviceAnalogVariableListVo.getVariableName(), null, null, deviceAnalogVariableListVo.getDataArea(),deviceAnalogVariableListVo.getMonitoringEquipment());
         int total = 0;
         if (deviceAnalogVariableListOne.size() > 0) {
             total = deviceAnalogVariableListOne.size();
         }
-        List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
+        List<DeviceAnalogVariableListOneVo> deviceAnalogVariableList = baseMapper.variableList(deviceAnalogVariableListVo.getSiteId(), deviceAnalogVariableListVo.getId(),
                 deviceAnalogVariableListVo.getVariableName(), start_current, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getDataArea(),deviceAnalogVariableListVo.getMonitoringEquipment());
         return new CommonPage<>(deviceAnalogVariableList, total, deviceAnalogVariableListVo.getCurrent(), deviceAnalogVariableListVo.getSize());
     }
@@ -91,5 +92,13 @@ public class DeviceAnalogVariableListServiceImpl extends AbstractCrudService<Dev
         }
     }
 
+    @Override
+    public List<DeviceAnalogVariableList> variableListDroplist() {
+        LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DeviceAnalogVariableList::getMonitoringEquipment, 0).eq(DeviceAnalogVariableList::getStatus, 1);
+        List<DeviceAnalogVariableList> DeviceAnalogVariableListDroplist = this.list(queryWrapper);
+        return DeviceAnalogVariableListDroplist;
+    }
+
 
 }

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

@@ -49,7 +49,7 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
 
     @Override
     public  CommonPage<DeviceAttribute> deviceNewsList(Integer id, Integer siteId,Integer size,Integer current) {
-        IPage<DeviceAttribute> page = new Page<DeviceAttribute>(size, current);
+        IPage<DeviceAttribute> page = new Page<DeviceAttribute>(current, size);
         LambdaQueryWrapper<DeviceAttribute> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DeviceAttribute::getStatus, 1).eq(DeviceAttribute::getSiteId, siteId);
         if (id != 0) {
@@ -57,17 +57,7 @@ public class DeviceAttributeServiceImpl extends AbstractCrudService<DeviceAttrib
         }
         page = this.page(page, queryWrapper);
         this.ToCommonPage(page);
-        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getCurrent(), page.getSize());
-
-
-
-//        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;
+        return new CommonPage<>(page.getRecords(), page.getTotal(), page.getSize(),page.getCurrent());
     }
 
     @Override