峰平谷字典修改02

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

@@ -1,27 +1,25 @@
 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.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfig;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.entity.PeaksAndValleysTimeConfigParam;
+import org.jeecg.modules.systemConfig.peaksAndValleysTimeConfig.service.IPeaksAndValleysTimeConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
 
  /**
  * @Description: 峰平谷时段配置
@@ -62,6 +60,7 @@ public class PeaksAndValleysTimeConfigController extends JeecgController<PeaksAn
 	 /**
 	  * 获取峰平谷时段配置
 	  *
+	  *
 	  * @return
 	  */
 	 //@AutoLog(value = "峰平谷时段配置-分页列表查询")

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

@@ -57,13 +57,13 @@ public class PeaksAndValleysTimeConfig implements Serializable {
 	@JsonFormat(timezone = "GMT+8",pattern = "HH:mm:ss")
     @DateTimeFormat(pattern="HH:mm:ss")
     @ApiModelProperty(value = "开始时间")
-    private java.util.Date startTime;
+    private String 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;
+    private String endTime;
 	/**峰平谷类型*/
 	@Excel(name = "峰平谷类型", width = 15)
     @ApiModelProperty(value = "峰平谷类型(尖：tops 峰:peaks 平:flat 谷:valleys)")