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

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

@@ -39,6 +39,12 @@ public class EvaluationController {
         Evaluation evaluation = evaluationService.findByName(name);
         return ResponseEntity.ok(evaluation.getOutEva());
     }
+    @ApiOperation("根据用户名查询输如")
+    @GetMapping(value = "/in/{name}")
+    public ResponseEntity getInName(@PathVariable String name) {
+        Evaluation evaluation = evaluationService.findByName(name);
+        return ResponseEntity.ok(evaluation.getInEva());
+    }
     /**
      * 修改评估报告
      * @param evaluation 规则封装

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

@@ -24,6 +24,7 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
     Rule findAllByTargetEqualsAndTechnologyIdEquals(String target,String techId);
 
     List<Rule> findAllByTargetLike(String target);
+    List<Rule> findAllByTarget(String target);
 
     Rule findByTarget(String target);
 

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

@@ -6,30 +6,18 @@ package com.zjty.inspect.enums;
  * @author mcj
  */
 public enum Language {
-    /**
-     * java类型
-     */
-    C井("c#",8),
 
-    JAVA("java",1),
 
     /**
-     * java类型
+     * 语言
      */
-    VUE("java",2),
+    JAVA("java",1),
+
+
+    VUE("js",2),
 
-    /**
-     * java类型
-     */
-    CPP("cpp",2),
-    /**
-     * pyth类型
-     */
     PYTHON("python",3),
 
-    /**
-     * asp
-     */
     ASP("asp",4),
     /**
      * js
@@ -44,7 +32,12 @@ public enum Language {
      * html
      */
     HTML("html",7),
-    UNKNOW("unknowun",9);
+
+    C井("c#",8),
+
+
+    C("c#",9),
+    UNKNOW("unknowun",10);
 
 
     Language(String name,Integer status){
@@ -63,4 +56,9 @@ public enum Language {
     public Integer getStatus() {
         return status;
     }
+
+    public static void main(String[] args) {
+        Language language = Language.valueOf("VUE");
+        System.out.println(language.name);
+    }
 }

src/main/java/com/zjty/inspect/inspect/Inspector.java

@@ -427,8 +427,8 @@ public class Inspector {
         //统计文件最多的
         for (Map.Entry<String, Counter> entry : languageMatchMap.entrySet()) {
             if (entry.getValue().getNumber() > maxnum) {
-                most = suffixLanguageMapping.get(entry.getKey()).name();
-                Language language = Language.valueOf(most);
+                Language language = suffixLanguageMapping.get(entry.getKey());
+                most = language.name();
                 mostStatus = language.getStatus();
                 maxnum = entry.getValue().getNumber();
             }

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

@@ -15,4 +15,5 @@ public interface EvaluationService {
     Page<Evaluation> findSearch(Map searchMap, int page, int size);
 
     Evaluation findByName(String name);
+
 }

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

@@ -76,6 +76,8 @@ public class EvaluationServiceImpl implements EvaluationService {
         return evaluationDao.findByUsername(name);
     }
 
+
+
     /**
      * 动态条件构建
      *

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

@@ -52,8 +52,8 @@ public class InspectServiceImpl implements InspectService {
         suffixLanguageMapping.put("aspx", Language.C井);
         suffixLanguageMapping.put("cs", Language.C井);
         suffixLanguageMapping.put("resx", Language.C井);
-        suffixLanguageMapping.put("vue", Language.VUE);
-        suffixLanguageMapping.put("cpp", Language.CPP);
+        suffixLanguageMapping.put("vue", Language.JAVASCRIPT);
+        suffixLanguageMapping.put("cpp", Language.C);
         suffixLanguageMapping.put("py", Language.PYTHON);
         suffixLanguageMapping.put("jsp", Language.JAVA);
         suffixLanguageMapping.put("go", Language.GO);

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

@@ -2,11 +2,13 @@ package com.zjty.inspect.service.impl;
 
 import com.zjty.inspect.dao.TechnologyDao;
 import com.zjty.inspect.dao.RuleDao;
+import com.zjty.inspect.entity.ExcelDataVo;
 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.ExcelReader;
 import com.zjty.inspect.utils.UUIDUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
@@ -20,10 +22,7 @@ import javax.persistence.criteria.CriteriaBuilder;
 import javax.persistence.criteria.CriteriaQuery;
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Root;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * 规则库
@@ -46,12 +45,25 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void test() {
-        List<Rule> rules = ruleDao.findAll();
-        for (Rule rule : rules) {
-            Technology technology = technologyService.findByid(rule.getTechnologyId());
-            rule.setTechnologyName(technology.getTechnologyName());
+        List<ExcelDataVo> excelDataVos = ExcelReader.readExcel("C:\\Users\\Jey\\Desktop\\生成代码\\规则表.xlsx");
+        System.out.println(excelDataVos);
+        HashSet<String> set=new HashSet();
+        for (ExcelDataVo excelDataVo : excelDataVos) {
+            List<Rule> rules = ruleDao.findAllByTarget(excelDataVo.getName());
+            if(rules==null||rules.size()==0){
+                set.add(excelDataVo.getName());
+            }
         }
-        ruleDao.saveAll(rules);
+        for (String s : set) {
+            Rule rule=new Rule();
+            rule.setTechnologyName("国产化依赖(支持)");
+            rule.setTechnologyId("967a8bd0-eb27-4fb6-ba1d-1bca21cea5b4");
+            rule.setSuffix("java");
+            rule.setTarget(s);
+            rule.setId(UUIDUtil.getUUID());
+            ruleDao.save(rule);
+        }
+
     }
 
     /**

src/main/java/com/zjty/inspect/utils/ExcelReader.java

@@ -37,6 +37,7 @@ public class ExcelReader {
         return workbook;
     }
 
+
     /**
      * 读取Excel文件内容
      * @param fileName 要读取的Excel文件所在路径

src/main/java/com/zjty/inspect/utils/WorkLoadUtil.java

@@ -401,7 +401,11 @@ public class WorkLoadUtil {
             string.append("其中");
         }
         for(TechnologyReport technologyReport:report.getTechnologyList().getTechnologyReports()){
-            string .append( technologyReport.getTechnology()+"修改项"+technologyReport.getTechnologyContents().size()+"个，");
+            int size = technologyReport.getTechnologyContents().size();
+            if(technologyReport.getTechnology().contains("国产化依赖(支持)")){
+                size = report.getDifficultyAssessment().getMiddlewareDifficulty().getDependOnNum();
+            }
+            string .append( technologyReport.getTechnology()+"修改项"+size+"个，");
         }
         report.getTechnologyList().setDes(string.substring(0,string.length()-1)+"。");
         String type = "";

src/main/resources/application.properties

@@ -28,8 +28,8 @@ spring.jpa.open-in-view=true
 spring.jpa.properties.javax.persistence.validation.mode=none
 
 # spring-http-\u6587\u4EF6\u4E0A\u4F20\u76F8\u5173\u914D\u7F6E
-spring.servlet.multipart.max-file-size=200MB
-spring.servlet.multipart.max-request-size=200MB
+spring.servlet.multipart.max-file-size=500MB
+spring.servlet.multipart.max-request-size=500MB
 
 #\u914D\u7F6E\u65F6\u95F4\u683C\u5F0F
 spring.jacksondate-format = yyyy-MM-dd HH:mm:ss
@@ -50,7 +50,7 @@ spring.resources.static-locations=classpath:/uploads/
 # mysql\u6570\u636E\u5E93\u914D\u7F6E
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 #spring.datasource.url=jdbc:mysql://192.168.1.249:3306/bservice?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
-spring.datasource.url=jdbc:mysql://120.55.57.35:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
+spring.datasource.url=jdbc:mysql://localhost:3306/adaptation?useSSL=false&serverTimezone=UTC&autoReconnect=true&characterEncoding=utf-8
 spring.datasource.username=root
 spring.datasource.password=root