sjq修改的

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

@@ -8,7 +8,7 @@ import org.springframework.data.jpa.repository.Query;
 public interface EvaluationDao extends JpaRepository<Evaluation,String>, JpaSpecificationExecutor<Evaluation> {
     Evaluation findByUsernameAndIdNot(String username,String id);
     Evaluation findByUsername(String username);
-    @Query(value = "SELECT * FROM evaluation WHERE username=:username AND create_time = (SELECT MAX(create_time) FROM evaluation WHERE username=:username)",nativeQuery = true)
+    @Query(value = "SELECT * FROM master_evaluation WHERE username=:username AND create_time = (SELECT MAX(create_time) FROM evaluation WHERE username=:username)",nativeQuery = true)
     Evaluation findByUsernameAndMaxCreateDate(String username);
 
 

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

@@ -27,6 +27,7 @@ public interface RuleDao extends JpaRepository<Rule,String>,JpaSpecificationExec
     List<Rule> findAllByTarget(String target);
 
     Rule findByTarget(String target);
+    List<Rule> findByTargetIgnoreCase(String target);
     Rule findByTargetAndIdNot(String target,String id);
 
     List<Rule> findByTargetAndSuffixEqualsAndTechnologyIdEquals(String target,String suffix,String technologyId);

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

@@ -20,6 +20,7 @@ import org.apache.tomcat.util.buf.Utf8Encoder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
 import java.io.File;
 import java.io.IOException;
@@ -462,8 +463,8 @@ public class Inspector {
             if (!ruleSuffixFilePathMap.containsKey(rule.getSuffix())) {
                 ruleSuffixFilePathMap.put(rule.getSuffix(), new ArrayList<>());
             }
-            if (!ruleMap.containsKey(rule.getTarget() + ":" + rule.getSuffix())) {
-                ruleMap.put(rule.getTarget() + ":" + rule.getSuffix(), rule);
+            if (!ruleMap.containsKey(rule.getTarget().toLowerCase() + ":" + rule.getSuffix())) {
+                ruleMap.put(rule.getTarget().toLowerCase() + ":" + rule.getSuffix(), rule);
             }
         }
     }
@@ -487,9 +488,11 @@ public class Inspector {
     private HashMap<String, List<Warn>> getWarnMap() {
         List<Technology> technologies = technologyDao.findAll();
 
+
+        if(!CollectionUtils.isEmpty(technologies)) {
             HashMap<String, Technology> techMap = new HashMap<>();
             for (Technology technology : technologies) {
-            if (!techMap.containsKey(technology.getId())) {
+                if(techMap.get(technology.getId())==null){
                     techMap.put(technology.getId(), technology);
                 }
             }
@@ -499,11 +502,18 @@ public class Inspector {
                 if (!warnMap.containsKey(warn.getTechnologyName())) {
                     ArrayList<Warn> warns1 = new ArrayList<>();
                     warns1.add(warn);
+                    if (techMap.get(warn.getTechnologyId()).getTechnologyName() != null) {
                         warnMap.put(techMap.get(warn.getTechnologyId()).getTechnologyName(), warns1);
+                    }
                 } else {
+                    if (warn.getTechnologyName() != null) {
+                        if (warnMap.get(warn.getTechnologyName()) == null) {
+                            warnMap.put(warn.getTechnologyName(), new ArrayList<>());
+                        }
                         warnMap.get(warn.getTechnologyName()).add(warn);
                     }
                 }
+            }
             for (Technology technology : technologies) {
                 if (!warnMap.containsKey(technology.getTechnologyName())) {
                     ArrayList<Warn> warns1 = new ArrayList<>();
@@ -512,6 +522,8 @@ public class Inspector {
             }
             return warnMap;
         }
+        return null;
+    }
 
     /**
      * @param stringBuilder string缓冲区
@@ -540,13 +552,13 @@ public class Inspector {
         rule1.setTarget(dependency.getArtifactId());
         rule1.setSuffix("*");
         rule1.setId(UUIDUtil.getUUID());
-        if (!ruleMap.containsKey(dependency.getGroupId() + ":" + rule.getSuffix())) {
+        if (!ruleMap.containsKey(dependency.getGroupId().toLowerCase() + ":" + rule.getSuffix())) {
             rules.add(rule);
-            ruleMap.put(dependency.getGroupId()  + ":" + rule.getSuffix(), rule);
+            ruleMap.put(dependency.getGroupId().toLowerCase()  + ":" + rule.getSuffix(), rule);
         }
-        if (!ruleMap.containsKey(dependency.getArtifactId() + ":" + rule1.getSuffix())) {
+        if (!ruleMap.containsKey(dependency.getArtifactId().toLowerCase() + ":" + rule1.getSuffix())) {
             rules.add(rule1);
-            ruleMap.put(dependency.getArtifactId() + ":" + rule1.getSuffix(), rule1);
+            ruleMap.put(dependency.getArtifactId().toLowerCase() + ":" + rule1.getSuffix(), rule1);
         }
     }
 
@@ -569,7 +581,7 @@ public class Inspector {
                 continue;
             }
             //匹配字符串
-            int index = KmpUtil.kmpMatch(data, rule.getTarget());
+            int index = KmpUtil.kmpMatch(data.toLowerCase(), rule.getTarget().toLowerCase());
             //当index>0时代表data中有当前规则
             if (index > -1) {
                 //判断当前规则是否是不支持规则
@@ -663,7 +675,7 @@ public class Inspector {
 
                                 if (!ruleMap.containsKey(patten.toLowerCase() + ":" + rule.getSuffix())) {
                                     rules.add(rule);
-                                    ruleMap.put(patten + ":" + rule.getSuffix(), rule);
+                                    ruleMap.put(patten.toLowerCase() + ":" + rule.getSuffix(), rule);
                                 }
                                 //设置当前依赖为可支持
                                 pomDependency.setSupport(1);
@@ -679,7 +691,6 @@ public class Inspector {
                         try {
 //                            List<String> allLines = Files.readAllLines(file);
                             String s = file.toAbsolutePath().toString();
-                            log.info("文件路径:{}",s);
                             long allLines = FileUtil.readFileNumber(new File(s));
                             fileLine += allLines;
                         } catch (Exception e) {

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

@@ -18,6 +18,7 @@ import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -79,8 +80,11 @@ public class RuleServiceImpl implements RuleService {
         if (StringUtils.isEmpty(rule.getTarget())) {
             return null;
         }
-        Rule rule1 = ruleDao.findByTarget(rule.getTarget());
-        if (rule1 == null) {
+        if(rule.getTarget().length()<4){
+            return null;
+        }
+        List<Rule> rules = ruleDao.findByTargetIgnoreCase(rule.getTarget());
+        if (CollectionUtils.isEmpty(rules)) {
             rule.setId(UUIDUtil.getUUID());
             Rule save = ruleDao.save(rule);
             return save;
@@ -95,6 +99,7 @@ public class RuleServiceImpl implements RuleService {
      */
     @Override
     public void addRule(RuleQo ruleQo) {
+        if(ruleQo.getTarget().length()>3) {
             List<String> suffixes = ruleQo.getSuffix();
             for (String suffix : suffixes) {
                 List<Rule> rule1 = ruleDao.findByTargetAndSuffixEqualsAndTechnologyIdEquals(ruleQo.getTarget(), suffix, ruleQo.getTechnologyId());
@@ -111,7 +116,7 @@ public class RuleServiceImpl implements RuleService {
             }
             RuleCollection ruleCollection = dataQo2RuleCollection(ruleQo);
             ruleCollectionDao.save(ruleCollection);
-
+        }
     }
 
 
@@ -119,14 +124,21 @@ public class RuleServiceImpl implements RuleService {
     @Override
     public void addListRulePlus(List<Rule> rules) {
         for (Rule rule : rules) {
+
             addRulePlus(rule);
         }
     }
 
     @Override
     public void addRule(List<Rule> rules) {
-        ruleDao.saveAll(rules);
-        List<RuleCollection> ruleCollections = dataList2RuleCollection(rules);
+        List<Rule> ruleList=new ArrayList<>();
+        for (Rule rule : rules) {
+            if(rule.getTarget().length()>3){
+                ruleList.add(rule);
+            }
+        }
+        ruleDao.saveAll(ruleList);
+        List<RuleCollection> ruleCollections = dataList2RuleCollection(ruleList);
         ruleCollectionDao.saveAll(ruleCollections);
     }
 
@@ -199,6 +211,7 @@ public class RuleServiceImpl implements RuleService {
 
     @Override
     public void upRule(RuleQo ruleQo) {
+        if(ruleQo.getTarget().length()>3) {
             RuleQo oldRule = ruleQo.getOldRule();
             List<Rule> rules = ruleDao.findAllByTechnologyIdEqualsAndTargetEquals(oldRule.getTechnologyId(), oldRule.getTarget());
             RuleCollection ruleCollection = ruleCollectionDao.findAllByTechnologyIdEqualsAndTargetEquals(oldRule.getTechnologyId(), oldRule.getTarget());
@@ -210,9 +223,11 @@ public class RuleServiceImpl implements RuleService {
             }
             addRule(ruleQo);
         }
+    }
 
     @Override
     public void upRulePlus(Rule rule) {
+        if(rule.getTarget().length()>3) {
             Rule rule1 = ruleDao.findByTargetAndIdNot(rule.getTarget(), rule.getId());
             if (rule1 == null) {
                 ruleDao.save(rule);
@@ -220,6 +235,7 @@ public class RuleServiceImpl implements RuleService {
                 ruleDao.deleteById(rule.getId());
             }
         }
+    }
 
     @Override
     public void deleteRulePlus(String id) {

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

@@ -90,8 +90,11 @@ public class ExcelUtil {
                 reform.setTime(11);
             } else {
                 String year = time.replaceAll("年", "");
+                try {
                     Integer newYear = Integer.valueOf(year);
                     reform.setTime(newYear);
+                }catch (Exception e){
+                }
             }
         }
         String address = getExcelCell(7, 2, sheetAt);
@@ -113,7 +116,7 @@ public class ExcelUtil {
 
         String construction = getExcelCell(10, 2, sheetAt);
         reform.setFramework(getFramework(construction));
-
+        /**容灾**/
         String disaster = getExcelCell(11, 2, sheetAt);
         int i2 = SpecialYesOrNo(disaster);
         reform.setDisasterTolerance(i2);
@@ -134,7 +137,7 @@ public class ExcelUtil {
         }
         DevelopLanguageSystem developLanguageSystem = new DevelopLanguageSystem();
         List<BaseDes> devFrameworks = new ArrayList<>();
-        for (int i = 17; i < 22; i++) {
+        for (int i = 17; i < 20; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
 
             if ("".equals(framework)) {
@@ -159,7 +162,7 @@ public class ExcelUtil {
 
 
         List<BaseDes> fontTechnologies = new ArrayList<>();
-        for (int i = 22; i < 29; i++) {
+        for (int i = 20; i < 26; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
             if ("".equals(framework)) {
                 continue;
@@ -179,7 +182,7 @@ public class ExcelUtil {
 
         developLanguageSystem.setFontDevTechnologies(fontTechnologies);
         ArrayList<BaseDes> fontDevTechnologies = new ArrayList<BaseDes>();
-        for (int i = 28; i < 35; i++) {
+        for (int i = 26; i < 32; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
             if ("".equals(framework)) {
                 continue;
@@ -200,7 +203,7 @@ public class ExcelUtil {
 
 
         List<BaseDes> opGAS = new ArrayList<>();
-        for (int i = 34; i < 39; i++) {
+        for (int i = 32; i < 35; i++) {
             String framework = getExcelCell(i, 2, sheetAt);
             if ("".equals(framework)) {
                 continue;
@@ -219,12 +222,12 @@ public class ExcelUtil {
         }
         developLanguageSystem.setOpGAs(opGAS);
 
-        String language = getExcelCell(39, 2, sheetAt);
+        String language = getExcelCell(35, 2, sheetAt);
         developLanguageSystem.setCode(MainLanguageEnum.getByName(language).getCode());
         developLanguageSystem.setName(MainLanguageEnum.getByName(language).getName());
 
         ArrayList<BaseDes> devLanguages = new ArrayList<>();
-        for (int i = 40; i < 45; i++) {
+        for (int i = 36; i < 39; i++) {
             String lan = getExcelCell(i, 2, sheetAt);
             if ("".equals(lan)) {
                 continue;
@@ -249,7 +252,7 @@ public class ExcelUtil {
          */
         Middleware middleware = new Middleware();
         List<BaseDes> middlewareEnums = new ArrayList<>();
-        for (int i = 46; i < 51; i++) {
+        for (int i = 40; i < 45; i++) {
             String middleware1 = getExcelCell(i, 2, sheetAt);
             String version = getExcelCell(i, 3, sheetAt);
             String remark = getExcelCell(i, 4, sheetAt);
@@ -268,7 +271,7 @@ public class ExcelUtil {
         middleware.setMiddlewareEnums(middlewareEnums);
 
         ArrayList<OtherApi> otherApis = new ArrayList<>();
-        for (int i = 51; i < 62; i++) {
+        for (int i = 45; i < 56; i++) {
             String api = getExcelCell(i, 2, sheetAt);
             if ("".equals(api)) {
                 continue;
@@ -286,7 +289,7 @@ public class ExcelUtil {
         middleware.setOtherApis(otherApis);
 
         List<BaseDes> microServices = new ArrayList<>();
-        for (int i = 62; i < 73; i++) {
+        for (int i = 56; i < 67; i++) {
             String name = getExcelCell(i, 2, sheetAt);
             if (name == null || "".equals(name)) {
                 continue;
@@ -309,7 +312,7 @@ public class ExcelUtil {
         //数据库相关
         Database database1 = new Database();
         ArrayList<DatabaseType> databaseTypes = new ArrayList<>();
-        for (int i = 74; i < 77; i++) {
+        for (int i = 68; i < 70; i++) {
             String database = getExcelCell(i, 2, sheetAt);
             String version = getExcelCell(i, 3, sheetAt);
             String remark = getExcelCell(i, 4, sheetAt);
@@ -323,34 +326,43 @@ public class ExcelUtil {
         }
         database1.setDatabaseType(databaseTypes);
 
-        String tableNum = getExcelCell(77, 2, sheetAt);
+        String tableNum = getExcelCell(71, 2, sheetAt);
         if ("".equals(tableNum)) {
             reform.setTableNum(0);
         } else {
+            try {
                 reform.setTableNum(Integer.valueOf(tableNum));
+            }catch (Exception e){
+                reform.setTableNum(0);
+            }
+
         }
 
-        String sp = getExcelCell(81, 2, sheetAt);
+        String sp = getExcelCell(75, 2, sheetAt);
         database1.setSeparate(yesOrNo(sp));
-        String dblink = getExcelCell(82, 2, sheetAt);
+        String dblink = getExcelCell(76, 2, sheetAt);
         database1.setDbLink(yesOrNo(dblink));
-        String view = getExcelCell(83, 2, sheetAt);
+        String view = getExcelCell(77, 2, sheetAt);
         database1.setView(yesOrNo(view));
-        String storage = getExcelCell(84, 2, sheetAt);
+        String storage = getExcelCell(78, 2, sheetAt);
         database1.setStorage(yesOrNo(storage));
-        String function = getExcelCell(85, 2, sheetAt);
+        String function = getExcelCell(79, 2, sheetAt);
         database1.setFunction(yesOrNo(function));
-        String timeTask = getExcelCell(86, 2, sheetAt);
+        String timeTask = getExcelCell(80, 2, sheetAt);
         database1.setTimeTask(yesOrNo(timeTask));
-        String sequence = getExcelCell(87, 2, sheetAt);
+        String sequence = getExcelCell(81, 2, sheetAt);
         database1.setSequence(yesOrNo(sequence));
-        String trigger = getExcelCell(88, 2, sheetAt);
+        /**触发器**/
+        String trigger = getExcelCell(82, 2, sheetAt);
         database1.setTrigger(yesOrNo(trigger));
-        String disasterTolerance = getExcelCell(89, 2, sheetAt);
+        /**主备容灾**/
+        String disasterTolerance = getExcelCell(83, 2, sheetAt);
         database1.setDisasterTolerance(yesOrNo(disasterTolerance));
-        String safe = getExcelCell(90, 2, sheetAt);
+        /**安全**/
+        String safe = getExcelCell(84, 2, sheetAt);
         database1.setSafe(yesOrNo(safe));
-        String performance = getExcelCell(91, 2, sheetAt);
+        /**性能**/
+        String performance = getExcelCell(85, 2, sheetAt);
         if (!"".equals(performance) && !"无".equals(performance)) {
             database1.setPerformance(1);
         }
@@ -358,7 +370,7 @@ public class ExcelUtil {
 
         Browser browser = new Browser();
         List<BaseDes> compatibleBrowsers = new ArrayList<>();
-        for (int i = 93; i <= 97; i++) {
+        for (int i = 87; i <= 91; i++) {
             String brows = getExcelCell(i, 2, sheetAt);
             String version = getExcelCell(i, 3, sheetAt);
             String remark = getExcelCell(i, 4, sheetAt);
@@ -375,7 +387,7 @@ public class ExcelUtil {
 
         ArrayList<BaseDes> browserPlugs = new ArrayList<>();
 
-        for (int i = 98; i <= 108; i++) {
+        for (int i = 92; i <= 102; i++) {
             String plugin = getExcelCell(i, 2, sheetAt);
             BaseDes browserPlug = new BaseDes();
             String version = getExcelCell(i, 3, sheetAt);
@@ -404,45 +416,50 @@ public class ExcelUtil {
         }
         browser.setBrowserPlugs(browserPlugs);
         reform.setBrowser(browser);
-        String apply = getExcelCell(110, 2, sheetAt);
+        String apply = getExcelCell(104, 2, sheetAt);
         Apply apply1 = new Apply();
         if (!"".equals(apply)) {
+            try {
                 apply1.setCost(Double.valueOf(apply));
+            }catch (Exception e){
+                apply1.setCost(0);
+            }
+
         }
-        String remark = getExcelCell(110, 4, sheetAt);
+        String remark = getExcelCell(104, 4, sheetAt);
         apply1.setReason(remark);
         reform.setApply(apply1);
         SystemStructure systemStructure = new SystemStructure();
 
-        Details sysDetails = getSysDetails(113, 2, sheetAt);
+        Details sysDetails = getSysDetails(107, 2, sheetAt);
         systemStructure.setApplication(sysDetails);
 
-        Details rdsdetails = getSysDetails(114, 2, sheetAt);
+        Details rdsdetails = getSysDetails(108, 2, sheetAt);
         systemStructure.setDatabase(rdsdetails);
 
-        Details nasdetails = getSysDetails(115, 2, sheetAt);
+        Details nasdetails = getSysDetails(109, 2, sheetAt);
         systemStructure.setNas(nasdetails);
 
-        Details slbdetails = getSysDetails(116, 2, sheetAt);
+        Details slbdetails = getSysDetails(110, 2, sheetAt);
         systemStructure.setSlb(slbdetails);
 
-        Details cdndetails = getSysDetails(117, 2, sheetAt);
+        Details cdndetails = getSysDetails(111, 2, sheetAt);
         systemStructure.setCdn(cdndetails);
 
-        Details vpsdetails = getSysDetails(118, 2, sheetAt);
+        Details vpsdetails = getSysDetails(112, 2, sheetAt);
         systemStructure.setVps(vpsdetails);
 
-        Details otherEquipment = getSysDetails(119, 2, sheetAt);
+        Details otherEquipment = getSysDetails(113, 2, sheetAt);
         systemStructure.setOtherEquipment(otherEquipment);
 
         reform.setSystemStructure(systemStructure);
 
-        String rpo = getExcelCell(121, 2, sheetAt);
+        String rpo = getExcelCell(115, 2, sheetAt);
         RtoEnum rtoEnum = RtoEnum.getByName(rpo);
         if (rtoEnum != null) {
             reform.setRto(rtoEnum.getCode());
         }
-        String rto = getExcelCell(122, 2, sheetAt);
+        String rto = getExcelCell(116, 2, sheetAt);
         RpoEnum rpoEnum = RpoEnum.getByName(rto);
         if (rpoEnum != null) {
             reform.setRpo(rpoEnum.getCode());
@@ -681,19 +698,27 @@ public class ExcelUtil {
     }
 
     private static int returnNum(String target) {
+        try {
             if (!"".equals(target)) {
                 return Integer.parseInt(target);
             } else {
                 return 0;
             }
+        }catch (Exception e){
+            return 1;
+        }
     }
 
     private static double returnDouble(String target) {
+        try {
             if (!"".equals(target)) {
                 return Double.parseDouble(target);
             } else {
                 return 0;
             }
+        }catch (Exception e){
+            return 0;
+        }
     }
 
     private static String getDeploy(Integer target) {

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

@@ -38,11 +38,9 @@ public class FileUtil {
                 while (lnr.readLine() != null){
                     linenumber++;
                 }
-                log.info("Total number of lines : " + linenumber);
                 lnr.close();
                 return linenumber;
             }else{
-                log.info("File does not exists!"+linenumber);
                 return linenumber;
             }
         }catch(IOException e){

src/main/resources/application.properties

@@ -68,7 +68,8 @@ spring.freemarker.template-loader-path=classpath:/templates/
 ##Redis\u670D\u52A1\u5668\u8FDE\u63A5\u5BC6\u7801\uFF08\u9ED8\u8BA4\u4E3A\u7A7A\uFF09
 #spring.redis.password=
 #宁波项目服务器ip
-address=120.55.57.35
+#address=120.55.57.35
+address=127.0.0.1
 
 #   核心线程池大小、最大线程数、空闲活跃时间、队列容量
 thread.pool.corePoolSize=10