委托查询

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/Itdmgongdanshuju/controller/ItdmGongdanShujuController.java

@@ -1,177 +1,63 @@
-package org.jeecg.modules.Itdmgongdanshuju.controller;
+package org.jeecg.modules.itdmgongdanshuju.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.Itdmgongdanshuju.entity.ItdmGongdanShuju;
-import org.jeecg.modules.Itdmgongdanshuju.service.IItdmGongdanShujuService;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import org.jeecg.modules.weituochaxun.vo.ItdmWeituoAllVO;
+import io.swagger.annotations.ApiOperation;
 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.jeecg.modules.itdmgongdanshuju.dto.ItdmGongdanDto;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanShujuService;
 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: 工单数据
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+
+/**
+ * @Description: 委托信息
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-17
  * @Version: V1.0
  */
 @Api(tags="工单数据")
 @RestController
-@RequestMapping("/Itdmgongdanshuju/itdmGongdanShuju")
+@RequestMapping("/itdmgomgongdanshuju/ItdmGongdanshuju")
 @Slf4j
-public class ItdmGongdanShujuController extends JeecgController<ItdmGongdanShuju, IItdmGongdanShujuService> {
+public class ItdmGongdanshujuController {
+
 	@Autowired
-	private IItdmGongdanShujuService itdmGongdanShujuService;
-	
-	/**
-	 * 分页列表查询
-	 *
-	 * @param itdmGongdanShuju
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "工单数据-分页列表查询")
-	@ApiOperation(value="工单数据-分页列表查询", notes="工单数据-分页列表查询")
-	@GetMapping(value = "/list")
-	public Result<IPage<ItdmGongdanShuju>> queryPageList(ItdmGongdanShuju itdmGongdanShuju,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<ItdmGongdanShuju> queryWrapper = QueryGenerator.initQueryWrapper(itdmGongdanShuju, req.getParameterMap());
+	private ItdmGongdanShujuService itdmGongdanShujuService;
+
+
+	@ApiOperation(value="工单数据-列表", notes="工单数据-列表")
+	@GetMapping("/list")
+	public 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> pageList = itdmGongdanShujuService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   添加
-	 *
-	 * @param itdmGongdanShuju
-	 * @return
-	 */
-	@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("添加成功！");
-	}
-	
-	/**
-	 *  编辑
-	 *
-	 * @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("编辑成功!");
-	}
-	
-	/**
-	 *   通过id删除
-	 *
-	 * @param id
-	 * @return
-	 */
-	@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("删除成功!");
+		IPage<ItdmGongdanShuju> list = itdmGongdanShujuService.page(page);
+		return list;
 	}
-	
-	/**
-	 *  批量删除
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "工单数据-批量删除")
-	@ApiOperation(value="工单数据-批量删除", notes="工单数据-批量删除")
-	//@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.itdmGongdanShujuService.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<ItdmGongdanShuju> queryById(@RequestParam(name="id",required=true) String id) {
-		ItdmGongdanShuju itdmGongdanShuju = itdmGongdanShujuService.getById(id);
-		if(itdmGongdanShuju==null) {
-			return Result.error("未找到对应数据");
-		}
-		return Result.OK(itdmGongdanShuju);
+
+
+	@ApiOperation(value = "工单数据-生成", notes = "工单数据-生成")
+	@GetMapping("/create")
+	public Boolean create(@RequestBody ItdmGongdanDto itdmGongdanDto, HttpServletRequest req) {
+		Boolean b  = itdmGongdanShujuService.generate(itdmGongdanDto);
+		return b;
 	}
 
-    /**
-    * 导出excel
-    *
-    * @param request
-    * @param itdmGongdanShuju
-    */
-    //@RequiresPermissions("org.jeecg.modules:itdm_gongdan_shuju:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, ItdmGongdanShuju itdmGongdanShuju) {
-        return super.exportXls(request, itdmGongdanShuju, ItdmGongdanShuju.class, "工单数据");
-    }
 
-    /**
-      * 通过excel导入数据
-    *
-    * @param request
-    * @param response
-    * @return
-    */
-    //@RequiresPermissions("itdm_gongdan_shuju:importExcel")
-    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
-    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
-        return super.importExcel(request, response, ItdmGongdanShuju.class);
-    }
+	@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/Itdmgongdanshuju/entity/ItdmGongdanShuju.java

@@ -1,4 +1,4 @@
-package org.jeecg.modules.Itdmgongdanshuju.entity;
+package org.jeecg.modules.itdmgongdanshuju.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
@@ -11,8 +11,7 @@ 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;
@@ -21,7 +20,7 @@ import lombok.experimental.Accessors;
 /**
  * @Description: 工单数据
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date:   2023-05-25
  * @Version: V1.0
  */
 @Data
@@ -33,7 +32,7 @@ public class ItdmGongdanShuju implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**主键*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "主键")
     private java.lang.String id;
 	/**创建人*/
@@ -56,30 +55,44 @@ public class ItdmGongdanShuju implements Serializable {
     @ApiModelProperty(value = "所属部门")
     private java.lang.String sysOrgCode;
 	/**工单id*/
-	@Excel(name = "工单id", width = 15)
+	//@Excel(name = "工单id", width = 15)
     @ApiModelProperty(value = "工单id")
     private java.lang.String woId;
 	/**试验类型*/
-	@Excel(name = "试验类型", width = 15, dicCode = "shiyan_type")
-	@Dict(dicCode = "shiyan_type")
+	//@Excel(name = "试验类型", width = 15, dicCode = "shiiyan_type")
+	//@Dict(dicCode = "shiiyan_type")
     @ApiModelProperty(value = "试验类型")
     private java.lang.String shiyanType;
-	/**试验时间*/
-	@Excel(name = "试验时间", width = 15, format = "yyyy-MM-dd")
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
-    @DateTimeFormat(pattern="yyyy-MM-dd")
-    @ApiModelProperty(value = "试验时间")
-    private java.util.Date shiyanTime;
-	/**试验数据*/
-	@Excel(name = "试验数据", width = 15)
-    @ApiModelProperty(value = "试验数据")
-    private java.lang.String shiyanData;
+	/**试验开始时间*/
+	//@Excel(name = "试验开始时间", width = 15)
+    @ApiModelProperty(value = "试验开始时间")
+    private java.lang.String shiyanKaishitime;
+	/**试验结束时间*/
+	//@Excel(name = "试验结束时间", width = 15)
+    @ApiModelProperty(value = "试验结束时间")
+    private java.lang.String shiyanJieshutime;
+	/**频次*/
+	//@Excel(name = "频次", width = 15)
+    @ApiModelProperty(value = "频次")
+    private java.lang.String pinci;
+	/**生成的时间*/
+	//@Excel(name = "生成的时间", width = 15)
+    @ApiModelProperty(value = "生成的时间")
+    private java.lang.String shiyanTime;
+	/**试验数据温度*/
+	//@Excel(name = "试验数据温度", width = 15)
+    @ApiModelProperty(value = "试验数据温度")
+    private java.lang.String shiyanWendu;
+	/**试验数据湿度*/
+	//@Excel(name = "试验数据湿度", width = 15)
+    @ApiModelProperty(value = "试验数据湿度")
+    private java.lang.String shiyanShidu;
 	/**试验图片*/
-	@Excel(name = "试验图片", width = 15)
+	//@Excel(name = "试验图片", width = 15)
     @ApiModelProperty(value = "试验图片")
     private java.lang.String extraPic;
 	/**备注*/
-	@Excel(name = "备注", width = 15)
+	//@Excel(name = "备注", width = 15)
     @ApiModelProperty(value = "备注")
     private java.lang.String remark;
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/Itdmgongdanshuju/mapper/ItdmGongdanShujuMapper.java

@@ -1,17 +1,16 @@
-package org.jeecg.modules.Itdmgongdanshuju.mapper;
+package org.jeecg.modules.itdmgongdanshuju.mapper;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-import org.jeecg.modules.Itdmgongdanshuju.entity.ItdmGongdanShuju;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
 
 /**
- * @Description: 工单数据
- * @Author: jeecg-boot
- * @Date:   2023-05-21
- * @Version: V1.0
+ * 创建人:zwl
+ * 时间：2023/5/27-9:04 上午
+ *
+ * @version 1.0.0
  */
+@Mapper
 public interface ItdmGongdanShujuMapper extends BaseMapper<ItdmGongdanShuju> {
-
 }

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/Itdmgongdanshuju/mapper/xml/ItdmGongdanShujuMapper.xml

@@ -1,5 +1,10 @@
-<?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.Itdmgongdanshuju.mapper.ItdmGongdanShujuMapper">
+<?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.itdmgongdanshuju.entity.ItdmGongdanShuju">
+
+
 
 </mapper>

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/Itdmgongdanshuju/service/IItdmGongdanShujuService.java

@@ -1,14 +0,0 @@
-package org.jeecg.modules.Itdmgongdanshuju.service;
-
-import org.jeecg.modules.Itdmgongdanshuju.entity.ItdmGongdanShuju;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * @Description: 工单数据
- * @Author: jeecg-boot
- * @Date:   2023-05-21
- * @Version: V1.0
- */
-public interface IItdmGongdanShujuService extends IService<ItdmGongdanShuju> {
-
-}

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/Itdmgongdanshuju/service/impl/ItdmGongdanShujuServiceImpl.java

@@ -1,19 +1,62 @@
-package org.jeecg.modules.Itdmgongdanshuju.service.impl;
+package org.jeecg.modules.itdmgongdanshuju.service.impl;
 
-import org.jeecg.modules.Itdmgongdanshuju.entity.ItdmGongdanShuju;
-import org.jeecg.modules.Itdmgongdanshuju.mapper.ItdmGongdanShujuMapper;
-import org.jeecg.modules.Itdmgongdanshuju.service.IItdmGongdanShujuService;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.BagUtils;
+import org.jeecg.modules.itdmGongdanDetail.mapper.ItdmGongdanDetailMapper;
+import org.jeecg.modules.itdmgongdanshuju.dto.ItdmGongdanDto;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanDetail;
+import org.jeecg.modules.itdmgongdanshuju.entity.ItdmGongdanShuju;
+import org.jeecg.modules.itdmgongdanshuju.mapper.ItdmGongdanDetail1Mapper;
+import org.jeecg.modules.itdmgongdanshuju.mapper.ItdmGongdanShujuMapper;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanDetailService;
+import org.jeecg.modules.itdmgongdanshuju.service.ItdmGongdanShujuService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import java.util.Date;
+import java.util.List;
 
 /**
- * @Description: 工单数据
+ * @Description: 委托信息
  * @Author: jeecg-boot
- * @Date:   2023-05-21
+ * @Date: 2023-05-17
  * @Version: V1.0
  */
 @Service
-public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMapper, ItdmGongdanShuju> implements IItdmGongdanShujuService {
+public class ItdmGongdanShujuServiceImpl extends ServiceImpl<ItdmGongdanShujuMapper, ItdmGongdanShuju> implements ItdmGongdanShujuService {
+
+    @Autowired
+    ItdmGongdanDetail1Mapper itdmGongdanDetailMapper;
+    @Autowired
+    ItdmGongdanShujuMapper itdmGongdanShujuMapper;
+
+    @Override
+    @Transactional
+    public Boolean generate(ItdmGongdanDto itdmGongdanDto) {
+
+        ItdmGongdanDetail itdmGongdanDetails = itdmGongdanDetailMapper.selectOne(new QueryWrapper<ItdmGongdanDetail>().eq("end_time", itdmGongdanDto.getShiyanJieshutime()).eq("start_time", itdmGongdanDto.getShiyanKaishitime()).eq("shiji_shiiyan_type", itdmGongdanDto.getShiyanType()).eq("wo_id", itdmGongdanDto.getWoId()));
+
+        String startTime = itdmGongdanDto.getShiyanKaishitime();
+        String endTime = itdmGongdanDto.getShiyanJieshutime();
+        Date date1 = DateUtil.parse(startTime);
+        Date date2 = DateUtil.parse(endTime);
+        long betweenMinute = DateUtil.between(date1, date2, DateUnit.MINUTE);
+        // 频次
+        int l = (int) (betweenMinute / Integer.parseInt(itdmGongdanDto.getPinci()));
+        for (int i = 1; i <= l; i++) {
+            ItdmGongdanShuju itdmGongdanShuju = new ItdmGongdanShuju();
+            BeanUtils.copyProperties(itdmGongdanDetails, itdmGongdanShuju);
+            itdmGongdanShuju.setShiyanTime(DateUtil.offsetMinute(date1, i * l).toString().split(" ")[1]);
+            itdmGongdanShujuMapper.insert(itdmGongdanShuju);
+        }
+        return true;
+    }
+
+
 
 }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.jeecg.config.JeecgBaseConfig;
-import org.jeecg.modules.Itdmgongdanshuju.mapper.ItdmGongdanShujuMapper;
 import org.jeecg.modules.baogao.convert.BaogaoConvert;
 import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;
 import org.jeecg.modules.baogao.entity.ItdmBaogao;
@@ -86,7 +85,7 @@ public class ItdmBaogaoServiceImpl extends ServiceImpl<ItdmBaogaoMapper, ItdmBao
 
 
     @Autowired
-    private ItdmGongdanShujuMapper itdmGongdanShujuMapper;
+    private ItdmBaogaoMapper itdmGongdanShujuMapper;
 
 
     @Override

itdmServer/module-iTDM/src/main/java/org/jeecg/modules/baogao/util/PoiTiUtils.java

@@ -8,7 +8,7 @@ import com.deepoove.poi.config.ConfigureBuilder;
 import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
 import org.apache.commons.collections4.ListUtils;
 import org.apache.commons.lang3.time.DateUtils;
-import org.jeecg.modules.Itdmgongdanshuju.entity.ItdmGongdanShuju;
+
 import org.jeecg.modules.baogao.common.BGType;
 import org.jeecg.modules.baogao.common.BGXsType;
 import org.jeecg.modules.baogao.dto.ItdmBaogaoCreateDTO;