diff --git a/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java b/shuili-common/src/main/java/com/shuili/common/utils/DateUtils.java index 1ed2d0ec..9cc0d5eb 100644 --- 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型日期 * diff --git a/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java b/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java index 4803f193..942fc7dd 100644 --- a/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java +++ b/shuili-framework/src/main/java/com/shuili/common/core/service/BaseService.java @@ -137,4 +137,9 @@ public class BaseService, T extends BaseEntity> extends public String getRedisKey() { return getEntityClass() + "_"; } + + public Boolean remove(String[] ids) { + + return false; + } } diff --git a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java index 08f22b2b..1453bd77 100644 --- a/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java +++ b/shuili-system/src/main/java/com/kms/system/service/SysXzqhService.java @@ -10,6 +10,10 @@ import com.shuili.common.core.service.BaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; /** @@ -28,6 +32,13 @@ public class SysXzqhService extends BaseService { private SysDeptService sysDeptService; + public Map get(List adcd) { + return sysXzqhMapper.selectList(Wrappers.lambdaQuery(SysXzqh.class) + .in(SysXzqh::getXzqhdm, adcd)) + .stream().collect(Collectors.toMap(SysXzqh::getXzqhdm, Function.identity(), (o1, o2) -> o1)); + } + + public String getSubString(String adcd) { SysXzqh sysXzqh = sysXzqhMapper.selectOne(Wrappers.lambdaQuery(SysXzqh.class) .eq(SysXzqh::getXzqhdm, adcd)); @@ -41,7 +52,7 @@ public class SysXzqhService extends BaseService { return sysXzqh.getXzqhdm().substring(0, 2); } else if (sysXzqh.getLayer() == 4) { return sysXzqh.getXzqhdm().substring(0, 4); - }else { + } else { return sysXzqh.getXzqhdm(); } diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java index ad9a0dee..9bec28f6 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java +++ b/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java @@ -7,9 +7,13 @@ import lombok.Data; import java.util.Collections; import java.util.List; -@ApiModel("图表信息") +@ApiModel("CharInfoDto-图表信息") @Data public class CharInfoDto { + + @ApiModelProperty(value = "标题") + private String title; + @ApiModelProperty(value = "x轴") private List xAxis = Collections.emptyList(); @@ -22,7 +26,7 @@ public class CharInfoDto { ; @Data - @ApiModel("y轴") + @ApiModel("CharInfoDto-y轴") public static class YAxis { @ApiModelProperty(value = "名称") private String name; @@ -34,18 +38,24 @@ public class CharInfoDto { private List series; } - @ApiModel("y轴数据") + @ApiModel("CharInfoDto-y轴数据") @Data public static class Series { + @ApiModelProperty(value = "指标编码") + private String code; + @ApiModelProperty(value = "名称") private String name; + @ApiModelProperty(value = "总和") + private String sum; + @ApiModelProperty(value = "数据") private List data; } - @ApiModel("标线") + @ApiModel("CharInfoDto-标线") @Data public static class MarkLine { @ApiModelProperty(value = "名称") diff --git a/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSpPlayController.java b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSpPlayController.java new file mode 100644 index 00000000..461232cd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSpPlayController.java @@ -0,0 +1,58 @@ +/** + * fshows.com + * Copyright (C) 2013-2025 All Rights Reserved. + */ +package com.kms.yg.df.controller; + +import com.kms.yg.df.service.BsSgcDfSpPlayService; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.dto.DfSpPlayDto; +import com.kms.yxgh.df.dto.DfSpPlayQueDto; +import com.kms.yxgh.df.dto.ReservoirListDto; +import com.shuili.common.core.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author lyd + * @version SpTest.java, v 0.1 2025-03-07 15:56 lyd + */ +@RestController +@RequestMapping("/safe/operation") +@Api(tags = "安全运行-视频播放") +public class BsSgcDfSpPlayController extends BaseController { + + @Autowired + private BsSgcDfSpPlayService bsSgcDfSpPlayService; + + /** + * 视频播放 + * + * @param dto + * @return + */ + @PostMapping("/play") + @ApiOperation("视频播放") + public Response Play(@RequestBody DfSpPlayQueDto dto) { + return Response.ok(bsSgcDfSpPlayService.play(dto)); + } + + /** + * 水库列表 + * + * @param + * @return + */ + @PostMapping("/reservoirList") + @ApiOperation("水库列表") + public Response reservoirList(@RequestBody ReservoirListDto dto) { + return Response.ok(bsSgcDfSpPlayService.reservoirList(dto)); + } + + +} diff --git a/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java new file mode 100644 index 00000000..b5150b49 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java @@ -0,0 +1,204 @@ +package com.kms.yg.df.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.annotation.JSONField; +import com.kms.yxgh.df.dto.DfSpPlayDto; +import com.kms.yxgh.df.dto.DfSpPlayQueDto; +import com.kms.yxgh.df.dto.ReservoirListDto; +import com.kms.yxgh.util.DataCenterRestTemplateUtils; +import com.kms.yxgh.util.RestTemplateUtil; +import lombok.Data; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.*; +import org.springframework.stereotype.Service; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.util.StringUtils; +import org.springframework.web.client.RestTemplate; + +import java.util.*; +import java.util.stream.Collectors; + + +/** + * 水文特征Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@Service +@Slf4j +public class BsSgcDfSpPlayService { + + @Value("${dataSync.url:}") + private String dataSyncUrl; + @Value("#{${dataSync.paths:{}}}") + private Map paths = new HashMap<>(); + + @Value("${video.url:}") + private String videoUrl; + @Value("${video.phone:}") + private String videoPhone; + + @Autowired + private DataCenterRestTemplateUtils dataCenterRestTemplateUtils; + static final String BELONG_URL = "dws_rel_wmst_res"; + + static final String OAUTH_TOKEN = "/vsap-opp-service/resourceSharing/oauth/token"; + + static final String SP_PLAY_URL = "/vsap-opp-service/resourceSharing/startTransform"; + + public ReservoirListDto reservoirList(ReservoirListDto dto) { + ReservoirListDto listDto = new ReservoirListDto(); + // 1. 获取水库信息 + String uri = paths.get(BELONG_URL); + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(dataSyncUrl)) { + return new ReservoirListDto(); + } + String belongReservoirUrlJson = dataCenterRestTemplateUtils.doPostRequest(dataSyncUrl + uri, dto); + + DataResponse response = JSON.parseObject(belongReservoirUrlJson, DataResponse.class); + ReservoirListDto result = new ReservoirListDto(); + if (response.isSuccess()) { + result.setCameraIds(response.getData().stream().map(Item::getWmstCode).collect(Collectors.toList())); + } + return result; + } + + @Data + public static class DataResponse { + private String msg; + private String code; + private List data = new ArrayList<>(); + + public Boolean isSuccess() { + return "0".equals(getCode()); + } + } + + @Data + public static class Item { + @JSONField(name = "WMST_CODE") + private String wmstCode; + } + + public DfSpPlayDto play(DfSpPlayQueDto dto) { + DfSpPlayDto rest = new DfSpPlayDto(); + try { + // 2. 获取令牌 + String spOauthTokenUrlJson = getToken(dto); + JSONObject tokenJson = parseJson(spOauthTokenUrlJson); + if (tokenJson == null || !isSuccess(tokenJson)) { + return rest; + } + JSONObject tokenData = tokenJson.getJSONObject("data"); + if (tokenData == null) { + log.warn("令牌数据为空"); + return rest; + } + String token = String.valueOf(tokenData.get("token")); + dto.setToken(token); + // 3. 调用第三方接口获取播放地址 + String playOauthTokenUrlJson = getSpPlayUrls(dto); + VideoInfo videoInfo = JSON.parseObject(playOauthTokenUrlJson, VideoInfo.class); + if (videoInfo.isSuccess()) { + rest.setUrlsMap(videoInfo.getData().getUrls()); + } + return rest; + } catch (Exception e) { + log.error("请求接口异常: {}", e.getMessage(), e); + } + return rest; + } + + @Data + public static class VideoInfo { + private String status; + private VideoData data; + + public Boolean isSuccess() { + return "0".equals(status); + } + } + + @Data + public static class VideoData { + private Url urls; + } + + @Data + public static class Url { + private String rtspPlayUrl; + private String flvPlayUrl; + private String rtmpPlayUrl; + private String hlsPlayUrl; + } + + /** + * 解析 JSON 字符串为 JSONObject + */ + private JSONObject parseJson(String json) { + if (StringUtils.isEmpty(json)) { + return null; + } + return JSONObject.parseObject(json); + } + + /** + * 解析 JSON 字符串为 JSONArray + */ + private JSONArray parseJsonArray(Object obj) { + if (obj == null) { + return null; + } + return JSON.parseArray(obj.toString()); + } + + /** + * 判断接口响应是否成功 + */ + private boolean isSuccess(JSONObject json) { + return json != null && Objects.equals(200, json.getIntValue("code")); + } + + public String getSpPlayUrls(DfSpPlayQueDto dto) { + HttpHeaders headers = new HttpHeaders(); + Map uriVariables = new HashMap<>(); + MultiValueMap headValues = new LinkedMultiValueMap<>(); + headValues.put("token", Collections.singletonList(dto.getToken())); + Map paramMap = new HashMap<>(); + paramMap.put("cameraId", dto.getCameraId()); + headers.setContentType(MediaType.APPLICATION_JSON); + String seqResult2 = null; + try { + seqResult2 = RestTemplateUtil.postForObjectWithHead(paramMap, headValues, videoUrl + SP_PLAY_URL, String.class, uriVariables); + log.info("获取播放地址响应SP_PLAY_URL: {}", seqResult2); + } catch (Exception e) { + log.warn("请求接口SP_PLAY_URL返回异常: {}", e.getMessage()); + } + return seqResult2; + } + + public String getToken(DfSpPlayQueDto dto) { + dto.setMobile(videoPhone); + RestTemplate restTemplate = new RestTemplate(); + String token = null; + String requestStr = JSONObject.toJSONString(dto); + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); + String seqResult = ""; + try { + ResponseEntity responseEntity = restTemplate.exchange(videoUrl + OAUTH_TOKEN, HttpMethod.POST, httpEntity, String.class); + seqResult = responseEntity.getBody(); + log.info("获取播放地址响应SP_PLAY_URL: {}", seqResult); + } catch (Exception e) { + log.warn("请求接口OAUTH_TOKEN返回异常: {}", e.getMessage()); + } + return token; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java index ee002ddd..e07825ce 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java @@ -21,36 +21,36 @@ import java.util.Date; @Service public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler { - @Override - public void insertFill(MetaObject metaObject) { - try { - if (ObjectUtil.isNotNull(metaObject) - && metaObject.getOriginalObject() instanceof SyBaseEntity) { - SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); - Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) - ? baseEntity.getCreateTime() : new Date(); - baseEntity.setCreateTime(current); - baseEntity.setUpdateTime(current); - BaseEntityUtils.preInsert(baseEntity); - } - } catch (Exception e) { - throw new BaseException(e.getMessage()); + @Override + public void insertFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof SyBaseEntity) { + SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); + Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime()) + ? baseEntity.getCreateTime() : new Date(); + baseEntity.setCreateTime(current); + baseEntity.setUpdateTime(current); + BaseEntityUtils.preInsert(baseEntity); + } + } catch (Exception e) { + throw new BaseException(e.getMessage()); + } } - } - @Override - public void updateFill(MetaObject metaObject) { - try { - if (ObjectUtil.isNotNull(metaObject) - && metaObject.getOriginalObject() instanceof SyBaseEntity) { - SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); - Date current = new Date(); - // 更新时间填充(不管为不为空) - baseEntity.setUpdateTime(current); - BaseEntityUtils.preUpdate(baseEntity); - } - } catch (Exception e) { - throw new BaseException(e.getMessage()); + @Override + public void updateFill(MetaObject metaObject) { + try { + if (ObjectUtil.isNotNull(metaObject) + && metaObject.getOriginalObject() instanceof SyBaseEntity) { + SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject(); + Date current = new Date(); + // 更新时间填充(不管为不为空) + baseEntity.setUpdateTime(current); + BaseEntityUtils.preUpdate(baseEntity); + } + } catch (Exception e) { + throw new BaseException(e.getMessage()); + } } - } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java index 3e886710..628bd319 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/DfException.java @@ -7,9 +7,9 @@ package com.kms.yxgh.base; */ public class DfException extends SyBaseException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public DfException(String message) { - super("Df", "500", null, message); - } + public DfException(String message) { + super("Df", "500", null, message); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/Response.java b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java index b8e47ee2..f6e862ce 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/Response.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/Response.java @@ -14,69 +14,69 @@ import java.io.Serializable; @NoArgsConstructor public class Response implements Serializable { - /** - * 成功 - */ - public static final String SUCCESS = "200"; - /** - * 失败 - */ - public static final String FAIL = "500"; - - /** - * 消息状态码 - */ - private Long code; - - /** - * 消息内容 - */ - private String msg; - - /** - * 数据对象 - */ - private T data; - - public static Response ok() { - return restResult(null, SUCCESS, "操作成功"); - } - - public static Response ok(T data) { - return restResult(data, SUCCESS, "操作成功"); - } - - public static Response ok(String msg, T data) { - return restResult(data, SUCCESS, msg); - } - - public static Response fail() { - return restResult(null, FAIL, "操作失败"); - } - - - public static Response fail(String code, String msg) { - return restResult(null, code, msg); - } - - private static Response restResult(T data, String code, String msg) { - Response response = new Response<>(); - response.setCode(code); - response.setData(data); - response.setMsg(msg); - return response; - } - - public void setCode(String code) { - this.code = Long.valueOf(code); - } - - public void setCode(Long code) { - this.code = code; - } - - public Boolean isSuccess() { - return (this.getCode() + "").equals(SUCCESS); - } + /** + * 成功 + */ + public static final String SUCCESS = "200"; + /** + * 失败 + */ + public static final String FAIL = "500"; + + /** + * 消息状态码 + */ + private Long code; + + /** + * 消息内容 + */ + private String msg; + + /** + * 数据对象 + */ + private T data; + + public static Response ok() { + return restResult(null, SUCCESS, "操作成功"); + } + + public static Response ok(T data) { + return restResult(data, SUCCESS, "操作成功"); + } + + public static Response ok(String msg, T data) { + return restResult(data, SUCCESS, msg); + } + + public static Response fail() { + return restResult(null, FAIL, "操作失败"); + } + + + public static Response fail(String code, String msg) { + return restResult(null, code, msg); + } + + private static Response restResult(T data, String code, String msg) { + Response response = new Response<>(); + response.setCode(code); + response.setData(data); + response.setMsg(msg); + return response; + } + + public void setCode(String code) { + this.code = Long.valueOf(code); + } + + public void setCode(Long code) { + this.code = code; + } + + public Boolean isSuccess() { + return (this.getCode() + "").equals(SUCCESS); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java index fc387c10..26acb5da 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/SzException.java @@ -8,9 +8,9 @@ package com.kms.yxgh.base; */ public class SzException extends SyBaseException { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - public SzException(String message) { - super("SZ", "500", null, message); - } + public SzException(String message) { + super("SZ", "500", null, message); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java index ef8078b6..d5d1a994 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsDsmPr.java @@ -24,14 +24,14 @@ public class MsDsmPr extends SyBaseEntity { * 水利工程测站代码 */ @ApiModelProperty("水利工程测站代码") - @JSONField( name = "PRJ_STCD") + @JSONField(name = "PRJ_STCD") private String prjStcd; /** * 测点编号 */ @ApiModelProperty("测点编号") - @JSONField( name = "MPCD") + @JSONField(name = "MPCD") private String mpcd; /** @@ -39,35 +39,35 @@ public class MsDsmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("测量时间") - @JSONField( name = "MSTM") + @JSONField(name = "MSTM") private Date mstm; /** * 温度（℃） */ @ApiModelProperty("温度（℃）") - @JSONField( name = "TMP") + @JSONField(name = "TMP") private String tmp; /** * 应力（MPa） */ @ApiModelProperty("应力（MPa）") - @JSONField( name = "STS") + @JSONField(name = "STS") private String sts; /** * 采集方式 */ @ApiModelProperty("采集方式") - @JSONField( name = "COLMT") + @JSONField(name = "COLMT") private String colmt; /** * 级联时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("级联时间") - @JSONField( name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "CONN_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date connTime; /** @@ -75,28 +75,28 @@ public class MsDsmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("采集时间") - @JSONField( name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "COLL_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date collTime; /** * 数据来源 */ @ApiModelProperty("数据来源") - @JSONField( name = "GDWR_DASC") + @JSONField(name = "GDWR_DASC") private String gdwrDasc; /** * 置信度 */ @ApiModelProperty("置信度") - @JSONField( name = "RELIABILITY") + @JSONField(name = "RELIABILITY") private String reliability; /** * 指令ID */ @ApiModelProperty("指令ID") - @JSONField( name = "COMMAND_ID") + @JSONField(name = "COMMAND_ID") private String commandId; /** @@ -104,6 +104,6 @@ public class MsDsmPr extends SyBaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("入库时间") - @JSONField( name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JSONField(name = "CREATE_TIME", format = "yyyy-MM-dd HH:mm:ss") private Date createTime; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java index da9d9ffc..3fab1737 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmTmpevs.java @@ -65,7 +65,6 @@ public class MsHdmTmpevs { private Date mnwtmptm; - @ApiModelProperty("采集方式") @JSONField(name = "COLMT") private String colmt; diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java index 0fdfdc31..98627816 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/domain/monitor/MsHdmWqamd.java @@ -97,7 +97,7 @@ public class MsHdmWqamd extends SyBaseEntity { private BigDecimal nh3n; /** - *亚硝酸盐氮（mg/L） + * 亚硝酸盐氮（mg/L） */ @ApiModelProperty("亚硝酸盐氮（mg/L）") @TableField("NO2") diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java index 0cf416e8..21f42080 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/CheckingStatus.java @@ -13,14 +13,14 @@ import lombok.Getter; @Getter public enum CheckingStatus { - NORMAL("正常", 1), - ABNORMAL("异常", 0); + NORMAL("正常", 1), + ABNORMAL("异常", 0); - private final Integer value; - private final String name; + private final Integer value; + private final String name; - CheckingStatus(String name, Integer value) { - this.name = name; - this.value = value; - } + CheckingStatus(String name, Integer value) { + this.name = name; + this.value = value; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DfAnimalRecordStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DfAnimalRecordStatus.java index 3834abb4..d2006586 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/DfAnimalRecordStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/DfAnimalRecordStatus.java @@ -13,14 +13,14 @@ import lombok.Getter; @Getter public enum DfAnimalRecordStatus { - SAVED("已保存", 0L), - CONFIRMED("已确认", 1L); + SAVED("已保存", 0L), + CONFIRMED("已确认", 1L); - private final Long value; - private final String name; + private final Long value; + private final String name; - DfAnimalRecordStatus(String name, Long value) { - this.name = name; - this.value = value; - } + DfAnimalRecordStatus(String name, Long value) { + this.name = name; + this.value = value; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseEngineeringStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseEngineeringStatus.java index aa79029f..3a648655 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseEngineeringStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseEngineeringStatus.java @@ -4,6 +4,7 @@ import lombok.Getter; /** * 监督检查工程状态 + * * @author hry * @date 2024/3/4 18:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemLevelStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemLevelStatus.java index c67fbbbe..21df443c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemLevelStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemLevelStatus.java @@ -4,23 +4,24 @@ import lombok.Getter; /** * 监督检查问题等级状态 + * * @author hry * @date 2024/3/2 16:54 */ @Getter public enum SuperviseProblemLevelStatus { - NONE("无", "0"), - SAME("一般", "1"), - HEAVY("较重", "2"), - SERIOUS("严重", "3"), - ; + NONE("无", "0"), + SAME("一般", "1"), + HEAVY("较重", "2"), + SERIOUS("严重", "3"), + ; - private final String value; - private final String name; + private final String value; + private final String name; - SuperviseProblemLevelStatus(String name, String value) { - this.name = name; - this.value = value; - } + SuperviseProblemLevelStatus(String name, String value) { + this.name = name; + this.value = value; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemStatus.java index e2795622..01691e5c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseProblemStatus.java @@ -4,23 +4,23 @@ import lombok.Getter; /** * 监督检查问题状态 + * * @author hry * @date 2024/3/2 16:54 */ @Getter public enum SuperviseProblemStatus { - DISTRIBUTE("下发", "0"), - HANDLE("处理", "1"), - CONFIRM("确认", "2"), - FINISH("完成", "3") - ; + DISTRIBUTE("下发", "0"), + HANDLE("处理", "1"), + CONFIRM("确认", "2"), + FINISH("完成", "3"); - private final String value; - private final String name; + private final String value; + private final String name; - SuperviseProblemStatus(String name, String value) { - this.name = name; - this.value = value; - } + SuperviseProblemStatus(String name, String value) { + this.name = name; + this.value = value; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseWayStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseWayStatus.java index 65027698..5665c5ed 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseWayStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/SuperviseWayStatus.java @@ -4,6 +4,7 @@ import lombok.Getter; /** * 监督检查办法状态 + * * @author hry * @date 2024/3/4 18:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java b/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java index 87e16bcd..7719bbc2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java +++ b/shuili-system/src/main/java/com/kms/yxgh/base/enums/YhRecordStatus.java @@ -13,14 +13,14 @@ import lombok.Getter; @Getter public enum YhRecordStatus { - SAVED("已保存", 0L), - CONFIRMED("已确认", 1L); + SAVED("已保存", 0L), + CONFIRMED("已确认", 1L); - private final Long value; - private final String name; + private final Long value; + private final String name; - YhRecordStatus(String name, Long value) { - this.name = name; - this.value = value; - } + YhRecordStatus(String name, Long value) { + this.name = name; + this.value = value; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java index 93f07917..65e28ec5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/ApprovalTypeEnum.java @@ -9,6 +9,7 @@ public enum ApprovalTypeEnum { YH_PLAN("堤防维修养护计划", "yh_plan", "dfYhPlanService"), YH_RECORD("堤防维修养护记录", "yh_record", "dfYhRecordService"), + YH_V2_RECORD("堤防维修养护记录v2", "yh_record_v2", "dfYhV2Service"), SZ_YH_PLAN("水闸维修养护计划", "sz_yh_plan", "szYhPlanService"), SZ_YH_RECORD("水闸维修养护记录", "sz_yh_record", "szYhRecordService"); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java new file mode 100644 index 00000000..b13d8eee --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java @@ -0,0 +1,39 @@ +package com.kms.yxgh.common.controller; + +import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.enums.StaticIndexEnum; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +@RestController +@AllArgsConstructor +@RequestMapping("/run/statistic") +@Api(tags = "通用统计接口") +public class CommonStatisticController { + + @PostMapping("/chart") + @ApiOperation("查询图表信息") + public Response chart(@RequestBody ObjectStatisticQueDto sp) { + if (sp.getGroup() == null) { + return Response.ok(new CharInfoDto()); + } + Map> data = + Stream.concat(sp.getGroup().getLeftElements().stream(), sp.getGroup().getRightElements().stream()) + .distinct() + .collect(Collectors.toMap(Function.identity(), k -> k.getSource().statistic(sp))); + CharInfoDto infoDto = sp.getGroup().toChar(data); + return Response.ok(infoDto); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java new file mode 100644 index 00000000..340ef77e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java @@ -0,0 +1,9 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountDateDto { + private String myDate; + private String mySum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDto.java new file mode 100644 index 00000000..fa874706 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountDto { + + private String code; + private Integer sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java new file mode 100644 index 00000000..950de4c7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountLevelDto { + + private String level; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java new file mode 100644 index 00000000..c8ad862c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountQxDto { + + private String date; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java new file mode 100644 index 00000000..5dbe04c4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountYhDto { + + private String date; + private String sum; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/DocV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DocV2Dto.java new file mode 100644 index 00000000..03ec36f6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DocV2Dto.java @@ -0,0 +1,27 @@ +package com.kms.yxgh.common.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Collections; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DocV2Dto { + @ApiModelProperty(value = "图片") + private List images = Collections.emptyList(); + @ApiModelProperty(value = "音频") + private List audios = Collections.emptyList(); + @ApiModelProperty(value = "文档") + private List docs = Collections.emptyList(); + + @Data + public static class Item { + private String name; + private String url; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java new file mode 100644 index 00000000..9b8ff9cc --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java @@ -0,0 +1,38 @@ +package com.kms.yxgh.common.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.common.enums.ProjectCharEnum; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("工程对象请求参数") +public class ObjectStatisticQueDto implements IAdcd { + + @ApiModelProperty(value = "查询类型") + private ProjectCharEnum group; + + @ApiModelProperty(value = "行政区划") + private String adcd; + + @ApiModelProperty(value = "工程对象编码") + private String code; + + @JSONField(name = "START_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "开始时间不能为空") + @ApiModelProperty(value = "开始时间", required = true) + private Date startTime; + + @JSONField(name = "END_TIME", format = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "结束时间不能为空") + @ApiModelProperty(value = "结束时间", required = true) + private Date endTime; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java new file mode 100644 index 00000000..2f0a7e8a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java @@ -0,0 +1,33 @@ +package com.kms.yxgh.common.enums; + +import lombok.Getter; + +@Getter +public enum DfYhV2StatusEnum { + + DURING_INSPECTION("巡查中", "1"), + INSPECTED("已巡检", "2"), + NO_DEFECTS("无隐患", "3"), + UNDER_MAINTENANCE("养护中", "4"), + ACCEPTED("已验收", "5"), + YES_UNDER("已养护", "6"); + + + + private final String name; + private final String value; + + DfYhV2StatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public static DfYhV2StatusEnum getDfYhV2StatusEnum(String value) { + for (DfYhV2StatusEnum statusEnum : DfYhV2StatusEnum.values()) { + if (statusEnum.getValue().equals(value)) { + return statusEnum; + } + } + return null; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java new file mode 100644 index 00000000..8885e5b5 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java @@ -0,0 +1,23 @@ +package com.kms.yxgh.common.enums; + +import lombok.Getter; + +@Getter +public enum PatrolMaintenanceCategory { + PROJECT_PATROL("工程巡查", "1"), + JD_PATROL("机电巡查", "2"), + + + DJ_LX("零星", "1"), + DJ_YB("一般", "2"), + DJ_JD("较大", "3"), + DJ_ZD("重大", "4"); + + private final String name; + private final String value; + + PatrolMaintenanceCategory(String name, String value) { + this.name = name; + this.value = value; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java new file mode 100644 index 00000000..607bd09e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -0,0 +1,140 @@ +package com.kms.yxgh.common.enums; + +import cn.hutool.core.collection.CollectionUtil; +import com.kms.yg.cz.dto.CharInfoDto; +import com.shuili.common.utils.StringUtils; +import lombok.Getter; + +import java.util.*; +import java.util.stream.Collectors; +import java.util.stream.Stream; + + +@Getter +public enum ProjectCharEnum { + + C_14("巡查记录分析", Arrays.asList(StaticIndexEnum.DF_JL_ONE_DATE_SUM, StaticIndexEnum.DF_JL_TWO_DATE_SUM), "数量", Collections.emptyList()), + C_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DF_QX_ONE_DATE_SUM, StaticIndexEnum.DF_QX_TWO_DATE_SUM), "数量", Collections.emptyList()), + C_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DF_QX_DJ_LX_SUM, StaticIndexEnum.DF_QX_DJ_JD_SUM, StaticIndexEnum.DF_QX_DJ_ZD_SUM, StaticIndexEnum.DF_QX_DJ_YB_SUM), "数量", Collections.emptyList()), + C_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_BD_YH_SUM, StaticIndexEnum.DF_BD_QX_SUM), "数量", Collections.emptyList()), + C_18("巡查项目总数", Collections.singletonList(StaticIndexEnum.DF_XM_SUM), "数量", Collections.emptyList()), + + + C_1("工程分布", Collections.singletonList(StaticIndexEnum.DF_PROJECT_ADCD_SUM), "数量", Collections.emptyList()), + C_2("巡查分析", Arrays.asList(StaticIndexEnum.DF_CHECKING_ADCD_SUM, StaticIndexEnum.DF_JD_ADCD_SUM), "数量", Collections.emptyList()), + C_3("缺陷和养护对比", Arrays.asList(StaticIndexEnum.DF_QX_ADCD_SUM, StaticIndexEnum.DF_YH_ADCD_SUM), "数量", Collections.emptyList()), + ; + + + private final String title; + private final List leftElements; + private final String leftName; + private final String leftUnit; + private final List rightElements; + private final String rightName; + private final String rightUnit; + + ProjectCharEnum(String title, List leftElements, List rightElements) { + this.title = title; + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getZhName(); + this.rightName = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getZhName(); + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + ProjectCharEnum(String title, List leftElements, List rightElements, String rightName) { + this.title = title; + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getZhName(); + this.rightName = rightName; + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + ProjectCharEnum(String title, List leftElements, String leftName, List rightElements) { + this.title = title; + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getZhName(); + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + ProjectCharEnum(String title, List leftElements, String leftName, List rightElements, String rightName) { + this.title = title; + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = rightName; + this.leftUnit = CollectionUtil.isEmpty(this.leftElements) ? "" : this.leftElements.get(0).getUnit(); + this.rightUnit = CollectionUtil.isEmpty(this.rightElements) ? "" : this.rightElements.get(0).getUnit(); + } + + ProjectCharEnum(String title, List leftElements, String leftName, String leftUnit, List rightElements, String rightName, String rightUnit) { + this.title = title; + this.leftElements = leftElements; + this.rightElements = rightElements; + this.leftName = leftName; + this.rightName = rightName; + this.leftUnit = leftUnit; + this.rightUnit = rightUnit; + } + + + public CharInfoDto toChar(Map> dataMap) { + CharInfoDto charInfoDto = new CharInfoDto(); + charInfoDto.setTitle(this.title); + charInfoDto.setXAxis(Stream.concat(this.leftElements.stream(), this.rightElements.stream()) + .flatMap(type -> dataMap.getOrDefault(type, new HashMap<>()).keySet().stream() + ).filter(Objects::nonNull) + .distinct() + .sorted() + .collect(Collectors.toList())); + List yAxis = new ArrayList<>(); + + if (CollectionUtil.isNotEmpty(this.leftElements)) { + CharInfoDto.YAxis left = new CharInfoDto.YAxis(); + left.setName(this.leftName); + left.setUnit(this.leftUnit); + left.setSeries(getCollect(this.leftElements, dataMap, charInfoDto)); + yAxis.add(left); + } + if (CollectionUtil.isNotEmpty(this.rightElements)) { + CharInfoDto.YAxis right = new CharInfoDto.YAxis(); + right.setName(this.rightName); + right.setUnit(this.rightUnit); + right.setSeries(getCollect(this.rightElements, dataMap, charInfoDto)); + yAxis.add(right); + } + charInfoDto.setYAxis(yAxis); + return charInfoDto; + } + + private List getCollect(List element, Map> dataMap, CharInfoDto charInfoDto) { + return element.stream() + .map(type -> { + CharInfoDto.Series series = new CharInfoDto.Series(); + series.setName(type.getZhName()); + series.setCode(type.name()); + Map values = dataMap.getOrDefault(type, new HashMap<>()); + series.setData(charInfoDto.getXAxis().stream() + .map(time -> { + Object value = values.get(time); + return value == null || StringUtils.isEmpty(value.toString()) ? type.getDefaultValue() : value.toString(); + }).collect(Collectors.toList())); + series.setSum(series.getData().stream().mapToDouble(Double::parseDouble).sum() + ""); + return series; + }).collect(Collectors.toList()); + } + + public static ProjectCharEnum getEnum(String name) { + return Arrays.stream(ProjectCharEnum.values()) + .filter(item -> item.name().equals(name)) + .findFirst() + .orElse(null); + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java new file mode 100644 index 00000000..b16918e9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -0,0 +1,175 @@ +package com.kms.yxgh.common.enums; + +import cn.hutool.core.collection.CollectionUtil; +import com.kms.system.domain.SysXzqh; +import com.kms.system.service.SysXzqhService; +import com.kms.yxgh.common.dto.*; +import com.kms.yxgh.common.service.Statistic; +import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; +import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; +import com.kms.yxgh.df.mapper.DfCheckingV2Mapper; +import com.kms.yxgh.df.mapper.DfYhV2Mapper; +import com.shuili.common.utils.SpringUtils; +import lombok.Getter; + +import java.util.*; +import java.util.stream.Collectors; + +@Getter +public enum StaticIndexEnum { + + DF_JL_ONE_DATE_SUM("机电巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.JD_PATROL); + return dataGroup(list); + }, "个", "0"), + DF_JL_TWO_DATE_SUM("工程巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.countDateGroup(sp, PatrolMaintenanceCategory.PROJECT_PATROL); + return dataGroup(list); + }, "个", "0"), + + + DF_QX_ONE_DATE_SUM("机电巡查", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countDate(sp, PatrolMaintenanceCategory.JD_PATROL); + return dataGroup(list); + }, "个", "0"), + DF_QX_TWO_DATE_SUM("工程巡查", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countDate(sp, PatrolMaintenanceCategory.PROJECT_PATROL); + return dataGroup(list); + }, "个", "0"), + + + DF_QX_DJ_LX_SUM("零星", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX); + return dataGroup(list); + }, "个", "0"), + DF_QX_DJ_YB_SUM("一般", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB); + return dataGroup(list); + }, "个", "0"), + DF_QX_DJ_JD_SUM("较大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD); + return dataGroup(list); + }, "个", "0"), + DF_QX_DJ_ZD_SUM("重大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD); + return dataGroup(list); + }, "个", "0"), + + + DF_BD_YH_SUM("养护次数", sp -> { + DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class); + List list = mapper.countYhDto(sp); + return dataGroup(list); + }, "个", "0"), + + DF_BD_QX_SUM("缺陷次数", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countQx(sp); + return dataGroup(list); + }, "个", "0"), + + DF_XM_SUM("巡查项目数", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + int list = mapper.countXm(sp); + Map map = new HashMap<>(); + map.put("sum", String.valueOf(list)); + return map; + }, "个", "0"), + + + DF_QX_ADCD_SUM("缺陷数量", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.count(sp); + return adcdGroup(list, sp); + }, "个", "0"), + DF_YH_ADCD_SUM("养护次数", sp -> { + DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class); + List list = mapper.count(sp); + return adcdGroup(list, sp); + }, "个", "0"), + DF_PROJECT_ADCD_SUM("工程数量", sp -> { + DfCheckingV2Mapper mapper = SpringUtils.getBean(DfCheckingV2Mapper.class); + List list = mapper.count(sp); + return adcdGroup(list, sp); + }, "个", "0"), + DF_CHECKING_ADCD_SUM("工程巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.count(sp, PatrolMaintenanceCategory.PROJECT_PATROL); + return adcdGroup(list, sp); + }, "个", "0"), + DF_JD_ADCD_SUM("机电巡查", sp -> { + DfCheckingRecordV2Mapper mapper = SpringUtils.getBean(DfCheckingRecordV2Mapper.class); + List list = mapper.count(sp, PatrolMaintenanceCategory.JD_PATROL); + return adcdGroup(list, sp); + }, "个", "0"), + + ; + + + private final String zhName; + private final Statistic source; + private final String unit; + private final String defaultValue; + + StaticIndexEnum(String zhName, Statistic source, String unit, String defaultValue) { + this.zhName = zhName; + this.source = source; + this.unit = unit; + this.defaultValue = defaultValue; + } + + + + public static Map dataGroup(List list) { + if (CollectionUtil.isEmpty(list) && list.isEmpty()) { + return Collections.emptyMap(); + } + return list.stream() + .collect(Collectors.toMap(CountDateDto::getMyDate, CountDateDto::getMySum)); + } + + + public static Map adcdGroup(List list, ObjectStatisticQueDto sp) { + if (CollectionUtil.isEmpty(list)) { + return Collections.emptyMap(); + } + String queryAdcd = sp.getAdcdQx(); + int index = queryAdcd.length(); + List adcds = list.stream() + .map(co -> fullAdcd(co.getCode(), index)) + .distinct() + .collect(Collectors.toList()); + SysXzqhService service = SpringUtils.getBean(SysXzqhService.class); + Map map = service.get(adcds); + return list.stream().map(item -> { + String code = fullAdcd(item.getCode(), index); + SysXzqh sysXzqh = map.get(code); + if (sysXzqh != null) { + item.setCode(sysXzqh.getName()); + return item; + } else { + return null; + } + }).filter(Objects::nonNull) + .collect(Collectors.groupingBy(CountDto::getCode, + Collectors.reducing("0", item -> item.getSum() + "", (a, b) -> { + int sum = Integer.parseInt(a); + int add = Integer.parseInt(b); + return String.valueOf(sum + add); + } + ))); + } + + public static String fullAdcd(String adcd, int index) { + return (adcd.substring(0, index + 2) + "0000000000000000").substring(0, 12); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java index 2ef07b49..24722e30 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/ApprovalObjRolesMapper.java @@ -26,4 +26,5 @@ public interface ApprovalObjRolesMapper extends BaseMapper { "WHERE so.obj_type = #{objType}") List getUsers(@Param("objType") String objType); + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/BaseDdlMapper.java b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/BaseDdlMapper.java index 1e6c1cf7..90a581f9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/mapper/BaseDdlMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/mapper/BaseDdlMapper.java @@ -14,7 +14,7 @@ public interface BaseDdlMapper extends BaseMapper { void insert(@Param("field") String field, @Param("dataList") List> dataList, @Param("tableName") String tableName); - void insertOrUpdate(@Param("field") String field, @Param("updateStr") String updateStr, @Param("dataList") List dataList, @Param("tableName") String tableName); + void insertOrUpdate(@Param("field") String field, @Param("updateStr") String updateStr, @Param("dataList") List dataList, @Param("tableName") String tableName); void delete(@Param("tableName") String tableName); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java index ade67df4..34f2592a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/ApprovalService.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.Comparator; import java.util.Date; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; @Service @@ -68,6 +69,18 @@ public class ApprovalService { } } + public String getTaskId(String formId, ApprovalTypeEnum approvalType) { + Wrapper wrapper = Wrappers.lambdaQuery() + .eq(ApprovalTask::getFormId, formId) + .eq(ApprovalTask::getBusinessType, approvalType.getValue()) + .eq(ApprovalTask::getStatus, ApprovalStatusEnum.WAITING.getValue()) + .orderByDesc(ApprovalTask::getCreateTime) + .last("limit 1"); + return Optional.ofNullable(approvalTaskService.getOne(wrapper)) + .map(ApprovalTask::getId) + .orElse(""); + } + @Transactional(rollbackFor = Exception.class) public void rejected(String id, ApprovalTypeEnum approvalType, ApprovalDetailDto dto) { ApprovalBusinessService service = approvalType.getService(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/service/Statistic.java b/shuili-system/src/main/java/com/kms/yxgh/common/service/Statistic.java new file mode 100644 index 00000000..be8a8fa8 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/service/Statistic.java @@ -0,0 +1,18 @@ +package com.kms.yxgh.common.service; + +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; + +import java.util.Map; + +@FunctionalInterface +public interface Statistic { + + + /** + * 统计 + * + * @param sp 请求条件 + * @return 统计结果 + */ + Map statistic(ObjectStatisticQueDto sp); +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalProjectController.java index 744cbd4f..854216b0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfAnimalProjectController.java @@ -37,5 +37,4 @@ public class DfAnimalProjectController { } - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java index 46be7dcf..18b65ae4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousGroupingController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * 堤防病险工程分组 + * * @author hry * @date 2024/3/12 14:44 */ @@ -27,6 +28,7 @@ public class DfDangerousGroupingController { /** * 查询堤防病险工程分组列表 + * * @param sp * @return */ @@ -38,6 +40,7 @@ public class DfDangerousGroupingController { /** * 查询堤防病险工程分组详情 + * * @param id * @return */ @@ -70,6 +73,7 @@ public class DfDangerousGroupingController { /** * 删除堤防病险工程分组 + * * @param id * @return */ @@ -79,5 +83,5 @@ public class DfDangerousGroupingController { public Response deleteData(@PathVariable String id) { return Response.ok(groupingService.deleteById(id)); } - + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java index 2fc921b0..d83c7d76 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousProjectController.java @@ -15,6 +15,7 @@ import java.util.List; /** * 堤防病险工程核查项目 + * * @author hry * @date 2024/3/12 14:44 */ @@ -28,6 +29,7 @@ public class DfDangerousProjectController { /** * 查询堤防病险工程核查项目列表 + * * @param dto * @return */ @@ -39,6 +41,7 @@ public class DfDangerousProjectController { /** * 查询堤防病险工程核查项目详情 + * * @param id * @return */ @@ -61,6 +64,7 @@ public class DfDangerousProjectController { /** * 删除堤防病险工程核查项目 + * * @param id * @return */ @@ -72,10 +76,9 @@ public class DfDangerousProjectController { } - - /** * 新增/修改堤防病险工程核查项目内容 + * * @param item * @return */ @@ -88,6 +91,7 @@ public class DfDangerousProjectController { /** * 删除堤防病险工程核查项目内容 + * * @param id * @return */ @@ -100,6 +104,7 @@ public class DfDangerousProjectController { /** * 查询堤防病险工程核查项目内容列表 + * * @param dto * @return */ @@ -111,6 +116,7 @@ public class DfDangerousProjectController { /** * 查询堤防病险工程核查项目内容详情 + * * @param id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java index 19fa4e7e..195c8a06 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfDangerousTaskController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * 堤防病险工程核查任务 + * * @author hry * @date 2024/3/12 14:44 */ @@ -27,6 +28,7 @@ public class DfDangerousTaskController { /** * 查询堤防病险工程核查任务列表 + * * @param sp * @return */ @@ -38,6 +40,7 @@ public class DfDangerousTaskController { /** * 查询堤防关联的安全鉴定列表 + * * @param sp * @return */ @@ -49,6 +52,7 @@ public class DfDangerousTaskController { /** * 查询堤防病险工程核查任务详情 + * * @param id * @return */ @@ -81,6 +85,7 @@ public class DfDangerousTaskController { /** * 删除堤防病险工程核查任务 + * * @param id * @return */ @@ -104,7 +109,8 @@ public class DfDangerousTaskController { /** * 堤防工程核查详情 - * @param id 任务id + * + * @param id 任务id * @return */ @ApiOperation("堤防工程核查详情") diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java index 7537eaf3..b983bf91 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseEngineeringController.java @@ -36,6 +36,7 @@ public class DfSuperviseEngineeringController { /** * 查询堤防监督检查工程详情 + * * @param id 任务id * @return */ @@ -66,6 +67,7 @@ public class DfSuperviseEngineeringController { /** * 查询堤防监督检查问题详情 + * * @param id 问题id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseTaskController.java index b8873e7a..80c72388 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseTaskController.java @@ -67,6 +67,7 @@ public class DfSuperviseTaskController extends BaseController { /** * 根据id查询堤防监督检查任务 + * * @param id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseWayController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseWayController.java index 7da79ed9..977ef98f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseWayController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfSuperviseWayController.java @@ -21,6 +21,7 @@ import java.util.List; /** * 堤防监督检查办法 + * * @author hry * @date 2024/2/29 14:44 */ @@ -66,7 +67,7 @@ public class DfSuperviseWayController extends BaseController { @ApiOperation("堤防监督检查办法复制") @Log(title = "堤防监督检查办法复制", businessType = BusinessType.INSERT) @PostMapping("/copy/{id}") - public Response copyInfo(@PathVariable String id){ + public Response copyInfo(@PathVariable String id) { return Response.ok(superviseWayService.copyInfo(id)); } @@ -81,17 +82,17 @@ public class DfSuperviseWayController extends BaseController { /** * 获取启用的堤防监督检查办法 + * * @param wayId 监督检查办法id * @return */ @GetMapping("/enable") @ApiOperation("查询启用的堤防监督检查办法") - public Response enableData(@RequestParam(value = "wayId",required = false) String wayId) { + public Response enableData(@RequestParam(value = "wayId", required = false) String wayId) { return Response.ok(superviseWayService.getEnableSuperviseWay(wayId)); } - /** * 查询堤防监督检查项目 */ @@ -132,7 +133,6 @@ public class DfSuperviseWayController extends BaseController { } - /** * 查询堤防监督检查项目内容列表 */ @@ -173,5 +173,4 @@ public class DfSuperviseWayController extends BaseController { } - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java index 7e6f2bfb..b7c7d2e4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfTraceController.java @@ -29,28 +29,28 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "堤防巡视检查检查记录轨迹") public class DfTraceController extends BaseController { - @Autowired - private DfTraceService dfTraceService; + @Autowired + private DfTraceService dfTraceService; - /** - * 查询堤防巡视检查检查记录轨迹列表 - */ - @PostMapping("/list") - @ApiOperation("堤防巡视检查检查记录轨迹列表") - public IPage list(@RequestBody SearchParam sp) { - return dfTraceService.selectPage(sp); - } + /** + * 查询堤防巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) { + return dfTraceService.selectPage(sp); + } - /** - * 新增堤防巡视检查检查记录轨迹 - */ - @Log(title = "堤防巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("堤防巡视检查检查记录轨迹新增") - public Response add(@RequestBody DfTrace dfTrace) { - BaseEntityUtils.preInsert(dfTrace); - dfTraceService.save(dfTrace); - return Response.ok(); - } + /** + * 新增堤防巡视检查检查记录轨迹 + */ + @Log(title = "堤防巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡视检查检查记录轨迹新增") + public Response add(@RequestBody DfTrace dfTrace) { + BaseEntityUtils.preInsert(dfTrace); + dfTraceService.save(dfTrace); + return Response.ok(); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhStatisticsController.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhStatisticsController.java index adb19b73..57d6f88e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhStatisticsController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/DfYhStatisticsController.java @@ -1,4 +1,5 @@ package com.kms.yxgh.df.controller; + import com.kms.yxgh.base.Response; import com.kms.yxgh.df.dto.DfYhCharHiddenDangerDto; import com.kms.yxgh.df.dto.DfYhCharInfoDto; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + /** * 堤防维修养护记录统计 * @@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController; @RestController @RequestMapping("/run/df/yh/statistics") @Api(tags = "堤防维修养护记录统计") -public class DfYhStatisticsController extends BaseController { +public class DfYhStatisticsController extends BaseController { @Autowired private DfYhStatisticsService dfYhStatisticsService; @@ -30,6 +32,7 @@ public class DfYhStatisticsController extends BaseController { /** * 获取巡查情况概览统计 + * * @param dto * @return */ @@ -42,6 +45,7 @@ public class DfYhStatisticsController extends BaseController { /** * 获取巡查隐患概览统计 + * * @param dto * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java new file mode 100644 index 00000000..9311b4a3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java @@ -0,0 +1,35 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.service.DfCheckingProblemV2Service; +import com.shuili.common.core.domain.SearchParam; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/v2/problem") +@Api(tags = "堤防巡查缺陷v2") +public class DfCheckingProblemV2Controller { + + private final DfCheckingProblemV2Service dfCheckingProblemV2Service; + + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡查缺陷列表v2") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingProblemV2Service.list(sp); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java new file mode 100644 index 00000000..0abf8d98 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java @@ -0,0 +1,58 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.service.DfCheckingRecordV2Service; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + + +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/v2/record") +@Api(tags = "堤防巡视检查记录v2") +public class DfCheckingRecordV2Controller { + + private final DfCheckingRecordV2Service dfCheckingRecordV2Service; + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查记录列表v2") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingRecordV2Service.list(sp); + } + + @ApiOperation("堤防巡视检查记录详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfCheckingRecordV2Service.getInfo(id)); + } + + @ApiOperation("堤防巡视检查记录新增或修改v2") + @Log(title = "堤防巡视检查记录新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody DfRecordDetailV2Dto dfRecord, + @PathVariable("commit") Boolean commit) { + return Response.ok(dfCheckingRecordV2Service.edit(dfRecord, commit)); + } + + @ApiOperation("堤防巡视检查记录删除v2") + @Log(title = "堤防巡视检查记录删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response myRemove(@PathVariable("ids") String[] ids) { + return Response.ok(dfCheckingRecordV2Service.myRemove(ids)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingV2Controller.java new file mode 100644 index 00000000..eb74ea0c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingV2Controller.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.dto.v2.DfV2CheckingDto; +import com.kms.yxgh.df.dto.v2.DfV2CheckingSearchDto; +import com.kms.yxgh.df.service.DfCheckingV2Service; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +/** + * 堤防巡视检查计划Controller + * + * @author sy + * @date 2023-11-09 + */ +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/v2/checking") +@Api(tags = "堤防巡查项目v2") +public class DfCheckingV2Controller { + + + private final DfCheckingV2Service dfCheckingV2Service; + + + @PostMapping("/list") + @ApiOperation("堤防巡查项目列表") + public IPage list(@RequestBody SearchParam sp) { + return dfCheckingV2Service.list(sp); + } + + @ApiOperation("堤防巡查项目详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfCheckingV2Service.getInfo(id)); + } + + @Log(title = "堤防巡查项目新增", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ApiOperation("堤防巡查项目新增") + public Response add(@RequestBody DfV2CheckingDto dfV2Ck) { + return Response.ok(dfCheckingV2Service.add(dfV2Ck)); + } + + @ApiOperation("堤防巡查项目修改") + @Log(title = "堤防巡查项目修改", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + public Response edit(@RequestBody DfV2CheckingDto dfV2Ck) { + return Response.ok(dfCheckingV2Service.edit(dfV2Ck)); + } + + @ApiOperation("堤防巡查项目删除") + @Log(title = "堤防巡查项目删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(dfCheckingV2Service.myRemove(ids)); + } + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java new file mode 100644 index 00000000..a9f2bb34 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java @@ -0,0 +1,65 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.ApprovalTypeEnum; +import com.kms.yxgh.common.controller.ApprovalAbstractController; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhApproveDto; +import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +import com.kms.yxgh.df.service.DfYhV2Service; +import com.shuili.common.annotation.Log; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.enums.BusinessType; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import static com.kms.yxgh.common.ApprovalTypeEnum.YH_V2_RECORD; + +@RestController +@AllArgsConstructor +@RequestMapping("/run/df/v2/yh") +@Api(tags = "堤防养护v2") +public class DfYhV2Controller extends ApprovalAbstractController { + + private final DfYhV2Service dfYhV2Service; + + @PostMapping("/list") + @ApiOperation("堤防养护列表v2") + public IPage list(@RequestBody SearchParam sp) { + return dfYhV2Service.list(sp); + } + + + @ApiOperation("堤防养护详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(dfYhV2Service.getInfo(id)); + } + + @ApiOperation("堤防养护新增或修改v2") + @Log(title = "堤防养护新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody DfYhDetailV2Dto dfYh, + @PathVariable("commit") Boolean commit) { + return Response.ok(dfYhV2Service.edit(dfYh, commit)); + } + + @ApiOperation("堤防养护删除v2") + @Log(title = "堤防养护删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response myRemove(@PathVariable("ids") String[] ids) { + return Response.ok(dfYhV2Service.myRemove(ids)); + } + + @Override + public ApprovalTypeEnum getApprovalType() { + return YH_V2_RECORD; + } +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java index 9a5c4759..f4e32176 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfAnimalOperator.java @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; - /** * 害堤动物防治计划执行人对象 bs_sgc_df_hdjhzx * @@ -18,31 +17,40 @@ import lombok.Data; @TableName("bs_sgc_df_hdjhzx") @Data @ApiModel("害堤动物防治计划执行人") -public class DfAnimalOperator extends SyBaseEntity -{ +public class DfAnimalOperator extends SyBaseEntity { private static final long serialVersionUID = 1L; - /** 害堤动物防治计划ID */ + /** + * 害堤动物防治计划ID + */ @Excel(name = "害堤动物防治计划ID") @ApiModelProperty("害堤动物防治计划ID") private String planId; - /** 执行人ID */ + /** + * 执行人ID + */ @Excel(name = "执行人ID") @ApiModelProperty("执行人ID") private String operatorUid; - /** 执行人名称 */ + /** + * 执行人名称 + */ @Excel(name = "执行人名称") @ApiModelProperty("执行人名称") private String operatorName; - /** 创建人 */ + /** + * 创建人 + */ @Excel(name = "创建人") @ApiModelProperty("创建人") private String createUid; - /** 最近修改人 */ + /** + * 最近修改人 + */ @Excel(name = "最近修改人") @ApiModelProperty("最近修改人") private String updateUid; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java new file mode 100644 index 00000000..9ca39ce2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java @@ -0,0 +1,143 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * 缺陷记录 bs_sgc_df_xcqx + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xcqx") +@Data +@ApiModel("缺陷记录") +public class DfCheckingProblemV2 extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + private String itemId; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + + + @ApiModelProperty("问题等级") + private String problemLevel; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private String checkingId; + + /** + * 记录id + */ + @ApiModelProperty("记录id") + private String recordId; + + + /** + * 巡查状态字典:patrol_maintenance_status + */ + @ApiModelProperty("巡查状态字典:patrol_maintenance_status") + private String status; + + + /** + * 巡查项目名称 + */ + @ApiModelProperty("巡查项目名称") + private String checkingName; + + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + + /** + * 巡查责任人 + */ + @ApiModelProperty("巡查责任人") + private String dutyHolderName; + + /** + * 巡查责任人id + */ + @ApiModelProperty("巡查责任人id") + private String dutyHolderId; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("堤防代码名称") + private String dikeName; + + /** + * 巡查开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("巡查开始时间") + private Date startDate; + + /** + * 巡查开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("巡查结束时间") + private Date endDate; + + /** + * 问题位置 + */ + @ApiModelProperty("问题位置") + private String position; + + @ApiModelProperty("检查内容") + private String content; + /** + * 文档 + */ + @ApiModelProperty("文档") + private String doc; + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private String createUid; + + + /** + * 附加配置 + */ + @ApiModelProperty("备注") + private String remark; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingRecord.java new file mode 100644 index 00000000..504f4806 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingRecord.java @@ -0,0 +1,122 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; + +import java.util.Date; + +import lombok.Data; + +/** + * 害堤动物防治计划对象 bs_sgc_df_xcitem + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xsxcjl") +@Data +@ApiModel("项目管理记录") +public class DfCheckingRecord extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("开始时间") + private Date startDate; + + /** + * 结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("结束时间") + private Date endDate; + + /** + * 巡查范围 + */ + @ApiModelProperty("巡查范围") + private String scope; + + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private String checkingId; + + /** + * 巡查状态字典:patrol_maintenance_status + */ + @ApiModelProperty("巡查状态字典:patrol_maintenance_status") + private String status; + + /** + * 巡查责任人 + */ + @ApiModelProperty("巡查责任人") + private String dutyHolderName; + + /** + * 巡查责任人id + */ + @ApiModelProperty("巡查责任人id") + private String dutyHolderId; + + /** + * 项目名称 + */ + @ApiModelProperty("项目名称") + private String checkingName; + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("堤防代码名称") + private String dikeName; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private String createUid; + + + /** + * 附加配置 + */ + @ApiModelProperty("备注") + private String remark; + + /** + * 创建人名称 + */ + @ApiModelProperty("创建人名称") + private String createName; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java new file mode 100644 index 00000000..e3010d5f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java @@ -0,0 +1,41 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 项目管理子项 + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xcitem") +@Data +@ApiModel("项目管理子项") +public class DfCheckingV2ProjectItem extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private String checkingId; + + /** + * 检查部位 + */ + @ApiModelProperty("检查部位") + private String parts; + + /** + * 检查内容 + */ + @ApiModelProperty("检查内容") + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectManage.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectManage.java new file mode 100644 index 00000000..23791bd6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectManage.java @@ -0,0 +1,72 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import com.shuili.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 害堤动物防治计划对象 bs_sgc_df_hdjh + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xmgl") +@Data +@ApiModel("项目管理") +public class DfCheckingV2ProjectManage extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("堤防代码名称") + private String dikeName; + + /** + * 项目名称 + */ + @ApiModelProperty("项目名称") + private String name; + + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + /** + * 附加配置 + */ + @ApiModelProperty("备注") + private String remark; + + /** + * 创建人名称 + */ + @ApiModelProperty("创建人名称") + private String createName; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java index 07b86fb0..df604fb5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousGrouping.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防病险工程核查分组表 bs_sgc_df_bxgcfz + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProject.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProject.java index 11f066c4..1b508b46 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProject.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProject.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防病险工程核查项目表 bs_sgc_df_bxgcxm + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProjectItem.java index 66d99651..3748fda0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProjectItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousProjectItem.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防病险工程核查项目内容表 bs_sgc_df_bxgcxmnr + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTask.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTask.java index 90b25736..ac8fdc27 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTask.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTask.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 堤防病险工程核查任务表 bs_sgc_df_bxgcrw + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java index 2ba661d2..173dc2e2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfDangerousTaskItemRel.java @@ -9,6 +9,7 @@ import lombok.Data; /** * 堤防病险工程任务问题 bs_sgc_df_bxgcnrgl + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java index 5e085844..dd13af81 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfPoint.java @@ -20,34 +20,34 @@ import lombok.Data; @Deprecated public class DfPoint extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 巡查计划ID - */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; - - /** - * 经度 - */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; - - /** - * 纬度 - */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; - - /** - * 海拔 - */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; + + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; + + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; + + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseProblem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseProblem.java index 87961370..01066f1a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseProblem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseProblem.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 堤防监督检查工程问题对象 bs_sgc_df_jdjcgcwt + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseTask.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseTask.java index 3abb1569..c79ffb32 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseTask.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseTask.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 堤防监督检查任务管理对象 bs_sgc_df_jdjcrw + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWay.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWay.java index 2514bed2..e490555b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWay.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWay.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防监督检查办法对象 bs_sgc_df_jdjcbf + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProject.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProject.java index 27ebcdd3..4cfe8135 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProject.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProject.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防监督检查办法项目对象 bs_sgc_df_jdjcbfxm + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProjectItem.java index ff25ef38..e07caea7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProjectItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfSuperviseWayProjectItem.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 堤防监督检查办法项目内容对象 bs_sgc_df_jdjcbfxmnr + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java index e453c33d..2f4c6660 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfTrace.java @@ -23,54 +23,54 @@ import java.util.Date; @ApiModel("堤防巡视检查检查记录轨迹") public class DfTrace extends SyBaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 巡查记录ID - */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private String recordId; + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; - /** - * 经度 - */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; - /** - * 纬度 - */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; - /** - * 海拔 - */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - @TableField(exist = false) - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + @TableField(exist = false) + private String updateUid; - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - @TableField(exist = false) - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + @TableField(exist = false) + private Date updateTime; - @TableField(exist = false) - private String remark; + @TableField(exist = false) + private String remark; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java new file mode 100644 index 00000000..ebe1a249 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java @@ -0,0 +1,136 @@ +package com.kms.yxgh.df.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.SyBaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + + +/** + * 缺陷记录 bs_sgc_df_xcqx + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xcyj") +@Data +@ApiModel("堤防巡视养护管理表") +public class DfYhV2 extends SyBaseEntity { + + /** + * 巡查项目id + */ + @ApiModelProperty("巡查项目id") + private String checkingId; + /** + * 缺陷id + */ + @ApiModelProperty("缺陷id") + private String problemId; + /** + * 文档 + */ + @ApiModelProperty("文档") + private String doc; + + + /** + * 维养责任人id + */ + @ApiModelProperty("维养责任人id") + private String dutyHolderId; + + /** + * 维养责任人名称 + */ + @ApiModelProperty("维养责任人名称") + private String dutyHolderName; + + + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String problemLevel; + + + /** + * 记录id + */ + @ApiModelProperty("记录id") + private String recordId; + + /** + * 巡查状态字典:patrol_maintenance_status + */ + @ApiModelProperty("巡查状态字典:patrol_maintenance_status") + private String status; + + /** + * name + */ + @ApiModelProperty("name") + private String name; + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("堤防代码名称") + private String dikeName; + + /** + * 维养开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("维养开始时间") + private Date startDate; + + /** + * 维养结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("维养结束时间") + private Date endDate; + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private String createUid; + + + /** + * 附加配置 + */ + @ApiModelProperty("备注") + private String remark; + + + private String content; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java index 783065ca..2cd5584c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfAqjdProjecDto.java @@ -18,12 +18,16 @@ public class DfAqjdProjecDto extends DfProjectListDto { @ApiModelProperty("鉴定日期") private Date identifyTime; - /** 安全类别 */ + /** + * 安全类别 + */ @Excel(name = "安全类别") @ApiModelProperty("安全类别") private String securityCategory; - /** 安全鉴定意见 */ + /** + * 安全鉴定意见 + */ @ApiModelProperty("安全鉴定意见") private String safetyAppraisalOpinion; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java index 210917cf..a5365c24 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfCheckingDetailDto.java @@ -2,7 +2,9 @@ package com.kms.yxgh.df.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; + import java.util.List; + import lombok.Data; /** @@ -16,30 +18,30 @@ import lombok.Data; @ApiModel("堤防巡视检查详情") public class DfCheckingDetailDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("巡查名称") - private String name; + @ApiModelProperty("巡查名称") + private String name; - @ApiModelProperty("巡查类型") - private String type; + @ApiModelProperty("巡查类型") + private String type; - @ApiModelProperty("检查项") - private List items; + @ApiModelProperty("检查项") + private List items; - @Data - public static class DfCheckingItemDto { + @Data + public static class DfCheckingItemDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("检查部位") - private List parts; + @ApiModelProperty("检查部位") + private List parts; - @ApiModelProperty("检查内容") - private String content; - } + @ApiModelProperty("检查内容") + private String content; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java index 7a1e71c5..86d22ac2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingDto.java @@ -10,6 +10,7 @@ import java.util.List; /** * 堤防病险工程核查分组dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java index cf5a2588..3b7502b7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousGroupingRelDto.java @@ -12,7 +12,7 @@ import lombok.Data; */ @Data @ApiModel("堤防病险工程核查分组成员关联") -public class DfDangerousGroupingRelDto{ +public class DfDangerousGroupingRelDto { /** * id diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java index f9e57fda..5cc52122 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousParamDto.java @@ -28,7 +28,7 @@ public class DfDangerousParamDto { /** * 备注 */ - @ApiModelProperty (value = "备注") + @ApiModelProperty(value = "备注") private String remark; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectDto.java index 5d0f2799..a28d485e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectDto.java @@ -9,12 +9,13 @@ import java.util.Date; /** * 堤防病险工程核查项目dto对象 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防病险工程核查项目") -public class DfDangerousProjectDto{ +public class DfDangerousProjectDto { /** * id diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectItemDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectItemDto.java index 234e9c0e..45773687 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectItemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousProjectItemDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 堤防病险工程核查项目内容dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java index 07668e50..531f1115 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDetailDto.java @@ -8,7 +8,7 @@ import java.util.List; @Data @ApiModel("堤防病险工程任务详情") -public class DfDangerousTaskDetailDto extends DfDangerousTaskDto{ +public class DfDangerousTaskDetailDto extends DfDangerousTaskDto { /** * 问题描述列表 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDto.java index 7e5896be..f03b38dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskDto.java @@ -9,12 +9,13 @@ import java.util.Date; /** * 堤防病险工程核查任务dto对象 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防病险工程核查任务") -public class DfDangerousTaskDto extends DfDangerousTaskSearchDto{ +public class DfDangerousTaskDto extends DfDangerousTaskSearchDto { /** * id @@ -83,13 +84,13 @@ public class DfDangerousTaskDto extends DfDangerousTaskSearchDto{ /** * 病险工程核查分组名称 */ - @ApiModelProperty (value = "病险工程核查分组名称") + @ApiModelProperty(value = "病险工程核查分组名称") private String groupName; /** * 备注 */ - @ApiModelProperty (value = "备注") + @ApiModelProperty(value = "备注") private String remark; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskItemRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskItemRelDto.java index f57c0b1e..4a6c9106 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskItemRelDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskItemRelDto.java @@ -6,12 +6,13 @@ import lombok.Data; /** * 堤防监督检查工程问题对象 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防监督检查工程问题") -public class DfDangerousTaskItemRelDto { +public class DfDangerousTaskItemRelDto { @ApiModelProperty(value = "id") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java index 05a88354..a74a515f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskProjectRelDto.java @@ -6,12 +6,13 @@ import lombok.Data; /** * 堤防病险工程任务项目关联管理 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防病险工程任务项目关联管理") -public class DfDangerousTaskProjectRelDto{ +public class DfDangerousTaskProjectRelDto { @ApiModelProperty(value = "id") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java index f81a5cac..db1fb49f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfDangerousTaskSearchDto.java @@ -6,12 +6,13 @@ import lombok.Data; /** * 堤防病险工程核查任务检索详情 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防病险工程核查任务检索详情") -public class DfDangerousTaskSearchDto { +public class DfDangerousTaskSearchDto { /** * 主键 @@ -65,7 +66,7 @@ public class DfDangerousTaskSearchDto { * 堤防型式 */ @ApiModelProperty("堤防型式") - private String dikePatt; + private String dikePatt; /** * 堤防类型 diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java index 5d84e85f..0ba64d80 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfPointDto.java @@ -15,15 +15,15 @@ import lombok.Data; @ApiModel("堤防巡视检查计划点位") public class DfPointDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("经度") - private Double longitude; + @ApiModelProperty("经度") + private Double longitude; - @ApiModelProperty("纬度") - private Double latitude; + @ApiModelProperty("纬度") + private Double latitude; - @ApiModelProperty("海拔") - private Double altitude; + @ApiModelProperty("海拔") + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayDto.java new file mode 100644 index 00000000..ce3311f3 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayDto.java @@ -0,0 +1,15 @@ +package com.kms.yxgh.df.dto; + +import com.kms.yg.df.service.BsSgcDfSpPlayService; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel("视频播放") +@Data +public class DfSpPlayDto { + + @ApiModelProperty(value = "播放地址") + private BsSgcDfSpPlayService.Url urlsMap; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java new file mode 100644 index 00000000..00df6a71 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java @@ -0,0 +1,37 @@ +package com.kms.yxgh.df.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: DfSpPlayQueDto + * @Description: TODO + * @Date: 2024/3/5 上午10:18 + * * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("安全运行-视频播放") +public class DfSpPlayQueDto { + private static final long serialVersionUID = 1L; + @ApiModelProperty("手机号码") + private String mobile; + + @ApiModelProperty("视频id") + private String cameraId; + + @ApiModelProperty(value = "token") + private String token; + + @ApiModelProperty(value = "页码") + private Integer pageSize = 10; + + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java index 18a93acd..26d0db24 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 堤防监督检查工程问题DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemParamDto.java index d18cc998..9dd14a41 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseProblemParamDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 堤防监督检查工程问题DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseTaskDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseTaskDto.java index c626043e..fd2c4608 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseTaskDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseTaskDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 堤防监督检查任务管理DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java index 7e86b2b2..62fb844a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 堤防监督检查办法dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java index e887d00d..ce3901d8 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectDto.java @@ -9,12 +9,13 @@ import java.util.Date; /** * 堤防监督检查办法项目dto对象 + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("堤防监督检查办法项目") -public class DfSuperviseWayProjectDto{ +public class DfSuperviseWayProjectDto { @ApiModelProperty("id") private String id; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectItemDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectItemDto.java index fd10015a..3099f302 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectItemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSuperviseWayProjectItemDto.java @@ -8,6 +8,7 @@ import java.util.List; /** * 堤防监督检查办法项目内容dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhCharHiddenDangerDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhCharHiddenDangerDto.java index b5d5cd3f..ff8c7fbe 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhCharHiddenDangerDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhCharHiddenDangerDto.java @@ -3,8 +3,10 @@ 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 DfYhCharHiddenDangerDto { diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhHiddenDangerQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhHiddenDangerQueDto.java index 6ea8da53..5ad35a81 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhHiddenDangerQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhHiddenDangerQueDto.java @@ -16,7 +16,7 @@ import lombok.Data; @Data @ApiModel("巡查隐患概览统计") -public class DfYhHiddenDangerQueDto implements IAdcd { +public class DfYhHiddenDangerQueDto implements IAdcd { @ApiModelProperty("查询开始时间") private String patrolStart; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsDto.java index 9eca43cd..a824175e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsDto.java @@ -24,7 +24,7 @@ import java.util.Map; public class DfYhStatisticsDto { @ApiModelProperty("数据集") - private Map> map= Collections.emptyMap(); + private Map> map = Collections.emptyMap(); @Data @AllArgsConstructor diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java index d79c6971..63be142d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfYhStatisticsQueDto.java @@ -1,9 +1,11 @@ package com.kms.yxgh.df.dto; + import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + /** * @ClassName: DfYqExceedIndexDto * @Description: TODO diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListDto.java new file mode 100644 index 00000000..48b7e3d2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListDto.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.df.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@ApiModel("视频播放") +@Data +public class ReservoirListDto { + @ApiModelProperty(value = "视频ids") + private List cameraIds = new ArrayList<>(); + + @JSONField(name = "RES_CODE") + @ApiModelProperty(value = "水库编码") + private String resCode; + + + @ApiModelProperty(value = "页码") + private Integer pageSize = 1000; + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java new file mode 100644 index 00000000..f190fe7e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java @@ -0,0 +1,29 @@ +package com.kms.yxgh.df.dto; + +import com.alibaba.fastjson.annotation.JSONField; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @ClassName: ReservoirListQueDto + * @Description: TODO + * @Date: 2024/3/5 上午10:18 + * * + * @author: hxh + * @version: 1.0 + */ + +@Data +@ApiModel("水库视频列表") +public class ReservoirListQueDto { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "页码") + private Integer pageSize = 10; + + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java index 10582fa2..3975820b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/SimpleDfCheckingDto.java @@ -15,9 +15,9 @@ import lombok.Data; @ApiModel("堤防巡视检查") public class SimpleDfCheckingDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("巡查名称") - private String name; + @ApiModelProperty("巡查名称") + private String name; } diff --git 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 new file mode 100644 index 00000000..cb914dfd --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java @@ -0,0 +1,86 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DocV2Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("堤防巡查问题v2") +public class DfProblemV2Dto { + + /** + * id + */ + @ApiModelProperty("id") + private String id; + + /** + * 问题位置 + */ + @ApiModelProperty("问题位置") + private String position; + + /** + * 文档 + */ + @ApiModelProperty("文档") + private String doc; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("问题Id") + private String problemId; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("记录id") + private String recordId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + +} diff --git 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 new file mode 100644 index 00000000..722d703f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java @@ -0,0 +1,118 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DocV2Dto; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("堤防巡视检查记录详情v2") +public class DfRecordDetailV2Dto { + + + @ApiModelProperty("文档") + private DocV2Dto doc; + + @NotBlank(message = "巡查记录ID不能为空") + @ApiModelProperty("巡查记录") + private String id; + + @NotBlank(message = "巡查项目ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @NotBlank(message = "堤防编码不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("堤防编码") + private String dikeCode; + + @NotBlank(message = "堤防名称不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("堤防名称") + private String dikeName; + + @ApiModelProperty("堤防类型") + private String dikeType; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查范围") + private String scope; + + @ApiModelProperty("创建者") + private String createUid; + + @ApiModelProperty("创建者名称") + private String createName; + + @ApiModelProperty("记录id") + private String recordId; + + + + @ApiModelProperty("巡查详情") + private List problems = Collections.emptyList(); + + + @Data + public static class DfRecordItemDetailV2Dto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查项ID") + private String itemId; + + @ApiModelProperty("检查部位") + private List parts = Collections.emptyList(); + + @ApiModelProperty("位置") + private String position; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("状态") + private String status; + // + @ApiModelProperty("问题图片") + private List problemImages = Collections.emptyList(); + + } + + @ApiModelProperty("检查项") + private List items = Collections.emptyList(); + ; + +} diff --git 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 new file mode 100644 index 00000000..d164e35f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -0,0 +1,51 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +@Data +@ApiModel("堤防巡视检查记录检索条件v2") +public class DfRecordSearchV2Dto { + + @ApiModelProperty("堤防名称") + private String dikeName; + @ApiModelProperty("堤防类型") + private String dikeType; + @ApiModelProperty("巡查责任人") + private String dutyHolder; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty("巡查类型") + private String type; + @ApiModelProperty("巡查类别") + private String category; + @ApiModelProperty("问题级别") + private String problemLevel; + @ApiModelProperty("状态") + private String status; + + + @ApiModelProperty("记录详情列表标识查询 巡查中的数据 1是 0否") + private int recordDetailsFlag; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + + @ApiModelProperty("记录id") + private String recordId; + + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "开始时间") + private Date startDate; + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty(value = "结束时间") + private Date endDate; + +} diff --git 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 new file mode 100644 index 00000000..90c47ed4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java @@ -0,0 +1,54 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@ApiModel(value = "堤防巡查项目信息v2") +@Data +public class DfV2CheckingDto { + + @ApiModelProperty("堤防编码") + private String dikeCode; + @ApiModelProperty("堤防名称") + private String dikeName; + @ApiModelProperty("堤防类型") + private String dikeType; + + @NotNull + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("创建者") + private String createUid; + + @ApiModelProperty("创建者名称") + private String createName; + + + @ApiModelProperty("是否领取") + private Boolean isReceive; + + @ApiModelProperty("检查项") + private List items; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java new file mode 100644 index 00000000..871d588b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java @@ -0,0 +1,19 @@ +package com.kms.yxgh.df.dto.v2; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +@ApiModel(value = "堤防巡查项目查询v2") +public class DfV2CheckingSearchDto { + + @ApiModelProperty(value = "堤防编号") + private String dikeCode; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty("巡查类型") + private String type; + @ApiModelProperty("巡查类别") + private String category; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java new file mode 100644 index 00000000..a5bc0608 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java @@ -0,0 +1,27 @@ +package com.kms.yxgh.df.dto.v2; + + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@ApiModel(value = "堤防养护验收列表信息v2") +@Data +public class DfYhApproveDto extends DfV2CheckingDto { + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + + @ApiModelProperty("问题级别") + private String problemLevel; + + @ApiModelProperty("记录id") + private String recordId; + @ApiModelProperty("问题id") + private String problemId; + @ApiModelProperty("状态") + private String status; +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java new file mode 100644 index 00000000..81ccc0fb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java @@ -0,0 +1,88 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.common.dto.DocV2Dto; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("堤防巡视检查维养记录详情v2") +public class DfYhDetailV2Dto { + + @ApiModelProperty("巡查维养记录") + private String id; + + @ApiModelProperty("巡查名称") + private String name; + + @ApiModelProperty("问题id") + private String problemId; + + @ApiModelProperty("巡查记录id") + private String recordId; + + @NotBlank(message = "巡查项目ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @NotNull(message = "开始时间", groups = {UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("维养详情") + private String content; + + @ApiModelProperty("文档") + private DocV2Dto doc; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String problemLevel; + + /** + * 巡查类型 字典：patrol_maintenance_type + */ + @ApiModelProperty("巡查类型 字典：patrol_maintenance_type") + private String type; + + /** + * 巡查类别字典：key_jf_patrol_category + */ + @ApiModelProperty("巡查类别字典：patrol_maintenance_category") + private String category; + + /** + * 堤防代码 + */ + @ApiModelProperty("堤防代码") + private String dikeCode; + + + /** + * 堤防代码名称 + */ + @ApiModelProperty("堤防代码名称") + private String dikeName; + + +} diff --git 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 new file mode 100644 index 00000000..56086814 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java @@ -0,0 +1,66 @@ +package com.kms.yxgh.df.dto.v2; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.kms.yxgh.base.AddGroup; +import com.kms.yxgh.base.UpdateGroup; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@ApiModel("堤防巡查养护列表v2") +public class DfYhListV2Dto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("问题Id") + private String problemId; + + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("记录id") + private String recordId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @ApiModelProperty("状态") + private String status; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; + + @ApiModelProperty("审批id") + private String approvalId; + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("巡查名称") + private String name; + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java index c40db8fd..78acaf3b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfAnimalRecordMapper.java @@ -30,10 +30,10 @@ public interface DfAnimalRecordMapper extends BaseMapper { @SelectProvider(type = DfAnimalRecordSqlProvider.class, method = "selectPage") IPage selectPage(Page page, @Param("dto") DfAnimalRecordDto dto); - class DfAnimalRecordSqlProvider { + class DfAnimalRecordSqlProvider { public String selectPage(final Map param) { - return new SQL(){{ + return new SQL() {{ SELECT("t.id, t.dike_code, t.plan_id, t.plan_name, t.location, t.construction_status, t.pest, t.status"); FROM("bs_sgc_df_hdjl t"); WHERE("1 = 1"); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java new file mode 100644 index 00000000..626bbf32 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java @@ -0,0 +1,78 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.dto.*; +import com.kms.yxgh.common.enums.PatrolMaintenanceCategory; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * DfCheckingProblemV2Mapper + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingProblemV2Mapper extends BaseMapper { + + @Select("") + List count(@Param("data") ObjectStatisticQueDto sp); + + + @Select("") + List countDate(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + + @Select("") + List countLevel(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + + @Select("") + List countQx(@Param("data") ObjectStatisticQueDto sp); + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java new file mode 100644 index 00000000..01b42f33 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java @@ -0,0 +1,67 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.dto.CountDateDto; +import com.kms.yxgh.common.dto.CountDto; +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.enums.PatrolMaintenanceCategory; +import com.kms.yxgh.df.domain.DfCheckingRecord; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 害堤动物防治计划Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingRecordV2Mapper extends BaseMapper { + + @Select("") + List count(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + + @Select("") + List countDateGroup(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); + + @Select("" + ) + int countXm(@Param("data") ObjectStatisticQueDto sp); + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java new file mode 100644 index 00000000..e2452921 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java @@ -0,0 +1,36 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.common.dto.CountDto; +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * 害堤动物防治计划Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingV2Mapper extends BaseMapper { + + @Select("" + ) + List count(@Param("data") ObjectStatisticQueDto sp); + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2ProjectItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2ProjectItemMapper.java new file mode 100644 index 00000000..b28f54e2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2ProjectItemMapper.java @@ -0,0 +1,18 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import org.springframework.stereotype.Repository; + +/** + * DfCheckingV2ProjectItemMapper + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingV2ProjectItemMapper extends BaseMapper { + + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java index a1e58337..f8ab2f93 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingMapper.java @@ -11,16 +11,17 @@ import org.springframework.stereotype.Repository; /** * 堤防病险工程分组Mapper接口 + * * @author hry * @date 2024/3/12 14:44 */ @Repository public interface DfDangerousGroupingMapper extends BaseMapper { - @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + - "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_df_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + - " FROM bs_sgc_df_bxgcfz a " + - " LEFT JOIN sys_dept b ON a.dept_id = b.id " + - " order by a.create_time desc") - IPage selectByPage(Page page, @Param("dto") DfDangerousGroupingDto dto); + @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + + "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_df_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + + " FROM bs_sgc_df_bxgcfz a " + + " LEFT JOIN sys_dept b ON a.dept_id = b.id " + + " order by a.create_time desc") + IPage selectByPage(Page page, @Param("dto") DfDangerousGroupingDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java index 088b7ad6..7c9890e5 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfDangerousGroupingRelMapper.java @@ -11,6 +11,7 @@ import java.util.List; /** * 堤防病险工程分组关联Mapper接口 + * * @author hry * @date 2024/3/12 14:44 */ @@ -19,6 +20,7 @@ public interface DfDangerousGroupingRelMapper extends BaseMapper" + "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " + - "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords "+ + "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords " + "FROM bs_sgc_df_bxgcnrgl wt " + "LEFT JOIN bs_sgc_df_bxgcxm xm on wt.project_id = xm.id " + "LEFT JOIN bs_sgc_df_bxgcxmnr nr on wt.project_item_id = nr.id " + @@ -40,9 +40,8 @@ public interface DfDangerousTaskItemRelMapper extends BaseMapper selectByListParam(@Param("dto") DfDangerousTaskItemRelDto dto); - @Select("") int paragraphCountNumber(@Param("dto") DfYhHiddenDangerQueDto dto); @Select("") int yhCountNumber(@Param("dto") DfYhHiddenDangerQueDto dto); @Select("") int clCountNumber(@Param("dto") DfYhHiddenDangerQueDto dto); - @Select("") List yhNumberData(@Param("dto") DfYhHiddenDangerQueDto dto); @Select("") List clfNumberData(@Param("dto") DfYhHiddenDangerQueDto dto); - - - - // @Select("") - List situation (@Param("dto") DfYhStatisticsQueDto data); + List situation(@Param("dto") DfYhStatisticsQueDto data); } diff --git 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 new file mode 100644 index 00000000..17f7d4a1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java @@ -0,0 +1,53 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.common.dto.*; +import com.kms.yxgh.df.domain.DfYhV2; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhApproveDto; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * DfYhV2Mapper + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfYhV2Mapper extends BaseMapper { + + IPage> approvalSearchPage(Page page, @Param("dto") ApprovalSearchDto data); + + + @Select("") + List count(@Param("data") ObjectStatisticQueDto sp); + + + @Select("") + List countYhDto(@Param("data") ObjectStatisticQueDto sp); +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java index ee304b19..4f62a38c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingItemService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfCheckingItemService extends BaseService{ +public class DfCheckingItemService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java new file mode 100644 index 00000000..c34acdf9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -0,0 +1,111 @@ +package com.kms.yxgh.df.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.BeanUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +import static com.kms.yxgh.common.enums.DfYhV2StatusEnum.DURING_INSPECTION; + +/** + * 项目管理记录 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingProblemV2Service extends BaseService { + + + public IPage list(SearchParam sp) { + // 分页参数 + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + DfRecordSearchV2Dto data = sp.getData(); + + // 构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + if (!ObjectUtils.isEmpty(data)) { + Optional.ofNullable(data.getCategory()) + .filter(StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfCheckingProblemV2::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfCheckingProblemV2::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfCheckingProblemV2::getCheckingName, name)); + + Optional.ofNullable(data.getDutyHolder()) + .filter(StringUtils::isNotBlank) + .ifPresent(dutyHolder -> queryWrapper.like(DfCheckingProblemV2::getDutyHolderName, dutyHolder)); + + Optional.ofNullable(data.getStatus()) + .filter(StringUtils::isNotBlank) + .ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status)); + + if (!Objects.isNull(data.getStartDate())) { + queryWrapper.ge(DfCheckingProblemV2::getStartDate, data.getStartDate()); + } + + if (!Objects.isNull(data.getEndDate())) { + queryWrapper.le(DfCheckingProblemV2::getEndDate, data.getEndDate()); + } + Optional.ofNullable(data.getProblemLevel()) + .filter(StringUtils::isNotBlank) + .ifPresent(problemLevel -> queryWrapper.le(DfCheckingProblemV2::getProblemLevel, problemLevel)); + + Optional.ofNullable(data.getRecordId()) + .filter(StringUtils::isBlank) + .ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); + + } + + + + + queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); + + // 查询分页数据 + Page queryPage = page(page, queryWrapper); + if (queryPage == null) { + return new Page<>(); + } + + // 转换为 DTO 分页对象 + Page dtoPage = new Page<>(); + BeanUtils.copyProperties(queryPage, dtoPage); + + // 处理查询结果 + List vos = queryPage.getRecords().stream() + .map(record -> { + DfProblemV2Dto dto = new DfProblemV2Dto(); + BeanUtils.copyProperties(record, dto); + return dto; + }) + .collect(Collectors.toList()); + dtoPage.setRecords(vos); + return dtoPage; + } +} + + + + diff --git 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 new file mode 100644 index 00000000..5364dd7b --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -0,0 +1,254 @@ +package com.kms.yxgh.df.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfCheckingRecord; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; +import com.kms.yxgh.df.domain.DfYhV2; +import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.mapper.DfCheckingRecordV2Mapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.BeanUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +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; + +/** + * 项目管理记录 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingRecordV2Service extends BaseService { + + private final DfYhV2Service dfYhV2Service; + + + private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service; + + private final DfCheckingProblemV2Service dfCheckingProblemV2Service; + + public IPage list(SearchParam sp) { + // 分页参数 + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + DfRecordSearchV2Dto data = sp.getData(); + + // 构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (!ObjectUtils.isEmpty(data)) { + Optional.ofNullable(data.getCategory()) + .filter(StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfCheckingRecord::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfCheckingRecord::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfCheckingRecord::getCheckingName, name)); + + Optional.ofNullable(data.getDutyHolder()) + .filter(StringUtils::isNotBlank) + .ifPresent(dutyHolder -> queryWrapper.like(DfCheckingRecord::getDutyHolderName, dutyHolder)); + + Optional.ofNullable(data.getStatus()) + .filter(StringUtils::isNotBlank) + .ifPresent(status -> queryWrapper.like(DfCheckingRecord::getStatus, status)); + + + if (!Objects.isNull(data.getStartDate())) { + queryWrapper.ge(DfCheckingRecord::getStartDate, data.getStartDate()); + } + + if (!Objects.isNull(data.getEndDate())) { + queryWrapper.le(DfCheckingRecord::getEndDate, data.getEndDate()); + } + } + + // 查询分页数据 + Page queryPage = page(page, queryWrapper); + if (queryPage == null) { + return new Page<>(); + } + + // 转换为 DTO 分页对象 + Page dtoPage = new Page<>(); + BeanUtils.copyProperties(queryPage, dtoPage); + + // 处理查询结果 + List vos = queryPage.getRecords().stream() + .map(record -> { + DfRecordDetailV2Dto dto = new DfRecordDetailV2Dto(); + BeanUtils.copyProperties(record, dto); + return dto; + }) + .collect(Collectors.toList()); + dtoPage.setRecords(vos); + return dtoPage; + + } + + public DfRecordDetailV2Dto getInfo(String id) { + DfRecordDetailV2Dto dto = new DfRecordDetailV2Dto(); + DfCheckingRecord dfCheckingRecord = getById(id); + if (dfCheckingRecord == null) { + return dto; + } + BeanUtils.copyProperties(dfCheckingRecord, dto); + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .eq(DfCheckingV2ProjectItem::getCheckingId, dfCheckingRecord.getCheckingId()) + ); + dto.setItems(items.stream() + .map(DfCheckingV2Service::convertToItemDto) + .collect(Collectors.toList())); + List recordsList = dfCheckingProblemV2Service.list(new LambdaQueryWrapper() + .eq(DfCheckingProblemV2::getRecordId, dfCheckingRecord.getId())); + List dtoList = new ArrayList<>(); + for (DfCheckingProblemV2 record : recordsList) { + DfRecordDetailV2Dto.DfRecordItemDetailV2Dto detailV2Dto = new DfRecordDetailV2Dto.DfRecordItemDetailV2Dto(); + if (null != record.getParts()) { + detailV2Dto.setParts(DfCheckingV2Service.getStringList(record.getParts().split(","))); + } + if (null != record.getDoc()) { + detailV2Dto.setProblemImages(DfCheckingV2Service.getStringList(record.getDoc().split(","))); + } + detailV2Dto.setItemId(record.getItemId()); + detailV2Dto.setId(record.getId()); + detailV2Dto.setPosition(record.getPosition()); + detailV2Dto.setContent(record.getContent()); + detailV2Dto.setProblemLevel(record.getProblemLevel()); + detailV2Dto.setStatus(record.getStatus()); + dtoList.add(detailV2Dto); + } + dto.setProblems(dtoList); + return dto; + } + + @Transactional(rollbackFor = Exception.class) + public DfRecordDetailV2Dto edit(DfRecordDetailV2Dto dfRecord, Boolean commit) { + // 先删后加 + myRemovePraIds(dfRecord); + if (commit) { + DfCheckingRecord dfCheckingRecord = new DfCheckingRecord(); + BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + // 提交为已巡检 + dfCheckingRecord.setStatus(DfYhV2StatusEnum.INSPECTED.getValue()); + // 如果相关缺陷大于一条就是养护中 + if (!dfRecord.getProblems().isEmpty()) { + dfCheckingRecord.setStatus(DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue()); + } else { + // 提交时缺陷无数据就是无缺陷 + dfCheckingRecord.setStatus(DfYhV2StatusEnum.NO_DEFECTS.getValue()); + } + mySaveOrUpdate(dfCheckingRecord); + dfRecord.setStatus(dfCheckingRecord.getStatus()); + dfRecord.setRecordId(dfCheckingRecord.getId()); + dfCheckingProblemV2Service.saveOrUpdateBatch(convertToImages(dfRecord)); + return dfRecord; + } else { + DfCheckingRecord dfCheckingRecord = new DfCheckingRecord(); + BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + // 未提交维巡查中 + dfCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue()); + 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 ids = dfRecord.getProblems() + .stream() + .map(DfRecordDetailV2Dto.DfRecordItemDetailV2Dto::getId).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(ids)) { + dfCheckingProblemV2Service.remove(new LambdaQueryWrapper().in(DfCheckingProblemV2::getId, ids)); + dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getProblemId, ids)); + } + } + + public static List convertToImages(DfRecordDetailV2Dto dfRecord) { + List dfCheckingProblemV2s = new ArrayList<>(); + dfRecord.getProblems().forEach(e -> { + DfCheckingProblemV2 dfCheckingProblemV2 = new DfCheckingProblemV2(); + BeanUtils.copyProperties(e, dfCheckingProblemV2); + dfCheckingProblemV2.setCheckingId(dfRecord.getCheckingId()); + dfCheckingProblemV2.setRecordId(dfRecord.getRecordId()); + dfCheckingProblemV2.setCheckingName(dfRecord.getCheckingName()); + dfCheckingProblemV2.setDikeCode(dfRecord.getDikeCode()); + dfCheckingProblemV2.setDikeName(dfRecord.getDikeName()); + dfCheckingProblemV2.setDutyHolderName(dfRecord.getCreateName()); + dfCheckingProblemV2.setDutyHolderId(dfRecord.getCreateUid()); + dfCheckingProblemV2.setStartDate(dfRecord.getStartDate()); + dfCheckingProblemV2.setEndDate(dfRecord.getEndDate()); + dfCheckingProblemV2.setType(dfRecord.getType()); + dfCheckingProblemV2.setCategory(dfRecord.getCategory()); + dfCheckingProblemV2.setStatus(dfRecord.getStatus()); + dfCheckingProblemV2.setItemId(e.getItemId()); + if (null != e.getParts()) { + dfCheckingProblemV2.setParts(String.join(",", e.getParts())); + } + if (null != e.getProblemImages()) { + dfCheckingProblemV2.setDoc(String.join(",", e.getProblemImages())); + + } + dfCheckingProblemV2s.add(dfCheckingProblemV2); + }); + return dfCheckingProblemV2s; + } + + @Transactional(rollbackFor = Exception.class) + public Boolean myRemove(String[] ids) { + if (null != ids && ids.length > 0) { + int count = dfCheckingProblemV2Service.count(new LambdaQueryWrapper() + .in(DfCheckingProblemV2::getCheckingId + , DfCheckingV2Service.getIntList(ids)) + ); + if (count > 0) { + throw new RuntimeException("请先删除项目子项"); + } + dfCheckingProblemV2Service.remove(new LambdaQueryWrapper() + .in(DfCheckingProblemV2::getCheckingId, DfCheckingV2Service.getIntList(ids))); + + return remove(new LambdaQueryWrapper() + .in(DfCheckingRecord::getId, DfCheckingV2Service.getIntList(ids))); + } + return Boolean.FALSE; + } + +} + + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java new file mode 100644 index 00000000..114c1ab1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java @@ -0,0 +1,19 @@ +package com.kms.yxgh.df.service; + +import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; +import com.kms.yxgh.df.mapper.DfCheckingV2ProjectItemMapper; +import com.shuili.common.core.service.BaseService; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +/** + * 项目管理项 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingV2ProjectItemV2Service extends BaseService { + +} diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java new file mode 100644 index 00000000..251fa677 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -0,0 +1,248 @@ +package com.kms.yxgh.df.service; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +import com.kms.yxgh.df.dto.v2.DfV2CheckingDto; +import com.kms.yxgh.df.dto.v2.DfV2CheckingSearchDto; +import com.kms.yxgh.df.mapper.DfCheckingV2Mapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.core.service.BaseService; +import com.shuili.common.utils.BeanUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.*; +import java.util.stream.Collectors; + +/** + * 项目管理 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingV2Service extends BaseService { + + private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service; + private final DfCheckingRecordV2Service dfCheckingRecordV2Service; + + public IPage list(SearchParam sp) { + // 分页参数 + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + DfV2CheckingSearchDto data = sp.getData(); + + // 构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (!ObjectUtils.isEmpty(data)) { + Optional.ofNullable(data.getCategory()) + .filter(StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfCheckingV2ProjectManage::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfCheckingV2ProjectManage::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfCheckingV2ProjectManage::getName, name)); + } + + // 查询分页数据 + Page queryPage = page(page, queryWrapper); + if (queryPage == null) { + return new Page<>(); + } + + // 转换为 DTO 分页对象 + Page dtoPage = new Page<>(); + BeanUtils.copyProperties(queryPage, dtoPage); + + // 处理查询结果 + List vos = queryPage.getRecords().stream() + .map(record -> { + DfV2CheckingDto dto = new DfV2CheckingDto(); + BeanUtils.copyProperties(record, dto); + return dto; + }) + .collect(Collectors.toList()); + + // 获取关联的项目项 + List ids = vos.stream() + .map(DfV2CheckingDto::getId) + .collect(Collectors.toList()); + + if (CollectionUtils.isEmpty(ids)) { + return dtoPage; + } + + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .in(DfCheckingV2ProjectItem::getCheckingId, ids) + ); + + // 将项目项关联到 DTO + vos.forEach(dto -> { + List itemDtos = items.stream() + .filter(item -> Objects.equals(item.getCheckingId(), dto.getId())) + .map(DfCheckingV2Service::convertToItemDto) + .collect(Collectors.toList()); + dto.setItems(itemDtos); + }); + + dtoPage.setRecords(vos); + return dtoPage; + } + + + /** + * 将 DfCheckingV2ProjectItem 转换为 DfCheckingDetailDto.DfCheckingItemDto + * + * @param item 原始对象 + * @return 转换后的 DTO 对象 + */ + public static DfCheckingDetailDto.DfCheckingItemDto convertToItemDto(DfCheckingV2ProjectItem item) { + DfCheckingDetailDto.DfCheckingItemDto itemDto = new DfCheckingDetailDto.DfCheckingItemDto(); + itemDto.setId(item.getId()); + itemDto.setContent(item.getContent()); + + // 处理 parts 字段 + Optional.ofNullable(item.getParts()) + .filter(StringUtils::isNotBlank) + .ifPresent(parts -> itemDto.setParts(Arrays.asList(parts.split(",")))); + + return itemDto; + } + + public DfV2CheckingDto getInfo(String id) { + DfCheckingV2ProjectManage dfCheckingV2ProjectManage = getById(id); + DfV2CheckingDto dto = new DfV2CheckingDto(); + if (!Objects.isNull(dfCheckingV2ProjectManage)) { + BeanUtils.copyProperties(dfCheckingV2ProjectManage, dto); + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .eq(DfCheckingV2ProjectItem::getCheckingId, id) + ); + + dto.setItems(items.stream() + .map(DfCheckingV2Service::convertToItemDto) + .collect(Collectors.toList())); + } + return dto; + } + + @Transactional(rollbackFor = Exception.class) + public DfV2CheckingDto add(DfV2CheckingDto dto) { + // 将 DTO 转换为实体对象 + DfCheckingV2ProjectManage dfCheckingV2ProjectManage = new DfCheckingV2ProjectManage(); + BeanUtils.copyProperties(dto, dfCheckingV2ProjectManage); + + // 保存实体对象 + if (!save(dfCheckingV2ProjectManage)) { + throw new RuntimeException("保存失败"); + } + // 处理关联的 items + Optional.ofNullable(dto.getItems()) + .filter(items -> !items.isEmpty()) + .ifPresent(items -> { + List projectItems = items.parallelStream() // 使用并行流 + .map(item -> { + DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); + projectItem.setCheckingId(dfCheckingV2ProjectManage.getId()); + projectItem.setContent(item.getContent()); + projectItem.setParts(String.join(",", item.getParts())); + return projectItem; + }) + .collect(Collectors.toList()); + // 批量保存 items + dfCheckingV2ProjectItemV2Service.saveBatch(projectItems); + }); + return dto; + } + + @Transactional(rollbackFor = Exception.class) + public DfV2CheckingDto edit(DfV2CheckingDto dfV2Ck) { + + + if (StringUtils.isBlank(dfV2Ck.getId())) { + return null; + } + + DfCheckingV2ProjectManage dfCheckingV2ProjectManage = getById(dfV2Ck.getId()); + if (dfCheckingV2ProjectManage == null) { + return null; + } + + BeanUtils.copyProperties(dfV2Ck, dfCheckingV2ProjectManage); + + if (!updateById(dfCheckingV2ProjectManage)) { + throw new RuntimeException("修改失败"); + } + + dfCheckingV2ProjectItemV2Service + .remove(new LambdaQueryWrapper() + .eq(DfCheckingV2ProjectItem::getCheckingId, dfV2Ck.getId())); + + + List items = dfV2Ck.getItems().stream() + .map(item -> { + DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); + projectItem.setId(item.getId()); + projectItem.setCheckingId(dfCheckingV2ProjectManage.getId()); + projectItem.setContent(item.getContent()); + projectItem.setParts(String.join(",", item.getParts())); + return projectItem; + }) + .collect(Collectors.toList()); + + if (!dfCheckingV2ProjectItemV2Service.saveOrUpdateBatch(items)) { + throw new RuntimeException("项目子项修改失败"); + } + + return dfV2Ck; + } + + @Transactional(rollbackFor = Exception.class) + public boolean myRemove(String[] ids) { + if (null != ids && ids.length > 0) { + dfCheckingV2ProjectItemV2Service.remove(new LambdaQueryWrapper() + .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids))); + + return remove(new LambdaQueryWrapper() + .in(DfCheckingV2ProjectManage::getId, getIntList(ids))); + } + return Boolean.FALSE; + } + + public static List getIntList(String[] ids) { + if (ids == null) { + return new ArrayList<>(); + } + return Arrays.stream(ids) + .map(Integer::valueOf) + .collect(Collectors.toList()); + } + + public static List getStringList(String[] ids) { + if (ids == null) { + return new ArrayList<>(); + } + return Arrays.stream(ids) + .collect(Collectors.toList()); + } +} + + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java index bf90f994..ff31c329 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousGroupingService.java @@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Transactional; */ @Service @AllArgsConstructor -public class DfDangerousGroupingService extends BaseService { +public class DfDangerousGroupingService extends BaseService { private final DfDangerousGroupingRelMapper relMapper; @@ -88,7 +88,7 @@ public class DfDangerousGroupingService extends BaseServicelambdaQuery().eq(DfDangerousGroupingRel::getGroupId, id)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java index 27f1dee1..f59b48b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfDangerousTaskService.java @@ -50,7 +50,7 @@ public class DfDangerousTaskService extends BaseService itemRel = dto.getProblemList().stream().filter(v->StringUtils.isNotBlank(v.getLevel())).map(level -> { + List itemRel = dto.getProblemList().stream().filter(v -> StringUtils.isNotBlank(v.getLevel())).map(level -> { DfDangerousTaskItemRel problem = new DfDangerousTaskItemRel(); BeanCopyUtils.copy(level, problem); problem.setId(null); @@ -121,7 +121,7 @@ public class DfDangerousTaskService extends BaseService{ +public class DfPlanOperatorService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java index efa1d547..6c7ce659 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfPointService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfPointService extends BaseService{ +public class DfPointService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java index f9826a3f..a311790b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordItemService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfRecordItemService extends BaseService{ +public class DfRecordItemService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java index 6e840fea..ce08fe5f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java @@ -40,6 +40,7 @@ import com.shuili.common.utils.poi.ExcelUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -64,9 +65,8 @@ public class DfRecordService extends BaseService { private final SysXzqhService sysXzqhService; - public DfYhCharHiddenDangerDto hiddenDanger(DfYhHiddenDangerQueDto dto) { - DfYhCharHiddenDangerDto dfYhCharHiddenDangerDto=new DfYhCharHiddenDangerDto(); + DfYhCharHiddenDangerDto dfYhCharHiddenDangerDto = new DfYhCharHiddenDangerDto(); // 堤防段数 dfYhCharHiddenDangerDto.setDfNumber(baseMapper.paragraphCountNumber(dto)); @@ -75,14 +75,14 @@ public class DfRecordService extends BaseService { // 处置数 dfYhCharHiddenDangerDto.setCzNumber(baseMapper.clCountNumber(dto)); - List list =new ArrayList<>(); + List list = new ArrayList<>(); // 隐患数量数据 List yhModel = baseMapper.yhNumberData(dto); if (!CollectionUtil.isEmpty(yhModel)) { list.addAll(yhModel); } // 处理数量数据 - List clModel = baseMapper.clfNumberData(dto); + List clModel = baseMapper.clfNumberData(dto); if (CollectionUtil.isEmpty(list)) { return dfYhCharHiddenDangerDto; } @@ -93,11 +93,11 @@ public class DfRecordService extends BaseService { .collect(Collectors.groupingBy(DfYhHiddenDangerModel::getAdcd)); if (!CollectionUtil.isEmpty(groupingByList)) { - List xList =new ArrayList<>(); - ListyAxisList=new ArrayList<>(); + List xList = new ArrayList<>(); + List yAxisList = new ArrayList<>(); // 是否查询区级 - boolean flag = ( StringUtils.isNotEmpty(dto.getDistrictLevelFlag()) + boolean flag = (StringUtils.isNotEmpty(dto.getDistrictLevelFlag()) && Objects.equals("1", dto.getDistrictLevelFlag())); if (flag) { SysXzqh xzqhdm = sysXzqhService.getOne(new LambdaQueryWrapper() @@ -117,7 +117,7 @@ public class DfRecordService extends BaseService { .likeRight(SysXzqh::getXzqhdm, entry.getKey()) .orderByDesc(SysXzqh::getCreateTime) .last("limit 1")); - if (null!=xzqhdm) { + if (null != xzqhdm) { xList.add(xzqhdm.getName()); } } @@ -131,16 +131,16 @@ public class DfRecordService extends BaseService { return dfYhCharHiddenDangerDto; } - private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry> entry) { - List seriesList =new ArrayList<>(); + private DfYhCharHiddenDangerDto.YAxis getyAxis(Map.Entry> entry) { + List seriesList = new ArrayList<>(); for (DfYhHiddenDangerModel it : entry.getValue()) { - DfYhCharHiddenDangerDto.Series series=new DfYhCharHiddenDangerDto.Series(); + DfYhCharHiddenDangerDto.Series series = new DfYhCharHiddenDangerDto.Series(); series.setCount(it.getCount()); series.setType(it.getProblem()); seriesList.add(series); } // 设置 y轴 - DfYhCharHiddenDangerDto.YAxis yAxisInfo=new DfYhCharHiddenDangerDto.YAxis(); + DfYhCharHiddenDangerDto.YAxis yAxisInfo = new DfYhCharHiddenDangerDto.YAxis(); yAxisInfo.setName("次数"); yAxisInfo.setUnit("个"); yAxisInfo.setSeries(seriesList); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java index 1a72ac9c..dfb0652a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseEngineeringService.java @@ -133,6 +133,7 @@ public class DfSuperviseEngineeringService extends BaseService { - public IPage list(SearchParam sp){ + public IPage list(SearchParam sp) { Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); //根据创建时间倒序排列 IPage pageData = this.getBaseMapper().selectPage(page, sp.getData()); @@ -39,7 +39,7 @@ public class DfSuperviseTaskService extends BaseService list = this.getBaseMapper().selectTaskInfo(superviseTaskDto); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseWayService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseWayService.java index 4fb66d08..41e4bb2b 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseWayService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfSuperviseWayService.java @@ -58,7 +58,7 @@ public class DfSuperviseWayService extends BaseServicelambdaQuery().eq(DfSuperviseWay::getStatus, SuperviseWayStatus.ENABLE.getValue())); } - + public DfSuperviseWayDto getDetailById(String id) { DfSuperviseWay superviseWay = this.getById(id); return BeanCopyUtils.copy(superviseWay, DfSuperviseWayDto.class); @@ -193,7 +193,7 @@ public class DfSuperviseWayService extends BaseService ids = listData(enable.getId()).stream().map(DfSuperviseWayProjectDto::getId).collect(Collectors.toList()); if (!ids.isEmpty()) { // 1.3 查询项目内容 - DfSuperviseWayProjectItemDto dto = new DfSuperviseWayProjectItemDto(); + DfSuperviseWayProjectItemDto dto = new DfSuperviseWayProjectItemDto(); dto.setIds(ids); superviseWayOtherDto.setItemList(getDataItemList(dto)); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java index 8c95d456..7e9b0fdb 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfTraceService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-09 */ @Service -public class DfTraceService extends BaseService{ +public class DfTraceService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java index 6b224003..978b3da9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhOperatorService.java @@ -12,6 +12,6 @@ import org.springframework.stereotype.Service; * @date 2023-11-20 */ @Service -public class DfYhOperatorService extends BaseService{ +public class DfYhOperatorService extends BaseService { } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java index 352fcc4b..cad94e88 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhRecordService.java @@ -53,17 +53,17 @@ public class DfYhRecordService extends DefaultApprovalBusinessService list = baseMapper.situation(dto); - DfYhCharInfoDto dtoInfo=new DfYhCharInfoDto(); - if (CollectionUtil.isEmpty(list)){ + DfYhCharInfoDto dtoInfo = new DfYhCharInfoDto(); + if (CollectionUtil.isEmpty(list)) { return dtoInfo; } Map> groupingByList = list.stream() .collect(Collectors.groupingBy(DfYhStatisticsModelDto::getAdcd)); - List xList =new ArrayList<>(); - ListyAxisList=new ArrayList<>(); + List xList = new ArrayList<>(); + List yAxisList = new ArrayList<>(); for (Map.Entry> entry : groupingByList.entrySet()) { // 设置 x轴 @@ -81,16 +81,16 @@ public class DfYhRecordService extends DefaultApprovalBusinessService> entry) { - List seriesList =new ArrayList<>(); + private DfYhCharInfoDto.YAxis getyAxis(Map.Entry> entry) { + List seriesList = new ArrayList<>(); for (DfYhStatisticsModelDto it : entry.getValue()) { - DfYhCharInfoDto.Series series=new DfYhCharInfoDto.Series(); + DfYhCharInfoDto.Series series = new DfYhCharInfoDto.Series(); series.setCount(it.getCount()); series.setDutyHolderType(it.getDutyHolderType()); seriesList.add(series); } // 设置 y轴 - DfYhCharInfoDto.YAxis yAxisInfo=new DfYhCharInfoDto.YAxis(); + DfYhCharInfoDto.YAxis yAxisInfo = new DfYhCharInfoDto.YAxis(); yAxisInfo.setName("次数"); yAxisInfo.setUnit("个"); yAxisInfo.setSeries(seriesList); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhStatisticsService.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhStatisticsService.java index b37d1443..20f0e789 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhStatisticsService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhStatisticsService.java @@ -1,4 +1,5 @@ package com.kms.yxgh.df.service; + import com.kms.yxgh.df.dto.DfYhCharHiddenDangerDto; import com.kms.yxgh.df.dto.DfYhCharInfoDto; import com.kms.yxgh.df.dto.DfYhHiddenDangerQueDto; @@ -21,13 +22,13 @@ public class DfYhStatisticsService { private final DfYhRecordService dfYhRecordService; - private final DfRecordService dfRecordService; + private final DfRecordService dfRecordService; - public DfYhCharInfoDto situation(DfYhStatisticsQueDto dto){ + public DfYhCharInfoDto situation(DfYhStatisticsQueDto dto) { return dfYhRecordService.situation(dto); } - public DfYhCharHiddenDangerDto hiddenDanger(DfYhHiddenDangerQueDto dto){ + public DfYhCharHiddenDangerDto hiddenDanger(DfYhHiddenDangerQueDto dto) { return dfRecordService.hiddenDanger(dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java new file mode 100644 index 00000000..b046af9d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java @@ -0,0 +1,201 @@ +package com.kms.yxgh.df.service; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.common.ApprovalStatusEnum; +import com.kms.yxgh.common.ApprovalTypeEnum; +import com.kms.yxgh.common.dto.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.dto.DocV2Dto; +import com.kms.yxgh.common.enums.DfYhV2StatusEnum; +import com.kms.yxgh.common.service.ApprovalService; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfYhV2; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhApproveDto; +import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +import com.kms.yxgh.df.mapper.DfYhV2Mapper; +import com.shuili.common.core.domain.SearchParam; +import com.shuili.common.utils.BeanUtils; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * 项目管理记录 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfYhV2Service extends DefaultApprovalBusinessService { + + private ApprovalService approvalService; + + public IPage list(SearchParam sp) { + // 分页参数 + Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); + DfRecordSearchV2Dto data = sp.getData(); + + // 构建查询条件 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (!ObjectUtils.isEmpty(data)) { + Optional.ofNullable(data.getCategory()) + .filter(StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfYhV2::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfYhV2::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfYhV2::getName, name)); + + Optional.ofNullable(data.getDutyHolder()) + .filter(StringUtils::isNotBlank) + .ifPresent(dutyHolder -> queryWrapper.like(DfYhV2::getDutyHolderName, dutyHolder)); + + Optional.ofNullable(data.getStatus()) + .filter(StringUtils::isNotBlank) + .ifPresent(status -> queryWrapper.like(DfYhV2::getStatus, status)); + + if (!Objects.isNull(data.getStartDate())) { + queryWrapper.ge(DfYhV2::getStartDate, data.getStartDate()); + } + + if (!Objects.isNull(data.getEndDate())) { + queryWrapper.le(DfYhV2::getEndDate, data.getEndDate()); + } + + Optional.ofNullable(data.getProblemLevel()) + .filter(StringUtils::isNotBlank) + .ifPresent(problemLevel -> queryWrapper.le(DfYhV2::getProblemLevel, problemLevel)); + + Optional.ofNullable(data.getRecordId()) + .filter(StringUtils::isBlank) + .ifPresent(recordId -> queryWrapper.eq(DfYhV2::getRecordId, recordId)); + + } + + // 查询分页数据 + Page queryPage = page(page, queryWrapper); + if (queryPage == null) { + return new Page<>(); + } + + // 转换为 DTO 分页对象 + Page dtoPage = new Page<>(); + BeanUtils.copyProperties(queryPage, dtoPage); + + // 处理查询结果 + List vos = queryPage.getRecords().stream() + .map(record -> { + DfYhListV2Dto dto = new DfYhListV2Dto(); + BeanUtils.copyProperties(record, dto); + dto.setApprovalId(approvalService.getTaskId(dto.getId(), ApprovalTypeEnum.YH_V2_RECORD)); + return dto; + }) + .collect(Collectors.toList()); + dtoPage.setRecords(vos); + return dtoPage; + } + + + public DfYhDetailV2Dto getInfo(String id) { + DfYhDetailV2Dto dto = new DfYhDetailV2Dto(); + DfYhV2 dfYhV2 = getById(id); + if (dfYhV2 != null) { + BeanUtils.copyProperties(dfYhV2, dto); + dto.setDoc(JSONObject.parseObject(dfYhV2.getDoc(), DocV2Dto.class)); + } + return dto; + } + + + public Boolean myRemove(String[] ids) { + if (null != ids && ids.length > 0) { + return remove(new LambdaQueryWrapper() + .in(DfYhV2::getId, DfCheckingV2Service.getIntList(ids))); + } + return Boolean.FALSE; + } + + public DfYhDetailV2Dto edit(DfYhDetailV2Dto dfYh, Boolean commit) { + DfYhDetailV2Dto dto = new DfYhDetailV2Dto(); + DfYhV2 dfYhV2 = new DfYhV2(); + if (commit) { + BeanUtils.copyProperties(dfYh, dfYhV2); + dfYhV2.setDoc(getDocStrJson(dfYh.getDoc())); + dfYhV2.setStatus(DfYhV2StatusEnum.YES_UNDER.getValue()); + saveOrUpdate(dfYhV2); + BeanUtils.copyProperties(dfYhV2, dto); + approvalService.submit(dfYhV2.getId(), ApprovalTypeEnum.YH_V2_RECORD); + return dto; + } else { + BeanUtils.copyProperties(dfYh, dfYhV2); + dfYhV2.setDoc(getDocStrJson(dfYh.getDoc())); + dfYhV2.setStatus(DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue()); + saveOrUpdate(dfYhV2); + BeanUtils.copyProperties(dfYhV2, dto); + return dto; + } + } + + private static String getDocStrJson(DocV2Dto dto) { + if (dto == null) { + return null; + } + return JSONObject.toJSONString(dto); + + } + + @Override + public IPage> approvalSearch(SearchParam> sp) { + if (sp.getData() == null) { + return new Page<>(); + } + return this.getBaseMapper().approvalSearchPage(new Page<>(sp.getPageNum(), sp.getPageSize()), sp.getData()); + } + + @Override + public void updateApprovalStatus(String formId, ApprovalStatusEnum status) { + String formStatus; + switch (status){ + case PASS: + formStatus = DfYhV2StatusEnum.ACCEPTED.getValue(); + break; + case REJECT: + formStatus = DfYhV2StatusEnum.UNDER_MAINTENANCE.getValue(); + break; + default: + formStatus = DfYhV2StatusEnum.YES_UNDER.getValue(); + } + Wrapper wp = Wrappers.lambdaUpdate() + .eq(DfYhV2::getId, formId) + .set(DfYhV2::getStatus, formStatus); + this.update(null, wp); + } + + @Override + public String formStatus(String formId) { + return ApprovalStatusEnum.SUBMITTING.getValue(); + } +} + + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java b/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java index c868bdf8..c97c6bc4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java +++ b/shuili-system/src/main/java/com/kms/yxgh/model/DfYhHiddenDangerModel.java @@ -4,6 +4,7 @@ import com.kms.yxgh.df.dto.DfYhHiddenDangerDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; + /** * @ClassName: DfYhHiddenDangerModel * @Description: 巡查隐患概览统计 @@ -15,7 +16,7 @@ import lombok.Data; @ApiModel("巡查隐患概览统计") @Data -public class DfYhHiddenDangerModel { +public class DfYhHiddenDangerModel { @ApiModelProperty("地区code") private String adcd; @@ -30,5 +31,4 @@ public class DfYhHiddenDangerModel { private Integer handleStatus; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java b/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java index 4db06b8f..2c62e501 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/model/DfYhStatisticsModelDto.java @@ -14,7 +14,7 @@ import lombok.Data; @ApiModel("巡查情况概览") @Data -public class DfYhStatisticsModelDto { +public class DfYhStatisticsModelDto { @ApiModelProperty("次数") private Integer count; @@ -24,5 +24,4 @@ public class DfYhStatisticsModelDto { private String dutyHolderType; - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java index 3ab4f5fa..65d02adf 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzCheckingController.java @@ -45,7 +45,8 @@ public class SzCheckingController { Map params = sp.getParams() == null ? new HashMap<>(2) : sp.getParams(); params.put(SearchParam.ORDER_BY, "update_time"); params.put(SearchParam.SORT_BY, ""); - sp.setParams(params);; + sp.setParams(params); + ; return szCheckingService.selectPage(sp); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java index a2d76952..d70f85ad 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousGroupingController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * 水闸病险工程分组 + * * @author hry * @date 2024/3/12 14:44 */ @@ -27,6 +28,7 @@ public class SzDangerousGroupingController { /** * 查询水闸病险工程分组列表 + * * @param sp * @return */ @@ -38,6 +40,7 @@ public class SzDangerousGroupingController { /** * 查询水闸病险工程分组详情 + * * @param id * @return */ @@ -70,6 +73,7 @@ public class SzDangerousGroupingController { /** * 删除水闸病险工程分组 + * * @param id * @return */ @@ -79,5 +83,5 @@ public class SzDangerousGroupingController { public Response deleteData(@PathVariable String id) { return Response.ok(groupingService.deleteById(id)); } - + } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousProjectController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousProjectController.java index ad1a006c..325c6579 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousProjectController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousProjectController.java @@ -15,6 +15,7 @@ import java.util.List; /** * 水闸病险工程核查项目 + * * @author hry * @date 2024/3/12 14:44 */ @@ -28,6 +29,7 @@ public class SzDangerousProjectController { /** * 查询水闸病险工程核查项目列表 + * * @param dto * @return */ @@ -39,6 +41,7 @@ public class SzDangerousProjectController { /** * 查询水闸病险工程核查项目详情 + * * @param id * @return */ @@ -61,6 +64,7 @@ public class SzDangerousProjectController { /** * 删除水闸病险工程核查项目 + * * @param id * @return */ @@ -72,10 +76,9 @@ public class SzDangerousProjectController { } - - /** * 新增/修改水闸病险工程核查项目内容 + * * @param item * @return */ @@ -88,6 +91,7 @@ public class SzDangerousProjectController { /** * 删除水闸病险工程核查项目内容 + * * @param id * @return */ @@ -100,6 +104,7 @@ public class SzDangerousProjectController { /** * 查询水闸病险工程核查项目内容列表 + * * @param dto * @return */ @@ -111,6 +116,7 @@ public class SzDangerousProjectController { /** * 查询水闸病险工程核查项目内容详情 + * * @param id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java index 289cdcf8..c9e8de27 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzDangerousTaskController.java @@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.*; /** * 水闸病险工程核查任务 + * * @author hry * @date 2024/3/12 14:44 */ @@ -27,6 +28,7 @@ public class SzDangerousTaskController { /** * 查询水闸病险工程核查任务列表 + * * @param sp * @return */ @@ -38,6 +40,7 @@ public class SzDangerousTaskController { /** * 查询水闸关联的安全鉴定列表 + * * @param sp * @return */ @@ -48,9 +51,9 @@ public class SzDangerousTaskController { } - /** * 查询水闸病险工程核查任务详情 + * * @param id * @return */ @@ -83,6 +86,7 @@ public class SzDangerousTaskController { /** * 删除水闸病险工程核查任务 + * * @param id * @return */ @@ -106,7 +110,8 @@ public class SzDangerousTaskController { /** * 水闸工程核查详情 - * @param id 任务id + * + * @param id 任务id * @return */ @ApiOperation("水闸工程核查详情") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSchedulingController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSchedulingController.java index 2abc7361..60930d13 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSchedulingController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSchedulingController.java @@ -34,6 +34,7 @@ public class SzSchedulingController { public IPage list(@RequestBody SearchParam sp) { return szSchedulingService.search(sp); } + //调度计划详情 @GetMapping("/{id}") @ApiOperation("调度计划详情") diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java index fe3b7646..04cb2890 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseEngineeringController.java @@ -36,6 +36,7 @@ public class SzSuperviseEngineeringController { /** * 查询水闸监督检查工程详情 + * * @param id 任务id * @return */ @@ -66,6 +67,7 @@ public class SzSuperviseEngineeringController { /** * 查询水闸监督检查问题详情 + * * @param id 问题id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseTaskController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseTaskController.java index 21d6e279..9f26e759 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseTaskController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseTaskController.java @@ -67,6 +67,7 @@ public class SzSuperviseTaskController extends BaseController { /** * 根据id查询水闸监督检查任务 + * * @param id * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java index e41324eb..77bba00e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzSuperviseWayController.java @@ -21,6 +21,7 @@ import java.util.List; /** * 水闸监督检查办法 + * * @author hry * @date 2024/2/29 14:44 */ @@ -28,7 +29,7 @@ import java.util.List; @AllArgsConstructor @RequestMapping("/run/sz/superviseWay") @Api(tags = "水闸监督检查办法") -public class SzSuperviseWayController extends BaseController { +public class SzSuperviseWayController extends BaseController { private final SzSuperviseWayService superviseWayService; @@ -81,17 +82,17 @@ public class SzSuperviseWayController extends BaseController { /** * 获取启用的堤防监督检查办法 + * * @param wayId 监督检查办法id * @return */ @GetMapping("/enable") @ApiOperation("查询启用的水闸监督检查办法") - public Response enableData(@RequestParam(value = "wayId",required = false) String wayId) { + public Response enableData(@RequestParam(value = "wayId", required = false) String wayId) { return Response.ok(superviseWayService.getEnableSuperviseWay(wayId)); } - /** * 查询水闸监督检查项目 */ @@ -132,8 +133,6 @@ public class SzSuperviseWayController extends BaseController { } - - /** * 查询水闸监督检查项目内容列表 */ @@ -174,5 +173,4 @@ public class SzSuperviseWayController extends BaseController { } - } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java index 0bb7eda9..492e1746 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/controller/SzTraceController.java @@ -29,28 +29,28 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "水闸巡视检查检查记录轨迹") public class SzTraceController extends BaseController { - @Autowired - private SzTraceService szTraceService; + @Autowired + private SzTraceService szTraceService; - /** - * 查询水闸巡视检查检查记录轨迹列表 - */ - @PostMapping("/list") - @ApiOperation("水闸巡视检查检查记录轨迹列表") - public IPage list(@RequestBody SearchParam sp) { - return szTraceService.selectPage(sp); - } + /** + * 查询水闸巡视检查检查记录轨迹列表 + */ + @PostMapping("/list") + @ApiOperation("水闸巡视检查检查记录轨迹列表") + public IPage list(@RequestBody SearchParam sp) { + return szTraceService.selectPage(sp); + } - /** - * 新增水闸巡视检查检查记录轨迹 - */ - @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) - @PostMapping - @ApiOperation("水闸巡视检查检查记录轨迹新增") - public Response add(@RequestBody SzTrace SzTrace) { - BaseEntityUtils.preInsert(SzTrace); - szTraceService.save(SzTrace); - return Response.ok(); - } + /** + * 新增水闸巡视检查检查记录轨迹 + */ + @Log(title = "水闸巡视检查检查记录轨迹新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("水闸巡视检查检查记录轨迹新增") + public Response add(@RequestBody SzTrace SzTrace) { + BaseEntityUtils.preInsert(SzTrace); + szTraceService.save(SzTrace); + return Response.ok(); + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java index af687074..c40f7e57 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzChecking.java @@ -19,20 +19,20 @@ import lombok.Data; @ApiModel("水闸巡视检查") public class SzChecking extends SyBaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 巡查名称 - */ - @Excel(name = "巡查名称") - @ApiModelProperty("巡查名称") - private String name; + /** + * 巡查名称 + */ + @Excel(name = "巡查名称") + @ApiModelProperty("巡查名称") + private String name; - /** - * 巡查类型 - */ - @Excel(name = "巡查类型") - @ApiModelProperty("巡查类型") - private String type; + /** + * 巡查类型 + */ + @Excel(name = "巡查类型") + @ApiModelProperty("巡查类型") + private String type; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java index e1b2f687..8222790d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzCheckingItem.java @@ -19,27 +19,27 @@ import lombok.Data; @ApiModel("水闸巡视检查项") public class SzCheckingItem extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 巡查ID - */ - @Excel(name = "巡查ID") - @ApiModelProperty("巡查ID") - private String xcId; - - /** - * 检查部位 - */ - @Excel(name = "检查部位") - @ApiModelProperty("检查部位") - private String parts; - - /** - * 检查内容 - */ - @Excel(name = "检查内容") - @ApiModelProperty("检查内容") - private String content; + private static final long serialVersionUID = 1L; + + /** + * 巡查ID + */ + @Excel(name = "巡查ID") + @ApiModelProperty("巡查ID") + private String xcId; + + /** + * 检查部位 + */ + @Excel(name = "检查部位") + @ApiModelProperty("检查部位") + private String parts; + + /** + * 检查内容 + */ + @Excel(name = "检查内容") + @ApiModelProperty("检查内容") + private String content; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousGrouping.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousGrouping.java index 8967918b..465905ad 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousGrouping.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousGrouping.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸病险工程核查分组表 bs_sgc_sz_bxgcfz + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java index 0974b659..ac282872 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProject.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸病险工程核查项目表 bs_sgc_sz_bxgcxm + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java index 266711f9..47a2b661 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousProjectItem.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸病险工程核查项目内容表 bs_sgc_sz_bxgcxmnr + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java index 65ffe459..2c0a6ba6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTask.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 水闸病险工程核查任务表 bs_sgc_sz_bxgcrw + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java index 187e35d9..655c0af3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzDangerousTaskItemRel.java @@ -9,6 +9,7 @@ import lombok.Data; /** * 水闸病险工程任务问题 bs_sgc_sz_bxgcnrgl + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java index ea73fddd..141a3be7 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzPoint.java @@ -19,35 +19,35 @@ import lombok.Data; @ApiModel("水闸巡视检查计划点位") public class SzPoint extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 巡查计划ID - */ - @Excel(name = "巡查计划ID") - @ApiModelProperty("巡查计划ID") - private String planId; - - /** - * 经度 - */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; - - /** - * 纬度 - */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; - - /** - * 海拔 - */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; + private static final long serialVersionUID = 1L; + + /** + * 巡查计划ID + */ + @Excel(name = "巡查计划ID") + @ApiModelProperty("巡查计划ID") + private String planId; + + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; + + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; + + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseProblem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseProblem.java index f0a49810..2dfa53be 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseProblem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseProblem.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 水闸监督检查工程问题对象 bs_sgc_sz_jdjcgcwt + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseTask.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseTask.java index 2b5b8ff2..c8e10fa9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseTask.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseTask.java @@ -11,6 +11,7 @@ import java.util.Date; /** * 水闸监督检查任务管理对象 bs_sgc_sz_jdjcrw + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWay.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWay.java index e5d6e4e6..7a3fa2fa 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWay.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWay.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸监督检查办法对象 bs_sgc_sz_jdjcbf + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProject.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProject.java index 8c433cc9..0781cb5e 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProject.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProject.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸监督检查办法项目对象 bs_sgc_sz_jdjcbfxm + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProjectItem.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProjectItem.java index b28896de..7a407ddc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProjectItem.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzSuperviseWayProjectItem.java @@ -8,6 +8,7 @@ import lombok.Data; /** * 水闸监督检查办法项目内容对象 bs_sgc_sz_jdjcbfxmnr + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java index bab5e0cf..921dabf2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzTrace.java @@ -23,54 +23,54 @@ import java.util.Date; @ApiModel("水闸巡视检查检查记录轨迹") public class SzTrace extends SyBaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 巡查记录ID - */ - @Excel(name = "巡查记录ID") - @ApiModelProperty("巡查记录ID") - private String recordId; + /** + * 巡查记录ID + */ + @Excel(name = "巡查记录ID") + @ApiModelProperty("巡查记录ID") + private String recordId; - /** - * 经度 - */ - @Excel(name = "经度") - @ApiModelProperty("经度") - private Double longitude; + /** + * 经度 + */ + @Excel(name = "经度") + @ApiModelProperty("经度") + private Double longitude; - /** - * 纬度 - */ - @Excel(name = "纬度") - @ApiModelProperty("纬度") - private Double latitude; + /** + * 纬度 + */ + @Excel(name = "纬度") + @ApiModelProperty("纬度") + private Double latitude; - /** - * 海拔 - */ - @Excel(name = "海拔") - @ApiModelProperty("海拔") - private Double altitude; + /** + * 海拔 + */ + @Excel(name = "海拔") + @ApiModelProperty("海拔") + private Double altitude; - /** - * 最近修改人 - */ - @Excel(name = "最近修改人") - @ApiModelProperty("最近修改人") - @TableField(exist = false) - private String updateUid; + /** + * 最近修改人 + */ + @Excel(name = "最近修改人") + @ApiModelProperty("最近修改人") + @TableField(exist = false) + private String updateUid; - /** - * 最近修改时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("最近修改时间") - @TableField(exist = false) - private Date updateTime; + /** + * 最近修改时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("最近修改时间") + @TableField(exist = false) + private Date updateTime; - @TableField(exist = false) - private String remark; + @TableField(exist = false) + private String remark; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java index 11c92dfa..35c33af9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/domain/SzYhOperator.java @@ -19,28 +19,28 @@ import lombok.Data; @ApiModel("水闸维修养护执行人") public class SzYhOperator extends SyBaseEntity { - private static final long serialVersionUID = 1L; - - /** - * 养护记录ID - */ - @Excel(name = "养护记录ID") - @ApiModelProperty("养护记录ID") - private String recordId; - - /** - * 执行人ID - */ - @Excel(name = "执行人ID") - @ApiModelProperty("执行人ID") - private String operatorUid; - - /** - * 执行人名称 - */ - @Excel(name = "执行人名称") - @ApiModelProperty("执行人名称") - private String operatorName; + private static final long serialVersionUID = 1L; + + /** + * 养护记录ID + */ + @Excel(name = "养护记录ID") + @ApiModelProperty("养护记录ID") + private String recordId; + + /** + * 执行人ID + */ + @Excel(name = "执行人ID") + @ApiModelProperty("执行人ID") + private String operatorUid; + + /** + * 执行人名称 + */ + @Excel(name = "执行人名称") + @ApiModelProperty("执行人名称") + private String operatorName; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java index 680237f0..790e917c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SimpleSzCheckingDto.java @@ -15,9 +15,9 @@ import lombok.Data; @ApiModel("水闸巡视检查") public class SimpleSzCheckingDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("巡查名称") - private String name; + @ApiModelProperty("巡查名称") + private String name; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java index 9bb389cf..d4c4b182 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/StartPlan.java @@ -15,12 +15,12 @@ import lombok.Data; @Data public class StartPlan { - @ApiModelProperty("计划id") - private String planId; + @ApiModelProperty("计划id") + private String planId; - @ApiModelProperty("水闸编号") - private String wagaCode; - @ApiModelProperty("巡查类型") - private String type; + @ApiModelProperty("水闸编号") + private String wagaCode; + @ApiModelProperty("巡查类型") + private String type; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java index 27b7d397..7c1350e6 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzAqjdProjecDto.java @@ -8,7 +8,6 @@ import lombok.Data; import java.util.Date; - /** * 包含安全鉴定检测等属性。 */ @@ -19,12 +18,16 @@ public class SzAqjdProjecDto extends SzProjectListDto { @ApiModelProperty("鉴定日期") private Date identifyTime; - /** 安全类别 */ + /** + * 安全类别 + */ @Excel(name = "安全类别") @ApiModelProperty("安全类别") private String securityCategory; - /** 安全鉴定意见 */ + /** + * 安全鉴定意见 + */ @ApiModelProperty("安全鉴定意见") private String safetyAppraisalOpinion; } 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 index 514ddf04..a3f5c92e 100644 --- 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 @@ -1,4 +1,5 @@ package com.kms.yxgh.sz.dto; + import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; 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 index cca4b947..8850f594 100644 --- 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 @@ -1,4 +1,5 @@ package com.kms.yxgh.sz.dto; + import com.kms.yxgh.common.dto.IAdcd; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java index ca0e08fd..5c0fe88f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzCheckingDetailDto.java @@ -17,30 +17,30 @@ import java.util.List; @ApiModel("水闸巡视检查详情") public class SzCheckingDetailDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("巡查名称") - private String name; + @ApiModelProperty("巡查名称") + private String name; - @ApiModelProperty("巡查类型") - private String type; + @ApiModelProperty("巡查类型") + private String type; - @ApiModelProperty("检查项") - private List items; + @ApiModelProperty("检查项") + private List items; - @Data - public static class SzCheckingItemDto { + @Data + public static class SzCheckingItemDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("检查部位") - private List parts; + @ApiModelProperty("检查部位") + private List parts; - @ApiModelProperty("检查内容") - private String content; - } + @ApiModelProperty("检查内容") + private String content; + } } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java index 5416ddd5..8cd1c5a2 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousGroupingDto.java @@ -10,6 +10,7 @@ import java.util.List; /** * 水闸病险工程核查分组dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousParamDto.java index 390f5a97..34907967 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousParamDto.java @@ -28,7 +28,7 @@ public class SzDangerousParamDto { /** * 备注 */ - @ApiModelProperty (value = "备注") + @ApiModelProperty(value = "备注") private String remark; diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java index 4ae9a015..d0cab0bc 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 水闸病险工程核查项目dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java index acfbdda0..d2e06935 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousProjectItemDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 水闸病险工程核查项目内容dto对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDto.java index aba8094d..5107717d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskDto.java @@ -9,12 +9,13 @@ import java.util.Date; /** * 水闸病险工程核查任务dto + * * @author hry * @date 2024/2/29 13:57 */ @Data @ApiModel("水闸病险工程核查任务") -public class SzDangerousTaskDto extends SzDangerousTaskSearchDto { +public class SzDangerousTaskDto extends SzDangerousTaskSearchDto { /** * id @@ -83,13 +84,13 @@ public class SzDangerousTaskDto extends SzDangerousTaskSearchDto { /** * 病险工程核查分组名称 */ - @ApiModelProperty (value = "病险工程核查分组名称") + @ApiModelProperty(value = "病险工程核查分组名称") private String groupName; /** * 备注 */ - @ApiModelProperty (value = "备注") + @ApiModelProperty(value = "备注") private String remark; /** diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java index b10aa7d4..d44a39ee 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskItemRelDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 水闸监督检查工程问题对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java index cafd9e2c..fe082c55 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzDangerousTaskSearchDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 水闸病险工程核查任务检索详情 + * * @author hry * @date 2024/2/29 13:57 */ @@ -32,12 +33,16 @@ public class SzDangerousTaskSearchDto { private String wagaName; - /** 所属流域 */ + /** + * 所属流域 + */ @ApiModelProperty("所属流域") private String riverLocation; - /** 建筑物级别 */ + /** + * 建筑物级别 + */ @ApiModelProperty("建筑物级别") private String mainBuildGrad; @@ -57,7 +62,7 @@ public class SzDangerousTaskSearchDto { * 工程规模 */ @ApiModelProperty("工程规模") - private String engScal; + private String engScal; /** * 水闸类型 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java index 7ff95139..f3677cea 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzPointDto.java @@ -15,15 +15,15 @@ import lombok.Data; @ApiModel("水闸巡视检查计划点位") public class SzPointDto { - @ApiModelProperty("主键") - private String id; + @ApiModelProperty("主键") + private String id; - @ApiModelProperty("经度") - private Double longitude; + @ApiModelProperty("经度") + private Double longitude; - @ApiModelProperty("纬度") - private Double latitude; + @ApiModelProperty("纬度") + private Double latitude; - @ApiModelProperty("海拔") - private Double altitude; + @ApiModelProperty("海拔") + private Double altitude; } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java index 7c6656a7..ab2ad728 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseEngineeringParamDto.java @@ -12,7 +12,7 @@ import java.util.List; */ @Data @ApiModel("水闸监督检查工程参数对象") -public class SzSuperviseEngineeringParamDto{ +public class SzSuperviseEngineeringParamDto { /** * 监督检查任务ID */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDetailDto.java index fd73e5ba..57e37e16 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDetailDto.java @@ -10,7 +10,7 @@ import lombok.Data; */ @Data @ApiModel("水闸监督检查问题详情") -public class SzSuperviseProblemDetailDto extends SzSuperviseTaskCommonDto{ +public class SzSuperviseProblemDetailDto extends SzSuperviseTaskCommonDto { /** * 检查项目名称 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java index af165ed3..48ee1c07 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 水闸监督检查工程问题DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemParamDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemParamDto.java index 5e1bd950..1d33b243 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemParamDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseProblemParamDto.java @@ -6,6 +6,7 @@ import lombok.Data; /** * 水闸监督检查工程问题DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskCommonDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskCommonDto.java index 57fcb6ec..a22b171a 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskCommonDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskCommonDto.java @@ -10,7 +10,7 @@ import lombok.Data; */ @Data @ApiModel("水闸监督检查任务共用信息") -public class SzSuperviseTaskCommonDto extends SzSuperviseTaskDto{ +public class SzSuperviseTaskCommonDto extends SzSuperviseTaskDto { /** * 水闸名称 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDetailDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDetailDto.java index e4584f17..c9699625 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDetailDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDetailDto.java @@ -12,7 +12,7 @@ import java.util.List; */ @Data @ApiModel("水闸监督检查任务管理") -public class SzSuperviseTaskDetailDto extends SzSuperviseTaskCommonDto{ +public class SzSuperviseTaskDetailDto extends SzSuperviseTaskCommonDto { /** * 问题列表 diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDto.java index 883153f2..1fe72270 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseTaskDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 水闸监督检查任务管理DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayDto.java index e83b7a00..da8aba41 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 水闸监督检查办法DTO对象 + * * @author hry * @date 2024/2/29 15:10 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java index 04663a66..a5e83e89 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectDto.java @@ -9,6 +9,7 @@ import java.util.Date; /** * 水闸监督检查办法项目TO对象 + * * @author hry * @date 2024/2/29 16:05 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectItemDto.java b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectItemDto.java index 824c71f4..49a5ce99 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectItemDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/dto/SzSuperviseWayProjectItemDto.java @@ -8,6 +8,7 @@ import java.util.List; /** * 水闸监督检查办法项目内容DTO对象 + * * @author hry * @date 2024/2/29 13:57 */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java index bbf723e6..18e623ee 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingMapper.java @@ -11,16 +11,17 @@ import org.springframework.stereotype.Repository; /** * 水闸病险工程分组Mapper接口 + * * @author hry * @date 2024/3/12 14:44 */ @Repository public interface SzDangerousGroupingMapper extends BaseMapper { - @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + - "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + - " FROM bs_sgc_sz_bxgcfz a " + - " LEFT JOIN sys_dept b ON a.dept_id = b.id "+ - " order by a.create_time desc") - IPage searchPage(Page page, @Param("dto") SzDangerousGroupingDto dto); + @Select("SELECT b.dept_name as deptName,a.id, a.name, a.dept_id as deptId, a.create_time as createTime, a.update_time as updateTime," + + "(select GROUP_CONCAT(DISTINCT c.GROUP_NAME ) from bs_sgc_sz_bxgcfzcy c where c.GROUP_ID = a.id ) as groupNames " + + " FROM bs_sgc_sz_bxgcfz a " + + " LEFT JOIN sys_dept b ON a.dept_id = b.id " + + " order by a.create_time desc") + IPage searchPage(Page page, @Param("dto") SzDangerousGroupingDto dto); } diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java index 1eeb3639..f944d258 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousGroupingRelMapper.java @@ -11,6 +11,7 @@ import java.util.List; /** * 水闸病险工程分组关联Mapper接口 + * * @author hry * @date 2024/3/12 14:44 */ @@ -18,6 +19,7 @@ import java.util.List; public interface SzDangerousGroupingRelMapper extends BaseMapper { /** * 根据groupId查询 + * * @param groupId * @return */ diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectItemMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectItemMapper.java index 09ad453b..e9f63340 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectItemMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousProjectItemMapper.java @@ -11,6 +11,7 @@ import java.util.List; /** * 水闸病险工程核查项目内容Mapper接口 + * * @author hry * @date 2024/3/12 14:44 */ @@ -19,6 +20,7 @@ public interface SzDangerousProjectItemMapper extends BaseMapper" + "SELECT xm.name as projectName, nr.project_id as projectId, nr.content, " + - "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords "+ + "wt.id, wt.task_id as taskId, wt.PROJECT_ITEM_ID as projectItemId, wt.level, wt.PROBLEM_DESCRIBE as problemDescribe, wt.SITE_SITUATION_RECORDS as siteSituationRecords " + "FROM bs_sgc_sz_bxgcnrgl wt " + "LEFT JOIN bs_sgc_sz_bxgcxm xm on wt.project_id = xm.id " + "LEFT JOIN bs_sgc_sz_bxgcxmnr nr on wt.project_item_id = nr.id " + @@ -41,7 +41,7 @@ public interface SzDangerousTaskItemRelMapper extends BaseMapper" + - "SELECT count(*) itemTotal, sum(IF(gl.level ='0', 1, 0)) normalTotal, sum(IF(gl.level ='1', 1, 0)) problemTotal "+ + "SELECT count(*) itemTotal, sum(IF(gl.level ='0', 1, 0)) normalTotal, sum(IF(gl.level ='1', 1, 0)) problemTotal " + "FROM bs_sgc_sz_bxgcnrgl gl " + "LEFT JOIN bs_sgc_sz_bxgcrw rw on gl.TASK_ID = rw.id " + "LEFT JOIN att_waga_base xx ON xx.waga_code = rw.waga_code " + diff --git a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java index 1b70e2ea..511826c0 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sz/mapper/SzDangerousTaskMapper.java @@ -69,7 +69,6 @@ public interface SzDangerousTaskMapper extends BaseMapper { IPage selectByPage(Page page, @Param("dto") SzDangerousTaskSearchDto dto); - @Select("") - List szStatistics (@Param("dto") SzCharInfoQueDto dto); + List szStatistics(@Param("dto") SzCharInfoQueDto dto); @Select("") int paragraphCountNumber(@Param("dto") SzCharInfoItemQueDto dto); @Select("") int yhCountNumber(@Param("dto") SzCharInfoItemQueDto dto); @Select("") int clCountNumber(@Param("dto") SzCharInfoItemQueDto dto); - @Select("") List yhNumberData(@Param("dto") SzCharInfoItemQueDto dto); @Select("") List clfNumberData(@Param("dto") SzCharInfoItemQueDto dto); - @Select("