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

bug调整(AI、供应商、进度)

Browse Source
This commit is contained in:
pengjie 2024-12-12 16:07:58 +08:00
parent 25445028f4
commit a1834015f5
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/video/service/impl/AiAnalyseHardWareAlarmRecordServiceImpl.java
View File

@ -638,7 +638,9 @@ public class AiAnalyseHardWareAlarmRecordServiceImpl extends ServiceImpl<AiAnaly
String relativePath = projectInfoBySn.getProjectName() + "/AI预警列表/" + DateUtil.today();
String dir = PathUtil.getBasePath() + "/" + relativePath;
FileUtil.copy(PathUtil.getBasePath() + "/" + record.getImageUrl(), dir + "/" + FileUtil.getName(record.getImageUrl()), true);
FileUtil.copy(PathUtil.getBasePath() + "/" + record.getAlarmVideo(), dir + "/" + FileUtil.getName(record.getAlarmVideo()), true);
if (StringUtils.isNotBlank(record.getAlarmVideo())) {
FileUtil.copy(PathUtil.getBasePath() + "/" + record.getAlarmVideo(), dir + "/" + FileUtil.getName(record.getAlarmVideo()), true);
}
baseMapper.updateById(record);
UserInfo user = SecurityUtils.getUser();

6
src/main/java/com/zhgd/xmgl/modules/xz/controller/XzTaskProgressController.java
View File

@ -27,10 +27,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
/**
@ -162,6 +159,7 @@ public class XzTaskProgressController {
@PostMapping(value = "/startTask")
public Result<XzTaskProgress> startTask(@RequestBody XzTaskProgress taskProgress) {
taskProgress.setStatus(1);
taskProgress.setActualStartDate(new Date());
taskProgressService.updateById(taskProgress);
return Result.ok();
}

2
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionCompareDataServiceImpl.java
View File

@ -132,7 +132,7 @@ public class XzHikvisionCompareDataServiceImpl extends ServiceImpl<XzHikvisionCo
queryWrapper.lambda().lt(XzHikvisionCompareData::getSyncResult, 3);
}
if (MapUtils.getInteger(param, "syncResultComplete") == 0) {
queryWrapper.lambda().gt(XzHikvisionCompareData::getSyncResult, 0);
queryWrapper.lambda().gt(XzHikvisionCompareData::getSyncResult, 1);
}
return queryWrapper;
}

10
src/main/java/com/zhgd/xmgl/util/FlowUtil.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.Date;
import java.util.List;
@ -62,7 +63,8 @@ public class FlowUtil {
}
public static String getJSONString(Map<String, Object> map, String key) {
return Optional.ofNullable(map.get(key)).map(JSON::toJSONString).orElse(null);
String value = String.valueOf(map.get(key));
return Optional.ofNullable(StringUtils.isNotBlank(value) ? map.get(key) : null).map(JSON::toJSONString).orElse(null);
}
public static List getList(Map<String, Object> map, String key) {
@ -78,11 +80,13 @@ public class FlowUtil {
}
public static String getLongitude(Map map, String key) {
return Optional.ofNullable(map.get(key)).map(o -> JSON.parseObject(o.toString()).getString("lng")).orElse(null);
String value = String.valueOf(map.get(key));
return Optional.ofNullable(StringUtils.isNotBlank(value) ? map.get(key) : null).map(o -> JSON.parseObject(o.toString()).getString("lng")).orElse(null);
}
public static String getLatitude(Map map, String key) {
return Optional.ofNullable(map.get(key)).map(o -> JSON.parseObject(o.toString()).getString("lat")).orElse(null);
String value = String.valueOf(map.get(key));
return Optional.ofNullable(StringUtils.isNotBlank(value) ? map.get(key) : null).map(o -> JSON.parseObject(o.toString()).getString("lat")).orElse(null);
}
}