app查询栋舍列表

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/controller/BasePigpenController.java

@@ -26,7 +26,6 @@ import com.huimv.manager.service.BasePigpenService;
 public class BasePigpenController {
     @Autowired
     private BasePigpenService basePigpenService;
-    private Map<String, Object> params;
 
     /**
      * 列表
@@ -153,4 +152,13 @@ public class BasePigpenController {
 
         return R.ok().put("page", list);
     }
+    /*
+     *更新栋舍信息
+     */
+    @RequestMapping("/test")
+    public void test(){
+         basePigpenService.test();
+
+    }
+
 }

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/BasePigpenService.java

@@ -27,5 +27,7 @@ public interface BasePigpenService extends IService<BasePigpenEntity> {
     void delete(Integer[] ids);
 
     List appTemp(Map<String, Object> params);
+
+    void test();
 }
 

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/BasePigpenServiceImpl.java

@@ -52,10 +52,10 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
         String farmCode = (String)params.get("farmCode");
-        String createStartTime = (String)params.get("createStartTime");
-        String createEndTime = (String)params.get("createEndTime");
+        String createStartTime = (String)params.get("registerStartTime ");
+        String createEndTime = (String)params.get("registerEndTime");
         String stage = (String)params.get("stage");
-        String name = (String)params.get("name");
+        String name = (String)params.get("pigpenName");
 
         QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
@@ -66,7 +66,7 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
             wrapper.eq("stage",Integer.parseInt(stage));
         }
 
-        wrapper.like(StringUtils.isNotBlank(name),"name",name);
+        wrapper.like(StringUtils.isNotBlank(name),"pigpen_name",name);
 
 
         IPage<BasePigpenEntity> page = this.page(
@@ -88,44 +88,115 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
     @Override
     public PageUtils appList(Map<String, Object> params) {
         String farmCode = (String)params.get("farmCode");
-        String stage = (String)params.get("stage");
-        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
-        wrapper.eq("type",2);
-        if (StringUtils.isNotBlank(stage)){
-            wrapper.eq("stage",Integer.parseInt(stage));
-        }
-
-        IPage<BasePigpenEntity> page = this.page(
-                new Query<BasePigpenEntity>().getPage(params),
-                wrapper
-        );
-
-
-        List<PigpenVo> pigpenVos = new ArrayList<>();
-        QueryWrapper<PigBasicInformationEntity> pigBasicInformationEntityQueryWrapper = new QueryWrapper<>();
-        for (BasePigpenEntity record : page.getRecords()) {
-            Integer id = record.getId();
-            Integer parentId = record.getParentId();
-            pigBasicInformationEntityQueryWrapper.eq("unit_id",id);
-            Integer countPig = pigBasicInformationDao.selectCount(pigBasicInformationEntityQueryWrapper);
-            PigpenVo pigpenVo = new PigpenVo();
-            BasePigpenEntity basePigpenEntity = baseMapper.selectById(parentId);
-
-            pigpenVo.setPigpenName(basePigpenEntity.getPigpenName()+record.getPigpenName());
-            pigpenVo.setPigpenTemp(record.getPigpenTemp());
-            pigpenVo.setStage(record.getStage());
-            pigpenVo.setTempAnomaly(record.getTempAnomaly());
-
-
-            pigpenVo.setCountPig(countPig);
-            pigpenVos.add(pigpenVo);
+        String type = (String)params.get("type");
+
+        IPage page1 = new Page();
+
+        if ("0".equals(type)){
+            QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+            wrapper.eq("type",2);
+
+
+            IPage<BasePigpenEntity> page = this.page(
+                    new Query<BasePigpenEntity>().getPage(params),
+                    wrapper
+            );
+            page1 = page;
+            List<PigpenVo> pigpenVos = new ArrayList<>();
+            QueryWrapper<PigBasicInformationEntity> pigBasicInformationEntityQueryWrapper = new QueryWrapper<>();
+            for (BasePigpenEntity record : page.getRecords()) {
+                Integer id = record.getId();
+                Integer parentId = record.getParentId();
+                pigBasicInformationEntityQueryWrapper.eq("unit_id",id);
+                Integer countPig = pigBasicInformationDao.selectCount(pigBasicInformationEntityQueryWrapper);
+                PigpenVo pigpenVo = new PigpenVo();
+                BasePigpenEntity basePigpenEntity = baseMapper.selectById(parentId);
+
+                pigpenVo.setPigpenName(basePigpenEntity.getPigpenName()+record.getPigpenName());
+                pigpenVo.setPigpenTemp(record.getPigpenTemp());
+                pigpenVo.setStage(record.getStage());
+                pigpenVo.setTempAnomaly(record.getTempAnomaly());
+
+
+                pigpenVo.setCountPig(countPig);
+                pigpenVos.add(pigpenVo);
+
+            }
+
+            page1.setRecords(pigpenVos);
+
+
+            return new PageUtils(page1);
+        }else if ("1".equals(type)){
+            QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+            wrapper.eq("type",2);
+            wrapper.eq("temp_anomaly",0);
+
+
+            IPage<BasePigpenEntity> page = this.page(
+                    new Query<BasePigpenEntity>().getPage(params),
+                    wrapper
+            );
+            List<PigpenVo> pigpenVos = new ArrayList<>();
+            QueryWrapper<PigBasicInformationEntity> pigBasicInformationEntityQueryWrapper = new QueryWrapper<>();
+            for (BasePigpenEntity record : page.getRecords()) {
+                Integer id = record.getId();
+                Integer parentId = record.getParentId();
+                pigBasicInformationEntityQueryWrapper.eq("unit_id",id);
+                Integer countPig = pigBasicInformationDao.selectCount(pigBasicInformationEntityQueryWrapper);
+                PigpenVo pigpenVo = new PigpenVo();
+                BasePigpenEntity basePigpenEntity = baseMapper.selectById(parentId);
+
+                pigpenVo.setPigpenName(basePigpenEntity.getPigpenName()+record.getPigpenName());
+                pigpenVo.setPigpenTemp(record.getPigpenTemp());
+                pigpenVo.setStage(record.getStage());
+                pigpenVo.setTempAnomaly(record.getTempAnomaly());
+
+
+                pigpenVo.setCountPig(countPig);
+                pigpenVos.add(pigpenVo);
+
+            }
+            page1 = page;
+            page1.setRecords(pigpenVos);
+
+
+
+        }else if ("2".equals(type)){
+            QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code",farmCode);
+            wrapper.eq("type",2);
+            wrapper.isNull("pigpen_temp");
+
+
+            IPage<BasePigpenEntity> page = this.page(
+                    new Query<BasePigpenEntity>().getPage(params),
+                    wrapper
+            );
+            List<PigpenVo> pigpenVos = new ArrayList<>();
+            QueryWrapper<PigBasicInformationEntity> pigBasicInformationEntityQueryWrapper = new QueryWrapper<>();
+            for (BasePigpenEntity record : page.getRecords()) {
+                Integer id = record.getId();
+                Integer parentId = record.getParentId();
+                pigBasicInformationEntityQueryWrapper.eq("unit_id",id);
+                Integer countPig = pigBasicInformationDao.selectCount(pigBasicInformationEntityQueryWrapper);
+                PigpenVo pigpenVo = new PigpenVo();
+                BasePigpenEntity basePigpenEntity = baseMapper.selectById(parentId);
+
+                pigpenVo.setPigpenName(basePigpenEntity.getPigpenName()+record.getPigpenName());
+                pigpenVo.setPigpenTemp(record.getPigpenTemp());
+                pigpenVo.setStage(record.getStage());
+                pigpenVo.setTempAnomaly(record.getTempAnomaly());
+                pigpenVo.setCountPig(countPig);
+                pigpenVos.add(pigpenVo);
+            }
+            page1 = page;
+            page1.setRecords(pigpenVos);
 
         }
 
-        IPage<PigpenVo> page1 = new Page();
-        page1.setRecords(pigpenVos);
-
 
         return new PageUtils(page1);
 
@@ -185,4 +256,33 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenDao, BasePigpen
 
         return  deviceTempDao.selectList(deviceTempEntityQueryWrapper);
     }
+
+    @Override
+    public void test() {
+        QueryWrapper<BasePigpenEntity> wrapper = new QueryWrapper<>();
+        wrapper.eq("type",2);
+        List<BasePigpenEntity> basePigpenEntities = baseMapper.selectList(wrapper);
+        for (BasePigpenEntity basePigpenEntity : basePigpenEntities) {
+            Integer unitId = basePigpenEntity.getId();
+            QueryWrapper<CollectorRegisterEntity> registerEntityQueryWrapper = new QueryWrapper<>();
+            registerEntityQueryWrapper.eq("unit_id",unitId);
+            List<CollectorRegisterEntity> collectorRegisterEntities = collectorRegisterDao.selectList(registerEntityQueryWrapper);
+            if (collectorRegisterEntities == null || collectorRegisterEntities.size() == 0){
+                basePigpenEntity.setPigpenTemp(null);
+                baseMapper.updateById(basePigpenEntity);
+            }else {
+                CollectorRegisterEntity collectorRegisterEntity = collectorRegisterEntities.get(0);
+                String deviceCode = collectorRegisterEntity.getDeviceCode();
+                QueryWrapper<DeviceTempEntity> deviceTempEntityQueryWrapper = new QueryWrapper<>();
+
+                deviceTempEntityQueryWrapper.eq("device_code",deviceCode);
+                deviceTempEntityQueryWrapper.orderByDesc("id");
+                deviceTempEntityQueryWrapper.last("limit 1");
+                DeviceTempEntity deviceTempEntity = deviceTempDao.selectOne(deviceTempEntityQueryWrapper);
+                basePigpenEntity.setPigpenTemp(   deviceTempEntity.getTempValue());
+                baseMapper.updateById(basePigpenEntity);
+            }
+
+        }
+    }
 }