diff --git a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java index 4f930bd1..a429a0fe 100644 --- a/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java +++ b/task/src/main/java/com/sdm/task/controller/SimuluationTaskPoolController.java @@ -146,23 +146,27 @@ public class SimuluationTaskPoolController implements ISimuluationTaskPoolFeignC } @GetMapping(value = "statisticDisciplineConfidence") - public SdmResponse statisticDisciplineConfidence(@RequestParam("poolName") String poolName,@RequestParam("nodeType") String nodeType) + public SdmResponse statisticDisciplineConfidence(@RequestParam("poolName") String poolName) { - return service.statisicDisciplineConfidence(poolName,nodeType); + return service.statisicNodeTypeConfidence(poolName,"discipline"); } @GetMapping(value = "statisticDisciplineConfidenceTrend") - public SdmResponse statisticDisciplineConfidenceTrend(@RequestParam("poolName") String poolName,@RequestParam("timeRange")String timeRange,@RequestParam("nodeType")String nodeType) + public SdmResponse statisticDisciplineConfidenceTrend(@RequestParam("poolName") String poolName,@RequestParam("timeRange")String timeRange) { - return service.staticDisciplineConfidenceTrend(poolName,timeRange,nodeType); + return service.staticNodeTypeConfidenceTrend(poolName,timeRange,"discipline"); } @GetMapping(value = "statisticDisciplineDifficulty") - public SdmResponse statisticDisciplineDifficulty(@RequestParam("poolName") String poolName,@RequestParam("nodeType") String nodeType) + public SdmResponse statisticDisciplineDifficulty(@RequestParam("poolName") String poolName) { - return service.statisicDisciplineDifficulty(poolName,nodeType); + return service.statisicNodeTypeDifficulty(poolName,"discipline"); } - + @GetMapping(value = "statisticWorkspaceConfidence") + public SdmResponse statisticWorkspaceConfidence(@RequestParam("poolName") String poolName) + { + return service.statisicNodeTypeConfidence(poolName,"workspace"); + } } diff --git a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java index 1a002cc1..584d88b1 100644 --- a/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java +++ b/task/src/main/java/com/sdm/task/dao/SimulationPoolMapper.java @@ -161,8 +161,8 @@ public interface SimulationPoolMapper { @Delete("DELETE FROM simulation_pool_node WHERE uuid = #{nodeId}") int deleteTaskPoolNode(@Param("nodeId")String nodeId); - @Select("SELECT DISTINCT(nodeName) FROM simulation_pool_node WHERE nodeType='discipline' AND poolName=#{poolName}") - List queryTaskPoolAllDiscipline(@Param("poolName") String poolName); + @Select("SELECT DISTINCT(nodeName) FROM simulation_pool_node WHERE nodeType=#{nodeType} AND poolName=#{poolName}") + List queryTaskPoolAllNodeNameByNodeType(@Param("poolName") String poolName,@Param("nodeType")String nodeType); @Delete("DELETE FROM simulation_pool_node_extra WHERE nodeId=#{nodeId}") @@ -260,23 +260,22 @@ public interface SimulationPoolMapper { @Select("SELECT * FROM simulation_taskpool_flowtemplate_relate WHERE poolName=#{poolName} AND version=#{version}") List queryTaskFlowRelateByPoolVersion(@Param("poolName")String poolName,@Param("version")String version); - @Select("SELECT discipline,AVG(confidence) confidence FROM simulation_task_confidence_difficulty_month_record WHERE month=#{month} AND confidence > 0 GROUP BY discipline") - List statisticDisciplineLastConfidence(@Param("month")String month); + @Select("SELECT nodeName,AVG(confidence) confidence FROM simulation_task_confidence_difficulty_month_record WHERE month=#{month} AND confidence > 0 AND nodeType=#{nodeType} GROUP BY nodeName") + List statisticNodeLastConfidence(@Param("month")String month,@Param("nodeType") String nodeType); - @Select("SELECT discipline,AVG(difficulty) difficulty FROM simulation_task_confidence_difficulty_month_record WHERE month=#{month} AND difficulty > 0 GROUP BY discipline") - List statisticDisciplineLastDifficulty(@Param("month")String month); + @Select("SELECT nodeName,AVG(difficulty) difficulty FROM simulation_task_confidence_difficulty_month_record WHERE month=#{month} AND nodeType=#{nodeType} AND difficulty > 0 GROUP BY nodeName") + List statisticDisciplineLastDifficulty(@Param("month")String month,@Param("nodeType")String nodeType); - @Insert("INSERT INTO simulation_task_confidence_difficulty_month_record(discipline,taskName,taskCode,confidence,difficulty,month) VALUES (#{entity.discipline},#{entity.taskName},#{entity.taskCode},#{entity.confidence},#{entity.difficulty},#{entity.month})") + @Insert("INSERT INTO simulation_task_confidence_difficulty_month_record(nodeName,nodeType,taskName,taskCode,confidence,difficulty,month) VALUES (#{entity.nodeName},#{entity.nodeType},#{entity.taskName},#{entity.taskCode},#{entity.confidence},#{entity.difficulty},#{entity.month})") int addDisciplineTaskMonthRecord(@Param("entity")DisciplineTaskConfidenceDifficultyRecord entity); - @Select("SELECT * FROM simulation_task_confidence_difficulty_month_record WHERE discipline=#{discipline} AND taskCode=#{taskCode} AND month=#{month}") - List queryDisciplineTaskMonthRecord(@Param("discipline")String discipline,@Param("taskCode")String taskCode,@Param("month")String month); + @Select("SELECT * FROM simulation_task_confidence_difficulty_month_record WHERE nodeName=#{nodeName} AND taskCode=#{taskCode} AND month=#{month} AND nodeType=#{nodeType}") + List queryDisciplineTaskMonthRecord(@Param("nodeName")String nodeName,@Param("taskCode")String taskCode,@Param("month")String month,@Param("nodeType")String nodeType); - @Update("UPDATE simulation_task_confidence_difficulty_month_record SET confidence=#{entity.confidence},difficulty=#{entity.difficulty} WHERE discipline=#{entity.discipline} AND taskCode=#{entity.taskCode} AND month=#{entity.month}") + @Update("UPDATE simulation_task_confidence_difficulty_month_record SET confidence=#{entity.confidence},difficulty=#{entity.difficulty} WHERE nodeName=#{entity.nodeName} AND nodeType=#{entity.nodeType} AND taskCode=#{entity.taskCode} AND month=#{entity.month}") int updateDisciplineTaskMonthRecord(@Param("entity")DisciplineTaskConfidenceDifficultyRecord entity); - @Select("SELECT month,AVG(confidence) FROM simulation_task_confidence_difficulty_month_record WHERE discipline=#{discipline} AND ${timeCondition} GROUP BY month ORDER BY month") - List statisticDisciplineConfidenceTrend(@Param("discipline")String discipline,@Param("timeCondition")String timeCondition); - + @Select("SELECT month,AVG(confidence) FROM simulation_task_confidence_difficulty_month_record WHERE nodeName=#{nodeName} AND nodeType=#{nodeType} AND ${timeCondition} GROUP BY month ORDER BY month") + List statisticDisciplineConfidenceTrend(@Param("nodeName")String nodeName,@Param("nodeType")String nodeType,@Param("timeCondition")String timeCondition); } diff --git a/task/src/main/java/com/sdm/task/model/entity/DisciplineConfidenceInfo.java b/task/src/main/java/com/sdm/task/model/entity/DisciplineConfidenceInfo.java index a8fb244e..e6c4e6e9 100644 --- a/task/src/main/java/com/sdm/task/model/entity/DisciplineConfidenceInfo.java +++ b/task/src/main/java/com/sdm/task/model/entity/DisciplineConfidenceInfo.java @@ -2,7 +2,7 @@ package com.sdm.task.model.entity; public class DisciplineConfidenceInfo { - public String discipline; + public String nodeName; public String month; diff --git a/task/src/main/java/com/sdm/task/model/entity/DisciplineDifficultyInfo.java b/task/src/main/java/com/sdm/task/model/entity/DisciplineDifficultyInfo.java index c0cab039..bea66cf9 100644 --- a/task/src/main/java/com/sdm/task/model/entity/DisciplineDifficultyInfo.java +++ b/task/src/main/java/com/sdm/task/model/entity/DisciplineDifficultyInfo.java @@ -2,7 +2,7 @@ package com.sdm.task.model.entity; public class DisciplineDifficultyInfo { - public String discipline; + public String nodeName; public float difficulty; } diff --git a/task/src/main/java/com/sdm/task/model/entity/DisciplineTaskConfidenceDifficultyRecord.java b/task/src/main/java/com/sdm/task/model/entity/DisciplineTaskConfidenceDifficultyRecord.java index cd3b51c8..62129bd3 100644 --- a/task/src/main/java/com/sdm/task/model/entity/DisciplineTaskConfidenceDifficultyRecord.java +++ b/task/src/main/java/com/sdm/task/model/entity/DisciplineTaskConfidenceDifficultyRecord.java @@ -8,7 +8,9 @@ public class DisciplineTaskConfidenceDifficultyRecord { public String taskCode; - public String discipline; + public String nodeName; + + public String nodeType; public float confidence; diff --git a/task/src/main/java/com/sdm/task/model/entity/DiscplineConfidenceTrendInfo.java b/task/src/main/java/com/sdm/task/model/entity/DiscplineConfidenceTrendInfo.java index 34ce3331..5c372c21 100644 --- a/task/src/main/java/com/sdm/task/model/entity/DiscplineConfidenceTrendInfo.java +++ b/task/src/main/java/com/sdm/task/model/entity/DiscplineConfidenceTrendInfo.java @@ -4,7 +4,7 @@ import java.util.List; public class DiscplineConfidenceTrendInfo { - public String discipline; + public String nodeName; public List disciplineConfidenceInfoList ; } \ No newline at end of file diff --git a/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java b/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java index 0c14c5fc..64f9e837 100644 --- a/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java +++ b/task/src/main/java/com/sdm/task/service/ISimulationTaskPoolService.java @@ -62,10 +62,10 @@ public interface ISimulationTaskPoolService { SdmResponse updateFlowTaskRelate(BindTaskAndFlowTemplateReq req); - SdmResponse statisicDisciplineConfidence(String poolName,String nodeType); + SdmResponse statisicNodeTypeConfidence(String poolName,String nodeType); - SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange,String nodeType); + SdmResponse staticNodeTypeConfidenceTrend(String poolName,String timeRange,String nodeType); - SdmResponse statisicDisciplineDifficulty(String poolName,String nodeType); + SdmResponse statisicNodeTypeDifficulty(String poolName,String nodeType); } diff --git a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java index bb5d2021..77a11ab9 100644 --- a/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java +++ b/task/src/main/java/com/sdm/task/service/impl/SimulationTaskPoolServiceImpl.java @@ -2340,23 +2340,23 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param poolName * @return */ - public SdmResponse statisicDisciplineConfidence(String poolName,String nodeType) + public SdmResponse statisicNodeTypeConfidence(String poolName,String nodeType) { SdmResponse response = SdmResponse.success(); syncProjectTaskConfidence(nodeType); - List disciplineNames = mapper.queryTaskPoolAllDiscipline(poolName); + List nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); String month = sdf.format(new Date()); - List confidenceInfos = mapper.statisticDisciplineLastConfidence(month); + List confidenceInfos = mapper.statisticNodeLastConfidence(month,nodeType); Map disciplineConfidenceInfoMap = new HashMap<>(); for(DisciplineConfidenceInfo confidenceInfo : confidenceInfos) { - disciplineConfidenceInfoMap.put(confidenceInfo.discipline,confidenceInfo); + disciplineConfidenceInfoMap.put(confidenceInfo.nodeName,confidenceInfo); } List disciplineConfidenceInfoList = new ArrayList<>(); - for(String discipline : disciplineNames) + for(String nodeName : nodeNames) { - DisciplineConfidenceInfo confidenceInfo = disciplineConfidenceInfoMap.get(discipline); + DisciplineConfidenceInfo confidenceInfo = disciplineConfidenceInfoMap.get(nodeName); if(confidenceInfo != null) { disciplineConfidenceInfoList.add(confidenceInfo); @@ -2364,7 +2364,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul else { DisciplineConfidenceInfo info = new DisciplineConfidenceInfo(); - info.discipline = discipline; + info.nodeName = nodeName; info.confidence = 0; disciplineConfidenceInfoList.add(info); } @@ -2379,7 +2379,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param timeRange * @return */ - public SdmResponse staticDisciplineConfidenceTrend(String poolName,String timeRange,String nodeType) + public SdmResponse staticNodeTypeConfidenceTrend(String poolName,String timeRange,String nodeType) { SdmResponse response = SdmResponse.success(); syncProjectTaskConfidence(nodeType); @@ -2389,7 +2389,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul } else { - List disciplineNames = mapper.queryTaskPoolAllDiscipline(poolName); + List nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); String[] yearMonths = timeRange.split(","); String timeCondition = " 1 "; if(yearMonths.length == 1) @@ -2401,11 +2401,11 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul timeCondition += " AND month BETWEEN '"+yearMonths[0]+"' AND '"+yearMonths[1]+"'"; } List discplineConfidenceTrendInfos = new ArrayList<>(); - for(String discipline : disciplineNames) + for(String nodeName : nodeNames) { - List disciplineConfidenceInfoList = mapper.statisticDisciplineConfidenceTrend(discipline,timeCondition); + List disciplineConfidenceInfoList = mapper.statisticDisciplineConfidenceTrend(nodeName,nodeType,timeCondition); DiscplineConfidenceTrendInfo trendInfo = new DiscplineConfidenceTrendInfo(); - trendInfo.discipline = discipline; + trendInfo.nodeName = nodeName; trendInfo.disciplineConfidenceInfoList = disciplineConfidenceInfoList; discplineConfidenceTrendInfos.add(trendInfo); } @@ -2419,23 +2419,23 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param poolName * @return */ - public SdmResponse statisicDisciplineDifficulty(String poolName,String nodeType) + public SdmResponse statisicNodeTypeDifficulty(String poolName,String nodeType) { SdmResponse response = SdmResponse.success(); syncProjectTaskDifficulty(nodeType); - List disciplineNames = mapper.queryTaskPoolAllDiscipline(poolName); + List nodeNames = mapper.queryTaskPoolAllNodeNameByNodeType(poolName,nodeType); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM"); String month = sdf.format(new Date()); - List confidenceInfos = mapper.statisticDisciplineLastDifficulty(month); + List confidenceInfos = mapper.statisticDisciplineLastDifficulty(month,nodeType); Map disciplineDifficultyInfoMap = new HashMap<>(); for(DisciplineDifficultyInfo confidenceInfo : confidenceInfos) { - disciplineDifficultyInfoMap.put(confidenceInfo.discipline,confidenceInfo); + disciplineDifficultyInfoMap.put(confidenceInfo.nodeName,confidenceInfo); } List disciplineDifficultyInfos = new ArrayList<>(); - for(String discipline : disciplineNames) + for(String nodeName : nodeNames) { - DisciplineDifficultyInfo difficultyInfo = disciplineDifficultyInfoMap.get(discipline); + DisciplineDifficultyInfo difficultyInfo = disciplineDifficultyInfoMap.get(nodeName); if(difficultyInfo != null) { disciplineDifficultyInfos.add(difficultyInfo); @@ -2443,7 +2443,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul else { DisciplineDifficultyInfo info = new DisciplineDifficultyInfo(); - info.discipline = discipline; + info.nodeName = nodeName; info.difficulty = 0; disciplineDifficultyInfos.add(info); } @@ -2457,7 +2457,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul * @param statisticArray * @param type */ - private void handleSyncProjectTaskRecord(List statisticArray,int type) + private void handleSyncProjectTaskRecord(List statisticArray,int type,String nodeType) { Map> taskConfidencesMap = new HashMap<>(); @@ -2465,7 +2465,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul for(int index=0; index new ArrayList<>()).add(floatVal); taskCodeAndNameMap.put(taskCode, taskName); } @@ -2482,7 +2482,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul for(String key : taskConfidencesMap.keySet()) { String[] keyHeader = key.split("_"); - String discipline = keyHeader[0]; + String nodeName = keyHeader[0]; String taskCode = keyHeader[1]; List confidenceList = taskConfidencesMap.get(key); float confidence = 0; @@ -2491,11 +2491,12 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul confidence += f; } confidence = confidence / taskConfidencesMap.size(); - List records = mapper.queryDisciplineTaskMonthRecord(discipline,taskCode,month); + List records = mapper.queryDisciplineTaskMonthRecord(nodeName,taskCode,month,nodeType); if(records == null || records.isEmpty()) { DisciplineTaskConfidenceDifficultyRecord record = new DisciplineTaskConfidenceDifficultyRecord(); - record.discipline = discipline; + record.nodeName = nodeName; + record.nodeType = nodeType; record.taskCode = taskCode; record.confidence = 0; record.difficulty = 0; @@ -2535,7 +2536,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul if(response.isSuccess()) { List taskConfidences = (List)response.getData(); - handleSyncProjectTaskRecord(taskConfidences,0); + handleSyncProjectTaskRecord(taskConfidences,0,nodeType); } return response; } @@ -2550,7 +2551,7 @@ public class SimulationTaskPoolServiceImpl extends BaseService implements ISimul if(response.isSuccess()) { List taskDifficulty = (List)response.getData(); - handleSyncProjectTaskRecord(taskDifficulty,1); + handleSyncProjectTaskRecord(taskDifficulty,1,nodeType); } return response; }