修改数据筛选死值时间段 项目信息经纬度修改问题

neim-biz/src/main/java/com/jiayue/biz/service/impl/CheckDataRecode.java

@@ -289,8 +289,8 @@ public class CheckDataRecode {
         //上个合理值不等于空并且上个合理值和传入值相等
         if (map.get(name + "OriginalVal") != null && map.get(name + "OriginalVal").equals(value)) {
             String ddst = map.get(name + "DeadDataStartTime").toString();
-            //如果死值数据开始时间不为空  并且  死值开始时间和传入的时间差距大于30分钟
-            if (!"".equals(ddst) && Minutes.minutesBetween(new DateTime(ddst), dateTime).getMinutes() > 30) {
+            //如果死值数据开始时间不为空  并且  死值开始时间和传入的时间差距大于四小时
+            if (!"".equals(ddst) && Minutes.minutesBetween(new DateTime(ddst), dateTime).getMinutes() > 240) {
                 log.warn("{}数据死值，数值为{},开始时间为{}", name, value, new DateTime(ddst).toString("HH:mm:ss"));
                 flag = true;
             }

neim-biz/src/main/java/com/jiayue/biz/service/impl/ProjectServiceImpl.java

@@ -215,7 +215,11 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
         projectBasicInfo.setProjectType(projectDto.getProjectType());
         projectBasicInfo.setProjectNameEasy(projectDto.getProjectNameEasy());
         if (projectDto.getLongitude() != null && projectDto.getLatitude() != null) {
-            projectBasicInfo.setPosition(projectDto.getLongitude() + "," + projectDto.getLatitude());
+            if (projectDto.getLongitude().equals("") && projectDto.getLatitude().equals("")) {
+                projectBasicInfo.setPosition("");
+            } else {
+                projectBasicInfo.setPosition(projectDto.getLongitude() + "," + projectDto.getLatitude());
+            }
         } else {
             projectBasicInfo.setPosition("");
         }