feat: 包迁移

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;

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;

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;
 

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;

shuili-system/src/main/java/com/kms/yg/cz/controller/AlarmController.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/controller/AttStBaseController.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/controller/AttStMpController.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/controller/MonitorController.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/domain/AlarmInfo.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/domain/AttStBase.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/domain/AttStMp.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/domain/BsSgcStMon.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/domain/MonitorConfig.java → 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("监测配置信息")

shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmInfoDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/AlarmQueDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/AttMpQueDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/CharInfoDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/CurrentWaterMonitorDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorConfigDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/dto/MonitorQueDto.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/enmu/MarkTypeEnum.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorComposeEnum.java → 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<MonitorTypeEnum> leftElements;
     private final String leftName;

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorGroupEnum.java → 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;
 

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexEnum.java → 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 {

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorIndexInfo.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorSourceEnum.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/enmu/MonitorTypeEnum.java → 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;
 

shuili-system/src/main/java/com/kms/yg/cz/enmu/MsgTypeEnum.java → 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;
 

shuili-system/src/main/java/com/kms/yg/cz/mapper/AlarmInfoMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStBaseMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/cz/mapper/AttStMpMapper.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/mapper/BsSgcStMonMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/cz/mapper/MonitorConfigMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/cz/service/AlarmService.java → 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;

shuili-system/src/main/java/com/kms/yg/cz/service/AttStBaseService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/cz/service/AttStMpService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/cz/service/BsSgcStMonService.java → 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;
 
 /**

shuili-system/src/main/java/com/kms/yg/cz/service/MonitorService.java → 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

shuili-system/src/main/java/com/kms/yg/sk/controller/AttResBaseSkController.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRsppController.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/controller/AttResRwacdrController.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/domain/AttResBaseSk.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/domain/AttResCode.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRfkwlv.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRspp.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/domain/AttResRwacdr.java → 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;

shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResBaseSkMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResCodeMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRfkwlvMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRsppMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/mapper/AttResRwacdrMapper.java → 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;
 
 

shuili-system/src/main/java/com/kms/yg/sk/service/AttResBaseSkService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/sk/service/AttResCodeService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/sk/service/AttResRsppService.java → 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;
 /**

shuili-system/src/main/java/com/kms/yg/sk/service/AttResRwacdrService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/controller/SyDirController.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerController.java → 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;
 
 /**
  * 图层管理

shuili-system/src/main/java/com/kms/yg/znjg/controller/SyLayerStyleManagerController.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneConfigRelationController.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneController.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/controller/SySceneDirRelationController.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDir.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyDirLayer.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayer.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerField.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyLayerStyle.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SyScene.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneConfigRelation.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/domain/SySceneDirRelation.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirLayerMapper.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyDirMapper.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerFieldMapper.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerMapper.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SyLayerStyleMapper.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneConfigRelationMapper.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneDirRelationMapper.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/mapper/SySceneMapper.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/qo/SyLayerStyleQo.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirLayerService.java → 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

shuili-system/src/main/java/com/kms/yg/znjg/service/SyDirService.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerFieldService.java → 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

shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerService.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/service/SyLayerStyleService.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneConfigRelationService.java → 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

shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneDirRelationService.java → 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;
 
 /**

shuili-system/src/main/java/com/kms/yg/znjg/service/SySceneService.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/vo/LayerForm.java → 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;
 

shuili-system/src/main/java/com/kms/yg/znjg/vo/SyDirVo.java → 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;

shuili-system/src/main/java/com/kms/yg/znjg/vo/SySceneVo.java → 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

shuili-system/src/main/resources/mapper/yg/znjg/SyDirLayerMapper.xml

@@ -2,8 +2,8 @@
 <!DOCTYPE mapper
     PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SyDirLayerMapper">
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyDirLayer">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SyDirLayerMapper">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyDirLayer">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="dirId" column="dir_id" jdbcType="VARCHAR"/>
         <result property="layerId" column="layer_id" jdbcType="VARCHAR"/>
@@ -16,7 +16,7 @@
         order_nm
     </sql>
 
-    <select id="findListByLayerId" resultType="com.kms.yg.znjg.domain.SyDirLayer">
+    <select id="findListByLayerId" resultType="com.kms.yxgh.znjg.domain.SyDirLayer">
         SELECT
         <include refid="Base_Column_List"/>
         FROM

shuili-system/src/main/resources/mapper/yg/znjg/SyDirMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SyDirMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SyDirMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyDir">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyDir">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="parentId" column="parent_id" jdbcType="VARCHAR"/>
@@ -26,7 +26,7 @@
     </sql>
 
     <!--获取指定场景指定类型所有的目录-->
-    <select id="findAll" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="findAll" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         SELECT
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -36,7 +36,7 @@
         ORDER BY y.order_nm
     </select>
 
-    <select id="findAllByQueryParams" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="findAllByQueryParams" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         SELECT
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -63,7 +63,7 @@
     </select>
 
     <!-- 根据id获取目录-->
-    <select id="findById" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="findById" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         select
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -113,7 +113,7 @@
     </update>
 
     <!--根据父id获取子节点数据-->
-    <select id="getChildrenByParentId" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="getChildrenByParentId" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         select
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -135,7 +135,7 @@
     </delete>
 
     <!--查找所有二级目录-->
-    <select id="findSecond" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="findSecond" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         SELECT
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -163,7 +163,7 @@
 
 
     <!--按id集合查找-->
-    <select id="findByIds" resultType="com.kms.yg.znjg.vo.SyDirVo">
+    <select id="findByIds" resultType="com.kms.yxgh.znjg.vo.SyDirVo">
         SELECT
         <include refid="Base_Column_List"/>,
         (SELECT count(1) from bs_sgc_qqjd_scene_dir_relation x
@@ -177,7 +177,7 @@
         ORDER BY order_nm
     </select>
 
-    <select id="findSecondInDirList" resultType="com.kms.yg.znjg.domain.SyDir">
+    <select id="findSecondInDirList" resultType="com.kms.yxgh.znjg.domain.SyDir">
         SELECT
         <include refid="Base_Column_List"/>
         FROM

shuili-system/src/main/resources/mapper/yg/znjg/SyLayerFieldMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SyLayerFieldMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SyLayerFieldMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyLayerField">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyLayerField">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="layerId" column="layer_id" jdbcType="VARCHAR"/>
         <result property="field" column="field" jdbcType="VARCHAR"/>

shuili-system/src/main/resources/mapper/yg/znjg/SyLayerMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SyLayerMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SyLayerMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyLayer">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyLayer">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="serviceName" column="service_name" jdbcType="VARCHAR"/>
         <result property="serviceNameAlias" column="service_name_alias" jdbcType="VARCHAR"/>
@@ -185,7 +185,7 @@
         </if>
     </select>
 
-    <select id="findOneById" resultType="com.kms.yg.znjg.domain.SyLayer">
+    <select id="findOneById" resultType="com.kms.yxgh.znjg.domain.SyLayer">
         select *
         from bs_sgc_qqjd_layer sl
         where is_valid = 1
@@ -204,7 +204,7 @@
     </select>
 
 
-    <select id="findSyLayerList" resultType="com.kms.yg.znjg.domain.SyLayer">
+    <select id="findSyLayerList" resultType="com.kms.yxgh.znjg.domain.SyLayer">
         SELECT
         <include refid="Base_Column_List_Query"/>
         ,IFNULL(orderNmTbl.orderNm,0) orderNm

shuili-system/src/main/resources/mapper/yg/znjg/SyLayerStyleMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SyLayerStyleMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SyLayerStyleMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyLayerStyle">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyLayerStyle">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="layerType" column="layer_type" jdbcType="VARCHAR"/>
@@ -22,7 +22,7 @@
         information,note,style_type,
         view_img,create_time,modify_time
     </sql>
-    <select id="findSyLayerList" resultType="com.kms.yg.znjg.domain.SyLayerStyle">
+    <select id="findSyLayerList" resultType="com.kms.yxgh.znjg.domain.SyLayerStyle">
         select
         <include refid="Base_Column_List"/>
         from bs_sgc_qqjd_layer_style

shuili-system/src/main/resources/mapper/yg/znjg/SySceneConfigRelationMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SySceneConfigRelationMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SySceneConfigRelationMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SySceneConfigRelation">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SySceneConfigRelation">
             <id property="id" column="id" jdbcType="VARCHAR"/>
             <result property="sceneId" column="scene_id" jdbcType="VARCHAR"/>
             <result property="initTime" column="init_time" jdbcType="TIMESTAMP"/>

shuili-system/src/main/resources/mapper/yg/znjg/SySceneDirRelationMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SySceneDirRelationMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SySceneDirRelationMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SySceneDirRelation">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SySceneDirRelation">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="sceneId" column="scene_id" jdbcType="VARCHAR"/>
         <result property="dirId" column="dir_id" jdbcType="VARCHAR"/>

shuili-system/src/main/resources/mapper/yg/znjg/SySceneMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.kms.yg.znjg.mapper.SySceneMapper">
+<mapper namespace="com.kms.yxgh.znjg.mapper.SySceneMapper">
 
-    <resultMap id="BaseResultMap" type="com.kms.yg.znjg.domain.SyScene">
+    <resultMap id="BaseResultMap" type="com.kms.yxgh.znjg.domain.SyScene">
         <id property="id" column="id" jdbcType="VARCHAR"/>
         <result property="name" column="name" jdbcType="VARCHAR"/>
         <result property="pubDate" column="pub_date" jdbcType="TIMESTAMP"/>
@@ -18,7 +18,7 @@
         ,y.name,y.pub_date,
         y.create_user,y.interface_address,description
     </sql>
-    <select id="findSceneList" resultType="com.kms.yg.znjg.vo.SySceneVo">
+    <select id="findSceneList" resultType="com.kms.yxgh.znjg.vo.SySceneVo">
         SELECT
         <include refid="Base_Column_List"/>,
         (SELECT COUNT(1) FROM bs_sgc_qqjd_scene_dir_relation x WHERE IS_VALID=1 and x.SCENE_ID=y.ID ) AS relationDirCount