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

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

@@ -79,7 +79,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, Integer method, String username, MultipartFile multfile) throws IOException {
+            , Integer admin, String projectName, Integer tables, String databaseType,Integer content, Integer method, String username, MultipartFile multfile) throws IOException {
 
         File file = FileUtil.saveToLocal(multfile);
         log.info("inspect:代码解压完成,地址为{}", file.getCanonicalPath());
@@ -95,6 +95,7 @@ public class InspectController {
         inspectParameter.setDisaster(disaster);
         inspectParameter.setData(data);
         inspectParameter.setFramework(framework);
+        inspectParameter.setContent(content);
         inspectParameter.setId(UUIDUtil.getUUID());
         inspectParameter.setAdmin(admin);
         inspectParameter.setSystemFund(systemFund);

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

@@ -77,17 +77,17 @@ public class InspectParameter {
 
     /**
      * 安全能力
-     * 1：无
+     * 0：无
      * 2：弱
-     * 3：强
+     * 4：强
      */
     private Integer safety;
 
     /**
      * 容灾
-     * 1：无0，有+0.05
+     * 0：无0，有+0.05
      * 2：有0，无-0.05
-     * 3：有0，无-0.1
+     * 4：有0，无-0.1
      */
     private Integer disaster;
 

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

@@ -316,6 +316,9 @@ public class Inspector {
     public ReportVo analysis() {
         DependencyVo dependencyVo = new DependencyVo();
         setReportLanguageAndFrame();
+        if(report.getLanguage()!=1 & report.getRecastMethod()==1){
+            return report;
+        }
         //查询所有规则
         ruleTransform(report.getRecastMethod());
         //解析配置文件集合

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

@@ -53,9 +53,9 @@ public class BudgetUitl {
             double v = inspectParameter.getModules() * 7.5;
             systemFund= (int) v;
         }
-        if(systemFund<30){
+        if(systemFund<=30){
             scale=1;
-        }else if(systemFund<200){
+        }else if(systemFund<=200){
             scale=2;
         }else{
             scale=3;