Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
092ab24d 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 74143070 9bccf323
内嵌 并排
正在显示 8 个修改的文件 包含 316 行增加 和 63 行删除
sk-module-datafill/src/main/java/com/skua/modules/report/service/impl/OperationReportServiceImpl.java
package com.skua.modules.report.service.impl;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.skua.common.constant.BusinessConstant;
import com.skua.common.constant.ReportConstant;
......@@ -175,34 +176,46 @@ public class OperationReportServiceImpl implements IOperationReportService {
// 翻译
Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
Map<String, String> sysUserDictMap = businessService.dictMap("sys_user", null);
// 1. 重点工作事项：取重点事项推进情况里面，当月完成的重点事项记录
QueryWrapper<?> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("status", "2")
.ge("end_time", startDate)
.le("end_time", endDate);
List<Map<String, Object>> queryMapList1 = baseService.queryForList("select * from f_major_issues_process", queryWrapper1);
for (Map<String, Object> item: queryMapList1) {
List<Map<String, Object>> priorityWorkItemList = new ArrayList<>();
priorityWorkItemList.add(new HashMap<String, Object>(){{
put("key0", item.get("depart_id"));
put("value0", sysDepartDictMap.get(item.get("depart_id")));
}});
productDataVO.setPriorityWorkItemList(priorityWorkItemList);
}
List<Map<String, Object>> priorityWorkItemList = queryMapList1.stream().map(item -> {
Map<String, Object> entityMap = item.keySet().stream().collect(Collectors.toMap(StrUtil::toCamelCase, key -> (item.get(key) == null ? "" : item.get(key))));
entityMap.put("departName", sysDepartDictMap.get(item.get("depart_id")));
return entityMap;
}).collect(Collectors.toList());
productDataVO.setPriorityWorkItemList(priorityWorkItemList);
// 2: 隐患排查巡检:取风险点巡检记录里面巡检类型是生产巡检的数据
QueryWrapper<?> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("inspection_type", "1")
.eq("status", "2")
.ge("end_date", startDate + BusinessConstant.startTimeSuffix)
.le("end_date", endDate + BusinessConstant.endTimeSuffix);
List<Map<String, Object>> queryMapList2 = baseService.queryForList("select * from danger_inspection_record", queryWrapper2);
for (Map<String, Object> item: queryMapList2) {
List<Map<String, Object>> hiddenDangerInspectionList = new ArrayList<>();
hiddenDangerInspectionList.add(new HashMap<String, Object>(){{
put("key0", item.get("depart_id"));
put("value0", sysDepartDictMap.get(item.get("depart_id")));
}});
productDataVO.setHiddenDangerInspectionList(hiddenDangerInspectionList);
Map<String, String> recordId2CountMap;
if (!queryMapList2.isEmpty()) {
List<String> recordIdList = queryMapList2.stream().map(item -> ConvertUtils.getString(item.get("id"))).collect(Collectors.toList());
QueryWrapper<?> tmpQueryWrapper = new QueryWrapper<>();
tmpQueryWrapper.in("danger_inspection_record.id", recordIdList)
.eq("danger_inspection_item.status", "0")
.groupBy("danger_inspection_record.id");
List<Map<String, Object>> tmpQueryMapList = baseService.queryForList("select danger_inspection_record.id as id, count(*) as total from danger_inspection_item left join danger_inspection_info on danger_inspection_item.inspection_info_id = danger_inspection_info.id left join danger_inspection_record on danger_inspection_info.inspection_record_id = danger_inspection_record.id", tmpQueryWrapper);
recordId2CountMap = tmpQueryMapList.stream().collect(Collectors.toMap(item -> ConvertUtils.getString(item.get("id")), item -> ConvertUtils.getString(item.get("total"))));
} else {
recordId2CountMap = new HashMap<>();
}
List<Map<String, Object>> hiddenDangerInspectionList = queryMapList2.stream().map(item -> {
Map<String, Object> entityMap = item.keySet().stream().collect(Collectors.toMap(StrUtil::toCamelCase, key -> (item.get(key) == null ? "" : item.get(key))));
entityMap.put("departName", sysDepartDictMap.get(item.get("depart_id")));
entityMap.put("realname", sysUserDictMap.get(item.get("report_user")));
entityMap.put("exceptionCount", recordId2CountMap.getOrDefault(item.get("id"), "0"));
return entityMap;
}).collect(Collectors.toList());
productDataVO.setHiddenDangerInspectionList(hiddenDangerInspectionList);
return productDataVO;
}
......
sk-module-equipment/src/main/java/com/skua/modules/equipment/controller/EquipmentController.java
......@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletResponse;
import cn.hutool.json.JSONObject;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.query.QueryGenerator;
import com.skua.modules.equipment.service.IEquipmentAssetService;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Sheet;
......@@ -109,6 +110,8 @@ public class EquipmentController {
@Autowired
private IEquipmentInfoService equipmentInfoService;
@Autowired
private IEquipmentAssetService equipmentAssetService;
@Autowired
private Key2ValueService key2ValueService;
......@@ -384,17 +387,26 @@ public class EquipmentController {
Result<?> result = new Result<>();
Equipment equipment = EquipmentUtils.equipDTO2Entity(equipmentDTO);
// todo 前端未传，特殊处理
equipment.getEquipmentInfo().setAssetId(equipment.getEquipmentAsset().getId());
// equipment.getEquipmentInfo().setAssetId(equipment.getEquipmentAsset().getId());
// equipment.getEquipmentExt().setInfoId(equipment.getEquipmentInfo().getId());
// 校验ID是否一致
JoinSqlUtils.checkSqlIdFunc(equipment);
// JoinSqlUtils.checkSqlIdFunc(equipment);
// 与点表有关联的台账不允许删除
List<SysMonitorMetricInfo> monitorMetricInfo = sysMonitorMetricInfoService.list(new QueryWrapper<SysMonitorMetricInfo>().eq("equipment_code", equipmentDTO.getEquipmentInfo().getId()));
if (monitorMetricInfo!=null&&monitorMetricInfo.size()>0) {
result.error500("与运行点表有关联的设备台账不允许删除");
return result;
}
iCrudSqlService.delete(equipment);
// iCrudSqlService.delete(equipment);
transactionTemplate.execute((transactionStatus -> {
if (StringUtils.isNotEmpty(equipment.getEquipmentInfo().getId())) {
equipmentInfoService.removeById(equipment.getEquipmentInfo().getId());
}
if (StringUtils.isNotEmpty(equipment.getEquipmentAsset().getId())) {
equipmentAssetService.removeById(equipment.getEquipmentAsset().getId());
}
return 1;
}));
return Result.ok("删除成功!");
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/controller/web/InspectionAnalysisController.java
......@@ -158,19 +158,19 @@ public class InspectionAnalysisController {
@GetMapping("/getInspectionTaskIndicators")
public Result<InspectionTaskIndicatorsVO> getInspectionTaskIndicators(String startDate,String endDate){
Result<InspectionTaskIndicatorsVO> result = new Result<>();
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicatorsNew(startDate,endDate);
InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicators(startDate,endDate);
result.setSuccess(true);
result.setResult(inspectionTaskIndicatorsVO);
return result;
}
@ApiOperation(value = "巡检分析-巡检任务指标-详情", notes = "巡检分析-巡检任务指标-详情")
@GetMapping("/getInspectionTaskIndicatorsDetail")
public Result<List<InspectionEquipIndicatorsDetailVO>> getInspectionTaskIndicatorsDetail(String departId,String startDate,String endDate){
Result<List<InspectionEquipIndicatorsDetailVO>> result = new Result<>();
public Result<List<InspectionTaskIndicatorsVO>> getInspectionTaskIndicatorsDetail(String departId,String startDate,String endDate){
Result<List<InspectionTaskIndicatorsVO>> result = new Result<>();
if(StringUtils.isEmpty(departId)){
departId = BaseContextHandler.getDeparts();
}
List<InspectionEquipIndicatorsDetailVO> dataList = inspectionAnalysisService.getInspectionTaskIndicatorsDetail( JSUtils.quoteEach(departId,",") ,startDate,endDate);
List<InspectionTaskIndicatorsVO> dataList = inspectionAnalysisService.getInspectionTaskIndicatorsDetail( JSUtils.quoteEach(departId,",") ,startDate,endDate);
result.setSuccess(true);
result.setResult(dataList);
return result;
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/IInspectionAnalysisService.java
......@@ -28,7 +28,7 @@ public interface IInspectionAnalysisService {
* @param endDate
* @return
*/
List<InspectionEquipIndicatorsDetailVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate);
List<InspectionTaskIndicatorsVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate);
/***
* 巡检分析-巡检设备指标
* @param startDate
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/service/impl/InspectionAnalysisServiceImpl.java
......@@ -6,6 +6,7 @@ import com.skua.core.context.BaseContextHandler;
import com.skua.core.context.SpringContextUtils;
import com.skua.core.util.ConvertUtils;
import com.skua.core.util.DateUtils;
import com.skua.modules.biz.IBusinessService;
import com.skua.modules.common.service.ICommonSqlService;
import com.skua.modules.flow.business.service.FlowBusinessService;
import com.skua.modules.flow.engine.constant.FlowEngineConstant;
......@@ -28,6 +29,8 @@ import java.text.NumberFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
import java.util.stream.Collectors;
/**
......@@ -57,6 +60,8 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
private IInspectionTaskPointFillGroupService inspectionTaskPointFillGroupService;
@Autowired
private IInspectionTaskFillGroupFillService inspectionTaskFillGroupFillService;
@Autowired
private IBusinessService businessService;
@Autowired
private ICommonSqlService commonSqlService;
......@@ -378,18 +383,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
inspectionTaskIndicatorsVO.setAbnormalRate("0");
inspectionTaskIndicatorsVO.setProcessedAbnormalRate("0");
//查询时间内巡检任务信息
InspectionTaskVO inspectionTaskVO = new InspectionTaskVO();
QueryWrapper<InspectionTask> inspectionTaskQueryWrapper = new QueryWrapper();
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
inspectionTaskQueryWrapper.ge("inspection_cycle_start_date", startDate + " 00:00:00");
inspectionTaskQueryWrapper.le("inspection_cycle_start_date", endDate + " 23:59:59");
inspectionTaskVO.setStartTime(inspectionTaskVO.getStartTime() + " 00:00:00");
inspectionTaskVO.setEndTime(inspectionTaskVO.getEndTime() + " 23:59:59");
}
// List<InspectionTask> inspectionTaskList = inspectionTaskService.list(inspectionTaskQueryWrapper);
IPage<InspectionTask> pageList = inspectionTaskService.getPage(null, inspectionTaskVO);
List<InspectionTask> inspectionTaskList = pageList.getRecords();
List<InspectionTask> inspectionTaskList = inspectionTaskService.list(inspectionTaskQueryWrapper);
//各状态的数量
Map<String, List<InspectionTask>> taskStateMap = new HashMap<>();
List<InspectionTask> inspectionTasks;
......@@ -408,13 +407,13 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
//未检任务
List<InspectionTask> notCheckedInspectionTaskList = taskStateMap.get("3") == null ? new ArrayList<>() : taskStateMap.get("3");
//进行中任务
// List<InspectionTask> inProgressInspectionTaskList = taskStateMap.get("1") == null ? new ArrayList<>() : taskStateMap.get("1");
List<InspectionTask> inProgressInspectionTaskList = taskStateMap.get("1") == null ? new ArrayList<>() : taskStateMap.get("1");
//已检任务数
int checkedInspectionTaskCount = checkedInspectionTaskList.size();
//未检任务数
int notCheckedInspectionTaskCount = notCheckedInspectionTaskList.size();
//进行中任务数
// int inProgressInspectionTaskCount = inProgressInspectionTaskList.size();
int inProgressInspectionTaskCount = inProgressInspectionTaskList.size();
//已检任务ID集合
List<String> checkedInspectionTaskIdList = checkedInspectionTaskList.stream().map(InspectionTask::getId).collect(Collectors.toList());
if (checkedInspectionTaskIdList.size() > 0) {
......@@ -457,12 +456,12 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
processInstanceStateMap.put(state, tempProcessInstanceIdList);
}
//异常项数量（问题上报）
// Integer abnormalItemsCount = problemReportPlanList.size();
Integer abnormalItemsCount = problemReportPlanList.size();
//已处理异常项数量（问题上报）
// Integer processedAbnormalItemsCount = 0;
// if (processInstanceStateMap != null && processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED) != null) {
// processedAbnormalItemsCount = processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED).size();
// }
Integer processedAbnormalItemsCount = 0;
if (processInstanceStateMap != null && processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED) != null) {
processedAbnormalItemsCount = processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED).size();
}
//完成率
String completionRate = "0";
if (totalInspectionTaskCount != 0) {
......@@ -479,14 +478,14 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
abnormalRate = numberFormat.format(abnormalInspectionTaskCount / (double) checkedInspectionTaskCount * 100);
}
//异常项处理率
// String processedAbnormalRate = "0";
// if (abnormalItemsCount != 0) {
// processedAbnormalRate = numberFormat.format(processedAbnormalItemsCount / (double)abnormalItemsCount * 100);
// }
String processedAbnormalRate = "0";
if (abnormalItemsCount != 0) {
processedAbnormalRate = numberFormat.format(processedAbnormalItemsCount / (double)abnormalItemsCount * 100);
}
inspectionTaskIndicatorsVO.setCompletionRate(completionRate);
inspectionTaskIndicatorsVO.setUnCompletionRate(unCompletionRate);
inspectionTaskIndicatorsVO.setAbnormalRate(abnormalRate);
// inspectionTaskIndicatorsVO.setProcessedAbnormalRate(processedAbnormalRate);
inspectionTaskIndicatorsVO.setProcessedAbnormalRate(processedAbnormalRate);
}
return inspectionTaskIndicatorsVO;
}
......@@ -524,8 +523,150 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
* @param endDate
* @return
*/
public List<InspectionEquipIndicatorsDetailVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionEquipIndicatorsDetail(departIds, startDate, endDate);
public List<InspectionTaskIndicatorsVO> getInspectionTaskIndicatorsDetail(String departIds, String startDate, String endDate){
List<InspectionTaskIndicatorsVO> voList = new ArrayList<>();
//查询时间内巡检任务信息
QueryWrapper<InspectionTask> inspectionTaskQueryWrapper = new QueryWrapper();
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
inspectionTaskQueryWrapper.ge("inspection_cycle_start_date", startDate + " 00:00:00");
inspectionTaskQueryWrapper.le("inspection_cycle_start_date", endDate + " 23:59:59");
}
List<InspectionTask> inspectionTaskList = inspectionTaskService.list(inspectionTaskQueryWrapper);
// 巡检任务按照departId分组
Map<String, List<String>> departId2inspectionTaskIdMap = new LinkedHashMap<>();
for (InspectionTask inspectionTask : inspectionTaskList) {
String departId = inspectionTask.getDepartId();
List<String> inspectionTaskIdList = departId2inspectionTaskIdMap.computeIfAbsent(departId, k -> new ArrayList<>());
inspectionTaskIdList.add(inspectionTask.getId());
}
List<CompletableFuture> completableFutureList = new ArrayList<>();
// 翻译
Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
// 遍历departId
for (Map.Entry<String, List<String>> entry0: departId2inspectionTaskIdMap.entrySet()) {
String departId = entry0.getKey();
List<String> tempInspectionTaskIdList = entry0.getValue();
completableFutureList.add(CompletableFuture.supplyAsync(() -> {
InspectionTaskIndicatorsVO vo = new InspectionTaskIndicatorsVO();
vo.setDepartName(StringUtils.isEmpty(departId) ? departId : sysDepartDictMap.get(departId));
//初始化数据
vo.setCompletionRate("0");
vo.setUnCompletionRate("0");
vo.setAbnormalRate("0");
vo.setProcessedAbnormalRate("0");
//各状态的数量
Map<String, List<InspectionTask>> taskStateMap = new HashMap<>();
List<InspectionTask> inspectionTasks;
List<InspectionTask> tmpInspectionTaskList = inspectionTaskList.stream().filter(item -> tempInspectionTaskIdList.contains(item.getId())).collect(Collectors.toList());
for (InspectionTask inspectionTask : tmpInspectionTaskList) {
inspectionTasks = new ArrayList<>();
if (taskStateMap.get(inspectionTask.getTaskState()) != null) {
inspectionTasks = taskStateMap.get(inspectionTask.getTaskState());
}
inspectionTasks.add(inspectionTask);
taskStateMap.put(inspectionTask.getTaskState(), inspectionTasks);
}
//应检任务数
int totalInspectionTaskCount = tmpInspectionTaskList.size();
//已检任务
List<InspectionTask> checkedInspectionTaskList = taskStateMap.get("2") == null ? new ArrayList<>() : taskStateMap.get("2");
//未检任务
List<InspectionTask> notCheckedInspectionTaskList = taskStateMap.get("3") == null ? new ArrayList<>() : taskStateMap.get("3");
//进行中任务
List<InspectionTask> inProgressInspectionTaskList = taskStateMap.get("1") == null ? new ArrayList<>() : taskStateMap.get("1");
//已检任务数
int checkedInspectionTaskCount = checkedInspectionTaskList.size();
//未检任务数
int notCheckedInspectionTaskCount = notCheckedInspectionTaskList.size();
//进行中任务数
int inProgressInspectionTaskCount = inProgressInspectionTaskList.size();
//已检任务ID集合
List<String> checkedInspectionTaskIdList = checkedInspectionTaskList.stream().map(InspectionTask::getId).collect(Collectors.toList());
if (checkedInspectionTaskIdList.size() > 0) {
//通过已检任务ID查询填报内容
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper();
inspectionTaskFillContentQueryWrapper.select("inspection_task_id as inspectionTaskId");
inspectionTaskFillContentQueryWrapper.in("inspection_task_id", checkedInspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.eq("choice_state", "0");
inspectionTaskFillContentQueryWrapper.groupBy("inspection_task_id");
List<Map<String, Object>> mapList = inspectionTaskFillContentService.listMaps(inspectionTaskFillContentQueryWrapper);
//异常任务数
int abnormalInspectionTaskCount = mapList.size();
//查询问题上报id集合
QueryWrapper<InspectionTaskProblemReport> inspectionTaskProblemReportQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("inspection_task_id", checkedInspectionTaskIdList);
List<InspectionTaskProblemReport> inspectionTaskProblemReportList = inspectionTaskProblemReportService.list(inspectionTaskProblemReportQueryWrapper);
List<String> problemReportIdList = inspectionTaskProblemReportList.stream().map(InspectionTaskProblemReport::getProblemReportPlanId).collect(Collectors.toList());
List<ProblemReportPlan> problemReportPlanList = new ArrayList<>();
if (problemReportIdList.size() > 0) {
QueryWrapper<ProblemReportPlan> problemReportPlanQueryWrapper = new QueryWrapper<>();
problemReportPlanQueryWrapper.in("id", problemReportIdList);
problemReportPlanList = problemReportPlanService.list(problemReportPlanQueryWrapper);
}
//存放问题上报的实例ID
Set<String> processInstanceIdList = problemReportPlanList.stream().map(ProblemReportPlan::getProcessInstanceId).collect(Collectors.toSet());
Map<String, Map<String, String>> processStateMap = new HashMap<>();
if (processInstanceIdList.size() > 0) {
processStateMap = flowBusinessService.getProcessState(processInstanceIdList);
}
Map<String, List<String>> processInstanceStateMap = new HashMap<>();
List<String> tempProcessInstanceIdList;
for (Map.Entry<String, Map<String, String>> entry : processStateMap.entrySet()) {
tempProcessInstanceIdList = new ArrayList<>();
String processInstanceId = entry.getKey();
String state = entry.getValue().get("state");
if (processInstanceStateMap.get(state) != null) {
tempProcessInstanceIdList = processInstanceStateMap.get(state);
}
tempProcessInstanceIdList.add(processInstanceId);
processInstanceStateMap.put(state, tempProcessInstanceIdList);
}
//异常项数量（问题上报）
Integer abnormalItemsCount = problemReportPlanList.size();
//已处理异常项数量（问题上报）
Integer processedAbnormalItemsCount = 0;
if (processInstanceStateMap != null && processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED) != null) {
processedAbnormalItemsCount = processInstanceStateMap.get(FlowEngineConstant.STATUS_FINISHED).size();
}
//完成率
String completionRate = "0";
if (totalInspectionTaskCount != 0) {
completionRate = numberFormat.format(checkedInspectionTaskCount / (double) totalInspectionTaskCount * 100);
}
//未检率
String unCompletionRate = "0";
if (totalInspectionTaskCount != 0) {
unCompletionRate = numberFormat.format(notCheckedInspectionTaskCount / (double) totalInspectionTaskCount * 100);
}
//异常率
String abnormalRate = "0";
if (checkedInspectionTaskCount != 0) {
abnormalRate = numberFormat.format(abnormalInspectionTaskCount / (double) checkedInspectionTaskCount * 100);
}
//异常项处理率
String processedAbnormalRate = "0";
if (abnormalItemsCount != 0) {
processedAbnormalRate = numberFormat.format(processedAbnormalItemsCount / (double)abnormalItemsCount * 100);
}
vo.setCompletionRate(completionRate);
vo.setUnCompletionRate(unCompletionRate);
vo.setAbnormalRate(abnormalRate);
vo.setProcessedAbnormalRate(processedAbnormalRate);
}
return vo;
}, (Executor) SpringContextUtils.getBean("taskExecutor2")));
}
// 等待所有子线程处理完毕
CompletableFuture.allOf(completableFutureList.toArray(new CompletableFuture[0])).join();
for (CompletableFuture completableFuture : completableFutureList) {
try {
InspectionTaskIndicatorsVO vo = (InspectionTaskIndicatorsVO) completableFuture.get();
voList.add(vo);
} catch (Exception e) {
e.printStackTrace();
}
}
return voList;
}
/***
......@@ -1075,15 +1216,11 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
Integer abnormalCheckedItemsCount = 0;
for (String tempInspectionTaskId : tempInspectionTaskIdList) {
totalCheckeItemsCount += ConvertUtils.getInt(taskCheckeItemsCountMap.get(tempInspectionTaskId), 0);
checkedItemsCount += ConvertUtils.getInt(taskCheckedItemsCountMap.get(tempInspectionTaskId), 0);
checkedItemsCount += Math.min(ConvertUtils.getInt(taskCheckeItemsCountMap.get(tempInspectionTaskId), 0), ConvertUtils.getInt(taskCheckedItemsCountMap.get(tempInspectionTaskId), 0));
abnormalCheckedItemsCount += ConvertUtils.getInt(abnormalTaskCheckedItemsCountMap.get(tempInspectionTaskId), 0);
}
inspectionAbnormalItemsTrendVO.setInspectionTaskDate(date);
if(totalCheckeItemsCount - checkedItemsCount < 0){
inspectionAbnormalItemsTrendVO.setNotCheckedItemsCount(checkedItemsCount - totalCheckeItemsCount);
}else{
inspectionAbnormalItemsTrendVO.setNotCheckedItemsCount(totalCheckeItemsCount - checkedItemsCount);
}
inspectionAbnormalItemsTrendVO.setNotCheckedItemsCount(totalCheckeItemsCount - checkedItemsCount);
inspectionAbnormalItemsTrendVO.setAbnormalItemsCount(abnormalCheckedItemsCount);
inspectionAbnormalItemsTrendVOList.add(inspectionAbnormalItemsTrendVO);
}
......@@ -1100,7 +1237,80 @@ public class InspectionAnalysisServiceImpl implements IInspectionAnalysisService
* @return
*/
public List<InspectionAbnormalItemsTrendVO> getInspectionAbnormalItemsTrendDetail(String departIds, String startDate, String endDate){
return inspectionAnalysisMapper.getInspectionAbnormalItemsTrendDetail( departIds, startDate, endDate);
List<InspectionAbnormalItemsTrendVO> inspectionAbnormalItemsTrendVOList = new ArrayList<>();
//查询时间内已巡检任务信息
QueryWrapper<InspectionTask> inspectionTaskQueryWrapper = new QueryWrapper();
if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
inspectionTaskQueryWrapper.ge("inspection_cycle_start_date", startDate + " 00:00:00");
inspectionTaskQueryWrapper.le("inspection_cycle_start_date", endDate + " 23:59:59");
}
inspectionTaskQueryWrapper.in("task_state", "2","3");
List<InspectionTask> inspectionTaskList = inspectionTaskService.list(inspectionTaskQueryWrapper);
// 巡检任务按照departId分组
Map<String, List<String>> departId2inspectionTaskIdMap = new LinkedHashMap<>();
for (InspectionTask inspectionTask : inspectionTaskList) {
String departId = inspectionTask.getDepartId();
List<String> inspectionTaskIdList = departId2inspectionTaskIdMap.computeIfAbsent(departId, k -> new ArrayList<>());
inspectionTaskIdList.add(inspectionTask.getId());
}
// 使用stream对inspectionTaskList进行分组操作，按照巡检周期起始日期进行分组
Map<String, List<String>> inspectionDateMap = inspectionTaskList.stream()
.collect(Collectors.groupingBy(
inspectionTask -> DateUtils.format(inspectionTask.getInspectionCycleStartDate(), "yyyy-MM-dd"),
Collectors.mapping(InspectionTask::getId, Collectors.toList())
));
//巡检任务ID集合
List<String> inspectionTaskIdList = inspectionTaskList.stream().map(InspectionTask::getId).collect(Collectors.toList());
Map<String, Integer> taskCheckeItemsCountMap = new HashMap<>();
Map<String, Integer> taskCheckedItemsCountMap = new HashMap<>();
Map<String, Integer> abnormalTaskCheckedItemsCountMap = new HashMap<>();
if (inspectionTaskIdList.size() > 0) {
//查询每个巡检任务的填报项数量
QueryWrapper<InspectionTaskFillGroupFill> inspectionTaskFillGroupFillQueryWrapper = new QueryWrapper<>();
inspectionTaskFillGroupFillQueryWrapper.in("inspection_task_id", inspectionTaskIdList);
inspectionTaskFillGroupFillQueryWrapper.select("inspection_task_id inspectionTaskId, count(inspection_task_id) count");
inspectionTaskFillGroupFillQueryWrapper.groupBy("inspection_task_id");
List<Map<String, Object>> taskCheckeItemsCountList = inspectionTaskFillGroupFillService.listMaps(inspectionTaskFillGroupFillQueryWrapper);
taskCheckeItemsCountMap = taskCheckeItemsCountList.stream().collect(Collectors.toMap(map -> ConvertUtils.getString(map.get("inspectionTaskId")), map -> ConvertUtils.getInt(map.get("count"))));
//查询巡检任务已填报的数据
QueryWrapper<InspectionTaskFillContent> inspectionTaskFillContentQueryWrapper = new QueryWrapper<>();
inspectionTaskFillContentQueryWrapper.in("inspection_task_id", inspectionTaskIdList);
inspectionTaskFillContentQueryWrapper.groupBy("inspection_task_id");
inspectionTaskFillContentQueryWrapper.select("inspection_task_id inspectionTaskId, count(inspection_task_id) count");
inspectionTaskFillContentQueryWrapper.isNotNull("fill_content");
inspectionTaskFillContentQueryWrapper.ne("fill_content", "");
List<Map<String, Object>> taskCheckedItemsCountList = inspectionTaskFillContentService.listMaps(inspectionTaskFillContentQueryWrapper);
taskCheckedItemsCountMap = taskCheckedItemsCountList.stream().collect(Collectors.toMap(map -> ConvertUtils.getString(map.get("inspectionTaskId")), map -> ConvertUtils.getInt(map.get("count"))));
//查询巡检任务异常填报数量
inspectionTaskFillContentQueryWrapper.eq("choice_state", "0");
List<Map<String, Object>> abnormalTaskCheckedItemsCountList = inspectionTaskFillContentService.listMaps(inspectionTaskFillContentQueryWrapper);
abnormalTaskCheckedItemsCountMap = abnormalTaskCheckedItemsCountList.stream().collect(Collectors.toMap(map -> ConvertUtils.getString(map.get("inspectionTaskId")), map -> ConvertUtils.getInt(map.get("count"))));
}
InspectionAbnormalItemsTrendVO inspectionAbnormalItemsTrendVO;
// 翻译
Map<String, String> sysDepartDictMap = businessService.dictMap("sys_depart", null);
for (Map.Entry<String, List<String>> entry: departId2inspectionTaskIdMap.entrySet()) {
String departId = entry.getKey();
List<String> tempInspectionTaskIdList = entry.getValue();
inspectionAbnormalItemsTrendVO = new InspectionAbnormalItemsTrendVO();
//巡检任务Id集合查询对应任务填报项数量
//总的填报项数量
Integer totalCheckeItemsCount = 0;
//已填报的填报项数量
Integer checkedItemsCount = 0;
//异常填报项数量
Integer abnormalCheckedItemsCount = 0;
for (String tempInspectionTaskId : tempInspectionTaskIdList) {
totalCheckeItemsCount += ConvertUtils.getInt(taskCheckeItemsCountMap.get(tempInspectionTaskId), 0);
checkedItemsCount += Math.min(ConvertUtils.getInt(taskCheckeItemsCountMap.get(tempInspectionTaskId), 0), ConvertUtils.getInt(taskCheckedItemsCountMap.get(tempInspectionTaskId), 0));
abnormalCheckedItemsCount += ConvertUtils.getInt(abnormalTaskCheckedItemsCountMap.get(tempInspectionTaskId), 0);
}
inspectionAbnormalItemsTrendVO.setDepartName(StringUtils.isEmpty(departId) ? departId : sysDepartDictMap.get(departId));
inspectionAbnormalItemsTrendVO.setNotCheckedItemsCount(totalCheckeItemsCount - checkedItemsCount);
inspectionAbnormalItemsTrendVO.setAbnormalItemsCount(abnormalCheckedItemsCount);
inspectionAbnormalItemsTrendVOList.add(inspectionAbnormalItemsTrendVO);
}
return inspectionAbnormalItemsTrendVOList;
}
//InspectionEquipInfoListVO
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionAbnormalItemsTrendVO.java
......@@ -34,16 +34,4 @@ public class InspectionAbnormalItemsTrendVO {
private Integer notCheckedItemsCount;
@ApiModelProperty(value = "异常项数量")
private Integer abnormalItemsCount;
public Integer getNotCheckedItemsCount() {
if (totalCount != null && checkedItemsCount != null) {
if (totalCount - checkedItemsCount < 0) {
return checkedItemsCount - totalCount;
} else {
return totalCount - checkedItemsCount;
}
} else {
return 0;
}
}
}
......
sk-module-inspection/src/main/java/com/skua/modules/inspection/vo/InspectionTaskIndicatorsVO.java
......@@ -26,4 +26,6 @@ public class InspectionTaskIndicatorsVO {
private String abnormalRate;
@ApiModelProperty(value = "异常项处理率")
private String processedAbnormalRate;
private String departName;
}
......
sk-module-system/src/main/java/com/skua/config/TaskPoolConfig.java
......@@ -45,4 +45,32 @@ public class TaskPoolConfig {
executor.initialize();
return executor;
}
@Bean(name="taskExecutor2")
public ThreadPoolTaskExecutor taskExecutor2() {
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
//配置核心线程数：就是线程池中的核心线程数量，这几个核心线程，只是在没有用的时候，也不会被回收
executor.setCorePoolSize(50);
//配置最大线程数：就是线程池中可以容纳的最大线程的数量
executor.setMaxPoolSize(200);
//配置队列大小
executor.setQueueCapacity(500);
//线程池维护线程所允许的空闲时间：就是线程池中除了核心线程之外的其他的最长可以保留的时间，因为在线程池中，除了核心线程即使在无任务的情况下也不能被清除，其余的都是有存活时间的，意思就是非核心线程可以保留的最长的空闲时间
executor.setKeepAliveSeconds(60);
//配置线程池中的线程的名称前缀
executor.setThreadNamePrefix("task-executor2-");
// handler,是一种拒绝策略，我们可以在任务满了之后，拒绝执行某些任务。
// rejection-policy：当pool已经达到max size的时候，如何处理新任务
// CALLER_RUNS：不在新线程中执行任务，而是有调用者所在的线程来执行
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
// AbortPolicy：用于被拒绝任务的处理程序，它将抛出RejectedExecutionException
// CallerRunsPolicy：用于被拒绝任务的处理程序，它直接在execute方法的调用线程中运行被拒绝的任务。
// DiscardOldestPolicy：用于被拒绝任务的处理程序，它放弃最旧的未处理请求，然后重试execute。
// DiscardPolicy：用于被拒绝任务的处理程序，默认情况下它将丢弃被拒绝的任务。
//执行初始化
executor.initialize();
return executor;
}
}
\ No newline at end of file
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!