From b6eaff3b1ebdfdb867ff51b76b395d376e2beea2 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 30 Jan 2026 14:58:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9A=E7=89=88bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voltage/impl/SgMachineServiceImpl.java | 26 ++++++++++++++++++ .../impl/SgSensitiveUnitServiceImpl.java | 27 +++++++++++++++++++ .../com/njcn/bpm/pojo/param/BpmSignParam.java | 2 +- .../service/impl/BpmCategoryServiceImpl.java | 4 +-- .../bpm/service/impl/BpmSignServiceImpl.java | 4 +-- .../com/njcn/echarts/json/PieGenerator.java | 2 ++ .../majornetwork/Impl/ReportServiceImpl.java | 6 ++--- 7 files changed, 63 insertions(+), 8 deletions(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgMachineServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgMachineServiceImpl.java index 7bad94484..40e6dd4cf 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgMachineServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/govern/voltage/impl/SgMachineServiceImpl.java @@ -9,8 +9,10 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.advance.enums.AdvanceResponseEnum; import com.njcn.advance.mapper.govern.voltage.SgMachineMapper; import com.njcn.advance.pojo.param.govern.voltage.SgMachineParam; +import com.njcn.advance.pojo.param.govern.voltage.SgUserParam; import com.njcn.advance.pojo.po.govern.voltage.SgMachine; import com.njcn.advance.pojo.po.govern.voltage.SgSensitiveUnit; +import com.njcn.advance.pojo.po.govern.voltage.SgUser; import com.njcn.advance.pojo.vo.govern.voltage.SgMachineVO; import com.njcn.advance.service.govern.voltage.ISgMachineService; import com.njcn.advance.service.govern.voltage.ISgSensitiveUnitService; @@ -56,12 +58,34 @@ public class SgMachineServiceImpl extends ServiceImpl sgUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sgUserLambdaQueryWrapper + .eq(SgMachine::getName, sgMachineParam.getName()) + .eq(SgMachine::getState, DataStateEnum.ENABLE.getCode()); + //更新的时候，需排除当前记录 + if (isExcludeSelf) { + if (sgMachineParam instanceof SgMachineParam.SgMachineUpdateParam) { + sgUserLambdaQueryWrapper.ne(SgMachine::getId, ((SgMachineParam.SgMachineUpdateParam) sgMachineParam).getId()); + } + } + int countByAccount = this.count(sgUserLambdaQueryWrapper); + //大于等于1个则表示重复 + if (countByAccount >= 1) { + throw new BusinessException(AdvanceResponseEnum.SG_USER_NAME_REPEAT); + } + } /** * 更新设备 @@ -70,6 +94,8 @@ public class SgMachineServiceImpl extends ServiceImpl sgUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sgUserLambdaQueryWrapper + .eq(SgSensitiveUnit::getName, sgSensitiveUnitParam.getName()) + .eq(SgSensitiveUnit::getState, DataStateEnum.ENABLE.getCode()); + //更新的时候，需排除当前记录 + if (isExcludeSelf) { + if (sgSensitiveUnitParam instanceof SgSensitiveUnitParam.SgSensitiveUnitUpdateParam) { + sgUserLambdaQueryWrapper.ne(SgSensitiveUnit::getId, ((SgSensitiveUnitParam.SgSensitiveUnitUpdateParam) sgSensitiveUnitParam).getId()); + } + } + int countByAccount = this.count(sgUserLambdaQueryWrapper); + //大于等于1个则表示重复 + if (countByAccount >= 1) { + throw new BusinessException(AdvanceResponseEnum.SG_USER_NAME_REPEAT); + } + } /** * 更新元器件 @@ -69,6 +94,8 @@ public class SgSensitiveUnitServiceImpl extends ServiceImpl getCategoryPage(BpmCategoryParam.BpmCategoryQueryParam bpmCategoryQueryParam) { QueryWrapper categoryVOQueryWrapper = new QueryWrapper<>(); - if (StrUtil.isNotBlank(bpmCategoryQueryParam.getName())) { - categoryVOQueryWrapper.like("bpm_category.name", bpmCategoryQueryParam.getName()); + if (StrUtil.isNotBlank(bpmCategoryQueryParam.getSearchValue())) { + categoryVOQueryWrapper.like("bpm_category.name", bpmCategoryQueryParam.getSearchValue()); } if (StrUtil.isNotBlank(bpmCategoryQueryParam.getCode())) { diff --git a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java index b5213e051..20e7b3f24 100644 --- a/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java +++ b/pqs-bpm/bpm-boot/src/main/java/com/njcn/bpm/service/impl/BpmSignServiceImpl.java @@ -106,8 +106,8 @@ public class BpmSignServiceImpl extends ServiceImpl impl bpmSignVOQueryWrapper.like("bpm_sign.name", bpmSignQueryParam.getName()); } - if (StrUtil.isNotBlank(bpmSignQueryParam.getKey())) { - bpmSignVOQueryWrapper.like("bpm_sign.signKey", bpmSignQueryParam.getKey()); + if (StrUtil.isNotBlank(bpmSignQueryParam.getSignKey())) { + bpmSignVOQueryWrapper.like("bpm_sign.sign_key", bpmSignQueryParam.getSignKey()); } bpmSignVOQueryWrapper.eq("bpm_sign.state", DataStateEnum.ENABLE.getCode()); bpmSignVOQueryWrapper.orderByAsc("bpm_sign.sort"); diff --git a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/PieGenerator.java b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/PieGenerator.java index f75579115..98392b9ee 100644 --- a/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/PieGenerator.java +++ b/pqs-common/common-echarts/src/main/java/com/njcn/echarts/json/PieGenerator.java @@ -33,6 +33,8 @@ public class PieGenerator { Option reasonOption = new Option(); //取消渲染动画 reasonOption.setAnimation(false); + String[] colorArr = {"#526ADE", "#00BFF5","#FFBF00","#77DA63","#D5FF6B"}; + reasonOption.setColor(colorArr); //背景色 reasonOption.setBackgroundColor(PicCommonData.PIC_BACK_COLOR); //标题 diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index a7bb89340..07105a673 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -747,8 +747,8 @@ public class ReportServiceImpl implements ReportService { bodyFont.setFontHeightInPoints((short) 9); bodyStyle.setFont(bodyFont); - sheet2(sheets, cellStyle, bodyStyle, businessParam); sheet3(sheets, cellStyle, bodyStyle, businessParam); + sheet2(sheets, cellStyle, bodyStyle, businessParam); sheet4(sheets, cellStyle, bodyStyle, businessParam); sheet5(sheets, cellStyle, bodyStyle, businessParam); sheet6(sheets, cellStyle, bodyStyle, businessParam); @@ -909,7 +909,7 @@ public class ReportServiceImpl implements ReportService { public void sheet2(HSSFWorkbook sheets, HSSFCellStyle cellStyle, HSSFCellStyle bodyStyle, DeviceInfoParam.BusinessParam businessParam) { sheets.createSheet("暂态严重度统计"); - HSSFSheet sheetAt = sheets.getSheetAt(1); + HSSFSheet sheetAt = sheets.getSheetAt(2); sheetAt.setColumnWidth(0, 24 * 256); sheetAt.setColumnWidth(1, 24 * 256); sheetAt.setColumnWidth(2, 24 * 256); @@ -1001,7 +1001,7 @@ public class ReportServiceImpl implements ReportService { public void sheet3(HSSFWorkbook sheets, HSSFCellStyle cellStyle, HSSFCellStyle bodyStyle, DeviceInfoParam.BusinessParam businessParam) throws TemplateException, IOException { sheets.createSheet("暂态原因统计"); - HSSFSheet sheetAt = sheets.getSheetAt(2); + HSSFSheet sheetAt = sheets.getSheetAt(1); sheetAt.setColumnWidth(0, 40 * 256); sheetAt.setColumnWidth(1, 40 * 256); sheetAt.setColumnWidth(2, 40 * 256);