Merge branch 'dev' of 123.57.213.14:guoqiang.duan/zgzt-bus-java into dev

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/controller/LeanEventsHostController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
+import org.jeecg.modules.events.entity.LeanEventsHostResult;
 import org.jeecg.modules.events.service.ILeanEventsHostService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -23,7 +24,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 
- /**
+/**
  * @Description: 精益事件设备启停配置表
  * @Author: jeecg-boot
  * @Date:   2024-09-20
@@ -36,7 +37,7 @@ import java.util.List;
 public class LeanEventsHostController extends JeecgController<LeanEventsHost, ILeanEventsHostService> {
 	@Autowired
 	private ILeanEventsHostService leanEventsHostService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -50,15 +51,15 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@ApiOperation(value="精益事件设备启停配置表-分页列表查询", notes="精益事件设备启停配置表-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<IPage<LeanEventsHost>> queryPageList(LeanEventsHost leanEventsHost,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
+													   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+													   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+													   HttpServletRequest req) {
 		QueryWrapper<LeanEventsHost> queryWrapper = QueryGenerator.initQueryWrapper(leanEventsHost, req.getParameterMap());
 		Page<LeanEventsHost> page = new Page<LeanEventsHost>(pageNo, pageSize);
 		IPage<LeanEventsHost> pageList = leanEventsHostService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -71,9 +72,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@PostMapping(value = "/add")
 	public Result<String> add(@RequestBody LeanEventsHost leanEventsHost) {
 		leanEventsHostService.save(leanEventsHost);
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -88,7 +90,7 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 		leanEventsHostService.edit(leanEventsHostEditParam);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -101,9 +103,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@DeleteMapping(value = "/delete")
 	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
 		leanEventsHostService.removeById(id);
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -115,9 +118,10 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 	@DeleteMapping(value = "/deleteBatch")
 	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
 		this.leanEventsHostService.removeByIds(Arrays.asList(ids.split(",")));
+		leanEventsHostService.updateEviceInformationCache();
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *
@@ -135,41 +139,41 @@ public class LeanEventsHostController extends JeecgController<LeanEventsHost, IL
 		return Result.OK(leanEventsHost);
 	}
 
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param leanEventsHost
-    */
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, LeanEventsHost leanEventsHost) {
-        return super.exportXls(request, leanEventsHost, LeanEventsHost.class, "精益事件设备启停配置表");
-    }
+	/**
+	 * 导出excel
+	 *
+	 * @param request
+	 * @param leanEventsHost
+	 */
+	@RequestMapping(value = "/exportXls")
+	public ModelAndView exportXls(HttpServletRequest request, LeanEventsHost leanEventsHost) {
+		return super.exportXls(request, leanEventsHost, LeanEventsHost.class, "精益事件设备启停配置表");
+	}
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+	/**
+	 * 通过excel导入数据
+	 *
+	 * @param request
+	 * @param response
+	 * @return
+	 */
+	@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
 	@ApiOperation(value="精益事件设备启停配置表-导入", notes="精益事件设备启停配置表-导入")
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, LeanEventsHost.class);
-    }
+	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+		return super.importExcel(request, response, LeanEventsHost.class);
+	}
 
-	 /**
-	  *  获取精益事件设备启停配置
-	  *
-	  * @return
-	  */
-	 @AutoLog(value = "获取精益事件设备启停配置")
-	 @ApiOperation(value="获取精益事件设备启停配置", notes="获取精益事件设备启停配置")
-	 @GetMapping(value = "/getConfig")
-	 public Result<List<LeanEventsHost>> getConfig(String id) {
-		 List<LeanEventsHost> leanEventsHosts = leanEventsHostService.getConfig(id);
-		 return Result.OK(leanEventsHosts);
-	 }
+	/**
+	 *  获取精益事件设备启停配置
+	 *
+	 * @return
+	 */
+	@AutoLog(value = "获取精益事件设备启停配置")
+	@ApiOperation(value="获取精益事件设备启停配置", notes="获取精益事件设备启停配置")
+	@GetMapping(value = "/getConfig")
+	public Result<List<LeanEventsHostResult>> getConfig(String id) {
+		List<LeanEventsHostResult> leanEventsHosts = leanEventsHostService.getConfig(id);
+		return Result.OK(leanEventsHosts);
+	}
 
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/entity/LeanEventsHostEditParam.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
 
 import java.util.List;
 
@@ -18,4 +19,7 @@ public class LeanEventsHostEditParam {
     @ApiModelProperty(value = "精益事件设备启停配置")
     private List<LeanEventsHost> leanEventsHosts;
 
+    @ApiModelProperty(value = "精益事件设备启停配置")
+    private List<LeanEventsHostConfig> leanEventsHostConfigs;
+
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/entity/LeanEventsHostResult.java

@@ -0,0 +1,71 @@
+package org.jeecg.modules.events.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.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+@TableName("lean_events_host")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="lean_events_host对象", description="精益事件设备启停配置表")
+public class LeanEventsHostResult {
+    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 deviceInformationId;
+    /**辅设备配置*/
+    @Excel(name = "辅设备配置", width = 15)
+    @ApiModelProperty(value = "辅设备配置")
+    private String deviceInformationList;
+    /**设备事件*/
+    @Excel(name = "设备事件", width = 15, dicCode = "lean_events_host")
+    @Dict(dicCode = "lean_events_host")
+    @ApiModelProperty(value = "设备事件")
+    private String deviceInformationType;
+    /**精益事件id*/
+    @Excel(name = "精益事件id", width = 15)
+    @ApiModelProperty(value = "精益事件id")
+    private String eventsId;
+    
+    @ApiModelProperty(value = "精益事件设备启停配置")
+    private List<LeanEventsHostConfig> leanEventsHostConfigs;
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/ILeanEventsHostService.java

@@ -1,8 +1,9 @@
 package org.jeecg.modules.events.service;
 
-import org.jeecg.modules.events.entity.LeanEventsHost;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
+import org.jeecg.modules.events.entity.LeanEventsHostResult;
 
 import java.util.List;
 
@@ -18,5 +19,7 @@ public interface ILeanEventsHostService extends IService<LeanEventsHost> {
     void edit(LeanEventsHostEditParam leanEventsHostEditParam);
 
     //获取精益事件设备启停配置
-    List<LeanEventsHost> getConfig(String id);
+    List<LeanEventsHostResult> getConfig(String id);
+
+    void updateEviceInformationCache();
 }

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/events/service/impl/LeanEventsHostServiceImpl.java

@@ -5,12 +5,20 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.events.entity.LeanEventsHost;
 import org.jeecg.modules.events.entity.LeanEventsHostEditParam;
+import org.jeecg.modules.events.entity.LeanEventsHostResult;
 import org.jeecg.modules.events.mapper.DeviceInformationMapper;
 import org.jeecg.modules.events.mapper.LeanEventsHostMapper;
 import org.jeecg.modules.events.service.ILeanEventsHostService;
+import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
+import org.jeecg.modules.leanEventHostConfig.mapper.LeanEventsHostConfigMapper;
+import org.jeecg.modules.leanEventHostConfig.service.ILeanEventsHostConfigService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,22 +35,44 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
     @Resource
     private DeviceInformationMapper deviceInformationMapper;
 
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    @Resource
+    private LeanEventsHostConfigMapper leanEventsHostConfigMapper;
+
+    @Resource
+    private ILeanEventsHostConfigService leanEventsHostConfigService;
+
     @Override
     public void edit(LeanEventsHostEditParam leanEventsHostEditParam) {
         if (oConvertUtils.listIsNotEmpty(leanEventsHostEditParam.getLeanEventsHosts())) {
             List<LeanEventsHost> leanEventsHostList = leanEventsHostEditParam.getLeanEventsHosts();
             LambdaQueryWrapper<LeanEventsHost> deleteQuery = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, leanEventsHostList.get(0).getEventsId());
             baseMapper.delete(deleteQuery);
+
+            LambdaQueryWrapper<LeanEventsHostConfig> deleteQuery1 = new LambdaQueryWrapper<LeanEventsHostConfig>().eq(LeanEventsHostConfig::getEventsId, leanEventsHostList.get(0).getEventsId());
+            leanEventsHostConfigMapper.delete(deleteQuery1);
+
             leanEventsHostList.forEach(x -> {
                 if (oConvertUtils.isNotEmpty(x.getDeviceInformationList())) {
+                    // 保存精益事件启停配置信息
                     baseMapper.insert(x);
                 }
             });
+            List<LeanEventsHostConfig> leanEventsHostConfigList = leanEventsHostEditParam.getLeanEventsHostConfigs();
+            if (oConvertUtils.listIsNotEmpty(leanEventsHostConfigList)){
+                leanEventsHostConfigService.saveBatch(leanEventsHostConfigList);
+            }
         }
+        updateEviceInformationCache();
     }
 
     @Override
-    public List<LeanEventsHost> getConfig(String id) {
+    public List<LeanEventsHostResult> getConfig(String id) {
+
+        List<LeanEventsHostResult> leanEventsHostResultList = new ArrayList<>();
+
         LambdaQueryWrapper<LeanEventsHost> query = new LambdaQueryWrapper<LeanEventsHost>().eq(LeanEventsHost::getEventsId, id);
         List<LeanEventsHost> leanEventsHosts = baseMapper.selectList(query);
         leanEventsHosts.forEach(leanEventsHost -> {
@@ -61,7 +91,54 @@ public class LeanEventsHostServiceImpl extends ServiceImpl<LeanEventsHostMapper,
             // 更新 LeanEventsHost 对象的辅设备配置信息ID集
             leanEventsHost.setDeviceInformationList(String.join(",", resChildTites));
         });
-        return leanEventsHosts;
+
+        leanEventsHosts.forEach(x ->{
+            LeanEventsHostResult leanEventsHostResult = new LeanEventsHostResult();
+            BeanUtils.copyProperties(x, leanEventsHostResult);
+            leanEventsHostResultList.add(leanEventsHostResult);
+        });
+        if (!oConvertUtils.listIsNotEmpty(leanEventsHostResultList)){
+            return leanEventsHostResultList;
+        }
+        List<String> list =leanEventsHostResultList.stream().map(LeanEventsHostResult::getDeviceInformationList).collect(Collectors.toList());
+
+        List<String> deviceInformationIdIds = new ArrayList<>();
+        list.forEach(s ->{
+            deviceInformationIdIds.addAll(Arrays.asList(s.split(",")));
+        });
+        List<String> newDeviceInformationIdIds = new ArrayList<>();
+        deviceInformationIdIds.forEach(x ->{
+            String substring = x.substring(0, x.indexOf("|"));
+            newDeviceInformationIdIds.add(substring);
+            });
+        LambdaQueryWrapper<LeanEventsHostConfig> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(LeanEventsHostConfig::getDeviceInformationListId, newDeviceInformationIdIds);
+        List<LeanEventsHostConfig> leanEventsHostConfigList = leanEventsHostConfigService.list(wrapper);
+        if (oConvertUtils.listIsNotEmpty(leanEventsHostConfigList)){
+            leanEventsHostResultList.forEach(y ->y.setLeanEventsHostConfigs(leanEventsHostConfigList));
+        }
+        return leanEventsHostResultList;
+    }
+
+    /**
+     * 更新 精益事件设备启停配置表 中的主设备ID集合、辅设备ID集合
+     */
+    @Override
+    public void updateEviceInformationCache() {
+        String keyMainString = String.format("sys:opcSynData::%s","deviceInformationMainIds");
+        String keySubString = String.format("sys:opcSynData::%s","deviceInformationSubIds");
+        List<LeanEventsHost> leanEventsHostList = baseMapper.selectList(new LambdaQueryWrapper<LeanEventsHost>().isNotNull(LeanEventsHost::getEventsId));
+        if (oConvertUtils.listIsNotEmpty(leanEventsHostList)){
+            List<String> mainDeviceInformationIds = leanEventsHostList.stream().map(LeanEventsHost::getDeviceInformationId).distinct().collect(Collectors.toList());
+            List<String> subDeviceInformationList = leanEventsHostList.stream().map(LeanEventsHost::getDeviceInformationList).collect(Collectors.toList());
+            List<String> allSubDeviceInformationList = new ArrayList<>();
+            subDeviceInformationList.forEach(x ->{
+                allSubDeviceInformationList.addAll(Arrays.asList(x.split(",")));
+            });
+            List<String> cacheSubDeviceInformationList = allSubDeviceInformationList.stream().distinct().collect(Collectors.toList());
+            redisTemplate.opsForValue().set(keyMainString, mainDeviceInformationIds);
+            redisTemplate.opsForValue().set(keySubString, cacheSubDeviceInformationList);
+        }
     }
 
     /**

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/controller/FpgLeanModelController.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.fpgLeanModel.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.authz.annotation.RequiresPermissions;
+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.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.service.IFpgLeanModelService;
+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-10-31
+ * @Version: V1.0
+ */
+@Api(tags="峰平谷模型")
+@RestController
+@RequestMapping("/fpgLeanModel/fpgLeanModel")
+@Slf4j
+public class FpgLeanModelController extends JeecgController<FpgLeanModel, IFpgLeanModelService> {
+	@Autowired
+	private IFpgLeanModelService fpgLeanModelService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param fpgLeanModel
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "峰平谷模型-分页列表查询")
+	@ApiOperation(value="峰平谷模型-分页列表查询", notes="峰平谷模型-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<FpgLeanModel>> queryPageList(FpgLeanModel fpgLeanModel,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<FpgLeanModel> queryWrapper = QueryGenerator.initQueryWrapper(fpgLeanModel, req.getParameterMap());
+		Page<FpgLeanModel> page = new Page<FpgLeanModel>(pageNo, pageSize);
+		IPage<FpgLeanModel> pageList = fpgLeanModelService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param fpgLeanModel
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷模型-添加")
+	@ApiOperation(value="峰平谷模型-添加", notes="峰平谷模型-添加")
+	@RequiresPermissions("fpgLeanModel:fpg_lean_model:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody FpgLeanModel fpgLeanModel) {
+		fpgLeanModelService.save(fpgLeanModel);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param fpgLeanModel
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷模型-编辑")
+	@ApiOperation(value="峰平谷模型-编辑", notes="峰平谷模型-编辑")
+	@RequiresPermissions("fpgLeanModel:fpg_lean_model:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody FpgLeanModel fpgLeanModel) {
+		fpgLeanModelService.updateById(fpgLeanModel);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷模型-通过id删除")
+	@ApiOperation(value="峰平谷模型-通过id删除", notes="峰平谷模型-通过id删除")
+	@RequiresPermissions("fpgLeanModel:fpg_lean_model:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		fpgLeanModelService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "峰平谷模型-批量删除")
+	@ApiOperation(value="峰平谷模型-批量删除", notes="峰平谷模型-批量删除")
+	@RequiresPermissions("fpgLeanModel:fpg_lean_model:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.fpgLeanModelService.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<FpgLeanModel> queryById(@RequestParam(name="id",required=true) String id) {
+		FpgLeanModel fpgLeanModel = fpgLeanModelService.getById(id);
+		if(fpgLeanModel==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(fpgLeanModel);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param fpgLeanModel
+    */
+    @RequiresPermissions("fpgLeanModel:fpg_lean_model:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, FpgLeanModel fpgLeanModel) {
+        return super.exportXls(request, fpgLeanModel, FpgLeanModel.class, "峰平谷模型");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("fpgLeanModel:fpg_lean_model:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, FpgLeanModel.class);
+    }
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/entity/FpgLeanModel.java

@@ -0,0 +1,113 @@
+package org.jeecg.modules.fpgLeanModel.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.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @Description: 峰平谷模型
+ * @Author: jeecg-boot
+ * @Date:   2024-10-31
+ * @Version: V1.0
+ */
+@Data
+@TableName("fpg_lean_model")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="fpg_lean_model对象", description="峰平谷模型")
+public class FpgLeanModel 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 title;
+	/**模型编号*/
+	@Excel(name = "模型编号", width = 15)
+    @ApiModelProperty(value = "模型编号")
+    private String leanModelCode;
+	/**功率 1： 开启 2： 关闭*/
+	@Excel(name = "功率 1： 开启 2： 关闭", width = 15)
+    @ApiModelProperty(value = "功率 1： 开启 2： 关闭")
+    private Integer power;
+	/**统计单位*/
+	@Excel(name = "统计单位", width = 15)
+    @Dict(dicCode = "lean_model_unit")
+    @ApiModelProperty(value = "统计单位")
+    private String totalUnit;
+	/**班次 1*/
+	@Excel(name = "班次 1", width = 15)
+    @Dict(dicCode = "lean_model_class")
+    @ApiModelProperty(value = "班次 1")
+    private String classUnit;
+	/**尖计费单价(元)*/
+	@Excel(name = "尖计费单价(元)", width = 15)
+    @ApiModelProperty(value = "尖计费单价(元)")
+    private BigDecimal topsPrice;
+	/**状态*/
+	@Excel(name = "状态", width = 15)
+    @ApiModelProperty(value = "状态")
+    private String status;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private String remark;
+	/**峰计费单价(元)*/
+	@Excel(name = "峰计费单价(元)", width = 15)
+    @ApiModelProperty(value = "峰计费单价(元)")
+    private BigDecimal peaksPrice;
+	/**平计费单价(元)*/
+	@Excel(name = "平计费单价(元)", width = 15)
+    @ApiModelProperty(value = "平计费单价(元)")
+    private BigDecimal flatPrice;
+	/**谷计费单价(元)*/
+	@Excel(name = "谷计费单价(元)", width = 15)
+    @ApiModelProperty(value = "谷计费单价(元)")
+    private BigDecimal valleysPrice;
+	/**核算占比% 1：开启 2： 关闭*/
+	@Excel(name = "核算占比% 1：开启 2： 关闭", width = 15)
+    @Dict(dicCode = "proportion_run_status")
+    @ApiModelProperty(value = "核算占比% 1：开启 2： 关闭")
+    private Integer proportion;
+	/**运行时长 1：开启 2： 关闭*/
+	@Excel(name = "运行时长 1：开启 2： 关闭", width = 15)
+    @Dict(dicCode = "proportion_run_status")
+    @ApiModelProperty(value = "运行时长 1：开启 2： 关闭")
+    private Integer runTime;
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/mapper/FpgLeanModelMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fpgLeanModel.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+
+/**
+ * @Description: 峰平谷模型
+ * @Author: jeecg-boot
+ * @Date:   2024-10-31
+ * @Version: V1.0
+ */
+public interface FpgLeanModelMapper extends BaseMapper<FpgLeanModel> {
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/mapper/xml/FpgLeanModelMapper.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.fpgLeanModel.mapper.FpgLeanModelMapper">
+
+</mapper>

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/IFpgLeanModelService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.fpgLeanModel.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+
+/**
+ * @Description: 峰平谷模型
+ * @Author: jeecg-boot
+ * @Date:   2024-10-31
+ * @Version: V1.0
+ */
+public interface IFpgLeanModelService extends IService<FpgLeanModel> {
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/fpgLeanModel/service/impl/FpgLeanModelServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.fpgLeanModel.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.fpgLeanModel.entity.FpgLeanModel;
+import org.jeecg.modules.fpgLeanModel.mapper.FpgLeanModelMapper;
+import org.jeecg.modules.fpgLeanModel.service.IFpgLeanModelService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 峰平谷模型
+ * @Author: jeecg-boot
+ * @Date:   2024-10-31
+ * @Version: V1.0
+ */
+@Service
+public class FpgLeanModelServiceImpl extends ServiceImpl<FpgLeanModelMapper, FpgLeanModel> implements IFpgLeanModelService {
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/controller/LeanEventsHostConfigController.java

@@ -0,0 +1,162 @@
+package org.jeecg.modules.leanEventHostConfig.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.authz.annotation.RequiresPermissions;
+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.leanEventHostConfig.entity.LeanEventsHostConfig;
+import org.jeecg.modules.leanEventHostConfig.service.ILeanEventsHostConfigService;
+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-10-30
+ * @Version: V1.0
+ */
+@Api(tags="精益事件配置关联表")
+@RestController
+@RequestMapping("/leanEventHostConfig/leanEventsHostConfig")
+@Slf4j
+public class LeanEventsHostConfigController extends JeecgController<LeanEventsHostConfig, ILeanEventsHostConfigService> {
+	@Autowired
+	private ILeanEventsHostConfigService leanEventsHostConfigService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param leanEventsHostConfig
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "精益事件配置关联表-分页列表查询")
+	@ApiOperation(value="精益事件配置关联表-分页列表查询", notes="精益事件配置关联表-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<LeanEventsHostConfig>> queryPageList(LeanEventsHostConfig leanEventsHostConfig,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<LeanEventsHostConfig> queryWrapper = QueryGenerator.initQueryWrapper(leanEventsHostConfig, req.getParameterMap());
+		Page<LeanEventsHostConfig> page = new Page<LeanEventsHostConfig>(pageNo, pageSize);
+		IPage<LeanEventsHostConfig> pageList = leanEventsHostConfigService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param leanEventsHostConfig
+	 * @return
+	 */
+	@AutoLog(value = "精益事件配置关联表-添加")
+	@ApiOperation(value="精益事件配置关联表-添加", notes="精益事件配置关联表-添加")
+	@RequiresPermissions("leanEventHostConfig:lean_events_host_config:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody LeanEventsHostConfig leanEventsHostConfig) {
+		leanEventsHostConfigService.save(leanEventsHostConfig);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param leanEventsHostConfig
+	 * @return
+	 */
+	@AutoLog(value = "精益事件配置关联表-编辑")
+	@ApiOperation(value="精益事件配置关联表-编辑", notes="精益事件配置关联表-编辑")
+	@RequiresPermissions("leanEventHostConfig:lean_events_host_config:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody LeanEventsHostConfig leanEventsHostConfig) {
+		leanEventsHostConfigService.updateById(leanEventsHostConfig);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "精益事件配置关联表-通过id删除")
+	@ApiOperation(value="精益事件配置关联表-通过id删除", notes="精益事件配置关联表-通过id删除")
+	@RequiresPermissions("leanEventHostConfig:lean_events_host_config:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		leanEventsHostConfigService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "精益事件配置关联表-批量删除")
+	@ApiOperation(value="精益事件配置关联表-批量删除", notes="精益事件配置关联表-批量删除")
+	@RequiresPermissions("leanEventHostConfig:lean_events_host_config:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.leanEventsHostConfigService.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<LeanEventsHostConfig> queryById(@RequestParam(name="id",required=true) String id) {
+		LeanEventsHostConfig leanEventsHostConfig = leanEventsHostConfigService.getById(id);
+		if(leanEventsHostConfig==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(leanEventsHostConfig);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param leanEventsHostConfig
+    */
+    @RequiresPermissions("leanEventHostConfig:lean_events_host_config:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, LeanEventsHostConfig leanEventsHostConfig) {
+        return super.exportXls(request, leanEventsHostConfig, LeanEventsHostConfig.class, "精益事件配置关联表");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("leanEventHostConfig:lean_events_host_config:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, LeanEventsHostConfig.class);
+    }
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/entity/LeanEventsHostConfig.java

@@ -0,0 +1,78 @@
+package org.jeecg.modules.leanEventHostConfig.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.Date;
+
+/**
+ * @Description: 精益事件配置关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("lean_events_host_config")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="lean_events_host_config对象", description="精益事件配置关联表")
+public class LeanEventsHostConfig 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;
+	/**辅设备ID*/
+	@Excel(name = "辅设备ID", width = 15)
+    @ApiModelProperty(value = "辅设备ID")
+    private String deviceInformationListId;
+	/**运行时间*/
+	@Excel(name = "运行时间", width = 15)
+    @ApiModelProperty(value = "运行时间")
+    private String runTime;
+	/**功率限制*/
+	@Excel(name = "功率限制", width = 15)
+    @ApiModelProperty(value = "功率限制")
+    private String powerLimit;
+	/**限制类型*/
+	@Excel(name = "限制类型", width = 15)
+    @ApiModelProperty(value = "限制类型")
+    private String limitType;
+	/**拓展字段*/
+	@Excel(name = "拓展字段", width = 15)
+    @ApiModelProperty(value = "拓展字段")
+    private String remark;
+    @Excel(name = "精益事件id", width = 15)
+    @ApiModelProperty(value = "精益事件id")
+    private String eventsId;
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/mapper/LeanEventsHostConfigMapper.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.leanEventHostConfig.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
+
+/**
+ * @Description: 精益事件配置关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-30
+ * @Version: V1.0
+ */
+public interface LeanEventsHostConfigMapper extends BaseMapper<LeanEventsHostConfig> {
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/mapper/xml/LeanEventsHostConfigMapper.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.leanEventHostConfig.mapper.LeanEventsHostConfigMapper">
+
+</mapper>

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/service/ILeanEventsHostConfigService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.leanEventHostConfig.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
+
+/**
+ * @Description: 精益事件配置关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-30
+ * @Version: V1.0
+ */
+public interface ILeanEventsHostConfigService extends IService<LeanEventsHostConfig> {
+
+}

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/leanEventHostConfig/service/impl/LeanEventsHostConfigServiceImpl.java

@@ -0,0 +1,18 @@
+package org.jeecg.modules.leanEventHostConfig.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.jeecg.modules.leanEventHostConfig.entity.LeanEventsHostConfig;
+import org.jeecg.modules.leanEventHostConfig.mapper.LeanEventsHostConfigMapper;
+import org.jeecg.modules.leanEventHostConfig.service.ILeanEventsHostConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: 精益事件配置关联表
+ * @Author: jeecg-boot
+ * @Date:   2024-10-30
+ * @Version: V1.0
+ */
+@Service
+public class LeanEventsHostConfigServiceImpl extends ServiceImpl<LeanEventsHostConfigMapper, LeanEventsHostConfig> implements ILeanEventsHostConfigService {
+
+}

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

@@ -29,43 +29,43 @@ import java.io.Serializable;
 public class PeaksAndValleysTimeConfig implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    /**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
+	/**主键*/
+	@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")
+	/**创建日期*/
+	@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")
+	/**更新日期*/
+	@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")
+	/**开始时间*/
+	@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")
+    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;
-    /**峰平谷类型*/
-    @Excel(name = "峰平谷类型", width = 15)
+    private String endTime;
+	/**峰平谷类型*/
+	@Excel(name = "峰平谷类型", width = 15)
     @ApiModelProperty(value = "峰平谷类型(尖：tops 峰:peaks 平:flat 谷:valleys)")
     @Dict(dicCode = "fpg_type")
     private String type;