配置修改

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyDevice/controller/EnergyDeviceController.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.modular.energy.energyDevice.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -33,11 +34,13 @@ import vip.xiaonuo.modular.energy.energyDevice.entity.EnergyDevice;
 import vip.xiaonuo.modular.energy.energyDevice.entity.vo.EnergyDeviceCountVo;
 import vip.xiaonuo.modular.energy.energyDevice.param.*;
 import vip.xiaonuo.modular.energy.energyDevice.service.EnergyDeviceService;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDeviceOrgIdParam;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 能耗设备控制器

snowy-web-app/src/main/java/vip/xiaonuo/modular/energy/energyDevice/service/impl/EnergyDeviceServiceImpl.java

@@ -15,12 +15,15 @@ package vip.xiaonuo.modular.energy.energyDevice.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
+import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
@@ -32,10 +35,13 @@ import vip.xiaonuo.modular.energy.energyDevice.entity.vo.EnergyDeviceCountVo;
 import vip.xiaonuo.modular.energy.energyDevice.mapper.EnergyDeviceMapper;
 import vip.xiaonuo.modular.energy.energyDevice.param.*;
 import vip.xiaonuo.modular.energy.energyDevice.service.EnergyDeviceService;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
 
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdata/mapper/mapping/EnvDataMapper.xml

@@ -78,11 +78,11 @@
             WHERE (pigpen_id, update_time) IN (
                 SELECT
                     pigpen_id,
-                    MAX(update_time)
+                 MAX(update_time)
                 FROM `env_data`
-                GROUP BY pigpen_id
-            )
-        ) d ON b.id = d.pigpen_id
-        WHERE b.type = 2 AND b.org_id = #{orgId};
+        GROUP BY pigpen_id
+    )
+) d ON b.id = d.pigpen_id
+WHERE b.type = 2 AND b.org_id = #{orgId};
     </select>
 </mapper>

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envdata/service/impl/EnvDataServiceImpl.java

@@ -30,8 +30,8 @@ import vip.xiaonuo.modular.env.envdata.param.EnvDataBuildNameParm;
 import vip.xiaonuo.modular.env.envdata.param.EnvDataListParm;
 import vip.xiaonuo.modular.env.envdata.param.EnvDataPigpenIdParm;
 import vip.xiaonuo.modular.env.envdata.service.EnvDataService;
-import vip.xiaonuo.modular.env.envDevice.entity.EnvDevice;
-import vip.xiaonuo.modular.env.envDevice.mapper.EnvDeviceMapper;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.mapper.EnvDeviceMapper;
 import vip.xiaonuo.modular.env.mapper.EnvDeviceEquipmentMapper;
 
 import java.math.BigDecimal;

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/controller/EnvDeviceController.java

@@ -10,8 +10,9 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.controller;
+package vip.xiaonuo.modular.env.envdevice.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import cn.hutool.core.lang.tree.Tree;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -30,15 +31,17 @@ import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.pigpen.param.BasePigpenOrgIdParam;
 import vip.xiaonuo.modular.base.pigpen.service.BasePigpenService;
 import vip.xiaonuo.modular.env.entity.EnvDeviceEquipment;
-import vip.xiaonuo.modular.env.envDevice.entity.EnvDevice;
-import vip.xiaonuo.modular.env.envDevice.entity.vo.EnvDeviceCountVo;
-import vip.xiaonuo.modular.env.envDevice.param.*;
-import vip.xiaonuo.modular.env.envDevice.service.EnvDeviceService;
+import vip.xiaonuo.modular.env.envThreshold.param.EnvThresholdUnitIdParam;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.entity.vo.EnvDeviceCountVo;
+import vip.xiaonuo.modular.env.envdevice.param.*;
+import vip.xiaonuo.modular.env.envdevice.service.EnvDeviceService;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 环控设备控制器
@@ -176,7 +179,7 @@ public class EnvDeviceController {
      */
     @ApiOperationSupport(order = 9)
     @ApiOperation("根据单元ID获取单元设备")
-    @GetMapping("/env/envDevice/deviceTypeSelector")
+    @GetMapping("/env/envDevice/getEquipmentByUnitId")
     public CommonResult<List<EnvDeviceEquipment>> getEquipmentByUnitId(unitIdParam unitIdParam) {
         return CommonResult.data(envDeviceService.getEquipmentByUnitId(unitIdParam));
     }

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/entity/EnvDevice.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.entity;
+package vip.xiaonuo.modular.env.envdevice.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fhs.core.trans.anno.Trans;
@@ -23,6 +23,9 @@ import vip.xiaonuo.common.pojo.CommonEntity;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 环控设备实体
  *

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/entity/vo/EnvDeviceCountVo.java

@@ -1,4 +1,4 @@
-package vip.xiaonuo.modular.env.envDevice.entity.vo;
+package vip.xiaonuo.modular.env.envdevice.entity.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/enums/EnvDeviceEnum.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.enums;
+package vip.xiaonuo.modular.env.envdevice.enums;
 
 import lombok.Getter;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/mapper/EnvDeviceMapper.java

@@ -10,14 +10,14 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.mapper;
+package vip.xiaonuo.modular.env.envdevice.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
-import vip.xiaonuo.modular.env.envDevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
 
 /**
  * 环控设备Mapper接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/mapper/mapping/EnvDeviceMapper.xml

@@ -2,12 +2,12 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="vip.xiaonuo.modular.env.envdevice.mapper.EnvDeviceMapper">
 
-    <select id="page" resultType="vip.xiaonuo.modular.env.envDevice.entity.EnvDevice">
+    <select id="page" resultType="vip.xiaonuo.modular.env.envdevice.entity.EnvDevice">
         SELECT d.id,d.device_code,d.device_type,d.device_name,p.build_name AS installPosition,d.status
         FROM `env_device` d LEFT JOIN `base_pigpen` p ON d.install_position = p.id
         ${ew.customSqlSegment}
     </select>
-    <select id="detail" resultType="vip.xiaonuo.modular.env.envDevice.entity.EnvDevice">
+    <select id="detail" resultType="vip.xiaonuo.modular.env.envdevice.entity.EnvDevice">
         SELECT d.id,d.device_code,d.device_type,d.device_name,p.build_name AS installPosition,d.status
         FROM `env_device` d LEFT JOIN `base_pigpen` p ON d.install_position = p.id
         WHERE d.id = #{id}

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/EnvDeviceAddParam.java

@@ -10,14 +10,18 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 环控设备添加参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/EnvDeviceEditParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
@@ -18,6 +18,8 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 环控设备编辑参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/EnvDeviceIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/EnvDeviceOrgIdParam.java

@@ -10,7 +10,7 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/EnvDevicePageParam.java

@@ -10,11 +10,13 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 环控设备查询参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/param/unitIdParam.java

@@ -10,11 +10,12 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.param;
+package vip.xiaonuo.modular.env.envdevice.param;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.modular.env.envThreshold.param.EnvThresholdOrgIdParam;
 
 import javax.validation.constraints.NotBlank;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/service/EnvDeviceService.java

@@ -10,18 +10,19 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.service;
+package vip.xiaonuo.modular.env.envdevice.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.env.entity.EnvDeviceEquipment;
-import vip.xiaonuo.modular.env.envDevice.entity.EnvDevice;
-import vip.xiaonuo.modular.env.envDevice.entity.vo.EnvDeviceCountVo;
-import vip.xiaonuo.modular.env.envDevice.param.*;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.entity.vo.EnvDeviceCountVo;
+import vip.xiaonuo.modular.env.envdevice.param.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 环控设备Service接口

snowy-web-app/src/main/java/vip/xiaonuo/modular/env/envDevice/service/impl/EnvDeviceServiceImpl.java

@@ -10,32 +10,40 @@
  * 5.不可二次分发开源参与同类竞品，如有想法可联系团队xiaonuobase@qq.com商议合作。
  * 6.若您的项目无法满足以上几点，需要更多功能代码，获取Snowy商业授权许可，请在官网购买授权，地址为 https://www.xiaonuo.vip
  */
-package vip.xiaonuo.modular.env.envDevice.service.impl;
+package vip.xiaonuo.modular.env.envdevice.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
+import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
+import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.common.pojo.CommonResult;
+import vip.xiaonuo.core.enums.EnvDataTypeEnum;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper;
 import vip.xiaonuo.modular.base.pigpen.entity.BasePigpen;
 import vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper;
+import vip.xiaonuo.modular.energy.energyDevice.entity.EnergyDevice;
 import vip.xiaonuo.modular.env.entity.EnvDeviceEquipment;
-import vip.xiaonuo.modular.env.envDevice.entity.EnvDevice;
-import vip.xiaonuo.modular.env.envDevice.entity.vo.EnvDeviceCountVo;
-import vip.xiaonuo.modular.env.envDevice.mapper.EnvDeviceMapper;
-import vip.xiaonuo.modular.env.envDevice.param.*;
-import vip.xiaonuo.modular.env.envDevice.service.EnvDeviceService;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.entity.vo.EnvDeviceCountVo;
+import vip.xiaonuo.modular.env.envdevice.mapper.EnvDeviceMapper;
+import vip.xiaonuo.modular.env.envdevice.param.*;
+import vip.xiaonuo.modular.env.envdevice.service.EnvDeviceService;
 import vip.xiaonuo.modular.env.mapper.EnvDeviceEquipmentMapper;
 
+import javax.validation.constraints.NotBlank;
 import java.text.NumberFormat;
 import java.util.*;
 import java.util.stream.Collectors;

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/controller/FeedingEnvController.java

@@ -12,6 +12,7 @@
  */
 package vip.xiaonuo.modular.feed.feedingenv.controller;
 
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -27,6 +28,9 @@ import vip.xiaonuo.common.annotation.CommonLog;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.common.pojo.CommonValidList;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDeviceOrgIdParam;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDevicePageParam;
 import vip.xiaonuo.modular.feed.feedingenv.entity.FeedingEnv;
 import vip.xiaonuo.modular.feed.feedingenv.param.*;
 import vip.xiaonuo.modular.feed.feedingenv.service.FeedingEnvService;
@@ -35,6 +39,7 @@ import javax.annotation.Resource;
 import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 精准饲喂设备控制器

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/param/FeedingEnvListParam.java

@@ -15,7 +15,7 @@ package vip.xiaonuo.modular.feed.feedingenv.param;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import vip.xiaonuo.modular.env.envDevice.param.EnvDeviceOrgIdParam;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDeviceOrgIdParam;
 
 /**
  * 环控设备查询参数

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/FeedingEnvService.java

@@ -17,6 +17,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDeviceOrgIdParam;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDevicePageParam;
 import vip.xiaonuo.modular.feed.feedingenv.entity.FeedingEnv;
 import vip.xiaonuo.modular.feed.feedingenv.param.*;
 

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/service/impl/FeedingEnvServiceImpl.java

@@ -15,6 +15,7 @@ package vip.xiaonuo.modular.feed.feedingenv.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -23,17 +24,23 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.page.CommonPageRequest;
 import vip.xiaonuo.common.pojo.CommonResult;
 import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
 import vip.xiaonuo.modular.base.baseConfig.mapper.BaseConfigMapper;
 import vip.xiaonuo.modular.base.pigpen.mapper.BasePigpenMapper;
+import vip.xiaonuo.modular.env.envdevice.entity.EnvDevice;
+import vip.xiaonuo.modular.env.envdevice.entity.vo.EnvDeviceCountVo;
+import vip.xiaonuo.modular.env.envdevice.param.EnvDeviceOrgIdParam;
 import vip.xiaonuo.modular.feed.feedingenv.entity.FeedingEnv;
 import vip.xiaonuo.modular.feed.feedingenv.mapper.FeedingEnvMapper;
 import vip.xiaonuo.modular.feed.feedingenv.param.*;
 import vip.xiaonuo.modular.feed.feedingenv.service.FeedingEnvService;
 
+import javax.validation.constraints.NotBlank;
+import java.text.DecimalFormat;
 import java.text.NumberFormat;
 import java.util.List;