数据管理-同比分析-下拉框修改1

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

@@ -131,13 +131,13 @@ public class DeviceServiceImpl extends AbstractCrudService<DeviceMapper, Device>
             for (int i = 0; i < deviceList.size(); i++) {
                 DeviceOneVo deviceOneVoOne = new DeviceOneVo();
                 List<DeviceAnalogVariableList> deviceAnalogVariableListTwo = new ArrayList<>();
-                DeviceAnalogVariableList deviceAnalogVariableListThree = new DeviceAnalogVariableList();
                 deviceOneVoOne.setId(deviceList.get(i).getId());
                 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).getMonitoringEquipment())) {
+                            DeviceAnalogVariableList deviceAnalogVariableListThree = new DeviceAnalogVariableList();
                             deviceAnalogVariableListThree.setVariableCoding(deviceAnalogVariableList.get(j).getVariableCoding()+"_"+deviceAnalogVariableList.get(j).getId());
                             deviceAnalogVariableListThree.setVariableName(deviceAnalogVariableList.get(j).getVariableName());
                             deviceAnalogVariableListThree.setId(deviceAnalogVariableList.get(j).getId());