接受数据修改6

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/CameraListVo.java

@@ -13,4 +13,5 @@ public class CameraListVo {
     private Integer sort;
     private Integer farmId;
     private Integer isOnline;
+    private Integer functionId;
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mqtt/EnvControll/PushCallback.java

@@ -172,6 +172,9 @@ public class PushCallback implements MqttCallbackExtended {
                 envData.setUnitId(device.getUnitId());
                 envData.setFarmId(device.getFarmId());
                 IEnvDataService dataService = SpringUtil.getBean(IEnvDataService.class);
+                if ("0".equals(humi2.toString()) || "0".equals(temp2.toString())){
+                    return;
+                }
                 dataService.save(envData);
                 log.info("温湿度处理完成！");
 

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnergyWaterServiceImpl.java

@@ -190,7 +190,7 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         String type = paramsMap.get("type");
         String unitId = paramsMap.get("unitId");
         List<WaterLineVo> waterLineList = new ArrayList<>();
-        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id", unitId).eq("chip_type", 3));
+        List<EnvDeviceChip> deviceChipList = envDeviceChipMapper.selectList(new QueryWrapper<EnvDeviceChip>().eq("unit_id", unitId).eq("chip_type", 3).ne("chip_code",1005));
         if (ObjectUtil.isEmpty(deviceChipList)) {
             return new Result(ResultCode.SUCCESS, waterLineList);
         }
@@ -239,28 +239,28 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         queryWrapper.eq("farm_id", farmId);
         if (type.equals("1")) {
             Date timesmorning = DataUill.getTimesmorning();
-            queryWrapper.ge("create_date", timesmorning);
+            queryWrapper.ge("create_date", timesmorning).ne("chip_code",1005);
             waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //本周
 
         if (type.equals("2")) {
             DateTime dateTime = DateUtil.beginOfWeek(new Date());
-            queryWrapper.ge("create_date", dateTime);
+            queryWrapper.ge("create_date", dateTime).ne("chip_code",1005);
             waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //本月
 
         if (type.equals("3")) {
             Date timesMonthmorning = DataUill.getTimesMonthmorning();
-            queryWrapper.ge("create_date", timesMonthmorning);
+            queryWrapper.ge("create_date", timesMonthmorning).ne("chip_code",1005);
             waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         //自定义
 
         if (type.equals("4")) {
             endTime = endTime + " 23:59:59";
-            queryWrapper.between("create_date", startTime, endTime);
+            queryWrapper.between("create_date", startTime, endTime).ne("chip_code",1005);
             waterVos = energyWaterMapper.selectList(queryWrapper);
         }
         EnergyWater water = energyWaterMapper.printWaterCount(queryWrapper);//总吨数

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/SysCameraServiceImpl.java

@@ -91,7 +91,7 @@ public class SysCameraServiceImpl extends ServiceImpl<SysCameraMapper, SysCamera
         } else {
             wrapper.orderByAsc("sort");
         }
-        wrapper.orderByDesc("id");
+//        wrapper.orderByDesc("id");
         return new Result(ResultCode.SUCCESS, page(new Page<>(current, size), wrapper));
     }
 

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/ExcelImportSheet.java

@@ -63,9 +63,11 @@ public class ExcelImportSheet {
             //一行对应一个T，将对象强转为泛型
             e = (T) cs.newInstance();
             //遍历单元行的每一列 设置值给泛型e
+
             for (int j = 0; j < row.getLastCellNum(); j++) {
                 //获取一个单元格
                 Cell cell = row.getCell(j);
+
                 //调用泛型对象的set方法设置单元格里的值 这也就是为什么我们要获取属性顺序以及其对应的类型
                 cs.getMethod(getSetterMethodName(paramsList.get(j)) , typeClass.get(j))
                         .invoke(e , getValueFromType(cell , typeClass.get(j)));