diff --git a/pom.xml b/pom.xml index 24158c752..b7bb7f2b1 100644 --- a/pom.xml +++ b/pom.xml @@ -54,8 +54,8 @@ nacos - - fd74182b-1fce-4dba-afa7-2623b0376205 + 30c701c4-2a94-49d9-82e1-76aa9456573f + ${middle.server.url}:8080 diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java index 66f3b2013..f28c8c42b 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/BizParamConstant.java @@ -17,4 +17,9 @@ public interface BizParamConstant { String STAT_BIZ_WEEK = "4"; String STAT_BIZ_DAY = "5"; + + /** + * 顶级父ID + */ + String PARENT_ID = "0"; } diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java index 1434e57b5..8cf9a80bb 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/PatternRegex.java @@ -83,6 +83,11 @@ public interface PatternRegex { */ String DIC_REGEX = "^[\\w\\u4E00-\\u9FA5()（）_/、/, /，\\- ]+\\.?[\\w\\u4E00-\\u9FA5()（）I II III IV V /]{0,125}$"; + /** + * 中文正则 + */ + String CHINESE_REGEX = "^[\\u4e00-\\u9fa5]+$"; + /** * 密码有效期（月）1-3月 */ diff --git a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java index 75f4ff059..cc0c0783b 100644 --- a/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java +++ b/pqs-common/common-core/src/main/java/com/njcn/common/pojo/constant/ServerInfo.java @@ -21,9 +21,7 @@ public interface ServerInfo { String REPORT = "report-boot"; String SYSTEM = "system-boot"; String ENERGY = "energy-boot"; - String JOB_ADMIN = "job-admin"; String USER = "user-boot"; - String JOB = "job-admin"; String QUALITY = "quality-boot"; String PROCESS = "process-boot"; String PREPARE_BOOT = "prepare-boot"; diff --git a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java index c2324d19d..24b1a2183 100644 --- a/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java +++ b/pqs-common/common-oss/src/main/java/com/njcn/oss/utils/FileStorageUtil.java @@ -134,10 +134,6 @@ public class FileStorageUtil { /** * 上传InputStream流,并指定文件的名称 * @author xuyang - * @param inputStream - * @param dir - * @param fileName - * @return */ public String uploadStreamSpecifyName(InputStream inputStream, String dir, String fileName) { String filePath; @@ -243,26 +239,6 @@ public class FileStorageUtil { } - /** - * 获取下载文件流 - * - * @param filePath - * @return - * @throws IOException - */ - public InputStream downloadStream(String filePath) { - InputStream inputStream; - try { - if (generalInfo.getBusinessFileStorage() == GeneralConstant.HUAWEI_OBS) { - inputStream = obsUtil.downloadStream(filePath); - } else { - inputStream = minIoUtils.downloadStream(minIossProperties.getBucket(), filePath); - } - } catch (Exception exception) { - throw new BusinessException(OssResponseEnum.DOWNLOAD_FILE_STREAM_ERROR); - } - return inputStream; - } /*** * 根据文件路径删除指定文件对象 diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java deleted file mode 100644 index eba1b12f2..000000000 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DataScaleVO.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.device.pq.pojo.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @version 1.0.0 - * @author: zbj - * @date: 2023/04/10 - */ -@Data -public class DataScaleVO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 月份 - */ - @ApiModelProperty("月份") - private String timeId; - - /** - * 数据 - */ - @ApiModelProperty("数据") - private Float dataStatis; - -} 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 6b62d7a79..77ad329cd 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 @@ -428,8 +428,8 @@ public class TransientServiceImpl implements TransientService { datPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.DAT; System.out.println("波形路径-------------------" + cfgPath); - cfgStream = fileStorageUtil.downloadStream(cfgPath); - datStream = fileStorageUtil.downloadStream(datPath); + cfgStream = fileStorageUtil.getFileStream(cfgPath); + datStream = fileStorageUtil.getFileStream(datPath); if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) { throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java index e71660eb7..8b9ca1f30 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/AreaCountServiceImpl.java @@ -17,7 +17,6 @@ import java.util.*; import java.util.stream.Collectors; import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY; -import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN; /** * Description: diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PmsMonitorPOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PmsMonitorPOServiceImpl.java index 121c9ad02..66791186b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PmsMonitorPOServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PmsMonitorPOServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.exception.BusinessException; @@ -24,7 +25,6 @@ import java.util.List; import java.util.stream.Collectors; import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY; -import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN; /** * @@ -54,17 +54,13 @@ public class PmsMonitorPOServiceImpl extends ServiceImpl qurymeasurementRunPoints(String orgid) { - LambdaQueryWrapper monitorPOLambdaQueryWrapper = new LambdaQueryWrapper ( ); /*获取当前部门及子部门*/ List deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(orgid).getData(); - monitorPOLambdaQueryWrapper.in (Monitor::getOrgId, deptIds); -// List data = dicDataFeignClient.getDicDataByTypeCode (DicDataTypeEnum.LINE_STATE.getCode ( )).getData ( ); -// List collect = data.stream ( ).filter (temp -> Objects.equals (temp.getCode ( ), DicDataEnum.RUN.getCode ())).collect (Collectors.toList ( )); String state = redisUtil.getStringByKey (NAME_KEY+ - SPLIT_SIGN+ DicDataTypeEnum.LINE_STATE.getCode ( )+ - SPLIT_SIGN+ DicDataEnum.RUN.getCode ( )); + StrUtil.DASHED + DicDataTypeEnum.LINE_STATE.getCode ( )+ + StrUtil.DASHED+ DicDataEnum.RUN.getCode ( )); if(StringUtils.isEmpty (state)){ throw new BusinessException (PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PrimaryGridDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PrimaryGridDataServiceImpl.java index 14be1aab7..af61a79b4 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PrimaryGridDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/PrimaryGridDataServiceImpl.java @@ -2,6 +2,7 @@ package com.njcn.prepare.harmonic.service.mysql.Impl.area; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.biz.commApi.CommTerminalGeneralClient; @@ -39,7 +40,6 @@ import java.util.Objects; import java.util.stream.Collectors; import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY; -import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN; /** * Description: @@ -122,8 +122,8 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService { /*获取终端下的监测点集合*/ QueryWrapper queryWrapper = new QueryWrapper<>(); String state = redisUtil.getStringByKey(NAME_KEY + - SPLIT_SIGN + DicDataTypeEnum.LINE_STATE.getCode() + - SPLIT_SIGN + DicDataEnum.RUN.getCode()); + StrUtil.DASHED + DicDataTypeEnum.LINE_STATE.getCode() + + StrUtil.DASHED + DicDataEnum.RUN.getCode()); if (StringUtils.isEmpty(state)) { throw new BusinessException(PqsPrepareExceptionEnum.REDIS_NULL_EXCEPTION); } @@ -375,8 +375,8 @@ public class PrimaryGridDataServiceImpl implements PrimaryGridDataService { /*在运监测终端个数 online_measurement_count*/ String state = redisUtil.getStringByKey(NAME_KEY + - SPLIT_SIGN + DicDataTypeEnum.DEV_STATUS.getCode() + - SPLIT_SIGN + DicDataEnum.RUNNING.getCode()); + StrUtil.DASHED + DicDataTypeEnum.DEV_STATUS.getCode() + + StrUtil.DASHED + DicDataEnum.RUNNING.getCode()); Integer online_measurement_count = Integer.valueOf(pmsTerminalPOS.stream().filter(temp -> Objects.equals(temp.getTerminalState(), state)).count() + ""); /*主网单位数据完整率 data_integrity_rate*/ diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java index c0702dd25..85456add4 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvProblemServiceImpl.java @@ -109,7 +109,7 @@ public class SupvProblemServiceImpl extends ServiceImpl fileLambdaQueryWrapper = new LambdaQueryWrapper<>(); fileLambdaQueryWrapper.in(SupvFile::getBusiId, problemIds); List supvFileList = supvFileMapper.selectList(fileLambdaQueryWrapper); - supvFileList.forEach(item-> fileStorageUtil.downloadStream(item.getFileUrl())); + supvFileList.forEach(item-> fileStorageUtil.getFileStream(item.getFileUrl())); supvFileMapper.delete(fileLambdaQueryWrapper); } return true; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java index a59913a88..e3f63e0fe 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsSuperviseServiceImpl.java @@ -863,7 +863,7 @@ public class ThsSuperviseServiceImpl extends ServiceImpl> monitorInfoListByCond = monitorClient.getMonitorInfoListByCond(pmsMonitorParam); - InputStream inputStream = fileStorageUtil.downloadStream(entry.getValue()); + InputStream inputStream = fileStorageUtil.getFileStream(entry.getValue()); // 对于每一个要被存放到压缩包的文件，都必须调用ZipOutputStream对象的putNextEntry()方法，确保压缩包里面文件不同名 zos.putNextEntry(new ZipEntry(monitorInfoListByCond.getData().get(0).getName() + ticketTypeEnum.getMessage() + entry.getValue().substring(entry.getValue().lastIndexOf(".")))); int bytesRead = 0; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/AreaEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/AreaEnum.java deleted file mode 100644 index 92017ab71..000000000 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/AreaEnum.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.system.enums; - -import lombok.Getter; - -/** - * @author denghuajun - * @date 2022/1/10 - * A00500~A00520 行政区域枚举 - */ -@Getter -public enum AreaEnum { - -} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/AuditLogEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/AuditLogEnum.java deleted file mode 100644 index 4b6e2813d..000000000 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/AuditLogEnum.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.njcn.system.enums; - -import lombok.Data; -import lombok.Getter; - -/** - * @version 1.0.0 - * @author: chenchao - * @date: 2022/07/15 16:21 - */ -@Getter -public enum AuditLogEnum { - - /** - * 审计日志模块异常响应码 - */ - NOT_FIND_FILE("A0300", "文件未备份或者备份文件为空，请先备份文件"), - LOG_EXCEPTION("A0301", "导入旧日志文件异常"), - LOG_EXCEPTIONTIME("A0302", "导入旧日志文件异常:缺少时间范围"), - DELETE_DATA("A0303", "导入旧日志文件异常:删除数据失败"), - MULTIPLE_CLICKS_LOGFILEWRITER("A0304", "当前文件备份数据未结束，请勿多次点击"), - MULTIPLE_CLICKS_RECOVERLOGFILE("A0303", "当前文件恢复数据未结束，请勿多次点击") - ; - - - private final String code; - - private final String message; - - AuditLogEnum(String code, String message) { - this.code = code; - this.message = message; - } - -} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java index 4e2fd748f..0c3edc327 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/enums/SystemResponseEnum.java @@ -51,7 +51,17 @@ public enum SystemResponseEnum { * 定时任务执行类不存在 */ TIMER_NOT_EXISTED("A00361", "定时任务执行类不存在"), - EXE_EMPTY_PARAM("A00361", "请检查定时器的id，定时器cron表达式，定时任务是否为空！") + EXE_EMPTY_PARAM("A00361", "请检查定时器的id，定时器cron表达式，定时任务是否为空！"), + + /** + * 审计日志模块异常响应 + */ + NOT_FIND_FILE("A0300", "文件未备份或者备份文件为空，请先备份文件"), + LOG_EXCEPTION("A0301", "导入旧日志文件异常"), + LOG_EXCEPTION_TIME("A0302", "导入旧日志文件异常:缺少时间范围"), + DELETE_DATA("A0303", "导入旧日志文件异常:删除数据失败"), + MULTIPLE_CLICKS_LOG_FILE_WRITER("A0304", "当前文件备份数据未结束，请勿多次点击"), + MULTIPLE_CLICKS_RECOVER_LOG_FILE("A0303", "当前文件恢复数据未结束，请勿多次点击") ; private final String code; diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java b/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java deleted file mode 100644 index 940d0abe8..000000000 --- a/pqs-system/system-api/src/main/java/com/njcn/system/enums/TemplateTreeEnum.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.njcn.system.enums; - -import lombok.Getter; - -/** - * @author hany - * @date 2022/09/21 - */ - -public interface TemplateTreeEnum { - - /** - * 权限资源状态 0-删除；1-正常；默认正常 - */ - int DELETE = 0; - - int ENABLE = 1; - - /** - * 顶层父类的pid - */ - String FATHER_PID = "0"; -} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java index 26962c12b..ba4e97974 100644 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java +++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/constant/DicDataConstant.java @@ -15,6 +15,5 @@ public interface DicDataConstant { String NAME_KEY = "DicCache:"; - String SPLIT_SIGN = "-"; } diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/MxGraphParam.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/MxGraphParam.java deleted file mode 100644 index 539bb9d98..000000000 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/param/MxGraphParam.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.njcn.system.pojo.param; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; - -/** - * pqs - * - * @author cdf - * @date 2022/1/26 - */ -@Data -@ApiModel -public class MxGraphParam { - - @ApiModelProperty(name = "title",value = "组态标题",required = true) - @NotBlank(message = "组态标题不可为空") - private String title; - - @ApiModelProperty(name = "mxContent",value = "组态内容",required = true) - @NotBlank(message = "内容不可为空") - private String mxContent; - - @ApiModelProperty(name = "bgImage",value = "组态背景图") - private String bgImage; - - @ApiModelProperty(name = "sort",value = "排序",required = true) - @NotNull(message = "排序不可为空") - private Integer sort; -} diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/MxGraph.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/MxGraph.java deleted file mode 100644 index 8f2c563e7..000000000 --- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/MxGraph.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.njcn.system.pojo.po; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * pqs - * 组态表 - * @author cdf - * @date 2022/1/26 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("sys_mxgraph") -public class MxGraph extends BaseEntity { - private String id; - - private String title; - - private String mxContent; - - private String bgImage; - - private Integer sort; - - private Integer state; -} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/component/DictCacheRedis.java b/pqs-system/system-boot/src/main/java/com/njcn/system/component/DictCacheRedis.java index 4c9ff75b9..e3ce3ee6e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/component/DictCacheRedis.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/component/DictCacheRedis.java @@ -1,7 +1,8 @@ package com.njcn.system.component; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.StrUtil; import com.njcn.redis.utils.RedisUtil; -import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.system.service.IDictDataService; @@ -16,7 +17,6 @@ import java.util.List; import java.util.Set; import static com.njcn.system.pojo.constant.DicDataConstant.NAME_KEY; -import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN; /** * pqs @@ -29,49 +29,43 @@ import static com.njcn.system.pojo.constant.DicDataConstant.SPLIT_SIGN; public class DictCacheRedis { - private @Autowired IDictDataService dictDataService; private @Autowired RedisUtil redisUtil; + private @Autowired RedisTemplate redisTemplate; @PostConstruct - public void init(){ + public void init() { log.info("系统启动中。。。加载dictDataMap"); - /*todo 后续将字典表全部加载*/ - List data = dictDataService.getDicDataByTypeCode (DicDataTypeEnum.LINE_STATE.getCode ( )); - List data2 = dictDataService.getDicDataByTypeCode (DicDataTypeEnum.DEV_STATUS.getCode ( )); - List data3 = dictDataService.getDicDataByTypeCode (DicDataTypeEnum.LINE_SORT.getCode ( )); - - /* - * key:NAME_KEY前缀（清缓存使用）+SPLIT_SIGN（拼接符号）+DicDataTypeEnum+SPLIT_SIGN（拼接符号）+Code - * Value:id - * */ - data.forEach (temp->{ - redisUtil.saveByKey (NAME_KEY+ SPLIT_SIGN+DicDataTypeEnum.LINE_STATE.getCode ( )+SPLIT_SIGN+temp.getCode (),temp.getId ()); - }); - - data2.forEach (temp->{ - redisUtil.saveByKey (NAME_KEY+SPLIT_SIGN+DicDataTypeEnum.DEV_STATUS.getCode ( )+SPLIT_SIGN+temp.getCode (),temp.getId ()); - }); - - data3.forEach (temp->{ - redisUtil.saveByKey (NAME_KEY+SPLIT_SIGN+DicDataTypeEnum.LINE_SORT.getCode ( )+SPLIT_SIGN+temp.getCode (),temp.getId ()); - }); + List dicDataTypeEnums = CollectionUtil.newArrayList( + DicDataTypeEnum.LINE_STATE, + DicDataTypeEnum.DEV_STATUS, + DicDataTypeEnum.LINE_SORT); + for (DicDataTypeEnum dicDataTypeEnum : dicDataTypeEnums) { + List data = dictDataService.getDicDataByTypeCode(dicDataTypeEnum.getCode()); + /* + * key:NAME_KEY前缀（清缓存使用）+SPLIT_SIGN（拼接符号）+DicDataTypeEnum+SPLIT_SIGN（拼接符号）+Code + * Value:id + * */ + data.forEach(temp -> { + redisUtil.saveByKey(NAME_KEY + StrUtil.DASHED + dicDataTypeEnum.getCode() + StrUtil.DASHED + temp.getCode(), temp.getId()); + }); + } } @PreDestroy - public void destroy(){ + public void destroy() { log.info("系统运行结束"); Set keys = redisTemplate.keys(NAME_KEY + "*"); - - redisTemplate.delete(keys); - + if (keys != null) { + redisTemplate.delete(keys); + } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java index 06510c6c4..bfccdc43d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AreaController.java @@ -9,7 +9,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.oss.utils.FileStorageUtil; import com.njcn.system.pojo.dto.AreaTreeDTO; import com.njcn.system.pojo.param.AreaParam; import com.njcn.system.pojo.po.Area; @@ -41,8 +40,6 @@ public class AreaController extends BaseController { private final IAreaService areaService; - private final FileStorageUtil fileStorageUtil; - /** * 分页查询行政区域 */ @@ -169,7 +166,7 @@ public class AreaController extends BaseController { String methodDescribe = getMethodDescribe("selectPid"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, ids); List result = areaService.selectPid(ids); - if (result.size() > 0) { + if (!result.isEmpty()) { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.DELETE_PID_EXIST, null, methodDescribe); } else { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.DELETE_PID_UNEXIST, null, methodDescribe); @@ -202,7 +199,7 @@ public class AreaController extends BaseController { @PostMapping("/areaDeptTree") @ApiOperation("获取新增部门区域树") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "区域id", required = false), + @ApiImplicitParam(name = "id", value = "区域id"), @ApiImplicitParam(name = "type", value = "区域类型", required = true) }) public HttpResult> areaDeptTree(@RequestParam(required = false) @ApiParam("id") String id, @RequestParam("type") Integer type) { @@ -220,7 +217,7 @@ public class AreaController extends BaseController { @PostMapping("/areaPro") @ApiOperation("根据区域id获取省份") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "区域id", required = false), + @ApiImplicitParam(name = "id", value = "区域id"), @ApiImplicitParam(name = "type", value = "区域类型", required = true) }) public HttpResult areaPro(@RequestParam(required = false) @ApiParam("id") String id, @RequestParam("type") Integer type) { @@ -264,7 +261,7 @@ public class AreaController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/areaDeptPro") @ApiOperation("根据区域id获取省份") - @ApiImplicitParam(name = "id", value = "部门id", required = false) + @ApiImplicitParam(name = "id", value = "部门id") public HttpResult areaDeptPro(@RequestParam(required = false) @ApiParam("id") String id) { String methodDescribe = getMethodDescribe("areaDeptTree"); Area result = areaService.areaDeptPro(id); @@ -272,9 +269,9 @@ public class AreaController extends BaseController { } /** - * @description: 获取省市区下拉框 - * @author: clam - * @Date: 2023/4/11 + * @description 获取省市区下拉框 + * @author clam + * @date 2023/4/11 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/areaSelect") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java index 2c62d3cd9..6939e683e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/AuditController.java @@ -31,7 +31,7 @@ import java.util.List; /** * @version 1.0.0 * @author: chenchao - * @date: 2022/07/11 19:00 + * @date 2022/07/11 19:00 */ @Validated @Slf4j @@ -57,7 +57,7 @@ public class AuditController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/logFileWriter") @ApiOperation("日志文件备份") - public HttpResult logFileWriter(){ + public HttpResult logFileWriter(){ String methodDescribe = getMethodDescribe("logFileWriter"); auditService.logFileWriter(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe); @@ -66,7 +66,7 @@ public class AuditController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/recoverLogFile") @ApiOperation("日志文件恢复") - public HttpResult recoverLogFile() { + public HttpResult recoverLogFile() { String methodDescribe = getMethodDescribe("recoverLogFile"); auditService.recoverLogFile(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS,null,methodDescribe); @@ -85,7 +85,7 @@ public class AuditController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/clearHistoryLog") @ApiOperation("清空历史日志") - public HttpResult clearHistoryLog() { + public HttpResult clearHistoryLog() { String methodDescribe = getMethodDescribe("clearHistoryLog"); auditService.clearHistoryLog(); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); @@ -93,7 +93,6 @@ public class AuditController extends BaseController { /** * 这个接口有毒，千万被调用 - * @return */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/saveLogParam") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java index 2e35014ce..6ac0aebda 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ConfigController.java @@ -143,7 +143,7 @@ public class ConfigController extends BaseController { @PostMapping("/addSysConfig") @ApiOperation("新增系统配置") @ApiImplicitParam(name = "configParam", value = "新增配置实体", required = true) - public HttpResult addSysConfig(@RequestBody @Validated ConfigParam configParam) { + public HttpResult addSysConfig(@RequestBody @Validated ConfigParam configParam) { String methodDescribe = getMethodDescribe("addSysConfig"); LogUtil.njcnDebug(log, "{}", methodDescribe, configParam); boolean res = iConfigService.addSysConfig(configParam); @@ -159,7 +159,7 @@ public class ConfigController extends BaseController { @PostMapping("/updateSysConfig") @ApiOperation("修改系统配置") @ApiImplicitParam(name = "configUpdateParam", value = "更新配置实体", required = true) - public HttpResult updateSysConfig(@RequestBody @Validated ConfigParam.ConfigUpdateParam configUpdateParam) { + public HttpResult updateSysConfig(@RequestBody @Validated ConfigParam.ConfigUpdateParam configUpdateParam) { String methodDescribe = getMethodDescribe("updateSysConfig"); LogUtil.njcnDebug(log, "{}", methodDescribe, configUpdateParam); boolean res = iConfigService.updateSysConfig(configUpdateParam); @@ -175,7 +175,7 @@ public class ConfigController extends BaseController { @OperateInfo(info = LogEnum.SYSTEM_COMMON) @GetMapping("/系统扩容操作") @ApiOperation("系统扩容操作") - public HttpResult addMemory(@RequestParam("size")Integer sizeInMB) { + public HttpResult addMemory(@RequestParam("size")Integer sizeInMB) { String methodDescribe = getMethodDescribe("addMemory"); try { @@ -188,7 +188,8 @@ public class ConfigController extends BaseController { // 为了确保JVM不会优化掉这个内存分配（因为它可能认为这个变量未使用）， // 我们可以对数组进行简单的操作，比如填充数据 for (int i = 0; i < memory.length; i++) { - memory[i] = (byte) (i % 256); // 简单的数据填充 + // 简单的数据填充 + memory[i] = (byte) (i % 256); } // 实际上，你可能不需要对数组进行填充，因为仅仅是分配就足以占用内存。 diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/CsStatisticalSetController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/CsStatisticalSetController.java index b078e2773..4c3ecddae 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/CsStatisticalSetController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/CsStatisticalSetController.java @@ -1,7 +1,6 @@ package com.njcn.system.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; @@ -16,17 +15,13 @@ import com.njcn.system.service.CsStatisticalSetPOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; -import java.util.Map; /** *

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java index fec7e8d69..4c471f55d 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DeptMapController.java @@ -86,7 +86,7 @@ public class DeptMapController extends BaseController { @PostMapping("/addDeptMapConfig") @ApiOperation("新增地图与部门关联配置") @ApiImplicitParam(name = "deptConfigParam", value = "新增配置实体", required = true) - public HttpResult addDeptMapConfig(@RequestBody @Validated DeptConfigParam deptConfigParam) { + public HttpResult addDeptMapConfig(@RequestBody @Validated DeptConfigParam deptConfigParam) { String methodDescribe = getMethodDescribe("addDeptMapConfig"); LogUtil.njcnDebug(log, "{}", methodDescribe, deptConfigParam); boolean res = deptMapService.addDeptMapConfig(deptConfigParam); @@ -101,7 +101,7 @@ public class DeptMapController extends BaseController { @PostMapping("/updateDeptMapConfigById") @ApiOperation("修改地图与部门关联配置") @ApiImplicitParam(name = "deptConfigUpdateParam", value = "修改配置实体", required = true) - public HttpResult updateDeptMapConfigById(@RequestBody @Validated DeptConfigParam.DeptConfigUpdateParam deptConfigUpdateParam) { + public HttpResult updateDeptMapConfigById(@RequestBody @Validated DeptConfigParam.DeptConfigUpdateParam deptConfigUpdateParam) { String methodDescribe = getMethodDescribe("updateDeptMapConfigById"); LogUtil.njcnDebug(log, "{}", methodDescribe, deptConfigUpdateParam); boolean res = deptMapService.updateDeptMapConfigById(deptConfigUpdateParam); @@ -116,7 +116,7 @@ public class DeptMapController extends BaseController { @GetMapping("/removeDeptMapConfigById") @ApiOperation("根据id删除地图与部门关联配置") @ApiImplicitParam(name = "id", value = "参数id", required = true) - public HttpResult removeDeptMapConfigById(@RequestParam("id") String id) { + public HttpResult removeDeptMapConfigById(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("removeDeptMapConfigById"); LogUtil.njcnDebug(log, "{}", methodDescribe, id); boolean res = deptMapService.removeDeptMapConfigById(id); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java index 095b3fe6a..6d941c3a8 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictDataController.java @@ -12,7 +12,6 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; import com.njcn.system.pojo.param.DictDataParam; import com.njcn.system.pojo.po.DictData; -import com.njcn.system.pojo.po.DictType; import com.njcn.system.pojo.vo.DictDataVO; import com.njcn.system.service.IDictDataService; import io.swagger.annotations.Api; @@ -27,7 +26,6 @@ import org.springframework.web.bind.annotation.*; import com.njcn.web.controller.BaseController; import springfox.documentation.annotations.ApiIgnore; -import java.util.Arrays; import java.util.List; /** diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java index 591ce87b4..50222e054 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTreeController.java @@ -1,8 +1,6 @@ package com.njcn.system.controller; -import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; @@ -10,24 +8,18 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.system.pojo.param.DictDataParam; import com.njcn.system.pojo.param.DictTreeParam; -import com.njcn.system.pojo.po.DictData; import com.njcn.system.pojo.po.SysDicTreePO; -import com.njcn.system.pojo.vo.DictDataVO; import com.njcn.system.pojo.vo.DictTreeVO; -import com.njcn.system.service.IDictDataService; import com.njcn.system.service.SysDicTreePOService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import springfox.documentation.annotations.ApiIgnore; import java.util.List; @@ -49,21 +41,6 @@ public class DictTreeController extends BaseController { private final SysDicTreePOService sysDicTreePOService; - /** - * 分页查询字典类型数据 - */ -// @OperateInfo(info = LogEnum.SYSTEM_COMMON) -// @PostMapping("/list") -// @ApiOperation("查询字典数据") -// @ApiImplicitParam(name = "queryParam", value = "查询参数", required = true) -// public HttpResult> list(@RequestBody @Validated DictDataParam.DictDataQueryParam queryParam) { -// String methodDescribe = getMethodDescribe("list"); -// LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, queryParam); -// Page result = dictDataService.listDictData(queryParam); -// return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); -// } - - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @PostMapping("/add") @ApiOperation("新增字典树数据") @@ -83,8 +60,7 @@ public class DictTreeController extends BaseController { /** * 修改 - * @param dicParam - * @return + * @param dicParam 修改参数 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) @PutMapping("/update") @@ -103,8 +79,7 @@ public class DictTreeController extends BaseController { /** * 删除 - * @param id - * @return + * @param id id */ @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.DELETE) @DeleteMapping("/delete") @@ -121,7 +96,7 @@ public class DictTreeController extends BaseController { } } - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/query") @ApiOperation("根据pid查询字典树") public HttpResult> query(@RequestParam("pid") String pid) { @@ -142,7 +117,7 @@ public class DictTreeController extends BaseController { } - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/queryByCode") @ApiOperation("根据Code查询字典树") public HttpResult queryByCode(@RequestParam("code") String code) { @@ -152,18 +127,18 @@ public class DictTreeController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/queryByid") @ApiOperation("根据id查询字典树最底层") - public HttpResult> queryByid(@RequestParam("id") String id) { - String methodDescribe = getMethodDescribe("queryByid"); + public HttpResult> queryLastLevelById(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("queryLastLevelById"); LogUtil.njcnDebug(log, "{}，字典数据为：{}", methodDescribe, id); - List result = sysDicTreePOService.queryByid(id); + List result = sysDicTreePOService.queryLastLevelById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } - @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY) + @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/queryById") @ApiOperation("根据id查询数据") public HttpResult queryById(@RequestParam("id") String id) { diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTypeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTypeController.java index 223f9dfd5..24e33f0a7 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTypeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/DictTypeController.java @@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; -import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.dto.SimpleTreeDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java index 17caa75c3..83ad738b5 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEpdPqdController.java @@ -141,7 +141,6 @@ public class EleEpdPqdController extends BaseController { EleEpdPqd eleEpdPqd = eleEpdPqdService.selectById(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eleEpdPqd, methodDescribe); } - /*查询指标库，按datatype分类*/ @PostMapping("/selectAll") @OperateInfo(info = LogEnum.BUSINESS_COMMON) @ApiOperation("查询指标库，按datatype分类") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParamController.java similarity index 96% rename from pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java rename to pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParamController.java index ee94ea815..51a2af508 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParmController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleEvtParamController.java @@ -7,7 +7,6 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.system.pojo.param.EleEpdPqdParam; import com.njcn.system.pojo.param.EleEvtParam; import com.njcn.system.pojo.po.EleEpdPqd; import com.njcn.system.pojo.po.EleEvtParm; @@ -38,7 +37,7 @@ import java.util.List; @RequiredArgsConstructor @Api(tags = "事件字典录入") @Validated -public class EleEvtParmController extends BaseController { +public class EleEvtParamController extends BaseController { private final IEleEvtParmService eleEvtParmService; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParmController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParamController.java similarity index 97% rename from pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParmController.java rename to pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParamController.java index 5fe3282a0..83fabbbfc 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParmController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EleWaveParamController.java @@ -33,7 +33,7 @@ import org.springframework.web.bind.annotation.*; @RequiredArgsConstructor @Api(tags = "波形字典录入") @Validated -public class EleWaveParmController extends BaseController { +public class EleWaveParamController extends BaseController { private final IEleWaveParmService waveParamService; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java index 608d8a12e..eb06ad982 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventDictController.java @@ -39,8 +39,7 @@ public class EventDictController extends BaseController { /** * 新增字典 - * @param eventDictParam - * @return + * @param eventDictParam 参数 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.ADD) @PostMapping("/addDict") @@ -59,8 +58,7 @@ public class EventDictController extends BaseController { /** * 修改字典 - * @param dictUpdateParam - * @return + * @param dictUpdateParam 参数 */ @PutMapping("/updateDict") @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE) @@ -79,8 +77,7 @@ public class EventDictController extends BaseController { /** * 删除字典 - * @param id - * @return + * @param id id */ @DeleteMapping("/deleteDict") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @@ -99,8 +96,7 @@ public class EventDictController extends BaseController { /** * 查询字典列表 - * @param dictQueryParam - * @return + * @param dictQueryParam 参数 */ @PostMapping("/getList") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @@ -115,8 +111,7 @@ public class EventDictController extends BaseController { /** * 查询字典列表_新 - * @param dictQueryParam - * @return + * @param dictQueryParam 参数 */ @PostMapping("/getReportDictList") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @@ -130,8 +125,7 @@ public class EventDictController extends BaseController { /** * 查询字典 - * @param id - * @return + * @param id id */ @PostMapping("/getDictById") @OperateInfo(info = LogEnum.SYSTEM_COMMON) @@ -148,9 +142,6 @@ public class EventDictController extends BaseController { /** * 字典树 - * @param - * - * @return */ @OperateInfo @PostMapping("/DictTree") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java index 637b73b1f..7c851b627 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTemplateController.java @@ -46,7 +46,6 @@ public class EventTemplateController extends BaseController{ * 查询所有模板 * @author hany * @date 2022/09/09 - * @return */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/getList") @@ -139,8 +138,7 @@ public class EventTemplateController extends BaseController{ /** * 根据模板id查询关系 - * @param ids - * @return + * @param ids id集合 */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/selectRelevance") @@ -161,17 +159,16 @@ public class EventTemplateController extends BaseController{ /** * 根据模板id查询关系 - * @param id - * @return + * @param id id */ @OperateInfo(info = LogEnum.SYSTEM_COMMON) @PostMapping("/selectReleation") @ApiOperation("根据模板id查询关系") @ApiImplicitParam(name = "id", value = "角色索引", required = true) - public HttpResult> selectReleation(@RequestParam @Validated String id) { - String methodDescribe = getMethodDescribe("selectReleation"); + public HttpResult> selectRelation(@RequestParam @Validated String id) { + String methodDescribe = getMethodDescribe("selectRelation"); LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, id); - List res = iEventTemplateService.selectReleation(id); + List res = iEventTemplateService.selectRelation(id); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, res, methodDescribe); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java index d89ad012a..67439fad5 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/EventTreeController.java @@ -32,8 +32,7 @@ public class EventTreeController extends BaseController { /** * 根据模板id查询绑定的树节点 - * @param idList - * @return + * @param idList id集合 */ @OperateInfo(info = LogEnum.BUSINESS_MEDIUM) @PostMapping("/selectEventTree") @@ -52,8 +51,7 @@ public class EventTreeController extends BaseController { /** * 为模板分配字典节点 - * @param templateRelevancy - * @return + * @param templateRelevancy 模板信息 */ @OperateInfo(operateType = OperateType.UPDATE) @PostMapping("/assignTemplate") diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java index 90789f327..c67294adc 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ImageToStreamController.java @@ -29,65 +29,16 @@ import java.io.*; @AllArgsConstructor @RequestMapping("/image") public class ImageToStreamController extends BaseController { + private final FileStorageUtil fileStorageUtil; + /** - * 数据规模 + * 下载图片 */ @GetMapping("/toStream") @ApiImplicitParam(name = "bgImage", value = "图片路径", required = true) public void toStream(@RequestParam("bgImage") String bgImage,HttpServletResponse response) { - - byte[] buffer = new byte[1024]; - FileInputStream fis = null; - BufferedInputStream bis = null; - try { - //获取部分参数，用于从minIO上将文件下载到tmp（此步骤不是必须） - InputStream fileStream = fileStorageUtil.getFileStream(bgImage); - //获取文件格式 - String format = bgImage.substring(bgImage.lastIndexOf('.') + 1); - response.setContentType("application/octet-stream"); - response.setHeader("content-type", "image/"+getFileFormat(format)); - response.setHeader("Content-Disposition", "inline;fileName=download" +System.currentTimeMillis() + "");// 设置文件名 - //返回流处理 - bis = new BufferedInputStream(fileStream); - OutputStream os = response.getOutputStream(); - int i = bis.read(buffer); - while (i != -1) { - os.write(buffer, 0, i); - i = bis.read(buffer); - } - }catch (Exception e) { - - }finally { - if (bis != null) { - try { - bis.close(); - } catch (IOException ignored) { - } - } - if (fis != null) { - try { - fis.close(); - } catch (IOException ignored) { - } - } - } + fileStorageUtil.downloadStream(response, bgImage); } - private String getFileFormat(String format){ - switch (format) { - case "png": - return "png"; - case "svg": - return "svg+xml"; - case "jpg": - return "jpeg"; - case "gif": - return "gif"; - - default: - break; - } - return format; - } } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java deleted file mode 100644 index f7a5322e9..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/LargeScreenController.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.njcn.system.controller; - -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pq.pojo.param.LargeScreenParam; -import com.njcn.device.pq.pojo.vo.DataScaleVO; -import com.njcn.system.service.LargeScreenService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - - -/** - * @version 1.0.0 - * @author: zbj - * @date: 2023/04/10 - */ -@Slf4j -@Api(tags = "大屏") -@RestController -@RequestMapping("/largeScreen") -@RequiredArgsConstructor -public class LargeScreenController extends BaseController { - - private final LargeScreenService largeScreenService; - - /** - * 数据规模 - */ - @OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/getDataScale") - @ApiOperation("数据规模") - @ApiImplicitParam(name = "largeScreenParam", value = "数据规模", required = true) - public HttpResult> getDataScale(@RequestBody @Validated LargeScreenParam largeScreenParam) { - String methodDescribe = getMethodDescribe("getDataScale"); - List result = largeScreenService.getDataScale(largeScreenParam); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } -} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/MxGraphController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/MxGraphController.java deleted file mode 100644 index 932a2c895..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/MxGraphController.java +++ /dev/null @@ -1,98 +0,0 @@ -package com.njcn.system.controller; - -import cn.hutool.core.collection.CollectionUtil; -import com.njcn.common.pojo.annotation.OperateInfo; -import com.njcn.common.pojo.enums.common.LogEnum; -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.common.utils.HttpResultUtil; -import com.njcn.common.utils.LogUtil; -import com.njcn.system.pojo.param.MxGraphParam; -import com.njcn.system.pojo.po.MxGraph; -import com.njcn.system.service.IMxGraphService; -import com.njcn.web.controller.BaseController; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; -import java.util.Objects; - -/** - * pqs - * 组态管理 - * @author cdf - * @date 2022/1/26 - */ -@RestController -@Slf4j -@Api(tags = "组态管理") -@RequestMapping("/king") -@AllArgsConstructor -public class MxGraphController extends BaseController { - - private final IMxGraphService iMxGraphService; - - /** - * 新增组态 - * @author cdf - * @date 2022/1/26 - */ - @OperateInfo(info = LogEnum.SYSTEM_MEDIUM) - @PostMapping("/addKingView") - @ApiOperation("新增组态") - @ApiImplicitParam(name = "mxGraphParam", value = "组件实体", required = true) - HttpResult addKingView(@RequestBody @Validated MxGraphParam mxGraphParam){ - String methodDescribe = getMethodDescribe("addKingView"); - boolean result = iMxGraphService.addKingView(mxGraphParam); - LogUtil.njcnDebug(log, "{}，组态实体：{}", methodDescribe, mxGraphParam); - if (result) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe); - } - } - - /** - * 查询 - * @author cdf - * @date 2022/1/26 - */ - @OperateInfo(info = LogEnum.SYSTEM_MEDIUM) - @GetMapping("/getKingViewList") - @ApiOperation("查询组态") - HttpResult getKingViewList(){ - String methodDescribe = getMethodDescribe("getKingViewList"); - List result = iMxGraphService.getKingViewList(); - if (CollectionUtil.isNotEmpty(result)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, result, methodDescribe); - } - } - - /** - * 通过id查询 - * @author cdf - * @date 2022/1/26 - */ - @OperateInfo(info = LogEnum.SYSTEM_MEDIUM) - @GetMapping("/getKingViewById") - @ApiOperation("查询组态") - HttpResult getKingViewById(@RequestParam("id") String id){ - String methodDescribe = getMethodDescribe("getKingViewById"); - MxGraph result = iMxGraphService.getKingViewById(id); - if (Objects.nonNull(result)) { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); - } else { - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, result, methodDescribe); - } - } - - - -} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ReportTemplateController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ReportTemplateController.java index c15516071..13ec5d1be 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ReportTemplateController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ReportTemplateController.java @@ -1,6 +1,5 @@ package com.njcn.system.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.common.LogEnum; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java index c40213a06..cfa358a4f 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ResourceAdministrationController.java @@ -8,17 +8,14 @@ import com.njcn.common.utils.HttpResultUtil; import com.njcn.system.pojo.po.Resinformation; import com.njcn.system.service.IResourceAdministrationService; import com.njcn.web.controller.BaseController; -import com.njcn.web.pojo.param.BaseParam; import io.swagger.annotations.*; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.InputStream; import java.util.List; @@ -46,7 +43,7 @@ public class ResourceAdministrationController extends BaseController { @ApiParam(value = "资源名称", required = true) String name, @ApiParam(value = "资源类型", required = true) String type, @ApiParam(value = "资源描述", required = true) String description, - @ApiParam(value = "系统类型Guid", required = false) String systemType) { + @ApiParam(value = "系统类型Guid") String systemType) { String methodDescribe = getMethodDescribe("uploadFile"); Boolean flag = iResourceAdministrationService.uploadFile(multipartFile, name, type, description, systemType); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); @@ -71,12 +68,12 @@ public class ResourceAdministrationController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateFile") @ApiOperation("修改资源") - public HttpResult updateFile(@ApiParam(value = "文件", required = false) MultipartFile multipartFile, + public HttpResult updateFile(@ApiParam(value = "文件") MultipartFile multipartFile, @ApiParam(value = "id", required = true) String id, @ApiParam(value = "资源名称", required = true) String name, @ApiParam(value = "资源类型", required = true) String type, @ApiParam(value = "资源描述", required = true) String description, - @ApiParam(value = "系统类型Guid", required = false) String systemType) { + @ApiParam(value = "系统类型Guid") String systemType) { String methodDescribe = getMethodDescribe("updateFile"); Boolean flag = iResourceAdministrationService.updateFile(multipartFile, id, name, type, description, systemType); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); @@ -108,15 +105,4 @@ public class ResourceAdministrationController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "下载成功", methodDescribe); } - /** - * 导出数据 - */ - /*@OperateInfo(info = LogEnum.BUSINESS_COMMON) - @PostMapping("/exportData") - @ApiOperation("导出数据") - public HttpResult exportData() { - String methodDescribe = getMethodDescribe("exportData"); - iResourceAdministrationService.exportData(); - return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "成功", methodDescribe); - }*/ } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/RocketmqMsgErrorLogController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/RocketmqMsgErrorLogController.java index ae351809f..ddf81de53 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/RocketmqMsgErrorLogController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/RocketmqMsgErrorLogController.java @@ -8,14 +8,12 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.common.utils.LogUtil; -import com.njcn.system.pojo.param.DictDataParam; import com.njcn.system.pojo.po.RocketmqMsgErrorLog; import com.njcn.system.service.IRocketmqMsgErrorLogService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ThemeController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ThemeController.java index bbfb9a207..328aeeb25 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ThemeController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/ThemeController.java @@ -14,18 +14,13 @@ import com.njcn.system.service.IThemeService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.ibatis.annotations.Param; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.multipart.MultipartFile; -import java.util.Arrays; import java.util.List; -import java.util.Objects; /** *

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java index 986680799..fac3be262 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/controller/UserLogController.java @@ -55,7 +55,7 @@ public class UserLogController extends BaseController { @PostMapping("/add") @ApiOperation("插入审计日志") @ApiImplicitParam(name = "logInfoDTO", value = "插入日志参数", required = true) - public HttpResult addUserLog(@RequestBody LogInfoDTO logInfoDTO) { + public HttpResult addUserLog(@RequestBody LogInfoDTO logInfoDTO) { String methodDescribe = getMethodDescribe("addUserLog"); userLogService.addUserLog(logInfoDTO); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AreaMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AreaMapper.java index e86fd3e5b..1480ffabb 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AreaMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/AreaMapper.java @@ -1,12 +1,9 @@ package com.njcn.system.mapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.system.pojo.dto.AreaTreeDTO; import com.njcn.system.pojo.po.Area; import com.njcn.system.pojo.vo.AreaTreeVO; -import io.swagger.annotations.ApiModelProperty; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -48,13 +45,6 @@ public interface AreaMapper extends BaseMapper { */ List selectPid(@Param("ids")List ids,@Param("state")Integer state); - /** - * - * @param ids id - * @param state 状态 - * @return 返回的结果 - */ - List getPid(@Param("ids")List ids,@Param("state")Integer state); /** * diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/CsStatisticalSetPOMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/CsStatisticalSetPOMapper.java index b558e150e..476c848b1 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/CsStatisticalSetPOMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/CsStatisticalSetPOMapper.java @@ -1,6 +1,5 @@ package com.njcn.system.mapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.system.pojo.po.CsStatisticalSetPO; diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java index ad7c80f03..75647ca83 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/DeptMapMapper.java @@ -25,6 +25,6 @@ public interface DeptMapMapper extends BaseMapper { /** * 查询部门名称返回集合 */ - List selectDeptListName(@Param("deptIndexes") List deptIndexes); + List selectDeptListName(@Param("deptIndexList") List deptIndexList); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java index fa9bd8015..802ef233e 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/EventTemplateMapper.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.system.pojo.po.EventTemplate; import com.njcn.system.pojo.vo.EventTemplateVO; -import com.njcn.user.pojo.vo.RoleVO; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,16 +17,11 @@ public interface EventTemplateMapper extends BaseMapper { /** * 分页查询模板数据 - * @param page - * @param queryWrapper - * @return */ Page page(@Param("page")Page page, @Param("ew") QueryWrapper queryWrapper); /** * 删除模板和字典关系 - * @param ids - * @return */ Boolean deleteRelevancy(@Param("ids")List ids); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java deleted file mode 100644 index 96b0b2f5d..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/LargeScreenMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.system.mapper; - - -import com.njcn.device.pq.pojo.param.LargeScreenParam; -import com.njcn.device.pq.pojo.vo.DataScaleVO; - -import java.util.List; - -/** - * @version 1.0.0 - * @author: zbj - * @date: 2023/04/10 - */ -public interface LargeScreenMapper { - - List getDataScale (LargeScreenParam largeScreenParam); - -} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/MxGraphMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/MxGraphMapper.java deleted file mode 100644 index 6f9a9b037..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/MxGraphMapper.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.njcn.system.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.system.pojo.po.MxGraph; - -/** - * pqs - * - * @author cdf - * @date 2022/1/26 - */ -public interface MxGraphMapper extends BaseMapper { -} diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java index f63fbafd1..e15e1e962 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/ResourceAdministrationMapper.java @@ -15,5 +15,4 @@ import java.util.List; */ @Mapper public interface ResourceAdministrationMapper extends BaseMapper { - List listAll(); } diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/SysDicTreePOMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/SysDicTreePOMapper.java index 52070a18d..0519bb859 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/SysDicTreePOMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/SysDicTreePOMapper.java @@ -16,5 +16,5 @@ import java.util.List; * @version V1.0.0 */ public interface SysDicTreePOMapper extends BaseMapper { - List queryByid(@Param("id") String id); + List queryLastLevelById(@Param("id") String id); } \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java index 185bcdacc..998340394 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/TemplateRelMapper.java @@ -16,8 +16,7 @@ public interface TemplateRelMapper extends BaseMapper { /** * 根据模板id查询绑定关系 - * @param ids - * @return + * @param ids ID集合 */ List selectRelevance (@Param("ids") List ids); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java index a09effe34..077c080e8 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/UserLogMapper.java @@ -21,21 +21,19 @@ public interface UserLogMapper extends BatchBaseMapper { /** * 日志批量插入 - * @param userLogs + * @param userLogs 日志集合 */ void insertBatch(@Param("list") List userLogs); /** * 根据id查询数据库是否存在 - * @param idList - * @return + * @param idList ID集合 */ List ids(@Param("ids")List idList); /** * 查询表空间大小 * @param schema - * @return */ Float getMemoInfo(@Param("schema") String schema); diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ConfigMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ConfigMapper.xml index a65a7718f..7a9fd5c8a 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ConfigMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ConfigMapper.xml @@ -12,7 +12,6 @@ sys_config sys_config LEFT JOIN sys_user sys_usera ON sys_config.create_by = sys_usera.id LEFT JOIN sys_user sys_userb ON sys_config.update_by = sys_userb.id - ORDER BY sys_config.create_time DESC diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml index b1227e321..01523d95b 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DeptMapMapper.xml @@ -12,10 +12,10 @@ diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml index 649b5b5cc..bcf022d74 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/DictDataMapper.xml @@ -75,13 +75,14 @@ and sys_dict_data.state = 1 order by sort + diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml index ceb62f318..8d344ac04 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/EleEpdPqdMapper.xml @@ -10,7 +10,7 @@ ele_epd_pqd.Other_Name otherName, ele_epd_pqd.Show_Name showName, ele_epd_pqd.Sort, - ele_epd_pqd.`Type` , + ele_epd_pqd.Type , ele_epd_pqd.Phase , ele_epd_pqd.Unit , case when ele_epd_pqd.Harm_Start = 1 then 0.5 else ele_epd_pqd.Harm_Start end harmStart, diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml deleted file mode 100644 index 2011bf896..000000000 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/LargeScreenMapper.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml index 07f4d0b9c..b6301e2f5 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/ResourceAdministrationMapper.xml @@ -2,9 +2,4 @@ - diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/SysDicTreePOMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/SysDicTreePOMapper.xml index 74244b3f1..b54a67452 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/SysDicTreePOMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/SysDicTreePOMapper.xml @@ -1,29 +1,7 @@ - - - - - - - - - - - - - - - - - - - id, pid, pids, `name`, code, sort, remark, `status`, create_time, create_by, update_time, - update_by - - - SELECT * FROM @@ -37,6 +15,5 @@ sys_dic_tree b WHERE b.pids LIKE concat('%',#{id},'%') and a.id = b.pid) - \ No newline at end of file diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml index 961e31cff..2fcc65ac4 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/TemplateRelMapper.xml @@ -25,6 +25,7 @@ #{item} +