diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java index be77b2288..6e1278b89 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/controller/EventRelevantAnalysisController.java @@ -83,10 +83,10 @@ public class EventRelevantAnalysisController extends BaseController { public HttpResult> queryEventsAssPage(@RequestBody BaseParam baseParam){ String methodDescribe = getMethodDescribe("queryEventsAssPage"); String searchValue = baseParam.getSearchValue(); - Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX); - if(pattern.matcher(searchValue).find()){ - throw new BusinessException(ValidMessage.SPECIAL_REGEX); - } +// Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX); +// if(pattern.matcher(searchValue).find()){ +// throw new BusinessException(ValidMessage.SPECIAL_REGEX); +// } Page page = eventRelevantAnalysisService.queryEventsAssPage(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe); } diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java index 59daf3707..9bb7eea22 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java @@ -471,6 +471,8 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl advanceEventDetailVOList = BeanUtil.copyToList(rmpEventDetailPOList, AdvanceEventDetailVO.class); advanceEventDetailVOList = advanceEventDetailVOList.stream().peek(item -> { + item.setFeatureAmplitude(item.getFeatureAmplitude()*100); + if (map.containsKey(item.getLineId())) { AreaLineInfoVO areaLineInfoVO = map.get(item.getLineId()); item.setGdName(areaLineInfoVO.getGdName()); diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceParam.java index 8ca93d6c2..9c4105866 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/DeviceParam.java @@ -93,7 +93,7 @@ public class DeviceParam { @NotBlank(message = "设备制造商不能为空") private String manufacturer; - @ApiModelProperty(name = "electroplate",value = "电镀功能",required = true) + @ApiModelProperty(name = "electroplate",value = "电度功能",required = true) @NotNull(message = "电镀标识不能为空") private Integer electroplate; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java index 499a37e5d..ac1eb0dc3 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceVO.java @@ -96,7 +96,7 @@ public class DeviceVO implements Serializable { @ApiModelProperty(name = "manufacturer",value = "设备制造商Guid") private String manufacturer; - @ApiModelProperty(name = "electroplate",value = "电镀功能") + @ApiModelProperty(name = "electroplate",value = "电度功能") private Integer electroplate; @ApiModelProperty(name = "thisTimeCheck",value = "本次定检时间") diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/PqDevice.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/PqDevice.java index 2e6cf0108..c8e8590f9 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/PqDevice.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/PqDevice.java @@ -92,7 +92,7 @@ public class PqDevice implements Serializable { */ private Date nextTimeCheck; /** - * 电镀功能 0关闭 1开启 默认关闭 + * 电度功能 0关闭 1开启 默认关闭 */ private Integer electroplate; /** diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java index c79bcd1cb..214b7ee32 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/AreaInfoServiceImpl.java @@ -148,6 +148,8 @@ public class AreaInfoServiceImpl implements AreaInfoService { eventDetailNew = BeanUtil.copyProperties(eventDetail, EventDetailNew.class); //监测点id eventDetailNew.setLineId(eventDetail.getMeasurementPointId()); + //需要转成百分比*100 + eventDetailNew.setFeatureAmplitude(eventDetail.getFeatureAmplitude()*100); //持续时间 eventDetailNew.setDuration(eventDetail.getDuration()); //特征幅值 diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index a78c9aec0..dbd3950ff 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -204,13 +204,41 @@ public class TransientServiceImpl implements TransientService { if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) { cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG; datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT; - log.info("本地磁盘波形文件路径----" + cfgPath); - InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); - InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); - if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { - throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + + //适配文件后缀小写 + cfgPath2 = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG.toLowerCase(); + datPath2 = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT.toLowerCase(); + log.info("本地磁盘波形文件路径----" + cfgPath2); + log.info("本地磁盘波形文件路径----" + datPath2); + try ( + InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); + InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); + ) + { + if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { + + throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + + } + waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1); + + + + } catch (Exception e) { + log.info("大写文件流为空"); + try { + InputStream cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath2); + InputStream datStream = waveFileComponent.getFileInputStreamByFilePath(datPath2); + if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { + throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); + } + waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1); + } catch (Exception e1) { + throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID); + } + } - waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1); + } else { cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT; @@ -495,22 +523,23 @@ public class TransientServiceImpl implements TransientService { try { if (generalInfo.getBusinessWaveFileStorage() == GeneralConstant.LOCAL_DISK) { cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG; + log.info("cfg-----"+cfgPath); + log.info("cfg-----"+datPath); + //判断文件是否存在 - boolean result1 = minIoUtils.checkFileIsExist(minIossProperties.getBucket(), cfgPath); - if (!result1) { - cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG_LOWER; - cfg = GeneralConstant.CFG_LOWER; + File file = new File(cfgPath); + if(!file.exists()){ + cfgPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.CFG_LOWER; } datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT; - boolean result2 = minIoUtils.checkFileIsExist(minIossProperties.getBucket(), datPath); - if (!result2) { - datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT_LOWER; - dat = GeneralConstant.DAT_LOWER; + File file2 = new File(datPath); + if(!file2.exists()){ + datPath = generalInfo.getBusinessWavePath() + File.separator + ip + File.separator + waveName + GeneralConstant.DAT_LOWER; } - + log.info("cfg-----"+cfgPath); + log.info("cfg-----"+datPath); cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); - datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); } else { cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; boolean result1 = minIoUtils.checkFileIsExist(minIossProperties.getBucket(), cfgPath); diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReportController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReportController.java index 3d4f5a906..c576d701d 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReportController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/QualifiedReportController.java @@ -54,11 +54,11 @@ public class QualifiedReportController extends BaseController { @ApiImplicitParam(name = "qualifiedReportParam", value = "合格率报告参数", required = true) public HttpResult> pageTable(@RequestBody @Validated QualifiedReportParam qualifiedReportParam) { TimeInterval timeInterval = new TimeInterval(); - String searchValue = qualifiedReportParam.getSearchValue(); - Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX); - if(pattern.matcher(searchValue).find()){ - throw new BusinessException(ValidMessage.SPECIAL_REGEX); - } +// String searchValue = qualifiedReportParam.getSearchValue(); +// Pattern pattern = Pattern.compile(PatternRegex.SPECIAL_REGEX); +// if(pattern.matcher(searchValue).find()){ +// throw new BusinessException(ValidMessage.SPECIAL_REGEX); +// } String methodDescribe = getMethodDescribe("pageTable"); Page result = qualifiedReportService.pageTable(qualifiedReportParam); log.info("合格率报告执行时长:"+timeInterval.interval()); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java index 9d946189b..89598f0f4 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveReportExcel.java @@ -54,7 +54,7 @@ public class SensitiveReportExcel implements Serializable { // private String orgId; - @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30) + @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30) private String expectedProductionDate; @Excel(name = "电压等级", width = 30) diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java index dfd847829..31f979df3 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java @@ -57,7 +57,7 @@ public class SensitiveUserSExcel implements Serializable { // private String orgId; - @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30) + @Excel(name = "*工程预期投产日期(yyyy-MM-dd)", width = 30) @NotBlank(message = "工程预期投产日期不能为空") private String expectedProductionDate; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java index 8d359da1e..cbb086f68 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SupervisionDevMainReportExcel.java @@ -209,14 +209,14 @@ public class SupervisionDevMainReportExcel { private String timeSyncFunction = "0"; /** - * 电镀功能 + * 电度功能 */ @Excel(name = "电度功能", width = 30, replace = {"关闭_0", "开启_1"}) private String electroplatingFunction = "0"; /** - * 召换标志 + * 召唤标志 */ @Excel(name = "召唤标志", width = 30, replace = {"周期触发_0", "变位触发_1"}) private String summonFlag = "0"; diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java index fe3fd8b83..6e4d53954 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/device/SupervisionTempDeviceReportParam.java @@ -206,9 +206,9 @@ public class SupervisionTempDeviceReportParam { private Integer timeSyncFunction; /** - * 电镀功能 + * 电度功能 */ - @ApiModelProperty(value="电镀功能") + @ApiModelProperty(value="电度功能") private Integer electroplatingFunction; /** @@ -218,9 +218,9 @@ public class SupervisionTempDeviceReportParam { private String monitoringDeviceInstallationPosition; /** - * 召换标志 + * 召唤标志 */ - @ApiModelProperty(value="召换标志") + @ApiModelProperty(value="召唤标志") private String summonFlag; /** diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java index 3aadf4098..a3528270b 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/device/SupervisionTempDeviceReport.java @@ -204,7 +204,7 @@ public class SupervisionTempDeviceReport { private Integer timeSyncFunction; /** - * 电镀功能 + * 电度功能 */ @TableField(value = "electroplating_function") private Integer electroplatingFunction; @@ -216,7 +216,7 @@ public class SupervisionTempDeviceReport { private String monitoringDeviceInstallationPosition; /** - * 召换标志 + * 召唤标志 */ @TableField(value = "summon_flag") private String summonFlag; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java index 8c28da0ac..8556a71c2 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java @@ -56,6 +56,7 @@ import com.njcn.web.factory.PageFactory; import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.BeanUtils; @@ -65,6 +66,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.time.LocalDate; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -78,6 +80,7 @@ import java.util.stream.Stream; */ @Service @RequiredArgsConstructor +@Slf4j public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl implements SupervisionDevMainReportPOService { @@ -502,6 +505,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl devMsgList = new ArrayList<>(); + log.info("beginqueryjiBeiArea-------------------"+ LocalDateTime.now()); + //所属地市 List jiBeiArea = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.JIBEI_AREA.getCode()).getData(); + log.info("beginquerydeptS-------------------"+ LocalDateTime.now()); //所属供电公司 List deptS = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); @@ -542,6 +549,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl nodes = nodeClient.nodeAllList().getData(); Map nodeMap = nodes.stream().collect(Collectors.toMap(Node::getName, Node::getId, (k1, k2) -> k1)); + log.info("beginquerydevConnect-------------------"+ LocalDateTime.now()); //接线方式 List devConnect = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_CONNECT.getCode()).getData(); @@ -552,10 +560,14 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl voltageTransformer = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.VOLTAGE_TRANSFORMER.getCode()).getData(); //中性点接线方式 List neutralPoint = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.Neutral_Point.getCode()).getData(); + log.info("beginqueryneutralPoint-------------------"+ LocalDateTime.now()); SubstationParam substationParam=new SubstationParam(); substationParam.setOrgIds(deptS.stream().map(DeptDTO::getId).distinct().collect(Collectors.toList())); + log.info("beginquerySubGetBase-------------------"+ LocalDateTime.now()); + List data = commterminalGeneralClient.tagOrIdGetSub(substationParam).getData(); + log.info("endquerySubGetBase-------------------"+ LocalDateTime.now()); SupervisionDevMainReportPO po; if (CollectionUtil.isNotEmpty(devExcels)) { diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java index 9a94e5819..a8a9ceef4 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java @@ -793,8 +793,9 @@ public class UserReportPOServiceImpl extends ServiceImpl sensitiveUserExcels; try { @@ -1018,6 +1019,7 @@ public class UserReportPOServiceImpl extends ServiceImpl evaluationType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVALUATION_TYPE.getCode()).getData(); //解决填报部门问题 - List data = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getUserIndex(), WebUtil.filterDeptType()).getData(); + List data = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData(); //执行批量导入敏感及重要用户，入库过程中会进行数据校验 List sensitiveUserExcelMsgs = new ArrayList<>(); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java index ddc76de2e..f7bcc1b76 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java @@ -98,11 +98,11 @@ public class PqFrontLogsServiceImpl extends ServiceImpl queryPage(PqFrontLogsParam baseParam) { QueryWrapper queryWrapper = new QueryWrapper<>(); - if (Objects.nonNull(baseParam.getSearchBeginTime()) && Objects.nonNull(baseParam.getSearchEndTime())) { + if (StringUtils.isNotBlank(baseParam.getSearchBeginTime()) && StringUtils.isNotBlank(baseParam.getSearchEndTime())) { queryWrapper.between("A.update_Time", baseParam.getSearchBeginTime()+" 00:00:00", baseParam.getSearchEndTime()+" 23:59:59"); } - if(Objects.nonNull(baseParam.getSearchValue())){ + if(StringUtils.isNotBlank(baseParam.getSearchValue())){ queryWrapper.like("line.name", baseParam.getSearchValue()); } queryWrapper.eq(StringUtils.isNotBlank(baseParam.getCode()),"A.code",baseParam.getCode());