Merge remote-tracking branch 'origin/master'

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/service/impl/ItdmBaogaoServiceImpl.java

@@ -17,8 +17,8 @@ import org.jeecg.modules.chuanganqi.entity.ItdmChuanganqi;
 import org.jeecg.modules.chuanganqi.mapper.ItdmChuanganqiMapper;
 import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
 import org.jeecg.modules.moban.entity.ItdmMoban;
 import org.jeecg.modules.moban.mapper.ItdmMobanMapper;
 import org.jeecg.modules.weituo.entity.ItdmWeituoInfo;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/controller/ItdmGongdanQuerenController.java

@@ -12,7 +12,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/convert/GongdanDetailConvert.java

@@ -1,7 +1,7 @@
 package org.jeecg.modules.gongdandetail.convert;
 
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import org.mapstruct.Mapper;
 import org.mapstruct.ReportingPolicy;
 import org.mapstruct.factory.Mappers;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/IItdmGongdanQuerenService.java

@@ -2,7 +2,7 @@ package org.jeecg.modules.gongdandetail.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 
 import java.text.ParseException;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/gongdandetail/service/impl/ItdmGongdanQuerenServiceImpl.java

@@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.gongdandetail.convert.GongdanDetailConvert;
 import org.jeecg.modules.gongdandetail.dto.ItdmGongdanDetailEditDTO;
 import org.jeecg.modules.gongdandetail.service.IItdmGongdanQuerenService;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,13 +16,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
-import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 工单detail
@@ -35,6 +31,7 @@ public class ItdmGongdanQuerenServiceImpl extends ServiceImpl<ItdmGongdanDetailM
 
 
     @Autowired
+    @SuppressWarnings("all")
     private ItdmGongdanMasterMapper masterMapper;
 
     @Override

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/controller/ItdmWenxiangController.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.ItdmWenxiang;
+import org.jeecg.modules.itdmDataHistory.service.IItdmWenxiangService;
+
+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("/itdmDataHistory/itdmWenxiang")
+@Slf4j
+public class ItdmWenxiangController extends JeecgController<ItdmWenxiang, IItdmWenxiangService> {
+	@Autowired
+	private IItdmWenxiangService itdmWenxiangService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmWenxiang
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "温箱历史数据-分页列表查询")
+	@ApiOperation(value="温箱历史数据-分页列表查询", notes="温箱历史数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmWenxiang>> queryPageList(ItdmWenxiang itdmWenxiang,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmWenxiang> queryWrapper = QueryGenerator.initQueryWrapper(itdmWenxiang, req.getParameterMap());
+		Page<ItdmWenxiang> page = new Page<ItdmWenxiang>(pageNo, pageSize);
+		IPage<ItdmWenxiang> pageList = itdmWenxiangService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmWenxiang
+	 * @return
+	 */
+	@AutoLog(value = "温箱历史数据-添加")
+	@ApiOperation(value="温箱历史数据-添加", notes="温箱历史数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmWenxiang itdmWenxiang) {
+		itdmWenxiangService.save(itdmWenxiang);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmWenxiang
+	 * @return
+	 */
+	@AutoLog(value = "温箱历史数据-编辑")
+	@ApiOperation(value="温箱历史数据-编辑", notes="温箱历史数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmWenxiang itdmWenxiang) {
+		itdmWenxiangService.updateById(itdmWenxiang);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "温箱历史数据-通过id删除")
+	@ApiOperation(value="温箱历史数据-通过id删除", notes="温箱历史数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmWenxiangService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "温箱历史数据-批量删除")
+	@ApiOperation(value="温箱历史数据-批量删除", notes="温箱历史数据-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmWenxiangService.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<ItdmWenxiang> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmWenxiang itdmWenxiang = itdmWenxiangService.getById(id);
+		if(itdmWenxiang==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmWenxiang);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmWenxiang
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_wenxiang:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmWenxiang itdmWenxiang) {
+        return super.exportXls(request, itdmWenxiang, ItdmWenxiang.class, "温箱历史数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_wenxiang:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmWenxiang.class);
+    }
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/controller/ItdmWenxiangVoltageController.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.ItdmWenxiangVoltage;
+import org.jeecg.modules.itdmDataHistory.service.IItdmWenxiangVoltageService;
+
+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("/itdmDataHistory/itdmWenxiangVoltage")
+@Slf4j
+public class ItdmWenxiangVoltageController extends JeecgController<ItdmWenxiangVoltage, IItdmWenxiangVoltageService> {
+	@Autowired
+	private IItdmWenxiangVoltageService itdmWenxiangVoltageService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param itdmWenxiangVoltage
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "温箱集体电压历史数据-分页列表查询")
+	@ApiOperation(value="温箱集体电压历史数据-分页列表查询", notes="温箱集体电压历史数据-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<ItdmWenxiangVoltage>> queryPageList(ItdmWenxiangVoltage itdmWenxiangVoltage,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<ItdmWenxiangVoltage> queryWrapper = QueryGenerator.initQueryWrapper(itdmWenxiangVoltage, req.getParameterMap());
+		Page<ItdmWenxiangVoltage> page = new Page<ItdmWenxiangVoltage>(pageNo, pageSize);
+		IPage<ItdmWenxiangVoltage> pageList = itdmWenxiangVoltageService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param itdmWenxiangVoltage
+	 * @return
+	 */
+	@AutoLog(value = "温箱集体电压历史数据-添加")
+	@ApiOperation(value="温箱集体电压历史数据-添加", notes="温箱集体电压历史数据-添加")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang_voltage:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody ItdmWenxiangVoltage itdmWenxiangVoltage) {
+		itdmWenxiangVoltageService.save(itdmWenxiangVoltage);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param itdmWenxiangVoltage
+	 * @return
+	 */
+	@AutoLog(value = "温箱集体电压历史数据-编辑")
+	@ApiOperation(value="温箱集体电压历史数据-编辑", notes="温箱集体电压历史数据-编辑")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang_voltage:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody ItdmWenxiangVoltage itdmWenxiangVoltage) {
+		itdmWenxiangVoltageService.updateById(itdmWenxiangVoltage);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "温箱集体电压历史数据-通过id删除")
+	@ApiOperation(value="温箱集体电压历史数据-通过id删除", notes="温箱集体电压历史数据-通过id删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang_voltage:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		itdmWenxiangVoltageService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "温箱集体电压历史数据-批量删除")
+	@ApiOperation(value="温箱集体电压历史数据-批量删除", notes="温箱集体电压历史数据-批量删除")
+	//@RequiresPermissions("org.jeecg.modules:itdm_wenxiang_voltage:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.itdmWenxiangVoltageService.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<ItdmWenxiangVoltage> queryById(@RequestParam(name="id",required=true) String id) {
+		ItdmWenxiangVoltage itdmWenxiangVoltage = itdmWenxiangVoltageService.getById(id);
+		if(itdmWenxiangVoltage==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(itdmWenxiangVoltage);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param itdmWenxiangVoltage
+    */
+    //@RequiresPermissions("org.jeecg.modules:itdm_wenxiang_voltage:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, ItdmWenxiangVoltage itdmWenxiangVoltage) {
+        return super.exportXls(request, itdmWenxiangVoltage, ItdmWenxiangVoltage.class, "温箱集体电压历史数据");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    //@RequiresPermissions("itdm_wenxiang_voltage:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, ItdmWenxiangVoltage.class);
+    }
+
+}

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

@@ -0,0 +1,142 @@
+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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_wenxiang")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_wenxiang对象", description="温箱历史数据")
+public class ItdmWenxiang 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, dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+	@Dict(dictTable = "itdm_device", dicText = "device_name", dicCode = "id")
+    @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, dicCode = "data_status")
+	@Dict(dicCode = "data_status")
+    @ApiModelProperty(value = "温度报警（0正常1报警）")
+    private java.lang.Integer temperatureAlarm;
+	/**湿度*/
+	@Excel(name = "湿度", width = 15)
+    @ApiModelProperty(value = "湿度")
+    private java.math.BigDecimal humidity;
+	/**湿度上限*/
+	@Excel(name = "湿度上限", width = 15)
+    @ApiModelProperty(value = "湿度上限")
+    private java.math.BigDecimal humidityMax;
+	/**湿度下限*/
+	@Excel(name = "湿度下限", width = 15)
+    @ApiModelProperty(value = "湿度下限")
+    private java.math.BigDecimal humidityMin;
+	/**湿度报警（0正常1报警）*/
+	@Excel(name = "湿度报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Dict(dicCode = "data_status")
+    @ApiModelProperty(value = "湿度报警（0正常1报警）")
+    private java.lang.Integer humidityAlarm;
+	/**A相电流*/
+	@Excel(name = "A相电流", width = 15)
+    @ApiModelProperty(value = "A相电流")
+    private java.math.BigDecimal currentA;
+	/**A相电流上限*/
+	@Excel(name = "A相电流上限", width = 15)
+    @ApiModelProperty(value = "A相电流上限")
+    private java.math.BigDecimal currentAMax;
+	/**A相电流下限*/
+	@Excel(name = "A相电流下限", width = 15)
+    @ApiModelProperty(value = "A相电流下限")
+    private java.math.BigDecimal currentAMin;
+	/**A相电流报警（0正常1报警）*/
+	@Excel(name = "A相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Dict(dicCode = "data_status")
+    @ApiModelProperty(value = "A相电流报警（0正常1报警）")
+    private java.lang.Integer currentAAlarm;
+	/**B相电流*/
+	@Excel(name = "B相电流", width = 15)
+    @ApiModelProperty(value = "B相电流")
+    private java.math.BigDecimal currentB;
+	/**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 currentBMin;
+	/**B相电流报警（0正常1报警）*/
+	@Excel(name = "B相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Dict(dicCode = "data_status")
+    @ApiModelProperty(value = "B相电流报警（0正常1报警）")
+    private java.lang.Integer currentBAlarm;
+	/**C相电流*/
+	@Excel(name = "C相电流", width = 15)
+    @ApiModelProperty(value = "C相电流")
+    private java.math.BigDecimal currentC;
+	/**C相电流上限*/
+	@Excel(name = "C相电流上限", width = 15)
+    @ApiModelProperty(value = "C相电流上限")
+    private java.math.BigDecimal currentCMax;
+	/**C相电流下限*/
+	@Excel(name = "C相电流下限", width = 15)
+    @ApiModelProperty(value = "C相电流下限")
+    private java.math.BigDecimal currentCMin;
+	/**C相电流报警（0正常1报警）*/
+	@Excel(name = "C相电流报警（0正常1报警）", width = 15, dicCode = "data_status")
+	@Dict(dicCode = "data_status")
+    @ApiModelProperty(value = "C相电流报警（0正常1报警）")
+    private java.lang.Integer currentCAlarm;
+	/**创建时间*/
+	@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/ItdmWenxiangVoltage.java

@@ -0,0 +1,92 @@
+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-27
+ * @Version: V1.0
+ */
+@Data
+@TableName("itdm_wenxiang_voltage")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_wenxiang_voltage对象", description="温箱集体电压历史数据")
+public class ItdmWenxiangVoltage 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;
+	/**A线电压上限*/
+	@Excel(name = "A线电压上限", width = 15)
+    @ApiModelProperty(value = "A线电压上限")
+    private java.math.BigDecimal voltageAMax;
+	/**A线电压下限*/
+	@Excel(name = "A线电压下限", width = 15)
+    @ApiModelProperty(value = "A线电压下限")
+    private java.math.BigDecimal voltageAMin;
+	/**A线电压报警（0正常1报警）*/
+	@Excel(name = "A线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "A线电压报警（0正常1报警）")
+    private java.lang.Integer voltageAAlarm;
+	/**B线电压*/
+	@Excel(name = "B线电压", width = 15)
+    @ApiModelProperty(value = "B线电压")
+    private java.math.BigDecimal voltageB;
+	/**B线电压上限*/
+	@Excel(name = "B线电压上限", width = 15)
+    @ApiModelProperty(value = "B线电压上限")
+    private java.math.BigDecimal voltageBMax;
+	/**B线电压下限*/
+	@Excel(name = "B线电压下限", width = 15)
+    @ApiModelProperty(value = "B线电压下限")
+    private java.math.BigDecimal voltageBMin;
+	/**B线电压报警（0正常1报警）*/
+	@Excel(name = "B线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "B线电压报警（0正常1报警）")
+    private java.lang.Integer voltageBAlarm;
+	/**C线电压*/
+	@Excel(name = "C线电压", width = 15)
+    @ApiModelProperty(value = "C线电压")
+    private java.math.BigDecimal voltageC;
+	/**C线电压上限*/
+	@Excel(name = "C线电压上限", width = 15)
+    @ApiModelProperty(value = "C线电压上限")
+    private java.math.BigDecimal voltageCMax;
+	/**C线电压下限*/
+	@Excel(name = "C线电压下限", width = 15)
+    @ApiModelProperty(value = "C线电压下限")
+    private java.math.BigDecimal voltageCMin;
+	/**C线电压报警（0正常1报警）*/
+	@Excel(name = "C线电压报警（0正常1报警）", width = 15)
+    @ApiModelProperty(value = "C线电压报警（0正常1报警）")
+    private java.lang.Integer voltageCAlarm;
+	/**创建时间*/
+	@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/ItdmWenxiangMapper.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.ItdmWenxiang;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 温箱历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface ItdmWenxiangMapper extends BaseMapper<ItdmWenxiang> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmDataHistory/mapper/ItdmWenxiangVoltageMapper.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.ItdmWenxiangVoltage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 温箱集体电压历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface ItdmWenxiangVoltageMapper extends BaseMapper<ItdmWenxiangVoltage> {
+
+}

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

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

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

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

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

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmDataHistory.service;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmWenxiangVoltage;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 温箱集体电压历史数据
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmWenxiangVoltageService extends IService<ItdmWenxiangVoltage> {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataHistory.service.impl;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmWenxiang;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmWenxiangMapper;
+import org.jeecg.modules.itdmDataHistory.service.IItdmWenxiangService;
+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 ItdmWenxiangServiceImpl extends ServiceImpl<ItdmWenxiangMapper, ItdmWenxiang> implements IItdmWenxiangService {
+
+}

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

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmDataHistory.service.impl;
+
+import org.jeecg.modules.itdmDataHistory.entity.ItdmWenxiangVoltage;
+import org.jeecg.modules.itdmDataHistory.mapper.ItdmWenxiangVoltageMapper;
+import org.jeecg.modules.itdmDataHistory.service.IItdmWenxiangVoltageService;
+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 ItdmWenxiangVoltageServiceImpl extends ServiceImpl<ItdmWenxiangVoltageMapper, ItdmWenxiangVoltage> implements IItdmWenxiangVoltageService {
+
+}

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

@@ -1,37 +1,22 @@
-package org.jeecg.modules.itdmGongdanDetail.controller;
+package org.jeecg.modules.itdmGongDan.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.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 
 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;
@@ -49,7 +34,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDetail, IItdmGongdanDetailService> {
 	@Autowired
 	private IItdmGongdanDetailService itdmGongdanDetailService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +56,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		IPage<ItdmGongdanDetail> pageList = itdmGongdanDetailService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +71,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.save(itdmGongdanDetail);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +86,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.updateById(itdmGongdanDetail);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +101,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		itdmGongdanDetailService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +116,7 @@ public class ItdmGongdanDetailController extends JeecgController<ItdmGongdanDeta
 		this.itdmGongdanDetailService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/controller/ItdmGongdanMasterController.java

@@ -1,37 +1,22 @@
-package org.jeecg.modules.itdmGongdanMaster.controller;
+package org.jeecg.modules.itdmGongDan.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.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 
 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;
@@ -39,7 +24,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
  /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Api(tags="工单master")
@@ -49,7 +34,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMaster, IItdmGongdanMasterService> {
 	@Autowired
 	private IItdmGongdanMasterService itdmGongdanMasterService;
-	
+
 	/**
 	 * 分页列表查询
 	 *
@@ -71,7 +56,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		IPage<ItdmGongdanMaster> pageList = itdmGongdanMasterService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *
@@ -86,7 +71,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.save(itdmGongdanMaster);
 		return Result.OK("添加成功！");
 	}
-	
+
 	/**
 	 *  编辑
 	 *
@@ -101,7 +86,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.updateById(itdmGongdanMaster);
 		return Result.OK("编辑成功!");
 	}
-	
+
 	/**
 	 *   通过id删除
 	 *
@@ -116,7 +101,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		itdmGongdanMasterService.removeById(id);
 		return Result.OK("删除成功!");
 	}
-	
+
 	/**
 	 *  批量删除
 	 *
@@ -131,7 +116,7 @@ public class ItdmGongdanMasterController extends JeecgController<ItdmGongdanMast
 		this.itdmGongdanMasterService.removeByIds(Arrays.asList(ids.split(",")));
 		return Result.OK("批量删除成功!");
 	}
-	
+
 	/**
 	 * 通过id查询
 	 *

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

@@ -1,16 +1,16 @@
-package org.jeecg.modules.itdmTestPlan.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
-import org.jeecg.modules.itdmTestPlan.service.IItdmJCXMSHJHService;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/controller/ItdmTestPlanController.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.controller;
+package org.jeecg.modules.itdmGongDan.controller;
 
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
@@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanDetail/entity/ItdmGongdanDetail.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmGongdanDetail.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/entity/ItdmGongdanMaster.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmGongdanMaster.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -21,7 +21,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Data
@@ -115,8 +115,8 @@ public class ItdmGongdanMaster implements Serializable {
 	/**所属部门*/
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
-    /**传感器*/
-    @Excel(name = "传感器id", width = 20)
-    @ApiModelProperty(value = "传感器id")
+	/**传感器*/
+	@Excel(name = "传感器", width = 15)
+    @ApiModelProperty(value = "传感器")
     private java.lang.String chuanganqi;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/entity/ItdmTestPlan.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.entity;
+package org.jeecg.modules.itdmGongDan.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;

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

@@ -1,9 +1,6 @@
-package org.jeecg.modules.itdmGongdanDetail.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**

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

@@ -1,15 +1,12 @@
-package org.jeecg.modules.itdmGongdanMaster.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 public interface ItdmGongdanMasterMapper extends BaseMapper<ItdmGongdanMaster> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmJCXMSHJHMapper.java

@@ -1,11 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.jeecg.modules.itdmDevice.entity.ItdmDevice;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJCXMAndSYJHVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJCXMAndSYJHVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 
 import java.util.List;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/ItdmTestPlanMapper.java

@@ -1,7 +1,7 @@
-package org.jeecg.modules.itdmTestPlan.mapper;
+package org.jeecg.modules.itdmGongDan.mapper;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 import java.util.List;

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

@@ -1,5 +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.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper">
 
-</mapper>
+</mapper>

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

@@ -1,5 +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.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper">
 
-</mapper>
+</mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmJCXMSHJHMapper.xml

@@ -1,5 +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.itdmTestPlan.mapper.ItdmJCXMSHJHMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmJCXMSHJHMapper">
 
 </mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/mapper/xml/ItdmTestPlanMapper.xml

@@ -1,6 +1,6 @@
 <?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.itdmTestPlan.mapper.ItdmTestPlanMapper">
+<mapper namespace="org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper">
 
     <select id="geChuanganqitByShiyanid" resultType="java.lang.String">
 
@@ -70,4 +70,4 @@
     </select>
 
 
-</mapper>
+</mapper>

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

@@ -1,6 +1,6 @@
-package org.jeecg.modules.itdmGongdanDetail.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/service/IItdmGongdanMasterService.java

@@ -1,12 +1,12 @@
-package org.jeecg.modules.itdmGongdanMaster.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 public interface IItdmGongdanMasterService extends IService<ItdmGongdanMaster> {

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/IItdmJCXMSHJHService.java

@@ -1,9 +1,8 @@
-package org.jeecg.modules.itdmTestPlan.service;
+package org.jeecg.modules.itdmGongDan.service;
 
 import org.apache.ibatis.annotations.Param;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/IItdmTestPlanService.java

@@ -1,6 +1,6 @@
-package org.jeecg.modules.itdmTestPlan.service;
+package org.jeecg.modules.itdmGongDan.service;
 
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

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

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmGongdanDetail.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanDetail.service.IItdmGongdanDetailService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanDetailService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmGongdanMaster/service/impl/ItdmGongdanMasterServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmGongdanMaster.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmGongdanMaster.service.IItdmGongdanMasterService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmGongdanMasterService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 /**
  * @Description: 工单master
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-28
  * @Version: V1.0
  */
 @Service

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

@@ -1,20 +1,20 @@
-package org.jeecg.modules.itdmTestPlan.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.jeecg.modules.itdmDevice.mapper.ItdmDeviceMapper;
-import org.jeecg.modules.itdmGongdanDetail.entity.ItdmGongdanDetail;
-import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmGongdanMaster.mapper.ItdmGongdanMasterMapper;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmJCXMSHJHMapper;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
-import org.jeecg.modules.itdmTestPlan.service.IItdmJCXMSHJHService;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJCXMAndSYJHVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmJHYQueryListVO;
-import org.jeecg.modules.itdmTestPlan.vo.ItdmXMJLQueryListVO;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmGongdanMasterMapper;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmJCXMSHJHMapper;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmJCXMSHJHService;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJCXMAndSYJHVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmJHYQueryListVO;
+import org.jeecg.modules.itdmGongDan.vo.ItdmXMJLQueryListVO;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoInfoMapper;
 import org.jeecg.modules.weituo.mapper.ItdmWeituoYangpinMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -58,6 +58,7 @@ public class ItdmJCXMSHJHServiceImpl implements IItdmJCXMSHJHService {
     /**
      * 项目经理新增或修改试验计划或工单master
      */
+    // TODO 初版，前端单个提交，还要改，前端可能用整体提交——删除怎么办
     public String XMJLAddOrUpdate(ItdmXMJLQueryListVO vo){
         String msg = "操作成功！";
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/service/impl/ItdmTestPlanServiceImpl.java

@@ -1,8 +1,8 @@
-package org.jeecg.modules.itdmTestPlan.service.impl;
+package org.jeecg.modules.itdmGongDan.service.impl;
 
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
-import org.jeecg.modules.itdmTestPlan.mapper.ItdmTestPlanMapper;
-import org.jeecg.modules.itdmTestPlan.service.IItdmTestPlanService;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.mapper.ItdmTestPlanMapper;
+import org.jeecg.modules.itdmGongDan.service.IItdmTestPlanService;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmTestPlan/vo/ItdmJCXMAndSYJHVO.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;

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

@@ -1,10 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 

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

@@ -1,10 +1,10 @@
-package org.jeecg.modules.itdmTestPlan.vo;
+package org.jeecg.modules.itdmGongDan.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecg.modules.itdmGongdanMaster.entity.ItdmGongdanMaster;
-import org.jeecg.modules.itdmTestPlan.entity.ItdmTestPlan;
+import org.jeecg.modules.itdmGongDan.entity.ItdmGongdanMaster;
+import org.jeecg.modules.itdmGongDan.entity.ItdmTestPlan;
 import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmMima/dto/ItdmMimaDTO.java

@@ -0,0 +1,63 @@
+package org.jeecg.modules.itdmMima.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import org.jeecg.modules.itdmMima.entity.ItdmMima;
+
+public class ItdmMimaDTO {
+
+    /** id */
+    @ApiModelProperty(value = "id")
+    private Long id;
+
+    /** 原密码 */
+    @ApiModelProperty(value = "原密码")
+    private String yuanmima;
+
+    /** 密码 */
+    @ApiModelProperty(value = "密码")
+    private String mima;
+
+    /** 设备id */
+    @ApiModelProperty(value = "设备id")
+    private String deviceId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setMima(String mima)
+    {
+        this.mima = mima;
+    }
+
+    public String getMima()
+    {
+        return mima;
+    }
+    public String getYuanmima() {
+        return yuanmima;
+    }
+
+    public void setYuanmima(String yuanmima) {
+        this.yuanmima = yuanmima;
+    }
+    public String getDeviceId() {
+        return deviceId;
+    }
+
+    public void setDeviceId(String deviceId) {
+        this.deviceId = deviceId;
+    }
+
+    public ItdmMima toItdmMima(){
+        ItdmMima itdmMima = new ItdmMima();
+        itdmMima.setId(this.getId());
+        itdmMima.setMima(this.getMima());
+        return itdmMima;
+    }
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmMima/entity/ItdmMima.java

@@ -0,0 +1,67 @@
+package org.jeecg.modules.itdmMima.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_mima")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="itdm_mima对象", description="修改密码表")
+public class ItdmMima implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private java.lang.Long id;
+	/**密码锁住的位置*/
+	@Excel(name = "密码锁住的位置", width = 15)
+    @ApiModelProperty(value = "密码锁住的位置")
+    private java.lang.String weizhi;
+	/**密码*/
+	@Excel(name = "密码", width = 15)
+    @ApiModelProperty(value = "密码")
+    private java.lang.String mima;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "创建时间")
+    private java.util.Date createTime;
+	/**修改人*/
+    @ApiModelProperty(value = "修改人")
+    private java.lang.String updateBy;
+	/**修改时间*/
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @ApiModelProperty(value = "修改时间")
+    private java.util.Date updateTime;
+	/**备注*/
+	@Excel(name = "备注", width = 15)
+    @ApiModelProperty(value = "备注")
+    private java.lang.String remark;
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmMima/mapper/ItdmMimaMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.itdmMima.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.jeecg.modules.itdmMima.entity.ItdmMima;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 修改密码表
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface ItdmMimaMapper extends BaseMapper<ItdmMima> {
+}

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

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmMima/service/IItdmMimaService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.itdmMima.service;
+
+import org.jeecg.modules.itdmMima.entity.ItdmMima;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 修改密码表
+ * @Author: jeecg-boot
+ * @Date:   2023-05-27
+ * @Version: V1.0
+ */
+public interface IItdmMimaService extends IService<ItdmMima> {
+
+}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/itdmMima/service/impl/ItdmMimaServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.itdmMima.service.impl;
+
+import org.jeecg.modules.itdmMima.entity.ItdmMima;
+import org.jeecg.modules.itdmMima.mapper.ItdmMimaMapper;
+import org.jeecg.modules.itdmMima.service.IItdmMimaService;
+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 ItdmMimaServiceImpl extends ServiceImpl<ItdmMimaMapper, ItdmMima> implements IItdmMimaService {
+
+}