diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java index f83b692..67452b9 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/AnalysisController.java @@ -14,6 +14,7 @@ import com.inspect.base.core.utils.StringUtils; import com.inspect.base.core.web.controller.BaseController; import com.inspect.base.core.web.domain.AjaxResult; import com.inspect.base.redis.service.RedisService; +import com.inspect.message.MessageUtils; import com.inspect.mqtt.services.Warn.IUploadServer; import com.inspect.partrolresult.client.WebsocketService; import com.inspect.partrolresult.domain.PatrolResult; @@ -38,6 +39,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -59,6 +61,9 @@ public class AnalysisController extends BaseController { private final WebsocketService WebsocketService; private final IPatrolTaskService patrolTaskService; + @Autowired + MessageUtils messageUtils; + @Resource private IAnalysisService analysisService; @@ -253,9 +258,9 @@ public class AnalysisController extends BaseController { if (StringUtils.isNotEmpty(isAlgType) && isAlgType.equals("1")) { if (resultAnalysis.getResultType().equals("1")) { - patrolResult.setValueUnit("无缺陷"); + patrolResult.setValueUnit(messageUtils.get("无缺陷")); } else { - patrolResult.setValueUnit("有缺陷"); + patrolResult.setValueUnit(messageUtils.get("有缺陷")); } } 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 33e332a..8d97453 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 @@ -13,6 +13,7 @@ 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.message.MessageUtils; import com.inspect.partrolresult.domain.AlgInfo; import com.inspect.partrolresult.domain.PatrolResult; import com.inspect.partrolresult.domain.PatrolResultRef; @@ -45,6 +46,9 @@ public class ResultAnalysisController extends BaseController { private final IPatrolTaskInfoService iPatrolTaskInfoService; private final IPatrolResultService patrolResultService; + @Resource + private MessageUtils messageUtils; + @Resource private PatrolResultMapper patrolResultMapper; @@ -658,7 +662,7 @@ public class ResultAnalysisController extends BaseController { String str = algValue.formatValue(item.getResValue()); if ("meter".equals(item.getAlgType())) { if (str.equals("-1")) { - item.setResValue("空值"); + item.setResValue(messageUtils.get("空值")); } } } diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java index 891c891..e78f72d 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/message/MessageUtils.java @@ -188,6 +188,10 @@ public class MessageUtils { return "noDefects"; case "总点位:%d个,已检点位:%d个,未检点位:0个,正常点位:%d个,异常点位:%d个,待人工确认点位:%d个。": return "Total points: %d, checked points: %d, unchecked points: 0, normal points: %d, abnormal points: %d, manual confirmation points: %d."; + case "高清视频": + return "video"; + case "空值": + return "null"; default: return key; } 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 4536b08..eabb72a 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 @@ -2394,7 +2394,7 @@ public class PatrolTaskController extends BaseController { String str = algValue.formatValue(item.getResValue()); if ("meter".equals(item.getAlgType())) { if (str.equals("-1")) { - item.setResValue("空值"); + item.setResValue(MessageUtils.get("空值")); } } } @@ -2413,7 +2413,7 @@ public class PatrolTaskController extends BaseController { String str = algValue.formatValue(item.getResValue()); if ("meter".equals(item.getAlgType())) { if (str.equals("-1")) { - item.setResValue("空值"); + item.setResValue(MessageUtils.get("空值")); } } } @@ -2653,12 +2653,12 @@ public class PatrolTaskController extends BaseController { if (!listPointStatus.contains(item.getPointStatus())) { if (item.getPointStatus().equals("1")) { map1.put("value", "1"); - map1.put("label", "正常"); + map1.put("label", MessageUtils.get("正常")); } if (item.getPointStatus().equals("0")) { map1.put("value", "0"); - map1.put("label", "异常"); + map1.put("label", MessageUtils.get("异常")); } listPointStatus.add(item.getPointStatus()); @@ -2702,12 +2702,12 @@ public class PatrolTaskController extends BaseController { if (!listPointStatus.contains(item.getPointStatus())) { if (item.getPointStatus().equals("1")) { map1.put("value", "1"); - map1.put("label", "正常"); + map1.put("label", MessageUtils.get("正常")); } if (item.getPointStatus().equals("0")) { map1.put("value", "0"); - map1.put("label", "异常"); + map1.put("label", MessageUtils.get("异常")); } listPointStatus.add(item.getPointStatus()); 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 0878b7f..d2fffa6 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 @@ -647,6 +647,7 @@ and b.filter = #{filter} and b.point_status = 0 and b.res_code = '2000' + and b.result_type != 2 ORDER BY b.line_id desc