From cde1d417e126db211014579e559798171a62be46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 7 Mar 2025 19:35:12 +0800 Subject: [PATCH 01/67] =?UTF-8?q?add:=E5=AE=89=E5=85=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfSpPlayController.java | 128 ++++++++++++++ .../yg/df/service/BsSgcDfSpPlayService.java | 162 ++++++++++++++++++ .../java/com/kms/yxgh/df/dto/DfSpPlayDto.java | 18 ++ .../com/kms/yxgh/df/dto/DfSpPlayQueDto.java | 39 +++++ 4 files changed, 347 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSpPlayController.java create mode 100644 shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java 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..8c1f1538 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/controller/BsSgcDfSpPlayController.java @@ -0,0 +1,128 @@ +/** + * fshows.com + * Copyright (C) 2013-2025 All Rights Reserved. + */ +package com.kms.yg.df.controller; + +import com.alibaba.fastjson.JSONObject; +import com.kms.yg.cz.dto.MonitorQueDto; +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.DfYhCharInfoDto; +import com.kms.yxgh.df.dto.DfYhStatisticsQueDto; +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.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +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 org.springframework.web.client.RestTemplate; + +/** + * @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.getMockData()); + } + + + + + + + + + + + + + // 共享接口 + static final String GX_URL ="http://19.15.67.125:80/resourceSharing/oauth/token"; + + + // 关系接口 + static final String BELONG_URL ="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_wmst_res"; + + static public HttpHeaders getHttpHeaders() { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.set("X-H3C-ID", "4846637469663"); + headers.set("X-H3C-APPKEY", "xynzynys"); + return headers; + } + public static void main(String[] args) { + MonitorQueDto monitorQueDto=new MonitorQueDto(); +// monitorQueDto.setResCode("HP0014418020000235"); +// monitorQueDto.setPageNum(1); +// monitorQueDto.setPageSize(10); +// RestTemplate restTemplate=new RestTemplate(); +// String requestStr = JSONObject.toJSONString(monitorQueDto); +// HttpHeaders headers = getHttpHeaders(); +// HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); +// String seqResult = ""; +// try { +// ResponseEntity responseEntity = restTemplate.exchange(BELONG_URL, HttpMethod.POST, httpEntity, String.class); +// seqResult = responseEntity.getBody(); +// System.out.println(seqResult); +// } catch (Exception e) { +// System.out.println("请求接口:{},返回异常"); +// } + + + + + + + + + DfSpPlayQueDto monitorQueDto=new DfSpPlayQueDto(); + monitorQueDto.setMobile("17324499214"); + RestTemplate restTemplate=new RestTemplate(); + String requestStr = JSONObject.toJSONString(monitorQueDto); + HttpHeaders headers = getHttpHeaders(); + HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); + String seqResult = ""; + try { + ResponseEntity responseEntity = restTemplate.exchange(GX_URL, HttpMethod.POST, httpEntity, String.class); + seqResult = responseEntity.getBody(); + System.out.println(seqResult); + } catch (Exception e) { + System.out.println("请求接口:{},返回异常"); + } + + + + + + + + + + } + +} 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..135933d2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yg/df/service/BsSgcDfSpPlayService.java @@ -0,0 +1,162 @@ +package com.kms.yg.df.service; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.kms.yg.df.domain.BsSgcDfSwtz; +import com.kms.yg.df.mapper.BsSgcDfSwtzMapper; +import com.kms.yxgh.df.dto.DfSpPlayDto; +import com.kms.yxgh.df.dto.DfSpPlayQueDto; +import com.kms.yxgh.util.DataCenterRestTemplateUtils; +import com.shuili.common.core.service.BaseService; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + + +/** + * 水文特征Service接口 + * + * @author kms + * @date 2024-01-16 + */ +@AllArgsConstructor +@Service +@Slf4j +public class BsSgcDfSpPlayService { +// @Value("${belong.reservoir.url:}") +// private String belongReservoirUrl; + +// @Value("${sp.oauth.token.url:}") +// private String spOauthTokenUrl; + + // @Value("${sp.play.url:}") +// private String spPlayUrl; + @Autowired + private DataCenterRestTemplateUtils dataCenterRestTemplateUtils; + static final String BELONG_URL ="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_wmst_res"; + + static final String OAUTH_TOKEN ="http://19.15.67.125:80/resourceSharing/oauth/token"; + + static final String SP_PLAY_URL ="http://19.15.67.125:80/resourceSharing/startTransform"; + + + public DfSpPlayDto getMockData () { + DfSpPlayDto rest = new DfSpPlayDto(); + Map map =new HashMap<>(); + map.put("rtspPlayUrl","rtsp://173.46.129.58:554/rtp/da3ca861873949dc66f6657f2adb01ea?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); + map.put("flvPlayUrl","http://173.46.129.58:8889/rtp/da3ca861873949dc66f6657f2adb01ea.flv?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); + map.put("rtmpPlayUrl","rtmp://173.46.129.58:1935/rtp/da3ca861873949dc66f6657f2adb01ea?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); + map.put("hlsPlayUrl","http://173.46.129.58:8889/rtp/da3ca861873949dc66f6657f2adb01ea/hls.m3u8?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); + rest.setUrlsMap(map); + return rest; + } + + public DfSpPlayDto play(DfSpPlayQueDto dto) { + + DfSpPlayDto rest = new DfSpPlayDto(); + + try { + + + // 1. 获取水库信息 + String belongReservoirUrlJson = dataCenterRestTemplateUtils.doPostRequest(BELONG_URL, dto); + log.info("belongReservoirUrl-请求接口响应报文: {}", belongReservoirUrlJson); + + JSONObject belongReservoirJson = parseJson(belongReservoirUrlJson); + if (belongReservoirJson == null || !isSuccess(belongReservoirJson)) { + log.warn("获取水库信息失败，响应: {}", belongReservoirUrlJson); + return rest; + } + + JSONArray reservoirData = parseJsonArray(belongReservoirJson.get("data")); + if (reservoirData == null || reservoirData.isEmpty()) { + log.warn("水库信息数据为空"); + return rest; + } + + // 取第一个水库信息 + Map detailMap = (Map) reservoirData.get(0); + String resCode = detailMap.getOrDefault("RES_CODE", ""); + dto.setResCode(resCode); + + // 2. 获取令牌 + String spOauthTokenUrlJson = dataCenterRestTemplateUtils.doPostRequest(OAUTH_TOKEN, dto); + log.info("spOauthTokenUrlJson-请求接口响应报文: {}", spOauthTokenUrlJson); + + JSONObject tokenJson = parseJson(spOauthTokenUrlJson); + if (tokenJson == null || !isSuccess(tokenJson)) { + log.warn("获取令牌失败，响应: {}", spOauthTokenUrlJson); + return rest; + } + + JSONObject tokenData = tokenJson.getJSONObject("data"); + if (tokenData == null) { + log.warn("令牌数据为空"); + return rest; + } + + String token = String.valueOf(tokenData.get("token")); + dto.setCameraId(dto.getResCode()); + dto.setToken(token); + + // 3. 调用第三方接口获取播放地址 + String playOauthTokenUrlJson = dataCenterRestTemplateUtils.doPostRequest(SP_PLAY_URL, dto); + log.info("spPlayUrl-请求接口响应报文: {}", playOauthTokenUrlJson); + + JSONObject playJson = parseJson(playOauthTokenUrlJson); + if (playJson == null || !isSuccess(playJson)) { + log.warn("获取播放地址失败，响应: {}", playOauthTokenUrlJson); + return rest; + } + + JSONObject playDataJson = playJson.getJSONObject("data"); + if (playDataJson == null) { + log.warn("播放地址数据为空"); + return rest; + } + + JSONObject urls = playDataJson.getJSONObject("urls"); + if (urls != null) { + rest.setUrlsMap((Map) urls); + } + } catch (Exception e) { + log.error("请求接口异常: {}", e.getMessage(), e); + } + return rest; + } + + /** + * 解析 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")); + } +} 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..bd8beaae --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayDto.java @@ -0,0 +1,18 @@ +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; +import java.util.Map; + +@ApiModel("视频播放") +@Data +public class DfSpPlayDto { + + @ApiModelProperty(value = "播放地址") + private Map urlsMap = Collections.emptyMap(); + +} 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..9c1b9447 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java @@ -0,0 +1,39 @@ +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; + + @JSONField(name = "RES_CODE") + @ApiModelProperty(value = "水库编码") + private String resCode; + + @ApiModelProperty(value = "视频播放接口入参") + private String cameraId; + + @ApiModelProperty(value = "token") + private String token; + + @ApiModelProperty(value = "页码") + private Integer pageSize = 10; + + @ApiModelProperty(value = "每页条数") + private Integer pageNum = 1; + + +} From bc60085a17784eed03c245b27201250788ad9de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 7 Mar 2025 19:36:05 +0800 Subject: [PATCH 02/67] =?UTF-8?q?add:=E5=AE=89=E5=85=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfSpPlayController.java | 47 ------------------- 1 file changed, 47 deletions(-) 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 index 8c1f1538..b0468a3a 100644 --- 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 @@ -10,22 +10,16 @@ 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.DfYhCharInfoDto; -import com.kms.yxgh.df.dto.DfYhStatisticsQueDto; 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.http.HttpEntity; import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; 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 org.springframework.web.client.RestTemplate; /** * @author lyd @@ -50,17 +44,6 @@ public class BsSgcDfSpPlayController extends BaseController { return Response.ok(bsSgcDfSpPlayService.getMockData()); } - - - - - - - - - - - // 共享接口 static final String GX_URL ="http://19.15.67.125:80/resourceSharing/oauth/token"; @@ -93,36 +76,6 @@ public class BsSgcDfSpPlayController extends BaseController { // System.out.println("请求接口:{},返回异常"); // } - - - - - - - - DfSpPlayQueDto monitorQueDto=new DfSpPlayQueDto(); - monitorQueDto.setMobile("17324499214"); - RestTemplate restTemplate=new RestTemplate(); - String requestStr = JSONObject.toJSONString(monitorQueDto); - HttpHeaders headers = getHttpHeaders(); - HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); - String seqResult = ""; - try { - ResponseEntity responseEntity = restTemplate.exchange(GX_URL, HttpMethod.POST, httpEntity, String.class); - seqResult = responseEntity.getBody(); - System.out.println(seqResult); - } catch (Exception e) { - System.out.println("请求接口:{},返回异常"); - } - - - - - - - - - } } From e12f011069f21baf3c4c7c0c3728c4adc8938f5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Fri, 7 Mar 2025 22:05:41 +0800 Subject: [PATCH 03/67] =?UTF-8?q?add:=E5=AE=89=E5=85=A8=E8=BF=90=E8=A1=8C?= =?UTF-8?q?=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfSpPlayController.java | 56 +-- .../yg/df/service/BsSgcDfSpPlayService.java | 135 ++++--- .../com/kms/yxgh/df/dto/DfSpPlayQueDto.java | 6 +- .../com/kms/yxgh/df/dto/ReservoirListDto.java | 21 ++ .../kms/yxgh/df/dto/ReservoirListQueDto.java | 28 ++ .../com/kms/yxgh/util/RestTemplateUtil.java | 333 ++++++++++++++++++ 6 files changed, 481 insertions(+), 98 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtil.java 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 index b0468a3a..95b9d0bf 100644 --- 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 @@ -3,30 +3,26 @@ * Copyright (C) 2013-2025 All Rights Reserved. */ package com.kms.yg.df.controller; - -import com.alibaba.fastjson.JSONObject; -import com.kms.yg.cz.dto.MonitorQueDto; 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.kms.yxgh.df.dto.ReservoirListQueDto; 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.http.HttpHeaders; -import org.springframework.http.MediaType; 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/") +@RequestMapping("/safe/operation") @Api(tags = "安全运行-视频播放") public class BsSgcDfSpPlayController extends BaseController { @@ -34,48 +30,26 @@ public class BsSgcDfSpPlayController extends BaseController { private BsSgcDfSpPlayService bsSgcDfSpPlayService; /** - * 获取巡查情况概览统计 + * 视频播放 * @param dto * @return */ - @PostMapping("/Play") + @PostMapping("/play") @ApiOperation("视频播放") public Response Play(@RequestBody DfSpPlayQueDto dto) { - return Response.ok(bsSgcDfSpPlayService.getMockData()); + return Response.ok(bsSgcDfSpPlayService.play(dto)); } - // 共享接口 - static final String GX_URL ="http://19.15.67.125:80/resourceSharing/oauth/token"; - - - // 关系接口 - static final String BELONG_URL ="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_wmst_res"; - - static public HttpHeaders getHttpHeaders() { - HttpHeaders headers = new HttpHeaders(); - headers.setContentType(MediaType.APPLICATION_JSON); - headers.set("X-H3C-ID", "4846637469663"); - headers.set("X-H3C-APPKEY", "xynzynys"); - return headers; + /** + * 水库列表 + * @param + * @return + */ + @PostMapping("/reservoirList") + @ApiOperation("水库列表") + public Response reservoirList(@RequestBody ReservoirListDto dto) { + return Response.ok(bsSgcDfSpPlayService.reservoirList(dto)); } - public static void main(String[] args) { - MonitorQueDto monitorQueDto=new MonitorQueDto(); -// monitorQueDto.setResCode("HP0014418020000235"); -// monitorQueDto.setPageNum(1); -// monitorQueDto.setPageSize(10); -// RestTemplate restTemplate=new RestTemplate(); -// String requestStr = JSONObject.toJSONString(monitorQueDto); -// HttpHeaders headers = getHttpHeaders(); -// HttpEntity httpEntity = new HttpEntity<>(requestStr, headers); -// String seqResult = ""; -// try { -// ResponseEntity responseEntity = restTemplate.exchange(BELONG_URL, HttpMethod.POST, httpEntity, String.class); -// seqResult = responseEntity.getBody(); -// System.out.println(seqResult); -// } catch (Exception e) { -// System.out.println("请求接口:{},返回异常"); -// } - } } 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 index 135933d2..11f1eaaa 100644 --- 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 @@ -7,16 +7,30 @@ import com.kms.yg.df.domain.BsSgcDfSwtz; import com.kms.yg.df.mapper.BsSgcDfSwtzMapper; 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.df.dto.ReservoirListQueDto; import com.kms.yxgh.util.DataCenterRestTemplateUtils; +import com.kms.yxgh.util.RestTemplateUtil; import com.shuili.common.core.service.BaseService; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; 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.ArrayList; +import java.util.Collections; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; @@ -31,84 +45,59 @@ import java.util.Objects; @Service @Slf4j public class BsSgcDfSpPlayService { -// @Value("${belong.reservoir.url:}") -// private String belongReservoirUrl; -// @Value("${sp.oauth.token.url:}") -// private String spOauthTokenUrl; - - // @Value("${sp.play.url:}") -// private String spPlayUrl; @Autowired private DataCenterRestTemplateUtils dataCenterRestTemplateUtils; static final String BELONG_URL ="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_wmst_res"; - static final String OAUTH_TOKEN ="http://19.15.67.125:80/resourceSharing/oauth/token"; + static final String OAUTH_TOKEN ="http://19.15.67.125:80/vsap-opp-service/resourceSharing/oauth/token"; - static final String SP_PLAY_URL ="http://19.15.67.125:80/resourceSharing/startTransform"; + static final String SP_PLAY_URL ="http://19.15.67.125:80/vsap-opp-service/resourceSharing/startTransform"; + public ReservoirListDto reservoirList (ReservoirListDto dto) { + ReservoirListDto listDto=new ReservoirListDto(); + // 1. 获取水库信息 + String belongReservoirUrlJson = dataCenterRestTemplateUtils.doPostRequest(BELONG_URL, dto); + log.info("belongReservoirUrl-请求接口响应报文: {}", belongReservoirUrlJson); - public DfSpPlayDto getMockData () { - DfSpPlayDto rest = new DfSpPlayDto(); - Map map =new HashMap<>(); - map.put("rtspPlayUrl","rtsp://173.46.129.58:554/rtp/da3ca861873949dc66f6657f2adb01ea?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); - map.put("flvPlayUrl","http://173.46.129.58:8889/rtp/da3ca861873949dc66f6657f2adb01ea.flv?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); - map.put("rtmpPlayUrl","rtmp://173.46.129.58:1935/rtp/da3ca861873949dc66f6657f2adb01ea?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); - map.put("hlsPlayUrl","http://173.46.129.58:8889/rtp/da3ca861873949dc66f6657f2adb01ea/hls.m3u8?token=9eedb58c7b634bc8b97bf2a618bf3bc1"); - rest.setUrlsMap(map); - return rest; + JSONObject belongReservoirJson = parseJson(belongReservoirUrlJson); + if (belongReservoirJson == null || !isSuccess(belongReservoirJson)) { + log.warn("获取水库信息失败，响应: {}", belongReservoirUrlJson); + return listDto; + } + JSONArray reservoirData = parseJsonArray(belongReservoirJson.get("data")); + if (reservoirData == null || reservoirData.isEmpty()) { + log.warn("水库信息数据为空:{}",reservoirData.toString()); + return listDto; + } + List list=new ArrayList(); + for (int i = 0; i < reservoirData.size(); i++) { + Map map = (Map) reservoirData.get(0); + list.add(map.get("RES_CODE").toString()); + } + listDto.setCameraIds(list); + return listDto; } - public DfSpPlayDto play(DfSpPlayQueDto dto) { + public DfSpPlayDto play(DfSpPlayQueDto dto) { DfSpPlayDto rest = new DfSpPlayDto(); - try { - - - // 1. 获取水库信息 - String belongReservoirUrlJson = dataCenterRestTemplateUtils.doPostRequest(BELONG_URL, dto); - log.info("belongReservoirUrl-请求接口响应报文: {}", belongReservoirUrlJson); - - JSONObject belongReservoirJson = parseJson(belongReservoirUrlJson); - if (belongReservoirJson == null || !isSuccess(belongReservoirJson)) { - log.warn("获取水库信息失败，响应: {}", belongReservoirUrlJson); - return rest; - } - - JSONArray reservoirData = parseJsonArray(belongReservoirJson.get("data")); - if (reservoirData == null || reservoirData.isEmpty()) { - log.warn("水库信息数据为空"); - return rest; - } - - // 取第一个水库信息 - Map detailMap = (Map) reservoirData.get(0); - String resCode = detailMap.getOrDefault("RES_CODE", ""); - dto.setResCode(resCode); - // 2. 获取令牌 - String spOauthTokenUrlJson = dataCenterRestTemplateUtils.doPostRequest(OAUTH_TOKEN, dto); - log.info("spOauthTokenUrlJson-请求接口响应报文: {}", spOauthTokenUrlJson); - + String spOauthTokenUrlJson = getToken(dto); JSONObject tokenJson = parseJson(spOauthTokenUrlJson); if (tokenJson == null || !isSuccess(tokenJson)) { - log.warn("获取令牌失败，响应: {}", spOauthTokenUrlJson); return rest; } - JSONObject tokenData = tokenJson.getJSONObject("data"); if (tokenData == null) { log.warn("令牌数据为空"); return rest; } - String token = String.valueOf(tokenData.get("token")); - dto.setCameraId(dto.getResCode()); dto.setToken(token); - // 3. 调用第三方接口获取播放地址 - String playOauthTokenUrlJson = dataCenterRestTemplateUtils.doPostRequest(SP_PLAY_URL, dto); + String playOauthTokenUrlJson = getSpPlayUrls(dto); log.info("spPlayUrl-请求接口响应报文: {}", playOauthTokenUrlJson); JSONObject playJson = parseJson(playOauthTokenUrlJson); @@ -133,6 +122,9 @@ public class BsSgcDfSpPlayService { return rest; } + + + /** * 解析 JSON 字符串为 JSONObject */ @@ -159,4 +151,43 @@ public class BsSgcDfSpPlayService { 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())); + MapparamMap=new HashMap<>(); + paramMap.put("cameraId",dto.getCameraId()); + headers.setContentType(MediaType.APPLICATION_JSON); + String seqResult2 = null; + try { + seqResult2 = RestTemplateUtil.postForObjectWithHead(paramMap, headValues,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) { + 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(OAUTH_TOKEN, HttpMethod.POST, httpEntity, String.class); + seqResult = responseEntity.getBody(); + log.info("获取播放地址响应SP_PLAY_URL: {}", seqResult); + JSONObject tokenJson = JSONObject.parseObject(seqResult); + JSONObject tokenData = tokenJson.getJSONObject("data"); + token= String.valueOf(tokenData.get("token")); + } catch (Exception e) { + log.warn("请求接口OAUTH_TOKEN返回异常: {}", e.getMessage()); + } + return token; + } } 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 index 9c1b9447..8a1b3bb5 100644 --- 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 @@ -19,11 +19,7 @@ public class DfSpPlayQueDto { @ApiModelProperty("手机号码") private String mobile; - @JSONField(name = "RES_CODE") - @ApiModelProperty(value = "水库编码") - private String resCode; - - @ApiModelProperty(value = "视频播放接口入参") + @ApiModelProperty("视频id") private String cameraId; @ApiModelProperty(value = "token") 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..2b0247a0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListDto.java @@ -0,0 +1,21 @@ +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.Collections; +import java.util.List; +import java.util.Map; + +@ApiModel("视频播放") +@Data +public class ReservoirListDto { + @ApiModelProperty(value = "视频ids") + private List cameraIds; + + @JSONField(name = "RES_CODE") + @ApiModelProperty(value = "水库编码") + private String resCode; +} 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..a79cf114 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java @@ -0,0 +1,28 @@ +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/util/RestTemplateUtil.java b/shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtil.java new file mode 100644 index 00000000..3eab6ed0 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/util/RestTemplateUtil.java @@ -0,0 +1,333 @@ +// +// Source code recreated from a .class file by IntelliJ IDEA +// (powered by FernFlower decompiler) +// + +package com.kms.yxgh.util; + +import com.alibaba.fastjson.JSONObject; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Collectors; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.lang.Nullable; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestTemplate; + +public class RestTemplateUtil { + private static final Logger log = LoggerFactory.getLogger(RestTemplateUtil.class); + private static final RestTemplate restTemplate = new RestTemplate(); + private static final String QUESTION_MARK = "?"; + private static final String AFTER_BRACE = "{"; + private static final String BEFORE_BRACE = "}"; + private static final String EQUALS_SIGN = "="; + private static final String AND = "&"; + + public RestTemplateUtil() { + } + + private static String getParams(Map params) { + return (String)params.keySet().stream().map((key) -> { + return key + "=" + "{" + key + "}"; + }).collect(Collectors.joining("&")); + } + + public static String getUrl(String url, Map params) { + String param = getParams(params); + if (url.indexOf("?") > 0) { + url = url + "&" + param; + } else { + url = url + "?" + param; + } + + return url; + } + + public static RestTemplate getRestTemplate() { + return restTemplate; + } + + public static T getForObject(String url, Class responseType) { + return restTemplate.getForObject(url, responseType, new Object[0]); + } + + public static T getForObject(String url, Class responseType, Object... uriVariables) { + return restTemplate.getForObject(url, responseType, uriVariables); + } + + public static T getForObject(String url, Class responseType, Map uriVariables) { + return restTemplate.getForObject(url, responseType, uriVariables); + } + + public static ResponseEntity getForObjectWithHead(MultiValueMap headValues, String url, Class responseType, Map uriVariables) { + HttpHeaders headers = new HttpHeaders(); + headers.addAll(headValues); + HttpEntity requestEntity = new HttpEntity(headers); + return restTemplate.exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables); + } + + public static T postForObjectWithHead(Object body, MultiValueMap headValues, String url, Class responseType, Map uriVariables) { + HttpHeaders headers = new HttpHeaders(); + headers.addAll(headValues); + HttpEntity requestEntity = new HttpEntity(body, headers); + return restTemplate.postForObject(url, requestEntity, responseType, uriVariables); + } + + public static String postForFormUrlencoded(String body, String url, Map uriVariables) { + HttpHeaders headers = new HttpHeaders(); + headers.add("Content-Type", "application/x-www-form-urlencoded"); + HttpEntity requestEntity = new HttpEntity(body, headers); + log.info(url); + log.info(requestEntity.toString()); + log.info(JSONObject.toJSONString(uriVariables)); + String s = (String)restTemplate.postForObject(url, requestEntity, String.class, uriVariables); + log.info(s); + return s; + } + + public static ResponseEntity getForObjectWithHead(MultiValueMap values, String url, Class responseType, Object... uriVariables) { + HttpHeaders headers = new HttpHeaders(); + headers.addAll(values); + HttpEntity requestEntity = new HttpEntity(headers); + return restTemplate.exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables); + } + + public static T postForObject(String url, @Nullable Object request, Class responseType) { + return restTemplate.postForObject(url, request, responseType, new Object[0]); + } + + public static T postForObject(String url, @Nullable Object request, Class responseType, Object... uriVariables) { + return restTemplate.postForObject(url, request, responseType, uriVariables); + } + + public static T postForObject(String url, @Nullable Object request, Class responseType, Map uriVariables) { + return restTemplate.postForObject(url, request, responseType, uriVariables); + } + + public static T postFormDataForObject(String url, MultiValueMap map, Class responseType) { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED); + HttpEntity> request = new HttpEntity(map, headers); + return restTemplate.postForObject(url, request, responseType, new Object[0]); + } + + public static ResponseEntity get(String url, Class responseType) { + return restTemplate.getForEntity(url, responseType, new Object[0]); + } + + public static ResponseEntity get(String url, Class responseType, Object... uriVariables) { + return restTemplate.getForEntity(url, responseType, uriVariables); + } + + public static ResponseEntity get(String url, Class responseType, Map uriVariables) { + return restTemplate.getForEntity(url, responseType, uriVariables); + } + + public static ResponseEntity get(String url, Map headers, Class responseType, Object... uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return get(url, httpHeaders, responseType, uriVariables); + } + + public static ResponseEntity get(String url, HttpHeaders headers, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(headers); + return exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity get(String url, Map headers, Class responseType, Map uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return get(url, httpHeaders, responseType, uriVariables); + } + + public static ResponseEntity get(String url, HttpHeaders headers, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(headers); + return exchange(url, HttpMethod.GET, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity post(String url, Class responseType) { + return restTemplate.postForEntity(url, HttpEntity.EMPTY, responseType, new Object[0]); + } + + public static ResponseEntity post(String url, Object requestBody, Class responseType) { + return restTemplate.postForEntity(url, requestBody, responseType, new Object[0]); + } + + public static ResponseEntity post(String url, Object requestBody, Class responseType, Object... uriVariables) { + return restTemplate.postForEntity(url, requestBody, responseType, uriVariables); + } + + public static ResponseEntity post(String url, Object requestBody, Class responseType, Map uriVariables) { + return restTemplate.postForEntity(url, requestBody, responseType, uriVariables); + } + + public static ResponseEntity post(String url, Map headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return post(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity post(String url, HttpHeaders headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return post(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity post(String url, Map headers, Object requestBody, Class responseType, Map uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return post(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity post(String url, HttpHeaders headers, Object requestBody, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return post(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity post(String url, HttpEntity requestEntity, Class responseType, Object... uriVariables) { + return restTemplate.exchange(url, HttpMethod.POST, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity post(String url, HttpEntity requestEntity, Class responseType, Map uriVariables) { + return restTemplate.exchange(url, HttpMethod.POST, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, Class responseType, Object... uriVariables) { + return put(url, HttpEntity.EMPTY, responseType, uriVariables); + } + + public static ResponseEntity put(String url, Object requestBody, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody); + return put(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, Object requestBody, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody); + return put(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, Map headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return put(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity put(String url, HttpHeaders headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return put(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, Map headers, Object requestBody, Class responseType, Map uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return put(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity put(String url, HttpHeaders headers, Object requestBody, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return put(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, HttpEntity requestEntity, Class responseType, Object... uriVariables) { + return restTemplate.exchange(url, HttpMethod.PUT, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity put(String url, HttpEntity requestEntity, Class responseType, Map uriVariables) { + return restTemplate.exchange(url, HttpMethod.PUT, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Class responseType, Object... uriVariables) { + return delete(url, HttpEntity.EMPTY, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Class responseType, Map uriVariables) { + return delete(url, HttpEntity.EMPTY, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Object requestBody, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Object requestBody, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Map headers, Class responseType, Object... uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return delete(url, httpHeaders, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpHeaders headers, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(headers); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Map headers, Class responseType, Map uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return delete(url, httpHeaders, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpHeaders headers, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(headers); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Map headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return delete(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpHeaders headers, Object requestBody, Class responseType, Object... uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, Map headers, Object requestBody, Class responseType, Map uriVariables) { + HttpHeaders httpHeaders = new HttpHeaders(); + httpHeaders.setAll(headers); + return delete(url, httpHeaders, requestBody, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpHeaders headers, Object requestBody, Class responseType, Map uriVariables) { + HttpEntity requestEntity = new HttpEntity(requestBody, headers); + return delete(url, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpEntity requestEntity, Class responseType, Object... uriVariables) { + return restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity delete(String url, HttpEntity requestEntity, Class responseType, Map uriVariables) { + return restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity exchange(String url, HttpMethod method, HttpEntity requestEntity, Class responseType, Object... uriVariables) { + return restTemplate.exchange(url, method, requestEntity, responseType, uriVariables); + } + + public static ResponseEntity exchange(String url, HttpMethod method, HttpEntity requestEntity, Class responseType, Map uriVariables) { + return restTemplate.exchange(url, method, requestEntity, responseType, uriVariables); + } + + public static void main(String[] args) { + Map body = new HashMap(); + Map uriVariables = new HashMap(); + uriVariables.put("name", "ddd"); + body.put("shopname", "测试商店"); + MultiValueMap headValues = new LinkedMultiValueMap(); + headValues.add("name2", "ssss"); + String response = (String)postForObjectWithHead(body, headValues, "http://127.0.0.1:9095/test/query?name={name}", String.class, uriVariables); + System.out.println(response); + } +} From a23344898d0c60ed153a01405ebc4c5ea3b34859 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 10:47:06 +0800 Subject: [PATCH 04/67] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E8=A7=86?= =?UTF-8?q?=E9=A2=91=E5=AF=B9=E6=8E=A5=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/BsSgcDfSpPlayController.java | 5 +- .../yg/df/service/BsSgcDfSpPlayService.java | 145 ++++++++++-------- .../java/com/kms/yxgh/df/dto/DfSpPlayDto.java | 7 +- .../com/kms/yxgh/df/dto/ReservoirListDto.java | 11 +- 4 files changed, 92 insertions(+), 76 deletions(-) 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 index 95b9d0bf..461232cd 100644 --- 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 @@ -3,12 +3,12 @@ * 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.kms.yxgh.df.dto.ReservoirListQueDto; import com.shuili.common.core.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +17,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; + /** * @author lyd * @version SpTest.java, v 0.1 2025-03-07 15:56 lyd @@ -31,6 +32,7 @@ public class BsSgcDfSpPlayController extends BaseController { /** * 视频播放 + * * @param dto * @return */ @@ -42,6 +44,7 @@ public class BsSgcDfSpPlayController extends BaseController { /** * 水库列表 + * * @param * @return */ 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 index 11f1eaaa..b5150b49 100644 --- 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 @@ -3,36 +3,25 @@ package com.kms.yg.df.service; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.kms.yg.df.domain.BsSgcDfSwtz; -import com.kms.yg.df.mapper.BsSgcDfSwtzMapper; +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.df.dto.ReservoirListQueDto; import com.kms.yxgh.util.DataCenterRestTemplateUtils; import com.kms.yxgh.util.RestTemplateUtil; -import com.shuili.common.core.service.BaseService; -import lombok.AllArgsConstructor; +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.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.MediaType; -import org.springframework.http.ResponseEntity; +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.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; +import java.util.stream.Collectors; /** @@ -41,44 +30,61 @@ import java.util.Objects; * @author kms * @date 2024-01-16 */ -@AllArgsConstructor @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 ="http://19.25.35.205:31190/ZHSL_ZY/dws_rel_wmst_res"; + static final String BELONG_URL = "dws_rel_wmst_res"; - static final String OAUTH_TOKEN ="http://19.15.67.125:80/vsap-opp-service/resourceSharing/oauth/token"; + static final String OAUTH_TOKEN = "/vsap-opp-service/resourceSharing/oauth/token"; - static final String SP_PLAY_URL ="http://19.15.67.125:80/vsap-opp-service/resourceSharing/startTransform"; + static final String SP_PLAY_URL = "/vsap-opp-service/resourceSharing/startTransform"; - public ReservoirListDto reservoirList (ReservoirListDto dto) { - ReservoirListDto listDto=new ReservoirListDto(); + public ReservoirListDto reservoirList(ReservoirListDto dto) { + ReservoirListDto listDto = new ReservoirListDto(); // 1. 获取水库信息 - String belongReservoirUrlJson = dataCenterRestTemplateUtils.doPostRequest(BELONG_URL, dto); - log.info("belongReservoirUrl-请求接口响应报文: {}", belongReservoirUrlJson); - - JSONObject belongReservoirJson = parseJson(belongReservoirUrlJson); - if (belongReservoirJson == null || !isSuccess(belongReservoirJson)) { - log.warn("获取水库信息失败，响应: {}", belongReservoirUrlJson); - return listDto; + String uri = paths.get(BELONG_URL); + if (StringUtils.isEmpty(uri) || StringUtils.isEmpty(dataSyncUrl)) { + return new ReservoirListDto(); } - JSONArray reservoirData = parseJsonArray(belongReservoirJson.get("data")); - if (reservoirData == null || reservoirData.isEmpty()) { - log.warn("水库信息数据为空:{}",reservoirData.toString()); - return listDto; + 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())); } - List list=new ArrayList(); - for (int i = 0; i < reservoirData.size(); i++) { - Map map = (Map) reservoirData.get(0); - list.add(map.get("RES_CODE").toString()); + 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()); } - listDto.setCameraIds(list); - return listDto; } + @Data + public static class Item { + @JSONField(name = "WMST_CODE") + private String wmstCode; + } public DfSpPlayDto play(DfSpPlayQueDto dto) { DfSpPlayDto rest = new DfSpPlayDto(); @@ -98,32 +104,39 @@ public class BsSgcDfSpPlayService { dto.setToken(token); // 3. 调用第三方接口获取播放地址 String playOauthTokenUrlJson = getSpPlayUrls(dto); - log.info("spPlayUrl-请求接口响应报文: {}", playOauthTokenUrlJson); - - JSONObject playJson = parseJson(playOauthTokenUrlJson); - if (playJson == null || !isSuccess(playJson)) { - log.warn("获取播放地址失败，响应: {}", playOauthTokenUrlJson); - return rest; - } - - JSONObject playDataJson = playJson.getJSONObject("data"); - if (playDataJson == null) { - log.warn("播放地址数据为空"); - return rest; - } - - JSONObject urls = playDataJson.getJSONObject("urls"); - if (urls != null) { - rest.setUrlsMap((Map) urls); + 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 @@ -152,17 +165,17 @@ public class BsSgcDfSpPlayService { return json != null && Objects.equals(200, json.getIntValue("code")); } - public String getSpPlayUrls (DfSpPlayQueDto dto) { + public String getSpPlayUrls(DfSpPlayQueDto dto) { HttpHeaders headers = new HttpHeaders(); Map uriVariables = new HashMap<>(); MultiValueMap headValues = new LinkedMultiValueMap<>(); headValues.put("token", Collections.singletonList(dto.getToken())); - MapparamMap=new HashMap<>(); - paramMap.put("cameraId",dto.getCameraId()); + Map paramMap = new HashMap<>(); + paramMap.put("cameraId", dto.getCameraId()); headers.setContentType(MediaType.APPLICATION_JSON); String seqResult2 = null; try { - seqResult2 = RestTemplateUtil.postForObjectWithHead(paramMap, headValues,SP_PLAY_URL , String.class, uriVariables); + 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()); @@ -170,21 +183,19 @@ public class BsSgcDfSpPlayService { return seqResult2; } - public String getToken (DfSpPlayQueDto dto) { - RestTemplate restTemplate=new RestTemplate(); - String token =null; + 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(OAUTH_TOKEN, HttpMethod.POST, httpEntity, String.class); + ResponseEntity responseEntity = restTemplate.exchange(videoUrl + OAUTH_TOKEN, HttpMethod.POST, httpEntity, String.class); seqResult = responseEntity.getBody(); log.info("获取播放地址响应SP_PLAY_URL: {}", seqResult); - JSONObject tokenJson = JSONObject.parseObject(seqResult); - JSONObject tokenData = tokenJson.getJSONObject("data"); - token= String.valueOf(tokenData.get("token")); } catch (Exception e) { log.warn("请求接口OAUTH_TOKEN返回异常: {}", e.getMessage()); } 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 index bd8beaae..ce3311f3 100644 --- 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 @@ -1,18 +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; -import java.util.Collections; -import java.util.List; -import java.util.Map; - @ApiModel("视频播放") @Data public class DfSpPlayDto { @ApiModelProperty(value = "播放地址") - private Map urlsMap = Collections.emptyMap(); + private BsSgcDfSpPlayService.Url urlsMap; } 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 index 2b0247a0..48b7e3d2 100644 --- 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 @@ -5,17 +5,22 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.Collections; +import java.util.ArrayList; import java.util.List; -import java.util.Map; @ApiModel("视频播放") @Data public class ReservoirListDto { @ApiModelProperty(value = "视频ids") - private List cameraIds; + 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; } From 0fe4627c115048cf9301670597eacd14212260c6 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 15:31:20 +0800 Subject: [PATCH 05/67] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E7=9B=B8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v2/DfCheckingV2Controller.java | 62 +++++++++++++++++++ .../kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 45 ++++++++++++++ .../yxgh/df/dto/v2/DfV2CheckingSearchDto.java | 19 ++++++ 3 files changed, 126 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingV2Controller.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java 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..a43061a6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingV2Controller.java @@ -0,0 +1,62 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.df.dto.v2.DfV2CheckingDto; +import com.kms.yxgh.df.dto.v2.DfV2CheckingSearchDto; +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 { + + @PostMapping("/list") + @ApiOperation("堤防巡查项目列表") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + @ApiOperation("堤防巡查项目详情") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @Log(title = "堤防巡查项目新增", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("堤防巡查项目新增") + public Response add(@RequestBody DfV2CheckingDto dfV2Ck) { + return Response.ok(); + } + + @ApiOperation("堤防巡查项目修改") + @Log(title = "堤防巡查项目修改", businessType = BusinessType.UPDATE) + @PutMapping + public Response edit(@RequestBody DfV2CheckingDto dfV2Ck) { + return Response.ok(); + } + + @ApiOperation("堤防巡查项目删除") + @Log(title = "堤防巡查项目删除", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} 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..750fb835 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java @@ -0,0 +1,45 @@ +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 java.util.Date; +import java.util.List; + +@ApiModel(value = "堤防巡查项目信息") +@Data +public class DfV2CheckingDto { + + @ApiModelProperty("堤防编码") + private String dikeCode; + @ApiModelProperty("堤防名称") + private String dikeName; + @ApiModelProperty("堤防类型") + private String dikeType; + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("名称") + private String name; + + @ApiModelProperty("巡查类型") + private String type; + + @ApiModelProperty("巡查类别") + private String category; + + @ApiModelProperty("创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date createTime; + + @ApiModelProperty("创建人") + private String createUid; + + @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..be9c78c6 --- /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 = "堤防巡查项目查询") +public class DfV2CheckingSearchDto { + + @ApiModelProperty(value = "堤防编号") + private String dikeCode; + @ApiModelProperty(value = "名称") + private String name; + @ApiModelProperty("巡查类型") + private String type; + @ApiModelProperty("巡查类别") + private String category; +} From 1a0422dc6d5964a70463573927fc99042fa915bb Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 15:58:14 +0800 Subject: [PATCH 06/67] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/DfCheckingRecordV2Controller.java | 58 +++++++++++ .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 97 +++++++++++++++++++ .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 36 +++++++ 3 files changed, 191 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java 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..e960df94 --- /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.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.base.Response; +import com.kms.yxgh.base.UpdateGroup; +import com.kms.yxgh.df.dto.DfRecordDetailDto; +import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +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 { + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡视检查记录列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + + @ApiOperation("堤防巡视检查记录详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @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(); + } + + @ApiOperation("堤防巡视检查记录删除v2") + @Log(title = "堤防巡视检查记录删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} 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..d708b9e1 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java @@ -0,0 +1,97 @@ +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.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("堤防巡视检查记录详情v2") +public class DfRecordDetailV2Dto { + + @NotBlank(message = "巡查记录ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查记录") + private String id; + + @NotBlank(message = "巡查项目ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @ApiModelProperty("巡查项目名称") + private String checkingName; + + @NotBlank(message = "堤防编码不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("堤防编码") + private String dikeCode; + + @NotBlank(message = "堤防名称不能为空", groups = {AddGroup.class, 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 HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查范围") + private String scope; + + @ApiModelProperty("创建者") + private String createUid; + + @ApiModelProperty("创建者名称") + private String createName; + + @ApiModelProperty("巡查详情") + private List details = Collections.emptyList(); + + + @Data + public static class DfRecordItemDetailDto { + + @ApiModelProperty("主键") + private String id; + + @ApiModelProperty("检查部位") + private List parts; + + @ApiModelProperty("检查内容") + private String content; + + @ApiModelProperty("问题等级") + private String problemLevel; + + @ApiModelProperty("存在问题") + private String problem; + + @ApiModelProperty("问题图片") + private List problemImages = 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..ecfa1071 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -0,0 +1,36 @@ +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 status; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "开始时间") + private Date startTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty(value = "结束时间") + private Date endTime; + +} From 9d595cbc61127aca2591c654519f2f8bd47938e5 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 16:15:54 +0800 Subject: [PATCH 07/67] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d708b9e1..dfebd880 100644 --- 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 @@ -68,7 +68,7 @@ public class DfRecordDetailV2Dto { private String createName; @ApiModelProperty("巡查详情") - private List details = Collections.emptyList(); + private List problems = Collections.emptyList(); @Data From 9c1e20256f6dd4be00e3220ad376c934d8ca314c Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 16:16:39 +0800 Subject: [PATCH 08/67] =?UTF-8?q?feat:=20=E7=BC=BA=E9=99=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../v2/DfCheckingProblemV2Controller.java | 32 ++++++++++++ .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 51 +++++++++++++++++++ 2 files changed, 83 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java 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..0847527c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java @@ -0,0 +1,32 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.kms.yxgh.df.dto.v2.DfProblemV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +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 { + + /** + * 查询堤防巡视检查记录列表 + */ + @PostMapping("/list") + @ApiOperation("堤防巡查缺陷列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + +} 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..72ddbdd4 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java @@ -0,0 +1,51 @@ +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 DfProblemV2Dto { + + @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 HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolder; + +} From bfd09db38798a1055821f21e2b84e6c1bb80bb68 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 16:37:55 +0800 Subject: [PATCH 09/67] =?UTF-8?q?feat:=20=E5=85=BB=E6=8A=A4=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/v2/DfYhV2Controller.java | 57 +++++++++++++++++++ .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 2 +- .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 52 +++++++++++++++++ .../com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java | 54 ++++++++++++++++++ 4 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java 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..93ce6ea7 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java @@ -0,0 +1,57 @@ +package com.kms.yxgh.df.controller.v2; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.dto.v2.DfYhDetailV2Dto; +import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +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/yh") +@Api(tags = "堤防养护v2") +public class DfYhV2Controller { + + + @PostMapping("/list") + @ApiOperation("堤防养护列表v2") + public IPage list(@RequestBody SearchParam sp) { + return new Page<>(); + } + + + @ApiOperation("堤防养护详情v2") + @GetMapping(value = "/{id}") + public Response getInfo(@PathVariable("id") String id) { + return Response.ok(); + } + + @ApiOperation("堤防养护新增或修改v2") + @Log(title = "堤防养护新增或修改v2", businessType = BusinessType.UPDATE) + @PostMapping("/{commit}") + public Response edit(@Validated(UpdateGroup.class) + @RequestBody DfRecordDetailV2Dto dfYh, + @PathVariable("commit") Boolean commit) { + return Response.ok(); + } + + @ApiOperation("堤防养护删除v2") + @Log(title = "堤防养护删除v2", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public Response remove(@PathVariable("ids") String[] ids) { + return Response.ok(); + } + +} 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 index 72ddbdd4..cc0b8644 100644 --- 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 @@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull; import java.util.Date; @Data -@ApiModel("堤防巡视检查记录详情v2") +@ApiModel("堤防巡查问题v2") public class DfProblemV2Dto { @ApiModelProperty("问题Id") 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..b1a080eb --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java @@ -0,0 +1,52 @@ +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.NotBlank; +import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; + +@Data +@ApiModel("堤防巡视检查记录详情v2") +public class DfYhDetailV2Dto { + + @NotBlank(message = "巡查养护记录ID不能为空", groups = {UpdateGroup.class}) + @ApiModelProperty("巡查维养记录") + private String id; + + @ApiModelProperty("问题id") + private String problemId; + + @ApiModelProperty("巡查记录id") + private String recordId; + + @NotBlank(message = "巡查项目ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @ApiModelProperty("巡查项目ID") + private String checkingId; + + @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("维养详情") + private String content; + + @ApiModelProperty("图片") + private List images; + + @ApiModelProperty("巡查责任人") + private String dutyHolder; + +} 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..419e0a1a --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java @@ -0,0 +1,54 @@ +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 HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("开始时间") + private Date startDate; + + @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiModelProperty("结束时间") + private Date endDate; + + @ApiModelProperty("巡查责任人") + private String dutyHolder; + +} From 521faee01732698cbdd7fb781018e67321d63e30 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 17:06:52 +0800 Subject: [PATCH 10/67] =?UTF-8?q?feat:=20=E5=AE=A1=E6=89=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/common/ApprovalTypeEnum.java | 1 + .../kms/yxgh/df/controller/v2/DfYhV2Controller.java | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) 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..8f9f2e12 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", "dfYhRecordV2Service"), 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/df/controller/v2/DfYhV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java index 93ce6ea7..07dad48d 100644 --- 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 @@ -4,6 +4,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.DfYhPlanDetailDto; +import com.kms.yxgh.df.dto.DfYhPlanSearchDto; import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; @@ -17,12 +21,14 @@ 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 { +public class DfYhV2Controller extends ApprovalAbstractController { @PostMapping("/list") @@ -54,4 +60,8 @@ public class DfYhV2Controller { return Response.ok(); } + @Override + public ApprovalTypeEnum getApprovalType() { + return YH_V2_RECORD; + } } From 38acf3b8cc787ea81ecee9118ef6cebaa614615e Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 17:35:33 +0800 Subject: [PATCH 11/67] =?UTF-8?q?feat:=20=E5=B7=A1=E6=9F=A5=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index e960df94..cf00dc78 100644 --- 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 @@ -35,7 +35,7 @@ public class DfCheckingRecordV2Controller { @ApiOperation("堤防巡视检查记录详情v2") @GetMapping(value = "/{id}") - public Response getInfo(@PathVariable("id") String id) { + public Response getInfo(@PathVariable("id") String id) { return Response.ok(); } From fa66c6a73e6a3e40f1c77700dba615d9883f223a Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 18:06:35 +0800 Subject: [PATCH 12/67] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0id=E5=92=8Cname?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 5 ++++- .../main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 5 ++++- .../main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 5 ++++- .../src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) 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 index cc0b8644..08b06481 100644 --- 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 @@ -46,6 +46,9 @@ public class DfProblemV2Dto { private Date endDate; @ApiModelProperty("巡查责任人") - private String dutyHolder; + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; } 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 index 750fb835..cda48685 100644 --- 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 @@ -36,9 +36,12 @@ public class DfV2CheckingDto { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; - @ApiModelProperty("创建人") + @ApiModelProperty("创建者") private String createUid; + @ApiModelProperty("创建者名称") + private String createName; + @ApiModelProperty("检查项") private List items; 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 index b1a080eb..a974f2b2 100644 --- 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 @@ -47,6 +47,9 @@ public class DfYhDetailV2Dto { private List images; @ApiModelProperty("巡查责任人") - private String dutyHolder; + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; } 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 index 419e0a1a..c0aeeec2 100644 --- 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 @@ -49,6 +49,9 @@ public class DfYhListV2Dto { private Date endDate; @ApiModelProperty("巡查责任人") - private String dutyHolder; + private String dutyHolderId; + + @ApiModelProperty("巡查责任人名称") + private String dutyHolderName; } From 85042ca9faf4ee95d30eac6c5ad3c6383f77de96 Mon Sep 17 00:00:00 2001 From: hxh Date: Sun, 9 Mar 2025 19:11:14 +0800 Subject: [PATCH 13/67] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/DocV2Dto.java | 26 +++++++++++++++++++ .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 6 ++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/DocV2Dto.java 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..f9dcc44c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/DocV2Dto.java @@ -0,0 +1,26 @@ +package com.kms.yxgh.common.dto; + +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class DocV2Dto { + @ApiModelProperty(value = "图片") + private List images; + @ApiModelProperty(value = "音频") + private List audios; + @ApiModelProperty(value = "文档") + private List docs; + + @Data + private static class Item { + private String name; + private String url; + } +} 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 index a974f2b2..f2e6e994 100644 --- 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 @@ -3,6 +3,7 @@ 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.DocDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,7 +11,6 @@ import lombok.Data; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.util.Date; -import java.util.List; @Data @ApiModel("堤防巡视检查记录详情v2") @@ -43,8 +43,8 @@ public class DfYhDetailV2Dto { @ApiModelProperty("维养详情") private String content; - @ApiModelProperty("图片") - private List images; + @ApiModelProperty("文档") + private DocDto doc; @ApiModelProperty("巡查责任人") private String dutyHolderId; From 4f6fddc51dd52546f1ed194eee42d244259ccfca Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 12:14:18 +0800 Subject: [PATCH 14/67] =?UTF-8?q?feat:=20=E5=9B=BE=E6=A0=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yg/cz/dto/CharInfoDto.java | 7 + .../controller/CommonStatisticController.java | 39 ++++++ .../common/dto/ObjectStatisticQueDto.java | 38 ++++++ .../yxgh/common/enums/ProjectCharEnum.java | 128 ++++++++++++++++++ .../yxgh/common/enums/StaticIndexEnum.java | 40 ++++++ .../kms/yxgh/common/service/Statistic.java | 18 +++ 6 files changed, 270 insertions(+) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/service/Statistic.java 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..a28e0f6c 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 @@ -10,6 +10,10 @@ import java.util.List; @ApiModel("图表信息") @Data public class CharInfoDto { + + @ApiModelProperty(value = "标题") + private String title; + @ApiModelProperty(value = "x轴") private List xAxis = Collections.emptyList(); @@ -41,6 +45,9 @@ public class CharInfoDto { @ApiModelProperty(value = "名称") private String name; + @ApiModelProperty(value = "总和") + private String sum; + @ApiModelProperty(value = "数据") private List data; } 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/ObjectStatisticQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/common/dto/ObjectStatisticQueDto.java new file mode 100644 index 00000000..5a91b281 --- /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 { + + @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/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java new file mode 100644 index 00000000..7f6b6b3c --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -0,0 +1,128 @@ +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_1("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_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) + .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()); + 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..c6a0484e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -0,0 +1,40 @@ +package com.kms.yxgh.common.enums; + +import com.kms.yxgh.common.service.Statistic; +import lombok.Getter; + +import java.util.HashMap; +import java.util.Map; + +@Getter +public enum StaticIndexEnum { + + DF_YH_SUM("养护数量", sp -> { + Map map = new HashMap<>(); + map.put("2024/05/20", "12"); + map.put("2024/05/21", "15"); + map.put("2024/05/22", "17"); + return map; + }, "个", "0"), + DF_QX_SUM("缺陷数量", sp -> { + Map map = new HashMap<>(); + map.put("2024/05/20", "12"); + map.put("2024/05/21", "15"); + map.put("2024/05/22", "17"); + return map; + }, "个", "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; + } + +} 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); +} From 035474d1ef8f4f06337dda2af1c8ded03915f3ac Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 14:23:21 +0800 Subject: [PATCH 15/67] =?UTF-8?q?feat:=20=E5=9B=BE=E6=A0=87=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yg/cz/dto/CharInfoDto.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 a28e0f6c..21896c9c 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,7 +7,7 @@ import lombok.Data; import java.util.Collections; import java.util.List; -@ApiModel("图表信息") +@ApiModel("CharInfoDto-图表信息") @Data public class CharInfoDto { @@ -26,7 +26,7 @@ public class CharInfoDto { ; @Data - @ApiModel("y轴") + @ApiModel("CharInfoDto-y轴") public static class YAxis { @ApiModelProperty(value = "名称") private String name; @@ -38,7 +38,7 @@ public class CharInfoDto { private List series; } - @ApiModel("y轴数据") + @ApiModel("CharInfoDto-y轴数据") @Data public static class Series { @@ -52,7 +52,7 @@ public class CharInfoDto { private List data; } - @ApiModel("标线") + @ApiModel("CharInfoDto-标线") @Data public static class MarkLine { @ApiModelProperty(value = "名称") From 08d12e75982df1362a0eeebbfff34a9b15da1244 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 15:10:43 +0800 Subject: [PATCH 16/67] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=AD=89=E7=BA=A7=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 2 ++ 1 file changed, 2 insertions(+) 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 index ecfa1071..67fc6e2c 100644 --- 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 @@ -23,6 +23,8 @@ public class DfRecordSearchV2Dto { private String type; @ApiModelProperty("巡查类别") private String category; + @ApiModelProperty("问题级别") + private String problemLevel; @ApiModelProperty("状态") private String status; From a64154ee6ddc994bb96a6bcaa7af7ad7ac82abf7 Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 17:25:54 +0800 Subject: [PATCH 17/67] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BD=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 index dfebd880..6f1fe630 100644 --- 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 @@ -68,11 +68,11 @@ public class DfRecordDetailV2Dto { private String createName; @ApiModelProperty("巡查详情") - private List problems = Collections.emptyList(); + private List problems = Collections.emptyList(); @Data - public static class DfRecordItemDetailDto { + public static class DfRecordItemDetailV2Dto { @ApiModelProperty("主键") private String id; @@ -80,15 +80,15 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("检查部位") private List parts; + @ApiModelProperty("位置") + private String position; + @ApiModelProperty("检查内容") private String content; @ApiModelProperty("问题等级") private String problemLevel; - @ApiModelProperty("存在问题") - private String problem; - @ApiModelProperty("问题图片") private List problemImages = Collections.emptyList(); From 90e43193e35ce0ec621dcd22199b00c46b764faf Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 17:26:28 +0800 Subject: [PATCH 18/67] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 3 +++ 1 file changed, 3 insertions(+) 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 index 6f1fe630..5e7e4e06 100644 --- 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 @@ -89,6 +89,9 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("问题等级") private String problemLevel; + @ApiModelProperty("状态") + private String status; + @ApiModelProperty("问题图片") private List problemImages = Collections.emptyList(); From 074b49590ded736b53ea390d78be931b3e744ade Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 17:40:17 +0800 Subject: [PATCH 19/67] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=96=87?= =?UTF-8?q?=E6=A1=A3=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 2 +- .../main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingSearchDto.java | 2 +- .../src/main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index cda48685..d4e8d49a 100644 --- 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 @@ -9,7 +9,7 @@ import lombok.Data; import java.util.Date; import java.util.List; -@ApiModel(value = "堤防巡查项目信息") +@ApiModel(value = "堤防巡查项目信息v2") @Data public class DfV2CheckingDto { 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 index be9c78c6..871d588b 100644 --- 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 @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data -@ApiModel(value = "堤防巡查项目查询") +@ApiModel(value = "堤防巡查项目查询v2") public class DfV2CheckingSearchDto { @ApiModelProperty(value = "堤防编号") 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 index f2e6e994..d10f657e 100644 --- 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 @@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull; import java.util.Date; @Data -@ApiModel("堤防巡视检查记录详情v2") +@ApiModel("堤防巡视检查维养记录详情v2") public class DfYhDetailV2Dto { @NotBlank(message = "巡查养护记录ID不能为空", groups = {UpdateGroup.class}) From 96778e382a54bea569632a482f4290221d2362b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Mon, 10 Mar 2025 19:24:11 +0800 Subject: [PATCH 20/67] =?UTF-8?q?add=EF=BC=9A=E6=8F=90=E9=98=B2v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/service/BaseService.java | 5 + .../v2/DfCheckingProblemV2Controller.java | 7 +- .../v2/DfCheckingRecordV2Controller.java | 16 +- .../controller/v2/DfCheckingV2Controller.java | 20 +- .../df/controller/v2/DfYhV2Controller.java | 18 +- .../yxgh/df/domain/DfCheckingProblemV2.java | 151 ++++++++++++ .../kms/yxgh/df/domain/DfCheckingRecord.java | 122 +++++++++ .../df/domain/DfCheckingV2ProjectItem.java | 41 ++++ .../df/domain/DfCheckingV2ProjectManage.java | 72 ++++++ .../java/com/kms/yxgh/df/domain/DfYhV2V2.java | 163 ++++++++++++ .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 4 + .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 3 + .../kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 2 + .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 6 + .../df/mapper/DfCheckingProblemV2Mapper.java | 17 ++ .../df/mapper/DfCheckingRecordV2Mapper.java | 17 ++ .../yxgh/df/mapper/DfCheckingV2Mapper.java | 17 ++ .../mapper/DfCheckingV2ProjectItemMapper.java | 18 ++ .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 17 ++ .../service/DfCheckingProblemV2Service.java | 99 ++++++++ .../df/service/DfCheckingRecordV2Service.java | 186 ++++++++++++++ .../DfCheckingV2ProjectItemV2Service.java | 17 ++ .../yxgh/df/service/DfCheckingV2Service.java | 231 ++++++++++++++++++ .../kms/yxgh/df/service/DfYhV2V2Service.java | 136 +++++++++++ .../main/java/com/kms/yxgh/util/ListUtil.java | 60 +++++ 25 files changed, 1418 insertions(+), 27 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingRecord.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectItem.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingV2ProjectManage.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2ProjectItemMapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/util/ListUtil.java 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/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingProblemV2Controller.java index 0847527c..9311b4a3 100644 --- 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 @@ -1,9 +1,9 @@ package com.kms.yxgh.df.controller.v2; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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; @@ -20,13 +20,16 @@ import org.springframework.web.bind.annotation.RestController; @Api(tags = "堤防巡查缺陷v2") public class DfCheckingProblemV2Controller { + private final DfCheckingProblemV2Service dfCheckingProblemV2Service; + + /** * 查询堤防巡视检查记录列表 */ @PostMapping("/list") @ApiOperation("堤防巡查缺陷列表v2") public IPage list(@RequestBody SearchParam sp) { - return new Page<>(); + 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 index cf00dc78..2ebf2304 100644 --- 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 @@ -1,12 +1,11 @@ package com.kms.yxgh.df.controller.v2; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.Response; import com.kms.yxgh.base.UpdateGroup; -import com.kms.yxgh.df.dto.DfRecordDetailDto; 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; @@ -23,20 +22,21 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "堤防巡视检查记录v2") public class DfCheckingRecordV2Controller { + private final DfCheckingRecordV2Service dfCheckingRecordV2Service; + /** * 查询堤防巡视检查记录列表 */ @PostMapping("/list") @ApiOperation("堤防巡视检查记录列表v2") public IPage list(@RequestBody SearchParam sp) { - return new Page<>(); + return dfCheckingRecordV2Service.list(sp); } - @ApiOperation("堤防巡视检查记录详情v2") @GetMapping(value = "/{id}") public Response getInfo(@PathVariable("id") String id) { - return Response.ok(); + return Response.ok(dfCheckingRecordV2Service.getInfo(id)); } @ApiOperation("堤防巡视检查记录新增或修改v2") @@ -45,14 +45,14 @@ public class DfCheckingRecordV2Controller { public Response edit(@Validated(UpdateGroup.class) @RequestBody DfRecordDetailV2Dto dfRecord, @PathVariable("commit") Boolean commit) { - return Response.ok(); + return Response.ok(dfCheckingRecordV2Service.edit(dfRecord,commit)); } @ApiOperation("堤防巡视检查记录删除v2") @Log(title = "堤防巡视检查记录删除v2", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public Response remove(@PathVariable("ids") String[] ids) { - return Response.ok(); + 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 index a43061a6..5abf2dff 100644 --- 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 @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.DfAnimalPlanService; +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; @@ -26,37 +28,41 @@ import org.springframework.web.bind.annotation.*; @Api(tags = "堤防巡查项目v2") public class DfCheckingV2Controller { + + private final DfCheckingV2Service dfCheckingV2Service; + + @PostMapping("/list") @ApiOperation("堤防巡查项目列表") public IPage list(@RequestBody SearchParam sp) { - return new Page<>(); + return dfCheckingV2Service.list(sp); } @ApiOperation("堤防巡查项目详情") @GetMapping(value = "/{id}") public Response getInfo(@PathVariable("id") String id) { - return Response.ok(); + return Response.ok(dfCheckingV2Service.getInfo(id)); } @Log(title = "堤防巡查项目新增", businessType = BusinessType.INSERT) - @PostMapping + @PostMapping("/add") @ApiOperation("堤防巡查项目新增") public Response add(@RequestBody DfV2CheckingDto dfV2Ck) { - return Response.ok(); + return Response.ok(dfCheckingV2Service.add(dfV2Ck)); } @ApiOperation("堤防巡查项目修改") @Log(title = "堤防巡查项目修改", businessType = BusinessType.UPDATE) - @PutMapping + @PostMapping("/edit") public Response edit(@RequestBody DfV2CheckingDto dfV2Ck) { - return Response.ok(); + return Response.ok(dfCheckingV2Service.edit(dfV2Ck)); } @ApiOperation("堤防巡查项目删除") @Log(title = "堤防巡查项目删除", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public Response remove(@PathVariable("ids") String[] ids) { - return Response.ok(); + 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 index 07dad48d..b1a16cea 100644 --- 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 @@ -6,12 +6,12 @@ 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.DfYhPlanDetailDto; -import com.kms.yxgh.df.dto.DfYhPlanSearchDto; import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; +import com.kms.yxgh.df.service.DfCheckingRecordV2Service; +import com.kms.yxgh.df.service.DfYhV2V2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.enums.BusinessType; @@ -20,28 +20,26 @@ 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 DfYhV2V2Service dfYhV2V2Service; @PostMapping("/list") @ApiOperation("堤防养护列表v2") public IPage list(@RequestBody SearchParam sp) { - return new Page<>(); + return dfYhV2V2Service.list(sp); } @ApiOperation("堤防养护详情v2") @GetMapping(value = "/{id}") public Response getInfo(@PathVariable("id") String id) { - return Response.ok(); + return Response.ok(dfYhV2V2Service.getInfo(id)); } @ApiOperation("堤防养护新增或修改v2") @@ -50,14 +48,14 @@ public class DfYhV2Controller extends ApprovalAbstractController edit(@Validated(UpdateGroup.class) @RequestBody DfRecordDetailV2Dto dfYh, @PathVariable("commit") Boolean commit) { - return Response.ok(); + return Response.ok(dfYhV2V2Service.edit(dfYh,commit)); } @ApiOperation("堤防养护删除v2") @Log(title = "堤防养护删除v2", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public Response remove(@PathVariable("ids") String[] ids) { - return Response.ok(); + public Response myRemove(@PathVariable("ids") String[] ids) { + return Response.ok(dfYhV2V2Service.myRemove(ids)); } @Override 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..fab4a77f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java @@ -0,0 +1,151 @@ +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; + + + + + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String issueLevel; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private String projectId; + + /** + * 记录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 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 startTime; + + /** + * 巡查结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("巡查结束时间") + private Date endTime; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String describe; + + + /** + * 问题位置 + */ + @ApiModelProperty("问题位置") + private String problemLocation; + + + /** + * 文档 + */ + @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..ae17fdd7 --- /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 lombok.Data; + +import java.util.Date; + + +/** + * 害堤动物防治计划对象 bs_sgc_df_xcitem + * + * @author sy + * @date 2024-01-04 + */ +@TableName("bs_sgc_df_xcitem") +@Data +@ApiModel("项目管理记录") +public class DfCheckingRecord extends SyBaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 巡查范围 + */ + @ApiModelProperty("巡查范围") + private String scope; + + /** + * 巡查开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("巡查开始时间") + private Date startTime; + + /** + * 巡查结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("巡查结束时间") + private Date endTime; + + /** + * 项目id + */ + @ApiModelProperty("项目id") + private String projectId; + + /** + * 巡查状态字典:patrol_maintenance_status + */ + @ApiModelProperty("巡查状态字典:patrol_maintenance_status") + private String status; + + /** + * 巡查责任人 + */ + @ApiModelProperty("巡查责任人") + private String dutyHolderName; + + /** + * 巡查责任人id + */ + @ApiModelProperty("巡查责任人id") + private String dutyHolderId; + + /** + * 项目名称 + */ + @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 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..424d344b --- /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 Integer projectId; + + /** + * 检查部位 + */ + @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/DfYhV2V2.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java new file mode 100644 index 00000000..b15e157d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java @@ -0,0 +1,163 @@ +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 DfYhV2V2 extends SyBaseEntity { + + /** + * 巡查项目id + */ + @ApiModelProperty("巡查项目id") + private String projectId; + /** + * 缺陷id + */ + @ApiModelProperty("缺陷id") + private String defectId; + /** + * 文档 + */ + @ApiModelProperty("文档") + private String doc; + + + /** + * 维养责任人id + */ + @ApiModelProperty("维养责任人id") + private String dutyHolderId; + + /** + * 维养责任人名称 + */ + @ApiModelProperty("维养责任人名称") + private String dutyHolderName; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String details; + + + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String issueLevel; + + + /** + * 记录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 startTime; + + /** + * 维养结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("维养结束时间") + private Date endDate; + + /** + * 描述 + */ + @ApiModelProperty("描述") + private String describe; + + + /** + * 问题位置 + */ + @ApiModelProperty("问题位置") + private String problemLocation; + + + + /** + * 创建人id + */ + @ApiModelProperty("创建人id") + private String createUid; + + + /** + * 附加配置 + */ + @ApiModelProperty("备注") + private String remark; + + +} 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 index 5e7e4e06..53f501b8 100644 --- 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 @@ -3,6 +3,7 @@ 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.df.dto.DfCheckingDetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -97,4 +98,7 @@ public class DfRecordDetailV2Dto { } + @ApiModelProperty("检查项") + private List items; + } 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 index 67fc6e2c..d0ae7d10 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -28,6 +28,9 @@ public class DfRecordSearchV2Dto { @ApiModelProperty("状态") private String status; + @ApiModelProperty("记录id") + private String recordId; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty(value = "开始时间") private Date startTime; 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 index d4e8d49a..936e719e 100644 --- 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 @@ -6,6 +6,7 @@ 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; @@ -20,6 +21,7 @@ public class DfV2CheckingDto { @ApiModelProperty("堤防类型") private String dikeType; + @NotNull @ApiModelProperty("主键") private String id; 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 index d10f657e..62650f22 100644 --- 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 @@ -52,4 +52,10 @@ public class DfYhDetailV2Dto { @ApiModelProperty("巡查责任人名称") private String dutyHolderName; + /** + * 问题等级 + */ + @ApiModelProperty("问题等级") + private String issueLevel; + } 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..1e369be6 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingProblemV2Mapper.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; +import org.springframework.stereotype.Repository; + +/** + * DfCheckingProblemV2Mapper + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingProblemV2Mapper extends BaseMapper { + + +} 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..e53ffa44 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingRecordV2Mapper.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfCheckingRecord; +import org.springframework.stereotype.Repository; + +/** + * 害堤动物防治计划Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingRecordV2Mapper extends BaseMapper { + + +} 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..2ffeaa1f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfCheckingV2Mapper.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectManage; +import org.springframework.stereotype.Repository; + +/** + * 害堤动物防治计划Mapper接口 + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfCheckingV2Mapper extends BaseMapper { + + +} 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/DfYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java new file mode 100644 index 00000000..a80be232 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java @@ -0,0 +1,17 @@ +package com.kms.yxgh.df.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.kms.yxgh.df.domain.DfYhV2V2; +import org.springframework.stereotype.Repository; + +/** + * DfYhV2Mapper + * + * @author sy + * @date 2024-01-04 + */ +@Repository +public interface DfYhV2Mapper extends BaseMapper { + + +} 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..9d4b8b1f --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingProblemV2Service.java @@ -0,0 +1,99 @@ +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.dto.v2.DfProblemV2Dto; +import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; +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 com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; +import com.kms.yxgh.df.domain.DfCheckingProblemV2; + +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * 项目管理记录 + * + * @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(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfCheckingProblemV2::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfCheckingProblemV2::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfCheckingProblemV2::getName, name)); + + Optional.ofNullable(data.getDutyHolder()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(dutyHolder -> queryWrapper.like(DfCheckingProblemV2::getDutyHolderName, dutyHolder)); + + Optional.ofNullable(data.getStatus()) + .filter(StringUtils::isNotBlank) + .ifPresent(status -> queryWrapper.like(DfCheckingProblemV2::getStatus, status)); + + Optional.ofNullable(data.getStartTime()) + .filter(startTime -> startTime != null) + .ifPresent(startTime -> queryWrapper.ge(DfCheckingProblemV2::getCreateTime, startTime)); + + Optional.ofNullable(data.getProblemLevel()) + .filter(problemLevel -> problemLevel != null) + .ifPresent(problemLevel -> queryWrapper.le(DfCheckingProblemV2::getIssueLevel, problemLevel)); + + Optional.ofNullable(data.getRecordId()) + .filter(StringUtils::isNotBlank) + .ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getIssueLevel, 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 -> { + 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..b156c907 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -0,0 +1,186 @@ +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.DfCheckingProblemV2; +import com.kms.yxgh.df.domain.DfCheckingRecord; +import com.kms.yxgh.df.domain.DfCheckingV2ProjectItem; +import com.kms.yxgh.df.dto.DfCheckingDetailDto; +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.kms.yxgh.util.ListUtil; +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.*; +import java.util.stream.Collectors; + +/** + * 项目管理记录 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfCheckingRecordV2Service extends BaseService { + + + 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::getName, 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)); + + Optional.ofNullable(data.getStartTime()) + .filter(startTime -> startTime != null) + .ifPresent(startTime -> queryWrapper.ge(DfCheckingRecord::getCreateTime, startTime)); + + Optional.ofNullable(data.getEndTime()) + .filter(endTime -> endTime != null) + .ifPresent(endTime -> queryWrapper.le(DfCheckingRecord::getCreateTime, endTime)); + + } + + // 查询分页数据 + 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) { + BeanUtils.copyProperties(dfCheckingRecord, dto); + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .eq(DfCheckingV2ProjectItem::getProjectId, id) + ); + dto.setItems(items.stream() + .map(DfCheckingV2Service::convertToItemDto) + .collect(Collectors.toList())); + } + // 巡查详情列表 + SearchParam sp=new SearchParam<>(); + DfRecordSearchV2Dto searchV2Dto=new DfRecordSearchV2Dto(); + searchV2Dto.setRecordId(dfCheckingRecord.getId()); + sp.setData(searchV2Dto); + sp.setPageSize(Integer.MAX_VALUE); + sp.setPageNum(1); + IPage list = dfCheckingProblemV2Service.list(sp); + if (null != list) { + List records = list.getRecords(); + List dtoList = + ListUtil.copyListToResultList(records, DfRecordDetailV2Dto.DfRecordItemDetailV2Dto.class); + dto.setProblems(dtoList); + } + // 子项 + return dto; + } + + public DfRecordDetailV2Dto edit(DfRecordDetailV2Dto dfRecord, Boolean commit) { + if (commit) { + + List ids = dfRecord.getProblems() + .stream() + .map(DfRecordDetailV2Dto.DfRecordItemDetailV2Dto::getId).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(ids)) { + dfCheckingProblemV2Service.remove(new LambdaQueryWrapper().in(DfCheckingProblemV2::getId,ids)); + } + DfCheckingRecord dfCheckingRecord=new DfCheckingRecord(); + BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + updateById(dfCheckingRecord); + List problems = dfRecord.getProblems(); + List dfCheckingProblemV2s = ListUtil.copyListToResultList(problems, DfCheckingProblemV2.class); + dfCheckingProblemV2Service.updateBatchById(dfCheckingProblemV2s); + return dfRecord; + } + DfCheckingRecord dfCheckingRecord=new DfCheckingRecord(); + BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + save(dfCheckingRecord); + List problems = dfRecord.getProblems(); + List dfCheckingProblemV2s = ListUtil.copyListToResultList(problems, DfCheckingProblemV2.class); + dfCheckingProblemV2Service.saveBatch(dfCheckingProblemV2s); + return dfRecord; + + } + + public Boolean myRemove(String[] ids) { + return Optional.ofNullable(ids) + .filter(array -> array.length > 0) + .map(array -> { + int count = dfCheckingProblemV2Service.count(new LambdaQueryWrapper() + .eq(DfCheckingProblemV2::getProjectId, DfCheckingV2Service.getIntList(array)) + ); + if (count > 0) { + throw new RuntimeException("请先删除项目子项"); + } + Arrays.stream(array) + .parallel() // 使用并行流 + .forEach(e->{ + dfCheckingProblemV2Service.remove(new LambdaQueryWrapper().eq(DfCheckingProblemV2::getRecordId,e)); + }); + return removeById(ids); + }) + .orElse(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..885a0c6d --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java @@ -0,0 +1,17 @@ +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..18c2a4da --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2Service.java @@ -0,0 +1,231 @@ +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.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; + + + 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()); + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .in(DfCheckingV2ProjectItem::getProjectId, ids) + ); + + // 将项目项关联到 DTO + vos.forEach(dto -> { + List itemDtos = items.stream() + .filter(item -> Objects.equals(item.getProjectId(),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 (dfCheckingV2ProjectManage != null) { + BeanUtils.copyProperties(dfCheckingV2ProjectManage, dto); + + List items = dfCheckingV2ProjectItemV2Service.list( + Wrappers.lambdaQuery() + .eq(DfCheckingV2ProjectItem::getProjectId, 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.setProjectId(Integer.valueOf(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("修改失败"); + } + + List items = dfV2Ck.getItems().stream() + .map(item -> { + DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); + projectItem.setId(item.getId()); + projectItem.setProjectId(Integer.valueOf(dfV2Ck.getId())); + projectItem.setContent(item.getContent()); + projectItem.setParts(String.join(",", item.getParts())); + return projectItem; + }) + .collect(Collectors.toList()); + + if (!dfCheckingV2ProjectItemV2Service.updateBatchById(items)) { + throw new RuntimeException("项目子项修改失败"); + } + + return dfV2Ck; + } + + @Transactional(rollbackFor = Exception.class) + public boolean myRemove(String[] ids) { + return Optional.ofNullable(ids) + .filter(array -> array.length > 0) + .map(array -> { + int count = dfCheckingV2ProjectItemV2Service.count(new LambdaQueryWrapper() + .eq(DfCheckingV2ProjectItem::getProjectId, getIntList(array)) + ); + if (count > 0) { + throw new RuntimeException("请先删除项目子项"); + } + Arrays.stream(array) + .parallel() // 使用并行流 + .forEach(dfCheckingV2ProjectItemV2Service::removeById); + return removeById(ids); + }) + .orElse(false); + } + public static List getIntList(String[] ids) { + if (ids == null) { + return new ArrayList<>(); + } + return Arrays.stream(ids) + .map(Integer::valueOf) + .collect(Collectors.toList()); + } +} + + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java new file mode 100644 index 00000000..0b9b10d9 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java @@ -0,0 +1,136 @@ +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.DfYhV2V2; +import com.kms.yxgh.df.dto.v2.*; +import com.kms.yxgh.df.mapper.DfYhV2Mapper; +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.Arrays; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +/** + * 项目管理记录 + * + * @author sy + * @date 2023-11-09 + */ +@Service +@AllArgsConstructor +public class DfYhV2V2Service 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(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(category -> queryWrapper.eq(DfYhV2V2::getCategory, category)); + + Optional.ofNullable(data.getType()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(type -> queryWrapper.eq(DfYhV2V2::getType, type)); + + Optional.ofNullable(data.getName()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(name -> queryWrapper.like(DfYhV2V2::getName, name)); + + Optional.ofNullable(data.getDutyHolder()) + .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .ifPresent(dutyHolder -> queryWrapper.like(DfYhV2V2::getDutyHolderName, dutyHolder)); + + Optional.ofNullable(data.getStatus()) + .filter(StringUtils::isNotBlank) + .ifPresent(status -> queryWrapper.like(DfYhV2V2::getStatus, status)); + + Optional.ofNullable(data.getStartTime()) + .filter(startTime -> startTime != null) + .ifPresent(startTime -> queryWrapper.ge(DfYhV2V2::getCreateTime, startTime)); + + Optional.ofNullable(data.getProblemLevel()) + .filter(problemLevel -> problemLevel != null) + .ifPresent(problemLevel -> queryWrapper.le(DfYhV2V2::getIssueLevel, problemLevel)); + + Optional.ofNullable(data.getRecordId()) + .filter(StringUtils::isNotBlank) + .ifPresent(recordId -> queryWrapper.eq(DfYhV2V2::getIssueLevel, 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); + return dto; + }) + .collect(Collectors.toList()); + dtoPage.setRecords(vos); + return dtoPage; + } + + + public DfYhDetailV2Dto getInfo(String id) { + DfYhDetailV2Dto dto=new DfYhDetailV2Dto(); + DfYhV2V2 dfYhV2V2 = getById(id); + if (dfYhV2V2 != null) { + BeanUtils.copyProperties(dfYhV2V2, dto); + } + return dto; + } + + + public Boolean myRemove(String[] ids) { + return Optional.ofNullable(ids) + .filter(array -> array.length > 0) + .map(array -> { + Arrays.stream(array) + .parallel() // 使用并行流 + .forEach(this::removeById); + return removeById(ids); + }) + .orElse(false); + } + + public DfYhDetailV2Dto edit(DfRecordDetailV2Dto dfYh, Boolean commit) { + DfYhDetailV2Dto dto=new DfYhDetailV2Dto(); + DfYhV2V2 dfYhV2V2=new DfYhV2V2(); + if (commit) { + BeanUtils.copyProperties(dfYhV2V2, dfYh); + updateById(dfYhV2V2); + } + BeanUtils.copyProperties(dfYhV2V2, dfYh); + updateById(dfYhV2V2); + BeanUtils.copyProperties(dfYhV2V2, dto); + return dto; + + + } +} + + + + diff --git a/shuili-system/src/main/java/com/kms/yxgh/util/ListUtil.java b/shuili-system/src/main/java/com/kms/yxgh/util/ListUtil.java new file mode 100644 index 00000000..14c737aa --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/util/ListUtil.java @@ -0,0 +1,60 @@ +package com.kms.yxgh.util; +import com.shuili.common.utils.BeanUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +public class ListUtil { + public ListUtil() { + } + + public static Predicate distinctByKey(Function keyExtractor) { + Map seen = new ConcurrentHashMap(1024); + return (object) -> { + return seen.putIfAbsent(keyExtractor.apply(object), Boolean.TRUE) == null; + }; + } + + + public static boolean isNull(List list) { + return list == null || list.size() == 0; + } + + public static List copyListToResultList(List sourceList, Class targetObj) { + List targetList = new ArrayList(); + if (!Objects.isNull(sourceList)) { + sourceList.forEach((item) -> { + try { + F data = targetObj.newInstance(); + BeanUtils.copyProperties(item, data); + targetList.add(data); + } catch (IllegalAccessException | InstantiationException var4) { + } + + }); + } + + return targetList; + } + + public static List getListByPage(Integer current, Integer size, List sourceList) { + if (sourceList != null && !sourceList.isEmpty()) { + if (current != 0 && current != 1) { + if (sourceList.size() < (current - 1) * size) { + return getListByPage(1, size, sourceList); + } else { + return sourceList.size() < current * size ? sourceList.subList((current - 1) * size, sourceList.size()) : sourceList.subList((current - 1) * size, current * size); + } + } else { + return sourceList.size() > size ? sourceList.subList(0, size) : sourceList; + } + } else { + return sourceList; + } + } +} \ No newline at end of file From 0100d9715abccd3aca2781fb557aae0bba0334dc Mon Sep 17 00:00:00 2001 From: hxh Date: Mon, 10 Mar 2025 21:20:03 +0800 Subject: [PATCH 21/67] =?UTF-8?q?feat:=20=E7=BB=B4=E5=85=BB=E5=AE=A1?= =?UTF-8?q?=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/v2/DfYhV2Controller.java | 13 ++-- .../kms/yxgh/df/dto/v2/DfYhApproveDto.java | 20 +++++++ .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 59 ++++++++++++++++++- .../service/DfCheckingProblemV2Service.java | 5 +- .../kms/yxgh/df/service/DfYhV2V2Service.java | 46 +++++++++++++-- 5 files changed, 126 insertions(+), 17 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java 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 index b1a16cea..5539cbe4 100644 --- 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 @@ -1,16 +1,11 @@ package com.kms.yxgh.df.controller.v2; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.DfRecordDetailV2Dto; -import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; -import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; -import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; -import com.kms.yxgh.df.service.DfCheckingRecordV2Service; +import com.kms.yxgh.df.dto.v2.*; import com.kms.yxgh.df.service.DfYhV2V2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; @@ -20,12 +15,14 @@ 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 { +public class DfYhV2Controller extends ApprovalAbstractController { private final DfYhV2V2Service dfYhV2V2Service; @@ -48,7 +45,7 @@ public class DfYhV2Controller extends ApprovalAbstractController edit(@Validated(UpdateGroup.class) @RequestBody DfRecordDetailV2Dto dfYh, @PathVariable("commit") Boolean commit) { - return Response.ok(dfYhV2V2Service.edit(dfYh,commit)); + return Response.ok(dfYhV2V2Service.edit(dfYh, commit)); } @ApiOperation("堤防养护删除v2") 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..cdeea44e --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java @@ -0,0 +1,20 @@ +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; +} 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 index a80be232..8d6470b9 100644 --- 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 @@ -1,7 +1,19 @@ 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.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.mapper.handler.DocHandler; +import com.kms.yxgh.common.mapper.handler.OperatorHandler; import com.kms.yxgh.df.domain.DfYhV2V2; +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.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; /** @@ -13,5 +25,50 @@ import org.springframework.stereotype.Repository; @Repository public interface DfYhV2Mapper extends BaseMapper { - + @Select("") + @Results(id = "approvalSearchPage", value = { + @Result(column = "operator", property = "operator", typeHandler = OperatorHandler.class), + @Result(column = "ts_doc", property = "doc", typeHandler = DocHandler.class), + @Result(column = "id", property = "formId"), + @Result(column = "form_id", property = "formId"), + @Result(column = "create_time", property = "submitTime"), + @Result(column = "approval_time", property = "approvalTime"), + }) + IPage> approvalSearchPage(Page page, @Param("dto") ApprovalSearchDto data); } 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 index 9d4b8b1f..e5ee619e 100644 --- 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 @@ -1,18 +1,19 @@ 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 com.kms.yxgh.df.mapper.DfCheckingProblemV2Mapper; -import com.kms.yxgh.df.domain.DfCheckingProblemV2; import java.util.List; import java.util.Optional; diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java index 0b9b10d9..c2884463 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java @@ -1,14 +1,20 @@ package com.kms.yxgh.df.service; + +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.dto.ApprovalDetailDto; +import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.service.DefaultApprovalBusinessService; import com.kms.yxgh.df.domain.DfYhV2V2; import com.kms.yxgh.df.dto.v2.*; import com.kms.yxgh.df.mapper.DfYhV2Mapper; 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; @@ -26,7 +32,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class DfYhV2V2Service extends BaseService { +public class DfYhV2V2Service extends DefaultApprovalBusinessService { public IPage list(SearchParam sp) { // 分页参数 @@ -94,7 +100,7 @@ public class DfYhV2V2Service extends BaseService { public DfYhDetailV2Dto getInfo(String id) { - DfYhDetailV2Dto dto=new DfYhDetailV2Dto(); + DfYhDetailV2Dto dto = new DfYhDetailV2Dto(); DfYhV2V2 dfYhV2V2 = getById(id); if (dfYhV2V2 != null) { BeanUtils.copyProperties(dfYhV2V2, dto); @@ -116,8 +122,8 @@ public class DfYhV2V2Service extends BaseService { } public DfYhDetailV2Dto edit(DfRecordDetailV2Dto dfYh, Boolean commit) { - DfYhDetailV2Dto dto=new DfYhDetailV2Dto(); - DfYhV2V2 dfYhV2V2=new DfYhV2V2(); + DfYhDetailV2Dto dto = new DfYhDetailV2Dto(); + DfYhV2V2 dfYhV2V2 = new DfYhV2V2(); if (commit) { BeanUtils.copyProperties(dfYhV2V2, dfYh); updateById(dfYhV2V2); @@ -125,9 +131,37 @@ public class DfYhV2V2Service extends BaseService { BeanUtils.copyProperties(dfYhV2V2, dfYh); updateById(dfYhV2V2); BeanUtils.copyProperties(dfYhV2V2, dto); - return dto; + return 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) { + Wrapper wp = Wrappers.lambdaUpdate() + .eq(DfYhV2V2::getId, formId) + .set(DfYhV2V2::getStatus, status.getValue()); + this.update(null, wp); + } + + @Override + public String formStatus(String formId) { + Wrapper wp = Wrappers.lambdaQuery() + .eq(DfYhV2V2::getId, formId) + .select(DfYhV2V2::getStatus); + List list = this.list(wp); + if (list != null && !list.isEmpty()) { + return list.get(0).getStatus(); + } + return ""; } } From 38898362da8806cc6c5efce43a519122f94e7783 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 09:16:03 +0800 Subject: [PATCH 22/67] =?UTF-8?q?add=EF=BC=9A=E6=8F=90=E9=98=B2v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/DocV2Dto.java | 7 +-- .../yxgh/common/enums/DfYhV2StatusEnum.java | 22 +++++++++ .../df/controller/v2/DfYhV2Controller.java | 2 - .../yxgh/df/domain/DfCheckingProblemV2.java | 16 ++----- .../kms/yxgh/df/domain/DfCheckingRecord.java | 27 ++++++----- .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 17 +++++-- .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 11 +++-- .../service/DfCheckingProblemV2Service.java | 4 +- .../df/service/DfCheckingRecordV2Service.java | 46 +++++++++++++------ .../yxgh/df/service/DfCheckingV2Service.java | 8 +++- .../kms/yxgh/df/service/DfYhV2V2Service.java | 24 +++++++--- 11 files changed, 119 insertions(+), 65 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java 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 index f9dcc44c..ef5824b4 100644 --- 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 @@ -5,6 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Collections; import java.util.List; @Data @@ -12,11 +13,11 @@ import java.util.List; @NoArgsConstructor public class DocV2Dto { @ApiModelProperty(value = "图片") - private List images; + private List images = Collections.emptyList(); @ApiModelProperty(value = "音频") - private List audios; + private List audios = Collections.emptyList(); @ApiModelProperty(value = "文档") - private List docs; + private List docs = Collections.emptyList(); @Data private static class Item { 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..926a2404 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java @@ -0,0 +1,22 @@ +package com.kms.yxgh.common.enums; + +import lombok.Getter; + +@Getter +public enum DfYhV2StatusEnum { + + DURING_INSPECTION("巡查中", "1"), + INSPECTED("已巡检", "2"), + UNDER_MAINTENANCE("养护中", "3"), + NO_DEFECTS("无缺陷", "4"), + ACCEPTED("已验收", "5"); + + + private final String name; + private final String value; + + DfYhV2StatusEnum(String name, String value) { + this.name = name; + this.value = value; + } +} 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 index b1a16cea..996dbb9c 100644 --- 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 @@ -1,7 +1,6 @@ package com.kms.yxgh.df.controller.v2; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.base.Response; import com.kms.yxgh.base.UpdateGroup; import com.kms.yxgh.common.ApprovalTypeEnum; @@ -10,7 +9,6 @@ import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; -import com.kms.yxgh.df.service.DfCheckingRecordV2Service; import com.kms.yxgh.df.service.DfYhV2V2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; 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 index fab4a77f..8fd3bba6 100644 --- 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 @@ -8,8 +8,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; - - /** * 缺陷记录 bs_sgc_df_xcqx * @@ -25,11 +23,8 @@ public class DfCheckingProblemV2 extends SyBaseEntity { - /** - * 问题等级 - */ @ApiModelProperty("问题等级") - private String issueLevel; + private String problemLevel; /** * 项目id @@ -107,12 +102,7 @@ public class DfCheckingProblemV2 extends SyBaseEntity { @ApiModelProperty("巡查开始时间") private Date startTime; - /** - * 巡查结束时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("巡查结束时间") - private Date endTime; + /** * 描述 @@ -125,7 +115,7 @@ public class DfCheckingProblemV2 extends SyBaseEntity { * 问题位置 */ @ApiModelProperty("问题位置") - private String problemLocation; + private String position; /** 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 index ae17fdd7..4faa93fc 100644 --- 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 @@ -5,10 +5,8 @@ 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; - +import lombok.Data; /** * 害堤动物防治计划对象 bs_sgc_df_xcitem @@ -23,30 +21,31 @@ public class DfCheckingRecord extends SyBaseEntity { private static final long serialVersionUID = 1L; /** - * 巡查范围 + * 开始时间 */ - @ApiModelProperty("巡查范围") - private String scope; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @ApiModelProperty("开始时间") + private Date startTime; /** - * 巡查开始时间 + * 结束时间 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("巡查开始时间") - private Date startTime; + @ApiModelProperty("结束时间") + private Date doneTime; /** - * 巡查结束时间 + * 巡查范围 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty("巡查结束时间") - private Date endTime; + @ApiModelProperty("巡查范围") + private String scope; + /** * 项目id */ @ApiModelProperty("项目id") - private String projectId; + private String checkingId; /** * 巡查状态字典:patrol_maintenance_status 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 index 53f501b8..f1b3fd66 100644 --- 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 @@ -3,6 +3,8 @@ 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.DocDto; +import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.df.dto.DfCheckingDetailDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -18,22 +20,26 @@ import java.util.List; @ApiModel("堤防巡视检查记录详情v2") public class DfRecordDetailV2Dto { - @NotBlank(message = "巡查记录ID不能为空", groups = {UpdateGroup.class}) + + @ApiModelProperty("文档") + private DocV2Dto doc; + + @NotBlank(message = "巡查记录ID不能为空") @ApiModelProperty("巡查记录") private String id; - @NotBlank(message = "巡查项目ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @NotBlank(message = "巡查项目ID不能为空", groups = {UpdateGroup.class}) @ApiModelProperty("巡查项目ID") private String checkingId; @ApiModelProperty("巡查项目名称") private String checkingName; - @NotBlank(message = "堤防编码不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @NotBlank(message = "堤防编码不能为空", groups = { UpdateGroup.class}) @ApiModelProperty("堤防编码") private String dikeCode; - @NotBlank(message = "堤防名称不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @NotBlank(message = "堤防名称不能为空", groups = { UpdateGroup.class}) @ApiModelProperty("堤防名称") private String dikeName; @@ -87,6 +93,9 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("检查内容") private String content; + @ApiModelProperty("描述") + private String describe; + @ApiModelProperty("问题等级") private String problemLevel; 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 index 62650f22..daf2df9b 100644 --- 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 @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.kms.yxgh.base.AddGroup; import com.kms.yxgh.base.UpdateGroup; import com.kms.yxgh.common.dto.DocDto; +import com.kms.yxgh.common.dto.DocV2Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -26,16 +27,16 @@ public class DfYhDetailV2Dto { @ApiModelProperty("巡查记录id") private String recordId; - @NotBlank(message = "巡查项目ID不能为空", groups = {AddGroup.class, UpdateGroup.class}) + @NotBlank(message = "巡查项目ID不能为空", groups = {UpdateGroup.class}) @ApiModelProperty("巡查项目ID") private String checkingId; - @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) + @NotNull(message = "开始时间", groups = { UpdateGroup.class}) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("开始时间") private Date startDate; - @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) + @NotNull(message = "结束时间", groups = { UpdateGroup.class}) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("结束时间") private Date endDate; @@ -44,7 +45,7 @@ public class DfYhDetailV2Dto { private String content; @ApiModelProperty("文档") - private DocDto doc; + private DocV2Dto doc; @ApiModelProperty("巡查责任人") private String dutyHolderId; @@ -58,4 +59,6 @@ public class DfYhDetailV2Dto { @ApiModelProperty("问题等级") private String issueLevel; + + } 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 index 9d4b8b1f..afcb6d15 100644 --- 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 @@ -63,11 +63,11 @@ public class DfCheckingProblemV2Service extends BaseService problemLevel != null) - .ifPresent(problemLevel -> queryWrapper.le(DfCheckingProblemV2::getIssueLevel, problemLevel)); + .ifPresent(problemLevel -> queryWrapper.le(DfCheckingProblemV2::getProblemLevel, problemLevel)); Optional.ofNullable(data.getRecordId()) .filter(StringUtils::isNotBlank) - .ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getIssueLevel, recordId)); + .ifPresent(recordId -> queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); } 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 index b156c907..956c7171 100644 --- 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 @@ -7,6 +7,7 @@ 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; @@ -21,6 +22,7 @@ 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; @@ -74,9 +76,10 @@ public class DfCheckingRecordV2Service extends BaseService endTime != null) .ifPresent(endTime -> queryWrapper.le(DfCheckingRecord::getCreateTime, endTime)); - } + + // 查询分页数据 Page queryPage = page(page, queryWrapper); if (queryPage == null) { @@ -131,34 +134,47 @@ public class DfCheckingRecordV2Service extends BaseService ids = dfRecord.getProblems() - .stream() - .map(DfRecordDetailV2Dto.DfRecordItemDetailV2Dto::getId).collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(ids)) { - dfCheckingProblemV2Service.remove(new LambdaQueryWrapper().in(DfCheckingProblemV2::getId,ids)); - } DfCheckingRecord dfCheckingRecord=new DfCheckingRecord(); BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + // 提交为已巡检 + dfCheckingRecord.setStatus(DfYhV2StatusEnum.INSPECTED.getValue()); updateById(dfCheckingRecord); - List problems = dfRecord.getProblems(); - List dfCheckingProblemV2s = ListUtil.copyListToResultList(problems, DfCheckingProblemV2.class); - dfCheckingProblemV2Service.updateBatchById(dfCheckingProblemV2s); + dfCheckingProblemV2Service.updateBatchById(convertToImages(dfRecord.getProblems())); return dfRecord; } DfCheckingRecord dfCheckingRecord=new DfCheckingRecord(); BeanUtils.copyProperties(dfRecord, dfCheckingRecord); + // 未提交维巡查中 + dfCheckingRecord.setStatus(DfYhV2StatusEnum.DURING_INSPECTION.getValue()); save(dfCheckingRecord); - List problems = dfRecord.getProblems(); - List dfCheckingProblemV2s = ListUtil.copyListToResultList(problems, DfCheckingProblemV2.class); - dfCheckingProblemV2Service.saveBatch(dfCheckingProblemV2s); + dfCheckingProblemV2Service.saveBatch(convertToImages(dfRecord.getProblems())); return dfRecord; + } + 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)); + } } + public static List convertToImages(List dtoList) { + List dfCheckingProblemV2s = new ArrayList<>(); + dtoList.stream().forEach(e->{ + DfCheckingProblemV2 dfCheckingProblemV2=new DfCheckingProblemV2(); + BeanUtils.copyProperties(e,dfCheckingProblemV2); + dfCheckingProblemV2.setDoc(e.getProblemImages().stream().collect(Collectors.joining(","))); + }); + return dfCheckingProblemV2s; + } + @Transactional(rollbackFor = Exception.class) public Boolean myRemove(String[] ids) { return Optional.ofNullable(ids) .filter(array -> array.length > 0) 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 index 18c2a4da..ca622e18 100644 --- 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 @@ -143,7 +143,6 @@ public class DfCheckingV2Service extends BaseService !items.isEmpty()) @@ -165,6 +164,8 @@ public class DfCheckingV2Service extends BaseService() + .eq(DfCheckingV2ProjectItem::getProjectId,dfV2Ck.getId())); + + List items = dfV2Ck.getItems().stream() .map(item -> { DfCheckingV2ProjectItem projectItem = new DfCheckingV2ProjectItem(); diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java index 0b9b10d9..9ba167e3 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2V2Service.java @@ -1,9 +1,11 @@ package com.kms.yxgh.df.service; +import com.alibaba.fastjson.JSONArray; 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.common.dto.DocV2Dto; import com.kms.yxgh.df.domain.DfYhV2V2; import com.kms.yxgh.df.dto.v2.*; import com.kms.yxgh.df.mapper.DfYhV2Mapper; @@ -37,11 +39,11 @@ public class DfYhV2V2Service extends BaseService { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); if (!ObjectUtils.isEmpty(data)) { Optional.ofNullable(data.getCategory()) - .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .ifPresent(category -> queryWrapper.eq(DfYhV2V2::getCategory, category)); Optional.ofNullable(data.getType()) - .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .ifPresent(type -> queryWrapper.eq(DfYhV2V2::getType, type)); Optional.ofNullable(data.getName()) @@ -49,7 +51,7 @@ public class DfYhV2V2Service extends BaseService { .ifPresent(name -> queryWrapper.like(DfYhV2V2::getName, name)); Optional.ofNullable(data.getDutyHolder()) - .filter(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .ifPresent(dutyHolder -> queryWrapper.like(DfYhV2V2::getDutyHolderName, dutyHolder)); Optional.ofNullable(data.getStatus()) @@ -98,6 +100,7 @@ public class DfYhV2V2Service extends BaseService { DfYhV2V2 dfYhV2V2 = getById(id); if (dfYhV2V2 != null) { BeanUtils.copyProperties(dfYhV2V2, dto); + dto.setDoc(JSONArray.parseObject(dfYhV2V2.getDoc(), DocV2Dto.class)); } return dto; } @@ -119,15 +122,22 @@ public class DfYhV2V2Service extends BaseService { DfYhDetailV2Dto dto=new DfYhDetailV2Dto(); DfYhV2V2 dfYhV2V2=new DfYhV2V2(); if (commit) { - BeanUtils.copyProperties(dfYhV2V2, dfYh); + BeanUtils.copyProperties(dfYh, dfYhV2V2); + dfYhV2V2.setDoc(getDocStrJson(dfYh.getDoc())); updateById(dfYhV2V2); } - BeanUtils.copyProperties(dfYhV2V2, dfYh); - updateById(dfYhV2V2); + BeanUtils.copyProperties(dfYh, dfYhV2V2); + dfYhV2V2.setDoc(getDocStrJson(dfYh.getDoc())); + save(dfYhV2V2); BeanUtils.copyProperties(dfYhV2V2, dto); return dto; + } - + private String getDocStrJson (DocV2Dto dto) { + if (dto == null) { + return null; + } + return JSONArray.toJSONString(dto); } } From efbd08c28fbac6a1ec2da2a58a413fcd94e0feaa Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 10:25:09 +0800 Subject: [PATCH 23/67] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E7=B1=BB?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../df/controller/v2/DfYhV2Controller.java | 12 ++-- .../df/domain/{DfYhV2V2.java => DfYhV2.java} | 12 +--- .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 4 +- ...fYhV2V2Service.java => DfYhV2Service.java} | 64 +++++++++---------- 4 files changed, 41 insertions(+), 51 deletions(-) rename shuili-system/src/main/java/com/kms/yxgh/df/domain/{DfYhV2V2.java => DfYhV2.java} (98%) rename shuili-system/src/main/java/com/kms/yxgh/df/service/{DfYhV2V2Service.java => DfYhV2Service.java} (74%) 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 index 0cfc8a9c..aeb17570 100644 --- 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 @@ -10,7 +10,7 @@ import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfRecordSearchV2Dto; import com.kms.yxgh.df.dto.v2.DfYhDetailV2Dto; import com.kms.yxgh.df.dto.v2.DfYhListV2Dto; -import com.kms.yxgh.df.service.DfYhV2V2Service; +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; @@ -28,19 +28,19 @@ import static com.kms.yxgh.common.ApprovalTypeEnum.YH_V2_RECORD; @Api(tags = "堤防养护v2") public class DfYhV2Controller extends ApprovalAbstractController { - private final DfYhV2V2Service dfYhV2V2Service; + private final DfYhV2Service dfYhV2Service; @PostMapping("/list") @ApiOperation("堤防养护列表v2") public IPage list(@RequestBody SearchParam sp) { - return dfYhV2V2Service.list(sp); + return dfYhV2Service.list(sp); } @ApiOperation("堤防养护详情v2") @GetMapping(value = "/{id}") public Response getInfo(@PathVariable("id") String id) { - return Response.ok(dfYhV2V2Service.getInfo(id)); + return Response.ok(dfYhV2Service.getInfo(id)); } @ApiOperation("堤防养护新增或修改v2") @@ -49,14 +49,14 @@ public class DfYhV2Controller extends ApprovalAbstractController edit(@Validated(UpdateGroup.class) @RequestBody DfRecordDetailV2Dto dfYh, @PathVariable("commit") Boolean commit) { - return Response.ok(dfYhV2V2Service.edit(dfYh, 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(dfYhV2V2Service.myRemove(ids)); + return Response.ok(dfYhV2Service.myRemove(ids)); } @Override diff --git a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java rename to shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java index b15e157d..d866bd6c 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2V2.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java @@ -19,7 +19,7 @@ import java.util.Date; @TableName("bs_sgc_df_xcyj") @Data @ApiModel("堤防巡视养护管理表") -public class DfYhV2V2 extends SyBaseEntity { +public class DfYhV2 extends SyBaseEntity { /** * 巡查项目id @@ -70,24 +70,18 @@ public class DfYhV2V2 extends SyBaseEntity { @ApiModelProperty("记录id") private String recordId; - - /** * 巡查状态字典:patrol_maintenance_status */ @ApiModelProperty("巡查状态字典:patrol_maintenance_status") private String status; - - /** * name */ @ApiModelProperty("name") private String name; - - /** * 巡查类型 字典：patrol_maintenance_type */ @@ -100,10 +94,6 @@ public class DfYhV2V2 extends SyBaseEntity { @ApiModelProperty("巡查类别字典：patrol_maintenance_category") private String category; - - - - /** * 堤防代码 */ 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 index 8d6470b9..c81a293e 100644 --- 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 @@ -7,7 +7,7 @@ import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.ApprovalSearchDto; import com.kms.yxgh.common.mapper.handler.DocHandler; import com.kms.yxgh.common.mapper.handler.OperatorHandler; -import com.kms.yxgh.df.domain.DfYhV2V2; +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; @@ -23,7 +23,7 @@ import org.springframework.stereotype.Repository; * @date 2024-01-04 */ @Repository -public interface DfYhV2Mapper extends BaseMapper { +public interface DfYhV2Mapper extends BaseMapper { @Select("") + List count(@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 index e53ffa44..5aeb9531 100644 --- 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 @@ -1,9 +1,16 @@ 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.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接口 * @@ -13,5 +20,20 @@ import org.springframework.stereotype.Repository; @Repository public interface DfCheckingRecordV2Mapper extends BaseMapper { - + @Select("") + List count(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); } 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 index 2ffeaa1f..0632c687 100644 --- 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 @@ -1,9 +1,15 @@ 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接口 * @@ -13,5 +19,17 @@ import org.springframework.stereotype.Repository; @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/DfYhV2Mapper.java b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java index ce98a2c1..63f7eab9 100644 --- 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 @@ -1,11 +1,12 @@ package com.kms.yxgh.df.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yxgh.df.domain.DfYhV2; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yxgh.common.dto.ApprovalDetailDto; import com.kms.yxgh.common.dto.ApprovalSearchDto; +import com.kms.yxgh.common.dto.CountDto; +import com.kms.yxgh.common.dto.ObjectStatisticQueDto; import com.kms.yxgh.common.mapper.handler.DocHandler; import com.kms.yxgh.common.mapper.handler.OperatorHandler; import com.kms.yxgh.df.domain.DfYhV2; @@ -17,6 +18,8 @@ import org.apache.ibatis.annotations.Results; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; +import java.util.List; + /** * DfYhV2Mapper * @@ -72,4 +75,19 @@ public interface DfYhV2Mapper extends BaseMapper { @Result(column = "approval_time", property = "approvalTime"), }) IPage> approvalSearchPage(Page page, @Param("dto") ApprovalSearchDto data); + + + @Select("") + List count(@Param("data") ObjectStatisticQueDto sp); } From 7f026ad0daf464cb822e7ac58c9fcb7fd70e19f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 18:15:41 +0800 Subject: [PATCH 33/67] =?UTF-8?q?add=EF=BC=9A=E6=8F=90=E9=98=B2v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/DocV2Dto.java | 2 +- .../yxgh/common/enums/ProjectCharEnum.java | 10 +++- .../yxgh/df/domain/DfCheckingProblemV2.java | 15 +++-- .../kms/yxgh/df/domain/DfCheckingRecord.java | 2 +- .../java/com/kms/yxgh/df/domain/DfYhV2.java | 10 +--- .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 33 +++++++++++ .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 12 ++-- .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 7 +++ .../service/DfCheckingProblemV2Service.java | 6 +- .../df/service/DfCheckingRecordV2Service.java | 58 +++++++++++++++---- .../yxgh/df/service/DfCheckingV2Service.java | 8 +++ .../kms/yxgh/df/service/DfYhV2Service.java | 2 +- sql/zj/v5.0.0/增量更新/v1.sql | 10 ++-- 13 files changed, 135 insertions(+), 40 deletions(-) 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 index ef5824b4..03ec36f6 100644 --- 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 @@ -20,7 +20,7 @@ public class DocV2Dto { private List docs = Collections.emptyList(); @Data - private static class Item { + public static class Item { private String name; private String url; } 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 index 95fc49e3..e9afb157 100644 --- 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 @@ -13,12 +13,20 @@ import java.util.stream.Stream; @Getter public enum ProjectCharEnum { - C_14("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "问题个数", Collections.emptyList()), + C_14("缺陷记录分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), + C_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), + C_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), + C_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_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; 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 index 88679530..09f940a9 100644 --- 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 @@ -21,6 +21,11 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private static final long serialVersionUID = 1L; + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; @ApiModelProperty("问题等级") @@ -49,10 +54,10 @@ public class DfCheckingProblemV2 extends SyBaseEntity { /** - * name + * 巡查项目名称 */ - @ApiModelProperty("name") - private String name; + @ApiModelProperty("巡查项目名称") + private String checkingName; @@ -110,13 +115,11 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private Date endDate; - - /** * 描述 */ @ApiModelProperty("描述") - private String describe; + private String depict; /** 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 index 9bcd8cd3..4a955637 100644 --- 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 @@ -69,7 +69,7 @@ public class DfCheckingRecord extends SyBaseEntity { * 项目名称 */ @ApiModelProperty("项目名称") - private String name; + private String checkingName; /** * 巡查类型 字典：patrol_maintenance_type 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 index 07d6dad4..b593ba6e 100644 --- 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 @@ -25,7 +25,7 @@ public class DfYhV2 extends SyBaseEntity { * 巡查项目id */ @ApiModelProperty("巡查项目id") - private String projectId; + private String checkingId; /** * 缺陷id */ @@ -54,7 +54,7 @@ public class DfYhV2 extends SyBaseEntity { * 描述 */ @ApiModelProperty("描述") - private String details; + private String depict; /** @@ -121,12 +121,6 @@ public class DfYhV2 extends SyBaseEntity { @ApiModelProperty("维养结束时间") private Date endDate; - /** - * 描述 - */ - @ApiModelProperty("描述") - private String describe; - /** * 问题位置 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 index 08b06481..13aa2e86 100644 --- 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 @@ -3,6 +3,7 @@ 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; @@ -14,9 +15,41 @@ import java.util.Date; @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 depict; + @ApiModelProperty("巡查项目ID") private String checkingId; 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 index f1b3fd66..6c85164e 100644 --- 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 @@ -74,6 +74,10 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("创建者名称") private String createName; + @ApiModelProperty("描述") + private String depict; + + @ApiModelProperty("巡查详情") private List problems = Collections.emptyList(); @@ -85,7 +89,7 @@ public class DfRecordDetailV2Dto { private String id; @ApiModelProperty("检查部位") - private List parts; + private List parts=Collections.emptyList();; @ApiModelProperty("位置") private String position; @@ -94,20 +98,20 @@ public class DfRecordDetailV2Dto { private String content; @ApiModelProperty("描述") - private String describe; + private String depict; @ApiModelProperty("问题等级") private String problemLevel; @ApiModelProperty("状态") private String status; - +// @ApiModelProperty("问题图片") private List problemImages = Collections.emptyList(); } @ApiModelProperty("检查项") - private List items; + 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 index 55a1a956..838323b9 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -28,6 +28,13 @@ public class DfRecordSearchV2Dto { @ApiModelProperty("状态") private String status; + + /** + * 问题位置 + */ + @ApiModelProperty("部位") + private String parts; + @ApiModelProperty("记录id") private String recordId; 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 index b5ae64a5..15546809 100644 --- 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 @@ -36,19 +36,19 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper = new LambdaQueryWrapper<>(); + 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(com.baomidou.mybatisplus.core.toolkit.StringUtils::isNotBlank) + .filter(StringUtils::isNotBlank) .ifPresent(type -> queryWrapper.eq(DfCheckingProblemV2::getType, type)); Optional.ofNullable(data.getName()) .filter(StringUtils::isNotBlank) - .ifPresent(name -> queryWrapper.like(DfCheckingProblemV2::getName, name)); + .ifPresent(name -> queryWrapper.like(DfCheckingProblemV2::getCheckingName, name)); Optional.ofNullable(data.getDutyHolder()) .filter(StringUtils::isNotBlank) 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 index 69711dfe..3646c18b 100644 --- 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 @@ -1,5 +1,8 @@ package com.kms.yxgh.df.service; +import com.alibaba.druid.sql.visitor.functions.If; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -7,6 +10,7 @@ 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.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; import com.kms.yxgh.df.domain.*; import com.kms.yxgh.df.dto.DfCheckingDetailDto; @@ -59,7 +63,7 @@ public class DfCheckingRecordV2Service extends BaseService queryWrapper.like(DfCheckingRecord::getName, name)); + .ifPresent(name -> queryWrapper.like(DfCheckingRecord::getCheckingName, name)); Optional.ofNullable(data.getDutyHolder()) .filter(StringUtils::isNotBlank) @@ -128,8 +132,22 @@ public class DfCheckingRecordV2Service extends BaseService list = dfCheckingProblemV2Service.list(sp); if (null != list) { List records = list.getRecords(); - List dtoList = - ListUtil.copyListToResultList(records, DfRecordDetailV2Dto.DfRecordItemDetailV2Dto.class); + List dtoList = new ArrayList<>(); + for (DfProblemV2Dto record : records) { + 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.setDepict(record.getDepict()); + detailV2Dto.setPosition(record.getPosition()); + detailV2Dto.setProblemLevel(record.getProblemLevel()); + detailV2Dto.setProblemImages(DfCheckingV2Service.getStringList(record.getParts().split(","))); + detailV2Dto.setStatus(record.getStatus()); + dtoList.add(detailV2Dto); + } dto.setProblems(dtoList); } return dto; @@ -150,16 +168,16 @@ public class DfCheckingRecordV2Service extends BaseService convertToImages(List dtoList) { + public static List convertToImages(DfRecordDetailV2Dto dfRecord) { List dfCheckingProblemV2s = new ArrayList<>(); - dtoList.forEach(e->{ + dfRecord.getProblems().forEach(e->{ DfCheckingProblemV2 dfCheckingProblemV2=new DfCheckingProblemV2(); BeanUtils.copyProperties(e,dfCheckingProblemV2); - dfCheckingProblemV2.setDoc(String.join(",", e.getProblemImages())); + dfCheckingProblemV2.setCheckingId(dfRecord.getCheckingId()); + dfCheckingProblemV2.setRecordId(dfRecord.getId()); + 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.setDepict(dfRecord.getDepict()); + dfCheckingProblemV2.setType(dfRecord.getType()); + dfCheckingProblemV2.setCategory(dfRecord.getCategory()); + if (null!= e.getParts()) { + dfCheckingProblemV2.setParts(e.getParts().stream().collect(Collectors.joining(","))); + } + if (null!= e.getProblemImages()){ + dfCheckingProblemV2.setDoc(e.getProblemImages().stream().collect(Collectors.joining(","))); + + } + dfCheckingProblemV2.setDepict(e.getDepict()); + dfCheckingProblemV2s.add(dfCheckingProblemV2); }); return dfCheckingProblemV2s; } 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 index e41dcee9..087f206e 100644 --- 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 @@ -229,6 +229,14 @@ public class DfCheckingV2Service extends BaseService 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/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index 4a4f9df3..8b46c664 100644 --- 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 @@ -150,7 +150,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService Date: Tue, 11 Mar 2025 18:29:42 +0800 Subject: [PATCH 34/67] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85content=E5=AD=97?= =?UTF-8?q?=E6=AE=B5,=E5=8E=BB=E9=99=A4depict=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/domain/DfCheckingProblemV2.java | 16 +---- .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 15 ++-- .../df/service/DfCheckingRecordV2Service.java | 71 +++++++++---------- 3 files changed, 44 insertions(+), 58 deletions(-) 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 index 09f940a9..5e82569e 100644 --- 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 @@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; + /** * 缺陷记录 bs_sgc_df_xcqx * @@ -44,7 +45,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private String recordId; - /** * 巡查状态字典:patrol_maintenance_status */ @@ -52,7 +52,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private String status; - /** * 巡查项目名称 */ @@ -60,7 +59,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private String checkingName; - /** * 巡查类型 字典：patrol_maintenance_type */ @@ -74,7 +72,6 @@ public class DfCheckingProblemV2 extends SyBaseEntity { private String category; - /** * 巡查责任人 */ @@ -114,21 +111,14 @@ public class DfCheckingProblemV2 extends SyBaseEntity { @ApiModelProperty("巡查结束时间") private Date endDate; - - /** - * 描述 - */ - @ApiModelProperty("描述") - private String depict; - - /** * 问题位置 */ @ApiModelProperty("问题位置") private String position; - + @ApiModelProperty("检查内容") + private String content; /** * 文档 */ 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 index 6c85164e..5a5f6bd2 100644 --- 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 @@ -3,7 +3,6 @@ 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.DocDto; import com.kms.yxgh.common.dto.DocV2Dto; import com.kms.yxgh.df.dto.DfCheckingDetailDto; import io.swagger.annotations.ApiModel; @@ -35,11 +34,11 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("巡查项目名称") private String checkingName; - @NotBlank(message = "堤防编码不能为空", groups = { UpdateGroup.class}) + @NotBlank(message = "堤防编码不能为空", groups = {UpdateGroup.class}) @ApiModelProperty("堤防编码") private String dikeCode; - @NotBlank(message = "堤防名称不能为空", groups = { UpdateGroup.class}) + @NotBlank(message = "堤防名称不能为空", groups = {UpdateGroup.class}) @ApiModelProperty("堤防名称") private String dikeName; @@ -89,7 +88,7 @@ public class DfRecordDetailV2Dto { private String id; @ApiModelProperty("检查部位") - private List parts=Collections.emptyList();; + private List parts = Collections.emptyList(); @ApiModelProperty("位置") private String position; @@ -97,21 +96,19 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("检查内容") private String content; - @ApiModelProperty("描述") - private String depict; - @ApiModelProperty("问题等级") private String problemLevel; @ApiModelProperty("状态") private String status; -// + // @ApiModelProperty("问题图片") private List problemImages = Collections.emptyList(); } @ApiModelProperty("检查项") - private List items=Collections.emptyList();; + private List items = Collections.emptyList(); + ; } 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 index 3646c18b..60fd87e9 100644 --- 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 @@ -1,8 +1,5 @@ package com.kms.yxgh.df.service; -import com.alibaba.druid.sql.visitor.functions.If; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -10,15 +7,15 @@ 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.dto.DocV2Dto; import com.kms.yxgh.common.enums.DfYhV2StatusEnum; -import com.kms.yxgh.df.domain.*; -import com.kms.yxgh.df.dto.DfCheckingDetailDto; +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.kms.yxgh.util.ListUtil; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.service.BaseService; import com.shuili.common.utils.BeanUtils; @@ -26,7 +23,9 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -45,6 +44,7 @@ public class DfCheckingRecordV2Service extends BaseService list(SearchParam sp) { // 分页参数 Page page = new Page<>(sp.getPageNum(), sp.getPageSize()); @@ -83,7 +83,6 @@ public class DfCheckingRecordV2Service extends BaseService queryPage = page(page, queryWrapper); if (queryPage == null) { @@ -108,7 +107,7 @@ public class DfCheckingRecordV2Service extends BaseService sp=new SearchParam<>(); - DfRecordSearchV2Dto searchV2Dto=new DfRecordSearchV2Dto(); + SearchParam sp = new SearchParam<>(); + DfRecordSearchV2Dto searchV2Dto = new DfRecordSearchV2Dto(); assert dfCheckingRecord != null; searchV2Dto.setRecordId(dfCheckingRecord.getId()); sp.setData(searchV2Dto); @@ -134,12 +133,12 @@ public class DfCheckingRecordV2Service extends BaseService records = list.getRecords(); List dtoList = new ArrayList<>(); for (DfProblemV2Dto record : records) { - DfRecordDetailV2Dto.DfRecordItemDetailV2Dto detailV2Dto=new DfRecordDetailV2Dto.DfRecordItemDetailV2Dto(); - if (null!=record.getParts()) { + 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(","))); + if (null != record.getDoc()) { + detailV2Dto.setProblemImages(DfCheckingV2Service.getStringList(record.getDoc().split(","))); } detailV2Dto.setDepict(record.getDepict()); detailV2Dto.setPosition(record.getPosition()); @@ -152,33 +151,34 @@ public class DfCheckingRecordV2Service extends BaseService().in(DfCheckingProblemV2::getId,ids)); - dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getDefectId,ids)); + dfCheckingProblemV2Service.remove(new LambdaQueryWrapper().in(DfCheckingProblemV2::getId, ids)); + dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getDefectId, ids)); } } public static List convertToImages(DfRecordDetailV2Dto dfRecord) { List dfCheckingProblemV2s = new ArrayList<>(); - dfRecord.getProblems().forEach(e->{ - DfCheckingProblemV2 dfCheckingProblemV2=new DfCheckingProblemV2(); - BeanUtils.copyProperties(e,dfCheckingProblemV2); + dfRecord.getProblems().forEach(e -> { + DfCheckingProblemV2 dfCheckingProblemV2 = new DfCheckingProblemV2(); + BeanUtils.copyProperties(e, dfCheckingProblemV2); dfCheckingProblemV2.setCheckingId(dfRecord.getCheckingId()); dfCheckingProblemV2.setRecordId(dfRecord.getId()); dfCheckingProblemV2.setCheckingName(dfRecord.getCheckingName()); @@ -206,29 +206,28 @@ public class DfCheckingRecordV2Service extends BaseService 0) { + if (null != ids && ids.length > 0) { int count = dfCheckingProblemV2Service.count(new LambdaQueryWrapper() .in(DfCheckingProblemV2::getCheckingId , DfCheckingV2Service.getIntList(ids)) ); - if (count > 0) { + if (count > 0) { throw new RuntimeException("请先删除项目子项"); } dfCheckingProblemV2Service.remove(new LambdaQueryWrapper() From 7d13a600309bbca84656f5af06e4306269e73a37 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 18:54:25 +0800 Subject: [PATCH 35/67] =?UTF-8?q?fix:=20=E9=97=AE=E9=A2=98=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E9=99=90=E5=88=B6=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BA=A4=E5=90=8E=E7=9A=84=E6=89=8D=E8=83=BD?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/service/DfCheckingProblemV2Service.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 index 15546809..a04601d5 100644 --- 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 @@ -19,6 +19,8 @@ import java.util.List; import java.util.Optional; import java.util.stream.Collectors; +import static com.kms.yxgh.common.enums.DfYhV2StatusEnum.DURING_INSPECTION; + /** * 项目管理记录 * @@ -59,11 +61,9 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.like(DfCheckingProblemV2::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startDate -> startDate != null) .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); Optional.ofNullable(data.getEndDate()) - .filter(endDate -> endDate != null) .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); Optional.ofNullable(data.getProblemLevel()) @@ -75,6 +75,7 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); } + queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); // 查询分页数据 Page queryPage = page(page, queryWrapper); From fa7f85a6dbbc56c1dc7c09f8a8d93c00742382a2 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 19:07:23 +0800 Subject: [PATCH 36/67] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java | 1 - 1 file changed, 1 deletion(-) 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 index 60fd87e9..81bfe971 100644 --- 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 @@ -140,7 +140,6 @@ public class DfCheckingRecordV2Service extends BaseService Date: Tue, 11 Mar 2025 19:19:12 +0800 Subject: [PATCH 37/67] =?UTF-8?q?fix:=20=E8=A1=A5=E5=85=85=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 4 ++-- .../com/kms/yxgh/df/service/DfCheckingRecordV2Service.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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 index 13aa2e86..e4ad38a0 100644 --- 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 @@ -47,8 +47,8 @@ public class DfProblemV2Dto { @ApiModelProperty("问题Id") private String problemId; - @ApiModelProperty("描述") - private String depict; + @ApiModelProperty("检查内容") + private String content; @ApiModelProperty("巡查项目ID") private String checkingId; 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 index 81bfe971..eedae139 100644 --- 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 @@ -140,7 +140,9 @@ public class DfCheckingRecordV2Service extends BaseService Date: Tue, 11 Mar 2025 19:37:47 +0800 Subject: [PATCH 38/67] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java | 2 ++ 1 file changed, 2 insertions(+) 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 index eedae139..769bc74a 100644 --- 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 @@ -170,6 +170,7 @@ public class DfCheckingRecordV2Service extends BaseService Date: Tue, 11 Mar 2025 19:56:39 +0800 Subject: [PATCH 39/67] =?UTF-8?q?fix:=20problem=E6=B7=BB=E5=8A=A0itemId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/domain/DfCheckingProblemV2.java | 1 + .../main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 3 +++ 2 files changed, 4 insertions(+) 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 index 5e82569e..9ca39ce2 100644 --- 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 @@ -21,6 +21,7 @@ import java.util.Date; public class DfCheckingProblemV2 extends SyBaseEntity { private static final long serialVersionUID = 1L; + private String itemId; /** * 问题位置 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 index 5a5f6bd2..f1c05d52 100644 --- 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 @@ -87,6 +87,9 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("主键") private String id; + @ApiModelProperty("检查项ID") + private String itemId; + @ApiModelProperty("检查部位") private List parts = Collections.emptyList(); From 6a4f806c65cde70a61244bdb2903b71e301b176c Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 20:52:17 +0800 Subject: [PATCH 40/67] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E7=BB=B4?= =?UTF-8?q?=E5=85=BB=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/controller/v2/DfYhV2Controller.java | 2 +- .../src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index aeb17570..658eec4a 100644 --- 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 @@ -47,7 +47,7 @@ public class DfYhV2Controller extends ApprovalAbstractController edit(@Validated(UpdateGroup.class) - @RequestBody DfRecordDetailV2Dto dfYh, + @RequestBody DfYhDetailV2Dto dfYh, @PathVariable("commit") Boolean commit) { return Response.ok(dfYhV2Service.edit(dfYh, commit)); } 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 index 8b46c664..d38af6a4 100644 --- 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 @@ -130,7 +130,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService Date: Tue, 11 Mar 2025 21:14:11 +0800 Subject: [PATCH 41/67] =?UTF-8?q?fix:=20=E5=85=BB=E6=8A=A4=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8E=BB=E9=99=A4id=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) 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 index daf2df9b..91a2417a 100644 --- 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 @@ -1,9 +1,7 @@ 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.DocDto; import com.kms.yxgh.common.dto.DocV2Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -17,7 +15,6 @@ import java.util.Date; @ApiModel("堤防巡视检查维养记录详情v2") public class DfYhDetailV2Dto { - @NotBlank(message = "巡查养护记录ID不能为空", groups = {UpdateGroup.class}) @ApiModelProperty("巡查维养记录") private String id; @@ -31,12 +28,12 @@ public class DfYhDetailV2Dto { @ApiModelProperty("巡查项目ID") private String checkingId; - @NotNull(message = "开始时间", groups = { UpdateGroup.class}) + @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}) + @NotNull(message = "结束时间", groups = {UpdateGroup.class}) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiModelProperty("结束时间") private Date endDate; @@ -60,5 +57,4 @@ public class DfYhDetailV2Dto { private String issueLevel; - } From 7eb50bd50112356775a5853ab81555ec2e00cd3d Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 21:22:49 +0800 Subject: [PATCH 42/67] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98id=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-system/src/main/java/com/kms/yxgh/df/domain/DfYhV2.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b593ba6e..75e3a1ec 100644 --- 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 @@ -30,7 +30,7 @@ public class DfYhV2 extends SyBaseEntity { * 缺陷id */ @ApiModelProperty("缺陷id") - private String defectId; + private String problemId; /** * 文档 */ From 10c8705fbefc0aacf96043b26057c6201a94ad31 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 21:26:05 +0800 Subject: [PATCH 43/67] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=97=AE?= =?UTF-8?q?=E9=A2=98id=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 769bc74a..d7ad09dd 100644 --- 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 @@ -190,7 +190,7 @@ public class DfCheckingRecordV2Service extends BaseService().in(DfCheckingProblemV2::getId, ids)); - dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getDefectId, ids)); + dfYhV2Service.remove(new LambdaQueryWrapper().in(DfYhV2::getProblemId, ids)); } } From 6e8c8f74d4dc92e4d6f4bdade16fd5f708c935a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 21:44:37 +0800 Subject: [PATCH 44/67] =?UTF-8?q?add=EF=BC=9A=E5=A0=A4=E9=98=B2=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/CountDateDto.java | 10 ++ .../kms/yxgh/common/dto/CountLevelDto.java | 10 ++ .../com/kms/yxgh/common/dto/CountQxDto.java | 10 ++ .../com/kms/yxgh/common/dto/CountYhDto.java | 10 ++ .../enums/PatrolMaintenanceCategory.java | 9 +- .../yxgh/common/enums/ProjectCharEnum.java | 13 +-- .../yxgh/common/enums/StaticIndexEnum.java | 107 ++++++++++++++--- .../df/mapper/DfCheckingProblemV2Mapper.java | 47 +++++++- .../df/mapper/DfCheckingRecordV2Mapper.java | 29 +++++ .../yxgh/df/mapper/DfCheckingV2Mapper.java | 3 + .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 20 +++- sql/sy/v1.0.0/v1.0.0.sql | 109 +++++++++++++++++ sql/zj/v5.0.0/增量更新/v1.sql | 110 +----------------- 13 files changed, 352 insertions(+), 135 deletions(-) create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountLevelDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountQxDto.java create mode 100644 shuili-system/src/main/java/com/kms/yxgh/common/dto/CountYhDto.java 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..3d2c46d2 --- /dev/null +++ b/shuili-system/src/main/java/com/kms/yxgh/common/dto/CountDateDto.java @@ -0,0 +1,10 @@ +package com.kms.yxgh.common.dto; + +import lombok.Data; + +@Data +public class CountDateDto { + private String level; + private String myData; + private String mySum; +} 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/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java index 338b7456..a652d09d 100644 --- 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 @@ -5,7 +5,14 @@ import lombok.Getter; @Getter public enum PatrolMaintenanceCategory { PROJECT_PATROL("工程巡查", "1"), - JD_PATROL("机电巡查", "2"); + JD_PATROL("机电巡查", "2"), + + + DJ_LX("零星", "1"), + DJ_YB("一般", "2"), + DJ_JD("较大", "3"), + DJ_ZD("重大", "4") + ; private final String name; private final String 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 index e9afb157..516d4b73 100644 --- 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 @@ -13,17 +13,16 @@ import java.util.stream.Stream; @Getter public enum ProjectCharEnum { - C_14("缺陷记录分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_15("巡查缺陷分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_16("缺陷问题等级分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), - C_17("缺陷养护对比分析", Arrays.asList(StaticIndexEnum.DF_YH_SUM, StaticIndexEnum.DF_QX_SUM), "数量", Collections.emptyList()), + 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()), - - - ; 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 index f2ceee58..422808a0 100644 --- 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 @@ -3,8 +3,7 @@ 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.CountDto; -import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +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; @@ -19,21 +18,82 @@ import java.util.stream.Collectors; @Getter public enum StaticIndexEnum { - DF_YH_SUM("养护数量", sp -> { - Map map = new HashMap<>(); - map.put("2024/05/20", "12"); - map.put("2024/05/21", "15"); - map.put("2024/05/22", "17"); - return map; + 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 levelGroup(list); + }, "个", "0"), + DF_QX_DJ_YB_SUM("一般", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_YB); + return levelGroup(list); + }, "个", "0"), + DF_QX_DJ_JD_SUM("较大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_JD); + return levelGroup(list); + }, "个", "0"), + DF_QX_DJ_ZD_SUM("重大", sp -> { + DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); + List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_ZD); + return levelGroup(list); + }, "个", "0"), + + + + + DF_BD_YH_SUM("养护次数", sp -> { + DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class); + List list = mapper.countYhDto(sp); + return dataGroup(list); }, "个", "0"), - DF_QX_SUM("缺陷数量", sp -> { - Map map = new HashMap<>(); - map.put("2024/05/20", "12"); - map.put("2024/05/21", "15"); - map.put("2024/05/22", "17"); + + 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); @@ -62,6 +122,8 @@ public enum StaticIndexEnum { ; + + private final String zhName; private final Statistic source; private final String unit; @@ -75,6 +137,25 @@ public enum StaticIndexEnum { } + + + private static Map levelGroup(List list) { + if (CollectionUtil.isEmpty(list) && list.isEmpty()) { + return Collections.emptyMap(); + } + return list.stream() + .collect(Collectors.toMap(CountDateDto::getLevel, CountDateDto::getMySum)); + } + + public static Map dataGroup(List list) { + if (CollectionUtil.isEmpty(list) && list.isEmpty()) { + return Collections.emptyMap(); + } + return list.stream() + .collect(Collectors.toMap(CountDateDto::getMyData, CountDateDto::getMySum)); + } + + public static Map adcdGroup(List list, ObjectStatisticQueDto sp) { if (CollectionUtil.isEmpty(list)) { return Collections.emptyMap(); 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 index fa84119a..d3402f3b 100644 --- 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 @@ -1,8 +1,8 @@ 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.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; @@ -32,4 +32,47 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper") 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 index 5aeb9531..d0d285fd 100644 --- 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 @@ -1,6 +1,7 @@ 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; @@ -36,4 +37,32 @@ public interface DfCheckingRecordV2Mapper extends BaseMapper { "group by base.adcd " + "") 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 index 0632c687..ec8e2f8b 100644 --- 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 @@ -32,4 +32,7 @@ public interface DfCheckingV2Mapper extends BaseMapper count(@Param("data") ObjectStatisticQueDto sp); + + + } 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 index 63f7eab9..49ea076f 100644 --- 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 @@ -3,10 +3,7 @@ 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.ApprovalDetailDto; -import com.kms.yxgh.common.dto.ApprovalSearchDto; -import com.kms.yxgh.common.dto.CountDto; -import com.kms.yxgh.common.dto.ObjectStatisticQueDto; +import com.kms.yxgh.common.dto.*; import com.kms.yxgh.common.mapper.handler.DocHandler; import com.kms.yxgh.common.mapper.handler.OperatorHandler; import com.kms.yxgh.df.domain.DfYhV2; @@ -90,4 +87,19 @@ public interface DfYhV2Mapper extends BaseMapper { "group by base.adcd " + "") List count(@Param("data") ObjectStatisticQueDto sp); + + + @Select("") + List countYhDto(@Param("data") ObjectStatisticQueDto sp); } diff --git a/sql/sy/v1.0.0/v1.0.0.sql b/sql/sy/v1.0.0/v1.0.0.sql index a0bc459d..6d0f493d 100644 --- a/sql/sy/v1.0.0/v1.0.0.sql +++ b/sql/sy/v1.0.0/v1.0.0.sql @@ -316,3 +316,112 @@ CREATE TABLE `bs_sgc_sz_yhjlzx` ( `UPDATE_TIME` datetime DEFAULT NULL COMMENT '最近修改时间', PRIMARY KEY (`ID`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci COMMENT='水闸维修养护执行人表'; + + +CREATE TABLE `bs_sgc_df_xmgl` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查项名称', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查类别字典：key_jf_patrol_category', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `create_name` varchar(50) NOT NULL DEFAULT '' COMMENT '责任人name', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `remark` text COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=24 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视项目管理表'; + +CREATE TABLE `bs_sgc_df_xcitem` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '项目id', + `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', + `content` varchar(500) NOT NULL DEFAULT '' COMMENT '检查内容', + `remark` text COMMENT '备注', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=455 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视检查项表'; + + +CREATE TABLE `bs_sgc_df_xsxcjl` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别字典：patrol_maintenance_category', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人name', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人id', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '巡查开始时间', + `end_date` datetime DEFAULT NULL COMMENT '巡查结束时间', + `scope` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查范围', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人id', + `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `remark` text COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=23 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录管理表'; + +CREATE TABLE `bs_sgc_df_xcqx` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `record_id` int NOT NULL DEFAULT '0' COMMENT '记录id', + `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '缺陷开始时间', + `end_date` datetime DEFAULT NULL COMMENT '缺陷结束时间', + `content` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', + `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', + `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', + `doc` text COMMENT '文档', + `remark` text COMMENT '备注', + `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_uid` varchar(50) NOT NULL DEFAULT '0' COMMENT '修改人id', + `item_id` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=28 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录缺陷管理表'; + +CREATE TABLE `bs_sgc_df_xcyj` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', + `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', + `problem_id` int NOT NULL DEFAULT '0' COMMENT '缺陷id', + `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', + `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', + `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', + `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', + `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', + `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', + `start_date` datetime DEFAULT NULL COMMENT '维养开始时间', + `end_date` datetime DEFAULT NULL COMMENT '维养结束时间', + `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', + `content` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', + `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', + `create_uid` varchar(50) NOT NULL DEFAULT '' COMMENT '数据创建人id', + `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人名称', + `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人id', + `doc` text COMMENT '文档', + `remark` text COMMENT '备注', + `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', + `create_time` datetime DEFAULT NULL COMMENT '创建时间', + `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', + `record_id` int DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视养护管理表'; diff --git a/sql/zj/v5.0.0/增量更新/v1.sql b/sql/zj/v5.0.0/增量更新/v1.sql index eaf044bc..e4234043 100644 --- a/sql/zj/v5.0.0/增量更新/v1.sql +++ b/sql/zj/v5.0.0/增量更新/v1.sql @@ -18,111 +18,5 @@ ALTER TABLE `sgc_yg`.`sys_user` ADD COLUMN `user_type` VARCHAR ( 255 ) NULL; ALTER TABLE `sgc_yg`.`att_dike_base` CHANGE COLUMN `ENG_GRAD` `dike_GRAD` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '堤防级别' AFTER `dike_USE`; - - - -CREATE TABLE `bs_sgc_df_xmgl` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查项名称', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查类别字典：key_jf_patrol_category', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `create_name` varchar(50) NOT NULL DEFAULT '' COMMENT '责任人name', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - `remark` text COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视项目管理表'; - - -CREATE TABLE `bs_sgc_df_xcitem` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '项目id', - `parts` varchar(100) NOT NULL DEFAULT '' COMMENT '检查部位', - `content` varchar(500) NOT NULL DEFAULT '' COMMENT '检查内容', - `remark` text COMMENT '备注', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=443 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视检查项表'; - -CREATE TABLE `bs_sgc_df_xsxcjl` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `checking_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别字典：patrol_maintenance_category', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人name', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查责任人id', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '巡查开始时间', - `end_date` datetime DEFAULT NULL COMMENT '巡查结束时间', - `scope` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查范围', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人id', - `create_name` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人名称', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - `remark` text COMMENT '备注', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录管理表'; - -CREATE TABLE `bs_sgc_df_xcqx` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `record_id` int NOT NULL DEFAULT '0' COMMENT '记录id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '缺陷人name', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '缺陷开始时间', - `end_date` datetime DEFAULT NULL COMMENT '缺陷结束时间', - `describe` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', - `position` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', - `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', - `doc` text COMMENT '文档', - `remark` text COMMENT '备注', - `create_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '创建人', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_uid` varchar(50) NOT NULL DEFAULT '0'COMMENT '修改人id', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视记录缺陷管理表'; - - -CREATE TABLE `bs_sgc_df_xcyj` ( - `id` int NOT NULL AUTO_INCREMENT COMMENT 'id', - `checking_id` int NOT NULL DEFAULT '0' COMMENT '巡查项目id', - `defect_id` int NOT NULL DEFAULT '0' COMMENT '缺陷id', - `status` int NOT NULL DEFAULT '0' COMMENT '巡查状态字典:patrol_maintenance_status', - `name` varchar(50) NOT NULL DEFAULT '' COMMENT '巡查名称', - `type` int NOT NULL DEFAULT '0' COMMENT '巡查类型 字典：patrol_maintenance_type', - `category` int NOT NULL DEFAULT '0' COMMENT '巡查类别 字典：patrol_maintenance_category', - `dike_code` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防code', - `dike_name` varchar(50) NOT NULL DEFAULT '' COMMENT '堤防名称', - `start_date` datetime DEFAULT NULL COMMENT '维养开始时间', - `end_date` datetime DEFAULT NULL COMMENT '维养结束时间', - `location` varchar(200) NOT NULL DEFAULT '' COMMENT '问题位置', - `details` varchar(200) NOT NULL DEFAULT '' COMMENT '描述', - `problem_level` int NOT NULL DEFAULT '0' COMMENT '问题等级 字典 patrol_maintenance_level', - `create_uid` varchar(50) NOT NULL DEFAULT '' COMMENT '数据创建人id', - `duty_holder_name` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人名称', - `duty_holder_id` varchar(50) NOT NULL DEFAULT '' COMMENT '维养责任人id', - `doc` text COMMENT '文档', - `remark` text COMMENT '备注', - `update_uid` varchar(32) NOT NULL DEFAULT '' COMMENT '最近修改人', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_time` datetime DEFAULT NULL COMMENT '最近修改时间', - PRIMARY KEY (`id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=20 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='堤防巡视养护管理表'; \ No newline at end of file +ALTER TABLE sgc_yg.bs_sgc_df_xcyj CHANGE defect_id problem_id int DEFAULT 0 NOT NULL COMMENT '缺陷id'; +ALTER TABLE sgc_yg.bs_sgc_df_xcyj ADD record_id INT NULL; \ No newline at end of file From 4674ab150f7fad2d2db84bf197a938f5cff358f3 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 21:44:46 +0800 Subject: [PATCH 45/67] =?UTF-8?q?fix:=20=E5=85=BB=E6=8A=A4=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=90=8E=E5=8F=AF=E4=BB=A5=E7=9B=B4=E6=8E=A5=E5=AE=A1?= =?UTF-8?q?=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/common/enums/DfYhV2StatusEnum.java | 9 +++++++++ .../com/kms/yxgh/df/service/DfYhV2Service.java | 16 +++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) 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 index 85a54655..4cfe6dbf 100644 --- 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 @@ -21,4 +21,13 @@ public enum DfYhV2StatusEnum { 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/df/service/DfYhV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java index d38af6a4..cbc80c92 100644 --- 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 @@ -17,7 +17,10 @@ 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.DfYhV2; -import com.kms.yxgh.df.dto.v2.*; +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; @@ -70,11 +73,9 @@ public class DfYhV2Service extends DefaultApprovalBusinessService queryWrapper.like(DfYhV2::getStatus, status)); Optional.ofNullable(data.getStartDate()) - .filter(startDate -> startDate != null) .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate)); Optional.ofNullable(data.getEndDate()) - .filter(endDate -> endDate != null) .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate)); Optional.ofNullable(data.getProblemLevel()) @@ -183,14 +184,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService wp = Wrappers.lambdaQuery() - .eq(DfYhV2::getId, formId) - .select(DfYhV2::getStatus); - List list = this.list(wp); - if (list != null && !list.isEmpty()) { - return list.get(0).getStatus(); - } - return ""; + return ApprovalStatusEnum.WAITING.getValue(); } } From 71dc929beb69875988754ed0a46822c43a5a88f9 Mon Sep 17 00:00:00 2001 From: hxh Date: Tue, 11 Mar 2025 21:47:05 +0800 Subject: [PATCH 46/67] =?UTF-8?q?doc:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CreateAndUpdateMetaObjectHandler.java | 58 ++-- .../java/com/kms/yxgh/base/DfException.java | 8 +- .../main/java/com/kms/yxgh/base/Response.java | 128 ++++----- .../java/com/kms/yxgh/base/SzException.java | 8 +- .../kms/yxgh/base/domain/monitor/MsDsmPr.java | 24 +- .../yxgh/base/domain/monitor/MsHdmTmpevs.java | 1 - .../yxgh/base/domain/monitor/MsHdmWqamd.java | 2 +- .../kms/yxgh/base/enums/CheckingStatus.java | 16 +- .../yxgh/base/enums/DfAnimalRecordStatus.java | 16 +- .../enums/SuperviseEngineeringStatus.java | 1 + .../enums/SuperviseProblemLevelStatus.java | 23 +- .../base/enums/SuperviseProblemStatus.java | 22 +- .../yxgh/base/enums/SuperviseWayStatus.java | 1 + .../kms/yxgh/base/enums/YhRecordStatus.java | 16 +- .../enums/PatrolMaintenanceCategory.java | 3 +- .../yxgh/common/enums/StaticIndexEnum.java | 28 +- .../kms/yxgh/common/mapper/BaseDdlMapper.java | 2 +- .../controller/DfAnimalProjectController.java | 1 - .../DfDangerousGroupingController.java | 6 +- .../DfDangerousProjectController.java | 10 +- .../controller/DfDangerousTaskController.java | 8 +- .../DfSuperviseEngineeringController.java | 2 + .../controller/DfSuperviseTaskController.java | 1 + .../controller/DfSuperviseWayController.java | 9 +- .../yxgh/df/controller/DfTraceController.java | 42 +-- .../controller/DfYhStatisticsController.java | 6 +- .../v2/DfCheckingRecordV2Controller.java | 2 +- .../controller/v2/DfCheckingV2Controller.java | 4 +- .../df/controller/v2/DfYhV2Controller.java | 3 +- .../kms/yxgh/df/domain/DfAnimalOperator.java | 24 +- .../kms/yxgh/df/domain/DfCheckingRecord.java | 3 +- .../yxgh/df/domain/DfDangerousGrouping.java | 1 + .../yxgh/df/domain/DfDangerousProject.java | 1 + .../df/domain/DfDangerousProjectItem.java | 1 + .../kms/yxgh/df/domain/DfDangerousTask.java | 1 + .../df/domain/DfDangerousTaskItemRel.java | 1 + .../java/com/kms/yxgh/df/domain/DfPoint.java | 58 ++-- .../yxgh/df/domain/DfSuperviseProblem.java | 1 + .../kms/yxgh/df/domain/DfSuperviseTask.java | 1 + .../kms/yxgh/df/domain/DfSuperviseWay.java | 1 + .../yxgh/df/domain/DfSuperviseWayProject.java | 1 + .../df/domain/DfSuperviseWayProjectItem.java | 1 + .../java/com/kms/yxgh/df/domain/DfTrace.java | 84 +++--- .../java/com/kms/yxgh/df/domain/DfYhV2.java | 1 - .../com/kms/yxgh/df/dto/DfAqjdProjecDto.java | 8 +- .../kms/yxgh/df/dto/DfCheckingDetailDto.java | 36 +-- .../yxgh/df/dto/DfDangerousGroupingDto.java | 1 + .../df/dto/DfDangerousGroupingRelDto.java | 2 +- .../kms/yxgh/df/dto/DfDangerousParamDto.java | 2 +- .../yxgh/df/dto/DfDangerousProjectDto.java | 3 +- .../df/dto/DfDangerousProjectItemDto.java | 1 + .../yxgh/df/dto/DfDangerousTaskDetailDto.java | 2 +- .../kms/yxgh/df/dto/DfDangerousTaskDto.java | 7 +- .../df/dto/DfDangerousTaskItemRelDto.java | 3 +- .../df/dto/DfDangerousTaskProjectRelDto.java | 3 +- .../yxgh/df/dto/DfDangerousTaskSearchDto.java | 5 +- .../java/com/kms/yxgh/df/dto/DfPointDto.java | 16 +- .../com/kms/yxgh/df/dto/DfSpPlayQueDto.java | 2 + .../yxgh/df/dto/DfSuperviseProblemDto.java | 1 + .../df/dto/DfSuperviseProblemParamDto.java | 1 + .../kms/yxgh/df/dto/DfSuperviseTaskDto.java | 1 + .../kms/yxgh/df/dto/DfSuperviseWayDto.java | 1 + .../yxgh/df/dto/DfSuperviseWayProjectDto.java | 3 +- .../df/dto/DfSuperviseWayProjectItemDto.java | 1 + .../yxgh/df/dto/DfYhCharHiddenDangerDto.java | 2 + .../yxgh/df/dto/DfYhHiddenDangerQueDto.java | 2 +- .../kms/yxgh/df/dto/DfYhStatisticsDto.java | 2 +- .../kms/yxgh/df/dto/DfYhStatisticsQueDto.java | 2 + .../kms/yxgh/df/dto/ReservoirListQueDto.java | 1 + .../kms/yxgh/df/dto/SimpleDfCheckingDto.java | 8 +- .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 1 - .../kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 4 + .../yxgh/df/mapper/DfAnimalRecordMapper.java | 4 +- .../df/mapper/DfCheckingProblemV2Mapper.java | 2 +- .../df/mapper/DfCheckingRecordV2Mapper.java | 3 +- .../yxgh/df/mapper/DfCheckingV2Mapper.java | 2 - .../df/mapper/DfDangerousGroupingMapper.java | 13 +- .../mapper/DfDangerousGroupingRelMapper.java | 2 + .../mapper/DfDangerousProjectItemMapper.java | 2 + .../df/mapper/DfDangerousProjectMapper.java | 1 + .../mapper/DfDangerousTaskItemRelMapper.java | 5 +- .../yxgh/df/mapper/DfDangerousTaskMapper.java | 5 +- .../kms/yxgh/df/mapper/DfRecordMapper.java | 147 +++++----- .../df/mapper/DfSuperviseProblemMapper.java | 11 +- .../yxgh/df/mapper/DfSuperviseTaskMapper.java | 2 +- .../DfSuperviseWayProjectItemMapper.java | 2 +- .../kms/yxgh/df/mapper/DfYhRecordMapper.java | 22 +- .../df/service/DfCheckingItemService.java | 2 +- .../DfCheckingV2ProjectItemV2Service.java | 4 +- .../yxgh/df/service/DfCheckingV2Service.java | 24 +- .../service/DfDangerousGroupingService.java | 4 +- .../df/service/DfDangerousTaskService.java | 10 +- .../df/service/DfPlanOperatorService.java | 2 +- .../kms/yxgh/df/service/DfPointService.java | 2 +- .../yxgh/df/service/DfRecordItemService.java | 2 +- .../kms/yxgh/df/service/DfRecordService.java | 24 +- .../DfSuperviseEngineeringService.java | 1 + .../df/service/DfSuperviseTaskService.java | 10 +- .../df/service/DfSuperviseWayService.java | 14 +- .../kms/yxgh/df/service/DfTraceService.java | 2 +- .../yxgh/df/service/DfYhOperatorService.java | 2 +- .../yxgh/df/service/DfYhRecordService.java | 18 +- .../df/service/DfYhStatisticsService.java | 7 +- .../kms/yxgh/model/DfYhHiddenDangerModel.java | 4 +- .../yxgh/model/DfYhStatisticsModelDto.java | 3 +- .../sz/controller/SzCheckingController.java | 3 +- .../SzDangerousGroupingController.java | 6 +- .../SzDangerousProjectController.java | 10 +- .../controller/SzDangerousTaskController.java | 9 +- .../sz/controller/SzSchedulingController.java | 1 + .../SzSuperviseEngineeringController.java | 2 + .../controller/SzSuperviseTaskController.java | 1 + .../controller/SzSuperviseWayController.java | 10 +- .../yxgh/sz/controller/SzTraceController.java | 42 +-- .../com/kms/yxgh/sz/domain/SzChecking.java | 26 +- .../kms/yxgh/sz/domain/SzCheckingItem.java | 44 +-- .../yxgh/sz/domain/SzDangerousGrouping.java | 1 + .../yxgh/sz/domain/SzDangerousProject.java | 1 + .../sz/domain/SzDangerousProjectItem.java | 1 + .../kms/yxgh/sz/domain/SzDangerousTask.java | 1 + .../sz/domain/SzDangerousTaskItemRel.java | 1 + .../java/com/kms/yxgh/sz/domain/SzPoint.java | 58 ++-- .../yxgh/sz/domain/SzSuperviseProblem.java | 1 + .../kms/yxgh/sz/domain/SzSuperviseTask.java | 1 + .../kms/yxgh/sz/domain/SzSuperviseWay.java | 1 + .../yxgh/sz/domain/SzSuperviseWayProject.java | 1 + .../sz/domain/SzSuperviseWayProjectItem.java | 1 + .../java/com/kms/yxgh/sz/domain/SzTrace.java | 84 +++--- .../com/kms/yxgh/sz/domain/SzYhOperator.java | 44 +-- .../kms/yxgh/sz/dto/SimpleSzCheckingDto.java | 8 +- .../java/com/kms/yxgh/sz/dto/StartPlan.java | 12 +- .../com/kms/yxgh/sz/dto/SzAqjdProjecDto.java | 9 +- .../kms/yxgh/sz/dto/SzCharInfoItemQueDto.java | 1 + .../com/kms/yxgh/sz/dto/SzCharInfoQueDto.java | 1 + .../kms/yxgh/sz/dto/SzCheckingDetailDto.java | 34 +-- .../yxgh/sz/dto/SzDangerousGroupingDto.java | 1 + .../kms/yxgh/sz/dto/SzDangerousParamDto.java | 2 +- .../yxgh/sz/dto/SzDangerousProjectDto.java | 1 + .../sz/dto/SzDangerousProjectItemDto.java | 1 + .../kms/yxgh/sz/dto/SzDangerousTaskDto.java | 7 +- .../sz/dto/SzDangerousTaskItemRelDto.java | 1 + .../yxgh/sz/dto/SzDangerousTaskSearchDto.java | 11 +- .../java/com/kms/yxgh/sz/dto/SzPointDto.java | 16 +- .../dto/SzSuperviseEngineeringParamDto.java | 2 +- .../sz/dto/SzSuperviseProblemDetailDto.java | 2 +- .../yxgh/sz/dto/SzSuperviseProblemDto.java | 1 + .../sz/dto/SzSuperviseProblemParamDto.java | 1 + .../yxgh/sz/dto/SzSuperviseTaskCommonDto.java | 2 +- .../yxgh/sz/dto/SzSuperviseTaskDetailDto.java | 2 +- .../kms/yxgh/sz/dto/SzSuperviseTaskDto.java | 1 + .../kms/yxgh/sz/dto/SzSuperviseWayDto.java | 1 + .../yxgh/sz/dto/SzSuperviseWayProjectDto.java | 1 + .../sz/dto/SzSuperviseWayProjectItemDto.java | 1 + .../sz/mapper/SzDangerousGroupingMapper.java | 13 +- .../mapper/SzDangerousGroupingRelMapper.java | 2 + .../mapper/SzDangerousProjectItemMapper.java | 2 + .../sz/mapper/SzDangerousProjectMapper.java | 1 + .../mapper/SzDangerousTaskItemRelMapper.java | 4 +- .../yxgh/sz/mapper/SzDangerousTaskMapper.java | 5 +- .../kms/yxgh/sz/mapper/SzRecordMapper.java | 166 ++++++----- .../sz/mapper/SzSuperviseProblemMapper.java | 11 +- .../yxgh/sz/mapper/SzSuperviseTaskMapper.java | 16 +- .../SzSuperviseWayProjectItemMapper.java | 2 +- .../yxgh/sz/model/SzHiddenDangerModel.java | 1 - .../yxgh/sz/model/SzStatisticsModelDto.java | 1 - .../sz/service/SzCheckingItemService.java | 2 +- .../service/SzDangerousGroupingService.java | 2 +- .../sz/service/SzDangerousTaskService.java | 4 +- .../sz/service/SzPlanOperatorService.java | 2 +- .../kms/yxgh/sz/service/SzPointService.java | 2 +- .../yxgh/sz/service/SzRecordItemService.java | 2 +- .../kms/yxgh/sz/service/SzRecordService.java | 51 ++-- .../sz/service/SzSuperviseTaskService.java | 10 +- .../sz/service/SzSuperviseWayService.java | 12 +- .../kms/yxgh/sz/service/SzTraceService.java | 2 +- .../java/com/kms/yxgh/util/BeanCopyUtils.java | 264 +++++++++--------- .../main/java/com/kms/yxgh/util/ListUtil.java | 2 + .../com/kms/yxgh/util/RestTemplateUtil.java | 8 +- .../java/com/kms/yxgh/util/StreamUtils.java | 28 +- 179 files changed, 1156 insertions(+), 1038 deletions(-) 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/enums/PatrolMaintenanceCategory.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/PatrolMaintenanceCategory.java index a652d09d..8885e5b5 100644 --- 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 @@ -11,8 +11,7 @@ public enum PatrolMaintenanceCategory { DJ_LX("零星", "1"), DJ_YB("一般", "2"), DJ_JD("较大", "3"), - DJ_ZD("重大", "4") - ; + DJ_ZD("重大", "4"); private final String name; private final String value; 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 index 422808a0..03782098 100644 --- 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 @@ -32,42 +32,38 @@ public enum StaticIndexEnum { DF_QX_ONE_DATE_SUM("机电巡查", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); - List list = mapper.countDate(sp,PatrolMaintenanceCategory.JD_PATROL); + 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); + 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); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX); return levelGroup(list); }, "个", "0"), DF_QX_DJ_YB_SUM("一般", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); - List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_YB); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_YB); return levelGroup(list); }, "个", "0"), DF_QX_DJ_JD_SUM("较大", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); - List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_JD); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_JD); return levelGroup(list); }, "个", "0"), DF_QX_DJ_ZD_SUM("重大", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); - List list = mapper.countLevel(sp,PatrolMaintenanceCategory.DJ_ZD); + List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_ZD); return levelGroup(list); }, "个", "0"), - - DF_BD_YH_SUM("养护次数", sp -> { DfYhV2Mapper mapper = SpringUtils.getBean(DfYhV2Mapper.class); List list = mapper.countYhDto(sp); @@ -83,17 +79,12 @@ public enum StaticIndexEnum { 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)); + 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); @@ -123,7 +114,6 @@ public enum StaticIndexEnum { ; - private final String zhName; private final Statistic source; private final String unit; @@ -137,8 +127,6 @@ public enum StaticIndexEnum { } - - private static Map levelGroup(List list) { if (CollectionUtil.isEmpty(list) && list.isEmpty()) { return Collections.emptyMap(); 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/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/DfCheckingRecordV2Controller.java b/shuili-system/src/main/java/com/kms/yxgh/df/controller/v2/DfCheckingRecordV2Controller.java index 2ebf2304..0abf8d98 100644 --- 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 @@ -45,7 +45,7 @@ public class DfCheckingRecordV2Controller { public Response edit(@Validated(UpdateGroup.class) @RequestBody DfRecordDetailV2Dto dfRecord, @PathVariable("commit") Boolean commit) { - return Response.ok(dfCheckingRecordV2Service.edit(dfRecord,commit)); + return Response.ok(dfCheckingRecordV2Service.edit(dfRecord, commit)); } @ApiOperation("堤防巡视检查记录删除v2") 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 index 5abf2dff..eb74ea0c 100644 --- 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 @@ -1,11 +1,9 @@ package com.kms.yxgh.df.controller.v2; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.DfAnimalPlanService; import com.kms.yxgh.df.service.DfCheckingV2Service; import com.shuili.common.annotation.Log; import com.shuili.common.core.domain.SearchParam; @@ -35,7 +33,7 @@ public class DfCheckingV2Controller { @PostMapping("/list") @ApiOperation("堤防巡查项目列表") public IPage list(@RequestBody SearchParam sp) { - return dfCheckingV2Service.list(sp); + return dfCheckingV2Service.list(sp); } @ApiOperation("堤防巡查项目详情") 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 index 658eec4a..a9f2bb34 100644 --- 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 @@ -5,9 +5,8 @@ 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.*; -import com.kms.yxgh.df.dto.v2.DfRecordDetailV2Dto; 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; 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/DfCheckingRecord.java b/shuili-system/src/main/java/com/kms/yxgh/df/domain/DfCheckingRecord.java index 4a955637..504f4806 100644 --- 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 @@ -5,7 +5,9 @@ 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; /** @@ -97,7 +99,6 @@ public class DfCheckingRecord extends SyBaseEntity { private String dikeName; - /** * 创建人id */ 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 index 75e3a1ec..8ed36394 100644 --- 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 @@ -129,7 +129,6 @@ public class DfYhV2 extends SyBaseEntity { private String location; - /** * 创建人id */ 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/DfSpPlayQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/DfSpPlayQueDto.java index 8a1b3bb5..00df6a71 100644 --- 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 @@ -1,8 +1,10 @@ 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 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/ReservoirListQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/df/dto/ReservoirListQueDto.java index a79cf114..f190fe7e 100644 --- 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 @@ -1,4 +1,5 @@ package com.kms.yxgh.df.dto; + import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; 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 index e4ad38a0..f9bd5fc0 100644 --- 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 @@ -40,7 +40,6 @@ public class DfProblemV2Dto { private String parts; - @ApiModelProperty("问题等级") private String problemLevel; 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 index 936e719e..c0f82171 100644 --- 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 @@ -44,6 +44,10 @@ public class DfV2CheckingDto { @ApiModelProperty("创建者名称") private String createName; + + @ApiModelProperty("是否领取") + private Boolean isReceive; + @ApiModelProperty("检查项") private List items; 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 index d3402f3b..8d283251 100644 --- 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 @@ -46,7 +46,7 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper" + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "") - List countDate(@Param("data") ObjectStatisticQueDto sp,@Param("category") PatrolMaintenanceCategory category); + List countDate(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); @Select("") - List countDateGroup(@Param("data") ObjectStatisticQueDto sp,@Param("category") PatrolMaintenanceCategory category); + List countDateGroup(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); @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/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/DfCheckingV2ProjectItemV2Service.java b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingV2ProjectItemV2Service.java index 885a0c6d..114c1ab1 100644 --- 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 @@ -1,9 +1,11 @@ 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; + /** * 项目管理项 * @@ -12,6 +14,6 @@ import org.springframework.stereotype.Service; */ @Service @AllArgsConstructor -public class DfCheckingV2ProjectItemV2Service extends BaseService { +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 index 087f206e..251fa677 100644 --- 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 @@ -1,5 +1,5 @@ package com.kms.yxgh.df.service; -import com.alibaba.druid.sql.visitor.functions.If; + import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; @@ -19,8 +19,10 @@ 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; + /** * 项目管理 * @@ -29,10 +31,10 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor -public class DfCheckingV2Service extends BaseService { +public class DfCheckingV2Service extends BaseService { private final DfCheckingV2ProjectItemV2Service dfCheckingV2ProjectItemV2Service; - + private final DfCheckingRecordV2Service dfCheckingRecordV2Service; public IPage list(SearchParam sp) { // 分页参数 @@ -83,6 +85,7 @@ public class DfCheckingV2Service extends BaseService items = dfCheckingV2ProjectItemV2Service.list( Wrappers.lambdaQuery() .in(DfCheckingV2ProjectItem::getCheckingId, ids) @@ -91,7 +94,7 @@ public class DfCheckingV2Service extends BaseService { List itemDtos = items.stream() - .filter(item -> Objects.equals(item.getCheckingId(),dto.getId())) + .filter(item -> Objects.equals(item.getCheckingId(), dto.getId())) .map(DfCheckingV2Service::convertToItemDto) .collect(Collectors.toList()); dto.setItems(itemDtos); @@ -108,7 +111,7 @@ public class DfCheckingV2Service extends BaseService() - .eq(DfCheckingV2ProjectItem::getCheckingId,dfV2Ck.getId())); + .eq(DfCheckingV2ProjectItem::getCheckingId, dfV2Ck.getId())); List items = dfV2Ck.getItems().stream() @@ -212,16 +215,17 @@ public class DfCheckingV2Service extends BaseService 0) { + if (null != ids && ids.length > 0) { dfCheckingV2ProjectItemV2Service.remove(new LambdaQueryWrapper() .in(DfCheckingV2ProjectItem::getCheckingId, getIntList(ids))); - return remove(new LambdaQueryWrapper() + return remove(new LambdaQueryWrapper() .in(DfCheckingV2ProjectManage::getId, getIntList(ids))); } return Boolean.FALSE; } - public static List getIntList(String[] ids) { + + public static List getIntList(String[] ids) { if (ids == null) { return new ArrayList<>(); } @@ -230,7 +234,7 @@ public class DfCheckingV2Service extends BaseService getStringList(String[] ids) { + public static List getStringList(String[] ids) { if (ids == null) { return new ArrayList<>(); } 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/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("") - @Results(id = "approvalSearchPage", value = { - @Result(column = "operator", property = "operator", typeHandler = OperatorHandler.class), - @Result(column = "ts_doc", property = "doc", typeHandler = DocHandler.class), - @Result(column = "id", property = "formId"), - @Result(column = "form_id", property = "formId"), - @Result(column = "create_time", property = "submitTime"), - @Result(column = "approval_time", property = "approvalTime"), - }) IPage> approvalSearchPage(Page page, @Param("dto") ApprovalSearchDto data); diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml new file mode 100644 index 00000000..196110d8 --- /dev/null +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From ca03d34951467cf4e856e6704553c4fa425403b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Tue, 11 Mar 2025 23:41:45 +0800 Subject: [PATCH 54/67] =?UTF-8?q?add=EF=BC=9A=E5=A0=A4=E9=98=B2=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 3 +- .../service/DfCheckingProblemV2Service.java | 4 ++ .../df/service/DfCheckingRecordV2Service.java | 46 ++++++++----------- 3 files changed, 26 insertions(+), 27 deletions(-) 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 index 838323b9..8ac57cad 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -28,7 +28,8 @@ public class DfRecordSearchV2Dto { @ApiModelProperty("状态") private String status; - + @ApiModelProperty("记录详情列表标识查询 巡查中的数据 1是 0否") + private int recordDetailsFlag; /** * 问题位置 */ 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 index a04601d5..043332ab 100644 --- 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 @@ -75,6 +75,10 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.eq(DfCheckingProblemV2::getProblemLevel, recordId)); } + + + + queryWrapper.ne(DfCheckingProblemV2::getStatus, DURING_INSPECTION.getValue()); // 查询分页数据 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 index c9a5aca3..9597f384 100644 --- 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 @@ -120,35 +120,27 @@ public class DfCheckingRecordV2Service extends BaseService sp = new SearchParam<>(); - DfRecordSearchV2Dto searchV2Dto = new DfRecordSearchV2Dto(); assert dfCheckingRecord != null; - searchV2Dto.setRecordId(dfCheckingRecord.getId()); - sp.setData(searchV2Dto); - sp.setPageSize(Integer.MAX_VALUE); - sp.setPageNum(1); - IPage list = dfCheckingProblemV2Service.list(sp); - if (null != list) { - List records = list.getRecords(); - List dtoList = new ArrayList<>(); - for (DfProblemV2Dto record : records) { - 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.setId(record.getId()); - detailV2Dto.setPosition(record.getPosition()); - detailV2Dto.setContent(record.getContent()); - detailV2Dto.setProblemLevel(record.getProblemLevel()); - detailV2Dto.setStatus(record.getStatus()); - dtoList.add(detailV2Dto); + 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(","))); } - dto.setProblems(dtoList); + 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; } @@ -178,6 +170,7 @@ public class DfCheckingRecordV2Service extends BaseService Date: Tue, 11 Mar 2025 23:54:23 +0800 Subject: [PATCH 55/67] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E5=88=97=E8=A1=A8=E8=A1=A5=E5=85=85=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java | 5 +++++ .../src/main/resources/mapper/yxgh/DfYhV2Mapper.xml | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 index cdeea44e..b45c9c9d 100644 --- 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 @@ -17,4 +17,9 @@ public class DfYhApproveDto extends DfV2CheckingDto { @ApiModelProperty("问题级别") private String problemLevel; + + @ApiModelProperty("记录id") + private String recordId; + @ApiModelProperty("问题id") + private String problemId; } diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 196110d8..b5419f3e 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -21,6 +21,8 @@ + + @@ -28,7 +30,7 @@ SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status, ts.operator operator, ts.comment comment, ts.doc ts_doc, jl.id , jl.name ,jl.dike_code , jl.dike_name , jl.type type, jl.category , - jl.problem_level , jl.duty_holder_id , jl.duty_holder_name + jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id FROM bs_sgc_sp_task ts LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id WHERE From 1b5d332204b4739d5690a752e89c58570b6d09fa Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 00:24:00 +0800 Subject: [PATCH 56/67] =?UTF-8?q?fix:=20=E5=85=BB=E6=8A=A4=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kms/yxgh/df/dto/v2/DfYhDetailV2Dto.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) 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 index 9e155096..81ccc0fb 100644 --- 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 @@ -59,5 +59,30 @@ public class DfYhDetailV2Dto { @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; + } From 9844398b2be49f47dba71f57a5be37c2d7e23a46 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 01:20:11 +0800 Subject: [PATCH 57/67] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/service/DfYhV2Service.java | 1 + 1 file changed, 1 insertion(+) 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 index 0ad1da74..60933f60 100644 --- 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 @@ -145,6 +145,7 @@ public class DfYhV2Service extends DefaultApprovalBusinessService Date: Wed, 12 Mar 2025 01:23:29 +0800 Subject: [PATCH 58/67] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E9=AA=8C=E6=94=B6=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/df/dto/v2/DfYhApproveDto.java | 2 ++ shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 index b45c9c9d..a5bc0608 100644 --- 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 @@ -22,4 +22,6 @@ public class DfYhApproveDto extends DfV2CheckingDto { private String recordId; @ApiModelProperty("问题id") private String problemId; + @ApiModelProperty("状态") + private String status; } diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index b5419f3e..70822330 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -14,6 +14,7 @@ + @@ -30,7 +31,7 @@ SELECT ts.id id, ts.form_id formId, ts.create_time submit_time, ts.approval_time approval_time, ts.status status, ts.operator operator, ts.comment comment, ts.doc ts_doc, jl.id , jl.name ,jl.dike_code , jl.dike_name , jl.type type, jl.category , - jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id + jl.problem_level , jl.duty_holder_id , jl.duty_holder_name, jl.problem_id , jl.record_id, jl.status yh_status FROM bs_sgc_sp_task ts LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id WHERE From bfa08cf4c70d76029bdbea596af9dc52d310e78b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Wed, 12 Mar 2025 01:25:57 +0800 Subject: [PATCH 59/67] =?UTF-8?q?fixbug:=E5=A0=A4=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shuili/common/utils/DateUtils.java | 13 ++++++ .../kms/yxgh/df/dto/v2/DfProblemV2Dto.java | 4 +- .../yxgh/df/dto/v2/DfRecordDetailV2Dto.java | 9 ++++- .../yxgh/df/dto/v2/DfRecordSearchV2Dto.java | 6 ++- .../kms/yxgh/df/dto/v2/DfV2CheckingDto.java | 2 +- .../com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java | 4 +- .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 5 +-- .../df/service/DfCheckingRecordV2Service.java | 40 ++++++++++++------- 8 files changed, 56 insertions(+), 27 deletions(-) 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-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 index f9bd5fc0..cb914dfd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfProblemV2Dto.java @@ -68,12 +68,12 @@ public class DfProblemV2Dto { private String category; @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("开始时间") private Date startDate; @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("结束时间") private Date endDate; 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 index dad8924b..722d703f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordDetailV2Dto.java @@ -55,12 +55,12 @@ public class DfRecordDetailV2Dto { private String category; @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("开始时间") private Date startDate; @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("结束时间") private Date endDate; @@ -73,6 +73,11 @@ public class DfRecordDetailV2Dto { @ApiModelProperty("创建者名称") private String createName; + @ApiModelProperty("记录id") + private String recordId; + + + @ApiModelProperty("巡查详情") private List problems = 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 index 8ac57cad..d164e35f 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfRecordSearchV2Dto.java @@ -28,8 +28,10 @@ public class DfRecordSearchV2Dto { @ApiModelProperty("状态") private String status; + @ApiModelProperty("记录详情列表标识查询 巡查中的数据 1是 0否") private int recordDetailsFlag; + /** * 问题位置 */ @@ -39,10 +41,10 @@ public class DfRecordSearchV2Dto { @ApiModelProperty("记录id") private String recordId; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "开始时间") private Date startDate; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty(value = "结束时间") private Date endDate; 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 index c0f82171..90c47ed4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfV2CheckingDto.java @@ -35,7 +35,7 @@ public class DfV2CheckingDto { private String category; @ApiModelProperty("创建时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; @ApiModelProperty("创建者") 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 index 75f24208..56086814 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/dto/v2/DfYhListV2Dto.java @@ -39,12 +39,12 @@ public class DfYhListV2Dto { private String category; @NotNull(message = "开始时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("开始时间") private Date startDate; @NotNull(message = "结束时间", groups = {AddGroup.class, UpdateGroup.class}) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("结束时间") private Date endDate; 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 index 9693f82f..9355d797 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/mapper/DfYhV2Mapper.java @@ -47,10 +47,7 @@ public interface DfYhV2Mapper extends BaseMapper { "" + "and dike_code = #{data.code} " + "" + - "" + - "and category = #{category.value} " + - "" + - "group by problem_level " + + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "") List countYhDto(@Param("data") ObjectStatisticQueDto sp); } 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 index 9597f384..980a58dd 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java +++ b/shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingRecordV2Service.java @@ -25,6 +25,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; @@ -73,15 +74,15 @@ public class DfCheckingRecordV2Service extends BaseService queryWrapper.like(DfCheckingRecord::getStatus, status)); - Optional.ofNullable(data.getStartDate()) - .filter(startDate -> startDate != null) - .ifPresent(startDate -> queryWrapper.ge(DfCheckingRecord::getStartDate, startDate)); - Optional.ofNullable(data.getEndDate()) - .filter(endDate -> endDate != null) - .ifPresent(endDate -> queryWrapper.le(DfCheckingRecord::getEndDate, endDate)); - } + if (!Objects.isNull(data.getStartDate())) { + queryWrapper.ge(DfCheckingRecord::getStartDate, data.getStartDate()); + } + if (!Objects.isNull(data.getEndDate())) { + queryWrapper.le(DfCheckingRecord::getStartDate, data.getEndDate()); + } + } // 查询分页数据 Page queryPage = page(page, queryWrapper); @@ -109,18 +110,18 @@ public class DfCheckingRecordV2Service extends BaseService items = dfCheckingV2ProjectItemV2Service.list( Wrappers.lambdaQuery() - .eq(DfCheckingV2ProjectItem::getCheckingId, id) + .eq(DfCheckingV2ProjectItem::getCheckingId, dfCheckingRecord.getCheckingId()) ); dto.setItems(items.stream() .map(DfCheckingV2Service::convertToItemDto) .collect(Collectors.toList())); - } - assert dfCheckingRecord != null; List recordsList = dfCheckingProblemV2Service.list(new LambdaQueryWrapper() .eq(DfCheckingProblemV2::getRecordId, dfCheckingRecord.getId())); List dtoList = new ArrayList<>(); @@ -160,8 +161,9 @@ public class DfCheckingRecordV2Service extends BaseService ids = dfRecord.getProblems() .stream() @@ -192,7 +204,7 @@ public class DfCheckingRecordV2Service extends BaseService Date: Wed, 12 Mar 2025 01:30:51 +0800 Subject: [PATCH 60/67] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/kms/yxgh/common/enums/DfYhV2StatusEnum.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) 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 index 4cfe6dbf..ee116c34 100644 --- 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 @@ -7,11 +7,10 @@ public enum DfYhV2StatusEnum { DURING_INSPECTION("巡查中", "1"), INSPECTED("已巡检", "2"), - UNDER_MAINTENANCE("养护中", "3"), - NO_DEFECTS("无缺陷", "4"), - YES_UNDER("已养护", "6"), - - ACCEPTED("已验收", "5"); + NO_DEFECTS("无隐患", "3"), + UNDER_MAINTENANCE("养护中", "4"), + ACCEPTED("已验收", "5"), + YES_UNDER("已养护", "6"); private final String name; From df4a47235995bedae1f89327d521c0281f42c97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Wed, 12 Mar 2025 01:34:22 +0800 Subject: [PATCH 61/67] =?UTF-8?q?fixbug:=E5=A0=A4=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxgh/df/service/DfCheckingProblemV2Service.java | 12 +++++++----- .../yxgh/df/service/DfCheckingRecordV2Service.java | 2 +- .../java/com/kms/yxgh/df/service/DfYhV2Service.java | 11 +++++++---- 3 files changed, 15 insertions(+), 10 deletions(-) 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 index 043332ab..c34acdf9 100644 --- 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 @@ -16,6 +16,7 @@ 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; @@ -60,12 +61,13 @@ public class DfCheckingProblemV2Service extends BaseService queryWrapper.like(DfCheckingProblemV2::getStatus, status)); - Optional.ofNullable(data.getStartDate()) - .ifPresent(startDate -> queryWrapper.ge(DfCheckingProblemV2::getStartDate, startDate)); - - Optional.ofNullable(data.getEndDate()) - .ifPresent(endDate -> queryWrapper.le(DfCheckingProblemV2::getEndDate, endDate)); + 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)); 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 index 980a58dd..5364dd7b 100644 --- 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 @@ -80,7 +80,7 @@ public class DfCheckingRecordV2Service extends BaseService queryWrapper.like(DfYhV2::getStatus, status)); - Optional.ofNullable(data.getStartDate()) - .ifPresent(startDate -> queryWrapper.ge(DfYhV2::getStartDate, startDate)); + if (!Objects.isNull(data.getStartDate())) { + queryWrapper.ge(DfYhV2::getStartDate, data.getStartDate()); + } - Optional.ofNullable(data.getEndDate()) - .ifPresent(endDate -> queryWrapper.ge(DfYhV2::getEndDate, endDate)); + if (!Objects.isNull(data.getEndDate())) { + queryWrapper.le(DfYhV2::getEndDate, data.getEndDate()); + } Optional.ofNullable(data.getProblemLevel()) .filter(StringUtils::isNotBlank) From 3f09745330ed9125c0c248062450a88d18600929 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 01:43:51 +0800 Subject: [PATCH 62/67] =?UTF-8?q?fix:=20=E9=BB=98=E8=AE=A4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=AE=A1=E6=89=B9=E7=8A=B6=E6=80=81=E4=B8=BA1,2?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml index 70822330..7cb54a29 100644 --- a/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml +++ b/shuili-system/src/main/resources/mapper/yxgh/DfYhV2Mapper.xml @@ -36,6 +36,7 @@ LEFT JOIN bs_sgc_df_xcyj jl ON jl.id = ts.form_id WHERE ts.business_type = #{dto.businessType} + and ts.status in ('1','2') AND ts.status = #{dto.status} From cf6a43e424901219cde3b1946d635f099e2ff933 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 02:32:28 +0800 Subject: [PATCH 63/67] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=85=BB?= =?UTF-8?q?=E6=8A=A4=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/df/service/DfYhV2Service.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) 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 index 9e8179f3..b046af9d 100644 --- 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 @@ -174,12 +174,16 @@ public class DfYhV2Service extends DefaultApprovalBusinessService wp = Wrappers.lambdaUpdate() .eq(DfYhV2::getId, formId) .set(DfYhV2::getStatus, formStatus); From 2df2435a5bcf5c9bc61a79ab813ec8098bf4e768 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 02:42:39 +0800 Subject: [PATCH 64/67] =?UTF-8?q?feature:=20=E8=B0=83=E6=95=B4=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/sy/{v1.0.0 => v1.6.0/增量脚本}/v1.0.0.sql | 0 sql/{zj/v5.0.0/增量更新 => sy/v1.6.0/增量脚本}/v1.sql | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename sql/sy/{v1.0.0 => v1.6.0/增量脚本}/v1.0.0.sql (100%) rename sql/{zj/v5.0.0/增量更新 => sy/v1.6.0/增量脚本}/v1.sql (100%) diff --git a/sql/sy/v1.0.0/v1.0.0.sql b/sql/sy/v1.6.0/增量脚本/v1.0.0.sql similarity index 100% rename from sql/sy/v1.0.0/v1.0.0.sql rename to sql/sy/v1.6.0/增量脚本/v1.0.0.sql diff --git a/sql/zj/v5.0.0/增量更新/v1.sql b/sql/sy/v1.6.0/增量脚本/v1.sql similarity index 100% rename from sql/zj/v5.0.0/增量更新/v1.sql rename to sql/sy/v1.6.0/增量脚本/v1.sql From 9f8db8b1c01142ed00a65ce33a82d95c3524ca48 Mon Sep 17 00:00:00 2001 From: hxh Date: Wed, 12 Mar 2025 02:52:42 +0800 Subject: [PATCH 65/67] =?UTF-8?q?fix:=20=E5=8E=BB=E9=87=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java | 1 + 1 file changed, 1 insertion(+) 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 index 516d4b73..607bd09e 100644 --- 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 @@ -91,6 +91,7 @@ public enum ProjectCharEnum { 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<>(); From 2c6c6c096c870ef741e1be11de547d8ed7b5fbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Clyd=E2=80=9D?= <“lyd@datametatech.com”> Date: Wed, 12 Mar 2025 02:55:39 +0800 Subject: [PATCH 66/67] =?UTF-8?q?fixbug:=E5=A0=A4=E9=98=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kms/yxgh/common/dto/CountDateDto.java | 3 +-- .../kms/yxgh/common/enums/DfYhV2StatusEnum.java | 1 + .../kms/yxgh/common/enums/StaticIndexEnum.java | 17 +++++------------ .../df/mapper/DfCheckingProblemV2Mapper.java | 8 ++++---- .../df/mapper/DfCheckingRecordV2Mapper.java | 2 +- .../com/kms/yxgh/df/mapper/DfYhV2Mapper.java | 2 +- 6 files changed, 13 insertions(+), 20 deletions(-) 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 index 3d2c46d2..340ef77e 100644 --- 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 @@ -4,7 +4,6 @@ import lombok.Data; @Data public class CountDateDto { - private String level; - private String myData; + private String myDate; private String mySum; } 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 index ee116c34..2f0a7e8a 100644 --- 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 @@ -13,6 +13,7 @@ public enum DfYhV2StatusEnum { YES_UNDER("已养护", "6"); + private final String name; private final String value; 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 index 03782098..b16918e9 100644 --- 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 @@ -45,22 +45,22 @@ public enum StaticIndexEnum { DF_QX_DJ_LX_SUM("零星", sp -> { DfCheckingProblemV2Mapper mapper = SpringUtils.getBean(DfCheckingProblemV2Mapper.class); List list = mapper.countLevel(sp, PatrolMaintenanceCategory.DJ_LX); - return levelGroup(list); + 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 levelGroup(list); + 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 levelGroup(list); + 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 levelGroup(list); + return dataGroup(list); }, "个", "0"), @@ -127,20 +127,13 @@ public enum StaticIndexEnum { } - private static Map levelGroup(List list) { - if (CollectionUtil.isEmpty(list) && list.isEmpty()) { - return Collections.emptyMap(); - } - return list.stream() - .collect(Collectors.toMap(CountDateDto::getLevel, CountDateDto::getMySum)); - } public static Map dataGroup(List list) { if (CollectionUtil.isEmpty(list) && list.isEmpty()) { return Collections.emptyMap(); } return list.stream() - .collect(Collectors.toMap(CountDateDto::getMyData, CountDateDto::getMySum)); + .collect(Collectors.toMap(CountDateDto::getMyDate, CountDateDto::getMySum)); } 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 index 50dcac21..626bbf32 100644 --- 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 @@ -35,7 +35,7 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper " + - "select DATE_FORMAT(create_time, '%Y-%m-%d') as myData,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + @@ -50,7 +50,7 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper " + - "select problem_level as level,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + + "select DATE_FORMAT(create_time, '%Y-%m-%d') as myDate,count(*) as mySum from bs_sgc_df_xcqx where 1=1 " + " and create_time >= #{data.startTime} " + " and create_time <= #{data.endTime} " + "" + @@ -59,13 +59,13 @@ public interface DfCheckingProblemV2Mapper extends BaseMapper" + "and category = #{category.value} " + "" + - "group by problem_level " + + "group by DATE_FORMAT(create_time, '%Y-%m-%d') " + "") List countLevel(@Param("data") ObjectStatisticQueDto sp, @Param("category") PatrolMaintenanceCategory category); @Select("