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

src/main/java/com/zjty/inspect/config/MvcConfig.java

@@ -32,6 +32,8 @@ public class MvcConfig extends WebMvcConfigurationSupport {
         registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**")
                 .addResourceLocations("classpath:/META-INF/resources/webjars/");
+        registry.addResourceHandler("/static/**")
+                .addResourceLocations("classpath:/static/");
     }
 
     @Override

src/main/java/com/zjty/inspect/controller/EvaluationController.java

@@ -5,6 +5,7 @@ import com.zjty.inspect.aop.AuthAnnotation;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.service.EvaluationService;
 import com.zjty.inspect.utils.ExcelUtil;
+import com.zjty.inspect.utils.WpsUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -135,4 +136,17 @@ public class EvaluationController {
         Page<Evaluation> pageList = evaluationService.findSearch(searchMap, page, size);
         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);
+    }
 }

src/main/java/com/zjty/inspect/entity/Download.java

+package com.zjty.inspect.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class Download {
+    private String id;//主键
+    private String danjia;//单位
+    private String yusuan;//总预算金额
+    private String gong;//工作量
+    private String ewai;//额外申请
+
+}

src/main/java/com/zjty/inspect/entity/ExcelDataTemp.java

@@ -3,6 +3,7 @@ package com.zjty.inspect.entity;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -13,5 +14,5 @@ import java.util.List;
 public class ExcelDataTemp {
 
     private String name;
-    private List<ExcelDataEntity> arrayList = new ArrayList();
+    private List<ExcelDataEntity> arrayList = new LinkedList<>();
 }

src/main/java/com/zjty/inspect/enums/Framework.java

 package com.zjty.inspect.enums;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public enum Framework {
 
     /**
      * 架构
      */
     SEPARATE("分离型架构",1),
-    MIXTURE("混合型架构",2);
-
+    MIXTURE("混合型架构",2),
+    NONE("无",3);
     Framework(String name,Integer status){
         this.name=name;
         this.status=status;
@@ -24,4 +27,27 @@ public enum Framework {
     public Integer getStatus() {
         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/utils/DocumentWordUtil.java

 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.regex.Matcher;
@@ -1302,4 +1306,66 @@ public class DocumentWordUtil {
                 "                                    <w:trHeight w:val=\"400\" w:h-rule=\"atLeast\"/>\n" +
                 "                                </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

@@ -472,12 +472,15 @@ public class ExcelUtil {
 
     public static List<ExcelDataTemp> parseExcel2Entity(Evaluation evaluation) {
         ArrayList<ExcelDataTemp> excelDataTemps = new ArrayList<>();
+        ArrayList<String> tables = new ArrayList<>();
         String inEva = evaluation.getInEva();
         ExcelDataTemp excelDataTemp = new ExcelDataTemp();
         excelDataTemp.setName("基本信息");
         List<ExcelDataEntity> arrayList = excelDataTemp.getArrayList();
         if (inEva != null) {
             Reform reform = JSON.parseObject(evaluation.getInEva(), Reform.class);
+
+
             arrayList.add(exportEntity("用户名", reform.getUsername()));
             if(reform.getAssessmentType()==1){
                 arrayList.add(exportEntity("评估类型", "快速评估"));

src/main/resources/application.properties

@@ -66,4 +66,5 @@ spring.freemarker.template-loader-path=classpath:/templates
 #spring.redis.port=6379
 ##Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 #spring.redis.password=
+#宁波项目服务器ip
 address=120.55.57.35
\ No newline at end of file