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

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

 package com.zjty.inspect.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.zjty.inspect.dao.ConfigParamDao;
 import com.zjty.inspect.dao.TechnologyDao;
 import com.zjty.inspect.entity.*;
 import com.zjty.inspect.service.*;
@@ -50,6 +51,9 @@ public class InspectController {
     @Autowired
     private ReportService reportService;
 
+    @Autowired
+    private ConfigParamDao configParamDao;
+
     /**
      * 上传代码进行评估
      *
@@ -127,6 +131,15 @@ public class InspectController {
 
     @PostMapping("/rapidAssessment")
     public ResponseEntity rapidAssessment(@RequestBody Reform reform){
+        //获取admin
+        Config adminConfig = configParamDao.findByName("admin");
+        Integer admin;
+        if(adminConfig != null){
+            admin = Integer.valueOf(adminConfig.getValue());
+        }else{
+            admin = 2;
+        }
+        System.out.println("admin:"+admin);
         System.out.println(JSON.toJSONString(reform));
         //输入参数
         String in = JSON.toJSONString(reform);
@@ -135,7 +148,7 @@ public class InspectController {
         inspectParameter.setValid("1");
         inspectParameter.setSourceAddress(reform.getCodeUrl());
         inspectParameter.setSystemFund(reform.getCost());
-        inspectParameter.setAdmin(reform.getAdmin());
+        inspectParameter.setAdmin(admin);
         inspectParameter.setModules(reform.getModuleNum());
         inspectParameter.setSafety(reform.getSafe());
         inspectParameter.setTables(reform.getTableNum());