mcj:新增报告管理页面逻辑

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

@@ -62,7 +62,7 @@ public class InspectController {
     @ApiOperation("上传代码进行评估")
     public ResponseEntity inspect(Integer years,Integer systemFund,Integer modules
             ,String valid,Integer framework,Integer safety,Integer disaster,Integer data
-            ,Integer admin,String projectName,Integer tables,String databaseType, MultipartFile multfile) throws IOException {
+            ,Integer admin,String projectName,Integer tables,String databaseType,Integer method, MultipartFile multfile) throws IOException {
 
         File file = FileUtil.saveToLocal(multfile);
         InspectParameter inspectParameter = new InspectParameter();
@@ -78,6 +78,7 @@ public class InspectController {
         inspectParameter.setData(data);
         inspectParameter.setFramework(framework);
         inspectParameter.setPath(file.getCanonicalPath());
+        inspectParameter.setRecastMethod(method);
         inspectParameter.setId(UUIDUtil.getUUID());
         ReportVo reportVo = new ReportVo();
 

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

+package com.zjty.inspect.dao;
+
+import com.zjty.inspect.entity.Config;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+/**
+ * @author Mcj
+ * @date 2020-03-05 20:55
+ */
+
+public interface ConfigParamDao extends JpaRepository<Config,Integer> {
+}

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

@@ -18,7 +18,7 @@ public class Config {
     private String id;
     private String name;
     private String value;
-    private String type;
+    private Integer type;
     private String des;
     private String arrs;
 }

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

@@ -126,6 +126,8 @@ public class InspectParameter {
 
     /**
      * 方式
+     * 1：修改
+     * 2：适配：
      */
     private Integer recastMethod;
 

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

@@ -34,4 +34,8 @@ public class Page<T> {
     public int getTotalElement() {
         return totalElement;
     }
+
+    public List<T> getObjects() {
+        return objects;
+    }
 }

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

@@ -59,7 +59,7 @@ public class ReportVo {
 
     /**
      * 适配方式
-     * 1：适配
+     * 1：适配或者修改
      * 2：重构
      */
     private Integer recastMethod;

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

@@ -9,6 +9,8 @@ public enum Language {
     /**
      * java类型
      */
+    C井("java",1),
+
     JAVA("java",1),
 
     /**

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

@@ -42,6 +42,9 @@ public class InspectServiceImpl implements InspectService {
         //统计文件后缀数量
         Map<String, Language> suffixLanguageMapping = new HashMap<>();
         suffixLanguageMapping.put("java", Language.JAVA);
+        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("py", Language.PYTHON);

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

 package com.zjty.inspect.utils;
 
 import com.zjty.inspect.dao.CoefficientModelDao;
+import com.zjty.inspect.dao.ConfigParamDao;
 import com.zjty.inspect.entity.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -18,6 +20,8 @@ import java.util.stream.Collectors;
 @Component
 public class BudgetUitl {
 
+    @Autowired
+    private ConfigParamDao configParamDao;
 
     @Autowired
     private CoefficientModelDao coefficientModelDao;
@@ -33,17 +37,31 @@ public class BudgetUitl {
         BudgetVo budgetVo = new BudgetVo();
 
         // TODO: 2020-03-05 查询年复利率,查询修改，适配和重构占比
-        inspectParameter.setMoneyRate(1.04);
+        List<Config> all = configParamDao.findAll();
+        HashMap<Integer, String> doubleHashMap = new HashMap<>();
+        for (Config config : all) {
+            if(!doubleHashMap.containsKey(config.getType())){
+                doubleHashMap.put(config.getType(),config.getValue());
+            }
+        }
 
 
-        //代码重构比
-        double refactorProportion = 0D;
-        //代码修改比
-        double updateProportion = 0D;
-        if(report.getRecastMethod()==1){
-            inspectParameter.setProportion(0.6);
+        inspectParameter.setMoneyRate(Double.valueOf(doubleHashMap.get(1)));
+        if(inspectParameter.getRecastMethod()==1){
+            //用户需要适配
+            double refactorProportion = Double.valueOf(doubleHashMap.get(3));
+            inspectParameter.setProportion(refactorProportion);
         }else{
-            inspectParameter.setProportion(0.3);
+            //用户需要修改
+            //代码重构比
+            if(report.getRecastMethod()==1){
+                double updateProportion = Double.valueOf(doubleHashMap.get(4));
+                inspectParameter.setProportion(updateProportion);
+            }else{
+                double updateProportion = Double.valueOf(doubleHashMap.get(2));
+                inspectParameter.setProportion(updateProportion);
+
+            }
         }
         int scale;
         Integer systemFund = inspectParameter.getSystemFund();