From e479648fdca0080f05c006b3e71d372c1f092f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Mon, 24 Jul 2023 17:13:09 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=A4=E7=A5=A8=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=88=86=E6=9E=90=E6=96=B0=E5=A2=9E=E6=97=A5=E6=9C=9F=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardTicket/service/impl/StandardTicketInfoServiceImpl.java | 6 ++++++ .../java/com/hnac/hzims/ticket/twoTicket/vo/TicketCountQueryVo.java | 6 ++++++ .../ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java | 5 +++++ 3 files changed, 17 insertions(+) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 2e0cf6e..1262a20 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -713,6 +713,7 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { String flowTaskName = ticketCountQueryVo.getFlowTaskName(); + String dateTime = ticketCountQueryVo.getDateTime(); String type = ticketCountQueryVo.getType(); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(StringUtils.isNotBlank(type), StandardTicketInfoEntity::getTicketType, type); @@ -735,6 +736,11 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(StringUtils.isNotBlank(type), WorkTicketInfoEntity::getType, @@ -1163,6 +1165,9 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl workTicketInfoEntities = baseMapper.selectList(null); From e52879ac69d82db390bebdbceb946db975891fc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Mon, 24 Jul 2023 17:21:36 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9B=91=E6=8E=A7=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/StationVideoTypeController.java | 350 +++++++++++---------- 1 file changed, 182 insertions(+), 168 deletions(-) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java index 95b2651..5f7c323 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/controller/StationVideoTypeController.java @@ -53,172 +53,186 @@ import java.util.Optional; @Api(value = "站点视频类型配置", tags = "站点视频类型配置") public class StationVideoTypeController extends BladeController { - private final IStationVideoTypeService stationVideoTypeService; - - private final ISysClient sysClient; - - private final IStationService stationService; - - /**秘钥appKey**/ - @Value("${hzims.videoProperties.appKey}") - private String appKey; - /**代理API网关nginx服务器ip端口**/ - @Value("${hzims.videoProperties.videoHost}") - private String videoHost; - /**秘钥appSecret**/ - @Value("${hzims.videoProperties.appSecret}") - private String appSecret; - - /** - * 分页 代码自定义代号 - */ - @ApiLog - @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperationSupport(order = 10) - @ApiOperation(value = "分页", notes = "传入stationVideoType") - @OperationAnnotation( - moduleName = "站点管理", - title = "视频配置",operatorType = OperatorType.MOBILE,businessType = BusinessType.GENCODE, - action = "分页查询") - public R> list(StationVideoTypeEntity entity, Query query) { - LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new StationVideoTypeEntity(),entity); - queryWrapper.orderByAsc(StationVideoTypeEntity::getStationId).orderByAsc(StationVideoTypeEntity::getSort); - IPage pages = stationVideoTypeService.page(Condition.getPage(query), queryWrapper); - IPage vos = StationVideoTypeWrapper.builder().pageVO(pages); - List records = vos.getRecords(); - records.forEach(stationVideoTypeVO -> { - R deptR = sysClient.getDept(stationVideoTypeVO.getDeptId()); - if(deptR.isSuccess()){ - stationVideoTypeVO.setDeptName(Optional.ofNullable(deptR.getData()).map(Dept::getDeptName).orElse(null)); - } - }); - return R.data(vos); - } - - /** - * 新增 - */ - @PostMapping("/save") - @ApiOperationSupport(order = 20) - @ApiOperation(value = "新增") - public R save(@Valid @RequestBody StationVideoTypeEntity req) { - List list = stationVideoTypeService.list(Wrappers.lambdaQuery() - .eq(StationVideoTypeEntity::getStationId,req.getStationId()) - .eq(StationVideoTypeEntity::getName,req.getName()) - ); - StationVO stationVO = stationService.getStationByCode(req.getStationId()); - if(ObjectUtil.isNotEmpty(stationVO)){ - req.setCreateDept(stationVO.getRefDept()); - } - req.setAppKey(appKey); - req.setVideoHost(videoHost); - req.setAppSecret(appSecret); - return list.size()>0 ? R.fail(400,"该名称已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.save(req)); - } - - /** - * 修改 代码自定义代号 - */ - @PostMapping("/update") - @ApiOperationSupport(order = 30) - @ApiOperation(value = "修改", notes = "传入stationVideoType") - public R update(@Valid @RequestBody StationVideoTypeEntity req) { - List list = stationVideoTypeService.list(Wrappers.lambdaQuery() - .eq(StationVideoTypeEntity::getStationId,req.getStationId()) - .eq(StationVideoTypeEntity::getName,req.getName()) - .ne(StationVideoTypeEntity::getId,req.getId()) - ); - return list.size()>0 ? R.fail(400,"该名称/视频源已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.updateById(req)); - } - - /** - * 删除 代码自定义代号 - */ - @PostMapping("/remove") - @ApiOperationSupport(order = 40) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids))); - } - - @ApiLog - @RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperationSupport(order = 50) - @ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表") - @OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = - BusinessType.GENCODE, - action = "获取视频监测列表") - public R> getVideoMonitor(){ - List result = stationVideoTypeService.getVideoMonitor(); - return R.data(result); - } - - @ApiLog - @RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperationSupport(order = 60) - @OperationAnnotation(moduleName = "视频监控",title = "视频监控",operatorType = OperatorType.APPSYSTEMS,businessType = BusinessType.GENCODE, - action = "获取视频监测对象") - @ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象") - public R getById(@RequestParam Long id,@RequestParam int streamType){ - return R.data(stationVideoTypeService.getById(id,streamType)); - } - @ApiLog - @RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST}) - public R getHikVideo(){ - return R.data(stationVideoTypeService.getHikVideo()); - } - @ApiLog - @RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperationSupport(order = 70) - @ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点") - public R> getStationsByVideo() { - return R.data(stationVideoTypeService.getStationsByVideo()); - } - @ApiLog - @GetMapping("/getStationVideoOrderBySort") - @ApiOperationSupport(order = 80) - @ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表") - public R getStationVideoOrderBySort(StationVideoTypeDTO stationVideoTypeDTO,Query query) { - return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO,query)); - } - @ApiLog - @RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST}) - @ApiOperationSupport(order = 90) - @ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址") - public R> getVideoByIdsAndType(@RequestParam String ids, @RequestParam String type) { - return R.data(stationVideoTypeService.getVideoByIdsAndType(ids,type)); - } - @ApiLog - @GetMapping("/getVideoByIds") - @ApiOperationSupport(order = 100) - @ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址") - public R> getVideoByIds(@RequestParam String ids,@RequestParam String randomCode) { - return R.data(stationVideoTypeService.getVideoByIds(ids,randomCode)); - } - @ApiLog - @RequestMapping(value = "/getVideoReviewerToken",method = {RequestMethod.GET, RequestMethod.POST}) - public R getVideoReviewerToken() { - return R.data(stationVideoTypeService.getVideoReviewerToken()); - } - @ApiLog - @GetMapping("/getVideoMonitorByAgency") - @ApiOperationSupport(order = 110) - @ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频") - public R> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) { - return R.data(stationVideoTypeService.getVideoMonitor(type)); - } - @ApiLog - @GetMapping("/getHikVisionStations") - @ApiOperationSupport(order = 120) - @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表") - public R> getHikVisionStations() { - return R.data(stationVideoTypeService.getHikVisionStations()); - } - @ApiLog - @GetMapping("/getMonitorsByStation") - @ApiOperationSupport(order = 130) - @ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点") - public R>> getMonitorsByStation(@RequestParam String stationId) { - return R.data(stationVideoTypeService.getMonitorsByStation(stationId)); - } + private final IStationVideoTypeService stationVideoTypeService; + + private final ISysClient sysClient; + + private final IStationService stationService; + + /** 秘钥appKey **/ + @Value("${hzims.videoProperties.appKey}") + private String appKey; + /** 代理API网关nginx服务器ip端口 **/ + @Value("${hzims.videoProperties.videoHost}") + private String videoHost; + /** 秘钥appSecret **/ + @Value("${hzims.videoProperties.appSecret}") + private String appSecret; + + /** + * 分页 代码自定义代号 + */ + @ApiLog + @RequestMapping(value = "/list", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperationSupport(order = 10) + @ApiOperation(value = "分页", notes = "传入stationVideoType") + @OperationAnnotation( + moduleName = "站点管理", + title = "视频配置", operatorType = OperatorType.MOBILE, businessType = BusinessType.GENCODE, + action = "分页查询") + public R> list(StationVideoTypeEntity entity, Query query) { + LambdaQueryWrapper queryWrapper = Condition.getQueryWrapper(new StationVideoTypeEntity(), entity); + queryWrapper.orderByAsc(StationVideoTypeEntity::getStationId).orderByAsc(StationVideoTypeEntity::getSort); + IPage pages = stationVideoTypeService.page(Condition.getPage(query), queryWrapper); + IPage vos = StationVideoTypeWrapper.builder().pageVO(pages); + List records = vos.getRecords(); + records.forEach(stationVideoTypeVO -> { + R deptR = sysClient.getDept(stationVideoTypeVO.getDeptId()); + if (deptR.isSuccess()) { + stationVideoTypeVO.setDeptName(Optional.ofNullable(deptR.getData()).map(Dept::getDeptName).orElse(null)); + } + }); + return R.data(vos); + } + + /** + * 新增 + */ + @PostMapping("/save") + @ApiOperationSupport(order = 20) + @ApiOperation(value = "新增") + public R save(@Valid @RequestBody StationVideoTypeEntity req) { + List list = stationVideoTypeService.list(Wrappers.lambdaQuery() + .eq(StationVideoTypeEntity::getStationId, req.getStationId()) + .eq(StationVideoTypeEntity::getName, req.getName()) + ); + StationVO stationVO = stationService.getStationByCode(req.getStationId()); + if (ObjectUtil.isNotEmpty(stationVO)) { + req.setCreateDept(stationVO.getRefDept()); + } + req.setAppKey(appKey); + req.setVideoHost(videoHost); + req.setAppSecret(appSecret); + return list.size() > 0 ? R.fail(400, "该名称已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.save(req)); + } + + /** + * 修改 代码自定义代号 + */ + @PostMapping("/update") + @ApiOperationSupport(order = 30) + @ApiOperation(value = "修改", notes = "传入stationVideoType") + public R update(@Valid @RequestBody StationVideoTypeEntity req) { + List list = stationVideoTypeService.list(Wrappers.lambdaQuery() + .eq(StationVideoTypeEntity::getStationId, req.getStationId()) + .eq(StationVideoTypeEntity::getName, req.getName()) + .ne(StationVideoTypeEntity::getId, req.getId()) + ); + return list.size() > 0 ? R.fail(400, "该名称/视频源已录入数据，请找到相应记录做修改处理") : R.status(stationVideoTypeService.updateById(req)); + } + + /** + * 删除 代码自定义代号 + */ + @PostMapping("/remove") + @ApiOperationSupport(order = 40) + @ApiOperation(value = "逻辑删除", notes = "传入ids") + public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + return R.status(stationVideoTypeService.deleteLogic(Func.toLongList(ids))); + } + + @ApiLog + @RequestMapping(value = "/getVideoMonitor", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperationSupport(order = 50) + @ApiOperation(value = "获取视频监测列表", notes = "获取视频监测列表") + public R> getVideoMonitor() { + List result = stationVideoTypeService.getVideoMonitor(); + return R.data(result); + } + + @ApiLog + @RequestMapping(value = "/getById", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperationSupport(order = 60) + @ApiOperation(value = "获取视频监测对象", notes = "获取视频监测对象") + public R getById(@RequestParam Long id, @RequestParam int streamType) { + return R.data(stationVideoTypeService.getById(id, streamType)); + } + + @ApiLog + @RequestMapping(value = "/getHikVideo", method = {RequestMethod.GET, RequestMethod.POST}) + public R getHikVideo() { + return R.data(stationVideoTypeService.getHikVideo()); + } + + @ApiLog + @RequestMapping(value = "/getStationsByVideo", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperationSupport(order = 70) + @ApiOperation(value = "获取视频对应站点", notes = "获取视频对应站点") + public R> getStationsByVideo() { + return R.data(stationVideoTypeService.getStationsByVideo()); + } + + @ApiLog + @GetMapping("/getStationVideoOrderBySort") + @ApiOperationSupport(order = 80) + @ApiOperation(value = "根据站点、视频排序获取视频列表", notes = "根据站点、视频排序获取视频列表") + public R getStationVideoOrderBySort(StationVideoTypeDTO stationVideoTypeDTO, Query query) { + return R.data(stationVideoTypeService.getStationVideoOrderBySort(stationVideoTypeDTO, query)); + } + + @ApiLog + @RequestMapping(value = "/getVideoByIdsAndType", method = {RequestMethod.GET, RequestMethod.POST}) + @ApiOperationSupport(order = 90) + @ApiOperation(value = "根据视频ID、视频流类型获取视频地址", notes = "根据视频ID、视频流类型获取视频地址") + public R> getVideoByIdsAndType(@RequestParam String ids, @RequestParam String type) { + return R.data(stationVideoTypeService.getVideoByIdsAndType(ids, type)); + } + + @ApiLog + @GetMapping("/getVideoByIds") + @ApiOperationSupport(order = 100) + @ApiOperation(value = "根据视频ID获取视频地址", notes = "根据视频ID获取视频地址") + public R> getVideoByIds(@RequestParam String ids, @RequestParam String randomCode) { + return R.data(stationVideoTypeService.getVideoByIds(ids, randomCode)); + } + + @ApiLog + @RequestMapping(value = "/getVideoReviewerToken", method = {RequestMethod.GET, RequestMethod.POST}) + public R getVideoReviewerToken() { + return R.data(stationVideoTypeService.getVideoReviewerToken()); + } + + @ApiLog + @GetMapping("/getVideoMonitorByAgency") + @ApiOperationSupport(order = 110) + @ApiOperation(value = "获取云服务站点（清污机类型）视频", notes = "根获取代运维站点（清污机类型）视频") + public R> getVideoMonitorByAgency(@RequestParam @ApiParam("视频分类") String type) { + return R.data(stationVideoTypeService.getVideoMonitor(type)); + } + + @ApiLog + @GetMapping("/getHikVisionStations") + @ApiOperationSupport(order = 120) + @ApiOperation(value = "获取海康视频区域列表", notes = "获取海康视频区域列表") + public R> getHikVisionStations() { + return R.data(stationVideoTypeService.getHikVisionStations()); + } + + @ApiLog + @GetMapping("/getMonitorsByStation") + @ApiOperationSupport(order = 130) + @ApiOperation(value = "获取海康威视站点下的检测点", notes = "获取海康威视站点下的检测点") + public R>> getMonitorsByStation(@RequestParam String stationId) { + return R.data(stationVideoTypeService.getMonitorsByStation(stationId)); + } + + + @OperationAnnotation(moduleName = "视频监控", title = "视频监控", operatorType = OperatorType.APPSYSTEMS, businessType = + BusinessType.GENCODE, + action = "获取视频监测列表") + @GetMapping("/videoimages") + public R videoimages() { + return R.success("视频监控处理成功"); + } + } From 764b5ceaf29897c6a0807f7d4b287602918a4dc6 Mon Sep 17 00:00:00 2001 From: tyty Date: Mon, 24 Jul 2023 20:59:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=99=BA=E8=83=BD=E8=AF=8A=E6=96=ADbug?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java index 32fd126..fa14570 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/fdp/scheduled/ThreadTask.java @@ -205,7 +205,7 @@ public class ThreadTask { faultAllReq.setStationId(fdpFaultEntity.getStationId()); DiagnoseFaultReq diagnoseFaultReq = new DiagnoseFaultReq(); - diagnoseFaultReq.setTaskId(req.getId().toString()); + diagnoseFaultReq.setTaskId(key); diagnoseFaultReq.setFaultId(req.getFaultId()); diagnoseFaultReq.setConfidence(1.0); diagnoseFaultReq.setLifeTime(24*3);//设置有效期3天 From 221823457aed674a422c42e4d7a1dcf1963fe5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E9=A3=9E=E5=AE=87?= <2684146481@qq.com> Date: Tue, 25 Jul 2023 08:41:11 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=A4=E7=A5=A8?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/IStandardTicketInfoService.java | 12 +++++----- .../impl/StandardTicketInfoServiceImpl.java | 5 +++-- .../controller/TicketCountController.java | 26 +++++++++++++++------- .../workTicket/service/IWorkTicketInfoService.java | 5 +++-- .../service/impl/WorkTicketInfoServiceImpl.java | 6 ++--- 5 files changed, 34 insertions(+), 20 deletions(-) diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java index 99267e8..43a9333 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/IStandardTicketInfoService.java @@ -130,9 +130,11 @@ public interface IStandardTicketInfoService extends BaseService listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo); + * 查看操作票 + * + * @param entityPage + * @param ticketCountQueryVo + * @return + */ + IPage listByOperationTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java index 1262a20..80ca0cf 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/service/impl/StandardTicketInfoServiceImpl.java @@ -707,11 +707,12 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { + public IPage listByOperationTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo) { String flowTaskName = ticketCountQueryVo.getFlowTaskName(); String dateTime = ticketCountQueryVo.getDateTime(); String type = ticketCountQueryVo.getType(); @@ -741,6 +742,6 @@ public class StandardTicketInfoServiceImpl extends BaseServiceImpl workTicketInfoEntities = - workTicketService.listByTicketWithKeyword(ticketCountQueryVo); + @GetMapping("/listByTicketWithKeyword/{page}/{size}") + public R listByTicketWithKeyword( + @PathVariable Long page, + @PathVariable Long size, + TicketCountQueryVo ticketCountQueryVo) { + Page entityPage = new Page<>(page,size); + IPage workTicketInfoEntities = + workTicketService.listByTicketWithKeyword(entityPage,ticketCountQueryVo); return R.data(workTicketInfoEntities); } @@ -90,10 +96,14 @@ public class TicketCountController { /** * 查看操作票 */ - @GetMapping("/listByOperationTicketWithKeyword") - public R listByOperationTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { - List ticketInfoEntities = - standardTicketInfoService.listByOperationTicketWithKeyword(ticketCountQueryVo); + @GetMapping("/listByOperationTicketWithKeyword/{page}/{size}") + public R listByOperationTicketWithKeyword( + @PathVariable Long page, + @PathVariable Long size, + TicketCountQueryVo ticketCountQueryVo) { + Page entityPage = new Page<>(page,size); + IPage ticketInfoEntities = + standardTicketInfoService.listByOperationTicketWithKeyword(entityPage,ticketCountQueryVo); return R.data(ticketInfoEntities); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java index a95c59f..7e5f6cb 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/IWorkTicketInfoService.java @@ -2,7 +2,6 @@ package com.hnac.hzims.ticket.workTicket.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.hnac.hzims.ticket.areamonthly.vo.AreaMonthlyVo; import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo; import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo; import com.hnac.hzims.ticket.twoTicket.vo.TicketCountQueryVo; @@ -173,8 +172,10 @@ public interface IWorkTicketInfoService extends BaseService listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo); + IPage listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo); } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java index 559dd69..76d970d 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/service/impl/WorkTicketInfoServiceImpl.java @@ -26,7 +26,6 @@ import com.hnac.hzims.ticket.areamonthly.vo.StandardTicketWithAreaVo; import com.hnac.hzims.ticket.areamonthly.vo.StandardWorkVo; import com.hnac.hzims.ticket.aspect.AroundFlow; import com.hnac.hzims.ticket.constants.TicketConstants; -import com.hnac.hzims.ticket.standardTicket.entity.StandardTicketInfoEntity; import com.hnac.hzims.ticket.twoTicket.entity.TicketInfoDanger; import com.hnac.hzims.ticket.twoTicket.entity.WorkTicketFinish; import com.hnac.hzims.ticket.twoTicket.service.TicketInfoDangerService; @@ -1135,11 +1134,12 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl listByTicketWithKeyword(TicketCountQueryVo ticketCountQueryVo) { + public IPage listByTicketWithKeyword(Page entityPage, TicketCountQueryVo ticketCountQueryVo) { //延期 String input = ticketCountQueryVo.getInput(); //开票 结束 作废 @@ -1180,6 +1180,6 @@ public class WorkTicketInfoServiceImpl extends BaseServiceImpl Date: Tue, 25 Jul 2023 10:23:53 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=8E=BB=E6=8E=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java index 74bf8bb..f9dbf68 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java @@ -1,5 +1,6 @@ package com.hnac.hzims.spare.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity; import com.hnac.hzims.spare.entity.WtSpBasicEntity; import com.hnac.hzims.spare.vo.WtSpBasicVO; @@ -14,7 +15,7 @@ import java.util.Map; * * @author Chill */ -public interface WtSpBasicMapper extends UserDataScopeBaseMapper { +public interface WtSpBasicMapper extends BaseMapper { /** * 备品备件基础信息列表 * @param params From 690266ab6bb663356824911756b59ddf49ecce6b Mon Sep 17 00:00:00 2001 From: tanghaihao <850814414@qq.com> Date: Tue, 25 Jul 2023 11:15:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=B7=A1=E6=A3=80=E5=86=85=E5=AE=B9=E7=9A=84?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E9=83=A8=E9=97=A8=E9=9C=80=E8=A6=81=E5=92=8C?= =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9A=84=E6=89=80=E5=B1=9E=E7=AB=99=E7=82=B9?= =?UTF-8?q?=E7=9B=B8=E5=90=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java index acc0803..e1eec7d 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/service/impl/EmInfoServiceImpl.java @@ -836,6 +836,7 @@ public class EmInfoServiceImpl extends BaseServiceImpl