|
@@ -6,18 +6,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
-import com.huimv.eartag2.manage2.mapper.EartagData2Mapper;
|
|
|
+import com.huimv.eartag2.manage2.mapper.*;
|
|
|
import com.huimv.eartag2.manage2.pojo.BaseFarmer;
|
|
|
import com.huimv.eartag2.manage2.pojo.EartagData2;
|
|
|
import com.huimv.eartag2.manage2.pojo.EartagDeviceRegister;
|
|
|
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
|
|
|
import com.huimv.eartag2.manage2.utils.IDUtil;
|
|
|
import com.huimv.eartag2.manage2.utils.Print;
|
|
|
import com.huimv.eartag2.manage2.utils.ResultUtil;
|
|
|
import com.huimv.eartag2.common.utils.Result;
|
|
|
import com.huimv.eartag2.common.utils.ResultCode;
|
|
|
-import com.huimv.eartag2.manage2.mapper.BaseFarmerMapper;
|
|
|
-import com.huimv.eartag2.manage2.mapper.BasePigpenMapper;
|
|
|
-import com.huimv.eartag2.manage2.mapper.EartagDeviceRegisterMapper;
|
|
|
import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
|
|
|
import com.huimv.eartag2.manage2.service.ICacheService;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -55,6 +53,7 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
|
|
|
private EartagData2Mapper data2Mapper;
|
|
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
|
public Result set(List<Map<String, String>> mapList) {
|
|
|
ArrayList<Integer> ids = new ArrayList<>();
|
|
@@ -93,12 +92,14 @@ public class EartagDeviceRegisterServiceImpl extends ServiceImpl<EartagDeviceReg
|
|
|
|
|
|
@Override
|
|
|
public void getData(String eartag ) throws Exception {
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
- calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
|
|
|
+// Calendar calendar = Calendar.getInstance();
|
|
|
+// calendar.set(Calendar.DATE, calendar.get(Calendar.DATE) - 7);
|
|
|
+ String startTime = "2024-05-19 00:00:00";
|
|
|
+ String endTime = "2024-05-24 23:59:59";
|
|
|
QueryWrapper<EartagData2> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq("earmark", eartag).ge("add_time", calendar.getTime()).orderByAsc("add_time");
|
|
|
+ queryWrapper.eq("earmark", eartag).between("add_time", startTime, endTime).orderByAsc("add_time");
|
|
|
List<EartagData2> eartagData2s = data2Mapper.selectList(queryWrapper);
|
|
|
- Print.printDuck(eartagData2s);
|
|
|
+ Print.printDuck(eartagData2s,eartag);
|
|
|
}
|
|
|
|
|
|
@Override
|