数据管理-同比分析报表-右侧设备查询

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

@@ -9,6 +9,7 @@ import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.HtAnalogData;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
+import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.persistence.mapper.HtAnalogDataMapper;
 import com.bizmatics.service.DeviceService;
@@ -93,8 +94,8 @@ public class DeviceController {
      * @return
      */
     @GetMapping("dataManagementDeviceList")
-    public ApiResult<List<Device>> dataManagementDeviceList(@RequestParam int siteId,
-                                                            @RequestParam(value = "deviceType", required = false, defaultValue = "1") int deviceType) {
+    public ApiResult<List<DeviceOneVo>> dataManagementDeviceList(@RequestParam int siteId,
+                                                                 @RequestParam(value = "deviceType", required = false, defaultValue = "1") int deviceType) {
         return ApiResult.success(deviceService.dataManagementDeviceList(siteId, deviceType));
     }
 

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

@@ -0,0 +1,51 @@
+package com.bizmatics.model.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.bizmatics.model.DeviceAnalogVariableList;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2021-07-07
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class DeviceOneVo implements Serializable {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 设备信息表ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备编号
+     */
+    private String deviceCode;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 变量列表
+     */
+    private List<DeviceAnalogVariableList> deviceAnalogVariableList;
+
+}

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

@@ -1,7 +1,8 @@
 package com.bizmatics.persistence.mapper;
 
-import com.bizmatics.model.Device;
 import com.bizmatics.common.mvc.base.CrudMapper;
+import com.bizmatics.model.Device;
+import com.bizmatics.model.DeviceAnalogVariableList;
 import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
 import org.apache.ibatis.annotations.Param;
@@ -12,7 +13,7 @@ import java.util.List;
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author ya
@@ -24,6 +25,7 @@ public interface DeviceMapper extends CrudMapper<Device> {
 
     /**
      * 根据条件查询总数
+     *
      * @param userId
      * @param siteId
      * @param deviceStatus
@@ -43,6 +45,7 @@ public interface DeviceMapper extends CrudMapper<Device> {
                       @Param("startTime") Date startTime,
                       @Param("endTime") Date endTime,
                       @Param("type") String type);
+
     List<DeviceList> DeviceList(@Param("siteId") Integer siteId);
 
     List<CorrespondDeviceVO> CorrespondDeviceList(@Param("deviceName") String deviceName,
@@ -50,4 +53,7 @@ public interface DeviceMapper extends CrudMapper<Device> {
                                                   @Param("size") Integer size);
 
 
+    List<DeviceAnalogVariableList> deviceAnalogVariableList(@Param("siteId") Integer siteId);
+
+
 }

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

@@ -135,6 +135,20 @@
 
     </select>
 
-
+    <select id="deviceAnalogVariableList" resultType="com.bizmatics.model.DeviceAnalogVariableList">
+        SELECT
+        a.*
+        FROM
+        device_analog_variable_list AS a
+        JOIN device AS b ON a.communication_equipment = b.id
+        <where>
+            a.status = 1
+            AND b.enable = 1
+            AND a.data_area = 1
+            <if test="siteId != null and siteId != 0">
+                AND b.site_id = #{siteId}
+            </if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -6,6 +6,7 @@ import com.bizmatics.model.Device;
 import com.bizmatics.model.DeviceList;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
+import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.service.vo.CorrespondDeviceVOT;
 import com.bizmatics.service.vo.DeviceCountVO;
 
@@ -40,7 +41,7 @@ public interface DeviceService extends CrudService<Device> {
 
     List<DeviceList> deviceList(String siteId);
 
-    List<Device> dataManagementDeviceList(int siteId, int deviceType);
+    List<DeviceOneVo> dataManagementDeviceList(int siteId, int deviceType);
 
     void correspondDeviceAdd(Device device);
 

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

@@ -13,6 +13,7 @@ import com.bizmatics.model.DeviceStatus;
 import com.bizmatics.model.system.SysUser;
 import com.bizmatics.model.vo.CorrespondDeviceListVO;
 import com.bizmatics.model.vo.CorrespondDeviceVO;
+import com.bizmatics.model.vo.DeviceOneVo;
 import com.bizmatics.persistence.mapper.DeviceMapper;
 import com.bizmatics.service.DeviceAnalogVariableListService;
 import com.bizmatics.service.DeviceService;
@@ -104,17 +105,33 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     }
 
     @Override
-    public List<Device> dataManagementDeviceList(int siteId, int deviceType) {
+    public List<DeviceOneVo> dataManagementDeviceList(int siteId, int deviceType) {
+        List<DeviceOneVo> deviceOneVo = new ArrayList<>();
         LambdaQueryWrapper<Device> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(Device::getEnable, 1).eq(Device::getSiteId, siteId);
         List<Device> deviceList = this.list(queryWrapper);
+        List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.deviceAnalogVariableList(siteId);
+
+        if (deviceList.size()>0){
+            for (int i = 0; i < deviceList.size(); i++) {
+                DeviceOneVo deviceOneVoOne = new DeviceOneVo();
+                List<DeviceAnalogVariableList> deviceAnalogVariableListTwo = new ArrayList<>();
+                deviceOneVoOne.setId(deviceList.get(i).getId());
+                deviceOneVoOne.setDeviceCode(deviceList.get(i).getDeviceCode());
+                deviceOneVoOne.setDeviceName(deviceList.get(i).getDeviceName());
+                if (deviceAnalogVariableList.size()>0){
+                    for (int j = 0; j < deviceAnalogVariableList.size(); j++) {
+                        if (deviceList.get(i).getId()==deviceAnalogVariableList.get(j).getCommunicationEquipment()){
+                            deviceAnalogVariableListTwo.add(deviceAnalogVariableList.get(j));
+                        }
+                    }
+                }
+                deviceOneVoOne.setDeviceAnalogVariableList(deviceAnalogVariableListTwo);
+                deviceOneVo.add(deviceOneVoOne);
+            }
+        }
 
-//        LambdaQueryWrapper<DeviceAnalogVariableList> queryWrapperOne = Wrappers.lambdaQuery();
-//        queryWrapperOne.eq(DeviceAnalogVariableList::getStatus, 1).eq(DeviceAnalogVariableList::getSiteId, siteId);
-//        List<DeviceAnalogVariableList> deviceAnalogVariableList = this.list(queryWrapperOne);
-
-
-        return deviceList;
+        return deviceOneVo;
     }
 
     @Override