|
@@ -33,6 +33,8 @@ public class EartagServiceImpl implements IEartagService {
|
|
private RedisTemplate redisTemplate;
|
|
private RedisTemplate redisTemplate;
|
|
@Autowired
|
|
@Autowired
|
|
private EartagDataRepo eartagDataRepo;
|
|
private EartagDataRepo eartagDataRepo;
|
|
|
|
+ @Autowired
|
|
|
|
+ private EartagData2Mapper eartagData2Mapper;
|
|
|
|
|
|
//处理耳标信息
|
|
//处理耳标信息
|
|
@Override
|
|
@Override
|
|
@@ -69,9 +71,6 @@ public class EartagServiceImpl implements IEartagService {
|
|
* @Date : 2022/1/18
|
|
* @Date : 2022/1/18
|
|
* @Time : 15:25
|
|
* @Time : 15:25
|
|
*/
|
|
*/
|
|
- @Autowired
|
|
|
|
- private EartagData2Mapper eartagData2Mapper;
|
|
|
|
-
|
|
|
|
@Override
|
|
@Override
|
|
public Integer countAct(String earmark, String nowAct,String farmId) {
|
|
public Integer countAct(String earmark, String nowAct,String farmId) {
|
|
|
|
|
|
@@ -83,7 +82,7 @@ public class EartagServiceImpl implements IEartagService {
|
|
// int nowActInt = Integer.parseInt(nowAct);
|
|
// int nowActInt = Integer.parseInt(nowAct);
|
|
// return nowActInt < lastAct ? nowActInt: nowActInt - lastAct;
|
|
// return nowActInt < lastAct ? nowActInt: nowActInt - lastAct;
|
|
|
|
|
|
-
|
|
|
|
|
|
+ int nowActInt = Integer.parseInt(nowAct);
|
|
//读取hash
|
|
//读取hash
|
|
Object actObj = redisTemplate.opsForHash().get(earmark, "act");
|
|
Object actObj = redisTemplate.opsForHash().get(earmark, "act");
|
|
if (actObj == null) {
|
|
if (actObj == null) {
|
|
@@ -92,11 +91,11 @@ public class EartagServiceImpl implements IEartagService {
|
|
Object lastAct = redisTemplate.opsForHash().get(earmark, "act");
|
|
Object lastAct = redisTemplate.opsForHash().get(earmark, "act");
|
|
if (lastAct == null) {
|
|
if (lastAct == null) {
|
|
log.error("#--- redis数据库有问题,请检查redis是否能正常连接 ---# ");
|
|
log.error("#--- redis数据库有问题,请检查redis是否能正常连接 ---# ");
|
|
- return 0;
|
|
|
|
|
|
+ return nowActInt;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
int lastAct = Integer.parseInt(redisTemplate.opsForHash().get(earmark, "act").toString());
|
|
int lastAct = Integer.parseInt(redisTemplate.opsForHash().get(earmark, "act").toString());
|
|
- int nowActInt = Integer.parseInt(nowAct);
|
|
|
|
|
|
+
|
|
return nowActInt < lastAct ? nowActInt: nowActInt - lastAct;
|
|
return nowActInt < lastAct ? nowActInt: nowActInt - lastAct;
|
|
|
|
|
|
|
|
|