Merge remote-tracking branch 'origin/master'

# Conflicts:
#	itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/controller/ItdmGongdanshujuController.java

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/itdmDataNow/controller/ItdmEnvironmentQuyuNowController.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/controller/ItdmEnvironmentWaterNowController.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/controller/ItdmEnvironmentYeweiNowController.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/controller/ItdmWenxiangNowController.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/controller/ItdmWenxiangVoltageNowController.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentQuyuNow.java

@@ -0,0 +1,60 @@
+package org.jeecg.modules.itdmDataNow.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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_quyu_now")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_quyu_now对象", description="区域实时数据")
+public class ItdmEnvironmentQuyuNow 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)
+    @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;
+	/**采集时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "采集时间")
+    private java.util.Date createTime;
+	/**气压*/
+	@Excel(name = "气压", width = 15)
+    @ApiModelProperty(value = "气压")
+    private java.math.BigDecimal airPrassure;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentWaterNow.java

@@ -0,0 +1,56 @@
+package org.jeecg.modules.itdmDataNow.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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_water_now")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_water_now对象", description="进出水口实时数据")
+public class ItdmEnvironmentWaterNow 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 temperature;
+	/**名称（0进水口，1出水口）*/
+	@Excel(name = "名称（0进水口，1出水口）", width = 15)
+    @ApiModelProperty(value = "名称（0进水口，1出水口）")
+    private java.lang.Integer areaNameWater;
+	/**水压*/
+	@Excel(name = "水压", width = 15)
+    @ApiModelProperty(value = "水压")
+    private java.math.BigDecimal waterPressure;
+	/**采集时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "采集时间")
+    private java.util.Date createTime;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmEnvironmentYeweiNow.java

@@ -0,0 +1,48 @@
+package org.jeecg.modules.itdmDataNow.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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_environment_yewei_now")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_environment_yewei_now对象", description="水液位实时数据")
+public class ItdmEnvironmentYeweiNow 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")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "采集时间")
+    private java.util.Date createTime;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmWenxiangNow.java

@@ -0,0 +1,136 @@
+package org.jeecg.modules.itdmDataNow.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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_wenxiang_now")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_wenxiang_now对象", description="温箱实时数据")
+public class ItdmWenxiangNow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**温箱数据id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "温箱数据id")
+    private java.lang.Integer id;
+	/**设备id*/
+	@Excel(name = "设备id", width = 15)
+    @ApiModelProperty(value = "设备id")
+    private java.lang.String deviceId;
+	/**设备名称*/
+	@Excel(name = "设备名称", width = 15)
+    @ApiModelProperty(value = "设备名称")
+    private java.lang.String deviceName;
+	/**设备编号*/
+	@Excel(name = "设备编号", width = 15)
+    @ApiModelProperty(value = "设备编号")
+    private java.lang.String deviceNo;
+	/**温度*/
+	@Excel(name = "温度", width = 15)
+    @ApiModelProperty(value = "温度")
+    private java.math.BigDecimal temperature;
+	/**温度上限*/
+	@Excel(name = "温度上限", width = 15)
+    @ApiModelProperty(value = "温度上限")
+    private java.math.BigDecimal temperatureMax;
+	/**温度下限*/
+	@Excel(name = "温度下限", width = 15)
+    @ApiModelProperty(value = "温度下限")
+    private java.math.BigDecimal temperatureMin;
+	/**温度报警（0正常1报警）*/
+	@Excel(name = "温度报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "温度报警（0正常1报警）")
+    private java.lang.Integer temperatureAlarm;
+	/**A相电流报警（0正常1报警）*/
+	@Excel(name = "A相电流报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "A相电流报警（0正常1报警）")
+    private java.lang.Integer currentAAlarm;
+	/**B相电流下限*/
+	@Excel(name = "B相电流下限", width = 15)
+    @ApiModelProperty(value = "B相电流下限")
+    private java.math.BigDecimal currentBMin;
+	/**C相电流下限*/
+	@Excel(name = "C相电流下限", width = 15)
+    @ApiModelProperty(value = "C相电流下限")
+    private java.math.BigDecimal currentCMin;
+	/**湿度*/
+	@Excel(name = "湿度", width = 15)
+    @ApiModelProperty(value = "湿度")
+    private java.math.BigDecimal humidity;
+	/**C相电流报警（0正常1报警）*/
+	@Excel(name = "C相电流报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "C相电流报警（0正常1报警）")
+    private java.lang.Integer currentCAlarm;
+	/**A相电流上限*/
+	@Excel(name = "A相电流上限", width = 15)
+    @ApiModelProperty(value = "A相电流上限")
+    private java.math.BigDecimal currentAMax;
+	/**B相电流报警（0正常1报警）*/
+	@Excel(name = "B相电流报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "B相电流报警（0正常1报警）")
+    private java.lang.Integer currentBAlarm;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**A相电流*/
+	@Excel(name = "A相电流", width = 15)
+    @ApiModelProperty(value = "A相电流")
+    private java.math.BigDecimal currentA;
+	/**湿度上限*/
+	@Excel(name = "湿度上限", width = 15)
+    @ApiModelProperty(value = "湿度上限")
+    private java.math.BigDecimal humidityMax;
+	/**湿度报警（0正常1报警）*/
+	@Excel(name = "湿度报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "湿度报警（0正常1报警）")
+    private java.lang.Integer humidityAlarm;
+	/**B相电流上限*/
+	@Excel(name = "B相电流上限", width = 15)
+    @ApiModelProperty(value = "B相电流上限")
+    private java.math.BigDecimal currentBMax;
+	/**B相电流*/
+	@Excel(name = "B相电流", width = 15)
+    @ApiModelProperty(value = "B相电流")
+    private java.math.BigDecimal currentB;
+	/**C相电流*/
+	@Excel(name = "C相电流", width = 15)
+    @ApiModelProperty(value = "C相电流")
+    private java.math.BigDecimal currentC;
+	/**A相电流下限*/
+	@Excel(name = "A相电流下限", width = 15)
+    @ApiModelProperty(value = "A相电流下限")
+    private java.math.BigDecimal currentAMin;
+	/**湿度下限*/
+	@Excel(name = "湿度下限", width = 15)
+    @ApiModelProperty(value = "湿度下限")
+    private java.math.BigDecimal humidityMin;
+	/**C相电流上限*/
+	@Excel(name = "C相电流上限", width = 15)
+    @ApiModelProperty(value = "C相电流上限")
+    private java.math.BigDecimal currentCMax;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/entity/ItdmWenxiangVoltageNow.java

@@ -0,0 +1,92 @@
+package org.jeecg.modules.itdmDataNow.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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_wenxiang_voltage_now")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_wenxiang_voltage_now对象", description="电压实时数据")
+public class ItdmWenxiangVoltageNow implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**温箱电压id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "温箱电压id")
+    private java.lang.Integer id;
+	/**A线电压*/
+	@Excel(name = "A线电压", width = 15)
+    @ApiModelProperty(value = "A线电压")
+    private java.math.BigDecimal voltageA;
+	/**C线电压上限*/
+	@Excel(name = "C线电压上限", width = 15)
+    @ApiModelProperty(value = "C线电压上限")
+    private java.math.BigDecimal voltageCMax;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**B线电压*/
+	@Excel(name = "B线电压", width = 15)
+    @ApiModelProperty(value = "B线电压")
+    private java.math.BigDecimal voltageB;
+	/**C线电压*/
+	@Excel(name = "C线电压", width = 15)
+    @ApiModelProperty(value = "C线电压")
+    private java.math.BigDecimal voltageC;
+	/**A线电压报警（0正常1报警）*/
+	@Excel(name = "A线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "A线电压报警（0正常1报警）")
+    private java.lang.Integer voltageAAlarm;
+	/**B线电压报警（0正常1报警）*/
+	@Excel(name = "B线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "B线电压报警（0正常1报警）")
+    private java.lang.Integer voltageBAlarm;
+	/**B线电压下限*/
+	@Excel(name = "B线电压下限", width = 15)
+    @ApiModelProperty(value = "B线电压下限")
+    private java.math.BigDecimal voltageBMin;
+	/**A线电压上限*/
+	@Excel(name = "A线电压上限", width = 15)
+    @ApiModelProperty(value = "A线电压上限")
+    private java.math.BigDecimal voltageAMax;
+	/**C线电压报警（0正常1报警）*/
+	@Excel(name = "C线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "C线电压报警（0正常1报警）")
+    private java.lang.Integer voltageCAlarm;
+	/**C线电压下限*/
+	@Excel(name = "C线电压下限", width = 15)
+    @ApiModelProperty(value = "C线电压下限")
+    private java.math.BigDecimal voltageCMin;
+	/**A线电压下限*/
+	@Excel(name = "A线电压下限", width = 15)
+    @ApiModelProperty(value = "A线电压下限")
+    private java.math.BigDecimal voltageAMin;
+	/**B线电压上限*/
+	@Excel(name = "B线电压上限", width = 15)
+    @ApiModelProperty(value = "B线电压上限")
+    private java.math.BigDecimal voltageBMax;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/mapper/ItdmEnvironmentQuyuNowMapper.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/mapper/ItdmEnvironmentWaterNowMapper.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/mapper/ItdmEnvironmentYeweiNowMapper.java

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/mapper/ItdmWenxiangNowMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmDataNow.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangNow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 温箱实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface ItdmWenxiangNowMapper extends BaseMapper<ItdmWenxiangNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/mapper/ItdmWenxiangVoltageNowMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmDataNow.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangVoltageNow;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 电压实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface ItdmWenxiangVoltageNowMapper extends BaseMapper<ItdmWenxiangVoltageNow> {
+
+}

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

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

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

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

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/IItdmEnvironmentQuyuNowService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataNow.service;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentQuyuNow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 区域实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentQuyuNowService extends IService<ItdmEnvironmentQuyuNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/IItdmEnvironmentWaterNowService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataNow.service;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentWaterNow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 进出水口实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentWaterNowService extends IService<ItdmEnvironmentWaterNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/IItdmEnvironmentYeweiNowService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataNow.service;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentYeweiNow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 水液位实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmEnvironmentYeweiNowService extends IService<ItdmEnvironmentYeweiNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/IItdmWenxiangNowService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataNow.service;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangNow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 温箱实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmWenxiangNowService extends IService<ItdmWenxiangNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/IItdmWenxiangVoltageNowService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataNow.service;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangVoltageNow;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 电压实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmWenxiangVoltageNowService extends IService<ItdmWenxiangVoltageNow> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/impl/ItdmEnvironmentQuyuNowServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataNow.service.impl;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentQuyuNow;
+import org.jeecg.modules.itdmDataNow.mapper.ItdmEnvironmentQuyuNowMapper;
+import org.jeecg.modules.itdmDataNow.service.IItdmEnvironmentQuyuNowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 区域实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentQuyuNowServiceImpl extends ServiceImpl<ItdmEnvironmentQuyuNowMapper, ItdmEnvironmentQuyuNow> implements IItdmEnvironmentQuyuNowService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/impl/ItdmEnvironmentWaterNowServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataNow.service.impl;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentWaterNow;
+import org.jeecg.modules.itdmDataNow.mapper.ItdmEnvironmentWaterNowMapper;
+import org.jeecg.modules.itdmDataNow.service.IItdmEnvironmentWaterNowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 进出水口实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentWaterNowServiceImpl extends ServiceImpl<ItdmEnvironmentWaterNowMapper, ItdmEnvironmentWaterNow> implements IItdmEnvironmentWaterNowService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/impl/ItdmEnvironmentYeweiNowServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataNow.service.impl;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmEnvironmentYeweiNow;
+import org.jeecg.modules.itdmDataNow.mapper.ItdmEnvironmentYeweiNowMapper;
+import org.jeecg.modules.itdmDataNow.service.IItdmEnvironmentYeweiNowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 水液位实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ItdmEnvironmentYeweiNowServiceImpl extends ServiceImpl<ItdmEnvironmentYeweiNowMapper, ItdmEnvironmentYeweiNow> implements IItdmEnvironmentYeweiNowService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/impl/ItdmWenxiangNowServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataNow.service.impl;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangNow;
+import org.jeecg.modules.itdmDataNow.mapper.ItdmWenxiangNowMapper;
+import org.jeecg.modules.itdmDataNow.service.IItdmWenxiangNowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 温箱实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ItdmWenxiangNowServiceImpl extends ServiceImpl<ItdmWenxiangNowMapper, ItdmWenxiangNow> implements IItdmWenxiangNowService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataNow/service/impl/ItdmWenxiangVoltageNowServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataNow.service.impl;
+
+import org.jeecg.modules.itdmDataNow.entity.ItdmWenxiangVoltageNow;
+import org.jeecg.modules.itdmDataNow.mapper.ItdmWenxiangVoltageNowMapper;
+import org.jeecg.modules.itdmDataNow.service.IItdmWenxiangVoltageNowService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 电压实时数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+@Service
+public class ItdmWenxiangVoltageNowServiceImpl extends ServiceImpl<ItdmWenxiangVoltageNowMapper, ItdmWenxiangVoltageNow> implements IItdmWenxiangVoltageNowService {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmGongdanDetailController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.itdmGongDan.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -14,18 +15,20 @@ import org.jeecg.modules.itdmGongDan.convert.GongDanDetailConvert;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
+import org.jeecg.modules.weituo.service.IItdmWeituoInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -40,28 +43,55 @@ import java.util.stream.Collectors;
 @Slf4j
 public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDetail, IItdmGongdanDetailService> {
 	@Autowired
+	@SuppressWarnings("all")
 	private IItdmGongdanDetailService itdmGongdanDetailService;
 	@Autowired
+	@SuppressWarnings("all")
 	private IItdmGongdanMasterService iItdmGongdanMasterService;
 	@Autowired
+	@SuppressWarnings("all")
 	private IItdmTestPlanService itdmTestPlanService;
+	@Autowired
+	@SuppressWarnings("all")
+	private ItdmGongdanMasterMapper itdmGongdanMasterMapper;
+	@Autowired
+	@SuppressWarnings("all")
+	private IItdmWeituoInfoService iItdmWeituoInfoService;
+
 
 	@ApiOperation(value="工单detail-分页列表查询", notes="工单detail-分页列表查询")
 	@GetMapping(value = "/list")
 	public Result<Page<ItdmGongdanDetailListVO>> queryPageList1(ItdmGongdanDetail itdmGongdanDetail,
+															@RequestParam(name="weituoId", defaultValue="") String weituoId,
 														   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 														   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 														   HttpServletRequest req) {
+
 		QueryWrapper<ItdmGongdanDetail> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanDetail, req.getParameterMap());
+
+		List<String> woIdList = new ArrayList<>();
+		if(!weituoId.equals("")){ //前端有传过来委托单id
+			woIdList = itdmGongdanMasterMapper.selectWoIdListByWeituoId(weituoId);
+			if(woIdList != null && !woIdList.isEmpty() && woIdList.get(0)!=null){
+				queryWrapper.in("wo_id",woIdList);
+			}else return Result.OK(new Page<ItdmGongdanDetailListVO>());
+		}//否则直接查询所有
+
 		Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
 		Page<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
 
-		List<ItdmGongdanDetailListVO> list=pageList.getRecords().stream().map(i -> {
-			ItdmGongdanMaster master = iItdmGongdanMasterService.getById(i.getWoId());
-			ItdmTestPlan itdmTestPlan = itdmTestPlanService.getById(master.getJihuaShiyanId());
-			return GongDanDetailConvert.INSTANCE.toList(i, master,itdmTestPlan);
-		}).collect(Collectors.toList());
-		return Result.OK(GongDanDetailConvert.INSTANCE.converter(pageList,list));
+//		Page<ItdmGongdanDetail> page = new Page<ItdmGongdanDetail>(pageNo, pageSize);
+//		Page<ItdmGongdanDetail> pageList = itdmGongdanDetailService.getDetailListByWoIdList(page,woIdList);
+
+		if(pageList != null ){
+			List<ItdmGongdanDetailListVO> list=pageList.getRecords().stream().map(i -> {
+				ItdmGongdanMaster master = iItdmGongdanMasterService.getById(i.getWoId());
+				ItdmTestPlan itdmTestPlan = master==null?null:itdmTestPlanService.getById(master.getJihuaShiyanId());
+				ItdmWeituoInfo itdmWeituoInfo = itdmTestPlan==null?null:iItdmWeituoInfoService.getById(itdmTestPlan.getWeituoId());
+				return GongDanDetailConvert.INSTANCE.toList(i, master,itdmTestPlan,itdmWeituoInfo);
+			}).collect(Collectors.toList());
+			return Result.OK(GongDanDetailConvert.INSTANCE.converter(pageList,list));
+		}else return Result.OK(new Page<ItdmGongdanDetailListVO>());
 	}
 
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/controller/ItdmJCXMSHJHController.java

@@ -59,8 +59,6 @@ public class ItdmJCXMSHJHController {
     @ApiOperation(value="项目经理新增或修改工单master", notes="项目经理新增或修改工单master")
     @PostMapping(value = "/XMJLAddOrUpdate")
     public Result<String> XMJLAddOrUpdate(@RequestBody ItdmXMJLQueryListVO vo) {
-        System.out.println("项目经理新增或修改工单master");
-//        System.out.println(JSON.toJSON(vo));
         return Result.OK(iItdmJCXMSHJHService.XMJLAddOrUpdate(vo));
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/convert/GongDanDetailConvert.java

@@ -9,6 +9,7 @@ import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
+import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.ReportingPolicy;
@@ -40,5 +41,7 @@ public interface GongDanDetailConvert {
     @Mapping(target ="weituoYangpinId",source ="master.weituoYangpinId")
     @Mapping(target ="shebeiId",source ="master.shebeiId")
     @Mapping(target ="createTime",source ="detail.createTime")
-    ItdmGongdanDetailListVO toList(ItdmGongdanDetail detail, ItdmGongdanMaster master, ItdmTestPlan itdmTestPlan);
+    @Mapping(target ="weituoClient",source ="itdmWeituoInfo.weituoClient")
+    @Mapping(target ="weituoNo",source ="itdmWeituoInfo.weituoNo")
+    ItdmGongdanDetailListVO toList(ItdmGongdanDetail detail, ItdmGongdanMaster master, ItdmTestPlan itdmTestPlan, ItdmWeituoInfo itdmWeituoInfo);
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmGongdanDetailMapper.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.itdmGongDan.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
@@ -15,4 +16,7 @@ import java.util.List;
  */
 public interface ItdmGongdanDetailMapper extends BaseMapper<ItdmGongdanDetail> {
     List<ItdmGongdanDetailListVO> getDetailList (Page<ItdmGongdanDetailListVO> page, String woId);
+
+    Page<ItdmGongdanDetail> getDetailListByWoIdList(Page<ItdmGongdanDetail> page,@Param("list") List<String> list);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/ItdmGongdanMasterMapper.java

@@ -1,8 +1,12 @@
 package org.jeecg.modules.itdmGongDan.mapper;
 
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
@@ -11,4 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ItdmGongdanMasterMapper extends BaseMapper<ItdmGongdanMaster> {
 
+    @Select("select m.id from itdm_gongdan_master m " +
+            "right join itdm_test_plan t on t.id = m.jihua_shiyan_id " +
+            "where t.weituo_id = #{weituoId}")
+    public List<String> selectWoIdListByWeituoId(@Param("weituoId") String weituoId);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/mapper/xml/ItdmGongdanDetailMapper.xml

@@ -2,7 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper">
 
-    <resultMap id="ItdmGongdanDetailListVO" type="org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO" >
+    <resultMap id="ItdmGongdanDetailResult" type="org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail" >
+        <result column="id" property="id" jdbcType="VARCHAR"/>
+        <result column="wo_id" property="woId" jdbcType="VARCHAR"/>
+        <result column="shiji_shebei_id" property="shijiShebeiId" jdbcType="VARCHAR"/>
+        <result column="shiji_shiiyan_type" property="shijiShiiyanType" jdbcType="VARCHAR"/>
+        <result column="work_date" property="workDate" jdbcType="DATE"/>
+        <result column="start_time" property="startTime" jdbcType="VARCHAR"/>
+        <result column="end_time" property="endTime" jdbcType="VARCHAR"/>
+        <result column="shiji_work_date" property="shijiWorkDate" jdbcType="VARCHAR"/>
+        <result column="shiji_start_time" property="shijiStartTime" jdbcType="VARCHAR"/>
+        <result column="shiji_end_time" property="shijiEndTime" jdbcType="VARCHAR"/>
+        <result column="chuanganqi" property="chuanganqi" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <resultMap id="ItdmGongdanDetailListVOResult" type="org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO" >
         <result column="id" property="id" jdbcType="VARCHAR"/>
         <result column="wo_id" property="woId" jdbcType="VARCHAR"/>
         <result column="shiji_shebei_id" property="shijiShebeiId" jdbcType="VARCHAR"/>
@@ -28,7 +42,7 @@
     </resultMap>
 
 
-    <select id="getDetailList" parameterType="String"  resultMap="ItdmGongdanDetailListVO">
+    <select id="getDetailList" parameterType="String"  resultMap="ItdmGongdanDetailListVOResult">
         select d.id, d.wo_id, d.shiji_shebei_id, d.shiji_shiiyan_type, d.work_date, d.start_time, d.end_time,
                d.shiji_work_date, d.shiji_start_time, d.shiji_end_time, d.chuanganqi,
                m.jihua_shiyan_id, m.test_items_id, m.weituo_yangpin_id, m.shebei_id, m.shiiyan_type, m.worker, m.yangpin_count,
@@ -43,4 +57,23 @@ left join itdm_test_plan t on m.jihua_shiyan_id = t.id
     </select>
 
 
+    <select id="getDetailListByWoIdList" resultMap="ItdmGongdanDetailResult">
+
+        select id,wo_id,shiji_shebei_id,shiji_shiiyan_type,work_date,start_time,end_time,
+               shiji_work_date,shiji_start_time,shiji_end_time,chuanganqi
+
+        from itdm_gongdan_detail
+
+        <if test="list!=null and list.size()>0">
+
+        where wo_id in
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+
+        </if>
+
+    </select>
+
+
 </mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/IItdmGongdanDetailService.java

@@ -1,10 +1,13 @@
 package org.jeecg.modules.itdmGongDan.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.itdmGongDan.vo.ItdmGongdanDetailListVO;
 
+import java.util.List;
+
 /**
  * @Description: 工单detail
  * @Author: jeecg-boot
@@ -15,4 +18,6 @@ public interface IItdmGongdanDetailService extends IService<ItdmGongdanDetail> {
 
     public Page<ItdmGongdanDetailListVO> getDetailList(Page<ItdmGongdanDetailListVO> page, String woId);
 
+    public Page<ItdmGongdanDetail> getDetailListByWoIdList(Page<ItdmGongdanDetail> page,@Param("list") List<String> list);
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmGongdanDetailServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.itdmGongDan.service.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
 import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
@@ -10,6 +11,8 @@ import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
+import java.util.List;
+
 /**
  * @Description: 工单detail
  * @Author: jeecg-boot
@@ -27,4 +30,8 @@ public class ItdmGongdanDetailServiceImpl extends ServiceImpl<ItdmGongdanDetailM
         return page.setRecords(itdmGongdanDetailMapper.getDetailList(page, woId));
     }
 
+    public Page<ItdmGongdanDetail> getDetailListByWoIdList(Page<ItdmGongdanDetail> page,@Param("list") List<String> list){
+        return itdmGongdanDetailMapper.getDetailListByWoIdList(page,list);
+    }
+
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/service/impl/ItdmJCXMSHJHServiceImpl.java

@@ -72,7 +72,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
 
 
     /**
-     * 项目经理新增或修改试验计划或工单master
+     * 项目经理新增或修改试工单master
      */
     public String XMJLAddOrUpdate(ItdmXMJLQueryListVO vo){
         String msg = "操作成功！";
@@ -91,6 +91,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             if(gongdanMaster==null){//是新增的数据
                 ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLQueryListVO.toItdmGongdanMaster(vo);
                 itdmGongdanMasterMapper.insert(itdmGongdanMaster);//新增一条工单master
+                System.out.println("======================================项目经理新增master" + itdmGongdanMaster.getId());
 
                 //修改工单master对应的试验计划，将状态改为已确认
                 ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(vo.getParent());
@@ -102,7 +103,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 for (int i=1;i<=lastDay;i++){
                     Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
                     ItdmGongdanDetail detail = new ItdmGongdanDetail();
-                    detail.setWoId(vo.getId());
+                    detail.setWoId(itdmGongdanMaster.getId());
                     detail.setWorkDate(workDate);
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
@@ -113,7 +114,9 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
                 if(vo.getShijiStartDate()==null){//此时可以修改
                     //先修改工单master
                     ItdmGongdanMaster itdmGongdanMaster = ItdmXMJLQueryListVO.toItdmGongdanMaster(vo);
+                    itdmGongdanMaster.setId(vo.getId());
                     itdmGongdanMasterMapper.updateById(itdmGongdanMaster);
+                    System.out.println("======================================项目经理修改master" + vo.getId());
 
                     //修改工单master对应的试验计划，将状态改为已确认
                     ItdmTestPlan itdmTestPlan = itdmTestPlanMapper.selectById(vo.getParent());
@@ -177,16 +180,18 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             if(vo.getTestPlanId()==null){ //新增试验计划
                 itdmTestPlan.setStatus(0);//试验计划初始状态为未确认0
                 itdmTestPlanMapper.insert(itdmTestPlan);
+                vo.setTestPlanId(itdmTestPlan.getId());
                 //同时新增一条一样的工单master
                 ItdmGongdanMaster master = ItdmJHYQueryListVO.toItdmGongdanMaster(vo);
                 itdmGongdanMasterMapper.insert(master);
+                System.out.println("======================================计划员新增试验计划新增master" + master.getId());
                 //再拆成工单detail，再插入新的工单detail
                 Date startDate = vo.getJihuaStartDate();
                 int lastDay = vo.getLastTime();
                 for (int i=1;i<=lastDay;i++){
                     Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
                     ItdmGongdanDetail detail = new ItdmGongdanDetail();
-                    detail.setWoId(vo.getId());
+                    detail.setWoId(master.getId());
                     detail.setWorkDate(workDate);
                     detail.setStartTime("00:00");
                     detail.setEndTime("23:59");
@@ -196,6 +201,38 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
             }else if(vo.getStatus() == 0){//状态为“未确定”，可以修改试验计划
                 itdmTestPlan.setId(vo.getTestPlanId());
                 itdmTestPlanMapper.updateById(itdmTestPlan);
+                //查原来的工单master
+                Map<String, Object> masterMap = new HashMap<>();
+                masterMap.put("jihua_shiyan_id",itdmTestPlan.getId());
+                List<ItdmGongdanMaster> masterList = itdmGongdanMasterMapper.selectByMap(masterMap);
+                //删原来的工单master
+                itdmGongdanMasterMapper.deleteByMap(masterMap);
+                //删掉原来的工单detail
+                if(masterList != null && !masterList.isEmpty() && masterList.get(0)!=null){
+                    for (ItdmGongdanMaster m: masterList){
+                        Map<String, Object> detailMap = new HashMap<>();
+                        detailMap.put("wo_id",m.getId());
+                        itdmGongdanDetailMapper.deleteByMap(detailMap);
+                    }
+                }
+
+                //新增一条一样的工单master
+                ItdmGongdanMaster master = ItdmJHYQueryListVO.toItdmGongdanMaster(vo);
+                itdmGongdanMasterMapper.insert(master);
+                System.out.println("======================================计划员修改试验计划新增master" + master.getId());
+                //再拆成工单detail，再插入新的工单detail
+                Date startDate = vo.getJihuaStartDate();
+                int lastDay = vo.getLastTime();
+                for (int i=1;i<=lastDay;i++){
+                    Date workDate = new Date(startDate.getTime() + (i-1)*1000*3600*24);
+                    ItdmGongdanDetail detail = new ItdmGongdanDetail();
+                    detail.setWoId(master.getId());
+                    detail.setWorkDate(workDate);
+                    detail.setStartTime("00:00");
+                    detail.setEndTime("23:59");
+                    detail.setChuanganqi(vo.getChuanganqi());
+                    itdmGongdanDetailMapper.insert(detail);
+                }
             }else if(vo.getStatus() != 0){
                 if(msg.equals("提交成功！")) msg="检测项目"+ vo.getTestItems();
                 else msg=msg+ "和"+ vo.getTestItems();

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmGongdanDetailListVO.java

@@ -150,11 +150,14 @@ public class ItdmGongdanDetailListVO implements Serializable {
     @Dict(dictTable = "itdm_weituo_info", dicText = "weituo_no", dicCode = "id")
     private String weituoId;
 
-//    //来自于委托表（itdm_weituo_info），通过委托id（weituoId）查询
-//    /**委托编号*/
-//    @Excel(name = "委托编号", width = 15)
-//    @ApiModelProperty(value = "委托编号")
-//    private String weituoNo;
+    //来自于委托表（itdm_weituo_info），通过委托id（weituoId）查询
+    @Excel(name = "委托单位", width = 15)
+    @ApiModelProperty(value = "委托单位")
+    private String weituoClient;
+    /**委托编号*/
+    @Excel(name = "委托编号", width = 15)
+    @ApiModelProperty(value = "委托编号")
+    private String weituoNo;
 //
 //    //来自于样品表（itdm_weituo_yangpin），通过样品id（weituoYangpinId）查询
 //    /**样品名称*/

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmJHYQueryListVO.java

@@ -329,13 +329,15 @@ public class ItdmJHYQueryListVO {
         Date jihuaEndTime = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
         itdmTestPlan.setJihuaEndDate(jihuaEndTime);
 
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
+        if(vo.getChuanganqiArray()!=null){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            itdmTestPlan.setChuanganqi(chuanganqi);
         }
-        itdmTestPlan.setChuanganqi(chuanganqi);
 
         return  itdmTestPlan;
     }
@@ -353,13 +355,16 @@ public class ItdmJHYQueryListVO {
         Date endDate = new Date(vo.getJihuaStartDate().getTime() + (lastTime-1)*1000*3600*24);
         m.setEndDate(endDate);
 
-        String[] arr = vo.getChuanganqiArray();
-        String chuanganqi = "";
-        for (int i = 0; i < arr.length; i++) {
-            if(i==0) chuanganqi = arr[i];
-            else chuanganqi = chuanganqi + ","+ arr[i];
+        if(vo.getChuanganqiArray() != null){
+            String[] arr = vo.getChuanganqiArray();
+            String chuanganqi = "";
+            for (int i = 0; i < arr.length; i++) {
+                if(i==0) chuanganqi = arr[i];
+                else chuanganqi = chuanganqi + ","+ arr[i];
+            }
+            m.setChuanganqi(chuanganqi);
         }
-        m.setChuanganqi(chuanganqi);
+
         return m;
     }
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongDan/vo/ItdmXMJLQueryListVO.java

@@ -339,7 +339,7 @@ public class ItdmXMJLQueryListVO {
      * */
     public static ItdmGongdanMaster toItdmGongdanMaster(ItdmXMJLQueryListVO vo){
         ItdmGongdanMaster m = new ItdmGongdanMaster();
-        m.setId(vo.getId());//如果用于新增，为空
+//        m.setId(vo.getId());//如果用于新增，为空
         m.setJihuaShiyanId(vo.getTestPlanId());
         m.setTestItemsId(vo.getTestItemsId());
         m.setWeituoYangpinId(vo.getYangpinId());
@@ -386,9 +386,12 @@ public class ItdmXMJLQueryListVO {
             vo.setLastTime(days+1);
         }
 
-        if(vo.getStatus()==0) vo.setStatusC("未确认");
-        else if(vo.getStatus()==1) vo.setStatusC("已确认");
-        else if(vo.getStatus()==2) vo.setStatusC("完成");
+        if(vo.getStatus()!=null){
+            if(vo.getStatus()==0) vo.setStatusC("未确认");
+            else if(vo.getStatus()==1) vo.setStatusC("已确认");
+            else if(vo.getStatus()==2) vo.setStatusC("完成");
+        }
+
         vo.setWeituoNo(weituoNo);
         vo.setId(vo.getTestPlanId());//一级列表，id为试验计划id
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmgongdanshuju/controller/ItdmGongdanshujuController.java

@@ -1,10 +1,9 @@
-package org.jeecg.modules.itdmgongdanshuju.controller;
+package org.jeecg.modules.Itdmgongdanshuju.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.modules.weituochaxun.vo.ItdmWeituoAllVO;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -31,70 +30,34 @@ import java.util.List;
 @Slf4j
 public class ItdmGongdanshujuController {
 
-	@Autowired
-	private ItdmGongdanShujuService itdmGongdanShujuService;
+    @Autowired
+    private ItdmGongdanShujuService itdmGongdanShujuService;
 
 
-	@ApiOperation(value="工单数据-列表", notes="工单数据-列表")
-	@GetMapping("/list")
-	public Result<IPage<ItdmGongdanShuju>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-											  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-											  HttpServletRequest req){
-		Page<ItdmGongdanShuju> page = new Page<ItdmGongdanShuju>(pageNo, pageSize);
-		IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page);
-		return Result.OK(list);
-	}
+    @ApiOperation(value="工单数据-列表", notes="工单数据-列表")
+    @GetMapping("/list")
+    public Result<IPage<ItdmGongdanShuju>> list(@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+                                                @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+                                                HttpServletRequest req){
+        Page<ItdmGongdanShuju> page = new Page<ItdmGongdanShuju>(pageNo, pageSize);
+        IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page);
+        return Result.OK(list);
+    }
 
 
-	@ApiOperation(value = "工单数据-生成", notes = "工单数据-生成")
-	@PostMapping("/create")
-	public Result create(@RequestBody ItdmGongdanDto itdmGongdanDto, HttpServletRequest req) {
-		Boolean b  = itdmGongdanShujuService.generate(itdmGongdanDto);
-		if (b) {
-			return Result.OK();
-		}
-		return Result.error("数据生成失败");
-	}
+    @ApiOperation(value = "工单数据-生成", notes = "工单数据-生成")
+    @GetMapping("/create")
+    public Boolean create(@RequestBody ItdmGongdanDto itdmGongdanDto, HttpServletRequest req) {
+        Boolean b  = itdmGongdanShujuService.generate(itdmGongdanDto);
+        return b;
+    }
 
 
-//	@ApiOperation(value = "工单数据-修改", notes = "工单数据-修改")
-//	@GetMapping("/update")
-//	public ItdmGongdanShuju update(@RequestBody ItdmGongdanShuju itdmGongdanShuju, HttpServletRequest req) {
-//		itdmGongdanShujuService.updateById(itdmGongdanShuju);
-//		return itdmGongdanShuju;
-//	}
-
-	@AutoLog(value = "工单数据-添加")
-	@ApiOperation(value="工单数据-添加", notes="工单数据-添加")
-	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody ItdmGongdanShuju itdmGongdanShuju) {
-		itdmGongdanShujuService.save(itdmGongdanShuju);
-		return Result.OK("添加成功！");
-	}
-
-	@AutoLog(value = "工单数据-通过id删除")
-	@ApiOperation(value="工单数据-通过id删除", notes="工单数据-通过id删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		itdmGongdanShujuService.removeById(id);
-		return Result.OK("删除成功!");
-	}
-
-	/**
-	 *  编辑
-	 *
-	 * @param itdmGongdanShuju
-	 * @return
-	 */
-	@AutoLog(value = "工单数据-编辑")
-	@ApiOperation(value="工单数据-编辑", notes="工单数据-编辑")
-	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody ItdmGongdanShuju itdmGongdanShuju) {
-		itdmGongdanShujuService.updateById(itdmGongdanShuju);
-		return Result.OK("编辑成功!");
-	}
+    @ApiOperation(value = "工单数据-修改", notes = "工单数据-修改")
+    @GetMapping("/update")
+    public ItdmGongdanShuju update(@RequestBody ItdmGongdanShuju itdmGongdanShuju, HttpServletRequest req) {
+        itdmGongdanShujuService.updateById(itdmGongdanShuju);
+        return itdmGongdanShuju;
+    }
 
 }

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
@@ -56,7 +40,23 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, IItdmWeituoInfoService> {
 	@Autowired
 	private IItdmWeituoInfoService itdmWeituoInfoService;
-	
+
+
+
+	/**根据委托单位查询委托信息列表*/
+	@ApiOperation(value="根据委托单位查询委托信息列表", notes="根据委托单位查询委托信息列表")
+	@GetMapping(value = "/weituoNoList")
+	public Result<List<ItdmWeituoInfo>> selectWTListByClient(@RequestParam(name="weituoClient") String weituoClient){
+		return Result.OK(itdmWeituoInfoService.selectWTListByClient(weituoClient));
+	}
+
+	 /**查询委托单位名称（不重复）*/
+	@ApiOperation(value="查询委托单位列表", notes="查询委托单位列表")
+	@GetMapping(value = "/distinctClientList")
+	public Result<List<String>> selectDistinctClientList(){
+		return Result.OK(itdmWeituoInfoService.selectDistinctClientList());
+	}
+
 	/**
 	 * 分页列表查询
 	 *
@@ -78,7 +78,7 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 		IPage<ItdmWeituoInfo> pageList = itdmWeituoInfoService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -93,7 +93,7 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 		itdmWeituoInfoService.saveWeituo(itdmWeituoInfo);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -109,7 +109,7 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -124,7 +124,7 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 		itdmWeituoInfoService.deleteById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -139,7 +139,7 @@ public class ItdmWeituoInfoController extends JeecgController<ItdmWeituoInfo, II
 		this.itdmWeituoInfoService.deleteByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/weituo/mapper/ItdmWeituoInfoMapper.java

@@ -5,6 +5,8 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
 
+import java.util.List;
+
 /**
  * @Description: 委托信息
  * @Author: jeecg-boot
@@ -13,6 +15,15 @@ import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;
  */
 public interface ItdmWeituoInfoMapper extends BaseMapper<ItdmWeituoInfo> {
 
+
+    /**根据委托单位查询委托信息列表*/
+    @Select("select * from itdm_weituo_info where weituo_client = #{weituoClient}")
+    public List<ItdmWeituoInfo> selectWTListByClient(@Param("weituoClient") String weituoClient);
+
+    /**查询委托单位名称（不重复）*/
+    @Select("select distinct weituo_client from itdm_weituo_info")
+    public List<String> selectDistinctClientList();
+
     /**根据委托查询委托id*/
     @Select("select id from itdm_weituo_info where weituo_no = #{weituoNo}")
     String selectByWeituoNo(@Param("weituoNo") String weituoNo);

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

@@ -1,11 +1,10 @@
 package org.jeecg.modules.weituo.service;
 
+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.jeecg.modules.weituo.vo.ItdmWeituoInfoInfoVO;
 
 import java.util.List;
 
@@ -18,6 +17,12 @@ import java.util.List;
 public interface IItdmWeituoInfoService extends IService<ItdmWeituoInfo> {
 
 
+    /**根据委托单位查询委托信息列表*/
+    public List<ItdmWeituoInfo> selectWTListByClient(String weituoClient);
+
+    /**查询委托单位名称（不重复）*/
+    public List<String> selectDistinctClientList();
+
     public void saveWeituo(WeituoInsertCommand command);
 
 

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

@@ -1,6 +1,7 @@
 package org.jeecg.modules.weituo.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.common.exception.JeecgBootException;
 import org.jeecg.modules.weituo.common.ShenheStatus;
 import org.jeecg.modules.weituo.convert.WeituoConvert;
@@ -16,8 +17,6 @@ import org.jeecg.modules.weituo.service.IItdmWeituoInfoService;
 import org.jeecg.modules.weituo.vo.ItdmWeituoInfoInfoVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
@@ -40,6 +39,18 @@ public class ItdmWeituoInfoServiceImpl extends ServiceImpl<ItdmWeituoInfoMapper,
     @Autowired
     private ItdmWeituoYangpinExtendMapper yangpinExtendMapper;
 
+    @Autowired
+    private ItdmWeituoInfoMapper itdmWeituoInfoMapper;
+
+    /**根据委托单位查询委托信息列表*/
+    public List<ItdmWeituoInfo> selectWTListByClient(String weituoClient){
+        return itdmWeituoInfoMapper.selectWTListByClient(weituoClient);
+    }
+
+    /**查询委托单位名称（不重复）*/
+    public List<String> selectDistinctClientList(){
+        return itdmWeituoInfoMapper.selectDistinctClientList();
+    }
 
     @Transactional
     @Override