From a0b351623b07302636a7b0c3ea5a92253bb3c5b1 Mon Sep 17 00:00:00 2001 From: Jone <515616805@qq.com> Date: Fri, 8 Mar 2024 11:05:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E6=B3=A8=E9=87=8A=E8=BF=87=E6=9C=9F=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hzims-service/operational/pom.xml | 2 +- .../defect/controller/OperDefectController.java | 51 --------------------- .../controller/OperDefectStatisticsController.java | 52 ---------------------- .../controller/OperPhenomenonController.java | 35 --------------- .../controller/DistributeWorkOrderController.java | 2 + .../operational/workOrder/dto/GrabPackageDTO.java | 1 + .../workOrder/dto/InspectionOrderContentDTO.java | 2 +- .../workOrder/dto/InspectionOrderDTO.java | 1 + .../workOrder/dto/MaintOrderContentDTO.java | 1 + .../operational/workOrder/dto/MaintOrderDTO.java | 1 + .../operational/workOrder/dto/OrderPackageDto.java | 1 + .../operational/workOrder/dto/OtherOrderDTO.java | 1 + .../hzims/operational/workOrder/dto/Publisher.java | 1 + .../workOrder/dto/RepairOrderAcptDto.java | 1 + .../workOrder/dto/RepairOrderContentDTO.java | 1 + .../workOrder/dto/RepairOrderPrognosisDTO.java | 1 + .../hzims/operational/workOrder/dto/TenderDto.java | 1 + .../service/IDistributeWorkOrderService.java | 2 +- .../impl/DistributeWorkOrderServiceImpl.java | 1 + 19 files changed, 17 insertions(+), 141 deletions(-) diff --git a/hzims-service/operational/pom.xml b/hzims-service/operational/pom.xml index 7f60701..e124c05 100644 --- a/hzims-service/operational/pom.xml +++ b/hzims-service/operational/pom.xml @@ -4,7 +4,7 @@ com.hnac.hzims hzims-service - 4.0.0-SNAPSHOT + 4.0.0.5-SNAPSHOT 4.0.0 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java index b1d5fac..c5eba9b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectController.java @@ -72,57 +72,6 @@ public class OperDefectController extends BladeController { return R.data(page); } - - /* - */ -/** - * 新增 代码自定义代号 - */ /* - - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入defect") - public R save(@Valid @RequestBody OperDefectEntity defect) { - return R.status(defectService.save(defect)); - } - - */ -/** - * 修改 代码自定义代号 - */ /* - - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入defect") - public R update(@Valid @RequestBody OperDefectEntity defect) { - return R.status(defectService.updateById(defect)); - } - - */ -/** - * 新增或修改 代码自定义代号 - */ /* - - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入defect") - public R submit(@Valid @RequestBody OperDefectEntity defect) { - return R.status(defectService.saveOrUpdate(defect)); - } -*/ - - - /* */ - - /** - * 删除 代码自定义代号 - */ /* - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(defectService.deleteLogic(Func.toLongList(ids))); - }*/ @PostMapping("/handleProcess") @ApiOperationSupport(order = 4) @ApiOperation(value = "执行问题处理流程", notes = "执行问题处理流程") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java index 9290f04..ed687cd 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperDefectStatisticsController.java @@ -107,12 +107,6 @@ public class OperDefectStatisticsController extends BladeController { public void exportDefectList(HttpServletResponse response,@RequestBody OperDefectStatisticsVO entity) { try { long timeMillis = System.currentTimeMillis(); -// if(ObjectUtil.isEmpty(entity.getCreateTime())&&ObjectUtil.isEmpty(entity.getCreateEndTime())){ -// LocalDateTime date = LocalDateTime.now(); -// LocalDateTime firstDay = date.with(TemporalAdjusters.firstDayOfMonth()).withHour(0).withMinute(0).withSecond(0); -// entity.setCreateTime(Date.from(firstDay.atZone(ZoneId.systemDefault()).toInstant())); -// entity.setCreateEndTime(new Date()); -// } response.setContentType("application/vnd.ms-excel"); response.setCharacterEncoding("UTF-8"); // 这里URLEncoder.encode可以防止中文乱码 当然和easyexcel没有关系 @@ -121,18 +115,14 @@ public class OperDefectStatisticsController extends BladeController { LambdaQueryWrapper queryWrapper = statisticsService.getQueryWrapper(entity); List list = statisticsService.list(queryWrapper); long timeMillis1 =System.currentTimeMillis()- timeMillis; - System.out.println("查询对应实例类耗时============================"+ timeMillis1); List defectStatisticsExportVO = statisticsService.getDefectStatisticsExportVO(list); long timeMillis2 =System.currentTimeMillis()- timeMillis; - System.out.println("参数转换耗时============================"+ timeMillis2); if(defectStatisticsExportVO!=null && defectStatisticsExportVO.size()>0){ - System.out.println("---------------- size = " + defectStatisticsExportVO.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), OperDefectStatisticsExportVO.class).autoCloseStream(Boolean.FALSE).sheet("缺陷统计报表") .doWrite(defectStatisticsExportVO); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); @@ -162,48 +152,6 @@ public class OperDefectStatisticsController extends BladeController { } /** - * 新增 代码自定义代号 - *//* - @PostMapping("/save") - @ApiOperationSupport(order = 4) - @ApiOperation(value = "新增", notes = "传入statistics") - public R save(@Valid @RequestBody OperDefectStatisticsEntity statistics) { - return R.status(statisticsService.save(statistics)); - } - - *//** - * 修改 代码自定义代号 - *//* - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入statistics") - public R update(@Valid @RequestBody OperDefectStatisticsEntity statistics) { - return R.status(statisticsService.updateById(statistics)); - } - - *//** - * 新增或修改 代码自定义代号 - *//* - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入statistics") - public R submit(@Valid @RequestBody OperDefectStatisticsEntity statistics) { - return R.status(statisticsService.saveOrUpdate(statistics)); - } - - - *//** - * 删除 代码自定义代号 - *//* - @PostMapping("/remove") - @ApiOperationSupport(order = 7) - @ApiOperation(value = "逻辑删除", notes = "传入ids") - public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { - return R.status(statisticsService.deleteLogic(Func.toLongList(ids))); - }*/ - - - /** * 巡检任务统计 * @return */ diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java index 11c37b0..ebf3a27 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/controller/OperPhenomenonController.java @@ -79,43 +79,9 @@ public class OperPhenomenonController extends BladeController { public R> list(OperAppearanceVO phenomenon, Query query) { LambdaQueryWrapper queryWrapper = operAppearanceService.getQueryWrapper(phenomenon); IPage pages = operAppearanceService.page(Condition.getPage(query), queryWrapper); -// IPage vos = OperPhenomenonWrapper.build().pageVO(pages); return R.data(pages); } - - //此端口弃用20230621 -// /** -// * 新增 代码自定义代号 -// */ -// @PostMapping("/save") -// @ApiOperationSupport(order = 4) -// @ApiOperation(value = "提交现象，现象提交后不能修改", notes = "传入phenomenon") -// public R save(@Valid @RequestBody OperPhenomenonEntity phenomenon) { -// return R.data(phenomenonService.submit(phenomenon)); -// } - - /* */ /** - * 修改 代码自定义代号 - */ /* - @PostMapping("/update") - @ApiOperationSupport(order = 5) - @ApiOperation(value = "修改", notes = "传入phenomenon") - public R update(@Valid @RequestBody OperPhenomenonEntity phenomenon) { - return R.status(phenomenonService.updateById(phenomenon)); - } - - */ /** - * 新增或修改 代码自定义代号 - */ /* - @PostMapping("/submit") - @ApiOperationSupport(order = 6) - @ApiOperation(value = "新增或修改", notes = "传入phenomenon") - public R submit(@Valid @RequestBody OperPhenomenonEntity phenomenon) { - return R.status(phenomenonService.saveOrUpdate(phenomenon)); - }*/ - - /** * 删除 代码自定义代号 */ @@ -131,7 +97,6 @@ public class OperPhenomenonController extends BladeController { @ApiOperation(value = "处理问题甄别流程", notes = "处理问题甄别流程") public R handleCheckProcess(@RequestBody @ObjectRequiredInvalid(attributes = {"taskId", "processInstanceId", "comment", "flag", "variables.pass"}, message = "参数不能为空") BladeFlow flow) { - //@DictInvalid(dictKey = "") return R.status(phenomenonService.handleCheckProcess(flow)); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/controller/DistributeWorkOrderController.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/controller/DistributeWorkOrderController.java index 8734551..545f392 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/controller/DistributeWorkOrderController.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/controller/DistributeWorkOrderController.java @@ -18,12 +18,14 @@ import java.util.List; /** * @author hx + * 和水务进行对接，IMS无用。20240308，wxq */ @RestController @AllArgsConstructor @Slf4j @RequestMapping("/token/distribute/workOrder") @Api(value = "派发工单",tags = "派发工单") +@Deprecated public class DistributeWorkOrderController { private final IDistributeWorkOrderService distributeWorkOrderService; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/GrabPackageDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/GrabPackageDTO.java index b080213..d04aa71 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/GrabPackageDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/GrabPackageDTO.java @@ -8,6 +8,7 @@ import java.util.List; @Data @ApiModel(value = "抢单受理参数对象",description = "抢单受理参数对象") +@Deprecated public class GrabPackageDTO { @ApiModelProperty("水厂名称") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderContentDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderContentDTO.java index 5c64490..2f37e47 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderContentDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderContentDTO.java @@ -1,4 +1,4 @@ package com.hnac.hzims.operational.workOrder.dto; - +@Deprecated public class InspectionOrderContentDTO { } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderDTO.java index 9b9842e..7b1ba6c 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/InspectionOrderDTO.java @@ -8,6 +8,7 @@ import java.util.List; @Data @ApiModel(value = "巡检工单列表",description = "巡检工单列表") +@Deprecated public class InspectionOrderDTO { @ApiModelProperty("异常设备数") private Integer equAbnormal; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderContentDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderContentDTO.java index d73d82e..d537027 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderContentDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderContentDTO.java @@ -8,6 +8,7 @@ import lombok.Data; @ApiModel(value = "MaintOrderContentDTO对象",description = "MaintOrderContentDTO对象") @Data +@Deprecated public class MaintOrderContentDTO { @ApiModelProperty("润滑内容") private String content; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderDTO.java index a610e28..777ce37 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/MaintOrderDTO.java @@ -10,6 +10,7 @@ import java.util.List; @Data @ApiModel(value = "MaintOrderDTO对象",description = "MaintOrderDTO对象") +@Deprecated public class MaintOrderDTO { @ApiModelProperty("所属大区") private String belongArea; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OrderPackageDto.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OrderPackageDto.java index 815ce60..65e0771 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OrderPackageDto.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OrderPackageDto.java @@ -13,6 +13,7 @@ import java.util.List; */ @Data @ApiModel(value = "工单包受理对象", description = "工单包受理对象") +@Deprecated public class OrderPackageDto { @ApiModelProperty("竞标主键ID") private String id; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OtherOrderDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OtherOrderDTO.java index da82f3e..8604051 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OtherOrderDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/OtherOrderDTO.java @@ -7,6 +7,7 @@ import lombok.Data; @Data @ApiModel(value = "OtherOrderDTO对象",description = "OtherOrderDTO对象") +@Deprecated public class OtherOrderDTO { @ApiModelProperty("工单类型 5防腐工单6大修工单7重置工单8临时通用工单") private String orderType; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/Publisher.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/Publisher.java index a3f6dcf..e1c7ac8 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/Publisher.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/Publisher.java @@ -6,6 +6,7 @@ import lombok.Data; @Data @ApiModel(value = "发布人信息", description = "发布人信息") +@Deprecated public class Publisher { @ApiModelProperty("联系地址") private String contactAddress; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderAcptDto.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderAcptDto.java index 01a0425..ef7a68d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderAcptDto.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderAcptDto.java @@ -10,6 +10,7 @@ import java.util.List; @Data @ApiModel(value = "RepairOrderAcptDto对象", description = "RepairOrderAcptDto对象") +@Deprecated public class RepairOrderAcptDto { @ApiModelProperty("报修人") private String createUser; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderContentDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderContentDTO.java index a7a8075..eb7fccc 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderContentDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderContentDTO.java @@ -8,6 +8,7 @@ import lombok.Data; @Data @ApiModel(value = "RepairOrderContentDTO对象",description = "RepairOrderContentDTO对象") +@Deprecated public class RepairOrderContentDTO { @ApiModelProperty("报修人") private String createUser; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderPrognosisDTO.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderPrognosisDTO.java index bfbf258..cc5b967 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderPrognosisDTO.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/RepairOrderPrognosisDTO.java @@ -6,6 +6,7 @@ import lombok.Data; @Data @ApiModel(value = "RepairOrderPrognosisDTO对象",description = "RepairOrderPrognosisDTO对象") +@Deprecated public class RepairOrderPrognosisDTO { @ApiModelProperty("故障原因描述") private String cause; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/TenderDto.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/TenderDto.java index e6d3ccb..2454662 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/TenderDto.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/dto/TenderDto.java @@ -10,6 +10,7 @@ import java.util.List; @Data @ApiModel(value = "招标信息",description = "招标信息") +@Deprecated public class TenderDto { @ApiModelProperty("备注") private String orderRemark; diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/IDistributeWorkOrderService.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/IDistributeWorkOrderService.java index bb5caa8..77e7955 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/IDistributeWorkOrderService.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/IDistributeWorkOrderService.java @@ -3,7 +3,7 @@ package com.hnac.hzims.operational.workOrder.service; import com.hnac.hzims.operational.access.entity.OperAccessTaskEntity; import com.hnac.hzims.operational.defect.entity.OperDefectEntity; import org.springblade.core.tool.api.R; - +@Deprecated public interface IDistributeWorkOrderService { /** * 派发检修任务 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java index d7d25f8..059bdec 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/workOrder/service/impl/DistributeWorkOrderServiceImpl.java @@ -44,6 +44,7 @@ import java.util.Set; @Slf4j @RequiredArgsConstructor @Service +@Deprecated public class DistributeWorkOrderServiceImpl implements IDistributeWorkOrderService { private final IEmInfoClient emInfoClient; private final ISysClient sysClient;