sjq修改的

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

@@ -388,15 +388,14 @@ public class InspectController {
         evaluation.setAuthority(reform.getAuthority());
         evaluation.setDel(0);
         Evaluation save = evaluationService.save(evaluation);
+        if(save==null){
+            return ServerResponse.badRequest();
+        }
         EvaReport evaReport=new EvaReport();
         BeanUtils.copyProperties(save,evaReport);
         evaReport.setEva_id(save.getId());
         evaReportService.save(evaReport);
 
-        if(save==null){
-            return ServerResponse.badRequest();
-        }
-
         return ServerResponse.ok(save.getId());
     }
 

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

@@ -44,13 +44,13 @@ public class MiddlewareDifficulty {
      * 依赖详情(国产化支持的，王永磊要用)
      */
     @ApiModelProperty(value = "依赖详情",example = "1")
-    private Integer dependOnNum;
+    private long dependOnNum;
 
     /**
      * 依赖数量
      */
     @ApiModelProperty(value = "依赖数量",example = "1")
-    private Integer number;
+    private long number;
     /*
      *用户额外信息详情
      */

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

@@ -118,15 +118,15 @@ public class ReportVo {
      * 文件个数
      */
     @ApiModelProperty(value = "权限",example = "1")
-    private Integer fileNum;
+    private long fileNum;
 
     /**
      * 文件行数
      */
     @ApiModelProperty(value = "权限",example = "1")
-    private Integer fileLine;
+    private long fileLine;
     @ApiModelProperty(value = "权限",example = "1")
-    private Integer supportSize = 0;
+    private long supportSize = 0;
 
     /**
      * 评估时间

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

@@ -22,7 +22,7 @@ public class Scale {
      * 数量
      */
     @ApiModelProperty(value = "权限",example = "1")
-    private Integer num;
+    private long num;
 
     /**
      * 备注

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

 package com.zjty.inspect.inspect;
 
+import com.google.common.base.Utf8;
 import com.zjty.inspect.dao.*;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.enums.DependenceManagement;
@@ -13,10 +14,14 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.LineIterator;
+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 java.io.File;
 import java.io.IOException;
 import java.nio.file.*;
 import java.nio.file.attribute.BasicFileAttributes;
@@ -93,11 +98,11 @@ public class Inspector {
     /**
      * 文件数量
      */
-    private Integer fileNum = 0;
+    private long fileNum = 0;
     /**
      * 文件行数
      */
-    private Integer fileLine = 0;
+    private long fileLine = 0;
     /**
      * 报告对象
      */
@@ -537,7 +542,7 @@ public class Inspector {
         rule1.setId(UUIDUtil.getUUID());
         if (!ruleMap.containsKey(dependency.getGroupId() + ":" + rule.getSuffix())) {
             rules.add(rule);
-            ruleMap.put(dependency.getGroupId() + ":" + rule.getSuffix(), rule);
+            ruleMap.put(dependency.getGroupId()  + ":" + rule.getSuffix(), rule);
         }
         if (!ruleMap.containsKey(dependency.getArtifactId() + ":" + rule1.getSuffix())) {
             rules.add(rule1);
@@ -586,8 +591,8 @@ public class Inspector {
                     if (supportWarns.size() != 10) {
                         supportWarns.add(warn);
                     }
-                    Integer supportSize = report.getSupportSize();
-                    int i = supportSize + 1;
+                    Long supportSize = report.getSupportSize();
+                    long i = supportSize + 1;
                     report.setSupportSize(i);
                     supportStatus = 1;
                 }
@@ -623,6 +628,7 @@ public class Inspector {
         //文件读取
         if (inspectParameter.getSourceAddress() != null) {
             try {
+                log.info("文件路径："+inspectParameter.getSourceAddress());
                 Files.walkFileTree(Paths.get(inspectParameter.getSourceAddress()), new FileVisitor<Path>() {
                     @Override
                     public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
@@ -655,7 +661,7 @@ public class Inspector {
                                 rule.setTechnologyName(techJavaSupport.getTechnologyName());
                                 //做规则查询，不用去数据库查询
 
-                                if (!ruleMap.containsKey(patten + ":" + rule.getSuffix())) {
+                                if (!ruleMap.containsKey(patten.toLowerCase() + ":" + rule.getSuffix())) {
                                     rules.add(rule);
                                     ruleMap.put(patten + ":" + rule.getSuffix(), rule);
                                 }
@@ -671,9 +677,12 @@ public class Inspector {
                         }
                         fileNum += 1;
                         try {
-                            List<String> allLines = Files.readAllLines(file);
-                            fileLine += allLines.size();
-                        } catch (IOException e) {
+//                            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) {
                             log.error("当前文件无法读取:{}", e.getMessage());
                         }
 

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

@@ -42,8 +42,10 @@ public class EvaReportServiceImpl implements EvaReportService {
             @Override
             public Predicate toPredicate(Root<EvaReport> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 List<Predicate> predicateList = new ArrayList<Predicate>();
-                if (searchMap.get("username") != null && !"".equals(searchMap.get("username"))) {
-                    predicateList.add(cb.like(root.get("username").as(String.class), "%" + (String) searchMap.get("username") + "%"));
+                if (searchMap.get("username") != null && !"".equals(searchMap.get("username")) ) {
+                    if(!"root".equals(searchMap.get("username"))) {
+                        predicateList.add(cb.like(root.get("username").as(String.class), "%" + (String) searchMap.get("username") + "%"));
+                    }
                 }
                 if (searchMap.get("projectName") != null && !"".equals(searchMap.get("projectName"))) {
                     predicateList.add(cb.like(root.get("projectName").as(String.class), "%" + (String) searchMap.get("projectName") + "%"));

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

@@ -6,6 +6,7 @@ import com.zjty.inspect.dao.ConfigParamDao;
 import com.zjty.inspect.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -60,7 +61,12 @@ public class BudgetUitl {
         }else{
             scale=3;
         }
-        inspectParameter.setMoneyRate(Double.valueOf(doubleHashMap.get(1)));
+        String s = doubleHashMap.get(1);
+        if(StringUtils.isEmpty(s)) {
+            inspectParameter.setMoneyRate(Double.valueOf(1.041));
+        }else {
+            inspectParameter.setMoneyRate(Double.valueOf(s));
+        }
         Double moneyRate = inspectParameter.getMoneyRate();
         System.out.println(JSON.toJSONString("inspectParameter:"+inspectParameter));
         int year = inspectParameter.getYears();
@@ -130,18 +136,29 @@ public class BudgetUitl {
         if(inspectParameter.getRecastMethod()==1){
             //用户需要适配
             if(report.getRecastMethod()==1){
-                double refactorProportion1 = Double.parseDouble(doubleHashMap.get(2));
+                String s1 = doubleHashMap.get(2);
+                double refactorProportion1 = 0.6;
+                if(!StringUtils.isEmpty(s1)){
+                    refactorProportion1 = Double.parseDouble(doubleHashMap.get(2));
+                }
                 inspectParameter.setProportion(refactorProportion1);
                 Budget budget1 = getCodeRefactor("代码重构预算", inspectParameter.getProportion(), pow, systemFund, fund, moneyRate, coefficient);
                 budgetVo.getBudget().add(budget1);
                 return budgetVo;
             }
-            double refactorProportion = Double.parseDouble(doubleHashMap.get(4));
+            double refactorProportion=0.3;
+            if(!StringUtils.isEmpty(doubleHashMap.get(4))){
+                refactorProportion = Double.parseDouble(doubleHashMap.get(4));
+            }
+
             inspectParameter.setProportion(refactorProportion);
             Budget budget = getCodeRefactor("代码修改预算", inspectParameter.getProportion(), pow, systemFund, fund, moneyRate, coefficient);
             budgetVo.getBudget().add(budget);
         }else{
-            double refactorProportion = Double.parseDouble(doubleHashMap.get(3));
+            double refactorProportion=0.15;
+            if(!StringUtils.isEmpty(doubleHashMap.get(3))){
+                refactorProportion = Double.parseDouble(doubleHashMap.get(3));
+            }
             inspectParameter.setProportion(refactorProportion);
             Budget budget = getCodeRefactor("代码适配预算", inspectParameter.getProportion(), pow, systemFund, fund, moneyRate, coefficient);
             budgetVo.getBudget().add(budget);

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

@@ -6,11 +6,14 @@ import lombok.extern.slf4j.Slf4j;
 import net.lingala.zip4j.core.ZipFile;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileWriter;
-import java.io.IOException;
+import java.io.*;
+import java.nio.MappedByteBuffer;
+import java.nio.channels.Channels;
+import java.nio.channels.FileChannel;
+import java.nio.channels.WritableByteChannel;
 import java.time.LocalDate;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
 
 @Slf4j
 public class FileUtil {
@@ -25,6 +28,28 @@ public class FileUtil {
         return filePath;
     }
 
+    public static int readFileNumber(File file){
+        int linenumber = 0;
+        try{
+            if(file.exists()){
+                FileReader fr = new FileReader(file);
+                LineNumberReader lnr = new LineNumberReader(fr);
+
+                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){
+            log.error(e.getMessage());
+        }
+        return linenumber;
+    }
     /**
      * 保存文件到本地
      * @param multipartFile

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

@@ -482,7 +482,7 @@ public class WorkLoadUtil {
             string.append("其中");
         }
         for(TechnologyReport technologyReport:report.getTechnologyList().getTechnologyReports()){
-            int size = technologyReport.getTechnologyContents().size();
+            long size = technologyReport.getTechnologyContents().size();
             if(technologyReport.getTechnology().contains("内部依赖(支持)")){
                 size = report.getDifficultyAssessment().getMiddlewareDifficulty().getDependOnNum();
             }

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

@@ -180,17 +180,17 @@ public class WpsUtil {
         keyValue.put("budget", assessmentReport.getBudget());
 
         SysScale sysScale = assessmentReport.getSysScale();
-        if(StringUtils.isEmpty(sysScale.getCode().getNum().toString())||sysScale.getCode().getNum()==-1) {
+        if(sysScale.getCode().getNum()==-1) {
             keyValue.put("sysScaleCodeNum", "0");
         }else{
-            keyValue.put("sysScaleCodeNum", sysScale.getCode().getNum().toString());
+            keyValue.put("sysScaleCodeNum", sysScale.getCode().getNum());
         }
         keyValue.put("sysScaleCodeDes", sysScale.getCode().getDes());
 
-        keyValue.put("sysScaleFileNum", sysScale.getFile().getNum().toString());
+        keyValue.put("sysScaleFileNum", sysScale.getFile().getNum());
         keyValue.put("sysScaleFileDes", sysScale.getFile().getDes());
 
-        keyValue.put("sysScaleModeNum", sysScale.getMode().getNum().toString());
+        keyValue.put("sysScaleModeNum", sysScale.getMode().getNum());
         keyValue.put("sysScaleModeDes", sysScale.getMode().getDes());
 
         TechnologyList technologyList = assessmentReport.getTechnologyList();