Skip to content

I
inspect
提交 96e59986 authored 作者: liujie's avatar liujie
浏览文件
操作

Merge branch 'lj-project' of git.yfzx.zjtys.com.cn:912-system/monitor/inspect into lj-project

Conflicts: src/main/java/com/zjty/inspect/controller/EvaluationController.java src/main/resources/application.properties
上级 c4952cbb 5d8245fd
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 240 行增加 和 51 行删除
src/main/java/com/zjty/inspect/aop/AopIntercept.java
浏览文件 @ 96e59986
...@@ -54,7 +54,7 @@ public class AopIntercept { ...@@ -54,7 +54,7 @@ public class AopIntercept {
String url = "http://"+address+":12345/user/getLogin/"+sessionId; String url = "http://"+address+":12345/user/getLogin/"+sessionId;
ServerResponse serverResponse = restTemplate.getForObject(url, ServerResponse.class); ServerResponse serverResponse = restTemplate.getForObject(url, ServerResponse.class);
if(serverResponse!=null && serverResponse.getCode()!=200){ if(serverResponse!=null && serverResponse.getCode()!=200){
ResponseEntity.status(403).build(); ResponseEntity.status(403).body(1);
} }
User user = serverResponse.getData(); User user = serverResponse.getData();
AuthAnnotation authAnnotation = ((MethodSignature)joinPoint.getSignature()).getMethod().getAnnotation(AuthAnnotation.class); AuthAnnotation authAnnotation = ((MethodSignature)joinPoint.getSignature()).getMethod().getAnnotation(AuthAnnotation.class);
...@@ -77,7 +77,7 @@ public class AopIntercept { ...@@ -77,7 +77,7 @@ public class AopIntercept {
} }
} }
} }
return ResponseEntity.status(403).build(); return ResponseEntity.status(403).body("f");
} }
} }
src/main/java/com/zjty/inspect/controller/EvaluationController.java
浏览文件 @ 96e59986
...@@ -5,6 +5,7 @@ import com.zjty.inspect.aop.AuthAnnotation; ...@@ -5,6 +5,7 @@ import com.zjty.inspect.aop.AuthAnnotation;
import com.zjty.inspect.entity.*; import com.zjty.inspect.entity.*;
import com.zjty.inspect.service.EvaluationService; import com.zjty.inspect.service.EvaluationService;
import com.zjty.inspect.utils.ExcelUtil; import com.zjty.inspect.utils.ExcelUtil;
import com.zjty.inspect.utils.WpsUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
...@@ -21,48 +22,50 @@ import java.util.Map; ...@@ -21,48 +22,50 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("/evaluation") @RequestMapping("/evaluation")
@Api(value = "评估报告管理接口",description = "评估报告管理接口,提供页面的增、删、改、查") @Api(value = "评估报告管理接口", description = "评估报告管理接口,提供页面的增、删、改、查")
public class EvaluationController { public class EvaluationController {
@Autowired @Autowired
private EvaluationService evaluationService; private EvaluationService evaluationService;
/** /**
* 新增评估报告 * 新增评估报告
*
* @param evaluation 评估报告 * @param evaluation 评估报告
* @return * @return
*/ */
@PostMapping @PostMapping
@ApiOperation("新增评估报告") @ApiOperation("新增评估报告")
public ResponseEntity rule(@RequestBody Evaluation evaluation){ public ResponseEntity rule(@RequestBody Evaluation evaluation) {
evaluationService.save(evaluation); evaluationService.save(evaluation);
return ResponseEntity.ok(200); return ResponseEntity.ok(200);
} }
@ApiOperation("根据用户名查询最新的报告输出") @ApiOperation("根据用户名查询最新的报告输出")
@GetMapping(value = "/eva") @GetMapping(value = "/eva")
public ResponseEntity getName(@RequestParam String name,@RequestParam String id) { public ResponseEntity getName(@RequestParam String name, @RequestParam String id) {
if(StringUtils.isEmpty(id)||id.equals("null")){ if (StringUtils.isEmpty(id) || id.equals("null")) {
Evaluation e = evaluationService.findByName(name); Evaluation e = evaluationService.findByName(name);
if(e!=null){ if (e != null) {
AssessmentReport assessmentReport = JSON.parseObject(e.getOutEva(), AssessmentReport.class); AssessmentReport assessmentReport = JSON.parseObject(e.getOutEva(), AssessmentReport.class);
return ResponseEntity.ok(assessmentReport); return ResponseEntity.ok(assessmentReport);
} }
return ResponseEntity.ok(null); return ResponseEntity.ok(null);
} }
Evaluation evaluation = evaluationService.findById(id); Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){ if (evaluation != null) {
AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class); AssessmentReport assessmentReport = JSON.parseObject(evaluation.getOutEva(), AssessmentReport.class);
return ResponseEntity.ok(assessmentReport); return ResponseEntity.ok(assessmentReport);
} }
return ResponseEntity.ok(null); return ResponseEntity.ok(null);
} }
@ApiOperation("根据id查询输入") @ApiOperation("根据id查询输入")
@GetMapping(value = "/in/{name}") @GetMapping(value = "/in/{name}")
//@AuthAnnotation(code = {"000800"}) //@AuthAnnotation(code = {"000800"})
public ResponseEntity getInName(@PathVariable String name) { public ResponseEntity getInName(@PathVariable String name) {
Evaluation evaluation = evaluationService.findById(name); Evaluation evaluation = evaluationService.findById(name);
if(evaluation!=null){ if (evaluation != null) {
Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class); Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
return ResponseEntity.ok(reform); return ResponseEntity.ok(reform);
} }
...@@ -74,7 +77,7 @@ public class EvaluationController { ...@@ -74,7 +77,7 @@ public class EvaluationController {
@AuthAnnotation(code = {"000800"}) @AuthAnnotation(code = {"000800"})
public ResponseEntity getInId(@PathVariable String id) { public ResponseEntity getInId(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id); Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){ if (evaluation != null) {
return ResponseEntity.ok(evaluation); return ResponseEntity.ok(evaluation);
} }
return ResponseEntity.ok(null); return ResponseEntity.ok(null);
...@@ -84,58 +87,76 @@ public class EvaluationController { ...@@ -84,58 +87,76 @@ public class EvaluationController {
@GetMapping(value = "/in/excel/{id}") @GetMapping(value = "/in/excel/{id}")
public ResponseEntity exportInName(@PathVariable String id) { public ResponseEntity exportInName(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id); Evaluation evaluation = evaluationService.findById(id);
if(evaluation!=null){ if (evaluation != null) {
List<ExcelDataTemp> excelDataTemp = ExcelUtil.parseExcel2Entity(evaluation); List<ExcelDataTemp> excelDataTemp = ExcelUtil.parseExcel2Entity(evaluation);
return ResponseEntity.ok(excelDataTemp); return ResponseEntity.ok(excelDataTemp);
}else{ } else {
return ResponseEntity.ok(new ArrayList<ExcelDataTemp>()); return ResponseEntity.ok(new ArrayList<ExcelDataTemp>());
} }
} }
/** /**
* 修改评估报告 * 修改评估报告
*
* @param evaluation 规则封装 * @param evaluation 规则封装
* @param id id * @param id id
* @return * @return
*/ */
@PostMapping(value = "/{id}") @PostMapping(value = "/{id}")
@ApiOperation("修改评估报告") @ApiOperation("修改评估报告")
@AuthAnnotation(code = {"000800"}) @AuthAnnotation(code = {"000800"})
public ResponseEntity update(@RequestBody Evaluation evaluation,@PathVariable String id){ public ResponseEntity update(@RequestBody Evaluation evaluation, @PathVariable String id) {
evaluation.setId(id); evaluation.setId(id);
evaluationService.update(evaluation); evaluationService.update(evaluation);
return ResponseEntity.ok(200); return ResponseEntity.ok(200);
} }
/** /**
* 根据id删除评估报告 * 根据id删除评估报告
*
* @param id id * @param id id
* @return * @return
*/ */
@ApiOperation("根据id删除评估报告") @ApiOperation("根据id删除评估报告")
@DeleteMapping(value = "/{id}") @DeleteMapping(value = "/{id}")
@AuthAnnotation(code = {"000800"}) @AuthAnnotation(code = {"000800"})
public ResponseEntity deleteById(@PathVariable String id){ public ResponseEntity deleteById(@PathVariable String id) {
evaluationService.delete(id); evaluationService.delete(id);
return ResponseEntity.ok(200); return ResponseEntity.ok(200);
} }
/** /**
* 分页+多条件查询 * 分页+多条件查询
*
* @param searchMap 查询条件封装 * @param searchMap 查询条件封装
* @param page 页码 * @param page 页码
* @param size 页大小 * @param size 页大小
* @return 分页结果 * @return 分页结果
*/ */
@ApiOperation("分页查询页面列表") @ApiOperation("分页查询页面列表")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name="page",value = "页码",required=true,paramType="path",dataType="int"), @ApiImplicitParam(name = "page", value = "页码", required = true, paramType = "path", dataType = "int"),
@ApiImplicitParam(name="size",value = "每页记录数",required=true,paramType="path",dataType="int") @ApiImplicitParam(name = "size", value = "每页记录数", required = true, paramType = "path", dataType = "int")
}) })
@RequestMapping(value="/search/{page}/{size}",method= RequestMethod.POST) @RequestMapping(value = "/search/{page}/{size}", method = RequestMethod.POST)
@AuthAnnotation(code = {"000800"}) @AuthAnnotation(code = {"000800"})
public ResponseEntity findSearch(@RequestBody Map searchMap , @PathVariable int page, @PathVariable int size){ public ResponseEntity findSearch(@RequestBody Map searchMap, @PathVariable int page, @PathVariable int size) {
Page<Evaluation> pageList = evaluationService.findSearch(searchMap, page, size); Page<Evaluation> pageList = evaluationService.findSearch(searchMap, page, size);
return ResponseEntity.ok(new PageResult<Evaluation>(pageList.getTotalElements(), pageList.getContent()) ); return ResponseEntity.ok(new PageResult<Evaluation>(pageList.getTotalElements(), pageList.getContent()));
} }
/**
* 修改评估报告
*
* @param id id
* @return
*/
@GetMapping(value = "/bg/{id}")
@ApiOperation("修改评估报告")
public ResponseEntity findall(@PathVariable String id) {
Evaluation evaluation = evaluationService.findById(id);
Map<String, String> wps = WpsUtil.createWps(evaluation);
return ResponseEntity.ok(wps);
@ApiOperation("下载报告") @ApiOperation("下载报告")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name="id",value = "报告主键"), @ApiImplicitParam(name="id",value = "报告主键"),
......
src/main/java/com/zjty/inspect/entity/ExcelDataTemp.java
浏览文件 @ 96e59986
...@@ -3,6 +3,7 @@ package com.zjty.inspect.entity; ...@@ -3,6 +3,7 @@ package com.zjty.inspect.entity;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List; import java.util.List;
/** /**
...@@ -13,5 +14,5 @@ import java.util.List; ...@@ -13,5 +14,5 @@ import java.util.List;
public class ExcelDataTemp { public class ExcelDataTemp {
private String name; private String name;
private List<ExcelDataEntity> arrayList = new ArrayList(); private List<ExcelDataEntity> arrayList = new LinkedList<>();
} }
src/main/java/com/zjty/inspect/enums/DocumentTitleEnum.java 0 → 100644
浏览文件 @ 96e59986
package com.zjty.inspect.enums;
import lombok.Getter;
import java.util.HashMap;
import java.util.Map;
@Getter
public enum DocumentTitleEnum {
MAINTITLE(0,"主标题",2,0,0),
FIRSTLEVELTITLE(1,"一级标题",2,0,1),
TWOTITLE(2,"二级标题",3,1,2),
THREETITLE(3,"三级标题",4,2,2),
FOURTITLE(4,"四级标题",5,3,2),
OTHER(8,"其他",0,0,0);
private Integer code;
private String name;
private Integer style;
private Integer ilvl;
private Integer ilfo;
private static Map<Integer,DocumentTitleEnum> documentTitleEnumMap=new HashMap<>();
static {
for (DocumentTitleEnum documentTitleEnum : DocumentTitleEnum.values()) {
documentTitleEnumMap.put(documentTitleEnum.getCode(),documentTitleEnum);
}
}
DocumentTitleEnum() {
}
DocumentTitleEnum(Integer code, String name, Integer style, Integer ilvl, Integer ilfo) {
this.code = code;
this.name = name;
this.style = style;
this.ilvl = ilvl;
this.ilfo = ilfo;
}
public static DocumentTitleEnum getByCode(Integer code){
DocumentTitleEnum documentTitleEnum = documentTitleEnumMap.get(code);
if(documentTitleEnum==null){
return null;
}
return documentTitleEnum;
}
}
src/main/java/com/zjty/inspect/enums/Framework.java
浏览文件 @ 96e59986
package com.zjty.inspect.enums; package com.zjty.inspect.enums;
import java.util.HashMap;
import java.util.Map;
public enum Framework { public enum Framework {
/** /**
* 架构 * 架构
*/ */
SEPARATE("分离型架构",1), SEPARATE("分离型架构",1),
MIXTURE("混合型架构",2); MIXTURE("混合型架构",2),
NONE("无",3);
Framework(String name,Integer status){ Framework(String name,Integer status){
this.name=name; this.name=name;
this.status=status; this.status=status;
...@@ -24,4 +27,27 @@ public enum Framework { ...@@ -24,4 +27,27 @@ public enum Framework {
public Integer getStatus() { public Integer getStatus() {
return status; return status;
} }
private static Map<String,Framework> frameWorkEnumMap=new HashMap<>();
private static Map<Integer,Framework> frameWorkEnumCodeMap=new HashMap<>();
static {
for (Framework frameWorkEnum : Framework.values()) {
frameWorkEnumMap.put(frameWorkEnum.getName(),frameWorkEnum);
frameWorkEnumCodeMap.put(frameWorkEnum.getStatus(),frameWorkEnum);
}
}
public static Framework getByName(String name){
Framework frameWorkEnum = frameWorkEnumMap.get(name);
if(frameWorkEnum==null){
return NONE;
}
return frameWorkEnum;
}
public static Framework getByCode(Integer code){
Framework frameWorkEnum = frameWorkEnumCodeMap.get(code);
if(frameWorkEnum==null){
return NONE;
}
return frameWorkEnum;
}
} }
src/main/java/com/zjty/inspect/enums/LanguageEnum.java
浏览文件 @ 96e59986
...@@ -24,6 +24,9 @@ public enum LanguageEnum { ...@@ -24,6 +24,9 @@ public enum LanguageEnum {
QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔"), QITA(12,"其他：请在备注中填写,如需填写多个,请以逗号分隔"),
JAVASCRIPT(13,"JavaScript"), JAVASCRIPT(13,"JavaScript"),
HTML(14,"HTML"), HTML(14,"HTML"),
JSP(15,"JSP"),
NET(16,".NET"),
; ;
private Integer code; private Integer code;
......
src/main/java/com/zjty/inspect/inspect/Inspector.java
浏览文件 @ 96e59986
...@@ -203,6 +203,9 @@ public class Inspector { ...@@ -203,6 +203,9 @@ public class Inspector {
* 配置文件的一个类型，xml文件 * 配置文件的一个类型，xml文件
*/ */
if ("xml".equals(entry.getKey())) { if ("xml".equals(entry.getKey())) {
List<Path> value = entry.getValue();
for (Path path : entry.getValue()) { for (Path path : entry.getValue()) {
if (path.getFileName().endsWith("pom.xml")) { if (path.getFileName().endsWith("pom.xml")) {
try { try {
...@@ -224,6 +227,8 @@ public class Inspector { ...@@ -224,6 +227,8 @@ public class Inspector {
} }
} }
} }
} }
} }
//指定后缀到文件匹配关键字 //指定后缀到文件匹配关键字
...@@ -267,6 +272,7 @@ public class Inspector { ...@@ -267,6 +272,7 @@ public class Inspector {
mostStatus = language.getCode(); mostStatus = language.getCode();
maxnum = entry.getValue().getNumber(); maxnum = entry.getValue().getNumber();
} }
} }
//设置语言 //设置语言
report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus); report.setLanguage(most == null ? LanguageEnum.NONE.getCode() : mostStatus);
......
src/main/java/com/zjty/inspect/service/impl/DocumentServiceImpl.java
浏览文件 @ 96e59986
...@@ -3,11 +3,13 @@ package com.zjty.inspect.service.impl; ...@@ -3,11 +3,13 @@ package com.zjty.inspect.service.impl;
import com.zjty.inspect.entity.DocumentContent; import com.zjty.inspect.entity.DocumentContent;
import com.zjty.inspect.entity.DocumentPage; import com.zjty.inspect.entity.DocumentPage;
import com.zjty.inspect.entity.TitleHead; import com.zjty.inspect.entity.TitleHead;
import com.zjty.inspect.enums.DocumentTitleEnum;
import com.zjty.inspect.service.DocumentService; import com.zjty.inspect.service.DocumentService;
import com.zjty.inspect.utils.DocumentWordUtil; import com.zjty.inspect.utils.DocumentWordUtil;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils; import org.springframework.util.StringUtils;
import java.security.cert.X509Certificate;
import java.util.List; import java.util.List;
@Service @Service
...@@ -20,11 +22,10 @@ public class DocumentServiceImpl implements DocumentService { ...@@ -20,11 +22,10 @@ public class DocumentServiceImpl implements DocumentService {
String enddard = DocumentWordUtil.enddard(); String enddard = DocumentWordUtil.enddard();
//标题内容 //标题内容
String maintitle = DocumentWordUtil.Maintitle(); String maintitle = DocumentWordUtil.Maintitle();
String subheading = DocumentWordUtil.subheading();
//标题下的内容 //标题下的内容
String standContent = DocumentWordUtil.content(); String standContent = DocumentWordUtil.content();
//表格内容
//表格内容
//页眉 //页眉
String header = documentPage.getHeader(); String header = documentPage.getHeader();
...@@ -34,36 +35,38 @@ public class DocumentServiceImpl implements DocumentService { ...@@ -34,36 +35,38 @@ public class DocumentServiceImpl implements DocumentService {
List<TitleHead> titleHeads = documentPage.getTitleHeads(); List<TitleHead> titleHeads = documentPage.getTitleHeads();
if(titleHeads!=null&&titleHeads.size()>0){ if(titleHeads!=null&&titleHeads.size()>0){
for (TitleHead titleHead : titleHeads) { for (TitleHead titleHead : titleHeads) {
String titleContent=subheading; DocumentTitleEnum documentTitleEnum = DocumentTitleEnum.getByCode(titleHead.getParentId());
if(documentTitleEnum!=null) {
//标题名称 String titleContent = DocumentWordUtil.subheading(documentTitleEnum);
String name = titleHead.getName(); //标题名称
if(!StringUtils.isEmpty(name)) { String name = titleHead.getName();
//标题级别 if (!StringUtils.isEmpty(name)) {
int parentId = titleHead.getParentId(); //标题级别
String s = titleContent.replaceAll("#title#", name) int parentId = titleHead.getParentId();
.replaceAll("#parentId#", String.valueOf(parentId)); String s = titleContent.replaceAll("#title#", name)
sb.append(s); .replaceAll("#parentId#", String.valueOf(parentId));
} sb.append(s);
List<DocumentContent> documentContents = titleHead.getDocumentContents(); }
if(documentContents!=null&&documentContents.size()>0){ List<DocumentContent> documentContents = titleHead.getDocumentContents();
for (DocumentContent documentContent : documentContents) { if (documentContents != null && documentContents.size() > 0) {
if(documentContent!=null){ for (DocumentContent documentContent : documentContents) {
if (documentContent != null) {
String content = documentContent.getContent(); String content = documentContent.getContent();
String baseUrl = documentContent.getBaseUrl(); String baseUrl = documentContent.getBaseUrl();
String documentTable = documentContent.getDocumentTable(); String documentTable = documentContent.getDocumentTable();
if(!StringUtils.isEmpty(content)){ if (!StringUtils.isEmpty(content)) {
String c=standContent; String c = standContent;
String s = c.replaceAll("#content#",content); String s = c.replaceAll("#content#", content);
sb.append(s); sb.append(s);
} }
if(!StringUtils.isEmpty(baseUrl)){ if (!StringUtils.isEmpty(baseUrl)) {
} }
if(!StringUtils.isEmpty(documentTable)){ if (!StringUtils.isEmpty(documentTable)) {
sb.append(documentTable); sb.append(documentTable);
} }
} }
}
} }
} }
} }
......
src/main/java/com/zjty/inspect/service/impl/InspectServiceImpl.java
浏览文件 @ 96e59986
...@@ -53,10 +53,15 @@ public class InspectServiceImpl implements InspectService { ...@@ -53,10 +53,15 @@ public class InspectServiceImpl implements InspectService {
suffixLanguageMapping.put("vue", LanguageEnum.JAVASCRIPT); suffixLanguageMapping.put("vue", LanguageEnum.JAVASCRIPT);
suffixLanguageMapping.put("cpp", LanguageEnum.C); suffixLanguageMapping.put("cpp", LanguageEnum.C);
suffixLanguageMapping.put("py", LanguageEnum.PYTHON); suffixLanguageMapping.put("py", LanguageEnum.PYTHON);
suffixLanguageMapping.put("jsp", LanguageEnum.JAVA); suffixLanguageMapping.put("jsp", LanguageEnum.JSP);
suffixLanguageMapping.put("go", LanguageEnum.GO); suffixLanguageMapping.put("go", LanguageEnum.GO);
suffixLanguageMapping.put("js", LanguageEnum.JAVASCRIPT); suffixLanguageMapping.put("js", LanguageEnum.JAVASCRIPT);
suffixLanguageMapping.put("html", LanguageEnum.HTML); suffixLanguageMapping.put("html", LanguageEnum.HTML);
suffixLanguageMapping.put("php",LanguageEnum.PHP);
suffixLanguageMapping.put("vbp",LanguageEnum.VB);
suffixLanguageMapping.put("rs",LanguageEnum.RUST);
suffixLanguageMapping.put("dpk",LanguageEnum.DELPHI);
//构造成员变量 //构造成员变量
inspector.setInspectParameter(inspectParameter); inspector.setInspectParameter(inspectParameter);
//构造报告vo //构造报告vo
......
src/main/java/com/zjty/inspect/utils/DocumentWordUtil.java
浏览文件 @ 96e59986
package com.zjty.inspect.utils; package com.zjty.inspect.utils;
import com.zjty.inspect.entity.DocumentContent;
import com.zjty.inspect.entity.DocumentPage;
import com.zjty.inspect.entity.TitleHead;
import com.zjty.inspect.enums.DocumentTitleEnum;
import org.springframework.util.StringUtils;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
...@@ -46,10 +52,15 @@ public class DocumentWordUtil { ...@@ -46,10 +52,15 @@ public class DocumentWordUtil {
" </w:p>"; " </w:p>";
} }
public static String subheading(){ public static String subheading(DocumentTitleEnum documentTitleEnum){
return "<w:p>\n" + return "<w:p>\n" +
" <w:pPr>\n" + " <w:pPr>\n" +
" <w:pStyle w:val=\"#parentId#\"/>\n" + " <w:pStyle w:val=\""+documentTitleEnum.getStyle()+"\"/>\n" +
"<w:listPr>\n" +
" <w:ilvl w:val=\""+documentTitleEnum.getIlvl()+"\"/>\n" +
" <w:ilfo w:val=\""+documentTitleEnum.getIlfo()+"\"/>\n" +
" </w:listPr>" +
" <w:rPr>\n" + " <w:rPr>\n" +
" <w:rFonts w:hint=\"default\"/>\n" + " <w:rFonts w:hint=\"default\"/>\n" +
" <w:lang w:val=\"EN-US\" w:fareast=\"ZH-CN\"/>\n" + " <w:lang w:val=\"EN-US\" w:fareast=\"ZH-CN\"/>\n" +
...@@ -1295,4 +1306,66 @@ public class DocumentWordUtil { ...@@ -1295,4 +1306,66 @@ public class DocumentWordUtil {
" <w:trHeight w:val=\"400\" w:h-rule=\"atLeast\"/>\n" + " <w:trHeight w:val=\"400\" w:h-rule=\"atLeast\"/>\n" +
" </w:trPr>"; " </w:trPr>";
} }
public static String createDocument(DocumentPage documentPage) {
StringBuilder sb=new StringBuilder();
//前面部分内容
String standard = DocumentWordUtil.standard();
String enddard = DocumentWordUtil.enddard();
//标题内容
String maintitle = DocumentWordUtil.Maintitle();
// String subheading = DocumentWordUtil.subheading();
//标题下的内容
String standContent = DocumentWordUtil.content();
//表格内容
//页眉
String header = documentPage.getHeader();
String s1 = maintitle.replaceAll("#title#", header);
sb.append(standard);
sb.append(s1);
List<TitleHead> titleHeads = documentPage.getTitleHeads();
if(titleHeads!=null&&titleHeads.size()>0){
for (TitleHead titleHead : titleHeads) {
DocumentTitleEnum byCode = DocumentTitleEnum.getByCode(titleHead.getParentId());
if (byCode != null) {
String titleContent = DocumentWordUtil.subheading(byCode);
//标题名称
String name = titleHead.getName();
if (!StringUtils.isEmpty(name)) {
//标题级别
int parentId = titleHead.getParentId();
String s = titleContent.replaceAll("#title#", name)
.replaceAll("#parentId#", String.valueOf(parentId));
sb.append(s);
}
List<DocumentContent> documentContents = titleHead.getDocumentContents();
if (documentContents != null && documentContents.size() > 0) {
for (DocumentContent documentContent : documentContents) {
if (documentContent != null) {
String content = documentContent.getContent();
String baseUrl = documentContent.getBaseUrl();
String documentTable = documentContent.getDocumentTable();
if (!StringUtils.isEmpty(content)) {
String c = standContent;
String s = c.replaceAll("#content#", content);
sb.append(s);
}
if (!StringUtils.isEmpty(baseUrl)) {
}
if (!StringUtils.isEmpty(documentTable)) {
sb.append(documentTable);
}
}
}
}
}
}
}
sb.append(enddard);
return sb.toString();
}
} }
src/main/java/com/zjty/inspect/utils/ExcelUtil.java
浏览文件 @ 96e59986
...@@ -472,12 +472,15 @@ public class ExcelUtil { ...@@ -472,12 +472,15 @@ public class ExcelUtil {
public static List<ExcelDataTemp> parseExcel2Entity(Evaluation evaluation) { public static List<ExcelDataTemp> parseExcel2Entity(Evaluation evaluation) {
ArrayList<ExcelDataTemp> excelDataTemps = new ArrayList<>(); ArrayList<ExcelDataTemp> excelDataTemps = new ArrayList<>();
ArrayList<String> tables = new ArrayList<>();
String inEva = evaluation.getInEva(); String inEva = evaluation.getInEva();
ExcelDataTemp excelDataTemp = new ExcelDataTemp(); ExcelDataTemp excelDataTemp = new ExcelDataTemp();
excelDataTemp.setName("基本信息"); excelDataTemp.setName("基本信息");
List<ExcelDataEntity> arrayList = excelDataTemp.getArrayList(); List<ExcelDataEntity> arrayList = excelDataTemp.getArrayList();
if (inEva != null) { if (inEva != null) {
Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class); Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
arrayList.add(exportEntity("用户名", reform.getUsername())); arrayList.add(exportEntity("用户名", reform.getUsername()));
if(reform.getAssessmentType()==1){ if(reform.getAssessmentType()==1){
arrayList.add(exportEntity("评估类型", "快速评估")); arrayList.add(exportEntity("评估类型", "快速评估"));
......
src/main/resources/application.properties
浏览文件 @ 96e59986
...@@ -67,6 +67,7 @@ spring.freemarker.template-loader-path=classpath:/templates ...@@ -67,6 +67,7 @@ spring.freemarker.template-loader-path=classpath:/templates
#spring.redis.port=6379 #spring.redis.port=6379
##Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09 ##Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
#spring.redis.password= #spring.redis.password=
#宁波项目服务器ip
address=120.55.57.35 address=120.55.57.35
# 核心线程池大小、最大线程数、空闲活跃时间、队列容量 # 核心线程池大小、最大线程数、空闲活跃时间、队列容量
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论