From b9be3396a828d2fab25f92c5032b380c92be2049 Mon Sep 17 00:00:00 2001
From: tqs <56479841@qq.com>
Date: 星期二, 29 十一月 2022 14:28:49 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/enums/RgvStatusType.java | 44 +++
src/main/resources/mapper/BasRgvMapper.xml | 24 +
src/main/java/com/zy/asrs/entity/BasRgv.java | 209 ++++++++++++++
src/main/java/com/zy/core/enums/RgvModeType.java | 42 +++
src/main/java/com/zy/core/model/RgvSlave.java | 51 +++
src/main/java/com/zy/asrs/mapper/BasRgvMapper.java | 12
src/main/java/com/zy/asrs/service/BasRgvService.java | 8
src/main/java/com/zy/core/model/protocol/RgvProtocol.java | 197 ++++++++++++++
src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java | 12
src/main/java/com/zy/common/CodeBuilder.java | 12
src/main/java/com/zy/core/model/command/RgvCommand.java | 129 +++++++++
src/main/java/com/zy/core/enums/RgvTaskModeType.java | 46 +++
12 files changed, 784 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgv.java b/src/main/java/com/zy/asrs/entity/BasRgv.java
new file mode 100644
index 0000000..1ad2b53
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasRgv.java
@@ -0,0 +1,209 @@
+package com.zy.asrs.entity;
+
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+import com.core.common.SpringUtils;
+import com.zy.system.service.UserService;
+import com.zy.system.entity.User;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_rgv")
+public class BasRgv implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * RGV缂栧彿
+ */
+ @ApiModelProperty(value= "RGV缂栧彿")
+ @TableId(value = "rgv_no", type = IdType.INPUT)
+ @TableField("rgv_no")
+ private Integer rgvNo;
+
+ /**
+ * 鍙叆
+ */
+ @ApiModelProperty(value= "鍙叆")
+ @TableField("in_enable")
+ private String inEnable;
+
+ /**
+ * 鍙嚭
+ */
+ @ApiModelProperty(value= "鍙嚭")
+ @TableField("out_enable")
+ private String outEnable;
+
+ /**
+ * 浣滀笟鎬�
+ */
+ @ApiModelProperty(value= "浣滀笟鎬�")
+ @TableField("rgv_sts")
+ private Integer rgvSts;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no1")
+ private Integer wrkNo1;
+
+ /**
+ * 鍫嗗灈鏈哄彿
+ */
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField("wrk_no2")
+ private Integer wrkNo2;
+
+ /**
+ * 閿欒鐮�
+ */
+ @ApiModelProperty(value= "閿欒鐮�")
+ @TableField("rgv_err")
+ private Long rgvErr;
+
+ /**
+ * 鏍囪
+ */
+ @ApiModelProperty(value= "鏍囪")
+ @TableField("pak_mk")
+ private String pakMk;
+
+ /**
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
+ private Integer status;
+
+ /**
+ * 娣诲姞浜哄憳
+ */
+ @ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
+ private Long createBy;
+
+ /**
+ * 娣诲姞鏃堕棿
+ */
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ @TableField("create_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date createTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public BasRgv() {}
+
+ public BasRgv(Integer rgvNo,String inEnable,String outEnable,Integer rgvSts,Integer wrkNo1,Integer wrkNo2,Long rgvErr,String pakMk,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ this.rgvNo = rgvNo;
+ this.inEnable = inEnable;
+ this.outEnable = outEnable;
+ this.rgvSts = rgvSts;
+ this.wrkNo1 = wrkNo1;
+ this.wrkNo2 = wrkNo2;
+ this.rgvErr = rgvErr;
+ this.pakMk = pakMk;
+ this.status = status;
+ this.createBy = createBy;
+ this.createTime = createTime;
+ this.updateBy = updateBy;
+ this.updateTime = updateTime;
+ this.memo = memo;
+ }
+
+// BasRgv basRgv = new BasRgv(
+// null, // RGV缂栧彿[闈炵┖]
+// null, // 鍙叆
+// null, // 鍙嚭
+// null, // 浣滀笟鎬�
+// null, // 浠诲姟鍙�
+// null, // 鍫嗗灈鏈哄彿
+// null, // 閿欒鐮�
+// null, // 鏍囪
+// null, // 鐘舵��
+// null, // 娣诲姞浜哄憳
+// null, // 娣诲姞鏃堕棿
+// null, // 淇敼浜哄憳
+// null, // 淇敼鏃堕棿
+// null // 澶囨敞
+// );
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "绂佺敤";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
+ public String getCreateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.createBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.createTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+ }
+
+ public String getUpdateBy$(){
+ UserService service = SpringUtils.getBean(UserService.class);
+ User user = service.selectById(this.updateBy);
+ if (!Cools.isEmpty(user)){
+ return String.valueOf(user.getNickname());
+ }
+ return null;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java b/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
new file mode 100644
index 0000000..cb45640
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasRgvMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasRgv;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasRgvMapper extends BaseMapper<BasRgv> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasRgvService.java b/src/main/java/com/zy/asrs/service/BasRgvService.java
new file mode 100644
index 0000000..12d4aba
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasRgvService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasRgv;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasRgvService extends IService<BasRgv> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
new file mode 100644
index 0000000..36c7bb0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasRgvServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasRgvMapper;
+import com.zy.asrs.entity.BasRgv;
+import com.zy.asrs.service.BasRgvService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basRgvService")
+public class BasRgvServiceImpl extends ServiceImpl<BasRgvMapper, BasRgv> implements BasRgvService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index d2c576a..6d43ab9 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -1,6 +1,7 @@
package com.zy.common;
import com.core.generators.CoolGenerator;
+import com.core.generators.constant.SqlOsType;
/**
* Created by vincent on 2019-06-04
@@ -15,11 +16,18 @@
// generator.password="xltys1995";
// generator.table="sys_host";
// sqlserver
- generator.url="192.168.3.208:1433;databasename=cool";
+ generator.sqlOsType = SqlOsType.SQL_SERVER;
+ generator.url="localhost:1433;databasename=xjhsasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_wrk_detl";
+ generator.table="asr_bas_rgv";
generator.packagePath="com.zy.asrs";
+
+ generator.controller = false;
+ generator.html = false;
+ generator.js = false;
+ generator.htmlDetail = false;
+ generator.sql = false;
generator.build();
}
diff --git a/src/main/java/com/zy/core/enums/RgvModeType.java b/src/main/java/com/zy/core/enums/RgvModeType.java
new file mode 100644
index 0000000..98cea8e
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/RgvModeType.java
@@ -0,0 +1,42 @@
+package com.zy.core.enums;
+
+public enum RgvModeType {
+
+ NONE(-1, "绂荤嚎"),
+ STOP(0, "缁翠慨"),
+ HAND(1, "鎵嬪姩"),
+ HALF_AUTO(2, "鍗婅嚜鍔�"),
+ AUTO(3, "鑷姩"),
+ ;
+
+ public Integer id;
+ public String desc;
+ RgvModeType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static RgvModeType get(Short id) {
+ if (null == id) {
+ return null;
+ }
+ for (RgvModeType type : RgvModeType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static RgvModeType get(RgvModeType type) {
+ if (null == type) {
+ return null;
+ }
+ for (RgvModeType rgvModeType : RgvModeType.values()) {
+ if (rgvModeType == type) {
+ return rgvModeType;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/zy/core/enums/RgvStatusType.java b/src/main/java/com/zy/core/enums/RgvStatusType.java
new file mode 100644
index 0000000..3126ba6
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/RgvStatusType.java
@@ -0,0 +1,44 @@
+package com.zy.core.enums;
+
+public enum RgvStatusType {
+
+ NONE(-1, "绂荤嚎"),
+ IDLE(0, "绌洪棽"),
+ WORKING(1, "浣滀笟涓�"),
+ SOS(2, "鎶ヨ"),
+ FETCHING(11, "鍙栬揣涓�"),
+ PUTTING(12, "鏀捐揣涓�"),
+ WAITING(10, "浠诲姟瀹屾垚绛夊緟WCS纭"),
+ ;
+
+ public Integer id;
+ public String desc;
+ RgvStatusType(Integer id, String desc) {
+ this.id = id;
+ this.desc = desc;
+ }
+
+ public static RgvStatusType get(Short id) {
+ if (null == id) {
+ return null;
+ }
+ for (RgvStatusType type : RgvStatusType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return NONE;
+ }
+
+ public static RgvStatusType get(RgvStatusType type) {
+ if (null == type) {
+ return null;
+ }
+ for (RgvStatusType rgvStatusType : RgvStatusType.values()) {
+ if (rgvStatusType == type) {
+ return rgvStatusType;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/com/zy/core/enums/RgvTaskModeType.java b/src/main/java/com/zy/core/enums/RgvTaskModeType.java
new file mode 100644
index 0000000..d5975d0
--- /dev/null
+++ b/src/main/java/com/zy/core/enums/RgvTaskModeType.java
@@ -0,0 +1,46 @@
+package com.zy.core.enums;
+
+public enum RgvTaskModeType {
+
+ NONE(0), // 鏃�
+ FETCH(1), // 鍙栬揣
+ PUT(2), // 鏀捐揣
+ FETCH_PUT(3), // 搴撲綅绉昏浆
+// X_MOVE(4), // 绔欎綅绉昏浆
+// Y_MOVE(5), // 绔欎綅绉昏浆
+// XY_MOVE(6), // 绔欎綅绉昏浆
+// GO_ORIGIN(7), // 鍥炲師鐐�
+// BACK_ORIGIN(8), // 鍥炲弽鍘熺偣
+// CLEAR(9), // 娓呴敊
+ ;
+
+ public Integer id;
+ RgvTaskModeType(Integer id) {
+ this.id = id;
+ }
+
+ public static RgvTaskModeType get(Short id) {
+ if (null == id) {
+ return null;
+ }
+ for (RgvTaskModeType type : RgvTaskModeType.values()) {
+ if (type.id.equals(id.intValue())) {
+ return type;
+ }
+ }
+ return null;
+ }
+
+ public static RgvTaskModeType get(RgvTaskModeType type) {
+ if (null == type) {
+ return null;
+ }
+ for (RgvTaskModeType rgvTaskModeType : RgvTaskModeType.values()) {
+ if (rgvTaskModeType == type) {
+ return rgvTaskModeType;
+ }
+ }
+ return null;
+ }
+
+}
diff --git a/src/main/java/com/zy/core/model/RgvSlave.java b/src/main/java/com/zy/core/model/RgvSlave.java
new file mode 100644
index 0000000..33d9e14
--- /dev/null
+++ b/src/main/java/com/zy/core/model/RgvSlave.java
@@ -0,0 +1,51 @@
+package com.zy.core.model;
+
+import com.zy.core.Slave;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by vincent on 2020/8/10
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class RgvSlave extends Slave {
+
+ private Integer rack;
+
+ private Integer slot;
+
+ private Integer offset;
+
+ private Boolean demo;
+
+ // 鍫嗗灈鏈哄叆搴撶珯鐐�
+ private List<CrnStn> rgvInStn = new ArrayList<>();
+
+ // 鍫嗗灈鏈哄嚭搴撶珯鐐�
+ private List<CrnStn> rgvOutStn = new ArrayList<>();
+
+ @Data
+ public static class CrnStn {
+
+ // 杈撻�佺嚎plc缂栧彿
+ private Integer devpPlcId;
+
+ // 鍫嗗灈鏈虹珯鐐圭紪鍙�
+ private Integer staNo;
+
+ // 鎺�
+ private Integer row;
+
+ // 鍒�
+ private Integer bay;
+
+ // 灞�
+ private Integer lev;
+
+ }
+
+}
diff --git a/src/main/java/com/zy/core/model/command/RgvCommand.java b/src/main/java/com/zy/core/model/command/RgvCommand.java
new file mode 100644
index 0000000..5be8072
--- /dev/null
+++ b/src/main/java/com/zy/core/model/command/RgvCommand.java
@@ -0,0 +1,129 @@
+package com.zy.core.model.command;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import com.zy.core.enums.RgvTaskModeType;
+import lombok.Data;
+
+import java.util.Calendar;
+import java.util.Date;
+
+/**
+ * 鍫嗗灈鏈哄懡浠ゆ姤鏂�
+ * Created by vincent on 2020/8/11
+ */
+@Data
+public class RgvCommand {
+
+ // Rgv缂栧彿
+ private Integer rgvNo = 0;
+
+ // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
+ private Short ackFinish1 = 0;
+
+ // 宸ヤ綅1浠诲姟鍙�
+ private Short taskNo1 = 0;
+
+ /**
+ * 浠诲姟妯″紡锛�
+ * 0 = 鏃�
+ * 1 = 鍙栬揣
+ * 2 = 鏀捐揣
+ * 3 = 鍙栨斁璐�
+ */
+ private Short taskMode1 = 0;
+
+ @JSONField(serialize = false)
+ private RgvTaskModeType taskModeType1;
+
+ /*
+ 宸ヤ綅1婧愮珯
+ */
+ private Short sourceStaNo1 = 0;
+
+ /*
+ 宸ヤ綅1鐩爣绔�
+ */
+ private Short destinationStaNo1 = 0;
+
+ ////////////////////// 宸ヤ綅2瀹氫箟 //////////////////////////////////////////////////
+ // 宸ヤ綅1浠诲姟瀹屾垚纭浣�
+ private Short ackFinish2 = 0;
+
+ // 宸ヤ綅2浠诲姟鍙�
+ private Short taskNo2 = 0;
+
+ /**
+ * 浠诲姟妯″紡锛�
+ * 0 = 鏃�
+ * 1 = 鍙栬揣
+ * 2 = 鏀捐揣
+ * 3 = 鍙栨斁璐�
+ */
+ private Short taskMode2 = 0;
+
+ @JSONField(serialize = false)
+ private RgvTaskModeType taskModeType2;
+
+ /*
+ 宸ヤ綅1婧愮珯
+ */
+ private Short sourceStaNo2 = 0;
+
+ /*
+ 宸ヤ綅1鐩爣绔�
+ */
+ private Short destinationStaNo2 = 0;
+ ///////////////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * 浠诲姟妯″紡锛�
+ * 0 = 鏈‘璁�
+ * 1 = 宸ヤ綅1浠诲姟纭
+ * 2 = 宸ヤ綅2浠诲姟纭
+ * 3 = 宸ヤ綅1銆�2浠诲姟鍚屾椂纭
+ */
+ private Short command = 0;
+
+ public void setTaskMode1(Short taskMode1){
+ this.taskMode1 = taskMode1;
+ this.taskModeType1 = RgvTaskModeType.get(taskModeType1);
+ }
+
+ public void setTaskMode1(RgvTaskModeType type1) {
+ this.taskModeType1 = type1;
+ this.taskMode1 = RgvTaskModeType.get(type1).id.shortValue();
+ }
+
+ public void setTaskMode2(Short taskMode2){
+ this.taskMode2 = taskMode2;
+ this.taskModeType2 = RgvTaskModeType.get(taskModeType2);
+ }
+
+ public void setTaskMode2(RgvTaskModeType type2) {
+ this.taskModeType2 = type2;
+ this.taskMode2 = RgvTaskModeType.get(type2).id.shortValue();
+ }
+
+ public static void main(String[] args) {
+ Date date = new Date();
+ Calendar cal = Calendar.getInstance();
+ cal.setTime(date);
+
+ System.out.println(cal.get(Calendar.YEAR));
+ //榛樿浠�0-11
+ System.out.println(cal.get(Calendar.MONTH)+1);
+ System.out.println(cal.get(Calendar.DATE));
+ int hour = cal.get(Calendar.HOUR_OF_DAY);
+ System.out.println("鏃�");
+ System.out.println(hour);
+ int minute = cal.get(Calendar.MINUTE);
+ System.out.println("鍒�");
+ System.out.println(minute);
+ int second = cal.get(Calendar.SECOND);
+ System.out.println("绉�");
+ System.out.println(second);
+ int mm = cal.get(Calendar.DAY_OF_WEEK) - 1; // 鏄熸湡锛�0(鏃�)锝�6(鍏�)
+ System.out.println("绀兼嫓");
+ System.out.println(mm);
+ }
+}
diff --git a/src/main/java/com/zy/core/model/protocol/RgvProtocol.java b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
new file mode 100644
index 0000000..1591bfc
--- /dev/null
+++ b/src/main/java/com/zy/core/model/protocol/RgvProtocol.java
@@ -0,0 +1,197 @@
+package com.zy.core.model.protocol;
+
+import com.zy.asrs.entity.BasCrnp;
+import com.zy.asrs.entity.BasRgv;
+import com.zy.core.enums.*;
+import lombok.Data;
+
+/**
+ * Created by vincent on 2020/8/7
+ */
+@Data
+public class RgvProtocol {
+
+ private Integer RgvNo;
+
+ /**
+ * 1 = 鎵嬪姩妯″紡
+ * 2 = 鑷姩妯″紡
+ * 3 = 鐢佃剳妯″紡
+ */
+ public Short mode;
+
+ public RgvModeType modeType;
+
+ /**
+ * RGV褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 1锛氫綔涓氫腑
+ * 2锛氭姤璀�
+ */
+ public Short status;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType;
+
+ /**
+ * 宸ヤ綅1浠诲姟鍙�
+ */
+ public Short taskNo1 = 0;
+
+ /**
+ * RGV宸ヤ綅1褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 11锛氬彇璐т腑
+ * 12锛氭斁璐т腑
+ * 10锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ */
+ public Short status1;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType1;
+
+ /**
+ * 宸ヤ綅1鏈夌墿
+ */
+ public Short loaded1;
+
+ /**
+ * RGV褰撳墠浣嶇疆
+ */
+ public Short RgvPos;
+
+ /**
+ * 璧拌鍦ㄥ畾浣�
+ * 0 = 鍦ㄥ畾浣�
+ * 1 = 涓嶅湪瀹氫綅
+ */
+ public Short walkPos;
+
+ ////////////////////// 宸ヤ綅2瀹氫箟 //////////////////////////////////////////////////
+ /**
+ * 宸ヤ綅2浠诲姟鍙�
+ */
+ public Short taskNo2 = 0;
+
+ /**
+ * RGV宸ヤ綅2褰撳墠鐘舵��
+ * 0锛氱┖闂诧紝鏃犱换鍔�
+ * 11锛氬彇璐т腑
+ * 12锛氭斁璐т腑
+ * 10锛氫换鍔″畬鎴愮瓑寰匴CS纭
+ */
+ public Short status2;
+
+ /**
+ * 鐘舵�佹灇涓�
+ */
+ public RgvStatusType statusType2;
+
+ /**
+ * 宸ヤ綅2鏈夌墿
+ */
+ public Short loaded2;
+ ///////////////////////////////////////////////////////////////////////////////////////
+
+ /**
+ * 寮傚父鐮�
+ */
+ public Short alarm;
+
+ private Short temp1;
+
+ private Short temp2;
+
+ private Short temp3;
+
+ private Short temp4;
+
+ /**
+ * X琛岃蛋琛岄�熷害m/min
+ */
+ private Float xSpeed;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛岃窛绂籯m
+ */
+ public Float xDistance;
+
+ /**
+ * 鍫嗗灈鏈虹疮璁¤蛋琛屾椂闀縣
+ */
+ public Float xDuration;
+
+ public void setMode(Short mode) {
+ this.mode = mode;
+ this.modeType = RgvModeType.get(mode);
+ }
+
+ public void setMode(RgvModeType type) {
+ this.modeType = type;
+ this.mode = RgvModeType.get(type).id.shortValue();
+ }
+
+ public void setStatus(Short status){
+ this.status = status;
+ this.statusType = RgvStatusType.get(status);
+ }
+
+ public void setStatus(RgvStatusType type){
+ this.statusType = type;
+ this.status = RgvStatusType.get(type).id.shortValue();
+ }
+
+ public void setStatus1(Short status1){
+ this.status1 = status1;
+ this.statusType1 = RgvStatusType.get(status1);
+ }
+
+ public void setStatus1(RgvStatusType type1){
+ this.statusType1 = type1;
+ this.status1 = RgvStatusType.get(type1).id.shortValue();
+ }
+
+ public void setStatus2(Short status2){
+ this.status2 = status2;
+ this.statusType2 = RgvStatusType.get(status2);
+ }
+
+ public void setStatus2(RgvStatusType type2){
+ this.statusType2 = type2;
+ this.status2 = RgvStatusType.get(type2).id.shortValue();
+ }
+
+ /**
+ * 鏈�杩戜竴娆″叆鍑哄簱绫诲瀷
+ * I:鍏ュ簱
+ * O:鍑哄簱
+ */
+ private String lastIo = "I";
+
+
+ public BasRgv toSqlModel(BasRgv basRgv){
+ if (alarm!=null) {
+ basRgv.setRgvErr(alarm.longValue());
+ }
+ basRgv.setWrkNo1(taskNo1.intValue());
+ basRgv.setWrkNo2(taskNo2.intValue());
+ return basRgv;
+ }
+
+ public void setxSpeed(Short xSpeed) {
+ this.xSpeed = Float.valueOf(xSpeed);
+ }
+
+ public void setxDistance(Short xDistance) {
+ this.xDistance = Float.valueOf(xDistance);
+ }
+
+ public void setxDuration(Short xDuration) {
+ this.xDuration = Float.valueOf(xDuration);
+ }
+
+}
diff --git a/src/main/resources/mapper/BasRgvMapper.xml b/src/main/resources/mapper/BasRgvMapper.xml
new file mode 100644
index 0000000..a826fab
--- /dev/null
+++ b/src/main/resources/mapper/BasRgvMapper.xml
@@ -0,0 +1,24 @@
+<?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.BasRgvMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasRgv">
+ <result column="rgv_no" property="rgvNo" />
+ <result column="in_enable" property="inEnable" />
+ <result column="out_enable" property="outEnable" />
+ <result column="rgv_sts" property="rgvSts" />
+ <result column="wrk_no1" property="wrkNo1" />
+ <result column="wrk_no2" property="wrkNo2" />
+ <result column="rgv_err" property="rgvErr" />
+ <result column="pak_mk" property="pakMk" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1