关键技术接口根据name查询功能

48d23b1e · 孙洁清 · 553a65a4 · 48d23b1e · 48d23b1e · 48d23b1e
--- a/src/main/java/com/zjty/inspect/controller/InspectController.java
+++ b/src/main/java/com/zjty/inspect/controller/InspectController.java
@@ -2,6 +2,7 @@ package com.zjty.inspect.controller;

 import com.zjty.inspect.entity.InspectParameter;
 import com.zjty.inspect.entity.ReportVo;
+import com.zjty.inspect.entity.Technology;
 import com.zjty.inspect.entity.Warn;
 import com.zjty.inspect.service.InspectService;
 import com.zjty.inspect.utils.*;
@@ -78,22 +79,18 @@ public class InspectController {
        reportVo.setProjectName(projectName);
        reportVo.setSourceAddress(file.getCanonicalPath());

-
-
-
-
-
-
-
-
        ReportVo inspect = inspectService.inspect(reportVo,inspectParameter);
 //        Map map=new HashMap();
 //        map.put("inspect",inspect);
-//        HashMap<String, List<Warn>> warnDetails = inspect.getWarnDetails();
-//        map.put("warnDetails",warnDetails);
+//        map.put("time",TimeUtil.getTime());
+//        HashMap<String, List<Warn>> warnMap = inspect.getWarnDetails();
+//        List<Technology> technologies = inspect.getTechnologies();
+//        map.put("warnMap",warnMap);
+//        map.put("technologies",technologies);
 //        try {
 //            String template = FreemarkerUtils.getTemplate("pg.ftl", map);
 //            String s = inspectService.generateHtml(template, map);
+//            System.out.println("内容"+s);
 //        } catch (TemplateException e) {
 //            e.printStackTrace();
 //        }

--- a/src/main/java/com/zjty/inspect/dao/RuleDao.java
+++ b/src/main/java/com/zjty/inspect/dao/RuleDao.java
@@ -24,4 +24,6 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
    Rule findAllByTargetEqualsAndTechnologyIdEquals(String target,String techId);

    List<Rule> findAllByTargetLike(String target);
+
+    Rule findByTarget(String target);
 }
--- a/src/main/java/com/zjty/inspect/entity/Category.java
+++ b/src/main/java/com/zjty/inspect/entity/Category.java
+package com.zjty.inspect.entity;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+
+public class Category {
+    @Id
+    @Column(length = 48)
+    private String id;
+    private String typeName;
+}
--- a/src/main/java/com/zjty/inspect/service/impl/RuleServiceImpl.java
+++ b/src/main/java/com/zjty/inspect/service/impl/RuleServiceImpl.java
@@ -47,6 +47,10 @@ public class RuleServiceImpl implements RuleService {
     */
    @Override
    public void addRule(RuleQo ruleQo) {
+        Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
+        if(rule1!=null){
+            return;
+        }
        // TODO: 2020-02-27 适配技术与扫描关键字关联
        Rule rule = new Rule();
        rule.setTarget(ruleQo.getTarget());

--- a/src/main/java/com/zjty/inspect/utils/TimeUtil.java
+++ b/src/main/java/com/zjty/inspect/utils/TimeUtil.java
 package com.zjty.inspect.utils;

+import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
+import java.util.Date;

 public class TimeUtil {
    public static String getNowDate(){
@@ -19,9 +21,14 @@ public class TimeUtil {
        return stringBuilder.toString();

    }
-
+    public static String getTime(){
+        Date d = new Date();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        System.out.println("当前时间：" + sdf.format(d));
+        return sdf.format(d);
+    }
    public static void main(String[] args) {
        String nowDate = TimeUtil.getNowDate();
-        System.out.println(nowDate);
+        System.out.println(getTime());
    }
 }
--- a/src/main/resources/templates/pg.ftl
+++ b/src/main/resources/templates/pg.ftl
@@ -123,20 +123,20 @@
    <p class="detailContentT">应用系统信创评估详情</p>
    <div class="systemName">
        <img src="./img/system.png" alt="">
-        <div class="nav-title">系统名称：<span>${projectName}</span></div>
-        <div class="nav-time">评估时间：<span>${createDate}</span></div>
+        <div class="nav-title">系统名称：<span>${inspect.projectName}</span></div>
+        <div class="nav-time">评估时间：<span>${time}</span></div>
        <div class="clearfloat"></div>
        <div class="line"></div>
        <div class="systemNameCon">
-            <div>编号：<span>${createDate}</span></div>
-            <div>上传类型：<span>${uploadType}</span></div>
-            <div>文件名：<span>${fileName}</span></div>
-            <div>架构：<span>${framework}</span></div>
+            <div>编号：<span>${inspect.id}</span></div>
+            <div>上传类型：<span>${inspect.uploadType}</span></div>
+            <div>文件名：<span><#if (inspect.fileName)??></#if></span></div>
+            <div>架构：<span><#if (inspect.framework)??></#if></span></div>
        </div>
        <div class="systemNameCon">
-            <div>数据库类型：<span>${databaseType}</span></div>
-            <div>依赖管理工具：<span>${manager}</span></div>
-            <div>语言： <span>${language}</span></div>
+            <div>数据库类型：<span><#if (inspect.databaseType)??></#if></span></div>
+            <div>依赖管理工具：<span><#if(inspect.manager)??></#if></span></div>
+            <div>语言： <span>${inspect.language}</span></div>
            <div></div>
        </div>
        <div class="systemNameCon">
@@ -146,11 +146,14 @@
    </div>
    <div class="keyTec">
        <#if warnDetails??>
-            <#list warnDetails as warn>
+
+            <#list technologies as tech>
+                <#assign  warns= warnMap[tech.technologyName]/>
+
                <div class="first">
            <div class="first-title">
                <img src="./img/key.png" alt="">
-                <div  class="nav-title key-title">关键技术：<span>${warn.}Java依赖(支持国产化)</span> <span>需替换</span> </div>
+                <div  class="nav-title key-title">关键技术：<span>${tech.technologyName}(${tech.support}<#if tech.support==1>支持国产化)<span>不需要替换</span><#elseif tech.support==2>不支持国产化)<span>需替换</span><#elseif tech.support==3>未知<#elseif tech.support==4>不完全支持国产化)<span>需替换</span></#if></span>  </div>
                <div  class="rightPic">
                    <img onclick="showDiv()" id="pic" src="./img/down.png" alt="">
                </div>
@@ -164,24 +167,17 @@
                        <th>所在文件</th>
                        <th>行数</th>
                    </tr>
+                <#list warns as warn>
                    <tr>
-                        <td>mysql</td>
-                        <td>pp.xl</td>
-                        <td>100</td>
-                    </tr>
-                    <tr>
-                        <td>mysql</td>
-                        <td>pp.xl</td>
-                        <td>100</td>
-                    </tr>
-                    <tr>
-                        <td>mysql</td>
-                        <td>pp.xl</td>
-                        <td>100</td>
+                        <td>${warn.rule}</td>
+                        <td>${warn.filePath}</td>
+                        <td>${warn.lineNum}</td>
                    </tr>
+                </#list>
                </table>
            </div>
        </div>
+
            </#list>
        </#if>
        <div class="second">