From aa1cceece8b421c6f3647bfeddb9188562e2f77f Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期五, 30 六月 2023 11:06:23 +0800
Subject: [PATCH] 实时数据增加字段

---
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryProdRecordMapper.xml           |    5 
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java |   57 +++++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryProdRecordServiceImpl.java   |   19 +
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryProdRecordService.java           |   14 +
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryProdRecord.java                    |  207 ++++++++++++++++++++
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryProdRecordMapper.java              |   17 +
 jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryProdRecordController.java      |  178 +++++++++++++++++
 jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java                       |   52 +++++
 8 files changed, 545 insertions(+), 4 deletions(-)

diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryProdRecord.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryProdRecord.java
new file mode 100644
index 0000000..9426814
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/entity/DryProdRecord.java
@@ -0,0 +1,207 @@
+package org.jeecg.modules.dry.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-06-26
+ * @Version: V1.0
+ */
+@Data
+@TableName("dry_prod_record")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="dry_prod_record瀵硅薄", description="鐢熶骇鎿嶄綔璁板綍")
+public class DryProdRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**id*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "id")
+    private String id;
+	/**鍝佸悕*/
+	@Excel(name = "鍝佸悕", width = 15)
+    @ApiModelProperty(value = "鍝佸悕")
+    private String reportHeadName;
+	/**鎵规*/
+	@Excel(name = "鎵规", width = 15)
+    @ApiModelProperty(value = "鎵规")
+    private String reportHeadBatch;
+	/**鏁伴噺*/
+	@Excel(name = "鏁伴噺", width = 15)
+    @ApiModelProperty(value = "鏁伴噺")
+    private String reportHeadNum;
+	/**璁惧*/
+	@Excel(name = "璁惧", width = 15)
+    @ApiModelProperty(value = "璁惧")
+    private String reportHeadMachine;
+	/**鎺ユ枡浜�*/
+	@Excel(name = "鎺ユ枡浜�", width = 15)
+    @ApiModelProperty(value = "鎺ユ枡浜�")
+    private String reportHeadAccepter;
+	/**鐢熶骇鏃ユ湡*/
+	@Excel(name = "鐢熶骇鏃ユ湡", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "鐢熶骇鏃ユ湡")
+    private Date reportHeadDate;
+	/**鐝粍闀�*/
+	@Excel(name = "鐝粍闀�", width = 15)
+    @ApiModelProperty(value = "鐝粍闀�")
+    private String reportHeadLeader;
+	/**宸ヨ壓鍛�*/
+	@Excel(name = "宸ヨ壓鍛�", width = 15)
+    @ApiModelProperty(value = "宸ヨ壓鍛�")
+    private String reportHeadTecher;
+	/**鐢熶骇鐜板満*/
+	@Excel(name = "鐢熶骇鐜板満", width = 15)
+    @ApiModelProperty(value = "鐢熶骇鐜板満")
+    private Integer reportCheckField;
+	/**鎵ц鏂囦欢*/
+	@Excel(name = "鎵ц鏂囦欢", width = 15)
+    @ApiModelProperty(value = "鎵ц鏂囦欢")
+    private Integer reportCheckFile;
+	/**鐗╂枡鏍囩ず*/
+	@Excel(name = "鐗╂枡鏍囩ず", width = 15)
+    @ApiModelProperty(value = "鐗╂枡鏍囩ず")
+    private Integer reportCheckTag;
+	/**绉伴噺鍣ㄥ叿*/
+	@Excel(name = "绉伴噺鍣ㄥ叿", width = 15)
+    @ApiModelProperty(value = "绉伴噺鍣ㄥ叿")
+    private Integer reportCheckTool;
+	/**妫�鏌ヤ汉*/
+	@Excel(name = "妫�鏌ヤ汉", width = 15)
+    @ApiModelProperty(value = "妫�鏌ヤ汉")
+    private String reportCheckMan;
+	/**妫�鏌ユ儏鍐�*/
+	@Excel(name = "妫�鏌ユ儏鍐�", width = 15)
+    @ApiModelProperty(value = "妫�鏌ユ儏鍐�")
+    private Integer reportCheckStatus;
+	/**QA*/
+	@Excel(name = "QA", width = 15)
+    @ApiModelProperty(value = "QA")
+    private String reportCheckQa;
+	/**寮傚父璁板綍*/
+	@Excel(name = "寮傚父璁板綍", width = 15)
+    @ApiModelProperty(value = "寮傚父璁板綍")
+    private String reportCheckRecord;
+	/**澶栬妫�鏌�*/
+	@Excel(name = "澶栬妫�鏌�", width = 15)
+    @ApiModelProperty(value = "澶栬妫�鏌�")
+    private Integer reportProductView;
+	/**鍚归*/
+	@Excel(name = "鍚归", width = 15)
+    @ApiModelProperty(value = "鍚归")
+    private Integer reportProductWind;
+	/**鏅�*/
+	@Excel(name = "鏅�", width = 15)
+    @ApiModelProperty(value = "鏅�")
+    private Integer reportProductSun;
+	/**浣庢俯骞茬嚗*/
+	@Excel(name = "浣庢俯骞茬嚗", width = 15)
+    @ApiModelProperty(value = "浣庢俯骞茬嚗")
+    private Integer reportProductLowDry;
+	/**骞茬嚗*/
+	@Excel(name = "骞茬嚗", width = 15)
+    @ApiModelProperty(value = "骞茬嚗")
+    private Integer reportProductDry;
+	/**寮�濮嬫椂闂�*/
+	@Excel(name = "寮�濮嬫椂闂�", width = 15)
+    @ApiModelProperty(value = "寮�濮嬫椂闂�")
+    private String reportProductStart;
+	/**缁撴潫鏃堕棿*/
+	@Excel(name = "缁撴潫鏃堕棿", width = 15)
+    @ApiModelProperty(value = "缁撴潫鏃堕棿")
+    private String reportProductEnd;
+	/**骞茬嚗鎬绘椂闂�*/
+	@Excel(name = "骞茬嚗鎬绘椂闂�", width = 15)
+    @ApiModelProperty(value = "骞茬嚗鎬绘椂闂�")
+    private Integer reportProductTotal;
+	/**骞茬嚗妫�鏌�*/
+	@Excel(name = "骞茬嚗妫�鏌�", width = 15)
+    @ApiModelProperty(value = "骞茬嚗妫�鏌�")
+    private Integer reportProductCheck;
+	/**鎿嶄綔浜�*/
+	@Excel(name = "鎿嶄綔浜�", width = 15)
+    @ApiModelProperty(value = "鎿嶄綔浜�")
+    private String reportProductMan1;
+	/**澶嶆牳浜�*/
+	@Excel(name = "澶嶆牳浜�", width = 15)
+    @ApiModelProperty(value = "澶嶆牳浜�")
+    private String reportProductMan2;
+	/**鎿嶄綔鍚庨噸閲�*/
+	@Excel(name = "鎿嶄綔鍚庨噸閲�", width = 15)
+    @ApiModelProperty(value = "鎿嶄綔鍚庨噸閲�")
+    private Double reportProductWeight;
+	/**搴熸枡鏁伴噺*/
+	@Excel(name = "搴熸枡鏁伴噺", width = 15)
+    @ApiModelProperty(value = "搴熸枡鏁伴噺")
+    private Double reportProductWaste;
+	/**鏀剁巼*/
+	@Excel(name = "鏀剁巼", width = 15)
+    @ApiModelProperty(value = "鏀剁巼")
+    private Double reportProductUse;
+	/**QA*/
+	@Excel(name = "QA", width = 15)
+    @ApiModelProperty(value = "QA")
+    private String reportProductQa;
+	/**璁惧娓呯悊*/
+	@Excel(name = "璁惧娓呯悊", width = 15)
+    @ApiModelProperty(value = "璁惧娓呯悊")
+    private Integer reportCleanMachine;
+	/**搴熸枡娓呯悊*/
+	@Excel(name = "搴熸枡娓呯悊", width = 15)
+    @ApiModelProperty(value = "搴熸枡娓呯悊")
+    private Integer reportCleanWaste;
+	/**宸ュ叿娓呯悊*/
+	@Excel(name = "宸ュ叿娓呯悊", width = 15)
+    @ApiModelProperty(value = "宸ュ叿娓呯悊")
+    private Integer reportCleanTool;
+	/**闂ㄧ獥娓呯悊*/
+	@Excel(name = "闂ㄧ獥娓呯悊", width = 15)
+    @ApiModelProperty(value = "闂ㄧ獥娓呯悊")
+    private Integer reportCleanDoor;
+	/**绠变綋娓呯悊*/
+	@Excel(name = "绠变綋娓呯悊", width = 15)
+    @ApiModelProperty(value = "绠变綋娓呯悊")
+    private Integer reportCleanBox;
+	/**鐢熶骇璁板綍娓呯悊*/
+	@Excel(name = "鐢熶骇璁板綍娓呯悊", width = 15)
+    @ApiModelProperty(value = "鐢熶骇璁板綍娓呯悊")
+    private Integer reportCleanRecord;
+	/**娓呭満鏃ユ湡*/
+	@Excel(name = "娓呭満鏃ユ湡", width = 15, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @ApiModelProperty(value = "娓呭満鏃ユ湡")
+    private Date reportCleanDate;
+	/**娓呭満浜�*/
+	@Excel(name = "娓呭満浜�", width = 15)
+    @ApiModelProperty(value = "娓呭満浜�")
+    private String reportCleanMan;
+	/**娓呭満纭*/
+	@Excel(name = "娓呭満纭", width = 15)
+    @ApiModelProperty(value = "娓呭満纭")
+    private Integer reportCleanConfirm;
+	/**QA*/
+	@Excel(name = "QA", width = 15)
+    @ApiModelProperty(value = "QA")
+    private String reportCleanQa;
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
index ffdf34c..2ad8865 100644
--- a/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
+++ b/jeecg-module-dry/jeecg-module-dry-api/src/main/java/org/jeecg/modules/dry/vo/RealTimeDataVo.java
@@ -6,6 +6,7 @@
 import lombok.ToString;
 import org.jeecg.modules.dry.entity.DryEquipment;
 
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -110,5 +111,56 @@
     /**宸ュ崟鐘舵��*/
     private Integer workorder_status;
 
+    /**---------------------鐢熶骇璁板綍鐩稿叧瀛楁瀹氫箟---s-------------------------*/
+
+    private Boolean report_flag;       // 鎻愪氦鏍囧織
+
+    private String report_head_name;         // 鍝佸悕
+    private String report_head_batch   ;     //鎵规
+    private String report_head_num     ;     //鏁伴噺--16妗�/355.8Kg
+    private String report_head_machine ;     //璁惧
+    private String report_head_accepter;     //鎺ユ枡浜�
+    private Date report_head_date    ;     //鐢熶骇鏃ユ湡
+    private String report_head_leader  ;     //鐝粍闀�
+    private String report_head_techer  ;     //宸ヨ壓鍛�
+    //妫�鏌�
+    private Boolean report_check_field ;    //鐢熶骇鐜板満
+    private Boolean report_check_file  ;    //鎵ц鏂囦欢
+    private Boolean report_check_tag   ;    //鐗╂枡鏍囩ず
+    private Boolean report_check_tool  ;    //绉伴噺鍣ㄥ叿
+    private String report_check_man   ;    //妫�鏌ヤ汉
+    private Boolean report_check_status;    //妫�鏌ユ儏鍐�
+    private String report_check_qa ;     //QA
+    private String report_check_record    ;     //寮傚父璁板綍
+    //鐢熶骇
+    private Boolean report_product_view    ;    //澶栬妫�鏌�
+    private Boolean report_product_wind    ;    //鍚归
+    private Boolean report_product_sun     ;    //鏅�
+    private Boolean report_product_low_dry ;    //浣庢俯骞茬嚗
+    private Boolean report_product_dry     ;    //骞茬嚗
+    private String  report_product_start   ;     //寮�濮嬫椂闂�
+    private String  report_product_end     ;     //缁撴潫鏃堕棿
+    private Integer report_product_total   ;    //骞茬嚗鎬绘椂闂�
+    private Boolean report_product_check   ;    //骞茬嚗妫�鏌�
+    private String  report_product_man1    ;     //鎿嶄綔浜�
+    private String  report_product_man2    ;     //澶嶆牳浜�
+    private Double  report_product_weight  ;     //鎿嶄綔鍚庨噸閲�
+    private Double  report_product_waste   ;     //搴熸枡鏁伴噺
+    private Double  report_product_use     ;     //鏀剁巼
+    private String  report_product_qa      ;     //QA
+    //娓呭満
+    private Boolean report_clean_machine   ;    //璁惧娓呯悊
+    private Boolean report_clean_waste     ;    //搴熸枡娓呯悊
+    private Boolean report_clean_tool      ;    //宸ュ叿娓呯悊
+    private Boolean report_clean_door      ;    //闂ㄧ獥娓呯悊
+    private Boolean report_clean_box       ;    //绠变綋娓呯悊
+    private Boolean report_clean_record    ;    //鐢熶骇璁板綍娓呯悊
+    private Date report_clean_date      ;     //娓呭満鏃ユ湡
+    private String report_clean_man       ;     //娓呭満浜�
+    private Boolean report_clean_confirm   ;    //娓呭満纭
+    private String report_clean_qa        ;     //QA
+
+    /**---------------------鐢熶骇璁板綍鐩稿叧瀛楁瀹氫箟---e-------------------------*/
+
 
 }
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryProdRecordController.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryProdRecordController.java
new file mode 100644
index 0000000..c63b99d
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/controller/DryProdRecordController.java
@@ -0,0 +1,178 @@
+package org.jeecg.modules.dry.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.dry.entity.DryProdRecord;
+import org.jeecg.modules.dry.service.IDryProdRecordService;
+
+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;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+
+ /**
+ * @Description: 鐢熶骇鎿嶄綔璁板綍
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Api(tags="鐢熶骇鎿嶄綔璁板綍")
+@RestController
+@RequestMapping("/dry/dryProdRecord")
+@Slf4j
+public class DryProdRecordController extends JeecgController<DryProdRecord, IDryProdRecordService> {
+	@Autowired
+	private IDryProdRecordService dryProdRecordService;
+	
+	/**
+	 * 鍒嗛〉鍒楄〃鏌ヨ
+	 *
+	 * @param dryProdRecord
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "鐢熶骇鎿嶄綔璁板綍-鍒嗛〉鍒楄〃鏌ヨ")
+	@ApiOperation(value="鐢熶骇鎿嶄綔璁板綍-鍒嗛〉鍒楄〃鏌ヨ", notes="鐢熶骇鎿嶄綔璁板綍-鍒嗛〉鍒楄〃鏌ヨ")
+	@GetMapping(value = "/list")
+	public Result<IPage<DryProdRecord>> queryPageList(DryProdRecord dryProdRecord,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<DryProdRecord> queryWrapper = QueryGenerator.initQueryWrapper(dryProdRecord, req.getParameterMap());
+		Page<DryProdRecord> page = new Page<DryProdRecord>(pageNo, pageSize);
+		IPage<DryProdRecord> pageList = dryProdRecordService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   娣诲姞
+	 *
+	 * @param dryProdRecord
+	 * @return
+	 */
+	@AutoLog(value = "鐢熶骇鎿嶄綔璁板綍-娣诲姞")
+	@ApiOperation(value="鐢熶骇鎿嶄綔璁板綍-娣诲姞", notes="鐢熶骇鎿嶄綔璁板綍-娣诲姞")
+	@RequiresPermissions("dry:dry_prod_record:add")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody DryProdRecord dryProdRecord) {
+		dryProdRecordService.save(dryProdRecord);
+		return Result.OK("娣诲姞鎴愬姛锛�");
+	}
+	
+	/**
+	 *  缂栬緫
+	 *
+	 * @param dryProdRecord
+	 * @return
+	 */
+	@AutoLog(value = "鐢熶骇鎿嶄綔璁板綍-缂栬緫")
+	@ApiOperation(value="鐢熶骇鎿嶄綔璁板綍-缂栬緫", notes="鐢熶骇鎿嶄綔璁板綍-缂栬緫")
+	@RequiresPermissions("dry:dry_prod_record:edit")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody DryProdRecord dryProdRecord) {
+		dryProdRecordService.updateById(dryProdRecord);
+		return Result.OK("缂栬緫鎴愬姛!");
+	}
+	
+	/**
+	 *   閫氳繃id鍒犻櫎
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "鐢熶骇鎿嶄綔璁板綍-閫氳繃id鍒犻櫎")
+	@ApiOperation(value="鐢熶骇鎿嶄綔璁板綍-閫氳繃id鍒犻櫎", notes="鐢熶骇鎿嶄綔璁板綍-閫氳繃id鍒犻櫎")
+	@RequiresPermissions("dry:dry_prod_record:delete")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		dryProdRecordService.removeById(id);
+		return Result.OK("鍒犻櫎鎴愬姛!");
+	}
+	
+	/**
+	 *  鎵归噺鍒犻櫎
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "鐢熶骇鎿嶄綔璁板綍-鎵归噺鍒犻櫎")
+	@ApiOperation(value="鐢熶骇鎿嶄綔璁板綍-鎵归噺鍒犻櫎", notes="鐢熶骇鎿嶄綔璁板綍-鎵归噺鍒犻櫎")
+	@RequiresPermissions("dry:dry_prod_record:deleteBatch")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.dryProdRecordService.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<DryProdRecord> queryById(@RequestParam(name="id",required=true) String id) {
+		DryProdRecord dryProdRecord = dryProdRecordService.getById(id);
+		if(dryProdRecord==null) {
+			return Result.error("鏈壘鍒板搴旀暟鎹�");
+		}
+		return Result.OK(dryProdRecord);
+	}
+
+    /**
+    * 瀵煎嚭excel
+    *
+    * @param request
+    * @param dryProdRecord
+    */
+    @RequiresPermissions("dry:dry_prod_record:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, DryProdRecord dryProdRecord) {
+        return super.exportXls(request, dryProdRecord, DryProdRecord.class, "鐢熶骇鎿嶄綔璁板綍");
+    }
+
+    /**
+      * 閫氳繃excel瀵煎叆鏁版嵁
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequiresPermissions("dry:dry_prod_record:importExcel")
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, DryProdRecord.class);
+    }
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryProdRecordMapper.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryProdRecordMapper.java
new file mode 100644
index 0000000..90a3e05
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/DryProdRecordMapper.java
@@ -0,0 +1,17 @@
+package org.jeecg.modules.dry.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.dry.entity.DryProdRecord;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 鐢熶骇鎿嶄綔璁板綍
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface DryProdRecordMapper extends BaseMapper<DryProdRecord> {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryProdRecordMapper.xml b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryProdRecordMapper.xml
new file mode 100644
index 0000000..23bd9e7
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/mapper/xml/DryProdRecordMapper.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.dry.mapper.DryProdRecordMapper">
+
+</mapper>
\ No newline at end of file
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryProdRecordService.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryProdRecordService.java
new file mode 100644
index 0000000..f46dd5b
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/IDryProdRecordService.java
@@ -0,0 +1,14 @@
+package org.jeecg.modules.dry.service;
+
+import org.jeecg.modules.dry.entity.DryProdRecord;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 鐢熶骇鎿嶄綔璁板綍
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+public interface IDryProdRecordService extends IService<DryProdRecord> {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryProdRecordServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryProdRecordServiceImpl.java
new file mode 100644
index 0000000..7c1e7ce
--- /dev/null
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryProdRecordServiceImpl.java
@@ -0,0 +1,19 @@
+package org.jeecg.modules.dry.service.impl;
+
+import org.jeecg.modules.dry.entity.DryProdRecord;
+import org.jeecg.modules.dry.mapper.DryProdRecordMapper;
+import org.jeecg.modules.dry.service.IDryProdRecordService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 鐢熶骇鎿嶄綔璁板綍
+ * @Author: jeecg-boot
+ * @Date:   2023-06-26
+ * @Version: V1.0
+ */
+@Service
+public class DryProdRecordServiceImpl extends ServiceImpl<DryProdRecordMapper, DryProdRecord> implements IDryProdRecordService {
+
+}
diff --git a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
index ff8c0df..1c5b65d 100644
--- a/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
+++ b/jeecg-module-dry/jeecg-module-dry-biz/src/main/java/org/jeecg/modules/dry/service/impl/DryRealTimeDataServiceImpl.java
@@ -9,10 +9,7 @@
 import org.jeecg.common.config.TenantContext;
 import org.jeecg.common.util.RedisUtil;
 import org.jeecg.modules.dry.common.CacheConstants;
-import org.jeecg.modules.dry.entity.DryEquipment;
-import org.jeecg.modules.dry.entity.DryHerb;
-import org.jeecg.modules.dry.entity.DryOrder;
-import org.jeecg.modules.dry.entity.DryOrderTrend;
+import org.jeecg.modules.dry.entity.*;
 import org.jeecg.modules.dry.service.*;
 import org.jeecg.modules.dry.vo.DryOrderTrendVo;
 import org.jeecg.modules.dry.vo.DryOrderVo;
@@ -42,6 +39,9 @@
 
     @Autowired
     private RedisUtil redisUtil;
+
+    @Autowired
+    private IDryProdRecordService prodRecordService;
 
     @Override
     @Transactional
@@ -90,6 +90,55 @@
         orderVo.setOrderStatus(realTimeDataVo.getWorkorder_status());
         DryOrderTrendVo trendVo = new DryOrderTrendVo(realTimeDataVo);
         // 2.2 淇濆瓨宸ュ崟鍚按鐜囧彉鍖� 鎴� 閲嶉噺鍙樺寲
+
+        if(realTimeDataVo.getReport_flag()) {
+            DryProdRecord prodRecord = new DryProdRecord();
+            prodRecord.setReportHeadName(realTimeDataVo.getReport_head_name());
+            prodRecord.setReportHeadBatch(realTimeDataVo.getReport_head_batch());
+            prodRecord.setReportHeadNum(realTimeDataVo.getReport_head_num());
+            prodRecord.setReportHeadMachine(realTimeDataVo.getReport_head_machine());
+            prodRecord.setReportHeadAccepter(realTimeDataVo.getReport_head_accepter());
+            prodRecord.setReportHeadDate(realTimeDataVo.getReport_head_date());
+            prodRecord.setReportHeadLeader(realTimeDataVo.getReport_head_leader());
+            prodRecord.setReportHeadTecher(realTimeDataVo.getReport_head_techer());
+
+            prodRecord.setReportCheckField(realTimeDataVo.getReport_check_field()?1:0);
+            prodRecord.setReportCheckFile(realTimeDataVo.getReport_check_file()?1:0);
+            prodRecord.setReportCheckTag(realTimeDataVo.getReport_check_tag()?1:0);
+            prodRecord.setReportCheckTool(realTimeDataVo.getReport_check_tool()?1:0);
+            prodRecord.setReportCheckMan(realTimeDataVo.getReport_check_man());
+            prodRecord.setReportCheckStatus(realTimeDataVo.getReport_check_status()?1:0);
+            prodRecord.setReportCheckQa(realTimeDataVo.getReport_check_qa());
+            prodRecord.setReportCheckRecord(realTimeDataVo.getReport_check_record());
+
+            prodRecord.setReportProductView(realTimeDataVo.getReport_product_view()?1:0);
+            prodRecord.setReportProductWind(realTimeDataVo.getReport_product_wind()?1:0);
+            prodRecord.setReportProductSun(realTimeDataVo.getReport_product_sun()?1:0);
+            prodRecord.setReportProductLowDry(realTimeDataVo.getReport_product_low_dry()?1:0);
+            prodRecord.setReportProductDry(realTimeDataVo.getReport_product_dry()?1:0);
+            prodRecord.setReportProductStart(realTimeDataVo.getReport_product_start());
+            prodRecord.setReportProductEnd(realTimeDataVo.getReport_product_end());
+            prodRecord.setReportProductTotal(realTimeDataVo.getReport_product_total());
+            prodRecord.setReportProductCheck(realTimeDataVo.getReport_product_check()?1:0);
+            prodRecord.setReportProductMan1(realTimeDataVo.getReport_product_man1());
+            prodRecord.setReportProductMan2(realTimeDataVo.getReport_product_man2());
+            prodRecord.setReportProductWeight(realTimeDataVo.getReport_product_weight());
+            prodRecord.setReportProductWaste(realTimeDataVo.getReport_product_waste());
+            prodRecord.setReportProductUse(realTimeDataVo.getReport_product_use());
+            prodRecord.setReportProductQa(realTimeDataVo.getReport_product_qa());
+
+            prodRecord.setReportCleanMachine(realTimeDataVo.getReport_clean_machine()?1:0);
+            prodRecord.setReportCleanWaste(realTimeDataVo.getReport_clean_waste()?1:0);
+            prodRecord.setReportCleanTool(realTimeDataVo.getReport_clean_tool()?1:0);
+            prodRecord.setReportCleanDoor(realTimeDataVo.getReport_clean_door()?1:0);
+            prodRecord.setReportCleanBox(realTimeDataVo.getReport_clean_box()?1:0);
+            prodRecord.setReportCleanRecord(realTimeDataVo.getReport_clean_record()?1:0);
+            prodRecord.setReportCleanDate(realTimeDataVo.getReport_clean_date());
+            prodRecord.setReportCleanMan(realTimeDataVo.getReport_clean_man());
+            prodRecord.setReportCleanConfirm(realTimeDataVo.getReport_clean_confirm()?1:0);
+            prodRecord.setReportCleanQa(realTimeDataVo.getReport_clean_qa());
+            prodRecordService.save(prodRecord);
+        }
         saveOrderTrendVo(trendVo, orderVo);
         orderVo.setTrendVo(trendVo);
         orderVo.getBellowsTemp().put(realTimeDataVo.getTime3(), realTimeDataVo.getTemp2());

--
Gitblit v1.9.3