|
@@ -7,7 +7,6 @@ import com.huimv.center.mapper.BizDeviceRegisterMapper;
|
|
import com.huimv.center.pojo.BizDeviceRegister;
|
|
import com.huimv.center.pojo.BizDeviceRegister;
|
|
import com.huimv.center.producer.Producer;
|
|
import com.huimv.center.producer.Producer;
|
|
import com.huimv.center.service.BizDeviceRegisterService;
|
|
import com.huimv.center.service.BizDeviceRegisterService;
|
|
-//import com.huimv.center.utils.DateUtil;
|
|
|
|
import com.huimv.center.utils.IDUtil;
|
|
import com.huimv.center.utils.IDUtil;
|
|
import com.huimv.eartag2.common.utils.DateUtil;
|
|
import com.huimv.eartag2.common.utils.DateUtil;
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
@@ -15,12 +14,15 @@ import com.huimv.eartag2.common.utils.ResultCode;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
+import org.springframework.util.CollectionUtils;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
import javax.annotation.Resource;
|
|
import java.text.ParseException;
|
|
import java.text.ParseException;
|
|
|
|
+import java.util.Comparator;
|
|
import java.util.HashMap;
|
|
import java.util.HashMap;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
import java.util.Map;
|
|
import java.util.Map;
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
/**
|
|
* <p>
|
|
* <p>
|
|
@@ -237,4 +239,25 @@ public class BizDeviceRegisterServiceImpl extends ServiceImpl<BizDeviceRegisterM
|
|
producer.fanoutSyncDevice(map);
|
|
producer.fanoutSyncDevice(map);
|
|
return ResultUtil.result(1);
|
|
return ResultUtil.result(1);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public String getBizDeviceRegisterByFarmCode(String farmCode) {
|
|
|
|
+ QueryWrapper<BizDeviceRegister> queryWrapper = new QueryWrapper<>();
|
|
|
|
+ queryWrapper.like(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
|
|
|
|
+ List<BizDeviceRegister> deviceRegisters = bizDeviceRegisterMapper.selectList(queryWrapper);
|
|
|
|
+ String code = builderBaseStationCode(deviceRegisters);
|
|
|
|
+ return code;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private String builderBaseStationCode(List<BizDeviceRegister> deviceRegisters){
|
|
|
|
+ if (CollectionUtils.isEmpty(deviceRegisters)){
|
|
|
|
+ //说明没有注册过,直接返回六位顺序码
|
|
|
|
+ return "000000";
|
|
|
|
+ }else {
|
|
|
|
+ //说明注册过、获取列表中最大的数据截取后六位+1f进行返回
|
|
|
|
+ List<BizDeviceRegister> sortList= deviceRegisters.stream().sorted(Comparator.comparing(BizDeviceRegister::getDeviceCode).reversed()).collect(Collectors.toList());
|
|
|
|
+ String maxCode = sortList.get(0).getDeviceCode().substring(sortList.get(0).getDeviceCode().length() - 6);
|
|
|
|
+ return Integer.parseInt(maxCode)+1+"";
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|