精准饲喂母猪修改4

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

@@ -27,7 +27,9 @@ import org.springframework.web.bind.annotation.RestController;
 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.*;
@@ -126,11 +128,24 @@ public class FeedingEnvController {
     }
 
 
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 6)
     @ApiOperation("获取精准饲喂设备分页")
-    @GetMapping("/env/envDevice/listPage")
+    @GetMapping("/feed/feedingenv/listPage")
     public CommonResult<Page<FeedingEnv>> page1(FeedingEnvListParam envDevicePageParam) {
         return CommonResult.data(feedingEnvService.page(envDevicePageParam));
     }
 
+
+    /**
+     * 获取设备类型选择器
+     *
+     * @author newspaper
+     * @date  2023/12/18 09:58
+     */
+    @ApiOperationSupport(order = 7)
+    @ApiOperation("获取设备类型选择器")
+    @GetMapping("/feed/feedingenv/deviceTypeSelector")
+    public CommonResult<List<BaseConfig>> deviceTypeSelector(FeedingEnvPageParam envDeviceOrgIdParam) {
+        return CommonResult.data(feedingEnvService.deviceTypeSelector(envDeviceOrgIdParam));
+    }
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingenv/entity/FeedingEnv.java

@@ -13,9 +13,13 @@
 package vip.xiaonuo.modular.feed.feedingenv.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
+import vip.xiaonuo.modular.base.baseConfig.entity.BaseConfig;
+
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -41,6 +45,7 @@ public class FeedingEnv {
 
     /** 设备类型 */
     @ApiModelProperty(value = "设备类型", position = 3)
+    @Trans(type = TransType.SIMPLE, target = BaseConfig.class,fields = "configName", alias = "type", ref = "deviceType")
     private String deviceType;
 
     /** 设备名称 */

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

@@ -16,7 +16,9 @@ import com.alibaba.fastjson.JSONObject;
 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.*;
@@ -86,4 +88,6 @@ public interface FeedingEnvService extends IService<FeedingEnv> {
     JSONObject listEnv(String orgId);
 
     Page<FeedingEnv> page(FeedingEnvListParam envDevicePageParam);
+
+    List<BaseConfig> deviceTypeSelector(FeedingEnvPageParam envDeviceOrgIdParam);
 }

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

@@ -28,7 +28,11 @@ 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.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.*;
@@ -49,6 +53,11 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
 
     @Autowired
     private FeedingEnvMapper envMapper;
+    @Autowired
+    private BaseConfigMapper baseConfigMapper;
+    @Autowired
+    private BasePigpenMapper basePigpenMapper;
+
 
     @Override
     public List<FeedingEnv> page(FeedingEnvPageParam feedingEnvPageParam) {
@@ -120,11 +129,11 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
         Integer onliveCount = 0;
         Integer offliveCount = 0;
         for (FeedingEnv env : envs) {
-            if (env.getDeviceStatus() == 0) {
+            if (env.getDeviceStatus() == 1) {
                 //在线
                 onliveCount = onliveCount + 1;
             }
-            if (env.getDeviceStatus() == 1) {
+            if (env.getDeviceStatus() == 0) {
                 //离线
                 offliveCount = offliveCount + 1;
             }
@@ -150,4 +159,13 @@ public class FeedingEnvServiceImpl extends ServiceImpl<FeedingEnvMapper, Feeding
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
+
+
+    @Override
+    public List<BaseConfig> deviceTypeSelector(FeedingEnvPageParam envDeviceOrgIdParam) {
+        String orgId = envDeviceOrgIdParam.getOrgId();
+        String parentId = baseConfigMapper.selectOne(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, 0).eq(BaseConfig::getConfigName, "环控设备类型")).getId();
+        List<BaseConfig> baseConfigs = baseConfigMapper.selectList(new QueryWrapper<BaseConfig>().lambda().eq(BaseConfig::getParentId, parentId).eq(BaseConfig::getOrgId, orgId));
+        return baseConfigs;
+    }
 }

snowy-web-app/src/main/java/vip/xiaonuo/modular/feed/feedingfat/entity/FeedingFat.java

@@ -83,4 +83,8 @@ public class FeedingFat {
     /** 体温 */
     @ApiModelProperty(value = "体温", position = 13)
     private String temp;
+
+    /** 日龄 */
+    @ApiModelProperty(value = "体温", position = 14)
+    private String dayNum;
 }