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

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

@@ -13,6 +13,8 @@ import org.apache.commons.io.FileUtils;
 import org.apache.tomcat.util.http.fileupload.disk.DiskFileItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.io.Resource;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
@@ -230,6 +232,7 @@ public class InspectController {
                 List<TechnologyContent> technologyContents = new ArrayList<>();
                 for (Warn warn:warns) {
                     TechnologyContent technologyContent = new TechnologyContent();
+                    //technologyContent.setLocal(warn.get);
                     technologyContent.setFile(warn.getFilePath());
                     technologyContent.setKeyWord(warn.getRule());
                     technologyContent.setPosition(warn.getLineNum().toString());
@@ -334,6 +337,8 @@ public class InspectController {
         assessmentReport.setDifficultyAssessment(difficultyAssessment);
         WorkLoadUtil workLoadUtil = new WorkLoadUtil();
         //r:人工费
+        RestTemplate restTemplate = new RestTemplate();
+        //restTemplate.exchange("localhost:8079/config", HttpMethod.GET,new HttpEntity<>())
         //计算f
         Budget budget = inspect.getBudgets().getBudget().get(0);
         double f = budget.getProportion()*budget.getSysFund()*budget.getMoneyRate()*budget.getCoefficient();

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

@@ -25,7 +25,9 @@ public class Evaluation {
     @Column( length = 48)
     private String id;
     private String username;
+    @Column(columnDefinition = "TEXT")
     private String inEva;
+    @Column(columnDefinition = "TEXT")
     private String outEva;
     /**
      * 数据创建时间