同比分析右侧树形数据-修改

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

@@ -137,6 +137,7 @@
             a.status = 1
             AND b.status = 1
             AND a.data_area = 1
+            AND a.monitoring_equipment != 0
             <if test="siteId != null and siteId != 0">
                 AND b.site_id = #{siteId}
             </if>

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

@@ -15,16 +15,14 @@ import com.bizmatics.common.core.util.BeanMapperUtils;
 import com.bizmatics.common.core.util.FileUtils;
 import com.bizmatics.common.mvc.base.AbstractCrudService;
 import com.bizmatics.common.spring.util.GlobalUtils;
-import com.bizmatics.model.Device;
-import com.bizmatics.model.DeviceAnalogVariableList;
-import com.bizmatics.model.DeviceList;
-import com.bizmatics.model.DeviceStatus;
+import com.bizmatics.model.*;
 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.DeviceAttributeService;
 import com.bizmatics.service.DeviceService;
 import com.bizmatics.service.DeviceStatusService;
 import com.bizmatics.service.enums.DeviceStatusCode;
@@ -61,6 +59,8 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     private DeviceAnalogVariableListService deviceAnalogVariableListService;
     @Autowired
     private DeviceStatusService deviceStatusService;
+    @Autowired
+    private DeviceAttributeService deviceAttributeService;
 
     @Override
     public DeviceCountVO selectDeviceCount(Date startTime, Date endTime) {
@@ -122,9 +122,9 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
     @Override
     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);
+        LambdaQueryWrapper<DeviceAttribute> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DeviceAttribute::getStatus, 1).eq(DeviceAttribute::getSiteId, siteId);
+        List<DeviceAttribute> deviceList = deviceAttributeService.list(queryWrapper);
         List<DeviceAnalogVariableList> deviceAnalogVariableList = baseMapper.deviceAnalogVariableList(siteId);
 
         if (deviceList.size() > 0) {
@@ -132,11 +132,11 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
                 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());
+                deviceOneVoOne.setDeviceCode(deviceList.get(i).getMonitorDeviceCode());
+                deviceOneVoOne.setDeviceName(deviceList.get(i).getMonitorDeviceName());
                 if (deviceAnalogVariableList.size() > 0) {
                     for (int j = 0; j < deviceAnalogVariableList.size(); j++) {
-                        if (deviceList.get(i).getId().equals(deviceAnalogVariableList.get(j).getCommunicationEquipment())) {
+                        if (deviceList.get(i).getId().equals(deviceAnalogVariableList.get(j).getMonitoringEquipment())) {
                             deviceAnalogVariableListTwo.add(deviceAnalogVariableList.get(j));
                         }
                     }