增加全宗号筛选条件

pom.xml

@@ -154,11 +154,11 @@
         <!--            <artifactId>spring-boot-devtools</artifactId>-->
         <!--            <optional>true</optional>-->
         <!--        </dependency>-->
-        <dependency>
-            <groupId>e-iceblue</groupId>
-            <artifactId>spire.pdf.free</artifactId>
-            <version>3.9.0</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>e-iceblue</groupId>-->
+<!--            <artifactId>spire.pdf.free</artifactId>-->
+<!--            <version>3.9.0</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
@@ -171,7 +171,13 @@
             <version>4.2.1</version>
         </dependency>
     </dependencies>
-
+    <repositories>
+        <repository>
+            <id>com.e-iceblue</id>
+            <name>e-iceblue</name>
+            <url>http://repo.e-iceblue.com/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
     <build>
         <plugins>
             <plugin>

src/main/java/com/gz/service/statistics/impl/SelectStatisticsServiceImpl.java

@@ -27,6 +27,7 @@ import com.gz.service.statistics.SelectStatisticsService;
 import com.gz.service.system.ArchivesTreeService;
 import com.gz.service.system.impl.AuthServiceImpl;
 import com.gz.utils.JwtUtils;
+import com.gz.utils.UnitUtils;
 import com.gz.vo.statistics.StatisticsVO;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/gz/vo/archive/SearchArchiveVO.java

@@ -59,6 +59,9 @@ public class SearchArchiveVO extends PageVO {
     // 部门id
     private String deptId;
 
+    // 全宗号
+    private String qzh;
+
     public boolean getAgain(){
         return this.again;
     }

src/main/resources/mapper/archiveMapper.xml

@@ -69,6 +69,9 @@
             <if test="ztc != null and ztc != ''">
                 AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%') OR sa.tm like concat(concat('%',#{ztc}),'%'))
             </if>
+            <if test="qzh != null and qzh != ''">
+                AND a.qzh = #{qzh}
+            </if>
             <if test="sql != null and sql != ''">
                 ${sql}
             </if>
@@ -111,6 +114,9 @@
             <if test="ztc != null and ztc != ''">
                 AND (a.ztc like concat(concat('%',#{ztc}),'%') OR a.tm like concat(concat('%',#{ztc}),'%'))
             </if>
+            <if test="qzh != null and qzh != ''">
+                AND a.qzh = #{qzh}
+            </if>
             <if test="sql != null and sql != ''">
                 ${sql}
             </if>

src/main/resources/static/page/archive/list.html

@@ -47,6 +47,16 @@
                             <option value="">保管期限</option>
                         </select>
                     </div>
+
+                    <div class="layui-inline" style="width: 100px;">
+                        <select name="qzh" id="qzh">
+                            <option value="">全宗号</option>
+                            <option value="5179">5179</option>
+                            <option value="5098">5098</option>
+                            <option value="5134">5134</option>
+                        </select>
+                    </div>
+
                     <div class="layui-inline">
                         <input type="checkbox" name="allDocument" lay-skin="primary" title="全文检索">
                         <div class="layui-unselect layui-form-checkbox layui-form-checked" lay-skin="primary">
@@ -658,6 +668,7 @@
             $("#wjbh").val('')
             $("#mj").val('')
             $("#gdnd").val('')
+            $("#qzh").val('')
             $("#bgqx").val('')
             const ml = searchParam.ml
             searchParam = {}
@@ -673,6 +684,7 @@
             searchParam.bgqx = data.field.bgqx
             searchParam.gdnd = data.field.gdnd
             searchParam.mj = data.field.mj
+            searchParam.qzh = data.field.qzh
             searchParam.ztc = data.field.ztc
             searchParam.wjbh = data.field.wjbh
             searchParam.again = true
@@ -686,6 +698,7 @@
             searchParam.bgqx = data.field.bgqx
             searchParam.gdnd = data.field.gdnd
             searchParam.mj = data.field.mj
+            searchParam.qzh = data.field.qzh
             searchParam.ztc = data.field.ztc
             searchParam.wjbh = data.field.wjbh
             searchParam.allDocument = data.field.allDocument

src/test/java/com/gz/ConverOldSystemData.java

@@ -2,30 +2,24 @@ package com.gz;
 
 import cn.hutool.core.io.FileTypeUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.IORuntimeException;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.CharsetUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
-import cn.hutool.poi.excel.ExcelUtil;
-import cn.hutool.poi.excel.ExcelWriter;
 import com.gz.dto.archive.ArchiveDTO;
 import com.itextpdf.text.Document;
 import com.itextpdf.text.DocumentException;
 import com.itextpdf.text.Image;
 import com.itextpdf.text.Rectangle;
 import com.itextpdf.text.pdf.PdfWriter;
-import com.sun.corba.se.spi.ior.iiop.IIOPFactories;
-import com.sun.xml.internal.org.jvnet.fastinfoset.stax.LowLevelFastInfosetStreamWriter;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.util.IOUtils;
 
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.*;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.nio.charset.Charset;
 import java.util.ArrayList;

src/test/java/com/gz/WatermarkPdf.java

@@ -1,70 +1,70 @@
-package com.gz;
-
-import com.spire.pdf.PdfDocument;
-import com.spire.pdf.PdfPageBase;
-import com.spire.pdf.graphics.*;
-
-import java.awt.*;
-import java.awt.geom.Dimension2D;
-import java.awt.geom.Point2D;
-import java.awt.geom.Rectangle2D;
-
-public class WatermarkPdf {
-
-
-    public static void main(String[] args)
-    {
-        //加载PDF文档
-        PdfDocument pdf = new PdfDocument();
-        pdf.loadFromFile("D:\\Program Files (x86)\\Tencent\\WeChat\\WeChat_DATA\\WeChat Files\\wxid_p52tn1dpq62f22\\FileStorage\\File\\2021-11\\自检情况报告（南苑街道）.pdf");
-
-        //调用AddImageWatermark方法给PDF第一页添加图片水印
-//        AddImageWatermark(pdf.getPages().get(0), "H:\\Pictures\\20210615105005_4d1f0.jpg");
-
-        //调用AddTextWatermark方法给PDF第二页添加文字水印
-        AddTextWatermark(pdf.getPages().get(0), "测试水印");
-
-        //保存
-        pdf.saveToFile("H:\\Desktop\\Watermark.pdf");
-        //关闭
-        pdf.close();
-    }
-    /**
-     * @param page
-     * 要添加水印的页面
-     * @param imageFile
-     * 水印图片路径
-     */
-    static void AddImageWatermark(PdfPageBase page, String imageFile)
-    {
-        page.setBackgroundImage(imageFile);
-        Rectangle2D rect = new Rectangle2D.Float();
-        rect.setFrame(page.getClientSize().getWidth()/2 - 100, page.getClientSize().getHeight()/2 - 100, 200, 200);
-        page.setBackgroundRegion(rect);
-    }
-
-    /**
-     * @param page
-     * 要添加水印的页面
-     * @param textWatermark
-     * 水印文字
-     */
-    static void AddTextWatermark(PdfPageBase page, String textWatermark)
-    {
-        Dimension2D dimension2D = new Dimension();
-        dimension2D.setSize(page.getCanvas().getClientSize().getWidth() / 2, page.getCanvas().getClientSize().getHeight() / 3);
-        PdfTilingBrush brush = new PdfTilingBrush(dimension2D);
-        brush.getGraphics().setTransparency(0.3F);
-        brush.getGraphics().save();
-        brush.getGraphics().translateTransform((float) brush.getSize().getWidth() / 2, (float) brush.getSize().getHeight() / 2);
-        brush.getGraphics().rotateTransform(-45);
-        brush.getGraphics().drawString(textWatermark, new PdfTrueTypeFont(new Font("宋体",Font.PLAIN,30),true), PdfBrushes.getRed(), 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
-        brush.getGraphics().restore();
-        brush.getGraphics().setTransparency(1);
-        Rectangle2D loRect = new Rectangle2D.Float();
-        loRect.setFrame(new Point2D.Float(0, 0), page.getCanvas().getClientSize());
-        page.getCanvas().drawRectangle(brush, loRect);
-    }
-
-
-}
+//package com.gz;
+//
+//import com.spire.pdf.PdfDocument;
+//import com.spire.pdf.PdfPageBase;
+//import com.spire.pdf.graphics.*;
+//
+//import java.awt.*;
+//import java.awt.geom.Dimension2D;
+//import java.awt.geom.Point2D;
+//import java.awt.geom.Rectangle2D;
+//
+//public class WatermarkPdf {
+//
+//
+//    public static void main(String[] args)
+//    {
+//        //加载PDF文档
+//        PdfDocument pdf = new PdfDocument();
+//        pdf.loadFromFile("D:\\Program Files (x86)\\Tencent\\WeChat\\WeChat_DATA\\WeChat Files\\wxid_p52tn1dpq62f22\\FileStorage\\File\\2021-11\\自检情况报告（南苑街道）.pdf");
+//
+//        //调用AddImageWatermark方法给PDF第一页添加图片水印
+////        AddImageWatermark(pdf.getPages().get(0), "H:\\Pictures\\20210615105005_4d1f0.jpg");
+//
+//        //调用AddTextWatermark方法给PDF第二页添加文字水印
+//        AddTextWatermark(pdf.getPages().get(0), "测试水印");
+//
+//        //保存
+//        pdf.saveToFile("H:\\Desktop\\Watermark.pdf");
+//        //关闭
+//        pdf.close();
+//    }
+//    /**
+//     * @param page
+//     * 要添加水印的页面
+//     * @param imageFile
+//     * 水印图片路径
+//     */
+//    static void AddImageWatermark(PdfPageBase page, String imageFile)
+//    {
+//        page.setBackgroundImage(imageFile);
+//        Rectangle2D rect = new Rectangle2D.Float();
+//        rect.setFrame(page.getClientSize().getWidth()/2 - 100, page.getClientSize().getHeight()/2 - 100, 200, 200);
+//        page.setBackgroundRegion(rect);
+//    }
+//
+//    /**
+//     * @param page
+//     * 要添加水印的页面
+//     * @param textWatermark
+//     * 水印文字
+//     */
+//    static void AddTextWatermark(PdfPageBase page, String textWatermark)
+//    {
+//        Dimension2D dimension2D = new Dimension();
+//        dimension2D.setSize(page.getCanvas().getClientSize().getWidth() / 2, page.getCanvas().getClientSize().getHeight() / 3);
+//        PdfTilingBrush brush = new PdfTilingBrush(dimension2D);
+//        brush.getGraphics().setTransparency(0.3F);
+//        brush.getGraphics().save();
+//        brush.getGraphics().translateTransform((float) brush.getSize().getWidth() / 2, (float) brush.getSize().getHeight() / 2);
+//        brush.getGraphics().rotateTransform(-45);
+//        brush.getGraphics().drawString(textWatermark, new PdfTrueTypeFont(new Font("宋体",Font.PLAIN,30),true), PdfBrushes.getRed(), 0, 0, new PdfStringFormat(PdfTextAlignment.Center));
+//        brush.getGraphics().restore();
+//        brush.getGraphics().setTransparency(1);
+//        Rectangle2D loRect = new Rectangle2D.Float();
+//        loRect.setFrame(new Point2D.Float(0, 0), page.getCanvas().getClientSize());
+//        page.getCanvas().drawRectangle(brush, loRect);
+//    }
+//
+//
+//}