环境历史数据

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/controller/ItdmEnvironmentQuyuController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.itdmDataHistory.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentQuyu;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentQuyuService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 区域历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Api(tags="区域历史数据")
+@RestController
+@RequestMapping("/itdmDataHistory/itdmEnvironmentQuyu")
+@Slf4j
+public class ItdmEnvironmentQuyuController extends JeecgController<ItdmEnvironmentQuyu, IItdmEnvironmentQuyuService> {
+	@Autowired
+	private IItdmEnvironmentQuyuService itdmEnvironmentQuyuService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmEnvironmentQuyu
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "区域历史数据-分页列表查询")
+	@ApiOperation(value="区域历史数据-分页列表查询", notes="区域历史数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmEnvironmentQuyu>> queryPageList(ItdmEnvironmentQuyu itdmEnvironmentQuyu,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmEnvironmentQuyu> queryWrapper = QueryGenerator.initQueryWrapper(itdmEnvironmentQuyu, req.getParameterMap());
+		Page<ItdmEnvironmentQuyu> page = new Page<ItdmEnvironmentQuyu>(pageNo, pageSize);
+		IPage<ItdmEnvironmentQuyu> pageList = itdmEnvironmentQuyuService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmEnvironmentQuyu
+	 * @return
+	 */
+	@AutoLog(value = "区域历史数据-添加")
+	@ApiOperation(value="区域历史数据-添加", notes="区域历史数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_quyu:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmEnvironmentQuyu itdmEnvironmentQuyu) {
+		itdmEnvironmentQuyuService.save(itdmEnvironmentQuyu);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmEnvironmentQuyu
+	 * @return
+	 */
+	@AutoLog(value = "区域历史数据-编辑")
+	@ApiOperation(value="区域历史数据-编辑", notes="区域历史数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_quyu:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmEnvironmentQuyu itdmEnvironmentQuyu) {
+		itdmEnvironmentQuyuService.updateById(itdmEnvironmentQuyu);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "区域历史数据-通过id删除")
+	@ApiOperation(value="区域历史数据-通过id删除", notes="区域历史数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_quyu:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmEnvironmentQuyuService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "区域历史数据-批量删除")
+	@ApiOperation(value="区域历史数据-批量删除", notes="区域历史数据-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_quyu:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmEnvironmentQuyuService.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<ItdmEnvironmentQuyu> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmEnvironmentQuyu itdmEnvironmentQuyu = itdmEnvironmentQuyuService.getById(id);
+		if(itdmEnvironmentQuyu==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmEnvironmentQuyu);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmEnvironmentQuyu
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_environment_quyu:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmEnvironmentQuyu itdmEnvironmentQuyu) {
+        return super.exportXls(request, itdmEnvironmentQuyu, ItdmEnvironmentQuyu.class, "区域历史数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_environment_quyu:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmEnvironmentQuyu.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/controller/ItdmEnvironmentWaterController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.itdmDataHistory.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentWater;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentWaterService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 进出水口历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Api(tags="进出水口历史数据")
+@RestController
+@RequestMapping("/itdmDataHistory/itdmEnvironmentWater")
+@Slf4j
+public class ItdmEnvironmentWaterController extends JeecgController<ItdmEnvironmentWater, IItdmEnvironmentWaterService> {
+	@Autowired
+	private IItdmEnvironmentWaterService itdmEnvironmentWaterService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmEnvironmentWater
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "进出水口历史数据-分页列表查询")
+	@ApiOperation(value="进出水口历史数据-分页列表查询", notes="进出水口历史数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmEnvironmentWater>> queryPageList(ItdmEnvironmentWater itdmEnvironmentWater,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmEnvironmentWater> queryWrapper = QueryGenerator.initQueryWrapper(itdmEnvironmentWater, req.getParameterMap());
+		Page<ItdmEnvironmentWater> page = new Page<ItdmEnvironmentWater>(pageNo, pageSize);
+		IPage<ItdmEnvironmentWater> pageList = itdmEnvironmentWaterService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmEnvironmentWater
+	 * @return
+	 */
+	@AutoLog(value = "进出水口历史数据-添加")
+	@ApiOperation(value="进出水口历史数据-添加", notes="进出水口历史数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_water:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmEnvironmentWater itdmEnvironmentWater) {
+		itdmEnvironmentWaterService.save(itdmEnvironmentWater);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmEnvironmentWater
+	 * @return
+	 */
+	@AutoLog(value = "进出水口历史数据-编辑")
+	@ApiOperation(value="进出水口历史数据-编辑", notes="进出水口历史数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_water:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmEnvironmentWater itdmEnvironmentWater) {
+		itdmEnvironmentWaterService.updateById(itdmEnvironmentWater);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "进出水口历史数据-通过id删除")
+	@ApiOperation(value="进出水口历史数据-通过id删除", notes="进出水口历史数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_water:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmEnvironmentWaterService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "进出水口历史数据-批量删除")
+	@ApiOperation(value="进出水口历史数据-批量删除", notes="进出水口历史数据-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_water:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmEnvironmentWaterService.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<ItdmEnvironmentWater> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmEnvironmentWater itdmEnvironmentWater = itdmEnvironmentWaterService.getById(id);
+		if(itdmEnvironmentWater==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmEnvironmentWater);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmEnvironmentWater
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_environment_water:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmEnvironmentWater itdmEnvironmentWater) {
+        return super.exportXls(request, itdmEnvironmentWater, ItdmEnvironmentWater.class, "进出水口历史数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_environment_water:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmEnvironmentWater.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/controller/ItdmEnvironmentYeweiController.java

@@ -0,0 +1,177 @@
+package org.jeecg.modules.itdmDataHistory.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+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.common.util.oConvertUtils;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentYewei;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentYeweiService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 水液位历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Api(tags="水液位历史数据")
+@RestController
+@RequestMapping("/itdmDataHistory/itdmEnvironmentYewei")
+@Slf4j
+public class ItdmEnvironmentYeweiController extends JeecgController<ItdmEnvironmentYewei, IItdmEnvironmentYeweiService> {
+	@Autowired
+	private IItdmEnvironmentYeweiService itdmEnvironmentYeweiService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmEnvironmentYewei
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "水液位历史数据-分页列表查询")
+	@ApiOperation(value="水液位历史数据-分页列表查询", notes="水液位历史数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmEnvironmentYewei>> queryPageList(ItdmEnvironmentYewei itdmEnvironmentYewei,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmEnvironmentYewei> queryWrapper = QueryGenerator.initQueryWrapper(itdmEnvironmentYewei, req.getParameterMap());
+		Page<ItdmEnvironmentYewei> page = new Page<ItdmEnvironmentYewei>(pageNo, pageSize);
+		IPage<ItdmEnvironmentYewei> pageList = itdmEnvironmentYeweiService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmEnvironmentYewei
+	 * @return
+	 */
+	@AutoLog(value = "水液位历史数据-添加")
+	@ApiOperation(value="水液位历史数据-添加", notes="水液位历史数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_yewei:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmEnvironmentYewei itdmEnvironmentYewei) {
+		itdmEnvironmentYeweiService.save(itdmEnvironmentYewei);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmEnvironmentYewei
+	 * @return
+	 */
+	@AutoLog(value = "水液位历史数据-编辑")
+	@ApiOperation(value="水液位历史数据-编辑", notes="水液位历史数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_yewei:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmEnvironmentYewei itdmEnvironmentYewei) {
+		itdmEnvironmentYeweiService.updateById(itdmEnvironmentYewei);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "水液位历史数据-通过id删除")
+	@ApiOperation(value="水液位历史数据-通过id删除", notes="水液位历史数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_yewei:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmEnvironmentYeweiService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "水液位历史数据-批量删除")
+	@ApiOperation(value="水液位历史数据-批量删除", notes="水液位历史数据-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_environment_yewei:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmEnvironmentYeweiService.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<ItdmEnvironmentYewei> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmEnvironmentYewei itdmEnvironmentYewei = itdmEnvironmentYeweiService.getById(id);
+		if(itdmEnvironmentYewei==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmEnvironmentYewei);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmEnvironmentYewei
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_environment_yewei:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmEnvironmentYewei itdmEnvironmentYewei) {
+        return super.exportXls(request, itdmEnvironmentYewei, ItdmEnvironmentYewei.class, "水液位历史数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_environment_yewei:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmEnvironmentYewei.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmEnvironmentQuyu.java

@@ -0,0 +1,61 @@
+package org.jeecg.modules.itdmDataHistory.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 区域历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_quyu")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_quyu对象", description="区域历史数据")
+public class ItdmEnvironmentQuyu implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**区域名称（1温箱区域2力学区域3霉菌区域）*/
+	@Excel(name = "区域名称（1温箱区域2力学区域3霉菌区域）", width = 15, dicCode = "area_name")
+	@Dict(dicCode = "area_name")
+    @ApiModelProperty(value = "区域名称（1温箱区域2力学区域3霉菌区域）")
+    private java.lang.String areaName;
+	/**温度*/
+	@Excel(name = "温度", width = 15)
+    @ApiModelProperty(value = "温度")
+    private java.math.BigDecimal temperature;
+	/**湿度*/
+	@Excel(name = "湿度", width = 15)
+    @ApiModelProperty(value = "湿度")
+    private java.math.BigDecimal humidity;
+	/**气压*/
+	@Excel(name = "气压", width = 15)
+    @ApiModelProperty(value = "气压")
+    private java.math.BigDecimal airPrassure;
+	/**采集时间*/
+	@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;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmEnvironmentWater.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.itdmDataHistory.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 进出水口历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_water")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_water对象", description="进出水口历史数据")
+public class ItdmEnvironmentWater implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**名称（0进水口，1出水口）*/
+	@Excel(name = "名称（0进水口，1出水口）", width = 15, dicCode = "area_name_water")
+	@Dict(dicCode = "area_name_water")
+    @ApiModelProperty(value = "名称（0进水口，1出水口）")
+    private java.lang.Integer areaNameWater;
+	/**温度*/
+	@Excel(name = "温度", width = 15)
+    @ApiModelProperty(value = "温度")
+    private java.math.BigDecimal temperature;
+	/**水压*/
+	@Excel(name = "水压", width = 15)
+    @ApiModelProperty(value = "水压")
+    private java.math.BigDecimal waterPressure;
+	/**采集时间*/
+	@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;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/entity/ItdmEnvironmentYewei.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.itdmDataHistory.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 水液位历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_yewei")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_yewei对象", description="水液位历史数据")
+public class ItdmEnvironmentYewei implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Integer id;
+	/**水液位*/
+	@Excel(name = "水液位", width = 15)
+    @ApiModelProperty(value = "水液位")
+    private java.math.BigDecimal waterLevel;
+	/**采集时间*/
+	@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;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/ItdmEnvironmentQuyuMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmDataHistory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentQuyu;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 区域历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface ItdmEnvironmentQuyuMapper extends BaseMapper<ItdmEnvironmentQuyu> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/ItdmEnvironmentWaterMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmDataHistory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentWater;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 进出水口历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface ItdmEnvironmentWaterMapper extends BaseMapper<ItdmEnvironmentWater> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/ItdmEnvironmentYeweiMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmDataHistory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentYewei;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 水液位历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface ItdmEnvironmentYeweiMapper extends BaseMapper<ItdmEnvironmentYewei> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/xml/ItdmEnvironmentQuyuMapper.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.itdmDataHistory.mapper.ItdmEnvironmentQuyuMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/xml/ItdmEnvironmentWaterMapper.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.itdmDataHistory.mapper.ItdmEnvironmentWaterMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/xml/ItdmEnvironmentYeweiMapper.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.itdmDataHistory.mapper.ItdmEnvironmentYeweiMapper">
+
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/IItdmEnvironmentQuyuService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataHistory.service;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentQuyu;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 区域历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentQuyuService extends IService<ItdmEnvironmentQuyu> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/IItdmEnvironmentWaterService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataHistory.service;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentWater;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 进出水口历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentWaterService extends IService<ItdmEnvironmentWater> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/IItdmEnvironmentYeweiService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataHistory.service;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentYewei;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 水液位历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentYeweiService extends IService<ItdmEnvironmentYewei> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/impl/ItdmEnvironmentQuyuServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataHistory.service.impl;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentQuyu;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmEnvironmentQuyuMapper;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentQuyuService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 区域历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentQuyuServiceImpl extends ServiceImpl<ItdmEnvironmentQuyuMapper, ItdmEnvironmentQuyu> implements IItdmEnvironmentQuyuService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/impl/ItdmEnvironmentWaterServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataHistory.service.impl;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentWater;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmEnvironmentWaterMapper;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentWaterService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 进出水口历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentWaterServiceImpl extends ServiceImpl<ItdmEnvironmentWaterMapper, ItdmEnvironmentWater> implements IItdmEnvironmentWaterService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/service/impl/ItdmEnvironmentYeweiServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataHistory.service.impl;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmEnvironmentYewei;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmEnvironmentYeweiMapper;
+import org.jeecg.modules.itdmDataHistory.service.IItdmEnvironmentYeweiService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 水液位历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-30
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentYeweiServiceImpl extends ServiceImpl<ItdmEnvironmentYeweiMapper, ItdmEnvironmentYewei> implements IItdmEnvironmentYeweiService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/controller/ItdmWeituoInfoController.java

@@ -1,49 +1,33 @@
 package org.jeecg.modules.weituo.controller;
 
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+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.commons.lang.StringUtils;
 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.util.oConvertUtils;
 import org.jeecg.modules.weituo.dto.WeituoInsertCommand;
 import org.jeecg.modules.weituo.dto.WeituoUpdateCommand;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import org.jeecg.modules.weituo.service.IItdmWeituoInfoService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import lombok.extern.slf4j.Slf4j;
-
 import org.jeecg.modules.weituo.vo.ItdmWeituoInfoInfoVO;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
-import org.jeecg.common.system.base.controller.JeecgController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
 import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.jeecg.common.aspect.annotation.AutoLog;
 
- /**
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+/**
  * @Description: 委托信息
  * @Author: jeecg-boot
  * @Date:   2023-05-17

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/service/IItdmWeituoInfoService.java

@@ -1,13 +1,10 @@
 package org.jeecg.modules.weituo.service;
 
-import org.jeecg.common.api.vo.Result;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.weituo.dto.WeituoInsertCommand;
 import org.jeecg.modules.weituo.dto.WeituoUpdateCommand;
-import org.jeecg.modules.weituo.vo.ItdmWeituoInfoInfoVO;
-
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.jeecg.modules.weituo.vo.ItdmWeituoInfoInfoVO;
 
 import java.util.List;