Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

PAS/src/main/java/cn/cslg/pas/common/config/SpringDocConfig.java

@@ -1,16 +1,12 @@
 package cn.cslg.pas.common.config;
 
-import io.swagger.v3.oas.models.ExternalDocumentation;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.info.License;
-import org.springdoc.core.GroupedOpenApi;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
 public class SpringDocConfig {
-
     @Bean
     public OpenAPI apiInfo() {
         return new OpenAPI().info(new Info().title("接口文档").description("接口文档").version("v1.0.0"));

PAS/src/main/java/cn/cslg/pas/common/core/annotation/PermissionAspect.java

@@ -3,15 +3,13 @@ package cn.cslg.pas.common.core.annotation;
 import cn.cslg.pas.common.core.base.RequestHolder;
 import cn.cslg.pas.common.core.exception.PermissionException;
 import cn.cslg.pas.common.model.PersonnelVO;
+import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectUser;
-import cn.cslg.pas.domain.User;
-import cn.cslg.pas.common.utils.CacheUtils;
-import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.service.ProjectService;
 import cn.cslg.pas.service.ProjectUserService;
-import cn.dev33.satoken.stp.StpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;

PAS/src/main/java/cn/cslg/pas/common/core/base/RequestHolder.java

@@ -47,7 +47,7 @@ public class RequestHolder {
      */
     public static HttpSession getSession() {
         log.debug("getSession -- Thread id :{}, name : {}", Thread.currentThread().getId(), Thread.currentThread().getName());
-        HttpServletRequest request = null;
+        HttpServletRequest request;
         if (null == (request = getRequest())) {
             return null;
         }

PAS/src/main/java/cn/cslg/pas/controller/ProjectController.java

@@ -2,11 +2,8 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.vo.ProjectVO;
-import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.Project;
@@ -15,7 +12,6 @@ import cn.cslg.pas.service.ProjectPatentLinkService;
 import cn.cslg.pas.service.ProjectService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
@@ -39,12 +35,8 @@ import java.util.List;
 @RequestMapping(Constants.API_VERSION_V2 + "/project")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ProjectController {
-
     private final ProjectService projectService;
-    private final CacheUtils cacheUtils;
     private final ProjectPatentLinkService projectPatentLinkService;
-    private final LoginUtils loginUtils;
-
 
     @PostMapping("list")
     @checkAuth(FunId = "/workspace/project/check")
@@ -59,6 +51,7 @@ public class ProjectController {
     public String add(@RequestBody Project project) {
         return projectService.add(project);
     }
+
     @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/modify")
     @PostMapping("edit")
@@ -112,13 +105,13 @@ public class ProjectController {
     @PostMapping("share")
     @checkAuth(FunId = "/workspace/project/project_share")
     @Operation(summary = "分享专题库")
-    public String share(Integer id,  @RequestBody List<ProjectUser.User> users) {
+    public String share(Integer id, @RequestBody List<ProjectUser.User> users) {
         List<Integer> userIds = new ArrayList<>();
-        users.forEach(item->{userIds.add(item.getUserId());});
-        return projectService.share(id, userIds,users);
+        users.forEach(item -> userIds.add(item.getUserId()));
+        return projectService.share(id, userIds, users);
     }
 
-    @checkAuth(FunId ="/workspace/project/import/Excel_template")
+    @checkAuth(FunId = "/workspace/project/import/Excel_template")
     @PostMapping("importExcel")
     @Operation(summary = "根据模板导入专题库信息")
     public String importExcel(MultipartFile file) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectExportController.java

@@ -1,30 +1,19 @@
 package cn.cslg.pas.controller;
 
-import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.core.exception.PermissionException;
 import cn.cslg.pas.common.model.vo.ProjectExportVO;
-import cn.cslg.pas.common.model.vo.ProjectVO;
-import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
-import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.common.utils.auth.checkAuth;
-import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectExport;
-import cn.cslg.pas.domain.User;
 import cn.cslg.pas.service.ProjectExportService;
-import cn.cslg.pas.service.ProjectPatentLinkService;
 import cn.cslg.pas.service.ProjectService;
-import cn.dev33.satoken.stp.StpUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
  * <p>
  * 专题库 前端控制器
@@ -43,7 +32,6 @@ public class ProjectExportController {
     private final ProjectExportService projectExportService;
     private final LoginUtils loginUtils;
 
-
     @PostMapping
     @Operation(summary = "数据导出")
     public String export(@RequestBody ProjectExportVO params) {

PAS/src/main/java/cn/cslg/pas/service/ImportErrorLogService.java

@@ -1,9 +1,7 @@
 package cn.cslg.pas.service;
 
-import cn.cslg.pas.domain.Area;
 import cn.cslg.pas.domain.ImportErrorLog;
 import cn.cslg.pas.mapper.ImportErrorLogMapper;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Lazy;

PAS/src/main/java/cn/cslg/pas/service/PoiService.java

@@ -5,27 +5,23 @@ import cn.cslg.pas.domain.PatentPledge;
 import cn.cslg.pas.mapper.PatentPledgeMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
-import org.apache.poi.hwpf.extractor.WordExtractor;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.LocaleUtil;
 import org.apache.poi.util.Units;
-import org.apache.poi.xwpf.extractor.XWPFWordExtractor;
 import org.apache.poi.xwpf.model.XWPFHeaderFooterPolicy;
 import org.apache.poi.xwpf.usermodel.*;
 import org.apache.xmlbeans.impl.xb.xmlschema.SpaceAttribute;
 import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
-import sun.misc.BASE64Decoder;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.math.BigInteger;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -40,74 +36,70 @@ import java.util.Map;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PoiService extends ServiceImpl<PatentPledgeMapper, PatentPledge> {
     public PoiVO readWordFile() throws IOException {
-        PoiVO poiVO =new PoiVO();
-        List<PoiVO.Pg> pgs =new ArrayList<>();
+        PoiVO poiVO = new PoiVO();
+        List<PoiVO.Pg> pgs = new ArrayList<>();
         InputStream is = new FileInputStream("C:\\\\BaiduNetdiskDownload\\\\生成\\\\first.docx");
         XWPFDocument doc = new XWPFDocument(is);
-     List<IBodyElement> bodyElements=   doc.getBodyElements();
-       for(IBodyElement iBodyElement: bodyElements)
-       {    PoiVO.Pg pg = new PoiVO.Pg();
-           if(iBodyElement.getElementType().name().equals("PARAGRAPH"))
-       {XWPFParagraph paragraph= (XWPFParagraph) iBodyElement;
-           if(paragraph.getStyle()!=null&&paragraph.getStyle().equals("word")) {
-               XWPFRun rh = paragraph.getRuns().get(0);
-               pg.setFontSize(rh.getFontSize());
-               pg.setFontFamily(rh.getFontFamily());
-               pg.setText(rh.getText(0));
-               pg.setColor(rh.getColor());
-               pg.setAlignment(paragraph.getFontAlignment());
-               pg.setType(paragraph.getStyle());
-               pgs.add(pg);
-           }
-           else if(paragraph.getStyle()!=null&&paragraph.getStyle().equals("picture")) {
-               XWPFRun rh = paragraph.getRuns().get(0);
-               pg.setAlignment(paragraph.getFontAlignment());
-               pg.setType(paragraph.getStyle());
-               XWPFPicture picture =  rh.getEmbeddedPictures().get(0);
-               pg.setHeight((int) picture.getDepth());
-               pg.setWeight((int) picture.getWidth());
-               pg.setImgUrl(picture.getDescription());
-               pgs.add(pg);
-           }
-           else if(paragraph.getStyle()!=null&&paragraph.getStyle().contains("Heading")) {
-               XWPFRun rh = paragraph.getRuns().get(0);
-               pg.setFontSize(rh.getFontSize());
-               pg.setFontFamily(rh.getFontFamily());
-               pg.setText(rh.getText(0));
-               pg.setColor(rh.getColor());
-               pg.setAlignment(paragraph.getFontAlignment());
-               pg.setType(paragraph.getStyle());
-               pgs.add(pg);
-           }
-
-       }
+        List<IBodyElement> bodyElements = doc.getBodyElements();
+        for (IBodyElement iBodyElement : bodyElements) {
+            PoiVO.Pg pg = new PoiVO.Pg();
+            if (iBodyElement.getElementType().name().equals("PARAGRAPH")) {
+                XWPFParagraph paragraph = (XWPFParagraph) iBodyElement;
+                if (paragraph.getStyle() != null && paragraph.getStyle().equals("word")) {
+                    XWPFRun rh = paragraph.getRuns().get(0);
+                    pg.setFontSize(rh.getFontSize());
+                    pg.setFontFamily(rh.getFontFamily());
+                    pg.setText(rh.getText(0));
+                    pg.setColor(rh.getColor());
+                    pg.setAlignment(paragraph.getFontAlignment());
+                    pg.setType(paragraph.getStyle());
+                    pgs.add(pg);
+                } else if (paragraph.getStyle() != null && paragraph.getStyle().equals("picture")) {
+                    XWPFRun rh = paragraph.getRuns().get(0);
+                    pg.setAlignment(paragraph.getFontAlignment());
+                    pg.setType(paragraph.getStyle());
+                    XWPFPicture picture = rh.getEmbeddedPictures().get(0);
+                    pg.setHeight((int) picture.getDepth());
+                    pg.setWeight((int) picture.getWidth());
+                    pg.setImgUrl(picture.getDescription());
+                    pgs.add(pg);
+                } else if (paragraph.getStyle() != null && paragraph.getStyle().contains("Heading")) {
+                    XWPFRun rh = paragraph.getRuns().get(0);
+                    pg.setFontSize(rh.getFontSize());
+                    pg.setFontFamily(rh.getFontFamily());
+                    pg.setText(rh.getText(0));
+                    pg.setColor(rh.getColor());
+                    pg.setAlignment(paragraph.getFontAlignment());
+                    pg.setType(paragraph.getStyle());
+                    pgs.add(pg);
+                }
 
-           else if(iBodyElement.getElementType().name().equals("TABLE")){
-               XWPFTable  table = (XWPFTable) iBodyElement;
-String  org = table.getText().replace("\t",",").replace("\n","||");
-String tableText =org.replace(",||","");
-               pg.setText(tableText);
-               pg.setType(table.getStyleID());
-               pgs.add(pg);
-           }
+            } else if (iBodyElement.getElementType().name().equals("TABLE")) {
+                XWPFTable table = (XWPFTable) iBodyElement;
+                String org = table.getText().replace("\t", ",").replace("\n", "||");
+                String tableText = org.replace(",||", "");
+                pg.setText(tableText);
+                pg.setType(table.getStyleID());
+                pgs.add(pg);
+            }
 
-       }
-    List<XWPFParagraph> ps=doc.getParagraphs();
+        }
+        List<XWPFParagraph> ps = doc.getParagraphs();
         PoiVO.Pg title = new PoiVO.Pg();
         title.setAlignment(ps.get(0).getFontAlignment());
         XWPFRun r = ps.get(0).getRuns().get(0);
-      title.setColor(r.getColor());
-      title.setText(r.getText(0));
-      title.setFontSize(r.getFontSize());
+        title.setColor(r.getColor());
+        title.setText(r.getText(0));
+        title.setFontSize(r.getFontSize());
 
-poiVO.setPgs(pgs);
-poiVO.setTitle(title);
+        poiVO.setPgs(pgs);
+        poiVO.setTitle(title);
         return poiVO;
     }
 
-    public  void writeFile(PoiVO poiVO) throws IOException, InvalidFormatException {
+    public void writeFile(PoiVO poiVO) throws IOException, InvalidFormatException {
         XWPFDocument doc = new XWPFDocument();// 创建Word文件
-        PoiVO.Pg title =poiVO.getTitle();
+        PoiVO.Pg title = poiVO.getTitle();
         // 标题
         XWPFParagraph p = doc.createParagraph();// 新建段落
         p.setFontAlignment(title.getAlignment());// 设置段落的对齐方式
@@ -117,92 +109,89 @@ poiVO.setTitle(title);
         r.setColor(title.getColor());//设置颜色
         r.setFontSize(title.getFontSize());//设置字体大小
         r.setStyle("Title");
-        if(title.getAddCarriageReturn()){
-        r.addCarriageReturn();//回车换行
-             }
+        if (title.getAddCarriageReturn()) {
+            r.addCarriageReturn();//回车换行
+        }
         doc.createParagraph().createRun().addBreak(BreakType.PAGE);//换页
 
         List<PoiVO.Pg> pgs = poiVO.getPgs();
 
-        CTSdtBlock ctSdtBlock =doc.getDocument().getBody().addNewSdt();
-           this.CustomTOC(ctSdtBlock);
+        CTSdtBlock ctSdtBlock = doc.getDocument().getBody().addNewSdt();
+        this.CustomTOC(ctSdtBlock);
         doc.createParagraph().createRun().addBreak(BreakType.PAGE);//换页
-  for(int i=0;i<pgs.size();i++){
+        for (int i = 0; i < pgs.size(); i++) {
 
-   if(pgs.get(i).getType()!=null&&pgs.get(i).getType().equals("word")) {
-       XWPFParagraph tm = doc.createParagraph();
-       tm.setStyle("word");
-       XWPFRun rh = tm.createRun();
-       rh.setFontSize(pgs.get(i).getFontSize());
-       rh.setFontFamily(pgs.get(i).getFontFamily());
-       rh.setText(pgs.get(i).getText());
-       rh.setColor(pgs.get(i).getColor());
-       tm.setFontAlignment(pgs.get(i).getAlignment());
-       rh.setFontFamily(pgs.get(i).getFontFamily());
-       if (pgs.get(i).getAddCarriageReturn()) {
-           rh.addCarriageReturn();//回车换行
-       }
-   }
-   else if(pgs.get(i).getType()!=null&&pgs.get(i).getType().equals("picture")) {
-       XWPFParagraph pImg = doc.createParagraph();
-       pImg.setStyle("picture");
-       pImg.setFontAlignment(pgs.get(i).getAlignment());
-       XWPFRun rImg = pImg.createRun();//创建标题
-       rImg.addCarriageReturn();//回车换行
-       String imgData = pgs.get(i).getImgUrl();
-       // 转为数据流
-       InputStream stream = new FileInputStream(imgData);
-       // 向段落中插入图片
-       rImg.addPicture(stream, Document.PICTURE_TYPE_PNG, pgs.get(i).getImgUrl(), Units.toEMU(pgs.get(i).getWeight()), Units.toEMU(pgs.get(i).getHeight()));
-   }
-   else if(pgs.get(i).getType()!=null&&pgs.get(i).getType().equals("table")) {
-  String org =pgs.get(i).getText();
-  int rows =0;
-  int cols =0;
-String[] row =org.split("\\|\\|");
- rows=row.length;
- for(int t=0;t<row.length;t++){
-  String[] tem =   row[t].split(",");
-     cols= cols> tem.length ? cols: tem.length;
- }
+            if (pgs.get(i).getType() != null && pgs.get(i).getType().equals("word")) {
+                XWPFParagraph tm = doc.createParagraph();
+                tm.setStyle("word");
+                XWPFRun rh = tm.createRun();
+                rh.setFontSize(pgs.get(i).getFontSize());
+                rh.setFontFamily(pgs.get(i).getFontFamily());
+                rh.setText(pgs.get(i).getText());
+                rh.setColor(pgs.get(i).getColor());
+                tm.setFontAlignment(pgs.get(i).getAlignment());
+                rh.setFontFamily(pgs.get(i).getFontFamily());
+                if (pgs.get(i).getAddCarriageReturn()) {
+                    rh.addCarriageReturn();//回车换行
+                }
+            } else if (pgs.get(i).getType() != null && pgs.get(i).getType().equals("picture")) {
+                XWPFParagraph pImg = doc.createParagraph();
+                pImg.setStyle("picture");
+                pImg.setFontAlignment(pgs.get(i).getAlignment());
+                XWPFRun rImg = pImg.createRun();//创建标题
+                rImg.addCarriageReturn();//回车换行
+                String imgData = pgs.get(i).getImgUrl();
+                // 转为数据流
+                InputStream stream = new FileInputStream(imgData);
+                // 向段落中插入图片
+                rImg.addPicture(stream, Document.PICTURE_TYPE_PNG, pgs.get(i).getImgUrl(), Units.toEMU(pgs.get(i).getWeight()), Units.toEMU(pgs.get(i).getHeight()));
+            } else if (pgs.get(i).getType() != null && pgs.get(i).getType().equals("table")) {
+                String org = pgs.get(i).getText();
+                int rows;
+                int cols = 0;
+                String[] row = org.split("\\|\\|");
+                rows = row.length;
+                for (String s : row) {
+                    String[] tem = s.split(",");
+                    cols = Math.max(cols, tem.length);
+                }
 
-       XWPFTable table1 = doc.createTable(rows, cols);
- table1.setStyleID(pgs.get(i).getType());
-       table1.setWidthType(TableWidthType.AUTO);
-       for(int t=0;t<row.length;t++){
-           String[] tem =   row[t].split(",");
-           XWPFTableRow row1 = table1.getRow(t);
-           for(int q=0;q<tem.length;q++){
-               row1.getCell(q).setText(tem[q]);
-           }
+                XWPFTable table1 = doc.createTable(rows, cols);
+                table1.setStyleID(pgs.get(i).getType());
+                table1.setWidthType(TableWidthType.AUTO);
+                for (int t = 0; t < row.length; t++) {
+                    String[] tem = row[t].split(",");
+                    XWPFTableRow row1 = table1.getRow(t);
+                    for (int q = 0; q < tem.length; q++) {
+                        row1.getCell(q).setText(tem[q]);
+                    }
 
-       }
-       doc.setTable(0, table1);
+                }
+                doc.setTable(0, table1);
 
-   }
-   else if(pgs.get(i).getType().contains("Heading")){
-       XWPFParagraph Paragraph = doc.createParagraph();
-       CTBookmark ctBookmark1 = Paragraph.getCTP().addNewBookmarkStart();//开始书签
-       ctBookmark1.setId(BigInteger.valueOf(i));//开始书签和结束书签通过ID关联
-       ctBookmark1.setName("书签"+ i);//书签名称
-       Paragraph.setStyle(pgs.get(i).getType());
-       XWPFRun run1 = Paragraph.createRun();
-       run1.setText(pgs.get(i).getText());
-       run1.setColor(pgs.get(i).getColor());
-       run1.setFontSize(pgs.get(i).getFontSize());
-       run1.setBold(true);
-       Paragraph.getCTP().addNewBookmarkEnd().setId(BigInteger.valueOf(i));
-   }
-  }
-        this.addItem2TOC(doc,ctSdtBlock);
-   Integer     pageCount = doc.getProperties().getExtendedProperties().getUnderlyingProperties().getPages();
+            } else if (pgs.get(i).getType().contains("Heading")) {
+                XWPFParagraph Paragraph = doc.createParagraph();
+                CTBookmark ctBookmark1 = Paragraph.getCTP().addNewBookmarkStart();//开始书签
+                ctBookmark1.setId(BigInteger.valueOf(i));//开始书签和结束书签通过ID关联
+                ctBookmark1.setName("书签" + i);//书签名称
+                Paragraph.setStyle(pgs.get(i).getType());
+                XWPFRun run1 = Paragraph.createRun();
+                run1.setText(pgs.get(i).getText());
+                run1.setColor(pgs.get(i).getColor());
+                run1.setFontSize(pgs.get(i).getFontSize());
+                run1.setBold(true);
+                Paragraph.getCTP().addNewBookmarkEnd().setId(BigInteger.valueOf(i));
+            }
+        }
+        this.addItem2TOC(doc, ctSdtBlock);
+        Integer pageCount = doc.getProperties().getExtendedProperties().getUnderlyingProperties().getPages();
         FileOutputStream out = new FileOutputStream("C:\\\\BaiduNetdiskDownload\\\\生成\\\\first.docx");
         CTSectPr sectPr = doc.getDocument().getBody().addNewSectPr();
         XWPFHeaderFooterPolicy policy = new XWPFHeaderFooterPolicy(doc, sectPr);
 
 
 //        this.createDefaultFooter(doc,"宋体",8);
-      //  添加页脚,
+        //  添加页脚,
         CTP ctpFooter = CTP.Factory.newInstance();
         CTR ctrFooter = ctpFooter.addNewR();
         CTText ctFooter = ctrFooter.addNewT();
@@ -220,27 +209,25 @@ String[] row =org.split("\\|\\|");
     }
 
 
-    public void addItem2TOC( XWPFDocument doc ,CTSdtBlock block) {
+    public void addItem2TOC(XWPFDocument doc, CTSdtBlock block) {
         List<XWPFParagraph> paragraphs = doc.getParagraphs();
-        int num =1;
+        int num = 1;
         for (XWPFParagraph par : paragraphs) {
             String parStyle = par.getStyle();
             List<CTR> ctrlist = par.getCTP().getRList();//获取<w:p>标签下的<w:r>list
-            for(int j=0; j < ctrlist.size(); j++) {  //遍历r
-                CTR r = ctrlist.get(j);
-
+            for (CTR r : ctrlist) {  //遍历r
                 List<CTEmpty> breaklist = r.getLastRenderedPageBreakList();//判断是否存在此标签
-                if(breaklist.size() > 0) {
+                if (breaklist.size() > 0) {
                     num++; //页数添加
                 }
             }
             if (parStyle != null && parStyle.startsWith("Heading")) {
-                List<CTBookmark> bookmarkList=par.getCTP().getBookmarkStartList();
+                List<CTBookmark> bookmarkList = par.getCTP().getBookmarkStartList();
                 try {
                     int level = Integer.parseInt(parStyle.substring("Heading".length()));
 
-                        //添加标题
-                       this.addRow(level, par.getText(), num,  bookmarkList.get(0).getName(),block);
+                    //添加标题
+                    this.addRow(level, par.getText(), num, bookmarkList.get(0).getName(), block);
                 } catch (NumberFormatException e) {
                     e.printStackTrace();
                 }
@@ -250,14 +237,14 @@ String[] row =org.split("\\|\\|");
 
 
     //生成页脚
-    public static void createDefaultFooter(final XWPFDocument document,String fontName,int fontSize) throws IOException {
+    public static void createDefaultFooter(final XWPFDocument document, String fontName, int fontSize) throws IOException {
         CTP pageNo = CTP.Factory.newInstance();
         XWPFParagraph footer = new XWPFParagraph(pageNo, document);
         footer.createRun().setFontSize(2000);
         CTPPr begin = pageNo.addNewPPr();
         begin.addNewPStyle().setVal("style21");
         begin.addNewJc().setVal(STJc.CENTER);
-        CTR  pageBegin=pageNo.addNewR();
+        CTR pageBegin = pageNo.addNewR();
         pageBegin.addNewRPr().addNewRFonts().setAscii(fontName);
         pageBegin.addNewRPr().addNewRFonts().setCs(fontName);
         pageBegin.addNewRPr().addNewRFonts().setEastAsia(fontName);
@@ -265,7 +252,7 @@ String[] row =org.split("\\|\\|");
         pageBegin.addNewRPr().addNewSz().setVal(BigInteger.valueOf(fontSize));
         pageBegin.addNewRPr().addNewSzCs().setVal(BigInteger.valueOf(fontSize));
         pageBegin.addNewFldChar().setFldCharType(STFldCharType.BEGIN);
-        CTR  page=pageNo.addNewR();
+        CTR page = pageNo.addNewR();
         page.addNewRPr().addNewRFonts().setAscii(fontName);
         page.addNewRPr().addNewRFonts().setCs(fontName);
         page.addNewRPr().addNewRFonts().setEastAsia(fontName);
@@ -273,7 +260,7 @@ String[] row =org.split("\\|\\|");
         page.addNewRPr().addNewSz().setVal(BigInteger.valueOf(fontSize));
         page.addNewRPr().addNewSzCs().setVal(BigInteger.valueOf(fontSize));
         page.addNewInstrText().setStringValue("PAGE   \\* MERGEFORMAT");
-        CTR  pageSep=pageNo.addNewR();
+        CTR pageSep = pageNo.addNewR();
         pageSep.addNewRPr().addNewRFonts().setAscii(fontName);
         pageSep.addNewRPr().addNewRFonts().setCs(fontName);
         pageSep.addNewRPr().addNewRFonts().setEastAsia(fontName);
@@ -295,7 +282,7 @@ String[] row =org.split("\\|\\|");
 
         CTSectPr sectPr = document.getDocument().getBody().isSetSectPr() ? document.getDocument().getBody().getSectPr() : document.getDocument().getBody().addNewSectPr();
         XWPFHeaderFooterPolicy policy = new XWPFHeaderFooterPolicy(document, sectPr);
-        policy.createFooter(STHdrFtr.DEFAULT, new XWPFParagraph[] { footer });
+        policy.createFooter(STHdrFtr.DEFAULT, new XWPFParagraph[]{footer});
     }
 
     // 目录添加行
@@ -314,8 +301,8 @@ String[] row =org.split("\\|\\|");
         pPr.addNewRPr().addNewNoProof();//不检查语法
         CTR run = p.addNewR();
         run.addNewRPr().addNewNoProof();
-        for(int i=0;i<level;i++){
-            title="\n"+title;
+        for (int i = 0; i < level; i++) {
+            title = "\n" + title;
         }
         run.addNewT().setStringValue(title);//添加标题文字
         //设置标题字体
@@ -346,7 +333,7 @@ String[] row =org.split("\\|\\|");
         text.setSpace(SpaceAttribute.Space.PRESERVE);
         // bookmark reference
         //源码的域名为" PAGEREF _Toc","\h"含义为在目录内建立目录项与页码的超链接
-        text.setStringValue(" PAGEREF "+bookmarkRef + " \\h ");
+        text.setStringValue(" PAGEREF " + bookmarkRef + " \\h ");
         p.addNewR().addNewRPr().addNewNoProof();
         run = p.addNewR();
         run.addNewRPr().addNewNoProof();
@@ -362,7 +349,7 @@ String[] row =org.split("\\|\\|");
         //添加页码右括号
         p.addNewR().addNewT().setStringValue(")");
         //设置行间距
-        CTSpacing pSpacing = pPr.getSpacing() != null ? pPr.getSpacing(): pPr.addNewSpacing();
+        CTSpacing pSpacing = pPr.getSpacing() != null ? pPr.getSpacing() : pPr.addNewSpacing();
         pSpacing.setLineRule(STLineSpacingRule.AUTO);//行间距类型：多倍
         pSpacing.setLine(new BigInteger("360"));//此处1.5倍行间距
     }