修改12

huimv-admin/src/main/java/com/huimv/admin/config/InterceptorConfig.java

@@ -33,6 +33,10 @@ public class InterceptorConfig implements WebMvcConfigurer {
                         ,"/huatongApi/energy-data/getData16"
                         ,"/huatongApi/energy-data/getData17"
                         ,"/huatongApi/energy-data/getData18"
+                        ,"/huatongApi/energy-data/getData19"
+                        ,"/huatongApi/energy-data/getData20"
+                        ,"/huatongApi/energy-data/getData21"
+                        ,"/huatongApi/energy-data/getData22"
                         ,"/huatongApi/energy-data/getDeviceStatus");
     }
 }

huimv-admin/src/main/java/com/huimv/admin/controller/EnergyDataController.java

@@ -513,6 +513,7 @@ public class EnergyDataController {
             EnergyEnvDevice device = deviceService.getOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(device)) {
                 energyData.setUnitId(device.getUnitId());
+                energyData.setUnitName(device.getUnitName());
             }
             iEnergyDataService.save(energyData);
         }
@@ -534,6 +535,7 @@ public class EnergyDataController {
             EnergyEnvDevice device = deviceService.getOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(device)) {
                 energyData.setUnitId(device.getUnitId());
+                energyData.setUnitName(device.getUnitName());
             }
             iEnergyDataService.save(energyData);
         }
@@ -555,6 +557,7 @@ public class EnergyDataController {
             EnergyEnvDevice device = deviceService.getOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(device)) {
                 energyData.setUnitId(device.getUnitId());
+                energyData.setUnitName(device.getUnitName());
             }
             iEnergyDataService.save(energyData);
         }
@@ -576,6 +579,7 @@ public class EnergyDataController {
             EnergyEnvDevice device = deviceService.getOne(queryWrapper);
             if (ObjectUtil.isNotEmpty(device)) {
                 energyData.setUnitId(device.getUnitId());
+                energyData.setUnitName(device.getUnitName());
             }
             iEnergyDataService.save(energyData);
         }