档案管理打印已完成

huimv-admin/src/main/java/com/huimv/guowei/admin/common/utils/PdfUtil.java

@@ -0,0 +1,344 @@
+package com.huimv.guowei.admin.common.utils;
+
+//import cn.bt.common.utils.StringUtils;
+//import cn.bt.modules.process.instance.enums.InstanceStatusEnum;
+//import com.itextpdf.text.*;
+//import com.itextpdf.text.pdf.*;
+
+import cn.hutool.core.io.IoUtil;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+/**
+ * @Author: xp
+ * @Date: 2021/7/14
+ */
+public class PdfUtil {
+
+    /**
+     * 返回PDF流
+     *
+     * @param response 相应设置
+     * @param pathName 水印文件路径和名称
+     * @throws Exception 异常
+     */
+    /*public static void returnPdfStream(HttpServletResponse response, String pathName) throws Exception {
+        response.setContentType("application/pdf");
+
+        File file = new File(pathName);
+        if (file.exists()) {
+            FileInputStream in = new FileInputStream(file);
+            OutputStream out = response.getOutputStream();
+            byte[] b = new byte[1024 * 4];
+            int n;
+            while ((n = in.read(b)) > -1) {
+                out.write(b, 0, n);
+            }
+            out.flush();
+            in.close();
+            out.close();
+        }
+    }*/
+    public static void returnPdfStream2(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
+        try {
+            File file = new File(pathName);
+             in = new BufferedInputStream(new FileInputStream(file));
+            String filename = new String((subsidyNane+".pdf").getBytes(), "ISO8859_1");
+            response.setContentType("application/binary;charset=ISO8859_1");
+            response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
+            IoUtil.copy(in, response.getOutputStream());
+        } catch (Exception e) {
+            System.out.println("------------ 这里除了问题！！！-----------");
+            System.out.println(e);
+        }finally {
+            if (in != null) {
+                in.close();
+            }
+        }
+    }
+
+    public static void returnPdfStream3(HttpServletResponse response, String pathName, String subsidyNane) throws Exception {
+        InputStream in = null;
+        try {
+            File file = new File(pathName);
+            in = new BufferedInputStream(new FileInputStream(file));
+            String filename = new String((subsidyNane+".xls").getBytes(), "ISO8859_1");
+            response.setContentType("application/binary;charset=ISO8859_1");
+            response.setHeader("Content-disposition", "attachment; filename=" + filename);// 组装附件名称和格式
+            IoUtil.copy(in, response.getOutputStream());
+        } catch (Exception e) {
+            System.out.println("------------ 这里除了问题！！！-----------");
+            System.out.println(e);
+        }finally {
+            if (in != null) {
+                in.close();
+            }
+        }
+    }
+
+    /**
+     * 返回水印图片路径
+     *
+     * @param instanceStatus 流程状态
+     * @return 水印图片路径
+     */
+//    public static String returnWatermarkPath(int instanceStatus) {
+//        String watermarkPath = "ioffice-api/src/main/resources/static/watermark";
+//        if (InstanceStatusEnum.E_0.getCode().equals(instanceStatus)) {
+//            watermarkPath = watermarkPath + "/已作废.png";
+//
+//        } else if (InstanceStatusEnum.E_2.getCode().equals(instanceStatus)) {
+//            watermarkPath = watermarkPath + "/审批通过.png";
+//
+//        } else {
+//            watermarkPath = watermarkPath + "/审批中.png";
+//        }
+//        return watermarkPath;
+//    }
+//
+//    /**
+//     * 建立一个书写器(Writer)与document对象关联，通过书写器(Writer)可以将文档写入到磁盘中。
+//     *
+//     * @param pdfPath     保存路径
+//     * @param document    文档
+//     * @param pdfPathName 文件保存路径和名称
+//     * @return 书写器(Writer)
+//     * @throws Exception
+//     */
+//    public static PdfWriter createPdfWriter(String pdfPath, Document document, String pdfPathName) throws Exception {
+//
+//        //判断文件夹是否存在
+//        File file = new File(pdfPath);
+//        if (!file.exists()) {
+//            file.mkdir();
+//        }
+//        file = new File(pdfPathName);
+//
+//        PdfWriter writer = PdfWriter.getInstance(document, new FileOutputStream(file));
+//        writer.setViewerPreferences(PdfWriter.PageModeUseThumbs);
+//
+//        return writer;
+//    }
+//
+//    /**
+//     * 设置第一标题内容
+//     *
+//     * @param title    第一标题
+//     * @param document 文档
+//     * @throws Exception 异常
+//     */
+//    public static void setPdfFirstTitle(String title, Document document) throws Exception {
+//        Paragraph paragraph = new Paragraph(title, getPdfChineseFont(0));
+//        paragraph.setAlignment(Element.ALIGN_CENTER);
+//        paragraph.setSpacingAfter(2);
+//        document.add(paragraph);
+//    }
+//
+//    /**
+//     * 设置第二标题内容
+//     *
+//     * @param title           第二标题
+//     * @param document        文档
+//     * @param alignment       对齐方式
+//     * @param firstLineIndent 第一行缩进
+//     * @param spacingAfter    之后间隔
+//     * @throws Exception
+//     */
+//    public static void setPdfSecondTitle(String title, Document document, int alignment, int firstLineIndent, int spacingAfter) throws Exception {
+//        Paragraph lsh = new Paragraph(title, getPdfChineseFont(1));
+//        lsh.setAlignment(alignment);
+//        lsh.setFirstLineIndent(firstLineIndent);
+//        lsh.setSpacingAfter(spacingAfter);
+//        document.add(lsh);
+//    }
+//
+//    /**
+//     * 设置表格内容 并将表格加入文档中
+//     *
+//     * @param dates    数据
+//     * @param document 文档
+//     * @param table    表格
+//     * @throws Exception 异常
+//     */
+//    public static void setPdfTableContent(Object[][] dates, Document document, PdfPTable table) throws Exception {
+//        for (int i = 0; i < dates.length; i++) {
+//            for (int j = 0; j < dates[i].length; j++) {
+//                //表格的单元格
+//                PdfPCell pdfCell = new PdfPCell();
+//                //设置表格行高
+//                if (i > 0 && i < 3) {
+//                    pdfCell.setMinimumHeight(50);
+//                } else {
+//                    pdfCell.setMinimumHeight(25);
+//                }
+//                Paragraph paragraph = new Paragraph(dates[i][j] + "", getPdfChineseFont(1));
+//                pdfCell.setPhrase(paragraph);
+//
+//                setCellStyle(pdfCell);
+//                table.addCell(pdfCell);
+//            }
+//        }
+//
+//        document.add(table);
+//    }
+//
+//    /**
+//     * 设置水印
+//     *
+//     * @param inputFile 要这设置水印的文件路径
+//     * @param imageFile 水印图片路径
+//     * @param tag       标记
+//     * @return 生成水印文件的路径
+//     */
+//    public static String imageWaterMark(String inputFile, String imageFile, String tag) throws Exception {
+//        String[] spe = separatePath(inputFile);
+//        String outputFile = spe[0] + tag + "." + spe[1];
+//
+//        PdfReader reader = new PdfReader(inputFile);
+//        PdfStamper stamper = new PdfStamper(reader, new FileOutputStream(outputFile));
+//
+//        int total = reader.getNumberOfPages() + 1;
+//
+//        Image image = Image.getInstance(imageFile);
+//        //坐标
+//        image.setAbsolutePosition(389, 730);
+//        //自定义大小
+//        image.scaleAbsolute(80, 80);
+//        //旋转 弧度
+//        image.setRotation(-55);
+//
+//        //旋转 角度
+//        image.setRotationDegrees(0);
+//        //依照比例缩放
+//        image.scalePercent(50);
+//
+//        PdfGState gs = new PdfGState();
+//        // 设置透明度为0.2
+//        gs.setFillOpacity(0.2f);
+//
+//
+//        PdfContentByte under;
+//        //给每一页加水印
+//        for (int i = 1; i < total; i++) {
+//            under = stamper.getUnderContent(i);
+//            under.beginText();
+//            // 添加水印图片
+//            under.addImage(image);
+//            under.setGState(gs);
+//        }
+//        stamper.close();
+//        reader.close();
+//        return outputFile;
+//    }
+//
+//    /**
+//     * 拆分原文件路径
+//     *
+//     * @param path 原文件路径
+//     * @return 拆分原路径的数组
+//     */
+//    public static String[] separatePath(String path) {
+//        if (StringUtils.isBlank(path)) {
+//            return null;
+//        }
+//        String[] sep = path.split("\\.");
+//        return new String[]{sep[0], sep[1]};
+//    }
+//
+//    /**
+//     * 设置表格单元格样式
+//     *
+//     * @param pdfCell 单元格对象
+//     */
+//    public static void setCellStyle(PdfPCell pdfCell) {
+//        pdfCell.setHorizontalAlignment(Element.ALIGN_CENTER);
+//        pdfCell.setVerticalAlignment(Element.ALIGN_MIDDLE);
+//        pdfCell.setBackgroundColor(new BaseColor(0xdd7e6b));
+//        pdfCell.setBorderWidthTop(0.1f);
+//        pdfCell.setBorderWidthBottom(0.1f);
+//        pdfCell.setBorderWidthLeft(0.1f);
+//        pdfCell.setBorderWidthRight(0.1f);
+//    }
+//
+//    /**
+//     * 设置pdf字体及大小
+//     *
+//     * @param type 标题或者内容 0-内容 1-标题
+//     * @return 字体
+//     * @throws Exception 异常
+//     */
+//    public static Font getPdfChineseFont(int type) throws Exception {
+//        // 使用系统字体
+//        BaseFont bfChinese = BaseFont.createFont("STSong-Light", "UniGB-UCS2-H", BaseFont.NOT_EMBEDDED);
+//        Font font;
+//        if (type == 1) {
+//            font = new Font(bfChinese);
+//        } else {
+//            font = new Font(bfChinese, 18, Font.BOLD);
+//        }
+//
+//        return font;
+//    }
+//
+//    /**
+//     * 删除文件夹
+//     *
+//     * @param folderPath 文件路基
+//     */
+//    public static void delFolder(String folderPath) {
+//        // 删除完里面所有内容
+//        delAllFile(folderPath);
+//        String filePath = folderPath;
+//        filePath = filePath.toString();
+//        java.io.File myFilePath = new java.io.File(filePath);
+//        // 删除空文件夹
+//        myFilePath.delete();
+//    }
+//
+//    /**
+//     * 删除指定文件夹下所有文件
+//     *
+//     * @param path 文件路基
+//     * @return 是否成功
+//     */
+//    public static boolean delAllFile(String path) {
+//        boolean flag = false;
+//        File file = new File(path);
+//        String[] tempList = file.list();
+//        File temp = null;
+//        for (int i = 0; i < tempList.length; i++) {
+//            if (path.endsWith(File.separator)) {
+//                temp = new File(path + tempList[i]);
+//            } else {
+//                temp = new File(path + File.separator + tempList[i]);
+//            }
+//            if (temp.isFile()) {
+//                temp.delete();
+//            }
+//            if (temp.isDirectory()) {
+//                // 先删除文件夹里面的文件
+//                delAllFile(path + "/" + tempList[i]);
+//                // 再删除空文件夹
+//                delFolder(path + "/" + tempList[i]);
+//                flag = true;
+//            }
+//        }
+//        return flag;
+//    }
+//    public static boolean delAllFile(String path) {
+//        boolean flag = false;
+//        File file = new File(path);
+//        File temp = null;
+//
+//            if (temp.isFile()) {
+//                temp.delete();
+//            }
+//        return flag;
+//    }
+}
+

huimv-admin/src/main/java/com/huimv/guowei/admin/config/InterceptorConfig.java

@@ -22,6 +22,6 @@ public class InterceptorConfig implements WebMvcConfigurer {
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(jwtInterceptor()).
                 excludePathPatterns("/guoweiApi/admin/my/*")
-                .excludePathPatterns("/guoweiApi/receive/feed");
+                .excludePathPatterns("/guoweiApi/receive/feed","/guoweiApi/base-duck-info/printDuck","/guoweiApi/env-regular-call-egg/printEgg");
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/BaseDuckInfoController.java

@@ -2,6 +2,7 @@ package com.huimv.guowei.admin.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.guowei.admin.common.utils.PdfUtil;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.UploadImage;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -95,10 +97,11 @@ public class BaseDuckInfoController {
     }
 
     @GetMapping("/printDuck")
-    public void printDuck(HttpServletRequest httpServletRequest, @RequestParam(name = "duckCode") String duckCode) throws Exception {
+    public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode) throws Exception {
         Map<String, String> map = new HashMap<>();
         map.put("duckCode", duckCode);
-        duckInfoService.printDuck(httpServletRequest, map);
-
+        duckInfoService.printDuck(response, map);
+        String path = "/opt/guowei/duck.xls";
+        PdfUtil.returnPdfStream3(response, path, "鸭只档案列表");
     }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvRegularCallEggController.java

@@ -1,19 +1,18 @@
 package com.huimv.guowei.admin.controller;
 
 
+import com.huimv.guowei.admin.common.utils.PdfUtil;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.huimv.guowei.admin.service.IEnvRegularCallEggService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -49,4 +48,13 @@ public class EnvRegularCallEggController {
     public Result deleteEgg(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap) throws ParseException {
         return eggService.deleteEgg(httpServletRequest, paramsMap);
     }
+
+    @GetMapping("/printEgg")
+    public void printDuck(HttpServletResponse response, @RequestParam(name = "duckCode") String duckCode) throws Exception {
+        Map<String, String> map = new HashMap<>();
+        map.put("duckCode", duckCode);
+        eggService.printEgg(response, map);
+        String path = "/opt/guowei/egg.xls";
+        PdfUtil.returnPdfStream3(response, path, "鸭只采食产蛋列表");
+    }
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckHealthInfo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import  java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,6 +30,7 @@ public class DuckHealthInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date healthDate;
 
     /**

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/DuckImmunityInfo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import  java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -28,6 +30,7 @@ public class DuckImmunityInfo implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date healthDate;
 
     /**

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvRegularCallEgg.java

@@ -63,7 +63,7 @@ public class EnvRegularCallEgg implements Serializable {
     /**
      * 称重日期
      */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date callDate;
 
     private Integer farmId;

huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/EnvRegularCallEggVo.java

@@ -0,0 +1,47 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 固定电子秤
+ * </p>
+ *
+ * @author author
+ * @since 2023-06-01
+ */
+@Data
+public class EnvRegularCallEggVo implements Serializable {
+
+    /**
+     * 鸭只编号
+     */
+    private String duckCode;
+
+
+    /**
+     * 蛋个数
+     */
+    private Integer eggNum;
+
+    /**
+     * 称重日期
+     */
+/*
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+*/
+    private String date;
+
+    private Integer feed;
+    private Integer weight;
+
+}

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.java

@@ -1,7 +1,9 @@
 package com.huimv.guowei.admin.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -19,4 +21,8 @@ import java.util.List;
  */
 public interface EnvRegularCallEggMapper extends BaseMapper<EnvRegularCallEgg> {
     List<EnvRegularCallEgg> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
+
+    IPage<EnvRegularCallEgg> listPage(Page<EnvRegularCallEgg> page, @Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
+
+    List<EnvRegularCallEgg> printEggList(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallEgg> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.java

@@ -1,7 +1,9 @@
 package com.huimv.guowei.admin.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
@@ -19,4 +21,6 @@ import java.util.List;
  */
 public interface EnvRegularCallFeedingMapper extends BaseMapper<EnvRegularCallFeeding> {
     List<EnvRegularCallFeeding> listDay(@Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
+
+    IPage<EnvRegularCallFeeding> listPage(Page<EnvRegularCallFeeding> page, @Param(Constants.WRAPPER) QueryWrapper<EnvRegularCallFeeding> queryWrapper);
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IBaseDuckInfoService.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
 import java.util.Map;
@@ -27,5 +28,5 @@ public interface IBaseDuckInfoService extends IService<BaseDuckInfo> {
 
     Result listDuckById(HttpServletRequest httpServletRequest, Map<String,String> paramsMap);
 
-    void printDuck(HttpServletRequest httpServletRequest, Map<String,String> paramsMap) throws Exception;
+    void printDuck(HttpServletResponse response, Map<String,String> paramsMap) throws Exception;
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvRegularCallEggService.java

@@ -1,11 +1,13 @@
 package com.huimv.guowei.admin.service;
 
+import cn.hutool.http.HttpResponse;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.util.Map;
 
@@ -25,4 +27,6 @@ public interface IEnvRegularCallEggService extends IService<EnvRegularCallEgg> {
     Result updateEgg(HttpServletRequest httpServletRequest,EnvRegularCallEgg egg);
 
     Result deleteEgg(HttpServletRequest httpServletRequest,Map<String,String> paramsMap);
+
+    void printEgg(HttpServletResponse response, Map<String, String> paramsMap) throws Exception;
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/BaseDuckInfoServiceImpl.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
@@ -163,7 +164,7 @@ public class BaseDuckInfoServiceImpl extends ServiceImpl<BaseDuckInfoMapper, Bas
     }
 
     @Override
-    public void printDuck(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws Exception {
+    public void printDuck(HttpServletResponse response, Map<String, String> paramsMap) throws Exception {
         String duckCode = paramsMap.get("duckCode");
         QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("duck_num", duckCode);

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckHealthInfoServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckHealthInfo;
+import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.DuckHealthInfoMapper;
 import com.huimv.guowei.admin.service.IDuckHealthInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,6 +33,8 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
 
     @Autowired
     private DuckHealthInfoMapper healthInfoMapper;
+    @Autowired
+    private BaseDuckInfoMapper infoMapper;
 
     @Override
     public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
@@ -69,15 +73,17 @@ public class DuckHealthInfoServiceImpl extends ServiceImpl<DuckHealthInfoMapper,
 
     @Override
     public Result addHealth(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String duckNum = paramsMap.get("duckCode");
         String farmId = paramsMap.get("farmId");
-        String duckId = paramsMap.get("id");
+        String duckId = paramsMap.get("duckId");
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", duckId);
+        BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);
         String date = paramsMap.get("date");
         date = date + " 00:00:00";
         String healthResult = paramsMap.get("healthResult");
         String treatmentMeasure = paramsMap.get("treatmentMeasure");
         DuckHealthInfo healthInfo = new DuckHealthInfo();
-        healthInfo.setDuckNum(duckNum);
+        healthInfo.setDuckNum(baseDuckInfo.getDuckNum());
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         healthInfo.setFarmId(Integer.parseInt(farmId));
         healthInfo.setHealthDate(sdf.parse(date));

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/DuckImmunityInfoServiceImpl.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.DuckImmunityInfo;
+import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.DuckImmunityInfoMapper;
 import com.huimv.guowei.admin.service.IDuckImmunityInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,6 +33,8 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
 
     @Autowired
     private DuckImmunityInfoMapper infoMapper;
+    @Autowired
+    private BaseDuckInfoMapper baseDuckInfoMapper;
     @Override
     public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String duckNum = paramsMap.get("id");
@@ -68,17 +72,19 @@ public class DuckImmunityInfoServiceImpl extends ServiceImpl<DuckImmunityInfoMap
 
     @Override
     public Result addImmunity(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String duckNum = paramsMap.get("duckCode");
         String date = paramsMap.get("date");
         date = date + " 00:00:00";
         String farmId = paramsMap.get("farmId");
-        String duckId = paramsMap.get("id");
+        String duckId = paramsMap.get("duckId");
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", duckId);
+        BaseDuckInfo baseDuckInfo = baseDuckInfoMapper.selectOne(queryWrapper);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         Date date1 = sdf.parse(date);
         String vaccination = paramsMap.get("vaccination");//接种疫苗
         DuckImmunityInfo immunityInfo = new DuckImmunityInfo();
         immunityInfo.setDuckId(Integer.parseInt(duckId));
-        immunityInfo.setDuckNum(duckNum);
+        immunityInfo.setDuckNum(baseDuckInfo.getDuckNum());
         immunityInfo.setFarmId(Integer.parseInt(farmId));
         immunityInfo.setHealthDate(date1);
         immunityInfo.setVaccination(vaccination);

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallEggServiceImpl.java

@@ -5,19 +5,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.common.utils.DataUill;
 import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
+import com.huimv.guowei.admin.entity.BaseDuckInfo;
 import com.huimv.guowei.admin.entity.EnvRegularCallEgg;
 import com.huimv.guowei.admin.entity.EnvRegularCallFeeding;
+import com.huimv.guowei.admin.mapper.BaseDuckInfoMapper;
 import com.huimv.guowei.admin.mapper.EnvRegularCallEggMapper;
+import com.huimv.guowei.admin.mapper.EnvRegularCallFeedingMapper;
 import com.huimv.guowei.admin.service.IEnvRegularCallEggService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.guowei.admin.utils.Print;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -33,11 +39,15 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
 
     @Autowired
     private EnvRegularCallEggMapper eggMapper;
+    @Autowired
+    private BaseDuckInfoMapper infoMapper;
+    @Autowired
+    private EnvRegularCallFeedingMapper feedingMapper;
 
     @Override
     public Result listById(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String type = paramsMap.get("type");//显示类型
-        String duckCode = paramsMap.get("id");
+        String duckCode = paramsMap.get("id");//鸭子的id
         String farmId = paramsMap.get("farmId");
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
@@ -51,7 +61,7 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
             QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId).orderByAsc("call_date");
             Page<EnvRegularCallEgg> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            return new Result(ResultCode.SUCCESS, eggMapper.selectPage(page, queryWrapper));
+            return new Result(ResultCode.SUCCESS, eggMapper.listPage(page, queryWrapper));
         } else {
             String dateType = paramsMap.get("dateType");
             QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
@@ -82,16 +92,18 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
 
     @Override
     public Result addEgg(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) throws ParseException {
-        String duckCode = paramsMap.get("duckCode");
         String farmId = paramsMap.get("farmId");
-        String duckId = paramsMap.get("id");
+        String duckId = paramsMap.get("duckId");
+        QueryWrapper<BaseDuckInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("id", duckId);
+        BaseDuckInfo baseDuckInfo = infoMapper.selectOne(queryWrapper);
         String date = paramsMap.get("date");
         date = date + " 00:00:00";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String eggNum = paramsMap.get("eggNum");
         String eggWeight = paramsMap.get("eggWeight");
         EnvRegularCallEgg egg = new EnvRegularCallEgg();
-        egg.setDuckCode(duckCode);
+        egg.setDuckCode(baseDuckInfo.getDuckNum());
         egg.setFarmId(Integer.parseInt(farmId));
         egg.setDuckWeight(Integer.parseInt(eggWeight));
         egg.setEggNum(Integer.parseInt(eggNum));
@@ -114,4 +126,16 @@ public class EnvRegularCallEggServiceImpl extends ServiceImpl<EnvRegularCallEggM
         return new Result(10000, "删除成功!", true);
     }
 
+    @Override
+    public void printEgg(HttpServletResponse response, Map<String, String> paramsMap) throws Exception {
+        String duckCode = paramsMap.get("duckCode");
+        QueryWrapper<EnvRegularCallEgg> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("duck_code", duckCode);
+        List<EnvRegularCallEgg> eggs = eggMapper.printEggList(queryWrapper);
+        QueryWrapper<EnvRegularCallFeeding> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("duck_code", duckCode);
+        List<EnvRegularCallFeeding> feedings = feedingMapper.listDay(queryWrapper1);
+        Print.printEgg(eggs, feedings);
+    }
+
 }

huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvRegularCallFeedingServiceImpl.java

@@ -51,7 +51,7 @@ public class EnvRegularCallFeedingServiceImpl extends ServiceImpl<EnvRegularCall
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("duck_id", duckCode).eq("farm_id", farmId).orderByAsc("call_date");
             Page<EnvRegularCallFeeding> page = new Page<>(Integer.parseInt(pageNum), Integer.parseInt(pageSize));
-            return new Result(ResultCode.SUCCESS, feedingMapper.selectPage(page, queryWrapper));
+            return new Result(ResultCode.SUCCESS,feedingMapper.listPage(page, queryWrapper));
         } else {
             String dateType = paramsMap.get("dateType");
             QueryWrapper<EnvRegularCallFeeding> queryWrapper = new QueryWrapper<>();

huimv-admin/src/main/java/com/huimv/guowei/admin/utils/Print.java

@@ -2,10 +2,8 @@ package com.huimv.guowei.admin.utils;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.guowei.admin.entity.BaseDuckInfo;
-import com.huimv.guowei.admin.entity.DuckHealthInfo;
-import com.huimv.guowei.admin.entity.DuckImmunityInfo;
-import com.huimv.guowei.admin.entity.EnvMoveCall;
+import com.huimv.guowei.admin.entity.*;
+import com.huimv.guowei.admin.entity.vo.EnvRegularCallEggVo;
 import org.jxls.common.Context;
 import org.jxls.util.JxlsHelper;
 
@@ -14,6 +12,7 @@ import java.io.FileOutputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -29,9 +28,9 @@ public class Print {
     public static void printDuck(BaseDuckInfo duckInfo, List<DuckHealthInfo> healthInfos,
                                  List<DuckImmunityInfo> immunityInfos, List<EnvMoveCall> envMoveCalls) throws Exception {
         //准备数据
-        String path = "G://duck.xls";
+        String path = "/opt/guowei/duck.xls";
         //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-        InputStream is = new FileInputStream("G://duck.xlsx");
+        InputStream is = new FileInputStream("/opt/guowei/duck.xlsx");
         //根据模板生成的文件保存路径  我这里保存在本地D盘
         OutputStream os = new FileOutputStream(path);
         //绑定数据
@@ -39,7 +38,8 @@ public class Print {
         context.putVar("duckCode", duckInfo.getDuckNum());
         context.putVar("duckType", duckInfo.getDuckBreed());
         context.putVar("duckSex", duckInfo.getDuckSex());
-        context.putVar("duckDate", duckInfo.getDuckBirthday());
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        context.putVar("duckDate",sdf.format( duckInfo.getDuckBirthday()));
         context.putVar("address", duckInfo.getDuckBirthplace());
         context.putVar("father", duckInfo.getFatherNum());
         context.putVar("father2", duckInfo.getFatherGenotype());
@@ -50,7 +50,7 @@ public class Print {
         String s2 = "";
         //健康状况
         for (DuckHealthInfo healthInfo : healthInfos) {
-            s1 = healthInfo.getHealthDate() + healthInfo.getHealthResult() + ";" + "\n" + s1;
+            s1 = sdf.format(healthInfo.getHealthDate()) + healthInfo.getHealthResult() + ";" + "\n" + s1;
         }
         //日龄体重
         for (EnvMoveCall envMoveCall : envMoveCalls) {
@@ -58,7 +58,7 @@ public class Print {
         }
         //免疫记录
         for (DuckImmunityInfo immunityInfo : immunityInfos) {
-            s2 = immunityInfo.getHealthDate() + immunityInfo.getVaccination() + ";" + "\n" + s2;
+            s2 = sdf.format(immunityInfo.getHealthDate()) + immunityInfo.getVaccination() + ";" + "\n" + s2;
         }
         context.putVar("weight", s);
         context.putVar("need", duckInfo.getSpecialNeeds());
@@ -69,26 +69,31 @@ public class Print {
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }
 
-    public static void printEgg() throws Exception {
+    public static void printEgg(List<EnvRegularCallEgg> eggs, List<EnvRegularCallFeeding> feedings) throws Exception {
+
         //准备数据
-        String path = "G://egg.xls";
+        String path = "/opt/guowei/egg.xls";
         //获取模板文件，你自己当前模板的位置  我这里为当前项目下
-        InputStream is = new FileInputStream("G://egg.xlsx");
+        InputStream is = new FileInputStream("/opt/guowei/egg.xlsx");
         //根据模板生成的文件保存路径  我这里保存在本地D盘
         OutputStream os = new FileOutputStream(path);
         //绑定数据
         Context context = new Context();
-/*        List<Abc> list = new ArrayList<>();
-        for (int i = 0; i < 3; i++) {
-            Abc abc = new Abc();
-            abc.setDuckCode(String.valueOf(i));
-            abc.setDate(String.valueOf(i + 1));
-            abc.setFeed(String.valueOf(i + 2));
-            abc.setEggNum(String.valueOf(i + 3));
-            abc.setWeight(String.valueOf(i + 5));
-            list.add(abc);
+        List<EnvRegularCallEggVo> list = new ArrayList<>();
+        int i = 0;
+        for (EnvRegularCallFeeding feeding : feedings) {
+            EnvRegularCallEggVo eggVo = new EnvRegularCallEggVo();
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            eggVo.setDate(sdf.format(feeding.getCallDate()));
+            eggVo.setDuckCode(feeding.getDuckCode());
+            eggVo.setFeed(feeding.getDuckWeight());
+            Integer eggNum = eggs.get(i).getEggNum();
+            eggVo.setEggNum(eggNum);
+            eggVo.setWeight(eggs.get(i).getDuckWeight());
+            i = i+1;
+            list.add(eggVo);
         }
-        context.putVar("list", list);*/
+        context.putVar("list", list);
         //生成
         JxlsHelper.getInstance().processTemplate(is, os, context);
     }

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallEggMapper.xml

@@ -16,7 +16,21 @@
     </resultMap>
 
     <select id="listDay" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
-        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',call_date 'callDate' FROM `env_regular_call_egg`
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate' FROM `env_regular_call_egg`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date ASC
+    </select>
+
+    <select id="listPage" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate' FROM `env_regular_call_egg`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date ASC
+    </select>
+
+    <select id="printEggList" resultType="com.huimv.guowei.admin.entity.EnvRegularCallEgg">
+        SELECT (IFNUll(sum(egg_num),'0')) 'eggNum',(IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_code 'duckCode',call_date 'callDate' FROM `env_regular_call_egg`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
         ORDER BY call_date ASC

huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/EnvRegularCallFeedingMapper.xml

@@ -15,6 +15,13 @@
         <result column="duck_id" property="duckId"/>
     </resultMap>
     <select id="listDay" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
+        SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',duck_code 'duckCode',call_date 'callDate' FROM `env_regular_call_feeding`
+         ${ew.customSqlSegment}
+        GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')
+        ORDER BY call_date ASC
+    </select>
+
+    <select id="listPage" resultType="com.huimv.guowei.admin.entity.EnvRegularCallFeeding">
         SELECT (IFNUll(sum(duck_weight),'0')) 'duckWeight',call_date 'callDate' FROM `env_regular_call_feeding`
          ${ew.customSqlSegment}
         GROUP BY DATE_FORMAT(call_date,'%Y-%m-%d')