admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ai为null的修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-18 10:36:36 +08:00
parent cc0080374e
commit ec4c447fcf
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/com/zhgd/xmgl/async/AsyncAiAnalyse.java
View File

@ -56,7 +56,8 @@ public class AsyncAiAnalyse {
@Async("taskExecutor")
public void sendAiAnalyse(AiAnalyseHardWareAlarmRecord aiAnalyseHardWareAlarmRecord) {
try {
String title = getTitleByAlarmType(aiAnalyseHardWareAlarmRecord.getAlarmType());
String title = getTitleByAlarmType(aiAnalyseHardWareAlarmRecord.getAlarmType(), aiAnalyseHardWareAlarmRecord.getProjectSn());
title = title == null ? "其他类型" : title;
String msg = title + ",位置" + aiAnalyseHardWareAlarmRecord.getLocation();
List<SystemUser> systemUserList = systemUserService.list(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getSn, aiAnalyseHardWareAlarmRecord.getProjectSn())
.in(SystemUser::getAccountType, Arrays.asList(5, 6)));
@ -80,8 +81,8 @@ public class AsyncAiAnalyse {
}
}
public String getTitleByAlarmType(Integer alarmType) {
DictionaryItem dict = dictionaryItemService.getDict(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, alarmType + "");
public String getTitleByAlarmType(Integer alarmType, String projectSn) {
DictionaryItem dict = dictionaryItemService.getDict(DictionaryConstant.AI_ANALYSE_HARD_WARE_ALARM_RECORD_TYPE, alarmType + "", projectSn);
return dict != null ? dict.getName() : null;
}
@ -118,10 +119,8 @@ public class AsyncAiAnalyse {
* @param systemUserList 需要推送的人员集合
*/
public void sendCorrectAnalyse(AiAnalyseHardWareAlarmRecord record, List<SystemUser> systemUserList) {
String msg = "你有一条待整改消息,位置-----" + record.getLocation();
String title = getTitleByAlarmType(record.getAlarmType());
String title = getTitleByAlarmType(record.getAlarmType(), record.getProjectSn());
if (CollectionUtils.isNotEmpty(systemUserList)) {
for (SystemUser systemUser : systemUserList) {
log.info(systemUser.getAccount() + "有一条消息,位置-----" + record.getLocation());

3
src/main/java/com/zhgd/xmgl/modules/basicdata/service/IDictionaryItemService.java
View File

@ -21,9 +21,10 @@ public interface IDictionaryItemService extends IService<DictionaryItem> {
*
* @param dictionaryEncoding
* @param data
* @param projectSn
* @return
*/
DictionaryItem getDict(String dictionaryEncoding, String data);
DictionaryItem getDict(String dictionaryEncoding, String data, String projectSn);
void add(DictionaryItem dictionaryItem);

21
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/DictionaryItemServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.zhgd.xmgl.modules.basicdata.entity.DictionaryItem;
import com.zhgd.xmgl.modules.basicdata.mapper.DictionaryItemMapper;
import com.zhgd.xmgl.modules.basicdata.mapper.DictionaryMapper;
import com.zhgd.xmgl.modules.basicdata.service.IDictionaryItemService;
import com.zhgd.xmgl.modules.video.entity.AiAnalyseHardWareAlarmRecord;
import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -23,8 +22,6 @@ import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -57,13 +54,19 @@ public class DictionaryItemServiceImpl extends ServiceImpl<DictionaryItemMapper,
}
@Override
public DictionaryItem getDict(String dictionaryEncoding, String data) {
List<DictionaryItem> dictionaryItems = dictionaryItemMapper.selectList(new LambdaQueryWrapper<DictionaryItem>()
.eq(DictionaryItem::getDictionaryEncoding, dictionaryEncoding)
public DictionaryItem getDict(String dictionaryEncoding, String data, String projectSn) {
String newCode = dictionaryEncoding + "_" + projectSn;
LambdaQueryWrapper<DictionaryItem> queryWrapper = new LambdaQueryWrapper<DictionaryItem>()
.and(w -> w.eq(DictionaryItem::getDictionaryEncoding, dictionaryEncoding).or().eq(DictionaryItem::getDictionaryEncoding, newCode))
.eq(DictionaryItem::getIsEnable, 1)
.eq(DictionaryItem::getData, data)
);
return CollUtil.isNotEmpty(dictionaryItems) ? dictionaryItems.get(0) : null;
.eq(DictionaryItem::getData, data);
List<DictionaryItem> dictionaryItems = dictionaryItemMapper.selectList(queryWrapper);
Map<String, DictionaryItem> map = dictionaryItems.stream().collect(Collectors.toMap(DictionaryItem::getDictionaryEncoding, dictionaryItem -> dictionaryItem, (o1, o2) -> o1));
if (map.containsKey(newCode)) {
return map.get(newCode);
} else {
return map.get(dictionaryEncoding);
}
}
@Override