根据行政编码查牧场

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

@@ -107,14 +107,19 @@ public class CollectorRegisterController {
         if (count >0){
             return R.error("编号为"+deviceCode+"的设备已存在");
         }
-        String countyCode = collectorRegister.getCountyCode();
-        QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
-        baseRegionEntityQueryWrapper.eq("region_code",countyCode);
-        BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+//        String countyCode = "";
+//        for (String countyCodes : collectorRegister.getCountyCode().split(",")) {
+//            QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
+//            baseRegionEntityQueryWrapper.eq("region_code",countyCodes);
+//            BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+//            countyCode += baseRegionEntity.getRegionName();
+//        }
+
+
         QueryWrapper<BaseFarmInfoEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("farm_code",collectorRegister.getFarmCode());
         BaseFarmInfoEntity baseFarmInfoEntity = baseFarmInfoDao.selectOne(wrapper);
-        collectorRegister.setCountyName(baseRegionEntity.getRegionName());
+//        collectorRegister.setCountyName(countyCode);
         collectorRegister.setFarmName(baseFarmInfoEntity.getFarmName());
         collectorRegisterService.save(collectorRegister);
 

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

@@ -2,7 +2,9 @@ package com.huimv.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.huimv.manager.entity.BaseRegionEntity;
 import com.huimv.manager.entity.vo.CollectorRegisterVo;
+import com.huimv.manager.mapper.BaseRegionDao;
 import com.huimv.manager.mapper.CollectorRegisterDao;
 import com.huimv.manager.result.R;
 import com.huimv.manager.result.RRException;
@@ -36,6 +38,8 @@ import com.huimv.manager.service.CollectorRegisterService;
 public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterDao, CollectorRegisterEntity> implements CollectorRegisterService {
 
 
+    @Autowired
+    private BaseRegionDao baseRegionDao;
 
     @Override
     public PageUtils queryPage(Map<String, Object> params) {
@@ -54,8 +58,13 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         String networkStatus = (String)params.get("networkStatus");
 
         wrapper.like(StringUtils.isNotBlank(deviceCode),"register.device_code",deviceCode);
-        wrapper.like(StringUtils.isNotBlank(countyName),"register.county_name",countyName).or().like(StringUtils.isNotBlank(countyName),"register.county_code",countyName);
-        wrapper.like(StringUtils.isNotBlank(farmName),"register.farm_name",farmName).or().like(StringUtils.isNotBlank(farmName),"register.farm_code",farmName);
+        if(StringUtils.isNotBlank(countyName)){
+            wrapper.like("register.county_name",countyName).or().like("register.county_code",countyName);
+        }
+        if (StringUtils.isNotBlank(farmName)){
+            wrapper.like("register.farm_name",farmName).or().like("register.farm_code",farmName);
+        }
+
 
 //        wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
         if (StringUtils.isNotBlank(acqStatus)){
@@ -80,15 +89,34 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         }
 
 
-//        wrapper.apply("register.del_status  = 1");
+        wrapper.apply("register.del_status  = 1");
 
         String sortord = (String)params.get("sortord");
         wrapper.orderByDesc(StringUtils.isNotBlank(sortord),sortord);
         IPage<CollectorRegisterVo> page = baseMapper.page(new Query<>().getPage(params),wrapper);
-
+   /* //todo
+        for (CollectorRegisterVo record : page.getRecords()) {
+            String countyCode = record.getCountyCode();
+            getAllCountyCode(countyCode);
+        }
+*/
         return new PageUtils(page);
     }
 
+  /*  private String getAllCountyCode(String countyCode) {
+        QueryWrapper<BaseRegionEntity> baseRegionEntityQueryWrapper = new QueryWrapper<>();
+        baseRegionEntityQueryWrapper.eq("region_code",countyCode);
+        BaseRegionEntity baseRegionEntity = baseRegionDao.selectOne(baseRegionEntityQueryWrapper);
+        if (baseRegionEntity.getParentCode() != null){
+            baseRegionEntityQueryWrapper.clear();
+
+            countyCode = countyCode + getAllCountyCode(countyCode);
+
+        }
+        return countyCode;
+
+    }*/
+
     @Override
     public Map countState(Map<String, Object> params) {
 

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CollectorRegisterDao.xml

@@ -51,7 +51,7 @@
         join base_pigpen pigpen on pigpen.id = register.pigpen_id
         join base_pigpen unit on unit.id = register.unit_id
 
-      ${ew.customSqlSegment} and  register.del_status  = 1
+      ${ew.customSqlSegment}
     </select>