系统配置集成system

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/controller/DateServicesExpressionController.java

@@ -0,0 +1,155 @@
+package org.jeecg.modules.dateServicesExpression.controller;
+
+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.dateServicesExpression.entity.DateServicesExpression;
+import org.jeecg.modules.dateServicesExpression.service.IDateServicesExpressionService;
+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;
+
+ /**
+ * @Description: 数据服务表达式
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Api(tags="数据服务表达式")
+@RestController
+@RequestMapping("/dateServicesExpression/dateServicesExpression")
+@Slf4j
+public class DateServicesExpressionController extends JeecgController<DateServicesExpression, IDateServicesExpressionService> {
+	@Autowired
+	private IDateServicesExpressionService dateServicesExpressionService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param dateServicesExpression
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "数据服务表达式-分页列表查询")
+	@ApiOperation(value="数据服务表达式-分页列表查询", notes="数据服务表达式-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<DateServicesExpression>> queryPageList(DateServicesExpression dateServicesExpression,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<DateServicesExpression> queryWrapper = QueryGenerator.initQueryWrapper(dateServicesExpression, req.getParameterMap());
+		Page<DateServicesExpression> page = new Page<DateServicesExpression>(pageNo, pageSize);
+		IPage<DateServicesExpression> pageList = dateServicesExpressionService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param dateServicesExpression
+	 * @return
+	 */
+	@AutoLog(value = "数据服务表达式-添加")
+	@ApiOperation(value="数据服务表达式-添加", notes="数据服务表达式-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody DateServicesExpression dateServicesExpression) {
+		dateServicesExpressionService.save(dateServicesExpression);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param dateServicesExpression
+	 * @return
+	 */
+	@AutoLog(value = "数据服务表达式-编辑")
+	@ApiOperation(value="数据服务表达式-编辑", notes="数据服务表达式-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody DateServicesExpression dateServicesExpression) {
+		dateServicesExpressionService.updateById(dateServicesExpression);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "数据服务表达式-通过id删除")
+	@ApiOperation(value="数据服务表达式-通过id删除", notes="数据服务表达式-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		dateServicesExpressionService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "数据服务表达式-批量删除")
+	@ApiOperation(value="数据服务表达式-批量删除", notes="数据服务表达式-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.dateServicesExpressionService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "数据服务表达式-通过id查询")
+	@ApiOperation(value="数据服务表达式-通过id查询", notes="数据服务表达式-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<DateServicesExpression> queryById(@RequestParam(name="id",required=true) String id) {
+		DateServicesExpression dateServicesExpression = dateServicesExpressionService.getById(id);
+		if(dateServicesExpression==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(dateServicesExpression);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param dateServicesExpression
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DateServicesExpression dateServicesExpression) {
+        return super.exportXls(request, dateServicesExpression, DateServicesExpression.class, "数据服务表达式");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, DateServicesExpression.class);
+    }
+
+}

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/entity/DateServicesExpression.java

@@ -0,0 +1,73 @@
+package org.jeecg.modules.dateServicesExpression.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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 数据服务表达式
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("date_services_expression")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="date_services_expression对象", description="数据服务表达式")
+public class DateServicesExpression implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**名称*/
+	@Excel(name = "名称", width = 15)
+    @ApiModelProperty(value = "名称")
+    private String name;
+	/**描述*/
+	@Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+	/**表达式*/
+	@Excel(name = "表达式", width = 15)
+    @ApiModelProperty(value = "表达式")
+    private String formula;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    @Dict(dicCode = "expression_status")
+    private String status;
+}

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/mapper/DateServicesExpressionMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.dateServicesExpression.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.dateServicesExpression.entity.DateServicesExpression;
+
+/**
+ * @Description: 数据服务表达式
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface DateServicesExpressionMapper extends BaseMapper<DateServicesExpression> {
+
+}

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/mapper/xml/DateServicesExpressionMapper.xml

@@ -0,0 +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.dateServicesExpression.mapper.DateServicesExpressionMapper">
+
+</mapper>

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/service/IDateServicesExpressionService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.dateServicesExpression.service;
+
+import org.jeecg.modules.dateServicesExpression.entity.DateServicesExpression;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 数据服务表达式
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface IDateServicesExpressionService extends IService<DateServicesExpression> {
+
+}

zgztBus/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/dateServicesExpression/service/impl/DateServicesExpressionServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.dateServicesExpression.service.impl;
+
+import org.jeecg.modules.dateServicesExpression.entity.DateServicesExpression;
+import org.jeecg.modules.dateServicesExpression.mapper.DateServicesExpressionMapper;
+import org.jeecg.modules.dateServicesExpression.service.IDateServicesExpressionService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 数据服务表达式
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Service
+public class DateServicesExpressionServiceImpl extends ServiceImpl<DateServicesExpressionMapper, DateServicesExpression> implements IDateServicesExpressionService {
+
+}

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

@@ -0,0 +1,168 @@
+package org.jeecg.modules.peaksAndValleysTimeConfig.controller;
+
+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;
+
+ /**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Api(tags="峰平谷时段配置")
+@RestController
+@RequestMapping("/systemConfig/peaksAndValleysTimeConfig")
+@Slf4j
+public class PeaksAndValleysTimeConfigController extends JeecgController<PeaksAndValleysTimeConfig, IPeaksAndValleysTimeConfigService> {
+	@Autowired
+	private IPeaksAndValleysTimeConfigService peaksAndValleysTimeConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param peaksAndValleysTimeConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "峰平谷时段配置-分页列表查询")
+	@ApiOperation(value="峰平谷时段配置-分页列表查询", notes="峰平谷时段配置-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<PeaksAndValleysTimeConfig>> queryPageList(PeaksAndValleysTimeConfig peaksAndValleysTimeConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<PeaksAndValleysTimeConfig> queryWrapper = QueryGenerator.initQueryWrapper(peaksAndValleysTimeConfig, req.getParameterMap());
+		Page<PeaksAndValleysTimeConfig> page = new Page<PeaksAndValleysTimeConfig>(pageNo, pageSize);
+		IPage<PeaksAndValleysTimeConfig> pageList = peaksAndValleysTimeConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+
+	 /**
+	  * 获取峰平谷时段配置
+	  *
+	  * @return
+	  */
+	 //@AutoLog(value = "峰平谷时段配置-分页列表查询")
+	 @ApiOperation(value="峰平谷时段配置-获取峰平谷时段配置", notes="峰平谷时段配置-获取峰平谷时段配置")
+	 @GetMapping(value = "/get")
+	 public Result<PeaksAndValleysTimeConfigParam> get() {
+		 PeaksAndValleysTimeConfigParam result = peaksAndValleysTimeConfigService.get();
+		 return Result.OK(result);
+	 }
+
+	/**
+	 *   添加
+	 *
+	 * @param peaksAndValleysTimeConfig
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷时段配置-添加")
+	@ApiOperation(value="峰平谷时段配置-添加", notes="峰平谷时段配置-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody PeaksAndValleysTimeConfig peaksAndValleysTimeConfig) {
+		peaksAndValleysTimeConfigService.save(peaksAndValleysTimeConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷时段配置-编辑")
+	@ApiOperation(value="峰平谷时段配置-编辑", notes="峰平谷时段配置-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody PeaksAndValleysTimeConfigParam peaksAndValleysTimeConfigParam) {
+		peaksAndValleysTimeConfigService.edit(peaksAndValleysTimeConfigParam);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷时段配置-通过id删除")
+	@ApiOperation(value="峰平谷时段配置-通过id删除", notes="峰平谷时段配置-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		peaksAndValleysTimeConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷时段配置-批量删除")
+	@ApiOperation(value="峰平谷时段配置-批量删除", notes="峰平谷时段配置-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.peaksAndValleysTimeConfigService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "峰平谷时段配置-通过id查询")
+	@ApiOperation(value="峰平谷时段配置-通过id查询", notes="峰平谷时段配置-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<PeaksAndValleysTimeConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		PeaksAndValleysTimeConfig peaksAndValleysTimeConfig = peaksAndValleysTimeConfigService.getById(id);
+		if(peaksAndValleysTimeConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(peaksAndValleysTimeConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param peaksAndValleysTimeConfig
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, PeaksAndValleysTimeConfig peaksAndValleysTimeConfig) {
+        return super.exportXls(request, peaksAndValleysTimeConfig, PeaksAndValleysTimeConfig.class, "峰平谷时段配置");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, PeaksAndValleysTimeConfig.class);
+    }
+
+}

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

@@ -0,0 +1,70 @@
+package org.jeecg.modules.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;
+
+/**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("peaks_and_valleys_time_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="peaks_and_valleys_time_config对象", description="峰平谷时段配置")
+public class PeaksAndValleysTimeConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+	/**创建日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+	/**更新日期*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+	/**开始时间*/
+	@Excel(name = "开始时间", width = 20, format = "HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern="HH:mm:ss")
+    @ApiModelProperty(value = "开始时间")
+    private java.util.Date startTime;
+	/**结束时间*/
+	@Excel(name = "结束时间", width = 20, format = "HH:mm:ss")
+	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
+    @DateTimeFormat(pattern="HH:mm:ss")
+    @ApiModelProperty(value = "结束时间")
+    private java.util.Date endTime;
+	/**峰平谷类型*/
+	@Excel(name = "峰平谷类型", width = 15)
+    @ApiModelProperty(value = "峰平谷类型(0:峰 1:平 2:谷)")
+    private String type;
+}

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

@@ -0,0 +1,34 @@
+package org.jeecg.modules.peaksAndValleysTimeConfig.entity;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="峰平谷时段配置请求参数", description="峰平谷时段配置请求参数")
+public class PeaksAndValleysTimeConfigParam implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "峰")
+    private List<PeaksAndValleysTimeConfig> peaks;
+
+    @ApiModelProperty(value = "平")
+    private List<PeaksAndValleysTimeConfig> flat;
+
+    @ApiModelProperty(value = "谷")
+    private List<PeaksAndValleysTimeConfig> valleys;
+
+}

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

@@ -0,0 +1,15 @@
+package org.jeecg.modules.peaksAndValleysTimeConfig.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+
+/**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface PeaksAndValleysTimeConfigMapper extends BaseMapper<PeaksAndValleysTimeConfig> {
+
+}

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

@@ -0,0 +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>

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.peaksAndValleysTimeConfig.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+
+
+/**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+public interface IPeaksAndValleysTimeConfigService extends IService<PeaksAndValleysTimeConfig> {
+
+    PeaksAndValleysTimeConfigParam get();
+
+    void edit(PeaksAndValleysTimeConfigParam peaksAndValleysTimeConfigParam);
+}

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

@@ -0,0 +1,53 @@
+package org.jeecg.modules.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.springframework.stereotype.Service;
+
+/**
+ * @Description: 峰平谷时段配置
+ * @Author: jeecg-boot
+ * @Date:   2024-09-25
+ * @Version: V1.0
+ */
+@Service
+public class PeaksAndValleysTimeConfigServiceImpl extends ServiceImpl<PeaksAndValleysTimeConfigMapper, PeaksAndValleysTimeConfig> implements IPeaksAndValleysTimeConfigService {
+
+    @Override
+    public PeaksAndValleysTimeConfigParam get() {
+        PeaksAndValleysTimeConfigParam res = new PeaksAndValleysTimeConfigParam();
+        //获取峰
+        res.setPeaks(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"0").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        //获取平
+        res.setFlat(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"1").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        //获取谷
+        res.setValleys(baseMapper.selectList(new LambdaQueryWrapper<PeaksAndValleysTimeConfig>()
+                .eq(PeaksAndValleysTimeConfig::getType,"2").orderByAsc(PeaksAndValleysTimeConfig::getStartTime)));
+        return res;
+    }
+
+    @Override
+    public void edit(PeaksAndValleysTimeConfigParam peaksAndValleysTimeConfigParam) {
+        //先删后增
+        //删除所有配置
+        baseMapper.delete(null);
+        //添加峰时段配置
+        peaksAndValleysTimeConfigParam.getPeaks().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+        //添加平时段配置
+        peaksAndValleysTimeConfigParam.getFlat().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+        //添加谷时段配置
+        peaksAndValleysTimeConfigParam.getValleys().forEach(peaksAndValleysTimeConfig -> {
+            baseMapper.insert(peaksAndValleysTimeConfig);
+        });
+    }
+}

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

@@ -0,0 +1,168 @@
+package org.jeecg.modules.systemVariable.controller;
+
+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;
+
+ /**
+ * @Description: 系统变量表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-11
+ * @Version: V1.0
+ */
+@Api(tags="系统变量表")
+@RestController
+@RequestMapping("/systemConfig/systemVariable")
+@Slf4j
+public class SystemVariableController extends JeecgController<SystemVariable, ISystemVariableService> {
+	 @Autowired
+	 private ISystemVariableService systemVariableService;
+
+	 /**
+	  * 分页列表查询
+	  *
+	  * @param systemVariable
+	  * @param pageNo
+	  * @param pageSize
+	  * @param req
+	  * @return
+	  */
+	 //@AutoLog(value = "系统变量表-分页列表查询")
+	 @ApiOperation(value="系统变量表-分页列表查询", notes="系统变量表-分页列表查询")
+	 @GetMapping(value = "/list")
+	 public Result<IPage<SystemVariable>> queryPageList(SystemVariable systemVariable,
+														@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+														@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		 QueryWrapper<SystemVariable> queryWrapper = QueryGenerator.initQueryWrapper(systemVariable, req.getParameterMap());
+		 Page<SystemVariable> page = new Page<SystemVariable>(pageNo, pageSize);
+		 IPage<SystemVariable> pageList = systemVariableService.page(page, queryWrapper);
+		 return Result.OK(pageList);
+	 }
+
+	 /**
+	  *   添加
+	  *
+	  * @param systemVariable
+	  * @return
+	  */
+	 @AutoLog(value = "系统变量表-添加")
+	 @ApiOperation(value="系统变量表-添加", notes="系统变量表-添加")
+	 @PostMapping(value = "/add")
+	 public Result<String> add(@RequestBody SystemVariable systemVariable) {
+		 systemVariableService.save(systemVariable);
+		 return Result.OK("添加成功！");
+	 }
+
+	 /**
+	  *  编辑
+	  *
+	  * @param systemVariable
+	  * @return
+	  */
+	 @AutoLog(value = "系统变量表-编辑")
+	 @ApiOperation(value="系统变量表-编辑", notes="系统变量表-编辑")
+	 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	 public Result<String> edit(@RequestBody SystemVariable systemVariable) {
+		 systemVariableService.updateById(systemVariable);
+		 return Result.OK("编辑成功!");
+	 }
+
+	 /**
+	  *   通过id删除
+	  *
+	  * @param id
+	  * @return
+	  */
+	 @AutoLog(value = "系统变量表-通过id删除")
+	 @ApiOperation(value="系统变量表-通过id删除", notes="系统变量表-通过id删除")
+	 @DeleteMapping(value = "/delete")
+	 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		 systemVariableService.removeById(id);
+		 return Result.OK("删除成功!");
+	 }
+
+	 /**
+	  *  批量删除
+	  *
+	  * @param ids
+	  * @return
+	  */
+	 @AutoLog(value = "系统变量表-批量删除")
+	 @ApiOperation(value="系统变量表-批量删除", notes="系统变量表-批量删除")
+	 @DeleteMapping(value = "/deleteBatch")
+	 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		 this.systemVariableService.removeByIds(Arrays.asList(ids.split(",")));
+		 return Result.OK("批量删除成功!");
+	 }
+
+	 /**
+	  * 通过id查询
+	  *
+	  * @param id
+	  * @return
+	  */
+	 //@AutoLog(value = "系统变量表-通过id查询")
+	 @ApiOperation(value="系统变量表-通过id查询", notes="系统变量表-通过id查询")
+	 @GetMapping(value = "/queryById")
+	 public Result<SystemVariable> queryById(@RequestParam(name="id",required=true) String id) {
+		 SystemVariable systemVariable = systemVariableService.getById(id);
+		 if(systemVariable==null) {
+			 return Result.error("未找到对应数据");
+		 }
+		 return Result.OK(systemVariable);
+	 }
+
+	 /**
+	  * 导出excel模板
+	  *
+	  * @param request
+	  */
+	 @ApiOperation(value="系统变量表-导出excel模板", notes="系统变量表-导出excel模板")
+	 @RequestMapping(value = "/exportXls")
+	 public ModelAndView exportXls(HttpServletRequest request) {
+		 LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		 ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+		 mv.addObject(NormalExcelConstants.FILE_NAME, "系统变量");
+		 mv.addObject(NormalExcelConstants.CLASS, SystemVariable.class);
+		 mv.addObject(NormalExcelConstants.PARAMS, new ExportParams("系统变量", "导出人:"+sysUser.getRealname(), "系统变量"));
+		 mv.addObject(NormalExcelConstants.DATA_LIST, new ArrayList<SystemVariable>());
+		 return mv;
+	 }
+
+	 /**
+	  * 通过excel导入数据
+	  *
+	  * @param request
+	  * @param response
+	  * @return
+	  */
+	 @ApiOperation(value="系统变量表-excel导入", notes="系统变量表-excel导入")
+	 @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	 public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		 return super.importExcel(request, response, SystemVariable.class);
+	 }
+
+}

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

@@ -0,0 +1,81 @@
+package org.jeecg.modules.systemVariable.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.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+
+/**
+ * @Description: 系统变量表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-11
+ * @Version: V1.0
+ */
+@Data
+@TableName("system_variable")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="system_variable对象", description="系统变量表")
+public class SystemVariable implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**主键*/
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private String id;
+    /**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private String createBy;
+    /**创建日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+    /**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private String updateBy;
+    /**更新日期*/
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+    /**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private String sysOrgCode;
+    /**变量名称*/
+    @Excel(name = "变量名称", width = 15)
+    @ApiModelProperty(value = "变量名称")
+    private String variableName;
+    /**变量地址*/
+    @Excel(name = "变量地址", width = 15)
+    @ApiModelProperty(value = "变量地址")
+    private String variableAddress;
+    /**数据类型*/
+    @Excel(name = "数据类型", width = 15)
+    @ApiModelProperty(value = "数据类型")
+    @Dict(dicCode = "sysvariable_datatype")
+    private String dataType;
+    /**默认值*/
+    @Excel(name = "默认值", width = 15)
+    @ApiModelProperty(value = "默认值")
+    private String defaultValue;
+    /**描述*/
+    @Excel(name = "描述", width = 15)
+    @ApiModelProperty(value = "描述")
+    private String description;
+    /**状态*/
+    @Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    @Dict(dicCode = "sysvariable_status")
+    private String status;
+}

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.systemVariable.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.systemVariable.entity.SystemVariable;
+
+/**
+ * @Description: 系统变量表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-11
+ * @Version: V1.0
+ */
+public interface SystemVariableMapper extends BaseMapper<SystemVariable> {
+
+}

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

@@ -0,0 +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.systemVariable.mapper.SystemVariableMapper">
+
+</mapper>

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.systemVariable.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.systemVariable.entity.SystemVariable;
+
+/**
+ * @Description: 系统变量表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-11
+ * @Version: V1.0
+ */
+public interface ISystemVariableService extends IService<SystemVariable> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.systemVariable.service.impl;
+
+
+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: 系统变量表
+ * @Author: jeecg-boot
+ * @Date:   2024-09-11
+ * @Version: V1.0
+ */
+@Service
+public class SystemVariableServiceImpl extends ServiceImpl<SystemVariableMapper, SystemVariable> implements ISystemVariableService {
+
+}

zgztBus/jeecg-server-cloud/jeecg-cloud-nacos/docs/config/jeecg-gateway-router.json

@@ -7,7 +7,10 @@
       "_genkey_0": "/sys/**",
       "_genkey_1": "/jmreport/**",
       "_genkey_3": "/online/**",
-      "_genkey_4": "/generic/**"
+      "_genkey_4": "/generic/**",
+      "_genkey_5": "/dateServicesExpression/dateServicesExpression/**",
+      "_genkey_6": "/systemConfig/peaksAndValleysTimeConfig/**",
+      "_genkey_7": "/systemConfig/systemVariable/**"
     }
   }],
   "filters": [],