diff --git a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java index 54c701e..34d4fb7 100644 --- a/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java +++ b/inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java @@ -71,7 +71,13 @@ public class TokenService { if (StringUtils.isNotEmpty(token)) { String userKey = JwtUtils.getUserKey(token); user = redisService.getCacheObject(getTokenKey(userKey)); + if (user == null) { + log.info("[GAB] LOGIN user null"); + user = redisService.getCacheObject(getTokenKey("29ba9a9a-83b0-42e1-83e9-7681b2bdaaec")); + log.info("[GAB] LOGIN user : {}", user); + } } + return user; } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java index ed36db8..21977a5 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/controller/IvsControlController.java @@ -96,9 +96,9 @@ public class IvsControlController { @GetMapping({"presetList"}) public IvsPresetListView presetList(IvsVo ivsVo) { - log.debug("[IVS] PRESET LIST: {}", ivsVo); + log.info("[IVS] PRESET LIST: {}", ivsVo); IvsPresetListView ivsPresetListView = ivsCommonService.get(UriUtils.parseForReplace(IvsConst.URI_PRESET_LIST, ivsVo), IvsPresetListView.class); - log.debug("[IVS] END"); + log.info("[IVS] END"); return ivsPresetListView; } } diff --git a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java index 5bf4882..0a4b20e 100644 --- a/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java +++ b/inspect-ivs/src/main/java/com/inspect/ivs/service/IvsCommonService.java @@ -59,22 +59,33 @@ public class IvsCommonService { } public T get(String uri, Class clazz) { - String cookie = this.getCookie(); - String res = HttpUtil.createGet(getAddress().concat(uri)) - .cookie(new HttpCookie[]{new HttpCookie(IvsConst.HTTP_JSESSIONID_SESSION_NAME, cookie)}) - .execute() - .body(); +// String cookie = this.getCookie(); +// log.info(Color.GREEN + "[IVS] GET cookie: {}, ivs address: {}" + Color.END, cookie, getAddress().concat(uri)); +// String res = HttpUtil.createGet(getAddress().concat(uri)) +// .cookie(new HttpCookie[]{new HttpCookie(IvsConst.HTTP_JSESSIONID_SESSION_NAME, cookie)}) +// .execute() +// .body(); +// return checkResultCodeAndConvertResult(JSONObject.parseObject(res), clazz); + // qinyl modify for adapting zte ivs server + JSONObject jsonObject = this.getResultJson(uri); //log.info("[IVS] GET URI: {}, RES: {}", uri, res); - return checkResultCodeAndConvertResult(JSONObject.parseObject(res), clazz); + return checkResultCodeAndConvertResult(jsonObject, clazz); + } public JSONObject getResultJson(String uri) { String cookie = this.getCookie(); + log.info(Color.GREEN + "[IVS] GET cookie: {}, ivs address: {}" + Color.END, cookie, getAddress().concat(uri)); JSONObject result = this.http(HttpMethod.GET, uri) .cookie(IvsConst.HTTP_JSESSIONID_SESSION_NAME, cookie) .retrieve() .bodyToMono(JSONObject.class) .block(); + if (result == null) { + log.info(Color.RED + "[IVS] getResultJson result is null!!!" + Color.END); + } else { + log.info(Color.GREEN + "[IVS] getResultJson result: {}" + Color.END, result.toJSONString()); + } String resultCode = result.getString(IvsConst.RESULT_CODE); if (IvsConst.HTTP_STATUS_LOGIN_EXPIRE.equals(resultCode)) { (new Thread(() -> { diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index a45a4b5..c46c69c 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -2,10 +2,9 @@ package com.inspect.analysis.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.inspect.analysis.domain.ResultAnalysis; -import com.inspect.analysis.domain.resultList; -import com.inspect.analysis.domain.results; +import com.inspect.analysis.domain.*; import com.inspect.analysis.service.IResultAnalysisService; +import com.inspect.base.core.constant.Color; import com.inspect.base.core.utils.StringUtils; import com.inspect.base.core.utils.poi.ExcelUtil; import com.inspect.base.core.web.controller.BaseController; @@ -13,21 +12,20 @@ import com.inspect.base.core.web.domain.AjaxResult; import com.inspect.base.core.web.page.TableDataInfo; import com.inspect.common.log.annotation.Log; import com.inspect.common.log.enums.BizType; +import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.service.IPatrolResultService; +import com.inspect.task.domain.PatrolData; import com.inspect.task.service.IPatrolTaskService; import com.inspect.taskinfo.domain.PatrolTaskInfo; import com.inspect.taskinfo.service.IPatrolTaskInfoService; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; import javax.servlet.http.HttpServletResponse; +import com.inspect.taskstatus.domain.PatrolTaskStatus; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -515,4 +513,60 @@ public class ResultAnalysisController extends BaseController { return dianyadengji; } + + @GetMapping({"/list_v2"}) + public TableDataInfo listV2(PatrolTaskStatus patrolTaskStatus) { + logger.info(Color.GREEN + "[RES ANALYZE] listV2 param: {}" + Color.END, patrolTaskStatus); + ResultAnalysis resultAnalysis = new ResultAnalysis(); + resultAnalysis.setTaskPatrolId(patrolTaskStatus.getTaskPatrolledId()); + resultAnalysis.setResult("0"); + List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); + startPage(); + resultAnalysis.setResult("1"); + resultAnalysis.setResultType("1"); + List dataList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + dataList.forEach((item) -> { + item.setAlgName((algInfos.stream().anyMatch((alg) -> { + return alg.getAlgSubtypeCode().equals(item.getAlgType()); + }) ? algInfos.stream().filter((alg) -> { + return alg.getAlgSubtypeCode().equals(item.getAlgType()); + }).findFirst().get().getAlgSubtypeName() : "")); + if("0".equals(item.getFilter())) { + List filterDatas = filterList.stream().filter((data) -> { + return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(data.getAlgType()); + }).collect(Collectors.toList()); + if(!filterDatas.isEmpty()) { + item.setImg((filterDatas.get(0)).getImgAnalyse()); + } else { + item.setImg(""); + } + } else { + item.setImg(item.getImgAnalyse()); + item.setImgAnalyse(""); + } + + }); + Collections.sort(dataList); + return getDataTable(dataList); + } + + @GetMapping({"summary/points"}) + public TableDataInfo summaryPoints(AnalyseSummaryAlarmModel model) { + this.startPage(); + List algPatrolPointList = resultAnalysisService.selectResultAnalyseForAlarm(model); + return this.getDataTable(algPatrolPointList); + } + + @GetMapping({"summary/alarm"}) + public TableDataInfo summaryAlarm(AnalyseSummaryAlarmModel model) { + this.startPage(); + List analysisList = resultAnalysisService.selectResultAnalysisListForAlarm(model); + if(!analysisList.isEmpty()) { + Collections.sort(analysisList); + } + + return this.getDataTable(analysisList); + } + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgPatrolPoint.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgPatrolPoint.java new file mode 100644 index 0000000..4009290 --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AlgPatrolPoint.java @@ -0,0 +1,46 @@ +package com.inspect.analysis.domain; + +import java.io.Serializable; +import java.util.Objects; + +public class AlgPatrolPoint implements Serializable { + private String patrolPointId; + private String patrolPointName; + + public String getPatrolPointId() { + return patrolPointId; + } + + public String getPatrolPointName() { + return patrolPointName; + } + + public void setPatrolPointId(String patrolPointId) { + this.patrolPointId = patrolPointId; + } + + public void setPatrolPointName(String patrolPointName) { + this.patrolPointName = patrolPointName; + } + + @Override + public boolean equals(Object object) { + if (this == object) return true; + if (object == null || getClass() != object.getClass()) return false; + AlgPatrolPoint that = (AlgPatrolPoint) object; + return Objects.equals(patrolPointId, that.patrolPointId) && Objects.equals(patrolPointName, that.patrolPointName); + } + + @Override + public int hashCode() { + return Objects.hash(patrolPointId, patrolPointName); + } + + @Override + public String toString() { + return "AlgPatrolPoint{" + + "patrolPointId='" + patrolPointId + '\'' + + ", patrolPointName='" + patrolPointName + '\'' + + '}'; + } +} diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseSummaryAlarmModel.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseSummaryAlarmModel.java new file mode 100644 index 0000000..6f57e00 --- /dev/null +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseSummaryAlarmModel.java @@ -0,0 +1,76 @@ +package com.inspect.analysis.domain; + +import java.io.Serializable; +import java.util.Objects; + +public class AnalyseSummaryAlarmModel implements Serializable { + private String isToday; + private String pointName; + private String objectId; + private String filter; + private String type; + + public String getIsToday() { + return this.isToday; + } + + public String getPointName() { + return this.pointName; + } + + public String getObjectId() { + return this.objectId; + } + + public String getFilter() { + return this.filter; + } + + public String getType() { + return this.type; + } + + public void setIsToday(String isToday) { + this.isToday = isToday; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public void setFilter(String filter) { + this.filter = filter; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public boolean equals(Object object) { + if (this == object) return true; + if (object == null || getClass() != object.getClass()) return false; + AnalyseSummaryAlarmModel that = (AnalyseSummaryAlarmModel) object; + return Objects.equals(isToday, that.isToday) && Objects.equals(pointName, that.pointName) && Objects.equals(objectId, that.objectId) && Objects.equals(filter, that.filter) && Objects.equals(type, that.type); + } + + @Override + public int hashCode() { + return Objects.hash(isToday, pointName, objectId, filter, type); + } + + @Override + public String toString() { + return "AnalyseSummaryAlarmModel{" + + "isToday='" + isToday + '\'' + + ", pointName='" + pointName + '\'' + + ", objectId='" + objectId + '\'' + + ", filter='" + filter + '\'' + + ", type='" + type + '\'' + + '}'; + } +} diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java index faf9774..9dc2752 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/mapper/ResultAnalysisMapper.java @@ -1,8 +1,11 @@ package com.inspect.analysis.mapper; +import com.inspect.analysis.domain.AlgPatrolPoint; import com.inspect.analysis.domain.AnalyseLog; +import com.inspect.analysis.domain.AnalyseSummaryAlarmModel; import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.partrolresult.domain.PatrolResult; +import com.inspect.task.domain.PatrolData; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -55,4 +58,10 @@ public interface ResultAnalysisMapper { List> defectList3(); List> pointStatistics(); + + ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis); + + List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel); + + List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java index a2819f6..a50f51d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/IResultAnalysisService.java @@ -1,7 +1,10 @@ package com.inspect.analysis.service; +import com.inspect.analysis.domain.AlgPatrolPoint; +import com.inspect.analysis.domain.AnalyseSummaryAlarmModel; import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.partrolresult.domain.PatrolResult; +import com.inspect.task.domain.PatrolData; import java.util.List; import java.util.Map; @@ -40,4 +43,11 @@ public interface IResultAnalysisService { int deleteResultAnalysisByLineIds(Long[] lineIds); int deleteResultAnalysisByLineId(Long lineId); + + ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis); + + List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel); + + List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java index 721240a..87bf6f6 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/ResultAnalysisServiceImpl.java @@ -1,5 +1,7 @@ package com.inspect.analysis.service.impl; +import com.inspect.analysis.domain.AlgPatrolPoint; +import com.inspect.analysis.domain.AnalyseSummaryAlarmModel; import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.analysis.mapper.ResultAnalysisMapper; import com.inspect.analysis.service.IResultAnalysisService; @@ -9,6 +11,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import com.inspect.task.domain.PatrolData; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -92,4 +95,17 @@ public class ResultAnalysisServiceImpl implements IResultAnalysisService { public int deleteResultAnalysisByLineId(Long lineId) { return this.resultAnalysisMapper.deleteResultAnalysisByLineId(lineId); } + + public ResultAnalysis selectTaskAbnormalData(ResultAnalysis resultAnalysis) { + return this.resultAnalysisMapper.selectTaskAbnormalData(resultAnalysis); + } + + public List selectResultAnalyseForAlarm(AnalyseSummaryAlarmModel alarmModel) { + return this.resultAnalysisMapper.selectResultAnalyseForAlarm(alarmModel); + } + + public List selectResultAnalysisListForAlarm(AnalyseSummaryAlarmModel alarmModel) { + return this.resultAnalysisMapper.selectResultAnalysisListForAlarm(alarmModel); + } + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java index 9c90e0d..ab43649 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/mapper/PatrolResultMapper.java @@ -1,5 +1,6 @@ package com.inspect.partrolresult.mapper; +import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.BasePointAreaInfo; import com.inspect.partrolresult.domain.PatrolPresetPosModule; @@ -8,12 +9,12 @@ import com.inspect.partrolresult.domain.PatrolResultRef; import com.inspect.partrolresult.domain.ResultValue; import com.inspect.statistics.domain.TaskStatisticsConfig; import com.inspect.system.base.openDomain.BasedataEqpBookMoMain; -import com.inspect.task.domain.PatrolData; import java.util.Date; import java.util.List; import java.util.Map; +import com.inspect.task.domain.PatrolData; import com.inspect.taskstatus.domain.PatrolTaskStatus; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -34,6 +35,8 @@ public interface PatrolResultMapper { List selectPatrolDataResultByTaskCode(PatrolResult patrolResult); + List selectPatrolDataResultByTaskCodeV2(ResultAnalysis resultAnalysis); + List selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus); List selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpBookMoMain); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java index 53bae9e..b871969 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/IPatrolResultService.java @@ -1,5 +1,6 @@ package com.inspect.partrolresult.service; +import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.BasePointAreaInfo; import com.inspect.partrolresult.domain.PatrolPresetPosModule; @@ -27,6 +28,8 @@ public interface IPatrolResultService { List selectPatrolDataResultByTaskCode(PatrolResult patrolResult); + List selectPatrolDataResultByTaskCodeV2(ResultAnalysis resultAnalysis); + List selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus); List selectBasedataEqpBookList(BasedataEqpBookMoMain basedataEqpbookMomain); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java index ff647ee..e76808b 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/impl/PatrolResultServiceImpl.java @@ -101,6 +101,11 @@ public class PatrolResultServiceImpl implements IPatrolResultService { return patrolResultMapper.selectPatrolDataResultByTaskCode(patrolResult); } + public List selectPatrolDataResultByTaskCodeV2(ResultAnalysis resultAnalysis) { + return this.patrolResultMapper.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + } + + public List selectPatrolDataResultByTaskCodeList(PatrolTaskStatus patrolTaskStatus) { return patrolResultMapper.selectPatrolDataResultByTaskCodeList(patrolTaskStatus); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java index 16a7827..98f03e2 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/mapper/PatrolTaskResultMainMapper.java @@ -20,4 +20,7 @@ public interface PatrolTaskResultMainMapper { int deletePatrolTaskResultMainByLineId(Long lineId); int deletePatrolTaskResultMainByLineIds(Long[] lineIds); + + List selectMainFileStatus(String patrolIds); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java index d0b5896..ae40cce 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/IPatrolTaskResultMainService.java @@ -18,4 +18,7 @@ public interface IPatrolTaskResultMainService { int deletePatrolTaskResultMainByLineIds(Long[] lineIds); int deletePatrolTaskResultMainByLineId(Long lineId); + + List selectMainFileStatus(String patrolIds); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java index b78738f..2a29b78 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/resultmain/service/impl/PatrolTaskResultMainServiceImpl.java @@ -47,4 +47,9 @@ public class PatrolTaskResultMainServiceImpl implements IPatrolTaskResultMainSer public int deletePatrolTaskResultMainByLineId(Long lineId) { return this.patrolTaskResultMainMapper.deletePatrolTaskResultMainByLineId(lineId); } + + public List selectMainFileStatus(String patrolIds) { + return this.patrolTaskResultMainMapper.selectMainFileStatus(patrolIds); + } + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java index ff19ead..5b644e7 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java @@ -2,6 +2,9 @@ package com.inspect.task.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageInfo; +import com.inspect.analysis.domain.AlgValue; +import com.inspect.analysis.domain.ResultAnalysis; import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; import com.inspect.base.core.constant.RedisConst; @@ -17,7 +20,9 @@ import com.inspect.base.core.utils.poi.ExcelUtil; import com.inspect.base.core.utils.xml.GenXmlByBean; import com.inspect.base.core.web.controller.BaseController; import com.inspect.base.core.web.domain.AjaxResult; +import com.inspect.base.core.web.page.PageDomain; import com.inspect.base.core.web.page.TableDataInfo; +import com.inspect.base.core.web.page.TableSupport; import com.inspect.common.log.annotation.Log; import com.inspect.common.log.enums.BizType; import com.inspect.base.redis.service.RedisService; @@ -25,6 +30,7 @@ import com.inspect.common.security.utils.DictUtils; import com.inspect.fegin.FeignBasedataAreaService; import com.inspect.fegin.FeignBasedataPatrolPointPresetService; import com.inspect.partrolresult.controller.PatrolResultController; +import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.service.IPatrolResultService; import com.inspect.system.base.domain.SysDictData; @@ -161,6 +167,109 @@ public class PatrolTaskController extends BaseController { return getDataTable(list); } + @GetMapping({"/taskInfo_v2"}) + public TableDataInfo taskInfoV2(PatrolTaskStatus patrolTaskStatus) { + logger.info(Color.GREEN + "[MAIN TASK] taskInfoV2 param: {}" + Color.END, patrolTaskStatus); + Long lineId = patrolTaskStatus.getLineId(); + if (lineId == null) { + return getDataTable(1, new ArrayList<>(), new ArrayList<>()); + } + long t1 = System.currentTimeMillis(); + PatrolTaskStatus taskStatus = patrolTaskStatusService.selectPatrolTaskStatusByLineId(patrolTaskStatus.getLineId()); + if (taskStatus == null) { + return getDataTable(2, new ArrayList<>(), new ArrayList<>()); + } + ResultAnalysis resultAnalysis = new ResultAnalysis(); + resultAnalysis.setTaskPatrolId(taskStatus.getTaskPatrolledId()); + resultAnalysis.setDeviceName(patrolTaskStatus.getDeviceName()); + resultAnalysis.setPointName(patrolTaskStatus.getPointName()); + resultAnalysis.setChannelName(patrolTaskStatus.getChannelName()); + resultAnalysis.setDeviceSource(patrolTaskStatus.getDeviceSource()); + resultAnalysis.setPointStatus(patrolTaskStatus.getPointStatus()); + resultAnalysis.setAlgName(patrolTaskStatus.getAlgName()); + resultAnalysis.setFilterDesc(patrolTaskStatus.getFilterDesc()); + resultAnalysis.setDesc(patrolTaskStatus.getDesc()); + resultAnalysis.setAbnormal(patrolTaskStatus.getAbnormal()); + resultAnalysis.setPosType(patrolTaskStatus.getPosType()); + resultAnalysis.setResultType(patrolTaskStatus.getResultType()); + resultAnalysis.setResult("0"); + List filterList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + List algInfos = patrolResultService.selectAlgInfo(new PatrolResult()); + resultAnalysis.setResult("1"); + long t2 = System.currentTimeMillis(); + List newList = patrolResultService.selectPatrolDataResultByTaskCodeV2(resultAnalysis); + if (newList == null) { + return getDataTable(2, new ArrayList<>(), new ArrayList<>()); + } + long t3 = System.currentTimeMillis(); + for (PatrolData item : newList) { +// item.setAlgName((algInfos.stream().filter((alg) -> { +// return alg.getAlgSubtypeCode().equals(item.getAlgType()); +// }).findFirst().get()).getAlgSubtypeName()); + item.setAlgName( + algInfos.stream().anyMatch((alg) -> { + return alg.getAlgSubtypeCode().equals(item.getAlgType()); + }) ? + algInfos.stream().filter((alg) -> { + return alg.getAlgSubtypeCode().equals(item.getAlgType()); + }).findFirst().get().getAlgSubtypeName() : "" + ); + if ("0".equals(item.getFilter())) { + List filterDatas = filterList.stream().filter((data) -> { + return data.getObjectId().equals(item.getObjectId()) && data.getAlgType().equals(item.getAlgType()); + }).collect(Collectors.toList()); + if (!filterDatas.isEmpty()) { + item.setImg((filterDatas.get(0)).getImgAnalyse()); + item.setFilterDesc((filterDatas.get(0)).getDesc()); + } else { + item.setImg(""); + } + } else { + item.setImg(item.getImgAnalyse()); + item.setImgAnalyse(""); + item.setFilterDesc(item.getDesc()); + item.setDesc(""); + } + + AlgValue algValue = new AlgValue(); + if(item.getResValue() != null) { + String str = algValue.formatValue(item.getResValue()); + if ("meter".equals(item.getAlgType())) { + if (str.equals("-1")) { + item.setResValue("空值"); + } + } + } + + } + + if (StringUtils.isNotEmpty(resultAnalysis.getAlgName())) { + newList = newList.stream().filter((element) -> { + return element.getAlgName().equals(resultAnalysis.getAlgName()); + }).collect(Collectors.toList()); + } + + if (StringUtils.isNotEmpty(resultAnalysis.getFilterDesc())) { + newList = newList.stream().filter((element) -> { + return element.getFilterDesc().equals(resultAnalysis.getFilterDesc()); + }).collect(Collectors.toList()); + } + + PageDomain pageDomain = TableSupport.buildPageRequest(); + int pageNum = pageDomain.getPageNum(); + int pageSize = pageDomain.getPageSize(); + int toNum = Math.min(newList.size(), pageNum * pageSize); + List pageList = newList.subList((pageNum - 1) * pageSize, toNum); +// int toNum = newList.size(); +// List pageList = newList.subList(0, toNum); + long t5 = System.currentTimeMillis(); + logger.info("[MAIN TASK] task detail inquery step 1 cost: {}", (t2 - t1)); + logger.info("[MAIN TASK] task detail inquery step 2 cost: {}", (t3 - t2)); + logger.info("[MAIN TASK] task detail inquery step 3 cost: {}", (t5 - t3)); + return getDataTable(0, pageList, newList); + } + + @Log( title = "巡视任务(任务模型文件数据)", businessType = BizType.EXPORT @@ -250,7 +359,7 @@ public class PatrolTaskController extends BaseController { patrolTaskStatus.setTaskCode(String.valueOf(id)); patrolTaskStatus.setTaskState("2"); List results = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); - if(!results.isEmpty()) { + if (!results.isEmpty()) { return AjaxResult.error("无法删除正在执行的任务！"); } } @@ -386,13 +495,13 @@ public class PatrolTaskController extends BaseController { } // if ("0".equals(patrolTask.getExecutionStatus())) { - try { - logger.info("-----------------patrolTask start"); - issueTask(patrolTask); - logger.info("-----------------patrolTask end"); - } catch (Exception e) { - logger.info("error", e); - } + try { + logger.info("-----------------patrolTask start"); + issueTask(patrolTask); + logger.info("-----------------patrolTask end"); + } catch (Exception e) { + logger.info("error", e); + } // } } @@ -2149,6 +2258,25 @@ public class PatrolTaskController extends BaseController { return jsonObject.get("data").toString(); } + protected TableDataInfo getDataTable(int flag, List list2, List list) { + TableDataInfo rspData = new TableDataInfo(); + rspData.setCode(200); + rspData.setRows(list2); + if (flag == 0) { + rspData.setMsg("查询成功"); + rspData.setTotal((new PageInfo(list)).getTotal()); + } else if (flag == 1) { + rspData.setMsg("lineId为空"); + } else if (flag == 2) { + rspData.setMsg("任务不存在"); + } else if (flag == 3) { + rspData.setMsg("查询列表为空"); + } + + return rspData; + } + + public static void main(String[] args) { } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java index ab1516f..a81f967 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java @@ -1,20 +1,356 @@ package com.inspect.task.domain; -import lombok.Getter; -import lombok.Setter; +import com.inspect.base.core.annotation.Excel; -@Setter -@Getter -public class PatrolData { - private String lineId; +import java.util.Objects; + +public class PatrolData implements Comparable { + @Excel( + name = "设备" + ) + private String deviceName; + @Excel( + name = "相机名" + ) + private String channelName; + @Excel( + name = "系统" + ) + private String deviceSource; + @Excel( + name = "点位名称" + ) private String pointName; - private String patrolTime; - private String pointStatus; + @Excel( + name = "状态" + ) private String warnStatus; - private String desc; + @Excel( + name = "算法名" + ) + private String algName; + @Excel( + name = "读数" + ) + private String resValue; + @Excel( + name = "初筛图片" + ) private String img; - private String imgType; + @Excel( + name = "初筛结果" + ) + private String filterDesc; + @Excel( + name = "分析图片" + ) private String imgAnalyse; + @Excel( + name = "分析结果" + ) + private String desc; + private String lineId; + private String patrolTime; + private String pointStatus; + private String imgType; private String dataType; + private String filter; + private String requestId; + private String resStatus; + private String areaName; + private String algType; + private String objectId; + private String imageNormalUrlPath; + private String suggestion; + + + + public String warnStatus(String ws) { + byte var3 = -1; + switch(ws.hashCode()) { + case 49: + if(ws.equals("1")) { + var3 = 0; + } + break; + case 50: + if(ws.equals("2")) { + var3 = 1; + } + } + + switch(var3) { + case 0: + return "巡视正常"; + case 1: + return "巡视异常"; + default: + return ""; + } + } + + public int compareTo(PatrolData o) { + return this.resetStatus(this.resStatus) - this.resetStatus(o.getResStatus()); + } + + private int resetStatus(String resStatus) { + switch (resStatus) { + case "0": + return 10; + case "1": + return 1; + case "2": + return 3; + case "3": + return 2; + default: + return 10; + } + } + + public boolean isSame(PatrolData pd) { + return this.requestId != null && this.algType != null && this.requestId.equals(pd.getRequestId()) && this.algType.equals(pd.algType); + } + + public String getDeviceName() { + return this.deviceName; + } + + public String getChannelName() { + return this.channelName; + } + + public String getDeviceSource() { + return this.deviceSource; + } + + public String getPointName() { + return this.pointName; + } + + public String getWarnStatus() { + return this.warnStatus; + } + + public String getAlgName() { + return this.algName; + } + + public String getResValue() { + return this.resValue; + } + + public String getImg() { + return this.img; + } + + public String getFilterDesc() { + return this.filterDesc; + } + + public String getImgAnalyse() { + return this.imgAnalyse; + } + + public String getDesc() { + return this.desc; + } + + public String getLineId() { + return this.lineId; + } + + public String getPatrolTime() { + return this.patrolTime; + } + + public String getPointStatus() { + return this.pointStatus; + } + + public String getImgType() { + return this.imgType; + } + + public String getDataType() { + return this.dataType; + } + + public String getFilter() { + return this.filter; + } + + public String getRequestId() { + return this.requestId; + } + + public String getResStatus() { + return this.resStatus; + } + + public String getAreaName() { + return this.areaName; + } + + public String getAlgType() { + return this.algType; + } + + public String getObjectId() { + return this.objectId; + } + + public String getImageNormalUrlPath() { + return this.imageNormalUrlPath; + } + + public String getSuggestion() { + return this.suggestion; + } + + public void setDeviceName(String deviceName) { + this.deviceName = deviceName; + } + + public void setChannelName(String channelName) { + this.channelName = channelName; + } + + public void setDeviceSource(String deviceSource) { + this.deviceSource = deviceSource; + } + + public void setPointName(String pointName) { + this.pointName = pointName; + } + + public void setWarnStatus(String warnStatus) { + this.warnStatus = warnStatus; + } + + public void setAlgName(String algName) { + this.algName = algName; + } + + public void setResValue(String resValue) { + this.resValue = resValue; + } + + public void setImg(String img) { + this.img = img; + } + + public void setFilterDesc(String filterDesc) { + this.filterDesc = filterDesc; + } + + public void setImgAnalyse(String imgAnalyse) { + this.imgAnalyse = imgAnalyse; + } + + public void setDesc(String desc) { + this.desc = desc; + } + + public void setLineId(String lineId) { + this.lineId = lineId; + } + + public void setPatrolTime(String patrolTime) { + this.patrolTime = patrolTime; + } + + public void setPointStatus(String pointStatus) { + this.pointStatus = pointStatus; + } + + public void setImgType(String imgType) { + this.imgType = imgType; + } + + public void setDataType(String dataType) { + this.dataType = dataType; + } + + public void setFilter(String filter) { + this.filter = filter; + } + + public void setRequestId(String requestId) { + this.requestId = requestId; + } + + public void setResStatus(String resStatus) { + this.resStatus = resStatus; + } + + public void setAreaName(String areaName) { + this.areaName = areaName; + } + + public void setAlgType(String algType) { + this.algType = algType; + } + + public void setObjectId(String objectId) { + this.objectId = objectId; + } + + public void setImageNormalUrlPath(String imageNormalUrlPath) { + this.imageNormalUrlPath = imageNormalUrlPath; + } + + public void setSuggestion(String suggestion) { + this.suggestion = suggestion; + } + + + + protected boolean canEqual(Object other) { + return other instanceof PatrolData; + } + + + @Override + public boolean equals(Object object) { + if (this == object) return true; + if (object == null || getClass() != object.getClass()) return false; + PatrolData that = (PatrolData) object; + return Objects.equals(deviceName, that.deviceName) && Objects.equals(channelName, that.channelName) && Objects.equals(deviceSource, that.deviceSource) && Objects.equals(pointName, that.pointName) && Objects.equals(warnStatus, that.warnStatus) && Objects.equals(algName, that.algName) && Objects.equals(resValue, that.resValue) && Objects.equals(img, that.img) && Objects.equals(filterDesc, that.filterDesc) && Objects.equals(imgAnalyse, that.imgAnalyse) && Objects.equals(desc, that.desc) && Objects.equals(lineId, that.lineId) && Objects.equals(patrolTime, that.patrolTime) && Objects.equals(pointStatus, that.pointStatus) && Objects.equals(imgType, that.imgType) && Objects.equals(dataType, that.dataType) && Objects.equals(filter, that.filter) && Objects.equals(requestId, that.requestId) && Objects.equals(resStatus, that.resStatus) && Objects.equals(areaName, that.areaName) && Objects.equals(algType, that.algType) && Objects.equals(objectId, that.objectId) && Objects.equals(imageNormalUrlPath, that.imageNormalUrlPath) && Objects.equals(suggestion, that.suggestion); + } + + @Override + public int hashCode() { + return Objects.hash(deviceName, channelName, deviceSource, pointName, warnStatus, algName, resValue, img, filterDesc, imgAnalyse, desc, lineId, patrolTime, pointStatus, imgType, dataType, filter, requestId, resStatus, areaName, algType, objectId, imageNormalUrlPath, suggestion); + } + @Override + public String toString() { + return "PatrolDataEx{" + + "deviceName='" + deviceName + '\'' + + ", channelName='" + channelName + '\'' + + ", deviceSource='" + deviceSource + '\'' + + ", pointName='" + pointName + '\'' + + ", warnStatus='" + warnStatus + '\'' + + ", algName='" + algName + '\'' + + ", resValue='" + resValue + '\'' + + ", img='" + img + '\'' + + ", filterDesc='" + filterDesc + '\'' + + ", imgAnalyse='" + imgAnalyse + '\'' + + ", desc='" + desc + '\'' + + ", lineId='" + lineId + '\'' + + ", patrolTime='" + patrolTime + '\'' + + ", pointStatus='" + pointStatus + '\'' + + ", imgType='" + imgType + '\'' + + ", dataType='" + dataType + '\'' + + ", filter='" + filter + '\'' + + ", requestId='" + requestId + '\'' + + ", resStatus='" + resStatus + '\'' + + ", areaName='" + areaName + '\'' + + ", algType='" + algType + '\'' + + ", objectId='" + objectId + '\'' + + ", imageNormalUrlPath='" + imageNormalUrlPath + '\'' + + ", suggestion='" + suggestion + '\'' + + '}'; + } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java index f933781..d11d965 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/mapper/PatrolTaskInfoMapper.java @@ -39,4 +39,7 @@ public interface PatrolTaskInfoMapper { int deletePatrolTaskInfoByLineIds(Long[] lineIds); int deletePatrolTaskInfoByMajorIds(Long[] majorIds); + + List> selectPatrolTaskInfoCount(String taskInfoIds); + } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java index abed6f1..38fbf19 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/IPatrolTaskInfoService.java @@ -32,4 +32,6 @@ public interface IPatrolTaskInfoService { int deletePatrolTaskInfoByLineId(Long lineId); int deletePatrolTaskInfoByMajorIds(Long[] majorIds); + + List> selectPatrolTaskInfoCount(String taskInfoIds); } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java index 73b84d0..da18491 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskinfo/service/impl/PatrolTaskInfoServiceImpl.java @@ -78,4 +78,8 @@ public class PatrolTaskInfoServiceImpl implements IPatrolTaskInfoService { public int deletePatrolTaskInfoByMajorIds(Long[] majorIds) { return this.patrolTaskInfoMapper.deletePatrolTaskInfoByMajorIds(majorIds); } + + public List> selectPatrolTaskInfoCount(String taskInfoIds) { + return this.patrolTaskInfoMapper.selectPatrolTaskInfoCount(taskInfoIds); + } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java index 82bd0db..49f02ac 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java @@ -1,6 +1,8 @@ package com.inspect.taskstatus.controller; import com.alibaba.fastjson.JSONObject; +import com.inspect.analysis.domain.ResultAnalysis; +import com.inspect.analysis.service.IResultAnalysisService; import com.inspect.base.core.constant.Color; import com.inspect.base.core.constant.RedisConst; import com.inspect.base.core.enums.TaskStatus; @@ -14,8 +16,9 @@ import com.inspect.base.core.web.page.TableDataInfo; import com.inspect.common.log.annotation.Log; import com.inspect.common.log.enums.BizType; import com.inspect.base.redis.service.RedisService; -import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.service.IPatrolResultService; +import com.inspect.resultmain.domain.PatrolTaskResultMain; +import com.inspect.resultmain.service.IPatrolTaskResultMainService; import com.inspect.system.base.openDomain.BasedataEqpBookMoMain; import com.inspect.task.controller.PatrolTaskController; import com.inspect.task.domain.PatrolSendTask; @@ -23,6 +26,8 @@ import com.inspect.task.domain.PatrolSendTask; import com.inspect.task.domain.PatrolTask; import com.inspect.task.domain.SendTask; import com.inspect.task.service.IPatrolTaskService; +import com.inspect.taskinfo.mapper.PatrolTaskInfoMapper; +import com.inspect.taskinfo.service.IPatrolTaskInfoService; import com.inspect.taskstatus.client.FeignJobTaskClient; import com.inspect.taskstatus.client.FeignTaskClient; import com.inspect.taskstatus.domain.PatrolTaskStatus; @@ -30,7 +35,6 @@ import com.inspect.taskstatus.domain.TaskCount; import com.inspect.taskstatus.service.IPatrolTaskStatusService; import java.text.ParseException; -import java.text.SimpleDateFormat; import java.time.DayOfWeek; import java.time.Duration; import java.time.LocalDate; @@ -39,13 +43,13 @@ import java.time.LocalTime; import java.time.YearMonth; import java.time.ZoneId; import java.time.format.DateTimeFormatter; -import java.time.temporal.ChronoUnit; import java.util.*; +import java.util.stream.Collectors; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -65,8 +69,23 @@ public class PatrolTaskStatusController extends BaseController { private final FeignJobTaskClient feignJobTaskClient; private final RedisService redisService; private PatrolTaskController patrolTaskController; - - public PatrolTaskStatusController(PatrolTaskController patrolTaskController, IPatrolTaskStatusService patrolTaskStatusService, IPatrolResultService patrolResultService, IPatrolTaskService patrolTaskService, FeignTaskClient feignTaskClient, FeignJobTaskClient feignJobTaskClient, RedisService redisService) { + private IPatrolTaskResultMainService patrolTaskResultMainService; + + @Resource + private IResultAnalysisService resultAnalysisService; + + @Resource + private IPatrolTaskInfoService patrolTaskInfoService; + + public PatrolTaskStatusController( + PatrolTaskController patrolTaskController, + IPatrolTaskStatusService patrolTaskStatusService, + IPatrolResultService patrolResultService, + IPatrolTaskService patrolTaskService, + FeignTaskClient feignTaskClient, + FeignJobTaskClient feignJobTaskClient, + RedisService redisService, + IPatrolTaskResultMainService patrolTaskResultMainService) { this.patrolTaskController = patrolTaskController; this.patrolTaskStatusService = patrolTaskStatusService; this.patrolResultService = patrolResultService; @@ -74,48 +93,100 @@ public class PatrolTaskStatusController extends BaseController { this.feignTaskClient = feignTaskClient; this.feignJobTaskClient = feignJobTaskClient; this.redisService = redisService; + this.patrolTaskResultMainService = patrolTaskResultMainService; } +// @GetMapping({"/list"}) +// public TableDataInfo list(PatrolTaskStatus patrolTaskStatus) { +// this.startPage(); +// List patrolTaskStatusList = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); +// for (PatrolTaskStatus taskStatus : patrolTaskStatusList) { +// if (StringUtils.isNotEmpty(taskStatus.getTaskCode())) { +// List patrolTaskList = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(taskStatus.getTaskCode()).build()); +// if (!patrolTaskList.isEmpty()) { +// PatrolTask task = patrolTaskList.get(0); +// if (StringUtils.isNotEmpty(task.getType())) { +// taskStatus.setPatrolType(task.getType()); +// } +// } +// } +// +// if (StringUtils.isNotEmpty(taskStatus.getTaskPatrolledId())) { +// PatrolResult patrolResult = new PatrolResult(); +// patrolResult.setTaskPatrolledId(taskStatus.getTaskPatrolledId()); +// List patrolResultList = patrolResultService.selectPatrolResultList(patrolResult); +// if (!patrolResultList.isEmpty()) { +// taskStatus.setPointCount(String.valueOf(patrolResultList.size())); +// for (PatrolResult patrolResultTemp : patrolResultList) { +// if (StringUtils.isNotEmpty(patrolResultTemp.getValid())) { +// if (patrolResultTemp.getValid().equals("0")) { +// taskStatus.setPatrolStatus("0"); +// } else { +// taskStatus.setPatrolStatus("1"); +// } +// } else { +// taskStatus.setPatrolStatus("1"); +// } +// } +// } else { +// taskStatus.setPatrolStatus("1"); +// } +// } else { +// taskStatus.setPatrolStatus("1"); +// } +// } +// log.info("[GAB] count: {}", patrolTaskStatusList.size()); +// return getDataTable(patrolTaskStatusList); +// } + @GetMapping({"/list"}) public TableDataInfo list(PatrolTaskStatus patrolTaskStatus) { + log.info("[TASK STATUS] patrolTaskStatus: {}", patrolTaskStatus.toString()); this.startPage(); - List patrolTaskStatusList = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); - for (PatrolTaskStatus taskStatus : patrolTaskStatusList) { - if (StringUtils.isNotEmpty(taskStatus.getTaskCode())) { - List patrolTaskList = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(taskStatus.getTaskCode()).build()); - if (!patrolTaskList.isEmpty()) { - PatrolTask task = patrolTaskList.get(0); - if (StringUtils.isNotEmpty(task.getType())) { - taskStatus.setPatrolType(task.getType()); - } - } - } - - if (StringUtils.isNotEmpty(taskStatus.getTaskPatrolledId())) { - PatrolResult patrolResult = new PatrolResult(); - patrolResult.setTaskPatrolledId(taskStatus.getTaskPatrolledId()); - List patrolResultList = patrolResultService.selectPatrolResultList(patrolResult); - if (!patrolResultList.isEmpty()) { - taskStatus.setPointCount(String.valueOf(patrolResultList.size())); - for (PatrolResult patrolResultTemp : patrolResultList) { - if (StringUtils.isNotEmpty(patrolResultTemp.getValid())) { - if (patrolResultTemp.getValid().equals("0")) { - taskStatus.setPatrolStatus("0"); - } else { - taskStatus.setPatrolStatus("1"); - } - } else { - taskStatus.setPatrolStatus("1"); - } - } + List list = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); + log.info("[TASK STATUS] list cnt: {}", list.size()); + String taskPatrolIds = "'" + list.stream().map((item) -> { + return item.getTaskPatrolledId(); + }).collect(Collectors.joining("','")) + "'"; + log.info("[TASK STATUS] taskPatrolIds: {}", taskPatrolIds); + List resultMains = patrolTaskResultMainService.selectMainFileStatus(taskPatrolIds); + String taskCodeIds = "'" + list.stream().map((item) -> { + return item.getTaskCode(); + }).collect(Collectors.joining("','")) + "'"; + List> pointList = patrolTaskInfoService.selectPatrolTaskInfoCount(taskCodeIds); + Map pointMap = pointList.stream().collect(Collectors.toMap((item) -> { + return (String) item.get("taskMajorId"); + }, (item) -> { + return String.valueOf(item.get("num")); + })); + list.forEach((item) -> { + item.setPatrolStatus("1"); + item.setPointCount(pointMap.get(item.getTaskCode())); + if (!item.getTaskProgress().contains("100")) { + item.setFileStatus("0"); + } else { + List collect = resultMains.stream().filter((res) -> { + return res.getTaskPatrolledId().equals(item.getTaskPatrolledId()); + }).collect(Collectors.toList()); + if (!collect.isEmpty()) { + item.setFileStatus((collect.get(0)).getFileStatus()); } else { - taskStatus.setPatrolStatus("1"); + item.setFileStatus("0"); } - } else { - taskStatus.setPatrolStatus("1"); } - } - return getDataTable(patrolTaskStatusList); + + ResultAnalysis resultAnalysis = new ResultAnalysis(); + log.info(Color.GREEN + "[TASK STATUS] taskPatrolledId: {}" + Color.END, item.getTaskPatrolledId()); + resultAnalysis.setTaskPatrolledId(item.getTaskPatrolledId()); + ResultAnalysis analysisRes = resultAnalysisService.selectTaskAbnormalData(resultAnalysis); + + item.setCsQxNum(analysisRes == null ? 0 : analysisRes.getCsQxNum()); + item.setAiQxNum(analysisRes == null ? 0 : analysisRes.getAiQxNum()); + item.setCsYcNum(analysisRes == null ? 0 : analysisRes.getCsYcNum()); + item.setAiYcNum(analysisRes == null ? 0 : analysisRes.getAiYcNum()); + }); + return this.getDataTable(list); + } @Log(title = "任务状态数据", businessType = BizType.EXPORT) @@ -514,8 +585,15 @@ public class PatrolTaskStatusController extends BaseController { //立即执行任务 @GetMapping({"/controlChange"}) public AjaxResult controlChange(PatrolTask patrolTask) { - PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); - return issueToRobot(patrol);//type=41 立即执行任务 + String taskCode = redisService.getCacheObject(RedisConst.TASK_CURRENT_CODE); + if (!StringUtils.isEmpty(taskCode)) { + log.info("[TASK] CURRENT EXEC TASK: {}", taskCode); + return AjaxResult.error(501, "THERE TASK IS RUNNING!"); + } else { + PatrolTask patrol = patrolTaskService.selectPatrolTaskByTaskId(patrolTask.getTaskId()); + issueToRobot(patrol);//type=41 立即执行任务 + return toAjax(1); + } } public void sendTaskToVideo(final PatrolTask patrolTask) { @@ -558,7 +636,7 @@ public class PatrolTaskStatusController extends BaseController { } - public AjaxResult issueToRobot(PatrolTask patrolTask) { + public void issueToRobot(PatrolTask patrolTask) { String receiveCode = ""; String sendCode = ""; BasedataEqpBookMoMain basedataEqpBookMoMain = new BasedataEqpBookMoMain(); @@ -587,17 +665,24 @@ public class PatrolTaskStatusController extends BaseController { String str = JSONObject.toJSONString(sendTask); this.feignTaskClient.sendCommand(str); } else { - String taskCode = redisService.getCacheObject(RedisConst.TASK_CURRENT_CODE); - if (!StringUtils.isEmpty(taskCode)) { - log.info("[TASK] CURRENT EXEC TASK: {}", taskCode); - return AjaxResult.error(501, "THERE TASK IS RUNNING!"); - } else { - sendTaskToVideo(patrolTask); - } + sendTaskToVideo(patrolTask); } +// +// SendTask sendTaskcontrol = new SendTask(); +// sendTaskcontrol.setReceiveCode(receiveCode); +// sendTaskcontrol.setSendCode(sendCode); +// sendTaskcontrol.setCode(devNo); +// sendTaskcontrol.setType("1"); +// sendTaskcontrol.setCommand("5"); +// List sendTaskArrayList = new ArrayList<>(); +// PatrolSendTask patrolSendTask = new PatrolSendTask(); +// patrolSendTask.setValue("1"); +// sendTaskArrayList.add(patrolSendTask); +// sendTaskcontrol.setItems(sendTaskArrayList); +// String jsonString = JSONObject.toJSONString(sendTaskcontrol); +// this.feignTaskClient.sendCommand(jsonString); } } - return toAjax(1); } @GetMapping({"/taskStatusChange"}) @@ -612,7 +697,7 @@ public class PatrolTaskStatusController extends BaseController { if (patrolTaskStatus == null) return error("no task: " + params.getLineId() + " exist"); String command = params.getCommand(); - log.info(Color.CYAN + "###### TASK STATUS CHANGE ######" + Color.END); + log.info("================================================================TASK STATUS CHANGE============================================================="); log.info("[TASK] cmd: {}, task: {}", command, patrolTaskStatus); if (TaskStatus.DONE.getCode().equals(command)) { patrolTaskStatus.setTaskState(TaskStatus.RUNNING.getCode()); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java index 4a07f75..5040517 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/domain/PatrolTaskStatus.java @@ -92,6 +92,24 @@ public class PatrolTaskStatus extends BaseEntity { private String pointCount; private String execType; + private String fileStatus; + private String filter; + private String pointName; + private String deviceName; + private String abnormal; + private String channelName; + private String deviceSource; + private String filterDesc; + private String desc; + private int csQxNum; + private int csYcNum; + private int aiQxNum; + private int aiYcNum; + private String resultType; + private String pointStatus; + private String algName; + + public PatrolTaskStatus(String taskPatrolledId) { this.taskPatrolledId = taskPatrolledId; } @@ -127,6 +145,22 @@ public class PatrolTaskStatus extends BaseEntity { ", command='" + command + '\'' + ", pointCount='" + pointCount + '\'' + ", execType='" + execType + '\'' + + ", fileStatus='" + fileStatus + '\'' + + ", filter='" + filter + '\'' + + ", pointName='" + pointName + '\'' + + ", deviceName='" + deviceName + '\'' + + ", abnormal='" + abnormal + '\'' + + ", channelName='" + channelName + '\'' + + ", deviceSource='" + deviceSource + '\'' + + ", filterDesc='" + filterDesc + '\'' + + ", desc='" + desc + '\'' + + ", csQxNum=" + csQxNum + + ", csYcNum=" + csYcNum + + ", aiQxNum=" + aiQxNum + + ", aiYcNum=" + aiYcNum + + ", resultType='" + resultType + '\'' + + ", pointStatus='" + pointStatus + '\'' + + ", algName='" + algName + '\'' + '}'; } } diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml index 62c2196..98055f4 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolResultMapper.xml @@ -134,6 +134,18 @@ and main_id = #{mainId} + + + + + + + + + + + + @@ -145,7 +157,20 @@ + + + + + + + + + + + + + + + + + + insert into patrol_task_info diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml index 35826e1..696cc45 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/PatrolTaskResultMainMapper.xml @@ -162,6 +162,18 @@ where line_id = #{lineId} + + + insert into patrol_task_result_main diff --git a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml index 6f225d8..ff7e7e9 100644 --- a/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml +++ b/inspect-main/inspect-main-task/src/main/resources/mapper/task/ResultAnalysisMapper.xml @@ -4,6 +4,21 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + + + + + + + + + + + + + @@ -17,8 +32,27 @@ + + + + + + + + + + + + + + + + + + + @@ -437,4 +471,114 @@ insert into patrol_analyse_log (content,type,create_time,task_patrol_id,filter,request_id) values(#{content},#{type},now(),#{taskPatrolId},#{filter},#{requestId}) + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java index dd0953e..1a3d3b2 100644 --- a/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java +++ b/inspect-metadata/src/main/java/com/inspect/metadata/eqpbook/controller/BasedataEqpBookController.java @@ -835,7 +835,7 @@ public class BasedataEqpBookController extends BaseController { if (pointlist != null && !pointlist.isEmpty()) { Map crr = pointlist.get(0); if (crr != null) { - String patrolPointName = (String) crr.get("patrolpoint_name"); + String patrolPointName = (String) crr.get("patrol_point_name"); brr.setPatrolpointName(patrolPointName); } } diff --git a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml index 9ea7c91..f82297b 100644 --- a/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/eqpbook/BasedataEqpBookMapper.xml @@ -446,8 +446,8 @@ ON a.task_code = c.task_code LEFT JOIN patrol_task_info z ON a.device_id = z.device_id AND c.task_id = z.task_major_id - LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrolpoint_id - LEFT JOIN patrol_preset_pos k ON d.patrolpoint_id = k.patrolpoint_id + LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrol_point_id + LEFT JOIN patrol_preset_pos k ON d.patrol_point_id = k.patrol_point_id LEFT JOIN basedata_device e ON d.device_id = e.device_id AND e.power_main_equ_flag = "No" LEFT JOIN basedata_device f ON d.device_id = f.device_id @@ -468,8 +468,8 @@ ON a.task_code = c.task_code LEFT JOIN patrol_task_info z ON a.device_id = z.device_id AND c.task_id = z.task_major_id - LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrolpoint_id - LEFT JOIN patrol_preset_pos k ON d.patrolpoint_id = k.patrolpoint_id + LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrol_point_id + LEFT JOIN patrol_preset_pos k ON d.patrol_point_id = k.patrol_point_id LEFT JOIN basedata_device e ON d.device_id = e.device_id AND e.power_main_equ_flag = "No" LEFT JOIN basedata_device f ON d.device_id = f.device_id @@ -490,8 +490,8 @@ ON a.task_code = c.task_code LEFT JOIN patrol_task_info z ON a.device_id = z.device_id AND c.task_id = z.task_major_id - LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrolpoint_id - LEFT JOIN patrol_preset_pos k ON d.patrolpoint_id = k.patrolpoint_id + LEFT JOIN basedata_patrolpoint d ON a.device_id = d.patrol_point_id + LEFT JOIN patrol_preset_pos k ON d.patrol_point_id = k.patrol_point_id LEFT JOIN basedata_device e ON d.device_id = e.device_id AND e.power_main_equ_flag = "No" LEFT JOIN basedata_device f ON d.device_id = f.device_id @@ -543,7 +543,7 @@ - + - + @@ -726,7 +726,7 @@ select * from basedata_patrolpoint - where patrolpoint_id = #{deviceId} + where patrol_point_id = #{deviceId}