合并分支 'wyl' 到 'master'

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

@@ -289,6 +289,11 @@ public class WorkLoadUtil {
                 (1.0+(browserDifficulty.getMedia()!=null&&browserDifficulty.getMedia()==1?1.0:0)/100)*
                 (1.0+(browserDifficulty.getFlash()!=null&&browserDifficulty.getFlash()==1?1.0:0)/100)*
                 (1.0+(browserDifficulty.getOtherDemand()!=null&&browserDifficulty.getOtherDemand()==1?1.0:0)/100);
+        List<CompatibleBrowser> compatibleBrowsers = reform.getBrowser().getCompatibleBrowsers();
+        if (compatibleBrowsers!=null&&compatibleBrowsers.contains(CompatibleBrowser.IETRIDENT)) {
+            eBrowser*=1.1;
+            logger.info("浏览器难度包含IE");
+        }
         eBrowser = eBrowser>1.3?1.3:eBrowser;
         logger.info("浏览器难度-用户额外："+eBrowser);
         browserDifficulty.setMessage(Double.valueOf(nf.format(eBrowser)));
@@ -312,10 +317,24 @@ public class WorkLoadUtil {
         logger.info("中间件难度-评估："+pMiddle);
         middlewareDifficulty.setSystemEvaluation(Double.valueOf(nf.format(pMiddle)));
         //中间件系统评估e （1+需求分数/100）*（1+需求分数/100）           max=1.3
-        double emiddle = (1.0+(middlewareDifficulty.getWeb()==1.0?1:0)/100)*
-                (1.0+(middlewareDifficulty.getJms()==1?1.0:0)/100)*
-                (1.0+(middlewareDifficulty.getJndi()==1?1.0:0)/100)*
-                (1.0+(middlewareDifficulty.getRoute()==1?1.0:0)/100);
+        double emiddle = (1.0+(middlewareDifficulty.getWeb()==10.0?1:0)/100)*
+                (1.0+(middlewareDifficulty.getJms()==1?10.0:0)/100)*
+                (1.0+(middlewareDifficulty.getJndi()==1?10.0:0)/100)*
+                (1.0+(middlewareDifficulty.getRoute()==1?10.0:0)/100);
+        Middleware middleware = reform.getMiddleware();
+        if(middleware!=null) {
+            List<MiddlewareEnum> middlewareEnums = middleware.getMiddlewareEnums();
+            for (MiddlewareEnum middlewareEnum : middlewareEnums) {
+                if (middlewareEnum!=MiddlewareEnum.TOMCAT) {
+                    emiddle*=1.05;
+                    logger.info("中间件："+middlewareEnum);
+                }
+            }
+            if (middleware.getOtherMiddleware() != null && !middleware.getOtherMiddleware().trim().equals("")) {
+                emiddle*=1.05;
+                logger.info("其他中间件："+middleware.getOtherMiddleware());
+            }
+        }
         emiddle = emiddle>1.3?1.3:emiddle;
         logger.info("中间件难度-用户额外："+emiddle);
         middlewareDifficulty.setMessage(Double.valueOf(nf.format(emiddle)));
@@ -331,10 +350,62 @@ public class WorkLoadUtil {
         DatabaseDifficulty databaseDifficulty = report.getDifficultyAssessment().getDatabaseDifficulty();
         //数据库e （1+需求/100）*...*(1+需求/100)
         double eDatabase = 1;
-        eDatabase *= (1.0+(databaseDifficulty.getSafe()==1?1.0:0)/100)*
-                (1.0+(databaseDifficulty.getSeparate()==1?1.0:0)/100)*
-                (1.0+(databaseDifficulty.getPerformance()==1?1.0:0)/100)*
-                (1.0+((databaseDifficulty.getOtherContent()!=null&&!databaseDifficulty.getOtherContent().trim().equals("")) ?1.0:0)/100);
+        eDatabase *= (1.0+(databaseDifficulty.getSafe()==1?10.0:0)/100)*
+                (1.0+(databaseDifficulty.getSeparate()==1?10.0:0)/100)*
+                (1.0+(databaseDifficulty.getPerformance()==1?10.0:0)/100)*
+                (1.0+((databaseDifficulty.getOtherContent()!=null&&!databaseDifficulty.getOtherContent().trim().equals("")) ?10.0:0)/100);
+        Database database = reform.getDatabase();
+        if(database!=null) {
+            List<DatabaseType> databaseType = database.getDatabaseType();
+            if (databaseType != null) {
+                for(DatabaseType databaseType1:databaseType) {
+                    if (databaseType1 != DatabaseType.MYSQL) {
+                        eDatabase *= 1.1;
+                        logger.info("数据库："+databaseType1);
+                    }
+                }
+            }
+            if (database.getOtherType() != null && !database.getOtherType().trim().equals("")) {
+                eDatabase *= 1.1;
+                logger.info("其他数据库："+database.getOtherType());
+            }
+            /*小需求，每个+2*/
+            //视图
+            if (database.getView() != null && database.getView() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有视图");
+            }
+            //存储过程
+            if (database.getStorage() != null && database.getStorage() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有存储过程");
+            }
+            //函数
+            if (database.getFunction() != null && database.getFunction() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有函数");
+            }
+            //DbLink
+            if (database.getDbLink() != null && database.getDbLink() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有DBLink");
+            }
+            //定时任务
+            if (database.getTimeTask() != null && database.getTimeTask() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有定时任务");
+            }
+            //序列
+            if (database.getSequence() != null && database.getSequence() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有序列");
+            }
+            //触发器
+            if (database.getTrigger() != null && database.getTrigger() == 1) {
+                eDatabase *= 1.02;
+                logger.info("有触发器");
+            }
+        }
         logger.info("数据库难度："+eDatabase);
         databaseDifficulty.setDifficulty(Double.valueOf(nf.format(eDatabase)));
         //工作量2*j*(z-1)