diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java index b13d8eee..d35b2303 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/controller/CommonStatisticController.java @@ -1,6 +1,6 @@ package com.kms.yxgh.common.controller; -import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yxgh.cz.dto.CharInfoDto; import com.kms.yxgh.base.Response; import com.kms.yxgh.common.dto.ObjectStatisticQueDto; import com.kms.yxgh.common.enums.StaticIndexEnum; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java index 2116c9af..37b99ee4 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/DataSyncBasicEnum.java @@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.TableInfo; import com.baomidou.mybatisplus.core.metadata.TableInfoHelper; -import com.kms.yg.cz.domain.BsSgcStMon; -import com.kms.yg.cz.service.BsSgcStMonService; +import com.kms.yxgh.cz.domain.BsSgcStMon; +import com.kms.yxgh.cz.service.BsSgcStMonService; import com.kms.yxgh.common.job.JsonObjProxy; import com.shuili.common.core.redis.RedisCache; import com.shuili.common.utils.SpringUtils; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java index eb4b54dd..39c53d92 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/ProjectCharEnum.java @@ -1,7 +1,7 @@ package com.kms.yxgh.common.enums; import cn.hutool.core.collection.CollectionUtil; -import com.kms.yg.cz.dto.CharInfoDto; +import com.kms.yxgh.cz.dto.CharInfoDto; import com.shuili.common.utils.StringUtils; import lombok.Getter; diff --git a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java index 2a0c661d..7fce5e7d 100644 --- a/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/common/enums/StaticIndexEnum.java @@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.kms.system.domain.SysXzqh; import com.kms.system.service.SysXzqhService; -import com.kms.yg.cz.service.AttStBaseService; -import com.kms.yg.cz.service.AttStMpService; +import com.kms.yxgh.cz.service.AttStBaseService; +import com.kms.yxgh.cz.service.AttStMpService; import com.kms.yg.df.service.BsSgcDfSafeJbxxService; import com.kms.yg.res.service.AttResBaseService; import com.kms.yg.sz.domain.BsSgcSzSzrw; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AlarmController.java similarity index 81% rename from shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/controller/AlarmController.java index 4c8a76bb..10816f0e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AlarmController.java @@ -1,10 +1,9 @@ -package com.kms.yg.cz.controller; +package com.kms.yxgh.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yg.cz.dto.AlarmInfoDto; -import com.kms.yg.cz.dto.AlarmQueDto; -import com.kms.yg.cz.dto.MonitorQueDto; -import com.kms.yg.cz.service.AlarmService; +import com.kms.yxgh.cz.dto.AlarmInfoDto; +import com.kms.yxgh.cz.dto.AlarmQueDto; +import com.kms.yxgh.cz.service.AlarmService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStBaseController.java b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStBaseController.java similarity index 92% rename from shuili-system/src/main/java/com/kms/yg/cz/controller/AttStBaseController.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStBaseController.java index bac766f6..289015bc 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStBaseController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStBaseController.java @@ -1,8 +1,8 @@ -package com.kms.yg.cz.controller; +package com.kms.yxgh.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yg.cz.domain.AttStBase; -import com.kms.yg.cz.service.AttStBaseService; +import com.kms.yxgh.cz.domain.AttStBase; +import com.kms.yxgh.cz.service.AttStBaseService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStMpController.java similarity index 94% rename from shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStMpController.java index 837a2b31..db1d6e55 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/AttStMpController.java @@ -1,10 +1,9 @@ -package com.kms.yg.cz.controller; +package com.kms.yxgh.cz.controller; -import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonProperty; -import com.kms.yg.cz.domain.AttStMp; -import com.kms.yg.cz.dto.AttMpQueDto; -import com.kms.yg.cz.service.AttStMpService; +import com.kms.yxgh.cz.domain.AttStMp; +import com.kms.yxgh.cz.dto.AttMpQueDto; +import com.kms.yxgh.cz.service.AttStMpService; import com.kms.yxgh.base.Response; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/MonitorController.java similarity index 86% rename from shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/controller/MonitorController.java index a1282e12..64d20564 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/controller/MonitorController.java @@ -1,12 +1,12 @@ -package com.kms.yg.cz.controller; +package com.kms.yxgh.cz.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.yg.cz.dto.CharInfoDto; -import com.kms.yg.cz.dto.CurrentWaterMonitorDto; -import com.kms.yg.cz.dto.MonitorConfigDto; -import com.kms.yg.cz.dto.MonitorQueDto; -import com.kms.yg.cz.enmu.MonitorIndexEnum; -import com.kms.yg.cz.service.MonitorService; +import com.kms.yxgh.cz.dto.CharInfoDto; +import com.kms.yxgh.cz.dto.CurrentWaterMonitorDto; +import com.kms.yxgh.cz.dto.MonitorConfigDto; +import com.kms.yxgh.cz.dto.MonitorQueDto; +import com.kms.yxgh.cz.enmu.MonitorIndexEnum; +import com.kms.yxgh.cz.service.MonitorService; import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AlarmInfo.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/domain/AlarmInfo.java index 6628aacb..f28fea06 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AlarmInfo.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.domain; +package com.kms.yxgh.cz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/AttStBase.java b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStBase.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/cz/domain/AttStBase.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStBase.java index bff63b9b..dbcd517d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/AttStBase.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStBase.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.domain; +package com.kms.yxgh.cz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/AttStMp.java b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStMp.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/cz/domain/AttStMp.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStMp.java index 242d57a5..1a0ad508 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/AttStMp.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/AttStMp.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.domain; +package com.kms.yxgh.cz.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.shuili.common.annotation.Excel; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/BsSgcStMon.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/domain/BsSgcStMon.java index 1cfa4b93..f83e0f78 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/BsSgcStMon.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.domain; +package com.kms.yxgh.cz.domain; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/MonitorConfig.java similarity index 89% rename from shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/domain/MonitorConfig.java index 8a203231..840efc56 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/domain/MonitorConfig.java @@ -1,16 +1,12 @@ -package com.kms.yg.cz.domain; +package com.kms.yxgh.cz.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; -import com.kms.yg.cz.enmu.MsgTypeEnum; -import com.kms.yxgh.common.dto.OperatorDto; import com.shuili.common.core.domain.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import java.util.List; - @Data @TableName("bs_sgc_st_micfg") @ApiModel("监测配置信息") diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmInfoDto.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmInfoDto.java index 05ca64d1..00f220d5 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmInfoDto.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmQueDto.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmQueDto.java index 84eea2b2..151540da 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AlarmQueDto.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AttMpQueDto.java similarity index 92% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/AttMpQueDto.java index 4941e053..1bc88dac 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/AttMpQueDto.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/CharInfoDto.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/CharInfoDto.java index 2722a372..3ebab908 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/CharInfoDto.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/CurrentWaterMonitorDto.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/CurrentWaterMonitorDto.java index 43709ebe..de45d0f6 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/CurrentWaterMonitorDto.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorConfigDto.java similarity index 94% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorConfigDto.java index 36fff8ba..6c614315 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorConfigDto.java @@ -1,6 +1,6 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; -import com.kms.yg.cz.enmu.MsgTypeEnum; +import com.kms.yxgh.cz.enmu.MsgTypeEnum; import com.kms.yxgh.common.dto.OperatorDto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorQueDto.java similarity index 92% rename from shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorQueDto.java index 1ba767ac..32a6ea5d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/dto/MonitorQueDto.java @@ -1,9 +1,9 @@ -package com.kms.yg.cz.dto; +package com.kms.yxgh.cz.dto; import com.alibaba.fastjson.annotation.JSONField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.cz.enmu.MonitorGroupEnum; -import com.kms.yg.cz.enmu.MonitorSourceEnum; +import com.kms.yxgh.cz.enmu.MonitorGroupEnum; +import com.kms.yxgh.cz.enmu.MonitorSourceEnum; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MarkTypeEnum.java similarity index 94% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MarkTypeEnum.java index f8f5ac0f..3fafbd0d 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MarkTypeEnum.java @@ -1,10 +1,10 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.cz.dto.CharInfoDto; -import com.kms.yg.sk.mapper.AttResRfkwlvMapper; -import com.kms.yg.sk.mapper.AttResRsppMapper; +import com.kms.yxgh.cz.dto.CharInfoDto; +import com.kms.yxgh.sk.mapper.AttResRfkwlvMapper; +import com.kms.yxgh.sk.mapper.AttResRsppMapper; import com.kms.yg.sz.mapper.BsSgcSzSwtzMapper; import com.shuili.common.utils.SpringUtils; import com.shuili.common.utils.StringUtils; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorComposeEnum.java similarity index 83% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorComposeEnum.java index 5dd9fcd1..f4524b2e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorComposeEnum.java @@ -1,8 +1,8 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import cn.hutool.core.collection.CollectionUtil; -import com.kms.yg.cz.dto.CharInfoDto; -import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yxgh.cz.dto.CharInfoDto; +import com.kms.yxgh.cz.dto.MonitorQueDto; import com.shuili.common.utils.DateUtils; import com.shuili.common.utils.StringUtils; import lombok.Getter; @@ -13,23 +13,22 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.kms.yg.cz.enmu.MonitorTypeEnum.*; import static com.shuili.common.utils.DateUtils.YYYY_MM_DD_HH_MM_SS; @Getter public enum MonitorComposeEnum { - WATER_LEVEL(Collections.singletonList(SK_RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), - ENV(Collections.singletonList(AIR_TEMPE), "气温", Collections.singletonList(WATER_TEMPE), "水温"), - C_STRESS(Collections.singletonList(STRESS), "压力", Collections.singletonList(STRAIN), "应变"), - C_SEEPAGE_FLOW(Collections.singletonList(SEEPAGE_FLOW), "渗流量", Collections.emptyList()), - C_DISPLACEMENT(Arrays.asList(HORIZONTAL_DISPLACEMENT_X_SURFACE, HORIZONTAL_DISPLACEMENT_Y_SURFACE, VERTICAL_DISPLACEMENT), "位移量", Collections.emptyList()), - DF_WATER_LEVEL(Collections.singletonList(RAINFALL), "降雨量", Collections.singletonList(MonitorTypeEnum.DF_WATER_LEVEL), "水位"), - SZ_WATER_LEVEL(Collections.singletonList(RAINFALL), "降雨量", Collections.emptyList()), - SZ_SEEPAGE_AROUND(Collections.singletonList(GATE_FLOW_RATE), "过闸流量", - Arrays.asList(WATER_LEVEL_ABOVE_GATE,WATER_LEVEL_BELOW_GATE), "水位"), - SZ_DISPLACEMENT(Collections.singletonList(CRACK_OPENING_DEGREE), "裂缝开合度", Collections.emptyList()); + WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.SK_RAINFALL), Collections.singletonList(MonitorTypeEnum.WATER_LEVEL)), + ENV(Collections.singletonList(MonitorTypeEnum.AIR_TEMPE), "气温", Collections.singletonList(MonitorTypeEnum.WATER_TEMPE), "水温"), + C_STRESS(Collections.singletonList(MonitorTypeEnum.STRESS), "压力", Collections.singletonList(MonitorTypeEnum.STRAIN), "应变"), + C_SEEPAGE_FLOW(Collections.singletonList(MonitorTypeEnum.SEEPAGE_FLOW), "渗流量", Collections.emptyList()), + C_DISPLACEMENT(Arrays.asList(MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_X_SURFACE, MonitorTypeEnum.HORIZONTAL_DISPLACEMENT_Y_SURFACE, MonitorTypeEnum.VERTICAL_DISPLACEMENT), "位移量", Collections.emptyList()), + DF_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Collections.singletonList(MonitorTypeEnum.DF_WATER_LEVEL), "水位"), + SZ_WATER_LEVEL(Collections.singletonList(MonitorTypeEnum.RAINFALL), "降雨量", Collections.emptyList()), + SZ_SEEPAGE_AROUND(Collections.singletonList(MonitorTypeEnum.GATE_FLOW_RATE), "过闸流量", + Arrays.asList(MonitorTypeEnum.WATER_LEVEL_ABOVE_GATE, MonitorTypeEnum.WATER_LEVEL_BELOW_GATE), "水位"), + SZ_DISPLACEMENT(Collections.singletonList(MonitorTypeEnum.CRACK_OPENING_DEGREE), "裂缝开合度", Collections.emptyList()); private final List leftElements; private final String leftName; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorGroupEnum.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorGroupEnum.java index c5ef6349..400a9011 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorGroupEnum.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import lombok.Getter; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexEnum.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexEnum.java index 7d17997f..0ed1359b 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexEnum.java @@ -1,5 +1,5 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import lombok.Data; import lombok.Getter; @@ -8,9 +8,9 @@ import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.kms.yg.cz.enmu.MarkTypeEnum.CHFLLV; -import static com.kms.yg.cz.enmu.MarkTypeEnum.FSLTDZ_LIMIT; -import static com.kms.yg.cz.enmu.MonitorTypeEnum.*; +import static com.kms.yxgh.cz.enmu.MarkTypeEnum.CHFLLV; +import static com.kms.yxgh.cz.enmu.MarkTypeEnum.FSLTDZ_LIMIT; +import static com.kms.yxgh.cz.enmu.MonitorTypeEnum.*; @Getter public enum MonitorIndexEnum { diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexInfo.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexInfo.java index e8b12834..cd6fc2ff 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorIndexInfo.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorSourceEnum.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorSourceEnum.java index 4d64ef0d..0ac6bcf1 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorSourceEnum.java @@ -1,10 +1,10 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.base.Strings; -import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yxgh.cz.dto.MonitorQueDto; import com.kms.yxgh.base.domain.monitor.*; import lombok.Data; import lombok.Getter; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorTypeEnum.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorTypeEnum.java index 7c957c25..c9aa21f6 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MonitorTypeEnum.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import lombok.Getter; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MsgTypeEnum.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MsgTypeEnum.java index 10eb8018..d1637aa9 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/enmu/MsgTypeEnum.java @@ -1,4 +1,4 @@ -package com.kms.yg.cz.enmu; +package com.kms.yxgh.cz.enmu; import lombok.Getter; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AlarmInfoMapper.java similarity index 72% rename from shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AlarmInfoMapper.java index 92e03a77..f5daf913 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AlarmInfoMapper.java @@ -1,8 +1,7 @@ -package com.kms.yg.cz.mapper; +package com.kms.yxgh.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.cz.domain.AlarmInfo; -import com.kms.yg.cz.domain.AttStBase; +import com.kms.yxgh.cz.domain.AlarmInfo; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStBaseMapper.java b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStBaseMapper.java similarity index 83% rename from shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStBaseMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStBaseMapper.java index 1a97f9e5..1756d42f 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStBaseMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStBaseMapper.java @@ -1,9 +1,9 @@ -package com.kms.yg.cz.mapper; +package com.kms.yxgh.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; //import com.kms.yg.cz.domain.AttStBase; //import com.kms.yg.sk.domain.AttResBase; -import com.kms.yg.cz.domain.AttStBase; +import com.kms.yxgh.cz.domain.AttStBase; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStMpMapper.java similarity index 89% rename from shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStMpMapper.java index 022ec4db..fa16fb84 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/AttStMpMapper.java @@ -1,8 +1,8 @@ -package com.kms.yg.cz.mapper; +package com.kms.yxgh.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.cz.domain.AttStMp; -import com.kms.yg.cz.dto.AttMpQueDto; +import com.kms.yxgh.cz.domain.AttStMp; +import com.kms.yxgh.cz.dto.AttMpQueDto; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/BsSgcStMonMapper.java b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/BsSgcStMonMapper.java similarity index 79% rename from shuili-system/src/main/java/com/kms/yg/cz/mapper/BsSgcStMonMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/mapper/BsSgcStMonMapper.java index ed1feec9..b4186d86 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/BsSgcStMonMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/BsSgcStMonMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.cz.mapper; +package com.kms.yxgh.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.cz.domain.BsSgcStMon; +import com.kms.yxgh.cz.domain.BsSgcStMon; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/MonitorConfigMapper.java similarity index 71% rename from shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/mapper/MonitorConfigMapper.java index c7f578b1..aa6624e5 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/mapper/MonitorConfigMapper.java @@ -1,8 +1,7 @@ -package com.kms.yg.cz.mapper; +package com.kms.yxgh.cz.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.cz.domain.AlarmInfo; -import com.kms.yg.cz.domain.MonitorConfig; +import com.kms.yxgh.cz.domain.MonitorConfig; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AlarmService.java similarity index 85% rename from shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/service/AlarmService.java index 8688a89d..f6b77675 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AlarmService.java @@ -1,13 +1,13 @@ -package com.kms.yg.cz.service; +package com.kms.yxgh.cz.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.cz.domain.AlarmInfo; -import com.kms.yg.cz.dto.AlarmInfoDto; -import com.kms.yg.cz.dto.AlarmQueDto; -import com.kms.yg.cz.mapper.AlarmInfoMapper; +import com.kms.yxgh.cz.domain.AlarmInfo; +import com.kms.yxgh.cz.dto.AlarmInfoDto; +import com.kms.yxgh.cz.dto.AlarmQueDto; +import com.kms.yxgh.cz.mapper.AlarmInfoMapper; import com.kms.yxgh.util.BeanCopyUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStBaseService.java b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStBaseService.java similarity index 69% rename from shuili-system/src/main/java/com/kms/yg/cz/service/AttStBaseService.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStBaseService.java index 0e0dad95..9ed86668 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStBaseService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStBaseService.java @@ -1,7 +1,7 @@ -package com.kms.yg.cz.service; +package com.kms.yxgh.cz.service; -import com.kms.yg.cz.domain.AttStBase; -import com.kms.yg.cz.mapper.AttStBaseMapper; +import com.kms.yxgh.cz.domain.AttStBase; +import com.kms.yxgh.cz.mapper.AttStBaseMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStMpService.java similarity index 71% rename from shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStMpService.java index f312122a..649db76e 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/service/AttStMpService.java @@ -1,8 +1,8 @@ -package com.kms.yg.cz.service; +package com.kms.yxgh.cz.service; -import com.kms.yg.cz.domain.AttStMp; -import com.kms.yg.cz.dto.AttMpQueDto; -import com.kms.yg.cz.mapper.AttStMpMapper; +import com.kms.yxgh.cz.domain.AttStMp; +import com.kms.yxgh.cz.dto.AttMpQueDto; +import com.kms.yxgh.cz.mapper.AttStMpMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java b/shuili-system/src/main/java/com/kms/yxgh/cz/service/BsSgcStMonService.java similarity index 71% rename from shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/service/BsSgcStMonService.java index b0549456..dbcef634 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/service/BsSgcStMonService.java @@ -1,8 +1,8 @@ -package com.kms.yg.cz.service; +package com.kms.yxgh.cz.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.cz.domain.BsSgcStMon; -import com.kms.yg.cz.mapper.BsSgcStMonMapper; +import com.kms.yxgh.cz.domain.BsSgcStMon; +import com.kms.yxgh.cz.mapper.BsSgcStMonMapper; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java b/shuili-system/src/main/java/com/kms/yxgh/cz/service/MonitorService.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java rename to shuili-system/src/main/java/com/kms/yxgh/cz/service/MonitorService.java index 62eadfd6..f0f84602 100644 --- a/shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/cz/service/MonitorService.java @@ -1,16 +1,17 @@ -package com.kms.yg.cz.service; +package com.kms.yxgh.cz.service; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.kms.yg.cz.domain.MonitorConfig; -import com.kms.yg.cz.dto.CharInfoDto; -import com.kms.yg.cz.dto.CurrentWaterMonitorDto; -import com.kms.yg.cz.dto.MonitorConfigDto; -import com.kms.yg.cz.dto.MonitorQueDto; +import com.kms.yxgh.cz.domain.MonitorConfig; +import com.kms.yxgh.cz.dto.CharInfoDto; +import com.kms.yxgh.cz.dto.CurrentWaterMonitorDto; +import com.kms.yxgh.cz.dto.MonitorConfigDto; +import com.kms.yxgh.cz.dto.MonitorQueDto; import com.kms.yg.cz.enmu.*; -import com.kms.yg.cz.mapper.MonitorConfigMapper; +import com.kms.yxgh.cz.enmu.*; +import com.kms.yxgh.cz.mapper.MonitorConfigMapper; import com.kms.yxgh.base.domain.monitor.MsHdmObp; import com.kms.yxgh.base.domain.monitor.MsHdmRsvr; import com.kms.yxgh.base.domain.monitor.MsHdmRsvrav; @@ -30,7 +31,7 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import static com.kms.yg.cz.enmu.MonitorSourceEnum.MS_HDM_RSVR; +import static com.kms.yxgh.cz.enmu.MonitorSourceEnum.MS_HDM_RSVR; @Service @Slf4j diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResBaseSkController.java similarity index 90% rename from shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResBaseSkController.java index 3f31e064..6bbde939 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResBaseSkController.java @@ -1,10 +1,10 @@ -package com.kms.yg.sk.controller; +package com.kms.yxgh.sk.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sk.domain.AttResBaseSk; -import com.kms.yg.sk.service.AttResBaseSkService; -import com.kms.yg.sk.service.AttResCodeService; +import com.kms.yxgh.sk.domain.AttResBaseSk; +import com.kms.yxgh.sk.service.AttResBaseSkService; +import com.kms.yxgh.sk.service.AttResCodeService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import com.shuili.common.core.domain.SearchParam; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRsppController.java similarity index 90% rename from shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRsppController.java index 28c9f9bb..942882c9 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRsppController.java @@ -1,9 +1,8 @@ -package com.kms.yg.sk.controller; +package com.kms.yxgh.sk.controller; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.kms.common.utils.BaseEntityUtils; -import com.kms.yg.sk.domain.AttResRspp; -import com.kms.yg.sk.service.AttResRsppService; +import com.kms.yxgh.sk.domain.AttResRspp; +import com.kms.yxgh.sk.service.AttResRsppService; import com.shuili.common.annotation.Log; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; @@ -15,7 +14,6 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Arrays; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRwacdrController.java b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRwacdrController.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRwacdrController.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRwacdrController.java index 4ea75f68..7b7af289 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRwacdrController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/controller/AttResRwacdrController.java @@ -1,6 +1,6 @@ -package com.kms.yg.sk.controller; +package com.kms.yxgh.sk.controller; -import com.kms.yg.sk.service.AttResRwacdrService; +import com.kms.yxgh.sk.service.AttResRwacdrService; import com.shuili.common.core.controller.BaseController; import com.shuili.common.core.domain.AjaxResult; import io.swagger.annotations.Api; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBaseSk.java b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResBaseSk.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBaseSk.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResBaseSk.java index bdd99b97..d8b69e1f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBaseSk.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResBaseSk.java @@ -1,4 +1,4 @@ -package com.kms.yg.sk.domain; +package com.kms.yxgh.sk.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResCode.java similarity index 94% rename from shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResCode.java index f8d97365..85090701 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResCode.java @@ -1,4 +1,4 @@ -package com.kms.yg.sk.domain; +package com.kms.yxgh.sk.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRfkwlv.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRfkwlv.java index d00365bf..f53aa57d 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRfkwlv.java @@ -1,4 +1,4 @@ -package com.kms.yg.sk.domain; +package com.kms.yxgh.sk.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRspp.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRspp.java index cb91152b..118c767b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRspp.java @@ -1,4 +1,4 @@ -package com.kms.yg.sk.domain; +package com.kms.yxgh.sk.domain; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRwacdr.java b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRwacdr.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRwacdr.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRwacdr.java index f907454f..0a29c35f 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRwacdr.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/domain/AttResRwacdr.java @@ -1,4 +1,4 @@ -package com.kms.yg.sk.domain; +package com.kms.yxgh.sk.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseSkMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResBaseSkMapper.java similarity index 78% rename from shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseSkMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResBaseSkMapper.java index 9579277d..59dc3255 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseSkMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResBaseSkMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.mapper; +package com.kms.yxgh.sk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sk.domain.AttResBaseSk; +import com.kms.yxgh.sk.domain.AttResBaseSk; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResCodeMapper.java similarity index 79% rename from shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResCodeMapper.java index 462302e4..5a831192 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResCodeMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.mapper; +package com.kms.yxgh.sk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sk.domain.AttResCode; +import com.kms.yxgh.sk.domain.AttResCode; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRfkwlvMapper.java similarity index 78% rename from shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRfkwlvMapper.java index a7596c0a..40e97ba2 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRfkwlvMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.mapper; +package com.kms.yxgh.sk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sk.domain.AttResRfkwlv; +import com.kms.yxgh.sk.domain.AttResRfkwlv; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRsppMapper.java similarity index 79% rename from shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRsppMapper.java index 56a1c73b..8a1b0a5b 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRsppMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.mapper; +package com.kms.yxgh.sk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sk.domain.AttResRspp; +import com.kms.yxgh.sk.domain.AttResRspp; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRwacdrMapper.java b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRwacdrMapper.java similarity index 78% rename from shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRwacdrMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRwacdrMapper.java index afafb668..11ca5f72 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRwacdrMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/mapper/AttResRwacdrMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.mapper; +package com.kms.yxgh.sk.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.sk.domain.AttResRwacdr; +import com.kms.yxgh.sk.domain.AttResRwacdr; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseSkService.java b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResBaseSkService.java similarity index 87% rename from shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseSkService.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResBaseSkService.java index 4e8106f3..bd20a896 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseSkService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResBaseSkService.java @@ -1,11 +1,11 @@ -package com.kms.yg.sk.service; +package com.kms.yxgh.sk.service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.sk.domain.AttResBaseSk; -import com.kms.yg.sk.mapper.AttResBaseSkMapper; +import com.kms.yxgh.sk.domain.AttResBaseSk; +import com.kms.yxgh.sk.mapper.AttResBaseSkMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResCodeService.java similarity index 75% rename from shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResCodeService.java index 5af08e60..70afc20c 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResCodeService.java @@ -1,9 +1,9 @@ -package com.kms.yg.sk.service; +package com.kms.yxgh.sk.service; //import com.kms.yg.sk.domain.AttResBase; -import com.kms.yg.sk.domain.AttResCode; +import com.kms.yxgh.sk.domain.AttResCode; //import com.kms.yg.sk.mapper.AttResBaseMapper; -import com.kms.yg.sk.mapper.AttResCodeMapper; +import com.kms.yxgh.sk.mapper.AttResCodeMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRsppService.java similarity index 69% rename from shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRsppService.java index 245d2a13..dc89c156 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRsppService.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.service; +package com.kms.yxgh.sk.service; -import com.kms.yg.sk.domain.AttResRspp; -import com.kms.yg.sk.mapper.AttResRsppMapper; +import com.kms.yxgh.sk.domain.AttResRspp; +import com.kms.yxgh.sk.mapper.AttResRsppMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRwacdrService.java b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRwacdrService.java similarity index 69% rename from shuili-system/src/main/java/com/kms/yg/sk/service/AttResRwacdrService.java rename to shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRwacdrService.java index d7f5d797..c4a936ee 100644 --- a/shuili-system/src/main/java/com/kms/yg/sk/service/AttResRwacdrService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/sk/service/AttResRwacdrService.java @@ -1,7 +1,7 @@ -package com.kms.yg.sk.service; +package com.kms.yxgh.sk.service; -import com.kms.yg.sk.domain.AttResRwacdr; -import com.kms.yg.sk.mapper.AttResRwacdrMapper; +import com.kms.yxgh.sk.domain.AttResRwacdr; +import com.kms.yxgh.sk.mapper.AttResRwacdrMapper; import com.shuili.common.core.service.BaseService; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyDirController.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyDirController.java index 2dbf94ce..337d0e13 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyDirController.java @@ -1,16 +1,17 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.yg.znjg.domain.*; -import com.kms.yg.znjg.mapper.SyDirLayerMapper; -import com.kms.yg.znjg.mapper.SyLayerMapper; -import com.kms.yg.znjg.mapper.SySceneDirRelationMapper; -import com.kms.yg.znjg.mapper.SySceneMapper; -import com.kms.yg.znjg.service.SyDirService; -import com.kms.yg.znjg.service.SyLayerService; -import com.kms.yg.znjg.vo.SyDirVo; +import com.kms.yxgh.znjg.domain.*; +import com.kms.yxgh.znjg.mapper.SyDirLayerMapper; +import com.kms.yxgh.znjg.mapper.SyLayerMapper; +import com.kms.yxgh.znjg.mapper.SySceneDirRelationMapper; +import com.kms.yxgh.znjg.mapper.SySceneMapper; +import com.kms.yxgh.znjg.service.SyDirService; +import com.kms.yxgh.znjg.service.SyLayerService; +import com.kms.yxgh.znjg.vo.SyDirVo; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import io.swagger.annotations.Api; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerController.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerController.java index bf31f419..3c8cc773 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerController.java @@ -1,11 +1,11 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; -import com.kms.yg.znjg.domain.SyLayer; -import com.kms.yg.znjg.service.SyLayerService; +import com.kms.yxgh.znjg.domain.SyLayer; +import com.kms.yxgh.znjg.service.SyLayerService; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import static com.kms.yg.znjg.service.SyDirService.generateLayerResourceDirectoryNumber; +import static com.kms.yxgh.znjg.service.SyDirService.generateLayerResourceDirectoryNumber; /** * 图层管理 diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerStyleManagerController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerStyleManagerController.java similarity index 90% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerStyleManagerController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerStyleManagerController.java index 04b18d02..2a40029a 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerStyleManagerController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SyLayerStyleManagerController.java @@ -1,10 +1,10 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.znjg.domain.SyLayerStyle; -import com.kms.yg.znjg.qo.SyLayerStyleQo; -import com.kms.yg.znjg.service.SyLayerStyleService; +import com.kms.yxgh.znjg.domain.SyLayerStyle; +import com.kms.yxgh.znjg.qo.SyLayerStyleQo; +import com.kms.yxgh.znjg.service.SyLayerStyleService; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import io.swagger.annotations.Api; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneConfigRelationController.java similarity index 92% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneConfigRelationController.java index 82784ffd..73d6e7ce 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneConfigRelationController.java @@ -1,11 +1,11 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.kms.yg.znjg.domain.SyScene; -import com.kms.yg.znjg.domain.SySceneConfigRelation; -import com.kms.yg.znjg.mapper.SySceneConfigRelationMapper; -import com.kms.yg.znjg.mapper.SySceneMapper; -import com.kms.yg.znjg.service.SySceneConfigRelationService; +import com.kms.yxgh.znjg.domain.SyScene; +import com.kms.yxgh.znjg.domain.SySceneConfigRelation; +import com.kms.yxgh.znjg.mapper.SySceneConfigRelationMapper; +import com.kms.yxgh.znjg.mapper.SySceneMapper; +import com.kms.yxgh.znjg.service.SySceneConfigRelationService; import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneController.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneController.java index 239a239b..39e59d56 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneController.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,9 +9,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.kms.common.utils.UserUtils; import com.kms.yg.znjg.domain.*; import com.kms.yg.znjg.mapper.*; -import com.kms.yg.znjg.service.SySceneService; -import com.kms.yg.znjg.vo.LayerForm; -import com.kms.yg.znjg.vo.SySceneVo; +import com.kms.yxgh.znjg.domain.*; +import com.kms.yxgh.znjg.mapper.*; +import com.kms.yxgh.znjg.service.SySceneService; +import com.kms.yxgh.znjg.vo.LayerForm; +import com.kms.yxgh.znjg.vo.SySceneVo; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneDirRelationController.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneDirRelationController.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneDirRelationController.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneDirRelationController.java index 03f36311..04a9ac2c 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneDirRelationController.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/controller/SySceneDirRelationController.java @@ -1,9 +1,9 @@ -package com.kms.yg.znjg.controller; +package com.kms.yxgh.znjg.controller; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; -import com.kms.yg.znjg.domain.SySceneDirRelation; -import com.kms.yg.znjg.mapper.SySceneDirRelationMapper; -import com.kms.yg.znjg.service.SySceneDirRelationService; +import com.kms.yxgh.znjg.domain.SySceneDirRelation; +import com.kms.yxgh.znjg.mapper.SySceneDirRelationMapper; +import com.kms.yxgh.znjg.service.SySceneDirRelationService; import com.kms.yxgh.base.Response; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDir.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDir.java index c1ddd1cc..fa63d875 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDir.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDirLayer.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDirLayer.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDirLayer.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDirLayer.java index 72f180c7..6eb6bf43 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDirLayer.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyDirLayer.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayer.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayer.java similarity index 99% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayer.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayer.java index 15f52a03..d1790b3e 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayer.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayer.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerField.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerField.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerField.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerField.java index d906fa7d..bd42ec15 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerField.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerField.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerStyle.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerStyle.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerStyle.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerStyle.java index 913a6b98..62958332 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerStyle.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyLayerStyle.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyScene.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyScene.java index dd06f04d..cef5761f 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SyScene.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneConfigRelation.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneConfigRelation.java index 45116f33..aa3a6920 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneConfigRelation.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneDirRelation.java similarity index 97% rename from shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneDirRelation.java index 0a2eed5a..b97474f8 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/domain/SySceneDirRelation.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.domain; +package com.kms.yxgh.znjg.domain; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirLayerMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirLayerMapper.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirLayerMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirLayerMapper.java index 31bc9e69..d5fcda62 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirLayerMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirLayerMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.znjg.domain.SyDirLayer; +import com.kms.yxgh.znjg.domain.SyDirLayer; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirMapper.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirMapper.java index 5cdc4119..f7c4ddd7 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyDirMapper.java @@ -1,9 +1,9 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.znjg.domain.SyDir; -import com.kms.yg.znjg.vo.SyDirVo; +import com.kms.yxgh.znjg.domain.SyDir; +import com.kms.yxgh.znjg.vo.SyDirVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerFieldMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerFieldMapper.java similarity index 84% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerFieldMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerFieldMapper.java index 01d0520c..2c29b2ed 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerFieldMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerFieldMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.znjg.domain.SyLayerField; +import com.kms.yxgh.znjg.domain.SyLayerField; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerMapper.java similarity index 93% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerMapper.java index 60033499..d5ce3cd3 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerMapper.java @@ -1,8 +1,8 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.znjg.domain.SyLayer; +import com.kms.yxgh.znjg.domain.SyLayer; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerStyleMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerStyleMapper.java similarity index 85% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerStyleMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerStyleMapper.java index 2e02fa37..6a5ce5e6 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerStyleMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SyLayerStyleMapper.java @@ -1,9 +1,9 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.znjg.domain.SyLayerStyle; -import com.kms.yg.znjg.qo.SyLayerStyleQo; +import com.kms.yxgh.znjg.domain.SyLayerStyle; +import com.kms.yxgh.znjg.qo.SyLayerStyleQo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneConfigRelationMapper.java similarity index 83% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneConfigRelationMapper.java index 469f817f..e3da24e7 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneConfigRelationMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.znjg.domain.SySceneConfigRelation; +import com.kms.yxgh.znjg.domain.SySceneConfigRelation; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneDirRelationMapper.java similarity index 84% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneDirRelationMapper.java index 87740927..74926c1a 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneDirRelationMapper.java @@ -1,7 +1,7 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.kms.yg.znjg.domain.SySceneDirRelation; +import com.kms.yxgh.znjg.domain.SySceneDirRelation; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneMapper.java similarity index 85% rename from shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneMapper.java index b3d87ce6..ad7a56ad 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/mapper/SySceneMapper.java @@ -1,9 +1,9 @@ -package com.kms.yg.znjg.mapper; +package com.kms.yxgh.znjg.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.kms.yg.znjg.domain.SyScene; -import com.kms.yg.znjg.vo.SySceneVo; +import com.kms.yxgh.znjg.domain.SyScene; +import com.kms.yxgh.znjg.vo.SySceneVo; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/qo/SyLayerStyleQo.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/qo/SyLayerStyleQo.java similarity index 96% rename from shuili-system/src/main/java/com/kms/yg/znjg/qo/SyLayerStyleQo.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/qo/SyLayerStyleQo.java index 8c5df85b..1736d0df 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/qo/SyLayerStyleQo.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/qo/SyLayerStyleQo.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.qo; +package com.kms.yxgh.znjg.qo; import lombok.Data; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirLayerService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirLayerService.java similarity index 61% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirLayerService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirLayerService.java index 6fd16adb..8d9774f5 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirLayerService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirLayerService.java @@ -1,7 +1,7 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SyDirLayer; -import com.kms.yg.znjg.mapper.SyDirLayerMapper; +import com.kms.yxgh.znjg.domain.SyDirLayer; +import com.kms.yxgh.znjg.mapper.SyDirLayerMapper; import org.springframework.stereotype.Service; @Service diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirService.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirService.java index 1595cc6b..036be3da 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyDirService.java @@ -1,13 +1,13 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.kms.common.utils.UserUtils; -import com.kms.yg.znjg.domain.SyDir; -import com.kms.yg.znjg.mapper.SyDirMapper; -import com.kms.yg.znjg.vo.SyDirVo; +import com.kms.yxgh.znjg.domain.SyDir; +import com.kms.yxgh.znjg.mapper.SyDirMapper; +import com.kms.yxgh.znjg.vo.SyDirVo; import com.kms.yxgh.base.Response; import com.shuili.common.core.domain.SearchParam; import com.shuili.common.core.domain.entity.SysUser; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerFieldService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerFieldService.java similarity index 62% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerFieldService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerFieldService.java index 0d956b27..de807ea4 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerFieldService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerFieldService.java @@ -1,8 +1,8 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SyLayerField; -import com.kms.yg.znjg.mapper.SyLayerFieldMapper; +import com.kms.yxgh.znjg.domain.SyLayerField; +import com.kms.yxgh.znjg.mapper.SyLayerFieldMapper; import org.springframework.stereotype.Service; @Service diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerService.java similarity index 95% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerService.java index 9bbca92e..b361951f 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerService.java @@ -1,4 +1,4 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; @@ -7,12 +7,12 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SyDirLayer; -import com.kms.yg.znjg.domain.SyLayer; -import com.kms.yg.znjg.domain.SyLayerField; -import com.kms.yg.znjg.mapper.SyDirLayerMapper; -import com.kms.yg.znjg.mapper.SyLayerFieldMapper; -import com.kms.yg.znjg.mapper.SyLayerMapper; +import com.kms.yxgh.znjg.domain.SyDirLayer; +import com.kms.yxgh.znjg.domain.SyLayer; +import com.kms.yxgh.znjg.domain.SyLayerField; +import com.kms.yxgh.znjg.mapper.SyDirLayerMapper; +import com.kms.yxgh.znjg.mapper.SyLayerFieldMapper; +import com.kms.yxgh.znjg.mapper.SyLayerMapper; import com.shuili.common.utils.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerStyleService.java similarity index 91% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerStyleService.java index e07f2be2..d4e5ba4a 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SyLayerStyleService.java @@ -1,11 +1,11 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SyLayerStyle; -import com.kms.yg.znjg.mapper.SyLayerStyleMapper; -import com.kms.yg.znjg.qo.SyLayerStyleQo; +import com.kms.yxgh.znjg.domain.SyLayerStyle; +import com.kms.yxgh.znjg.mapper.SyLayerStyleMapper; +import com.kms.yxgh.znjg.qo.SyLayerStyleQo; import com.kms.yxgh.util.BeanCopyUtils; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneConfigRelationService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneConfigRelationService.java similarity index 61% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneConfigRelationService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneConfigRelationService.java index fe5c6d6c..085da512 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneConfigRelationService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneConfigRelationService.java @@ -1,8 +1,8 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SySceneConfigRelation; -import com.kms.yg.znjg.mapper.SySceneConfigRelationMapper; +import com.kms.yxgh.znjg.domain.SySceneConfigRelation; +import com.kms.yxgh.znjg.mapper.SySceneConfigRelationMapper; import org.springframework.stereotype.Service; @Service diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneDirRelationService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneDirRelationService.java similarity index 72% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneDirRelationService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneDirRelationService.java index b9bf3eda..ffb482d6 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneDirRelationService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneDirRelationService.java @@ -1,8 +1,8 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SySceneDirRelation; -import com.kms.yg.znjg.mapper.SySceneDirRelationMapper; +import com.kms.yxgh.znjg.domain.SySceneDirRelation; +import com.kms.yxgh.znjg.mapper.SySceneDirRelationMapper; import org.springframework.stereotype.Service; /** diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneService.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneService.java similarity index 90% rename from shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneService.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneService.java index aaeba85c..e21eeaf5 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneService.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/service/SySceneService.java @@ -1,12 +1,12 @@ -package com.kms.yg.znjg.service; +package com.kms.yxgh.znjg.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.kms.yg.znjg.domain.SyScene; -import com.kms.yg.znjg.mapper.SySceneMapper; -import com.kms.yg.znjg.vo.SySceneVo; +import com.kms.yxgh.znjg.domain.SyScene; +import com.kms.yxgh.znjg.mapper.SySceneMapper; +import com.kms.yxgh.znjg.vo.SySceneVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/LayerForm.java similarity index 98% rename from shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/vo/LayerForm.java index f7748124..456e6c7f 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/LayerForm.java @@ -1,9 +1,9 @@ -package com.kms.yg.znjg.vo; +package com.kms.yxgh.znjg.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; -import com.kms.yg.znjg.domain.SyLayer; -import com.kms.yg.znjg.domain.SyLayerField; +import com.kms.yxgh.znjg.domain.SyLayer; +import com.kms.yxgh.znjg.domain.SyLayerField; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/vo/SyDirVo.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SyDirVo.java similarity index 75% rename from shuili-system/src/main/java/com/kms/yg/znjg/vo/SyDirVo.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SyDirVo.java index 66c8998d..720179b7 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/vo/SyDirVo.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SyDirVo.java @@ -1,6 +1,6 @@ -package com.kms.yg.znjg.vo; +package com.kms.yxgh.znjg.vo; -import com.kms.yg.znjg.domain.SyDir; +import com.kms.yxgh.znjg.domain.SyDir; import lombok.Data; import java.util.List; diff --git a/shuili-system/src/main/java/com/kms/yg/znjg/vo/SySceneVo.java b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SySceneVo.java similarity index 70% rename from shuili-system/src/main/java/com/kms/yg/znjg/vo/SySceneVo.java rename to shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SySceneVo.java index 2f30984f..f03465b6 100644 --- a/shuili-system/src/main/java/com/kms/yg/znjg/vo/SySceneVo.java +++ b/shuili-system/src/main/java/com/kms/yxgh/znjg/vo/SySceneVo.java @@ -1,6 +1,6 @@ -package com.kms.yg.znjg.vo; +package com.kms.yxgh.znjg.vo; -import com.kms.yg.znjg.domain.SyScene; +import com.kms.yxgh.znjg.domain.SyScene; import lombok.Data; @Data diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirLayerMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirLayerMapper.xml index 5c93d910..94c9dd4e 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirLayerMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirLayerMapper.xml @@ -2,8 +2,8 @@ - - + + @@ -16,7 +16,7 @@ order_nm - SELECT FROM diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml index f685e0f6..0f1f93c9 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -26,7 +26,7 @@ - SELECT , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -36,7 +36,7 @@ ORDER BY y.order_nm - SELECT , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -63,7 +63,7 @@ - select , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -113,7 +113,7 @@ - select , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -135,7 +135,7 @@ - SELECT , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -163,7 +163,7 @@ - SELECT , (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x @@ -177,7 +177,7 @@ ORDER BY order_nm - SELECT FROM diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml index 65cd46a1..e09fa5c6 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml index 58b10d42..234c5e7f 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -185,7 +185,7 @@ - select * from bs_sgc_qqjd_layer sl where is_valid = 1 @@ -204,7 +204,7 @@ - SELECT ,IFNULL(orderNmTbl.orderNm,0) orderNm diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml index 0054464c..4d12c504 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -22,7 +22,7 @@ information,note,style_type, view_img,create_time,modify_time - select from bs_sgc_qqjd_layer_style diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneConfigRelationMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneConfigRelationMapper.xml index 52b614b2..1b88a20a 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneConfigRelationMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneConfigRelationMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneDirRelationMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneDirRelationMapper.xml index 353982cb..409a9f8c 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneDirRelationMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneDirRelationMapper.xml @@ -2,9 +2,9 @@ - + - + diff --git a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml index 8f71e38b..cdb6b627 100644 --- a/shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml +++ b/shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -18,7 +18,7 @@ ,y.name,y.pub_date, y.create_user,y.interface_address,description - SELECT , (SELECT COUNT(1) FROM bs_sgc_qqjd_scene_dir_relation x WHERE IS_VALID=1 and x.SCENE_ID=y.ID ) AS relationDirCount