From eddc7010369c735de1c4931a46b9d87a1008ae1e Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 17 十一月 2025 09:04:57 +0800
Subject: [PATCH] 堆垛机移库任务等待确认调整
---
src/main/resources/mapper/DeviceDataLogMapper.xml | 16 +++++
src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java | 12 ++++
src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java | 12 ++++
src/main/java/com/zy/asrs/entity/DeviceDataLog.java | 83 +++++++++++++++++++++++++++
src/main/java/com/zy/asrs/service/DeviceDataLogService.java | 8 ++
5 files changed, 131 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
new file mode 100644
index 0000000..2598c30
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
@@ -0,0 +1,83 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("wcs_device_data_log")
+public class DeviceDataLog implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value= "")
+ private Long id;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ @ApiModelProperty(value= "璁惧绫诲瀷")
+ private String type;
+
+ /**
+ * 璁惧鍙�
+ */
+ @ApiModelProperty(value= "璁惧鍙�")
+ @TableField("device_no")
+ private Integer deviceNo;
+
+ /**
+ * 婧愭暟鎹�
+ */
+ @ApiModelProperty(value= "婧愭暟鎹�")
+ @TableField("origin_data")
+ private String originData;
+
+ /**
+ * 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
+ */
+ @ApiModelProperty(value= "婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁")
+ @TableField("wcs_data")
+ private String wcsData;
+
+ /**
+ * 閲囬泦鏃堕棿
+ */
+ @ApiModelProperty(value= "閲囬泦鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ public DeviceDataLog() {}
+
+ public DeviceDataLog(String type,Integer deviceNo,String originData,String wcsData,Date createTime) {
+ this.type = type;
+ this.deviceNo = deviceNo;
+ this.originData = originData;
+ this.wcsData = wcsData;
+ this.createTime = createTime;
+ }
+
+// DeviceDataLog deviceDataLog = new DeviceDataLog(
+// null, // 璁惧绫诲瀷
+// null, // 璁惧鍙�
+// null, // 婧愭暟鎹�
+// null, // 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
+// null // 閲囬泦鏃堕棿
+// );
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java b/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java
new file mode 100644
index 0000000..286d049
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/DeviceDataLogMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.DeviceDataLog;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface DeviceDataLogMapper extends BaseMapper<DeviceDataLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/DeviceDataLogService.java b/src/main/java/com/zy/asrs/service/DeviceDataLogService.java
new file mode 100644
index 0000000..ef6215d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/DeviceDataLogService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.DeviceDataLog;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface DeviceDataLogService extends IService<DeviceDataLog> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java
new file mode 100644
index 0000000..ea9d19d
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/DeviceDataLogServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.DeviceDataLogMapper;
+import com.zy.asrs.entity.DeviceDataLog;
+import com.zy.asrs.service.DeviceDataLogService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("deviceDataLogService")
+public class DeviceDataLogServiceImpl extends ServiceImpl<DeviceDataLogMapper, DeviceDataLog> implements DeviceDataLogService {
+
+}
diff --git a/src/main/resources/mapper/DeviceDataLogMapper.xml b/src/main/resources/mapper/DeviceDataLogMapper.xml
new file mode 100644
index 0000000..7de7f65
--- /dev/null
+++ b/src/main/resources/mapper/DeviceDataLogMapper.xml
@@ -0,0 +1,16 @@
+<?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="com.zy.asrs.mapper.DeviceDataLogMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.DeviceDataLog">
+ <id column="id" property="id" />
+ <result column="type" property="type" />
+ <result column="device_no" property="deviceNo" />
+ <result column="origin_data" property="originData" />
+ <result column="wcs_data" property="wcsData" />
+ <result column="create_time" property="createTime" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1