fixbug:堤防

1 month ago · bfa08cf4c7
8 changed files with 56 additions and 27 deletions
--- a/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java
+++ b/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java
@ -5,6 +5,9 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 import java.lang.management.ManagementFactory;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@ -33,7 +36,17 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
            "yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM",
            "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
            "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
+    public static String getStrDate (Date date) {
+        // 将 Date 转换为 LocalDateTime
+        LocalDateTime localDateTime = date.toInstant()
+                .atZone(ZoneId.systemDefault())
+                .toLocalDateTime();
+        // 定义日期时间格式
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");

+        // 将 LocalDateTime 格式化为字符串
+        return localDateTime.format(formatter);
+    }
    /**
     * 获取当前Date型日期
     *
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java
@ -68,12 +68,12 @@ public class DfProblemV2Dto {
    private String category;

    @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("开始时间")
    private Date startDate;

    @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("结束时间")
    private Date endDate;

--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java
@ -55,12 +55,12 @@ public class DfRecordDetailV2Dto {
    private String category;

    @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("开始时间")
    private Date startDate;

    @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("结束时间")
    private Date endDate;

@ -73,6 +73,11 @@ public class DfRecordDetailV2Dto {
    @ApiModelProperty("创建者名称")
    private String createName;

+    @ApiModelProperty("记录id")
+    private String recordId;
+
+
+
    @ApiModelProperty("巡查详情")
    private List<DfRecordItemDetailV2Dto> problems = Collections.emptyList();

--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java
@ -28,8 +28,10 @@ public class DfRecordSearchV2Dto {
    @ApiModelProperty("状态")
    private String status;

+
    @ApiModelProperty("记录详情列表标识查询  巡查中的数据   1是  0否")
    private int recordDetailsFlag;
+
    /**
     * 问题位置
     */
@ -39,10 +41,10 @@ public class DfRecordSearchV2Dto {
    @ApiModelProperty("记录id")
    private String recordId;

-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "开始时间")
    private Date startDate;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty(value = "结束时间")
    private Date endDate;

--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java
@ -35,7 +35,7 @@ public class DfV2CheckingDto {
    private String category;

    @ApiModelProperty("创建时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date createTime;

    @ApiModelProperty("创建者")
--- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java
@ -39,12 +39,12 @@ public class DfYhListV2Dto {
    private String category;

    @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("开始时间")
    private Date startDate;

    @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class})
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    @ApiModelProperty("结束时间")
    private Date endDate;

--- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java
@ -47,10 +47,7 @@ public interface DfYhV2Mapper extends BaseMapper<DfYhV2> {
            "<if test='data.code != null and data.code != \"\"'>" +
            "and dike_code = #{data.code} " +
            "</if>" +
-            "<if test='category != null'>" +
-            "and category = #{category.value} " +
-            "</if>" +
-            "group by problem_level " +
+            "group by DATE_FORMAT(create_time, '%Y-%m-%d') " +
            "</script>")
    List<CountDateDto> countYhDto(@Param("data") ObjectStatisticQueDto sp);
 }
--- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
+++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java
@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional;

 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;

@ -73,15 +74,15 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                    .filter(StringUtils::isNotBlank)
                    .ifPresent(status -> queryWrapper.like(DfCheckingRecord::getStatus, status));

-            Optional.ofNullable(data.getStartDate())
-                    .filter(startDate -> startDate != null)
-                    .ifPresent(startDate -> queryWrapper.ge(DfCheckingRecord::getStartDate, startDate));

-            Optional.ofNullable(data.getEndDate())
-                    .filter(endDate -> endDate != null)
-                    .ifPresent(endDate -> queryWrapper.le(DfCheckingRecord::getEndDate, endDate));
-        }
+            if (!Objects.isNull(data.getStartDate())) {
+                queryWrapper.ge(DfCheckingRecord::getStartDate, data.getStartDate());
+            }

+            if (!Objects.isNull(data.getEndDate())) {
+                queryWrapper.le(DfCheckingRecord::getStartDate, data.getEndDate());
+            }
+        }

        // 查询分页数据
        Page<DfCheckingRecord> queryPage = page(page, queryWrapper);
@ -109,18 +110,18 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
    public DfRecordDetailV2Dto getInfo(String id) {
        DfRecordDetailV2Dto dto = new DfRecordDetailV2Dto();
        DfCheckingRecord dfCheckingRecord = getById(id);
-        if (dfCheckingRecord != null) {
+        if (dfCheckingRecord == null) {
+            return dto;
+        }
            BeanUtils.copyProperties(dfCheckingRecord, dto);

            List<DfCheckingV2ProjectItem> items = dfCheckingV2ProjectItemV2Service.list(
                    Wrappers.<DfCheckingV2ProjectItem>lambdaQuery()
-                            .eq(DfCheckingV2ProjectItem::getCheckingId, id)
+                            .eq(DfCheckingV2ProjectItem::getCheckingId, dfCheckingRecord.getCheckingId())
            );
            dto.setItems(items.stream()
                    .map(DfCheckingV2Service::convertToItemDto)
                    .collect(Collectors.toList()));
-        }
-        assert dfCheckingRecord != null;
        List<DfCheckingProblemV2> recordsList = dfCheckingProblemV2Service.list(new LambdaQueryWrapper<DfCheckingProblemV2>()
                .eq(DfCheckingProblemV2::getRecordId, dfCheckingRecord.getId()));
        List<DfRecordDetailV2Dto.DfRecordItemDetailV2Dto> dtoList = new ArrayList<>();
@ -160,8 +161,9 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
                // 提交时缺陷无数据就是无缺陷
                dfCheckingRecord.setStatus(DfYhV2StatusEnum.NO_DEFECTS.getValue());
            }
-            saveOrUpdate(dfCheckingRecord);
+            mySaveOrUpdate(dfCheckingRecord);
            dfRecord.setStatus(dfCheckingRecord.getStatus());
+            dfRecord.setRecordId(dfCheckingRecord.getId());
            dfCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(dfRecord));
            return dfRecord;
        } else {
@ -169,13 +171,23 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
            BeanUtils.copyProperties(dfRecord, dfCheckingRecord);
            // 未提交维巡查中
            dfCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
-            saveOrUpdate(dfCheckingRecord);
+            mySaveOrUpdate(dfCheckingRecord);
            dfRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue());
+            dfRecord.setRecordId(dfCheckingRecord.getId());
            dfCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(dfRecord));
            return dfRecord;
        }
    }

+    public void mySaveOrUpdate (DfCheckingRecord dfCheckingRecord) {
+        Boolean flag = org.springframework.util.StringUtils.isEmpty(dfCheckingRecord.getId()) ?   Boolean.TRUE :Boolean.FALSE;
+        if (flag) {
+            save(dfCheckingRecord);
+        }else {
+            updateById(dfCheckingRecord);
+        }
+    }
+
    public void myRemovePraIds(DfRecordDetailV2Dto dfRecord) {
        List<String> ids = dfRecord.getProblems()
                .stream()
@ -192,7 +204,7 @@ public class DfCheckingRecordV2Service extends BaseService<DfCheckingRecordV2Map
            DfCheckingProblemV2 dfCheckingProblemV2 = new DfCheckingProblemV2();
            BeanUtils.copyProperties(e, dfCheckingProblemV2);
            dfCheckingProblemV2.setCheckingId(dfRecord.getCheckingId());
-            dfCheckingProblemV2.setRecordId(dfRecord.getId());
+            dfCheckingProblemV2.setRecordId(dfRecord.getRecordId());
            dfCheckingProblemV2.setCheckingName(dfRecord.getCheckingName());
            dfCheckingProblemV2.setDikeCode(dfRecord.getDikeCode());
            dfCheckingProblemV2.setDikeName(dfRecord.getDikeName());