峰平谷时段配置位置调整

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/controller/PeaksAndValleysTimeConfigController.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/controller/PeaksAndValleysTimeConfigController.java

@@ -1,25 +1,27 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.controller;
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.controller;
+
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
-import org.jeecg.modules.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
  * @Description: 峰平谷时段配置

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfig.java

@@ -1,18 +1,18 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.entity;
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity;
+
+import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
 
 /**
  * @Description: 峰平谷时段配置

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfigParam.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/entity/PeaksAndValleysTimeConfigParam.java

@@ -1,10 +1,16 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.entity;
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.List;

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/mapper/PeaksAndValleysTimeConfigMapper.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/mapper/PeaksAndValleysTimeConfigMapper.java

@@ -1,8 +1,7 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.mapper;
-
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.mapper;
 
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 
 /**
  * @Description: 峰平谷时段配置

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/mapper/xml/PeaksAndValleysTimeConfigMapper.xml → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/mapper/xml/PeaksAndValleysTimeConfigMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.peaksAndValleysTimeConfig.mapper.PeaksAndValleysTimeConfigMapper">
+<mapper namespace="org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.mapper.PeaksAndValleysTimeConfigMapper">
 
 </mapper>

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/service/IPeaksAndValleysTimeConfigService.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/IPeaksAndValleysTimeConfigService.java

@@ -1,9 +1,9 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.service;
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
-
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
 
 /**
  * @Description: 峰平谷时段配置

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/peaksAndValleysTimeConfig/service/impl/PeaksAndValleysTimeConfigServiceImpl.java

@@ -1,13 +1,14 @@
-package org.jeecg.modules.peaksAndValleysTimeConfig.service.impl;
+package org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
-import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
-import org.jeecg.modules.peaksAndValleysTimeConfig.mapper.PeaksAndValleysTimeConfigMapper;
-import org.jeecg.modules.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.mapper.PeaksAndValleysTimeConfigMapper;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
 /**
  * @Description: 峰平谷时段配置
  * @Author: jeecg-boot

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/systemVariable/controller/SystemVariableController.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/controller/SystemVariableController.java

@@ -1,30 +1,33 @@
-package org.jeecg.modules.systemVariable.controller;
+package org.jeecg.modules.systemConfig.systemVariable.controller;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.systemConfig.systemVariable.entity.SystemVariable;
+import org.jeecg.modules.systemConfig.systemVariable.service.ISystemVariableService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.SecurityUtils;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
+
 import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.systemVariable.entity.SystemVariable;
-import org.jeecg.modules.systemVariable.service.ISystemVariableService;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Arrays;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 
  /**
  * @Description: 系统变量表

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/systemVariable/entity/SystemVariable.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/entity/SystemVariable.java

@@ -1,19 +1,19 @@
-package org.jeecg.modules.systemVariable.entity;
+package org.jeecg.modules.systemConfig.systemVariable.entity;
+
+import java.io.Serializable;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
 
 /**
  * @Description: 系统变量表

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/systemVariable/mapper/SystemVariableMapper.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/mapper/SystemVariableMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.systemVariable.mapper;
+package org.jeecg.modules.systemConfig.systemVariable.mapper;
 
+import org.jeecg.modules.systemConfig.systemVariable.entity.SystemVariable;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.systemVariable.entity.SystemVariable;
 
 /**
  * @Description: 系统变量表

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/systemVariable/service/ISystemVariableService.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/service/ISystemVariableService.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.systemVariable.service;
+package org.jeecg.modules.systemConfig.systemVariable.service;
 
+import org.jeecg.modules.systemConfig.systemVariable.entity.SystemVariable;
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.systemVariable.entity.SystemVariable;
 
 /**
  * @Description: 系统变量表

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/systemVariable/service/impl/SystemVariableServiceImpl.java → zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/systemConfig/systemVariable/service/impl/SystemVariableServiceImpl.java

@@ -1,11 +1,11 @@
-package org.jeecg.modules.systemVariable.service.impl;
+package org.jeecg.modules.systemConfig.systemVariable.service.impl;
 
+import org.jeecg.modules.systemConfig.systemVariable.entity.SystemVariable;
+import org.jeecg.modules.systemConfig.systemVariable.mapper.SystemVariableMapper;
+import org.jeecg.modules.systemConfig.systemVariable.service.ISystemVariableService;
+import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.systemVariable.entity.SystemVariable;
-import org.jeecg.modules.systemVariable.mapper.SystemVariableMapper;
-import org.jeecg.modules.systemVariable.service.ISystemVariableService;
-import org.springframework.stereotype.Service;
 
 /**
  * @Description: 系统变量表