wwh преди 11 месеца
родител
ревизия
e7c9a99d84

+ 17 - 4
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/controller/EartagDeviceRegisterController.java

@@ -1,9 +1,13 @@
 package com.huimv.eartag2.manage2.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huimv.eartag2.common.utils.Result;
+import com.huimv.eartag2.manage2.mapper.EartagEartagRegister2Mapper;
+import com.huimv.eartag2.manage2.pojo.EartagEartagRegister2;
 import com.huimv.eartag2.manage2.service.EartagDeviceRegisterService;
 import com.huimv.eartag2.manage2.utils.PdfUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -25,6 +29,8 @@ public class EartagDeviceRegisterController {
 
     @Resource
     private EartagDeviceRegisterService eartagDeviceRegisterService;
+    @Autowired
+    private EartagEartagRegister2Mapper register2Mapper;
 
     /**
      * @description: 【添加】设置栋舍单元
@@ -99,10 +105,17 @@ public class EartagDeviceRegisterController {
     }
 
     @GetMapping("/printData")
-    public void printChi(HttpServletResponse response,@RequestParam(name = "eartag") String eartag) throws Exception {
-        eartagDeviceRegisterService.getData(eartag);
-        String path = "G://"+eartag+".xls";
-        PdfUtil.returnPdfStream3(response, path, eartag);
+    public void printChi(HttpServletResponse response/*,@RequestParam(name = "eartag") String eartag*/) throws Exception {
+        String farmId = "330112002";
+        QueryWrapper<EartagEartagRegister2> register2QueryWrapper = new QueryWrapper<>();
+        register2QueryWrapper.eq("farm_id", farmId);
+        List<EartagEartagRegister2> eartagEartagRegister2s = register2Mapper.selectList(register2QueryWrapper);
+        for (EartagEartagRegister2 eartagEartagRegister2 : eartagEartagRegister2s) {
+            String earmark = eartagEartagRegister2.getEarmark();
+            eartagDeviceRegisterService.getData(earmark);
+            String path = "G://"+earmark+".xls";
+            PdfUtil.returnPdfStream3(response, path, earmark);
+        }
     }
 }
 

+ 9 - 8
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/service/impl/EartagDeviceRegisterServiceImpl.java

@@ -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

+ 2 - 2
huimv-eartag2-platform/huimv-eartag2-manage2/src/main/java/com/huimv/eartag2/manage2/utils/Print.java

@@ -21,10 +21,10 @@ public class Print {
      * @return
      * @throws Exception
      */
-    public static void printDuck(List<EartagData2> eartagData2s) throws Exception {
+    public static void printDuck(List<EartagData2> eartagData2s,String earmark) throws Exception {
 
         //准备数据
-        String path = "G://"+eartagData2s.get(0).getEarmark()+".xls";
+        String path = "G://"+earmark+".xls";
         //获取模板文件,你自己当前模板的位置  我这里为当前项目下
         InputStream is = new FileInputStream("G://getData.xlsx");
         //根据模板生成的文件保存路径  我这里保存在本地D盘