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

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

@@ -94,8 +94,6 @@ public class InspectController {
         reportVo.setSourceAddress(file.getCanonicalPath());
         reportVo.setDatabaseType(databaseType);
 
-
-
         ReportVo inspect = inspectService.inspect(reportVo,inspectParameter);
 
         Map map=new HashMap();
@@ -114,8 +112,8 @@ public class InspectController {
             String template = FreemarkerUtils.getTemplate("pg.ftl", map);
             String s = inspectService.generateHtml(template, map);
             String filePath = FileUtil.createFilePath();
-            FileUtil.write(s,"/opt/pgbg/"+filePath+"/"+file.getName()+".html");
-            reportVo.setHtmlAddress("/opt/pgbg/"+filePath+"/"+file.getName()+".html");
+            FileUtil.write(s,"./pgbg/"+filePath+"/"+file.getName()+".html");
+            reportVo.setHtmlAddress("./pgbg/"+filePath+"/"+file.getName()+".html");
             System.out.println("内容"+s);
         } catch (TemplateException e) {
             e.printStackTrace();

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

@@ -79,7 +79,16 @@ public class RuleController {
         return ResponseEntity.ok(ruleService.findAll());
     }
 
-
+    /**
+     * 查询所有规则
+     * @return 规则
+     */
+    @ApiOperation("查询所有规则")
+    @GetMapping("/test")
+    public ResponseEntity test(){
+        ruleService.test();
+        return ResponseEntity.ok(200);
+    }
     /**
      * 分页+多条件查询
      * @param searchMap 查询条件封装

src/main/java/com/zjty/inspect/dao/TechnologyDao.java

@@ -6,6 +6,7 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface TechnologyDao extends JpaRepository<Technology,String>, JpaSpecificationExecutor<Technology> {
 
@@ -15,7 +16,7 @@ public interface TechnologyDao extends JpaRepository<Technology,String>, JpaSpec
      * @return Technology
      */
     Technology findAllByTechnologyNameEquals(String name);
-
+    Optional<Technology> findById(String id);
     /**
      * 模糊查询技术名称
      * @param name

src/main/java/com/zjty/inspect/service/RuleService.java

@@ -44,4 +44,5 @@ public interface RuleService {
     List<Rule> findByName(String name);
 
     Page<Rule> findSearch(Map searchMap, int page, int size);
+    void test();
 }

src/main/java/com/zjty/inspect/service/TechnologyService.java

@@ -42,4 +42,6 @@ public interface TechnologyService {
      * @return 查询技术数量
      */
     int findAllTechnologyNotSupport();
+
+    Technology findByid(String technologyId);
 }

src/main/java/com/zjty/inspect/service/impl/RuleServiceImpl.java

@@ -6,6 +6,7 @@ import com.zjty.inspect.entity.Technology;
 import com.zjty.inspect.entity.Rule;
 import com.zjty.inspect.entity.RuleQo;
 import com.zjty.inspect.service.RuleService;
+import com.zjty.inspect.service.TechnologyService;
 import com.zjty.inspect.utils.UUIDUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -39,7 +40,17 @@ public class RuleServiceImpl implements RuleService {
      */
     @Autowired
     private RuleDao ruleDao;
+    @Autowired
+    private TechnologyService technologyService;
 
+    public void test(){
+        List<Rule> rules = ruleDao.findAll();
+        for (Rule rule : rules) {
+            Technology technology = technologyService.findByid(rule.getTechnologyId());
+            rule.setTechnologyName(technology.getTechnologyName());
+        }
+        ruleDao.saveAll(rules);
+    }
     /**
      * 新增规则
      *
@@ -56,6 +67,7 @@ public class RuleServiceImpl implements RuleService {
         rule.setTarget(ruleQo.getTarget());
         rule.setSuffix(ruleQo.getSuffix());
         rule.setTechnologyId(ruleQo.getTechnologyId());
+        rule.setTechnologyName(ruleQo.getTechnologyName());
         rule.setId(UUIDUtil.getUUID());
         ruleDao.save(rule);
     }
@@ -100,10 +112,15 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
+        Rule rule1 = ruleDao.findByTarget(ruleQo.getTarget());
+        if(rule1!=null){
+            return;
+        }
         Rule rule = new Rule();
         rule.setTarget(ruleQo.getTarget());
         rule.setSuffix(ruleQo.getSuffix());
         rule.setTechnologyId(ruleQo.getTechnologyId());
+        rule.setTechnologyName(ruleQo.getTechnologyName());
         rule.setId(ruleQo.getId());
         ruleDao.save(rule);
     }

src/main/java/com/zjty/inspect/service/impl/TechnologyServiceImpl.java

@@ -19,6 +19,7 @@ import javax.persistence.criteria.Root;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * 适配技术
@@ -115,6 +116,15 @@ public class TechnologyServiceImpl implements TechnologyService {
         return technologyDao.countAllBySupportIsNot(1);
     }
 
+    @Override
+    public Technology findByid(String technologyId) {
+        Optional<Technology> optional = technologyDao.findById(technologyId);
+        if(optional.isPresent()){
+            return optional.get();
+        }
+        return null;
+    }
+
     /**
             * 动态条件构建
 	 * @param searchMap

src/main/resources/templates/pg.ftl

@@ -74,6 +74,16 @@
             right: 40px;
             top: 30px;
         }
+        .onClick {
+            width:0;
+            height:0;
+            border-width:17px 17px 0;
+            border-style:solid;
+            border-color:grey transparent transparent;/*灰 透明 透明 */
+            margin:40px auto;
+            position:relative;
+            top: 20px;
+        }
 
         .key-title {
             color: #d32d2d;
@@ -87,6 +97,7 @@
         table{
             width: 100%;
         }
+        .table-body{width:100%; height:300px;overflow-y:scroll;}
         td{
             text-align: center;
             height: 30px;
@@ -114,7 +125,7 @@
         }
 
         .className {
-            transform:rotate(180deg);
+            transform:rotate(180deg) !important ;
         }
     </style>
 </head>
@@ -162,7 +173,11 @@
                     keyThird-title
                 </#if>">关键技术：<span>${key?default("")}  </div>
                 <div  class="rightPic">
-                    <img onclick="showDiv()" id="pic" src="./img/down.png" alt="">
+                    <!--<img onclick="showDiv()" id="pic" src="./img/down.png" alt="">-->
+                    <div id="pic" onclick="showDiv()">
+                        <span class="onClick"></span>
+                    </div>
+
                 </div>
             </div>
 
@@ -205,27 +220,7 @@
 
             </#list>
 
-        <div class="second">
-            <div class="first-title">
-                <img src="./img/key.png" alt="">
-                <div  class="nav-title keySecond-title">关键技术：<span>Java依赖(支持国产化)</span> <span>无需替换</span> </div>
-                <div  class="rightPic">
-                    <img id="pic1" onclick="showDiv1()" src="./img/down.png" alt="">
-                </div>
-            </div>
-            <div class="line"></div>
-            <div id="secondClick">
-            </div>
-
-        </div>
         <div class="third">
-            <div class="first-title">
-                <img src="./img/key.png" alt="">
-                <div  class="nav-title keyThird-title">关键技术：<span>Java依赖(支持国产化)</span> <span>未知</span> </div>
-                <div  class="rightPic ">
-                    <img id="pic2"  onclick="showDiv2()" src="./img/down.png" alt="">
-                </div>
-            </div>
             <div class="line"></div>
 
             <div class="onAnaly" id="thirdClick">