diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/SzCharItemDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SzCharItemDto.java new file mode 100644 index 00000000..89a9c081 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SzCharItemDto.java @@ -0,0 +1,55 @@ +package com.kms.yxgh.df.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +@ApiModel("获取巡查情况概览统计图表隐患信息") +@Data +public class SzCharItemDto { + @ApiModelProperty(value = "x轴") + private List xAxis = Collections.emptyList(); + + @ApiModelProperty(value = "y轴") + private List yAxis = Collections.emptyList(); + ; + + @ApiModelProperty(value = "堤防数量") + private int dfNumber; + + @ApiModelProperty(value = "一般隐患数量") + private int ybNumber; + + @ApiModelProperty(value = "重大隐患数量") + private int zdNumber; + + @ApiModelProperty(value = "处置状态数量") + private int czNumber; + + + @Data + @ApiModel("y轴") + public static class YAxis { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "数据") + private List series; + } + + @ApiModel("y轴数据") + @Data + public static class Series { + @ApiModelProperty("次数") + private Integer count; + @ApiModelProperty("隐患数量对应的类型1,处理数量对应的是2") + private Integer type; + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java index 6bdb8a91..8c329e40 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfRecordMapper.java @@ -35,13 +35,12 @@ public interface DfRecordMapper extends BaseMapper { " "+ "group by jl.DIKE_CODE,jl.id "+ ") "+ - "where 1=1 "+ " "+ "AND (DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') >= DATE_FORMAT(#{dto.patrolStart} , '%Y-%m-%d %H:%i:%s') "+ "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+ " " + " " + - "AND problem=#{dto.problem} "+ + "AND status=#{dto.problem} "+ " " + " " + "AND handle_status=#{dto.handleStatus} "+ @@ -62,7 +61,7 @@ public interface DfRecordMapper extends BaseMapper { "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+ " " + " " + - "AND lz.problem=#{dto.problem} "+ + "AND lz.status=#{dto.problem} "+ " " + "group by adb.adcd ,lz.problem "+ "") @@ -83,7 +82,7 @@ public interface DfRecordMapper extends BaseMapper { "AND DATE_FORMAT(create_time, '%Y-%m-%d %H:%i:%s') <= DATE_FORMAT(#{dto.patrolEnd} , '%Y-%m-%d %H:%i:%s')) "+ " " + " "+ - "AND lz.problem=#{dto.problem} "+ + "AND lz.status=#{dto.problem} "+ " " + "group by adb.adcd ,lz.handle_status "+ "") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java index 8f52e993..588a6316 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzRecordController.java @@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.kms.yxgh.base.AddGroup; import com.kms.yxgh.base.Response; import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.df.dto.SzCharItemDto; +import com.kms.yxgh.sz.dto.SzCharInfoDto; +import com.kms.yxgh.sz.dto.SzCharInfoQueDto; +import com.kms.yxgh.sz.dto.SzCharInfoItemQueDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto; import com.kms.yxgh.sz.dto.SzRecordSearchDto; import com.kms.yxgh.sz.dto.SzRecordSimpleDto; @@ -33,6 +37,26 @@ public class SzRecordController { private final SzRecordService szRecordService; + + /** + * 查询水闸巡视检查记录列表 + */ + @PostMapping("/szStatistics") + @ApiOperation("水闸巡视检查统计图") + public Response szStatistics(@RequestBody SzCharInfoQueDto dto) { + return Response.ok(szRecordService.szStatistics(dto)); + } + + + /** + * 查询水闸巡视检查记录列表 + */ + @PostMapping("/szStatistics") + @ApiOperation("水闸巡视检查统计图") + public Response szHiddenDanger(@RequestBody SzCharInfoItemQueDto dto) { + return Response.ok(szRecordService.szHiddenDanger(dto)); + } + /** * 查询水闸巡视检查记录列表 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoDto.java new file mode 100644 index 00000000..670d3824 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoDto.java @@ -0,0 +1,55 @@ +package com.kms.yxgh.sz.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Collections; +import java.util.List; + +@ApiModel("水闸获取巡查情况概览统计图表信息") +@Data +public class SzCharInfoDto { + @ApiModelProperty(value = "x轴") + private List xAxis = Collections.emptyList(); + + @ApiModelProperty(value = "y轴") + private List yAxis = Collections.emptyList(); + ; + + @ApiModelProperty(value = "标线") + private List markLine = Collections.emptyList(); + ; + + @Data + @ApiModel("y轴") + public static class YAxis { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "单位") + private String unit; + + @ApiModelProperty(value = "数据") + private List series; + } + + @ApiModel("y轴数据") + @Data + public static class Series { + @ApiModelProperty("次数") + private Integer count; + @ApiModelProperty("负责人类型") + private String dutyHolderType; + } + + @ApiModel("标线") + @Data + public static class MarkLine { + @ApiModelProperty(value = "名称") + private String name; + + @ApiModelProperty(value = "值") + private String value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoItemQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoItemQueDto.java new file mode 100644 index 00000000..9efffccb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoItemQueDto.java @@ -0,0 +1,27 @@ +package com.kms.yxgh.sz.dto; +import com.kms.yxgh.common.dto.IAdcd; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: SzHiddenDangerQueDto + * @Description: TODO + * @Date: 2024/3/5 上午10:18 + * * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("水闸责任人巡查情况概览隐患统计") +public class SzCharInfoItemQueDto implements IAdcd { + private static final long serialVersionUID = 1L; + @ApiModelProperty("查询开始时间 yyyy-MM-dd HH:mm:ss") + private String patrolStart; + @ApiModelProperty("查询结束时间 yyyy-MM-dd HH:mm:ss") + private String patrolEnd; + + @ApiModelProperty("地区code") + private String adcd; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoQueDto.java new file mode 100644 index 00000000..cca4b947 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCharInfoQueDto.java @@ -0,0 +1,27 @@ +package com.kms.yxgh.sz.dto; +import com.kms.yxgh.common.dto.IAdcd; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: SzCharInfoQueDto + * @Description: TODO + * @Date: 2024/3/5 上午10:18 + * * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("水闸责任人巡查情况概览统计") +public class SzCharInfoQueDto implements IAdcd { + private static final long serialVersionUID = 1L; + @ApiModelProperty("查询开始时间 yyyy-MM-dd HH:mm:ss") + private String patrolStart; + @ApiModelProperty("查询结束时间 yyyy-MM-dd HH:mm:ss") + private String patrolEnd; + + @ApiModelProperty("地区code") + private String adcd; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzHiddenDangerModel.java b/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzHiddenDangerModel.java new file mode 100644 index 00000000..779a8786 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzHiddenDangerModel.java @@ -0,0 +1,34 @@ +package com.kms.yxgh.sz.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: SzHiddenDangerModel + * @Description: 水闸巡查隐患概览统计 + * @Date: 2024/3/5 上午10:51 + * * + * @author: lyd + * @version: 1.0 + */ + +@ApiModel("水闸巡查隐患概览统计") +@Data +public class SzHiddenDangerModel { + + @ApiModelProperty("地区code") + private String adcd; + + @ApiModelProperty("隐患类型") + private String problem; + + @ApiModelProperty("数量") + private Integer count; + + @ApiModelProperty("处置状态") + private Integer handleStatus; + + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzStatisticsModelDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzStatisticsModelDto.java new file mode 100644 index 00000000..39850eb8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/model/SzStatisticsModelDto.java @@ -0,0 +1,28 @@ +package com.kms.yxgh.sz.model; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: SzStatisticsModelDto + * @Date: 2024/3/5 上午10:51 + * * + * @author: lyd + * @version: 1.0 + */ + +@ApiModel("水闸巡查情况概览") +@Data +public class SzStatisticsModelDto { + + @ApiModelProperty("次数") + private Integer count; + @ApiModelProperty("堤防代码") + private String adcd; + @ApiModelProperty("巡查责任人类型") + private String dutyHolderType; + + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java index ddd7d681..b0df0caa 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java @@ -7,10 +7,14 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.system.service.SysUserService; import com.kms.yxgh.base.SzException; +import com.kms.yxgh.df.dto.SzCharItemDto; import com.kms.yxgh.sz.domain.SzCheckingItem; import com.kms.yxgh.sz.domain.SzCheckingLine; import com.kms.yxgh.sz.domain.SzRecord; import com.kms.yxgh.sz.domain.SzRecordItem; +import com.kms.yxgh.sz.dto.SzCharInfoDto; +import com.kms.yxgh.sz.dto.SzCharInfoItemQueDto; +import com.kms.yxgh.sz.dto.SzCharInfoQueDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto; import com.kms.yxgh.sz.dto.SzRecordDetailDto.SzRecordItemDto; import com.kms.yxgh.sz.dto.SzRecordDetailExportDto; @@ -53,6 +57,18 @@ public class SzRecordService extends BaseService { private final SzPlanOperatorMapper planOperatorMapper; private final SzCheckingItemMapper szCheckingItemMapper; + + + public SzCharInfoDto szStatistics(SzCharInfoQueDto dto){ + + return null; + } + + public SzCharItemDto szHiddenDanger(SzCharInfoItemQueDto dto){ + + return null; + } + public IPage search(SearchParam sp) { IPage page = new Page<>(sp.getPageNum(), sp.getPageSize()); SzRecordSearchDto searchDto = sp.getData();