From 4bc1403afa866481d9595c5950eb3506fe3ed3fd Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Thu, 1 Aug 2024 18:59:31 +0800 Subject: [PATCH 1/7] =?UTF-8?q?fix:=E5=B7=A1=E6=A3=80=E6=8A=A5=E5=A4=87?= =?UTF-8?q?=E9=99=90=E5=88=B6=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 9bf35972120fffaad41ad4719ea21ecb6034a51b) --- .../task/service/impl/TaskRecordServiceImpl.java | 36 ++++++++-------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java index fe03308..25905e2 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/service/impl/TaskRecordServiceImpl.java @@ -1,7 +1,10 @@ package com.hnac.hzinfo.inspect.task.service.impl; +import cn.hutool.core.lang.Assert; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.google.common.collect.Lists; import com.hnac.hzinfo.inspect.task.TaskContants; import com.hnac.hzinfo.inspect.task.TaskContants.ClaimStatusEnum; import com.hnac.hzinfo.inspect.task.TaskContants.TaskRecordTypeEnum; @@ -19,6 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; /** * 巡检报备服务实现类 @@ -36,36 +41,21 @@ public class TaskRecordServiceImpl extends ServiceImplquery().lambda().eq(TaskUserEntity::getTaskId, itr.getTaskId()).eq(TaskUserEntity::getClaimStatus,ClaimStatusEnum.UN_COLLECT.getStatus())); - //领取任务 + // 领取任务 TaskUserEntity itu = TaskUserEntity.builder().taskId(itr.getTaskId()).userId(itr.getExecutor()).claimStatus(ClaimStatusEnum.COLLECT.getStatus()).claimTime(LocalDateTime.now()).build(); taskUserService.save(itu); - }else{//任务报备（谁第一个登录任务谁就领取任务） -// //领取任务(抢占任务取第一个人员领取该任务,并发任务，一个任务对应的一个人也是取第一个人) -// TaskUserEntity itu = taskUserService.getOne(Wrappers.query().lambda().eq(TaskUserEntity::getTaskId, itr.getTaskId()).eq(TaskUserEntity::getClaimStatus,ClaimStatusEnum.UN_COLLECT.getStatus()).last("limit 1")); -// if(itu!=null){ -// itu.setClaimStatus(ClaimStatusEnum.COLLECT.getStatus()); -// itu.setClaimTime(LocalDateTime.now()); -// taskUserService.updateById(itu); -// //如果是抢占任务,删除能够抢占此任务的其他人 -// if(PlanContants.PlanMethodEnum.SEIZE.getMethod().equals(task.getMethod())) { -// taskUserService.remove(Wrappers.lambdaQuery().eq(TaskUserEntity::getTaskId,task.getId()).ne(TaskUserEntity::getId,itu.getUserId())); -// } -// } } - //报备后任务默认为进行中 - UpdateWrapper uwTask = new UpdateWrapper<>(); - uwTask.lambda() + // 报备后任务默认为进行中 + LambdaUpdateWrapper uwTask = Wrappers.lambdaUpdate() .set(TaskEntity::getKeepOnRecord, keepOnRecordEnum.yes.getType()) - .set(TaskEntity::getStartTime,LocalDateTime.now()) + .set(TaskEntity::getStartTime, LocalDateTime.now()) .set(TaskEntity::getStatus, TaskContants.TaskStatusEnum.UNDERWAY_STATUS.getStatus()) .eq(TaskEntity::getId, itr.getTaskId()); taskService.update(uwTask); From 51b563a0eccabc0d5c482ec0588ba74a9d7ab277 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 5 Aug 2024 10:36:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=89=A9=E8=B5=84?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=8F=B0=E8=B4=A6=E7=9A=84=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzims/spare/service/impl/WtSpBasicServiceImpl.java | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java index f97b662..9469cb3 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java @@ -1,6 +1,5 @@ package com.hnac.hzims.spare.service.impl; - import cn.afterturn.easypoi.excel.entity.ImportParams; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; @@ -33,7 +32,6 @@ import com.hnac.hzims.spare.utils.SheetWriteStyleHandler; import com.hnac.hzims.spare.vo.SparePartVO; import com.hnac.hzims.spare.vo.WtSpBasicVO; import com.hnac.hzims.ticket.allTicket.fegin.ITicketInfoAllClient; -import com.hnac.hzims.ticket.allTicket.vo.TicketInfoStatisticVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; @@ -171,7 +169,6 @@ public class WtSpBasicServiceImpl extends ServiceImpl voList = new ArrayList<>(); IPage voPages = new Page<>(); if (Func.isNotEmpty(spBasicEntity.getName()) && "工具".equals(spBasicEntity.getName())) { -// if(Func.isNotEmpty(spBasicEntity.getName())){ List list = managementService.list(Wrappers.query().lambda(). eq(WtSpManagementEntity::getName, spBasicEntity.getName())); if (list.size() == 0) { @@ -218,13 +215,6 @@ public class WtSpBasicServiceImpl extends ServiceImpl ticketVOS = ticketInfoAllClient.getTicketStatistic("2022-02"); - -// R deptR = sysClient.getDept(basicEntity.getWaterPlantId()); -// if(Func.isNotEmpty(deptR.getData())){ -// basicVO.setWaterPlantName(deptR.getData().getDeptName()); -// } voList.add(basicVO); } else { WtSpBasicVO basicVO = new WtSpBasicVO(); @@ -240,16 +230,11 @@ public class WtSpBasicServiceImpl extends ServiceImpl totalList = totalService.list(Wrappers.query().lambda().eq(WtSpTotalEntity::getSpBasicId, basicEntity.getId())); if (totalList.size() > 0) { -// basicVO.setStock(totalList.get(0).getStock()); basicVO.setStock(totalEntity.getStock()); } else { basicVO.setStock(0L); } BeanUtils.copyProperties(basicEntity, basicVO); -// R deptR = sysClient.getDept(basicEntity.getWaterPlantId()); -// if(Func.isNotEmpty(deptR.getData())){ -// basicVO.setWaterPlantName(deptR.getData().getDeptName()); -// } voList.add(basicVO); } List totalEntities = totalMapper.selectByWarehouseId(warehouseId); From 809aad8d3e2fbdc7a3ed56fdd9bd7a93c728dec6 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 5 Aug 2024 13:56:20 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E5=B7=A5=E5=99=A8=E5=85=B7=E6=89=AB=E6=8F=8F=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=8A=A5=E9=94=99=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../safeproduct/controller/SafetyToolController.java | 11 ++++------- .../hzims/safeproduct/service/ISafetyToolService.java | 7 +++++++ .../safeproduct/service/impl/SafetyToolServiceImpl.java | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java index f8750e9..1e6bb6e 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/SafetyToolController.java @@ -1,5 +1,6 @@ package com.hnac.hzims.safeproduct.controller; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import com.hnac.hzims.common.logs.annotation.OperationAnnotation; @@ -26,6 +27,7 @@ import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.api.ResultCode; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.SpringUtil; import org.springframework.web.bind.annotation.*; @@ -84,18 +86,13 @@ public class SafetyToolController extends BladeController { return safetyToolService.doUpdate(safetyTool); } - /** - * 详情 - */ @GetMapping("/detail") @ApiOperationSupport(order = 40) @ApiOperation(value = "详情", notes = "传入safetyTool") @Operate(label = "详情", type = com.hnac.hzinfo.log.contants.BusinessType.QUERY, ignore = false) public R detail(@RequestParam("id") Long id) { - SafetyToolEntity detail = safetyToolService.getOne(Condition.getQueryWrapper(new SafetyToolEntity() {{ - setId(id); - }})); - return R.data(SafetyToolWrapper.build().entityVO(detail)); + SafetyToolVO safetyToolVO = safetyToolService.detail(id); + return R.data(safetyToolVO); } /** diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolService.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolService.java index 7731e49..862232c 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolService.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/ISafetyToolService.java @@ -45,4 +45,11 @@ public interface ISafetyToolService extends IService { * @return */ R remove(List idList); + + /** + * 详情 + * @param id 安全工器具id + * @return 安全工器具VO类 + */ + SafetyToolVO detail(Long id); } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java index 6ad2f15..702c252 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/SafetyToolServiceImpl.java @@ -38,6 +38,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.api.ResultCode; import org.springblade.core.tool.utils.*; import org.springblade.system.feign.ISysClient; import org.springblade.system.user.entity.User; @@ -275,6 +276,20 @@ public class SafetyToolServiceImpl extends ServiceImpl Date: Mon, 5 Aug 2024 14:12:45 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=88=A0=E9=99=A4System.out.println=20?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hnac/hzims/spare/feign/ISpareOutServiceFallback.java | 1 - .../main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java | 1 - .../hzims/spare/service/impl/SpAllocationServiceImpl.java | 1 - .../hzims/spare/service/impl/SpWarehouseInServiceImpl.java | 1 - .../hzims/spare/service/impl/WtSpBasicServiceImpl.java | 1 - .../hnac/hzims/fdp/service/impl/FdpMonitorServiceImpl.java | 3 --- .../java/com/hnac/hzims/alarm/mqtt/DroolsMqttConsumer.java | 1 - .../hzims/basic/controller/PresonManagementController.java | 2 -- .../inspect/ai/service/impl/CameraInfoServiceImpl.java | 1 - .../java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java | 1 - .../hnac/hzinfo/inspect/offline/util/CompressUtils.java | 2 -- .../inspect/report/controller/InspectReportController.java | 4 ---- .../hzinfo/inspect/task/controller/TaskController.java | 2 -- .../main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java | 1 - .../main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java | 1 - .../java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java | 3 --- .../hnac/hzims/operational/access/utils/ZXingGenCode.java | 3 --- .../config/service/impl/StAlamRecordServiceImpl.java | 1 - .../duty/service/impl/ImsAnalyseExampleServiceImpl.java | 2 -- .../com/hnac/hzims/operational/main/common/ExcelData.java | 3 --- .../controller/OperMaintenanceTaskController.java | 2 -- .../service/impl/OperStationMonthReportServiceImpl.java | 1 - .../hzims/operational/station/utils/ArtemisPostUtils.java | 2 -- .../java/com/hnac/hzims/operational/util/CommonUtils.java | 3 --- .../java/com/hnac/hzims/operational/util/ExcelUtil.java | 2 -- .../main/java/com/hnac/hzims/operational/util/ZpiUtil.java | 3 --- .../com/hnac/hzims/safeproduct/config/XxlJobConfig.java | 1 - .../hzims/safeproduct/hazard/util/ExcelConvertPdf.java | 9 +-------- .../java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java | 1 - .../com/hnac/hzims/safeproduct/utils/ZXingGenCode.java | 3 --- .../controller/OperationTicketController.java | 4 ---- .../controller/StandardTicketInfoController.java | 9 +++------ .../service/impl/StandardTicketInfoServiceImpl.java | 1 - .../twoTicket/service/impl/FirstWorkTicketServiceImpl.java | 2 ++ .../twoTicket/service/impl/TicketProcessServiceImpl.java | 7 +------ .../main/java/com/hnac/hzims/ticket/utils/ExcelUtil.java | 2 -- .../workTicket/controller/WorkTicketInfoController.java | 14 ++++++-------- .../workTicket/service/impl/WorkTicketInfoServiceImpl.java | 2 -- .../java/com/hnac/hzims/weather/config/XxlJobConfig.java | 1 - 39 files changed, 13 insertions(+), 91 deletions(-) diff --git a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java index 6e8994f..4be9a02 100644 --- a/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java +++ b/hzims-service-api/assets-api/src/main/java/com/hnac/hzims/spare/feign/ISpareOutServiceFallback.java @@ -12,7 +12,6 @@ public class ISpareOutServiceFallback implements ISpareOutServiceClient { Long tenantId, Integer current, Integer size){ - System.out.println("熔断了"); return null; } diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java index 6b10a50..9621957 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/fdp/util/HttpRequestUtil.java @@ -122,7 +122,6 @@ public class HttpRequestUtil { result += str; } log.info(url+"-------------------------{}"+result); - System.out.println(result); //关闭流 is.close(); //断开连接，disconnect是在底层tcp socket链接空闲时才切断，如果正在被其他线程使用就不切断。 diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java index e161c7e..048ca65 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/SpAllocationServiceImpl.java @@ -86,7 +86,6 @@ public class SpAllocationServiceImpl extends ServiceImpl basicEntityList = entity.getBasicList(); super.save(entity); - System.out.println(entity.getId()); for (int i = 0; i < basicEntityList.size(); i++) { if(basicEntityList.get(i).getAmount()<=0){ throw new ServiceException("数量必须大于0"); diff --git a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java index f97b662..a1a910e 100644 --- a/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java +++ b/hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpBasicServiceImpl.java @@ -508,7 +508,6 @@ public class WtSpBasicServiceImpl extends ServiceImpl list=iImsPresonManagementService.exportPersonManagemet(personManagemetVo); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), PersonManagemetExportVo.class).autoCloseStream(Boolean.FALSE).sheet("档案管理报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java index bcd548f..a649ce0 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/ai/service/impl/CameraInfoServiceImpl.java @@ -28,7 +28,6 @@ public class CameraInfoServiceImpl extends ServiceImpl success = smsClient.sendMessage("aliyun-task-end", "{\"two\":\"2021-03-24 16:41:26\",\"one\":\"测试短信3\"}", "18229968652"); - System.out.println("msg -- 用户手机号：18229968652 ; 返回信息 = " + (Func.isNotEmpty(success)?success.toString(): "返回为空")); } @Override diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java index 93d9e3a..b9e8f2c 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/config/XxlJobConfig.java @@ -44,7 +44,6 @@ public class XxlJobConfig { xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); - System.out.println(">>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java index af0ccc1..eea4b58 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/offline/util/CompressUtils.java @@ -79,7 +79,6 @@ public class CompressUtils { in.close(); } long end = System.currentTimeMillis(); - System.out.println("压缩完成，耗时：" + (end - start) + " ms"); } catch (Exception e) { throw new RuntimeException("zip error from ZipUtils", e); } finally { @@ -244,7 +243,6 @@ public class CompressUtils { in.close(); } long end = System.currentTimeMillis(); - System.out.println("压缩完成，耗时：" + (end - start) +" ms"); result = true; } catch (Exception e) { throw new RuntimeException("zip error from ZipUtils",e); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java index dac2ba5..4c61968 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/report/controller/InspectReportController.java @@ -75,13 +75,11 @@ public class InspectReportController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List datas = irs.getExcelByMonth(month, routId, userId); if(datas!=null && datas.size()>0){ - System.out.println("---------------- size = " + datas.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(month +"巡检详情") .doWrite(datas); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); @@ -118,13 +116,11 @@ public class InspectReportController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List datas = irs.getExcelByMonthGather(vo); if(datas!=null && datas.size()>0){ - System.out.println("---------------- size = " + datas.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectMonthReportExcel.class).autoCloseStream(Boolean.FALSE).sheet(vo.getMonth() +"巡检详情") .doWrite(datas); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java index f738356..77acd7d 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/task/controller/TaskController.java @@ -184,13 +184,11 @@ public class TaskController extends BladeController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List list = taskService.exportTaskList(task); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), InspectTaskExportVO.class).autoCloseStream(Boolean.FALSE).sheet("巡检任务报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java index 3d57ca5..1fd883b 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HiKUtil.java @@ -117,7 +117,6 @@ public class HiKUtil { put("https://", url); }}; final String contentType = "application/json"; - System.out.println("海康调用传参"+ JSON.toJSONString(variable)); String result = ArtemisHttpUtil.doPostStringArtemis(path, JSON.toJSONString(variable), null, null, contentType , null); Assert.isTrue("0".equals(JSONObject.parseObject(result).getString("code")),() -> { throw new ServiceException("调用海康URL失败,报错信息为：" + result); diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java index 97cfa1f..d5755d6 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/HtmltoPdf.java @@ -128,7 +128,6 @@ public class HtmltoPdf { public static String getCurrentOperatingSystem(){ String os = System.getProperty("os.name").toLowerCase(); - System.out.println("---------当前操作系统是-----------" + os); return os; } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java index 8708fbb..7a1cab7 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/utils/ZxingGenCode.java @@ -54,9 +54,6 @@ public class ZxingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java index fe24f13..3c07300 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/access/utils/ZXingGenCode.java @@ -47,9 +47,6 @@ public class ZXingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java index 4c0583c..26e2920 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/service/impl/StAlamRecordServiceImpl.java @@ -133,7 +133,6 @@ public class StAlamRecordServiceImpl extends ServiceImpl stationIds = station.stream().map(StationEntity::getCode).collect(Collectors.toSet()); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Date date2 = new Date(); - System.out.println("开始：" + sdf.format(date2)); //查询出用户所拥有的数据权限站点下的所有属性 List list = stFocusPropertiesService.list(new LambdaQueryWrapper() {{ in(StFocusPropertiesEntity::getStationId, stationIds); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java index 5cec3ce..57b8824 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/service/impl/ImsAnalyseExampleServiceImpl.java @@ -169,7 +169,6 @@ public class ImsAnalyseExampleServiceImpl extends ServiceImpl list = taskService.exportMaintenance(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), MaintenanceExportVO.class).autoCloseStream(Boolean.FALSE).sheet("日常维护记录统计") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java index 98e3cf4..498282a 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/report/service/impl/OperStationMonthReportServiceImpl.java @@ -356,7 +356,6 @@ public class OperStationMonthReportServiceImpl implements IOperStationMonthRepor log.info("电站发电量总览"+reportVOS.toString()); }catch (Exception e){ log.error("getStationMonthReportV2电站发电量报错", e); - System.out.println(e); }finally { countDownLatch.countDown(); log.info("电站发电耗时："+(System.currentTimeMillis()-startMillis)+"ms"); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java index 480fb07..84d373b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/utils/ArtemisPostUtils.java @@ -129,10 +129,8 @@ public class ArtemisPostUtils { String body = jsonBody.toJSONString(); String result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType, null); } catch (InterruptedException e) { - System.out.println("Runnable is error"); Thread.currentThread().interrupt(); } - System.out.println("Runnable running"); } }; Thread thread = new Thread(myRunnable); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java index cb5970f..0396945 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/CommonUtils.java @@ -186,9 +186,6 @@ public class CommonUtils { cell1.setCellStyle(valStyle); Map dataMap = avgList.get(i).getDataMap(); - for (Object o : dataMap.keySet()) { - System.out.println("测试打印：" + o + "===" + dataMap.get(o)); - } //第2格为上月平均值 Cell cell2 = row.createCell(2); if (dataMap.get(preMonthStr) != null) { diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java index a95d8d4..330f98f 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ExcelUtil.java @@ -96,8 +96,6 @@ public class ExcelUtil { if(resources.length == 1) { InputStream inputStream = resources[0].getInputStream(); inputStreamToFile(inputStream, file); - }else { - System.out.println("请检查模板文件是否存在"); } return file; } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java index 49644fc..07689e5 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/util/ZpiUtil.java @@ -49,7 +49,6 @@ public class ZpiUtil { out = new FileOutputStream(file.getPath()); workbook.write(out); } catch (Exception e) { - System.out.println("出现异常"); e.printStackTrace(); } fileList.add(file); @@ -123,7 +122,6 @@ public class ZpiUtil { zipOut.closeEntry(); } } catch (Exception e) { - System.out.println("压缩ZIP包出现异常"); e.printStackTrace(); } finally { in.close(); @@ -152,7 +150,6 @@ public class ZpiUtil { } response.flushBuffer(); } catch (IOException e) { - System.out.println("下载出现异常"); e.printStackTrace(); } finally { fis.close(); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java index 71fb82d..87e5702 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/config/XxlJobConfig.java @@ -45,7 +45,6 @@ public class XxlJobConfig { xxlJobSpringExecutor.setAppname(appName); xxlJobSpringExecutor.setIp(ip); xxlJobSpringExecutor.setPort(port); - System.out.println(">>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java index cc6cad7..0b23047 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/hazard/util/ExcelConvertPdf.java @@ -43,7 +43,6 @@ public class ExcelConvertPdf { Sheet sheet = workbook.getSheetAt(0); int column = sheet.getRow(1).getLastCellNum(); int row = sheet.getPhysicalNumberOfRows(); - System.out.println(row); //下面是找出表格中的空行和空列 List nullCol = new ArrayList<>(); List nullRow = new ArrayList<>(); @@ -76,7 +75,6 @@ public class ExcelConvertPdf { PdfPTable table = new PdfPTable(column-sheet.getRow(1).getFirstCellNum()); List ranges = new ArrayList(); int sheetMergeCount = sheet.getNumMergedRegions(); - System.out.println("sheetMergeCount"+sheetMergeCount); for (int i = 0; i < sheetMergeCount; i++) { CellRangeAddress range = sheet.getMergedRegion(i); ranges.add(range); @@ -104,10 +102,6 @@ public class ExcelConvertPdf { } else { str = cell.getStringCellValue(); } - - System.out.println("i ::"+i + "j::"+j); - System.out.println(str); - for (CellRangeAddress range : ranges) { //合并的单元格判断和处理 if (j >= range.getFirstColumn() && j <= range.getLastColumn() && i >= range.getFirstRow() @@ -125,7 +119,6 @@ public class ExcelConvertPdf { rowNum = range.getLastRow() - range.getFirstRow() + 1; colNum = range.getLastColumn() - range.getFirstColumn() + 1; cell1 = mergeCell(str, font, rowNum, colNum); - System.out.println("合并"+rowNum+"、"+colNum); table.addCell(cell1); flag = false; mergeFlag = ranges.size() > 1; @@ -172,4 +165,4 @@ public class ExcelConvertPdf { cell.setMinimumHeight(25); return cell; } -} \ No newline at end of file +} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java index 714bc38..3400258 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/HtmltoPdf.java @@ -111,7 +111,6 @@ public class HtmltoPdf { public static String getCurrentOperatingSystem(){ String os = System.getProperty("os.name").toLowerCase(); - System.out.println("---------当前操作系统是-----------" + os); return os; } diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java index a7262b3..ae81112 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/utils/ZXingGenCode.java @@ -47,9 +47,6 @@ public class ZXingGenCode { Result result = null; try { image = ImageIO.read(new File(imgPath)); - if (image == null) { - System.out.println("the decode image may be not exit."); - } LuminanceSource source = new BufferedImageLuminanceSource(image); BinaryBitmap bitmap = new BinaryBitmap(new HybridBinarizer(source)); diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java index deaa288..0194c13 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/OperationTicketController.java @@ -123,13 +123,9 @@ public class OperationTicketController { businessMessageDTO.setUserIds(userIds); businessMessageDTO.setCreateUser(1522897714092781569L); - System.out.println("businessMessageDTO = " + businessMessageDTO); - R booleanR = messageClient.sendAppAndWsMsgByUsers(businessMessageDTO); if (!booleanR.isSuccess()) { throw new ServiceException("消息推送失败"); - }else { - System.out.println("推送成功"); } } diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java index 63b1474..3e464e3 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/standardTicket/controller/StandardTicketInfoController.java @@ -25,7 +25,7 @@ import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; - + import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.support.BladePage; import org.springblade.core.mp.support.Condition; @@ -92,7 +92,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.detail(id); } - + @PostMapping("/queryList") @ApiOperationSupport(order = 50) @ApiOperation(value = "分页") @@ -101,7 +101,7 @@ public class StandardTicketInfoController extends BladeController { return standardTicketInfoService.queryList(req, query); } - + @PostMapping("/exportStandardTicket") @ApiOperationSupport(order = 2) @ApiOperation(value = "操作票导出") @@ -123,14 +123,11 @@ public class StandardTicketInfoController extends BladeController { response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx"); List list = standardTicketInfoService.exportStandardTicket(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), StandardTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("操作票统计报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); - // 重置response response.reset(); response.setContentType("application/json"); response.setCharacterEncoding("utf-8"); 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 1eb86d3..ca28546 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 @@ -900,7 +900,6 @@ public class StandardTicketInfoServiceImpl extends ServiceImpl list = workTicketInfoService.exportWorkTicket(req); if(list!=null && list.size()>0){ - System.out.println("---------------- size = " + list.size()); // 这里需要设置不关闭流 EasyExcel.write(response.getOutputStream(), WorkTicketExportVO.class).autoCloseStream(Boolean.FALSE).sheet("工作票统计报表") .doWrite(list); } } catch (Exception e) { - System.out.println("exportExcel = " + e); // 重置response response.reset(); response.setContentType("application/json"); @@ -214,7 +212,7 @@ public class WorkTicketInfoController { return workTicketInfoService.licenseOfflineTicket(req); } - + @GetMapping("/userListByRoleAlias") @ApiOperationSupport(order = 100) @ApiOperation(value = "获取某机构下角色的人员列表") @@ -258,7 +256,7 @@ public class WorkTicketInfoController { /** * 获取工作票台账、 */ - + @GetMapping("/getWorkTicketBill") @ApiOperation(value = "获取工作票台账") public R> getWorkTicketBill(String emCode, String startTime, String endTime) { @@ -272,7 +270,7 @@ public class WorkTicketInfoController { return R.data(workTicketInfoService.work(Condition.getPage(query),work)); } - + @PostMapping("/cancel") @ApiOperationSupport(order = 50) @ApiOperation(value = "线下工作票作废") 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 aec8082..7da2909 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 @@ -1018,7 +1018,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl " + classGroupMembers); String[] split = classGroupMembers.split(","); for (String classGroupMember : split) { - System.out.println(classGroupMember); if (StringUtils.isNoneBlank(classGroupMember)) { boolean matches = classGroupMember.matches("[0-9]+"); if (matches) { @@ -1314,7 +1313,6 @@ public class WorkTicketInfoServiceImpl extends ServiceImpl>>>>>>>>>> xxl-rpc, port " + port); xxlJobSpringExecutor.setAccessToken(accessToken); xxlJobSpringExecutor.setLogPath(logPath); xxlJobSpringExecutor.setLogRetentionDays(logRetentionDays); From 43ae7e8cad9f587ba6ffd1a576f79c121c370a23 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 5 Aug 2024 16:21:42 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E7=BB=B4=E4=BF=9D?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java | 2 +- .../java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml | 2 +- .../hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java index 172f7b5..7b3edd9 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/CarMaintenanceEntity.java @@ -40,7 +40,7 @@ public class CarMaintenanceEntity extends BaseEntity { @NotNull @JsonFormat(pattern = "yyyy-MM-dd") - @ApiModelProperty("维保开始时间") + @ApiModelProperty("维保时间") private Date startTime; // @NotNull diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml index a2ba99e..e0860b8 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml @@ -35,7 +35,7 @@ AND t1.start_time >= #{param.startTime} - AND t1.end_time <= #{param.startTime} + AND t1.start_time <= #{param.endTime} AND t1.car_id = #{param.carId} diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java index f42c988..dec42a9 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java @@ -16,7 +16,6 @@ import com.hnac.hzims.safeproduct.enums.CarMaintenanceTypeEnum; import com.hnac.hzims.safeproduct.mapper.CarMaintenanceMapper; import com.hnac.hzims.safeproduct.mapper.CarMapper; import com.hnac.hzims.safeproduct.service.ICarMaintenanceService; -import com.hnac.hzims.safeproduct.service.ICarService; import com.hnac.hzims.safeproduct.utils.BaseUtil; import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailVO; import com.hnac.hzims.safeproduct.vo.CarMaintenancePageVO; From 2f9a9435eec14e022283ecc57a0efe651ac5b5c0 Mon Sep 17 00:00:00 2001 From: liwen Date: Mon, 5 Aug 2024 17:18:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BC=9A=E8=AE=AE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E7=BB=93=E6=9E=9C=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml index f46e80d..6aa8051 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/ConferenceRecordMapper.xml @@ -27,11 +27,11 @@ AND t2.id = #{param.conferencePlanId} - - AND t1.actualStartTime >= #{param.startTime} + + AND t1.actual_start_time >= #{param.actualStartTime} - - AND t1.actualEndTime <= #{param.endTime} + + AND t1.actual_end_time <= #{param.actualEndTime} AND t2.unit like concat('%', #{param.unit}, '%') From 7e07d9b3816c1c3d3f464fc9305038f43495b3d8 Mon Sep 17 00:00:00 2001 From: haungxing <1203316822@qq.com> Date: Mon, 5 Aug 2024 18:36:04 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=E4=BD=93=E7=B3=BB=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=20fix=EF=BC=9A=E6=97=A5=E5=B8=B8=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=B7=BB=E5=8A=A0=E7=AB=99=E7=82=B9=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=20fix=EF=BC=9A?= =?UTF-8?q?=E9=9A=90=E6=82=A3=E6=8E=92=E6=9F=A5=E8=AE=A1=E5=88=92=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=9F=A5=E8=AF=A2=E8=B4=9F=E8=B4=A3=E4=BA=BA=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=B7=BB=E5=8A=A0=20fix=EF=BC=9A=E5=B7=A1=E6=A3=80?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=96=B0=E5=A2=9E=E6=8F=90=E5=87=BA=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BD=BF=E7=94=A8=E7=9A=84=E5=B7=A1=E6=A3=80=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E9=80=89=E6=8B=A9=20fix=EF=BC=9A=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BF=9D=E5=AD=98=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java | 3 --- .../operational/maintenance/entity/OperMaintenancePlanEntity.java | 1 + .../java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java | 3 --- .../com/hnac/hzims/equipment/controller/EmDefinitionController.java | 2 +- .../com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml | 6 +++++- .../maintenance/service/impl/OperMaintenanceTaskServiceImpl.java | 1 + .../hiddenDanger/service/impl/HiddenDangerPlanServiceImpl.java | 6 +++++- .../src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java | 3 +++ .../java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java | 1 + 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java index d37dcab..925df9b 100644 --- a/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java +++ b/hzims-service-api/equipment-api/src/main/java/com/hnac/hzims/equipment/entity/EmDefinitionEntity.java @@ -34,9 +34,6 @@ public class EmDefinitionEntity extends TenantEntity { @ApiModelProperty(value = "模型名称") private String modelName; - @ApiModelProperty(value = "创建用户") - private Long createUser; - @ApiModelProperty(value = "创建用户名称") @TableField(exist = false) private String createUserName; diff --git a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java index e473eba..d7a051d 100644 --- a/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java +++ b/hzims-service-api/hzims-operational-api/src/main/java/com/hnac/hzims/operational/maintenance/entity/OperMaintenancePlanEntity.java @@ -29,6 +29,7 @@ public class OperMaintenancePlanEntity extends TenantEntity { private static final long serialVersionUID = 1L; @ApiModelProperty(value = "站点编号") + @QueryField(condition = SqlCondition.EQUAL) private String stationCode; @ApiModelProperty(value = "站点名称") diff --git a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java index 757a635..f88a16e 100644 --- a/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java +++ b/hzims-service-api/safeproduct-api/src/main/java/com/hnac/hzims/safeproduct/entity/SystemFileEntity.java @@ -50,7 +50,4 @@ public class SystemFileEntity extends TenantEntity { @ApiModelProperty(value = "工作流ID") private String flowId; - @ApiModelProperty("创建人") - private Long createUser; - } diff --git a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java index 5f8ec5e..df87fad 100644 --- a/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java +++ b/hzims-service/equipment/src/main/java/com/hnac/hzims/equipment/controller/EmDefinitionController.java @@ -92,7 +92,7 @@ public class EmDefinitionController extends BladeController { @ApiOperation(value = "新增", notes = "传入EmDefinitionDTO") public R save(@Valid @RequestBody EmDefinitionDTO emDefinitionDTO) { EmDefinitionEntity definition = BeanUtil.copy(emDefinitionDTO, EmDefinitionEntity.class); - definition.setCreateUser(AuthUtil.getUserId()); + // definition.setCreateUser(AuthUtil.getUserId()); return R.data(emDefinitionService.save(definition)); } diff --git a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml index 03aeb53..6136502 100644 --- a/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml +++ b/hzims-service/inspect/src/main/java/com/hnac/hzinfo/inspect/obj/mapper/ObjectTemplateMapper.xml @@ -6,7 +6,11 @@ SELECT t.id,o.code,o.name,o.SUPPORT_AUTO_VIDEO,t.template_id,t.object_id from hz_st_re_object_template t left JOIN hz_st_re_template o on (t.template_id=o.id) + left join hz_st_re_template_project p on o.id = p.template_id + left join hz_st_re_project_content c on p.project_id = c.project_id where t.object_id=#{objectId} AND t.is_deleted=0 + and o.is_deleted = 0 and p.is_deleted = 0 and c.is_deleted = 0 + and p.id is not null and c.id is not null and o.support_auto_video = #{type} @@ -17,7 +21,7 @@ SELECT o.*, t.id as OBJ_TEMP_ID from hz_st_re_object_template t left JOIN hz_st_re_template o on (t.template_id=o.id) - where t.object_id=#{objectId} AND t.is_deleted=0 + where t.object_id=#{objectId} AND t.is_deleted=0 and o.is_deleted = 0 order by t.UPDATE_TIME desc diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java index c5e6e35..1471be6 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java @@ -165,6 +165,7 @@ public class OperMaintenanceTaskServiceImpl extends ServiceImpl checkItemList = planCheckItemService.list(Wrappers.lambdaQuery().eq(PlanCheckItemEntity::getPlanId, id)); planVO.setCheckItemVOS(PlanCheckItemWrapper.build().listVO(checkItemList)); return planVO; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java index b5b7f33..26f81e4 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/vo/SystemFileVO.java @@ -15,6 +15,9 @@ public class SystemFileVO extends SystemFileEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty("创建人ID") + private Long createUserId; + @ApiModelProperty("创建人名称") private String createUserName; diff --git a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java index 407c9b8..556af38 100644 --- a/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java +++ b/hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/wrapper/SystemFileWrapper.java @@ -24,6 +24,7 @@ public class SystemFileWrapper extends BaseEntityWrapper