From 97d67712b7e95b5b63ed27d56a35c8e9fe214012 Mon Sep 17 00:00:00 2001 From: guo Date: Fri, 19 Jan 2024 11:26:36 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/async/AsyncAiAnalyse.java | 44 +++++-------------- .../service/IDictionaryItemService.java | 10 ++++- .../impl/DictionaryItemServiceImpl.java | 12 ++++- .../PressureTestMachineManageBlockData.java | 3 ++ ...iAnalyseHardWareAlarmRecordController.java | 3 ++ ...AnalyseHardWareAlarmRecordServiceImpl.java | 15 +++++-- 6 files changed, 50 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java index 8b2d4d861..17ac81b21 100644 --- a/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java +++ b/src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java @@ -3,11 +3,14 @@ package com.zhgd.xmgl.async; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.zhgd.mqtt.bean.PushPayload; import com.zhgd.mqtt.server.IMqttSender; +import com.zhgd.xmgl.modules.basicdata.constant.DictionaryConstant; import com.zhgd.xmgl.modules.basicdata.entity.CompanyConfig; +import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; import com.zhgd.xmgl.modules.basicdata.entity.SystemUser; import com.zhgd.xmgl.modules.basicdata.mapper.SystemUserMapper; import com.zhgd.xmgl.modules.basicdata.service.ICompanyConfigService; import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService; +import com.zhgd.xmgl.modules.basicdata.service.impl.DictionaryItemServiceImpl; import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord; import com.zhgd.xmgl.push.service.UniPushService; import lombok.extern.slf4j.Slf4j; @@ -16,7 +19,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; +import java.util.Arrays; import java.util.List; /** @@ -38,6 +44,8 @@ public class AsyncAiAnalyse { private ICompanyConfigService companyConfigService; @Autowired private UniPushService uniPushService; + @Autowired + private DictionaryItemServiceImpl dictionaryItemService; @Value("${mqtt-scope}") private String scope; @@ -47,8 +55,8 @@ public class AsyncAiAnalyse { try { String title = getTitleByAlarmType(aiAnalyseHardWareAlarmRecord.getAlarmType()); String msg = title + ",位置" + aiAnalyseHardWareAlarmRecord.getLocation(); - List systemUserList = systemUserService.list(Wrappers.lambdaQuery().eq(SystemUser::getSn, aiAnalyseHardWareAlarmRecord.getProjectSn()).eq(SystemUser::getAccountType, 5)); -// List systemUserList=systemUserMapper.selectProjectSystemUserList(aiAnalyseHardWareAlarmRecord.getProjectSn()); + List systemUserList = systemUserService.list(Wrappers.lambdaQuery().eq(SystemUser::getSn, aiAnalyseHardWareAlarmRecord.getProjectSn()) + .in(SystemUser::getAccountType, Arrays.asList(5, 6))); title = "AI分析" + title; //向项目管理员和子账号推送通知 if (systemUserList.size() > 0) { @@ -70,36 +78,8 @@ public class AsyncAiAnalyse { } public String getTitleByAlarmType(Integer alarmType) { - //1-烟感、2-明火、3-人员倒地、4-未戴安全帽、5-区域入侵、6-越界入侵、7-人员聚集衣 8-反光衣、9-裸土覆盖,13口罩识别,14徘徊预警,15物体滞留监测,16绊线监测 - String title = ""; - if (alarmType == 1) { - title = "烟感报警"; - } else if (alarmType == 2) { - title = "明火报警"; - } else if (alarmType == 3) { - title = "人员倒地报警"; - } else if (alarmType == 4) { - title = "未戴安全帽报警"; - } else if (alarmType == 5) { - title = "区域入侵报警"; - } else if (alarmType == 6) { - title = "越界入侵报警"; - } else if (alarmType == 7) { - title = "人员聚集衣报警"; - } else if (alarmType == 8) { - title = "反光衣报警"; - } else if (alarmType == 9) { - title = "裸土覆盖报警"; - } else if (alarmType == 13) { - title = "口罩识别报警"; - } else if (alarmType == 14) { - title = "徘徊预警"; - } else if (alarmType == 15) { - title = "物体滞留监测"; - } else if (alarmType == 16) { - title = "绊线监测"; - } - return title; + DictionaryItem dict = dictionaryItemService.getDict(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, alarmType + ""); + return dict != null ? dict.getName() : null; } /** diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java index e9758b5d6..a5ce22e38 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java @@ -1,7 +1,6 @@ package com.zhgd.xmgl.modules.basicdata.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.zhgd.xmgl.modules.basicdata.entity.DictionariesRecord; import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; import javax.servlet.http.HttpServletRequest; @@ -17,6 +16,15 @@ public interface IDictionaryItemService extends IService { */ List getDictList(String dictionaryEncoding); + /** + * 查询基础字典信息，根据数值 + * + * @param dictionaryEncoding + * @param data + * @return + */ + DictionaryItem getDict(String dictionaryEncoding, String data); + void add(DictionaryItem dictionaryItem); List listEnableByConstructionStage(String projectConstructionStage); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java index 7dd94b56c..80444417a 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java @@ -1,11 +1,11 @@ package com.zhgd.xmgl.modules.basicdata.service.impl; +import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.zhgd.jeecg.common.execption.OpenAlertException; import com.zhgd.jeecg.common.system.query.QueryGenerator; -import com.zhgd.xmgl.enums.ParamEnum; import com.zhgd.xmgl.modules.basicdata.constant.DictionaryConstant; import com.zhgd.xmgl.modules.basicdata.entity.Dictionary; import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem; @@ -42,6 +42,16 @@ public class DictionaryItemServiceImpl extends ServiceImpl dictionaryItems = dictionaryItemMapper.selectList(new LambdaQueryWrapper() + .eq(DictionaryItem::getDictionaryEncoding, dictionaryEncoding) + .eq(DictionaryItem::getIsEnable, 1) + .eq(DictionaryItem::getData, data) + ); + return CollUtil.isNotEmpty(dictionaryItems) ? dictionaryItems.get(0) : null; + } + @Override public void add(DictionaryItem dictionaryItem) { Long dictionaryId = dictionaryItem.getDictionaryId(); diff --git a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManageBlockData.java b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManageBlockData.java index b70940850..ce7e8ed89 100644 --- a/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManageBlockData.java +++ b/src/main/java/com/zhgd/xmgl/modules/pressuretest/entity/PressureTestMachineManageBlockData.java @@ -37,6 +37,9 @@ public class PressureTestMachineManageBlockData implements Serializable { @Excel(name = "试验检测管理-试块编号id", width = 15) @ApiModelProperty(value = "试验检测管理-试块编号id") private java.lang.Long pressureTestMachineManageBlockNumberId; + //@ApiModelProperty(value = "试验检测管理id") + //private java.lang.Long pressureTestMachineManageId; + /** * code */ diff --git a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java index 380ba7012..41058a096 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/controller/AiAnalyseHardWareAlarmRecordController.java @@ -263,6 +263,9 @@ public class AiAnalyseHardWareAlarmRecordController { } @ApiOperation(value = "宁波隧道推送ai报警消息", notes = "宁波隧道推送ai报警消息", httpMethod = "POST") + @ApiImplicitParams({ + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "body", required = false, dataType = "String"), + }) @PostMapping(value = "/callback") public Result callback(@ApiIgnore @RequestBody HashMap paramMap) { aiAnalyseHardWareAlarmRecordService.callback(paramMap); diff --git a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java index 83121c7e7..4fed301e9 100644 --- a/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java @@ -404,12 +404,21 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl