qinyanlei
/
inspect
1
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

master
WangGuangYuan 8 months ago
parent
e5d8c63dcb 3a2b1d1582
commit
248b87c781
10 changed files with 75 additions and 404 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -1
      inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java
  2. +1
    -1
      inspect-main/inspect-main-start/src/main/resources/logback.xml
  3. +0
    -1
      inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java
  4. +3
    -300
      inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java
  5. +21
    -36
      inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java
  6. +24
    -51
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
  7. +6
    -7
      inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java
  8. +18
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java
  9. +2
    -2
      inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java
  10. +0
    -3
      inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java

+ 0
- 1
inspect-common/inspect-common-security/src/main/java/com/inspect/common/security/service/TokenService.java View File

@ -70,7 +70,6 @@ public class TokenService {
LoginUser user = null;
if (StringUtils.isNotEmpty(token)) {
String userKey = JwtUtils.getUserKey(token);
log.info("[GAB] LOGIN UUID: {}", userKey);
user = redisService.getCacheObject(getTokenKey(userKey));
}
return user;


+ 1
- 1
inspect-main/inspect-main-start/src/main/resources/logback.xml View File

@ -62,7 +62,7 @@
</appender>
<!-- 系统模块日志级别控制 -->
<logger name="com.inspect" level="DEBUG" />
<logger name="com.inspect" level="info" />
<!-- Spring日志级别控制 -->
<logger name="org.springframework" level="warn" />


+ 0
- 1
inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java View File

@ -116,7 +116,6 @@ public class PatrolTaskExecController extends BaseController {
Arrays.stream(devTypes)
.forEach(LambdaUtils.consumerWithIndex((item, index) -> {
if ("2".equals(item)) {
log.debug(Color.MAGENTA + "[GABRIEL] index: {}, devNo: {}", index, devNos[index]);
resultList.add(PatrolTask.builder()
.taskId(task.getTaskId())
.stationName(task.getStationName())


+ 3
- 300
inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java View File

@ -96,7 +96,7 @@ public class AnalysisController extends BaseController {
logger.info("[ANALYSIS] doAnalysis task start");
try {
Thread.sleep(2000L);
doAlgorithmAnalysis(analyseResult);
doAlgorithmAnalysisOld(analyseResult);
} catch (InterruptedException e) {
logger.error("[ANALYSIS] doAnalysis task EXCEPTION: {}", e.getMessage());
}
@ -110,7 +110,7 @@ public class AnalysisController extends BaseController {
}
public void doAlgorithmAnalysis(AnalyseResult analyseResult) {
public void doAlgorithmAnalysisOld(AnalyseResult analyseResult) {
logger.info("[ANALYSIS]: DO ANALYSIS BODY: {}", analyseResult);
int size = 0;
String taskId = "";
@ -137,7 +137,7 @@ public class AnalysisController extends BaseController {
}
List<AnalyseResItem> resContentList = analyseResult.getResultList();
logger.info(Color.GREEN + "<=============分析算法模块返回的表计识别结果==================>" + Color.END);
logger.info(Color.GREEN + "<=============分析算法模块返回的表计识别结果old==================>" + Color.END);
logger.info(Color.GREEN + "[ANALYSIS] meter algorithm resContentList: {}" + Color.END, resContentList);
if (!resContentList.isEmpty()) {
List<WebsocketData> websocketDataArrayList = new ArrayList<>();
@ -295,303 +295,7 @@ public class AnalysisController extends BaseController {
boolean bRes = redisService.deleteObject(requestId);
logger.info("[ANALYSIS] CLEAR requestId FROM REDIS: {}", bRes);
}
// if (!websocketDataArrayList.isEmpty()) {
// try {
// sendToWebSocketService(websocketDataArrayList);
// } catch (Exception e) {
// logger.error("[ANALYSIS] SEND TO WEBSOCKET EXCEPTION: {}", e.getMessage());
// }
// }
}
}
// @PostMapping
// public AjaxResult add(@RequestBody final String alarmDefect) {
// System.out.println(alarmDefect);
// logger.info("alarmDefect: {}", alarmDefect);
// try {
// JSONObject parseObject = JSONObject.parseObject(alarmDefect);
// String requestId = parseObject.get("requestId").toString();
// logger.info("[ANALYSIS] requestId: {}", requestId);
// Object jsonArray = parseObject.get("resultList");
// logger.info("[ANALYSIS] jsonArray: {}", jsonArray.toString());
// JSONArray.parseArray(jsonArray + "", resultList.class);
// } catch (Exception e) {
// e.printStackTrace();
// return AjaxResult.error(400, "格式错误");
// }
//
// (new Thread(() -> {
// logger.info("[ANALYSIS] doAnalysis task start");
// try {
// Thread.sleep(2000L);
// doAlgorithmAnalysis(alarmDefect);
// } catch (InterruptedException e) {
// logger.error("[ANALYSIS] doAnalysis task EXCEPTION: {}", e.getMessage());
// }
//
// logger.info("[ANALYSIS] doAnalysis task finish");
// })).start();
// return AjaxResult.success();
// }
// public void doAlgorithmAnalysis(String messageBody) {
// logger.info("[ANALYSIS]: DO ANALYSIS BODY: {}", messageBody);
// int size = 0;
// String taskId = "";
// JSONObject parseObject = JSONObject.parseObject(messageBody);
// String requestId = parseObject.get("requestId").toString();
// String taskPatrolId = redisService.getCacheObject(requestId);
// logger.info("[ANALYSIS] requestId: {}, taskPatrolId: {}", requestId, taskPatrolId);
// Map<String, Long> deviceIdLineIdMap = new HashMap<>();
// PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain();
// taskResultMain.setTaskPatrolledId(taskPatrolId);
// List<PatrolTaskResultMain> patrolTaskResultMainList = patrolTaskResultMainService.selectPatrolTaskResultMainList(taskResultMain);
// if (!patrolTaskResultMainList.isEmpty()) {
// PatrolTaskResultMain patrolTaskResultMain = patrolTaskResultMainList.get(0);
// taskId = patrolTaskResultMain.getTaskId();
// PatrolResult patrolResult = new PatrolResult();
// patrolResult.setMainId(String.valueOf(patrolTaskResultMain.getLineId()));
// logger.info("[ANALYSIS] taskId: {}, lineId: {}", taskId, patrolTaskResultMain.getLineId());
// List<PatrolResult> patrolResultList = patrolResultService.selectPatrolResultList(patrolResult);
// size = patrolResultList.size();
// logger.info("[ANALYSIS] mainId {}, patrolResultList size: {}", patrolResult.getMainId(), size);
// for (PatrolResult result : patrolResultList) {
// //logger.info("[ANALYSIS] arr.getDeviceId(): {}, arr.getLineId(): {}", arr.getDeviceId(), arr.getLineId());
// deviceIdLineIdMap.put(result.getDeviceId(), result.getLineId());
// }
// }
//
// Object jsonArray = parseObject.get("resultList");
// List<resultList> resContentList = JSONArray.parseArray(jsonArray.toString(), resultList.class);
// logger.info(Color.GREEN + "<=============分析算法模块返回的表计识别结果==================>" + Color.END);
// logger.info(Color.GREEN + "[ANALYSIS] meter algorithm resContentList: {}" + Color.END, resContentList);
// if (!resContentList.isEmpty()) {
// List<WebsocketData> websocketDataArrayList = new ArrayList<>();
// for (resultList algorithmResult : resContentList) {
// Long lineId = deviceIdLineIdMap.get(algorithmResult.getObjectId());
// logger.info("[ANALYSIS] resultList lineId: {}, objectId: {}", lineId, algorithmResult.getObjectId());
// ResultAnalysis resultAnalysis = new ResultAnalysis();
// resultAnalysis.setBusinessId(String.valueOf(lineId));
// resultAnalysis.setResultContent(messageBody);
// resultAnalysis.setResultType("1");
// resultAnalysis.setObjectId(algorithmResult.getObjectId());
// List<results> resultsList = algorithmResult.getResults();
// String value = "";
// List<String> typeList = new ArrayList<>();
// String description;
// String objectId;
// for (Iterator<results> iterator = resultsList.iterator(); iterator.hasNext(); resultAnalysis.setDescription(description)) {
// results algorithmInnerResult = iterator.next();
// value = algorithmInnerResult.getValue();
// String code = algorithmInnerResult.getCode();
// description = algorithmInnerResult.getDesc();
// objectId = algorithmInnerResult.getType();
// if (StringUtils.isNotEmpty(objectId)) {
// typeList.add(objectId);
// }
//
// logger.info("[ANALYSIS] RESULT CODE: {}, DESC: {}", code, description);
// if ("meter normal".equals(description)) {
// description = "识别完成";
// }
//
// resultAnalysis.setCreateTime(new Date());
// switch (value) {
// case "0":
// resultAnalysis.setPointStatus("1");
// resultAnalysis.setResultType("1");
// resultAnalysis.setResStatus("1");
// break;
// case "1":
// resultAnalysis.setPointStatus("0");
// resultAnalysis.setResultType("0");
// resultAnalysis.setResStatus("0");
// break;
// case "-1":
// resultAnalysis.setPointStatus("0");
// resultAnalysis.setResultType("2");
// resultAnalysis.setResStatus("0");
// break;
// default:
// resultAnalysis.setPointStatus("1");
// resultAnalysis.setResultType("1");
// resultAnalysis.setResStatus("1");
// break;
// }
//
// if (!code.equals("2000")) {
// resultAnalysis.setResultType("3");
// description = "GET PICTURE FAIL";
// }
// }
//
// logger.info("[ANALYSIS] BEFORE resultAnalysis: {}", resultAnalysis);
// try {
// setAllStatus(resultAnalysis);
// } catch (Exception e) {
// e.printStackTrace();
// }
//
// logger.info("[ANALYSIS] AFTER resultAnalysis: {}", resultAnalysis);
// if (StringUtils.isNotEmpty(resultAnalysis.getBusinessId())) {
// ResultAnalysis analysis = new ResultAnalysis();
// analysis.setBusinessId(resultAnalysis.getBusinessId());
// List<ResultAnalysis> resultAnalyses = resultAnalysisService.selectResultAnalysisList(analysis);
// if (resultAnalyses.isEmpty()) {
// int analysisRes = resultAnalysisService.insertResultAnalysis(resultAnalysis);
// logger.info(Color.GREEN + "[ANALYSIS] INSERT analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
// }
// }
//
// PatrolResult patrolResult = patrolResultService.selectPatrolResultByLineId(lineId);
// if (StringUtils.isNotEmpty(value) && patrolResult != null) {
// patrolResult.setValue(value);
// }
//
// String isAlgType = "";
// if (!typeList.isEmpty()) {
// List<String> typeListAgain = new ArrayList<>();
// Iterator<String> iterator = typeList.iterator();
// while (true) {
// if (!iterator.hasNext()) {
// if (!typeListAgain.isEmpty()) {
// patrolResult.setRecognitionType(String.join(StringUtils.COMMA, typeListAgain));
// }
// break;
// }
//
// objectId = iterator.next();
// String[] types = objectId.split(StringUtils.COMMA);
// for (String type : types) {
// Map<String, String> algType = patrolResultService.selectAlgTypeByCode(type);
// if (StringUtils.isEmpty(isAlgType) && algType != null && algType.get("alg_name") != null && algType.get("alg_name").equals("缺陷识别")) {
// isAlgType = "1";
// }
//
// System.out.println(type);
// Map<String, String> algmap = patrolResultService.selectAlgTypeDataType(type);
// if (algmap != null && StringUtils.isNotEmpty(algmap.get("remark"))) {
// typeListAgain.add(algmap.get("remark"));
// }
// }
// }
// }
//
// if (StringUtils.isNotEmpty(isAlgType) && isAlgType.equals("1")) {
// if (resultAnalysis.getResultType().equals("1")) {
// patrolResult.setValueUnit("无缺陷");
// } else {
// patrolResult.setValueUnit("有缺陷");
// }
// }
//
// Map<String, String> valueMap = patrolResultService.getPatrolResultValue(patrolResult);
// if (null != valueMap && !valueMap.isEmpty()) {
// if (valueMap.containsKey("value") && null != valueMap.get("value")) {
// description = valueMap.get("value");
// patrolResult.setValue(description);
// }
//
// if (valueMap.containsKey("value_unit") && null != valueMap.get("value_unit")) {
// description = valueMap.get("value_unit");
// patrolResult.setValueUnit(description);
// }
// }
//
// patrolResultService.updatePatrolResult(patrolResult);
// WebsocketData webData = new WebsocketData();
// webData.setTime(DateUtils.format(DateUtils.yyyyMMddHHmmss2, new Date()));
// objectId = algorithmResult.getObjectId();
// webData.setDevId(objectId);
// webData.setDesc(resultAnalysis.getDescription());
// websocketDataArrayList.add(webData);
// }
//
// PatrolTaskInfo patrolTaskInfo = new PatrolTaskInfo();
// patrolTaskInfo.setTaskMajorId(taskId);
// List<PatrolTaskInfo> arr = patrolTaskInfoService.selectPatrolTaskInfoList(patrolTaskInfo);
// Set<String> point = new HashSet<>();
// for (PatrolTaskInfo ass : arr) {
// if (StringUtils.isNotEmpty(ass.getDeviceId())) {
// point.add(ass.getDeviceId());
// }
// }
//
// if (point.size() == size) {
// boolean bRes = redisService.deleteObject(requestId);
// logger.info("[ANALYSIS] CLEAR requestId FROM REDIS: {}", bRes);
// }
//
//// if (!websocketDataArrayList.isEmpty()) {
//// try {
//// sendToWebSocketService(websocketDataArrayList);
//// } catch (Exception e) {
//// logger.error("[ANALYSIS] SEND TO WEBSOCKET EXCEPTION: {}", e.getMessage());
//// }
//// }
// }
// }
public void sendToWebSocketService(List<WebsocketData> list) {
Map<String, Object> webSocketMap = new HashMap<>();
webSocketMap.put("event", "mont/warn");
webSocketMap.put("data", list);
JSONObject jsonObject = new JSONObject(webSocketMap);
WebsocketService.parseMessage(jsonObject.toString());
}
public void sendHww(List<PatrolResult> results) {
List<resultList> resslist = new ArrayList<>();
for (PatrolResult result : results) {
ResultAnalysis resultAnalysis = new ResultAnalysis();
resultAnalysis.setBusinessId(String.valueOf(result.getLineId()));
List<ResultAnalysis> list = this.resultAnalysisService.selectResultAnalysisList(resultAnalysis);
String str;
if (!list.isEmpty()) {
str = list.get(0).getResultContent();
JSONObject parseObject = JSONObject.parseObject(str);
Object jsonArray = parseObject.get("resultList");
List<resultList> resContentList = JSONArray.parseArray(jsonArray.toString(), resultList.class);
for (resultList crr : resContentList) {
crr.setTaskId(results.get(0).getTaskCode());
resslist.add(crr);
}
}
str = JSONObject.toJSONString(resslist);
System.out.println(str);
try {
this.feignTaskClient.notify(str);
} catch (Exception e) {
e.printStackTrace();
}
}
}
public static void main(String[] args) {
String str = "{\"requestId\": \"f5d92e3de7aa41739baf101f2ec54902\", \"resultList\": [{\"objectId\": \"2024027\", \"results\": [{\"type\": [\"bj_bpmh\", \"bj_bpps\", \"meter\"], \"Value\": 0, \"code\": 2000, \"resImageUrl\": \"1/2024/01/17/1205/CCD/1205_20240117162054_2024027_02160558348953680123.jpg\", \"conf\": 0, \"desc\": \"\\u6b63\\u5e38\", \"pos\": []}]}]}";
JSONObject parseObject = JSONObject.parseObject(str);
Object jsonArray = parseObject.get("resultList");
List<resultList> resContentList = JSONArray.parseArray(jsonArray + "", resultList.class);
List<results> results = resContentList.get(0).getResults();
for (com.inspect.analysis.domain.results arr : results) {
String type = arr.getType();
String value = arr.getValue();
String[] types = type.split(StringUtils.COMMA);
String[] values = value.split(StringUtils.COMMA);
for (int i = 0; i < types.length; ++i) {
String var10000 = types[i];
var10000 = values[i];
}
}
}
public void setAllStatus(ResultAnalysis resultAnalysis) {
@ -814,7 +518,6 @@ public class AnalysisController extends BaseController {
resultAnalysis.setResultType("2");
}
}
}
public void SendToSJ(PatrolResult patrolResult, ResultAnalysis resultAnalysis) {


+ 21
- 36
inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalysisServiceImpl.java View File

@ -64,31 +64,30 @@ public class AnalysisServiceImpl implements IAnalysisService {
@Override
public void picAnalyseRetNotify(AnalyseResult analyseResult) {
log.info(Color.CYAN + "###### 分析算法模块返回的表计识别结果 start ######" + Color.END);
String requestId = analyseResult.getRequestId();
if (!redisService.hasKey(AnalyseConstants.ANALYSE_REQUEST_ID.concat(requestId))) {
log.error("[ANALYSE REMOTE RES] NO REQUEST_ID={} in REDIS!", requestId);
log.error("picAnalyseRetNotify NO REQUEST_ID={} in REDIS!", requestId);
} else {
String patrolTaskIdObj = redisService.getCacheObject(AnalyseConstants.ANALYSE_REQUEST_ID.concat(requestId));
analyseResult.setTaskPatrolId(patrolTaskIdObj);
String key = AnalyseConstants.ANALYSE_FILTER_REQUEST + requestId;
if (redisService.hasKey(key)) {
log.info("[ANALYSE REMOTE RES] PRELIMINARY CALLBACK REQUEST_ID={}", requestId);
analyseResult.setFilter("1");
AnalyseRequest analyseRequest = (AnalyseRequest) redisService.redisTemplate.opsForValue().getAndDelete(key);
AnalyseResPoint analyseResPoint = analyseResult.getResultList().get(0).getResults().get(0);
boolean bSuccess = analyseResPoint.checkSuccess();
log.info(Color.MAGENTA + "[ANALYSE REMOTE RES] bSuccess={}, type={}" + Color.END, bSuccess, analyseResPoint.getType());
log.info("picAnalyseRetNotify bSuccess={}, type={}", bSuccess, analyseResPoint.getType());
analyseResult.reloadReq(analyseRequest);
if (!bSuccess && !"meter".equals(analyseResPoint.getType())) {
log.info(Color.GREEN + "[ANALYSE REMOTE RES] NO BIG_MODEL WOULD CALLED REQUEST_ID={}" + Color.END, requestId);
log.info("picAnalyseRetNotify NO BIG_MODEL WOULD CALLED REQUEST_ID={}", requestId);
} else {
analyseResult.setResult("0");
log.info(Color.RED + "[ANALYSE REMOTE RES] CALL BIG_MODEL REQUEST_ID={}" + Color.END, requestId);
log.info("picAnalyseRetNotify CALL BIG_MODEL REQUEST_ID={}", requestId);
ispAlgorithmRequestService.sendRequest(analyseRequest);
}
} else {
log.info("[ANALYSE REMOTE RES] BIG_MODEL CALLBACK REQUEST_ID={}", requestId);
log.info("picAnalyseRetNotify BIG_MODEL CALLBACK REQUEST_ID={}", requestId);
}
//qinyl
@ -96,17 +95,17 @@ public class AnalysisServiceImpl implements IAnalysisService {
//analysis(analyseResult);
doAlgorithmAnalysis(analyseResult);
//calculateProcess(analyseResult);
log.info(Color.CYAN + "###### 分析算法模块返回的表计识别结果 end ######" + Color.END);
}
}
public void doAlgorithmAnalysis(AnalyseResult analyseResult) {
log.info("[ANALYSIS]: DO ANALYSIS BODY: {}", analyseResult);
log.info("doAlgorithmAnalysis analyseResult: {}", analyseResult);
int size = 0;
String taskId = "";
String requestId = analyseResult.getRequestId();
String taskPatrolId = redisService.getCacheObject(RedisConst.REQUEST_UUID + requestId);
log.info("[ANALYSIS] requestId: {}, taskPatrolId: {}", requestId, taskPatrolId);
log.info("doAlgorithmAnalysis requestId: {}, taskPatrolId: {}", requestId, taskPatrolId);
Map<String, Long> deviceIdLineIdMap = new HashMap<>();
PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain();
taskResultMain.setTaskPatrolledId(taskPatrolId);
@ -116,24 +115,22 @@ public class AnalysisServiceImpl implements IAnalysisService {
taskId = patrolTaskResultMain.getTaskId();
PatrolResult patrolResult = new PatrolResult();
patrolResult.setMainId(String.valueOf(patrolTaskResultMain.getLineId()));
log.info("[ANALYSIS] taskId: {}, lineId: {}", taskId, patrolTaskResultMain.getLineId());
log.info("doAlgorithmAnalysis taskId: {}, lineId: {}", taskId, patrolTaskResultMain.getLineId());
List<PatrolResult> patrolResultList = patrolResultService.selectPatrolResultList(patrolResult);
size = patrolResultList.size();
log.info("[ANALYSIS] mainId {}, patrolResultList size: {}", patrolResult.getMainId(), size);
log.info("doAlgorithmAnalysis mainId {}, patrolResultList size: {}", patrolResult.getMainId(), size);
for (PatrolResult result : patrolResultList) {
//logger.info("[ANALYSIS] arr.getDeviceId(): {}, arr.getLineId(): {}", arr.getDeviceId(), arr.getLineId());
deviceIdLineIdMap.put(result.getDeviceId(), result.getLineId());
}
}
List<AnalyseResItem> resContentList = analyseResult.getResultList();
log.info(Color.GREEN + "<=============分析算法模块返回的表计识别结果==================>" + Color.END);
log.info(Color.GREEN + "[ANALYSIS] meter algorithm resContentList: {}" + Color.END, resContentList);
log.info(Color.GREEN + "doAlgorithmAnalysis meter algorithm resContentList: {}" + Color.END, resContentList);
if (!resContentList.isEmpty()) {
List<WebsocketData> websocketDataArrayList = new ArrayList<>();
for (AnalyseResItem algorithmResult : resContentList) {
Long lineId = deviceIdLineIdMap.get(algorithmResult.getObjectId());
log.info("[ANALYSIS] resultList lineId: {}, objectId: {}", lineId, algorithmResult.getObjectId());
log.info("doAlgorithmAnalysis resultList lineId: {}, objectId: {}", lineId, algorithmResult.getObjectId());
ResultAnalysis resultAnalysis = new ResultAnalysis();
resultAnalysis.setBusinessId(String.valueOf(lineId));
resultAnalysis.setResultContent(new Gson().toJson(analyseResult));
@ -154,7 +151,7 @@ public class AnalysisServiceImpl implements IAnalysisService {
typeList.add(objectId);
}
log.info("[ANALYSIS] RESULT CODE: {}, DESC: {}", code, description);
log.info("doAlgorithmAnalysis RESULT CODE: {}, DESC: {}", code, description);
if ("meter normal".equals(description)) {
description = "识别完成";
}
@ -189,21 +186,21 @@ public class AnalysisServiceImpl implements IAnalysisService {
}
}
log.info("[ANALYSIS] BEFORE resultAnalysis: {}", resultAnalysis);
log.info("doAlgorithmAnalysis BEFORE resultAnalysis: {}", resultAnalysis);
try {
setAllStatus(resultAnalysis);
} catch (Exception e) {
e.printStackTrace();
log.error("error", e);
}
log.info("[ANALYSIS] AFTER resultAnalysis: {}", resultAnalysis);
log.info("doAlgorithmAnalysis AFTER resultAnalysis: {}", resultAnalysis);
if (StringUtils.isNotEmpty(resultAnalysis.getBusinessId())) {
ResultAnalysis analysis = new ResultAnalysis();
analysis.setBusinessId(resultAnalysis.getBusinessId());
List<ResultAnalysis> resultAnalyses = resultAnalysisService.selectResultAnalysisList(analysis);
if (resultAnalyses.isEmpty()) {
int analysisRes = resultAnalysisService.insertResultAnalysis(resultAnalysis);
log.info(Color.GREEN + "[ANALYSIS] INSERT analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
log.info(Color.GREEN + "doAlgorithmAnalysis INSERT analysisRes: {}, lineId: {}" + Color.END, analysisRes, resultAnalysis.getLineId());
}
}
@ -283,16 +280,8 @@ public class AnalysisServiceImpl implements IAnalysisService {
if (point.size() == size) {
boolean bRes = redisService.deleteObject(requestId);
log.info("[ANALYSIS] CLEAR requestId FROM REDIS: {}", bRes);
log.info("doAlgorithmAnalysis CLEAR requestId FROM REDIS: {}", bRes);
}
// if (!websocketDataArrayList.isEmpty()) {
// try {
// sendToWebSocketService(websocketDataArrayList);
// } catch (Exception e) {
// logger.error("[ANALYSIS] SEND TO WEBSOCKET EXCEPTION: {}", e.getMessage());
// }
// }
}
}
@ -309,7 +298,6 @@ public class AnalysisServiceImpl implements IAnalysisService {
if (!results.isEmpty()) {
for (com.inspect.analysis.domain.results arr : results) {
arr.setType("meter");
log.info("[ANALYSIS] ??????????????????????????arr: {}", arr);
String arrType = arr.getType();
String arrValue = arr.getValue();
String[] types = arrType.split(StringUtils.COMMA);
@ -350,7 +338,6 @@ public class AnalysisServiceImpl implements IAnalysisService {
JSONObject jSONObjectinfrared;
double valuedoule;
if (type.equals("meter")) {
this.log.info("===============(type.equals(\"meter\")=======1===========");
map = this.resultAnalysisService.selectPointInfoById(devId);
alarm_threshold = (String) map.get("alarm_threshold");
lower_value = 0.0D;
@ -376,7 +363,6 @@ public class AnalysisServiceImpl implements IAnalysisService {
}
}
log.info("===============(type.equals(\"meter\")=======2=========== : {}", value);
if (upper_value != 0.0D) {
valuedoule = 0.0D;
if (StringUtils.isNotEmpty(value)) {
@ -516,7 +502,6 @@ public class AnalysisServiceImpl implements IAnalysisService {
resultAnalysis.setResultType("2");
}
}
}
private void calculateProcess(AnalyseResult analyseResult) {
@ -553,11 +538,11 @@ public class AnalysisServiceImpl implements IAnalysisService {
taskStatus.setEndTime(DateUtil.formatDateTime(new Date()));
patrolTaskStatusService.updatePatrolTaskStatus(taskStatus);
//patrolResultController.senWebsocket(taskStatus);
log.info("[ANALYSE REMOTE RES] TASK FINISH taskPatrolId: {}", taskPatrolId);
log.info("picAnalyseRetNotify TASK FINISH taskPatrolId: {}", taskPatrolId);
}
}
} catch (Exception e) {
log.error("[ANALYSE REMOTE RES] CAL PROGRESS EXCEPTION: {}", e.getMessage());
log.error("error", e);
}
}


+ 24
- 51
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java View File

@ -691,11 +691,8 @@ public class PatrolResultController extends BaseController {
String MAJOR_URL = patrolTaskService.selectConfigByKey("MAJOR_URL");
String TASK_PORT = patrolTaskService.selectConfigByKey("TASK_PORT");
logger.info("callRemoteAlgorithm ftpInfo: " + ftp);
logger.info("callRemoteAlgorithm ANALYSIS_URL: " + ANALYSIS_URL);
logger.info("callRemoteAlgorithm BIG_ANALYSIS_URL: " + BIG_ANALYSIS_URL);
logger.info("callRemoteAlgorithm MAJOR_URL: " + MAJOR_URL);
logger.info("callRemoteAlgorithm TASK_PORT: " + TASK_PORT);
logger.info("callRemoteAlgorithm ftpInfo: {}, ANALYSIS_URL: {}, BIG_ANALYSIS_URL: {}, MAJOR_URL: {}, TASK_PORT: {}",
ftp, ANALYSIS_URL, BIG_ANALYSIS_URL, MAJOR_URL, TASK_PORT);
logger.info("callRemoteAlgorithm patrolResultList: " + patrolResultList);
String ids = "";
@ -1046,15 +1043,7 @@ public class PatrolResultController extends BaseController {
List<String> patrolDeviceCodeList = new ArrayList<>();
List listEqpBook;
if (type.equals(StaEnum.RunState.getCode())) {
//qinyl remove
// logger.info("<==================================RECEIVE DATA TO UPPER SYSTEM=============================>");
// logger.info("UPPER BODY: {} \n", messageBody);
// try {
// sendService.sendMsg(messageBody);
// } catch (Exception e) {
// logger.info("SEND TO UPPER BODY EXCEPTION: {} \n", e.getMessage());
// }
logger.info("<==================================RECEIVE DATA TO ANALYSIS [41]=============================>");
logger.info(Color.CYAN + "###### RECEIVE DATA TO ANALYSIS [41] start ######" + Color.END);
try {
JSONObject parseObject = JSONObject.parseObject(messageBody);
Object sendCode = parseObject.get("SendCode");
@ -1065,7 +1054,6 @@ public class PatrolResultController extends BaseController {
}
final String jsonArrayStr = String.valueOf(jsonArray);
logger.info(Color.CYAN + "[RES] 41 messageBody: {}, jsonArrayStr: {}" + Color.END, messageBody, jsonArrayStr);
List<PatrolTaskStatus> patrolTaskStatusListItems = JSONArray.parseArray(jsonArrayStr, PatrolTaskStatus.class);
if (!patrolTaskStatusListItems.isEmpty()) {
for (PatrolTaskStatus item : patrolTaskStatusListItems) {
@ -1073,15 +1061,14 @@ public class PatrolResultController extends BaseController {
patrolTask.setTaskCode(item.getTaskCode());
List<PatrolTask> list = patrolTaskService.selectPatrolTaskList(patrolTask);
if (CollectionUtils.isEmpty(list)) {
logger.info("[RES] TASK CODE: {} NO EXIST, SKIP IT!", item.getTaskCode());
logger.info("TASK CODE: {} NO EXIST, SKIP IT!", item.getTaskCode());
} else {
try {
sendWebsocket(item);
} catch (Exception e) {
e.printStackTrace();
logger.error("error", e);
}
logger.info("[RES] arr.getTaskPatrolledId: {}", item.getTaskPatrolledId());
if (StringUtils.isNotEmpty(item.getTaskPatrolledId())) {
String str = "";
PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus();
@ -1097,9 +1084,7 @@ public class PatrolResultController extends BaseController {
item.setCode(((BasedataEqpBookChannel) listEqpBook.get(0)).getChannelCode());
}
}
logger.info("[RES] arr.getTaskPatrolledId 2!!!!!");
listEqpBook = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
logger.info("[RES] arr.getTaskPatrolledId 3, size: {}", listEqpBook.size());
if (item.getTaskState() != null &&
(item.getTaskState().equals(TaskStatus.DONE.getCode())
|| item.getTaskState().equals(TaskStatus.HALTED.getCode())
@ -1108,9 +1093,7 @@ public class PatrolResultController extends BaseController {
item.setEndTime(DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss2, new Date()));
}
if (!listEqpBook.isEmpty()) {
logger.info("[RES] listEqpBook size: {}", listEqpBook.size());
item.setLineId(((PatrolTaskStatus) listEqpBook.get(0)).getLineId());
logger.info("[RES] TASK STATUS UPDATE DATA: {}", item);
i = iPatrolTaskStatusService.updatePatrolTaskStatus(item);
if ("E100-001".equals(sendCode)) {
if ("100".equals(item.getTaskProgress())) {
@ -1121,7 +1104,6 @@ public class PatrolResultController extends BaseController {
item.setPosType(str);
item.setCreateTime(new Date());
item.setStartTime(new Date());
logger.info("[RES] TASK STATUS NEW ADD: {}", item);
i = iPatrolTaskStatusService.insertPatrolTaskStatus(item);
}
}
@ -1129,20 +1111,21 @@ public class PatrolResultController extends BaseController {
}
return toAjax(i);
} else {
logger.info("[RES] items empty!!!");
logger.info("items empty!!!");
}
} catch (Exception e) {
logger.error("error", e);
} finally {
logger.info(Color.CYAN + "###### RECEIVE DATA TO ANALYSIS [41] end ######" + Color.END);
}
} else if (StaEnum.CtlModel.getCode().equals(type)) {
logger.info(Color.CYAN + "###### RECEIVE DATA TO ANALYSIS [61] start ######" + Color.END);
String Jqtype = "";
logger.info("<==================================RECEIVE DATA TO ANALYSIS [61]=============================>");
HashSet<String> superiorFilePaths = new HashSet<>();
try {
JsonRootBean jsonRootBean = JSONObject.parseObject(messageBody, JsonRootBean.class);
List<ItemsInfo> itemsInfoList = jsonRootBean.getItems();
logger.info("[MAIN]: 点位数量: {}, 消息体: \n {}", itemsInfoList.size(), messageBody);
logger.info("点位数量: {}, 消息体: \n {}", itemsInfoList.size(), messageBody);
for (ItemsInfo itemsInfo : itemsInfoList) {
if (StringUtils.isEmpty(itemsInfo.getMaterialId()) && StringUtils.isNotEmpty(itemsInfo.getDeviceId())) {
Map<String, String> deviceInfoMap = resultAnalysisService.selectDeviceInfo(itemsInfo.getDeviceId());
@ -1178,17 +1161,8 @@ public class PatrolResultController extends BaseController {
superiorFilePaths.add(itemsInfo.getFilePath());
}
}
String asd = JSONObject.toJSONString(jsonRootBean);
logger.info("[RES] SEND TO UPPER: {}", asd);
// (new Thread(() -> {
// //qinyl
// superiorFilePaths.forEach(this::sendFileToSg);
// sendService.sendMsg(asd);
// })).start();
} catch (Exception e) {
logger.error(e.getMessage());
logger.error("error", e);
}
int mainID = -1;
@ -1223,11 +1197,11 @@ public class PatrolResultController extends BaseController {
PatrolTaskResultMain taskResultMain = new PatrolTaskResultMain();
taskResultMain.setTaskId(String.valueOf(tasks.get(0).getTaskId()));
taskResultMain.setTaskPatrolledId(eqList.get(0).getTaskPatrolledId());
logger.info("[TASK] taskResultMain: {}", taskResultMain);
logger.info("taskResultMain: {}", taskResultMain);
listEqpBook = iPatrolTaskResultMainService.selectPatrolTaskResultMainList(taskResultMain);
if (!listEqpBook.isEmpty()) {
mainID = ((PatrolTaskResultMain) listEqpBook.get(0)).getLineId().intValue();
logger.info("[TASK] mainID: {}", mainID);
logger.info("exist PatrolTaskResultMain Id: {}", mainID);
} else {
PatrolTaskResultMain patrolTaskResultMain = new PatrolTaskResultMain();
patrolTaskResultMain.setTaskId(String.valueOf(tasks.get(0).getTaskId()));
@ -1258,13 +1232,13 @@ public class PatrolResultController extends BaseController {
}
mainID = iPatrolTaskResultMainService.insertPatrolTaskResultMain(patrolTaskResultMain);
logger.info("[MAIN] insertPatrolTaskResultMain mainId: {}", mainID);
logger.info("insert PatrolTaskResultMain Id: {}", mainID);
}
}
List<PatrolResult> resultList = new ArrayList<>();
for (PatrolResult arr : eqList) {
logger.info(Color.GREEN + "[MAIN] eqList arr: {}" + Color.END, arr);
logger.info(Color.GREEN + "PatrolResult: {}" + Color.END, arr);
datetype = "";
String str;
if (StringUtils.isNotEmpty(arr.getPatrolDeviceCode())) {
@ -1286,14 +1260,14 @@ public class PatrolResultController extends BaseController {
str = parseObject.getString("SendCode");
String strfile;
if ("2".equals(datetype)) {
logger.info("[RES] feedback from robot");
logger.info("feedback from robot");
Long patrolPointId = baseDataClient.queryPatrolPointId(str + "_" + arr.getDeviceId());
if (patrolPointId != null) {
arr.setDeviceId(patrolPointId.toString());
}
InputStream is = doGetRequestForInputStream(intranetFtpAddress + arr.getFilePath());
logger.info("[RES] feedback from robot image size: {}", (is != null));
logger.info("feedback from robot image size: {}", (is != null));
if (is != null) {
try {
is = ImageUtil.overlaying(is, arr.getRectangle(), arr.getValue());
@ -1302,7 +1276,7 @@ public class PatrolResultController extends BaseController {
String fileName = "modify_" + strfile.substring(strfile.lastIndexOf("/") + 1);
String file = saveFile(is, fileName, strfile);
arr.setFilePath(file);
logger.info("[RES] robot image path: {}", file);
logger.info("robot image path: {}", file);
} catch (Exception e) {
e.printStackTrace();
}
@ -1350,7 +1324,7 @@ public class PatrolResultController extends BaseController {
Map<String, String> valueMap = patrolResultService.getPatrolResultValue(arr);
if (null != valueMap && !valueMap.isEmpty()) {
logger.info("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit"));
logger.info("valueMap:" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit"));
if (valueMap.containsKey("value") && null != valueMap.get("value")) {
strfile = valueMap.get("value");
arr.setValue(strfile);
@ -1404,7 +1378,7 @@ public class PatrolResultController extends BaseController {
Map<String, String> valueMap = patrolResultService.getPatrolResultValue(arr);
if (null != valueMap && !valueMap.isEmpty()) {
logger.info("valueMap::" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit"));
logger.info("valueMap:" + valueMap.get("value") + ",value_unit:" + valueMap.get("value_unit"));
if (valueMap.containsKey("value") && null != valueMap.get("value")) {
strfile = valueMap.get("value");
arr.setValue(strfile);
@ -1416,7 +1390,6 @@ public class PatrolResultController extends BaseController {
}
}
logger.info("[RES] mainId: {}, deviceId: {}, taskPatrolId: {} !!!!!!!!!!!!!!!!!", arr.getMainId(), arr.getDeviceId(), arr.getTaskPatrolledId());
i = patrolResultService.insertPatrolResult(arr);
resultStatistics.compare(arr);
// if (!"2".equals(Jqtype)) {
@ -1425,12 +1398,11 @@ public class PatrolResultController extends BaseController {
}
}
logger.info("------------------------Jqtype: " + Jqtype);
logger.info("------------------------resultList.isEmpty(): " + resultList.isEmpty());
if (!resultList.isEmpty()) {
logger.info(Color.RED + "[RES] ++++++++++++++++++++++++++++callAlgorithm++++++++++++++++++++++++++" + Color.END);
logger.info(Color.CYAN + "+++++++ callAlgorithm start +++++++" + Color.END);
//callLocalAlgorithm(resultList);
callRemoteAlgorithm(resultList);
logger.info(Color.CYAN + "+++++++ callAlgorithm end +++++++" + Color.END);
}
}
@ -1439,9 +1411,10 @@ public class PatrolResultController extends BaseController {
code = patrolDeviceCodeList.stream().distinct().collect(Collectors.joining(StringUtils.COMMA));
deviceStateMapper.updatePatrolDeviceTaskState(code);
} catch (Exception e) {
logger.error("[RES] GET PATROL RESULT MSG, UPDATE TASK STATUS EXCEPTION: {}", e.getMessage());
logger.error("error", e);
}
}
logger.info(Color.CYAN + "###### RECEIVE DATA TO ANALYSIS [61] end ######" + Color.END);
}
return toAjax(i);


+ 6
- 7
inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/service/AnalyseRemoteService.java View File

@ -71,16 +71,15 @@ public class AnalyseRemoteService {
//this.logService.log(new AnalyseLog(analyseReq.toString(), "0", taskPatrolId, filter, requestId));
try {
log.info(Color.MAGENTA + "[CALL REMOTE ANALYZE] ===========> URL={} \n PARAMS={}" + Color.END, requestUrl, analyseReq);
log.info("[CALL REMOTE ANALYZE] ===========> URL={} \n PARAMS={}", requestUrl, analyseReq);
String result = HttpClientUtils.sendPostAgain(requestUrl + "/picAnalyse", analyseReq.toString());
log.info(Color.MAGENTA + "[CALL REMOTE ANALYZE] <=========== result={}" + Color.END, result);
log.info(Color.MAGENTA + "[CALL REMOTE ANALYZE] <=========== CODE={} \n PARAMS={}" + Color.END, JSONObject.parseObject(result).getString("code"), result);
log.info("[CALL REMOTE ANALYZE] <=========== result={}", result);
log.info("[CALL REMOTE ANALYZE] <=========== CODE={} \n PARAMS={}", JSONObject.parseObject(result).getString("code"), result);
if (!"200".equals(JSONObject.parseObject(result).getString("code"))) {
log.error(Color.RED + "[CALL REMOTE ANALYZE] <=========== CALL FAIL: {}" + Color.END, result);
log.error("[CALL REMOTE ANALYZE] <=========== CALL FAIL: {}", result);
}
} catch (Exception exception) {
exception.printStackTrace();
log.error(Color.RED +"[CALL REMOTE ANALYZE] <=========== CALL EXCEPTION: {}" + Color.END, exception.getMessage());
} catch (Exception e) {
log.error("error", e);
HttpClientUtils.sendPostAgain("http://localhost:" + this.port + "/picAnalyseRetNotify", analyseReq.toErrorResultStr());
}


+ 18
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java View File

@ -617,7 +617,23 @@ public class PatrolTaskController extends BaseController {
List<String> infoList = patrolTaskInfoService.selectPatrolTaskInfoListByMajorId(String.valueOf(patrolTask.getTaskId()));
logger.info("[TASK] taskId: {}", patrolTask.getTaskId());
if (!infoList.isEmpty()) {
patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, infoList));
if(receiveCode.startsWith("areaPatrolServer")) {
List areaPatrolDevList = new ArrayList();
for (String dev : infoList) {
if(dev.startsWith("areaPatrolServer")) {
areaPatrolDevList.add(dev);
}
}
patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, areaPatrolDevList));
} else {
List otherDevList = new ArrayList();
for (String dev : infoList) {
if(!dev.startsWith("areaPatrolServer")) {
otherDevList.add(dev);
}
}
patrolSendTask.setDeviceList(String.join(StringUtils.COMMA, otherDevList));
}
} else {
patrolSendTask.setDeviceList("[empty device list 2]");
}
@ -737,7 +753,7 @@ public class PatrolTaskController extends BaseController {
}
String str = JSONObject.toJSONString(sendTask);
System.out.println(str);
logger.info("-----------------sendTask: " + str);
if (StringUtils.isEmpty(receiveCode)) {
continue;
}


+ 2
- 2
inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java View File

@ -1,6 +1,7 @@
package com.inspect.taskstatus.controller;
import com.alibaba.fastjson.JSONObject;
import com.inspect.base.core.constant.Color;
import com.inspect.base.core.constant.RedisConst;
import com.inspect.base.core.enums.TaskStatus;
import com.inspect.base.core.utils.DateUtils;
@ -114,7 +115,6 @@ public class PatrolTaskStatusController extends BaseController {
taskStatus.setPatrolStatus("1");
}
}
log.info("[GAB] count: {}", patrolTaskStatusList.size());
return getDataTable(patrolTaskStatusList);
}
@ -626,7 +626,7 @@ public class PatrolTaskStatusController extends BaseController {
if (patrolTaskStatus == null) return error("no task: " + params.getLineId() + " exist");
String command = params.getCommand();
log.info("================================================================TASK STATUS CHANGE=============================================================");
log.info(Color.CYAN + "###### TASK STATUS CHANGE ######" + Color.END);
log.info("[TASK] cmd: {}, task: {}", command, patrolTaskStatus);
if (TaskStatus.DONE.getCode().equals(command)) {
patrolTaskStatus.setTaskState(TaskStatus.RUNNING.getCode());


+ 0
- 3
inspect-metadata/src/main/java/com/inspect/metadata/montdatamqhandle/service/impl/BasedataMontPatDevStaDataConsumerHandle.java View File

@ -76,9 +76,6 @@ public class BasedataMontPatDevStaDataConsumerHandle implements IBasedataMontDat
this.parseMessage(jsonString);
System.out.println("巡视设备状态数据信息 websocket mont/montPatrolDeviceStaData:::" + jsonString);
}
this.feignMsgClient.senMessageToMl(Type, jsonObject.toJSONString());
this.feignMsgClient.senMessageToZk(Type, jsonObject.toJSONString());
}
}


Write Preview
Loading…
Cancel
Save