From 2f662f2a75ca9af4d28a9af5eebe3d2a67c5c17c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 14 三月 2022 13:27:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/BasSteOptMapper.java | 12 +
src/main/java/com/zy/core/thread/SteThread.java | 25 +-
src/main/java/com/zy/asrs/service/impl/BasSteOptServiceImpl.java | 12 +
src/main/java/com/zy/asrs/entity/BasSteOpt.java | 341 ++++++++++++++++++++++++++++++++++++++++++
src/main/resources/mapper/BasSteOptMapper.xml | 27 +++
src/main/java/com/zy/common/CodeBuilder.java | 3
src/main/java/com/zy/asrs/service/BasSteOptService.java | 8 +
7 files changed, 416 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasSteOpt.java b/src/main/java/com/zy/asrs/entity/BasSteOpt.java
new file mode 100644
index 0000000..02c3a03
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasSteOpt.java
@@ -0,0 +1,341 @@
+package com.zy.asrs.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@TableName("asr_bas_ste_opt")
+public class BasSteOpt implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 绌挎杞�
+ */
+ @ApiModelProperty(value= "绌挎杞�")
+ @TableField("ste_no")
+ private Integer steNo;
+
+ /**
+ * 涓嬪彂鏃堕棿
+ */
+ @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 浣滀笟
+ */
+ @ApiModelProperty(value= "浣滀笟")
+ private String mode;
+
+ /**
+ * 婧愭帓
+ */
+ @ApiModelProperty(value= "婧愭帓")
+ @TableField("source_row")
+ private Integer sourceRow;
+
+ /**
+ * 婧愬垪
+ */
+ @ApiModelProperty(value= "婧愬垪")
+ @TableField("source_bay")
+ private Integer sourceBay;
+
+ /**
+ * 婧愬眰
+ */
+ @ApiModelProperty(value= "婧愬眰")
+ @TableField("source_lev")
+ private Integer sourceLev;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta")
+ private Integer sourceSta;
+
+ /**
+ * 鐩爣鎺�
+ */
+ @ApiModelProperty(value= "鐩爣鎺�")
+ @TableField("pos_row")
+ private Integer posRow;
+
+ /**
+ * 鐩爣鍒�
+ */
+ @ApiModelProperty(value= "鐩爣鍒�")
+ @TableField("pos_bay")
+ private Integer posBay;
+
+ /**
+ * 鐩爣灞�
+ */
+ @ApiModelProperty(value= "鐩爣灞�")
+ @TableField("pos_lev")
+ private Integer posLev;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("pos_sta")
+ private Integer posSta;
+
+ /**
+ * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
+ */
+ @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ private Integer response;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 淇敼浜哄憳
+ */
+ @ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
+ private Long updateBy;
+
+ /**
+ * 澶囨敞
+ */
+ @ApiModelProperty(value= "澶囨敞")
+ private String memo;
+
+ public BasSteOpt() {}
+
+ public BasSteOpt(Integer wrkNo,Integer steNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) {
+ this.wrkNo = wrkNo;
+ this.steNo = steNo;
+ this.sendTime = sendTime;
+ this.mode = mode;
+ this.sourceRow = sourceRow;
+ this.sourceBay = sourceBay;
+ this.sourceLev = sourceLev;
+ this.sourceSta = sourceSta;
+ this.posRow = posRow;
+ this.posBay = posBay;
+ this.posLev = posLev;
+ this.posSta = posSta;
+ this.response = response;
+ this.updateTime = updateTime;
+ this.updateBy = updateBy;
+ this.memo = memo;
+ }
+
+// BasSteOpt basSteOpt = new BasSteOpt(
+// null, // 浠诲姟鍙�
+// null, // 绌挎杞�
+// null, // 涓嬪彂鏃堕棿
+// null, // 浣滀笟
+// null, // 婧愭帓
+// null, // 婧愬垪
+// null, // 婧愬眰
+// null, // 婧愮珯
+// null, // 鐩爣鎺�
+// null, // 鐩爣鍒�
+// null, // 鐩爣灞�
+// null, // 鐩爣绔�
+// null, // 鍝嶅簲缁撴灉
+// null, // 淇敼鏃堕棿
+// null, // 淇敼浜哄憳
+// null // 澶囨敞
+// );
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ public Integer getWrkNo() {
+ return wrkNo;
+ }
+
+ public void setWrkNo(Integer wrkNo) {
+ this.wrkNo = wrkNo;
+ }
+
+ public Integer getSteNo() {
+ return steNo;
+ }
+
+ public void setSteNo(Integer steNo) {
+ this.steNo = steNo;
+ }
+
+ public Date getSendTime() {
+ return sendTime;
+ }
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public void setSendTime(Date sendTime) {
+ this.sendTime = sendTime;
+ }
+
+ public String getMode() {
+ return mode;
+ }
+
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
+
+ public Integer getSourceRow() {
+ return sourceRow;
+ }
+
+ public void setSourceRow(Integer sourceRow) {
+ this.sourceRow = sourceRow;
+ }
+
+ public Integer getSourceBay() {
+ return sourceBay;
+ }
+
+ public void setSourceBay(Integer sourceBay) {
+ this.sourceBay = sourceBay;
+ }
+
+ public Integer getSourceLev() {
+ return sourceLev;
+ }
+
+ public void setSourceLev(Integer sourceLev) {
+ this.sourceLev = sourceLev;
+ }
+
+ public Integer getSourceSta() {
+ return sourceSta;
+ }
+
+ public void setSourceSta(Integer sourceSta) {
+ this.sourceSta = sourceSta;
+ }
+
+ public Integer getPosRow() {
+ return posRow;
+ }
+
+ public void setPosRow(Integer posRow) {
+ this.posRow = posRow;
+ }
+
+ public Integer getPosBay() {
+ return posBay;
+ }
+
+ public void setPosBay(Integer posBay) {
+ this.posBay = posBay;
+ }
+
+ public Integer getPosLev() {
+ return posLev;
+ }
+
+ public void setPosLev(Integer posLev) {
+ this.posLev = posLev;
+ }
+
+ public Integer getPosSta() {
+ return posSta;
+ }
+
+ public void setPosSta(Integer posSta) {
+ this.posSta = posSta;
+ }
+
+ public Integer getResponse() {
+ return response;
+ }
+
+ public String getResponse$(){
+ if (null == this.response){ return null; }
+ switch (this.response){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.response);
+ }
+ }
+
+ public void setResponse(Integer response) {
+ this.response = response;
+ }
+
+ public Date getUpdateTime() {
+ return updateTime;
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+ public void setUpdateTime(Date updateTime) {
+ this.updateTime = updateTime;
+ }
+
+ public Long getUpdateBy() {
+ return updateBy;
+ }
+
+ public void setUpdateBy(Long updateBy) {
+ this.updateBy = updateBy;
+ }
+
+ public String getMemo() {
+ return memo;
+ }
+
+ public void setMemo(String memo) {
+ this.memo = memo;
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasSteOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasSteOptMapper.java
new file mode 100644
index 0000000..402a7f0
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasSteOptMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasSteOpt;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasSteOptMapper extends BaseMapper<BasSteOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasSteOptService.java b/src/main/java/com/zy/asrs/service/BasSteOptService.java
new file mode 100644
index 0000000..71e3022
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasSteOptService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasSteOpt;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasSteOptService extends IService<BasSteOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasSteOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasSteOptServiceImpl.java
new file mode 100644
index 0000000..c731a51
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasSteOptServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasSteOptMapper;
+import com.zy.asrs.entity.BasSteOpt;
+import com.zy.asrs.service.BasSteOptService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basSteOptService")
+public class BasSteOptServiceImpl extends ServiceImpl<BasSteOptMapper, BasSteOpt> implements BasSteOptService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 5984f89..0b9411c 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -18,9 +18,10 @@
generator.url="localhost:1433;databasename=bfasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="asr_bas_ste";
+ generator.table="asr_bas_ste_opt";
generator.packagePath="com.zy.asrs";
+ generator.controller = false;
generator.html = false;
generator.js = false;
generator.htmlDetail = false;
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index e74e48e..a3da704 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasSte;
+import com.zy.asrs.service.BasSteOptService;
import com.zy.asrs.service.BasSteService;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
@@ -188,12 +189,14 @@
// 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
BasSteService service = SpringUtils.getBean(BasSteService.class);
- BasSte basSte = new BasSte();
- basSte.setSteNo(slave.getId());
- if (!service.updateById(steProtocol.toSqlModel(basSte))){
- log.error("绌挎杞lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
- }
+ if (null != service) {
+ BasSte basSte = new BasSte();
+ basSte.setSteNo(slave.getId());
+ if (!service.updateById(steProtocol.toSqlModel(basSte))){
+ log.error("绌挎杞lc鏁版嵁搴撴洿鏂板け璐� ===>> [id:{}] [ip:{}] [port:{}]", slave.getId(), slave.getIp(), slave.getPort());
+ }
+ }
} else {
OutputQueue.CRN.offer(MessageFormat.format("銆恵0}銆憑1}绌挎杞lc鐘舵�佷俊鎭け璐�",DateUtils.convert(new Date()), slave.getId()));
throw new CoolException(MessageFormat.format( "绌挎杞lc鐘舵�佷俊鎭け璐� ===>> [id:{0}] [ip:{1}] [port:{2}]", slave.getId(), slave.getIp(), slave.getPort()));
@@ -236,12 +239,12 @@
try {
// 鏃ュ織璁板綍
-// BasCrnOptService bean = SpringUtils.getBean(BasCrnOptService.class);
-// BasCrnOpt basCrnOpt = new BasCrnOpt(
-// command.getTaskNo().intValue(), // 浠诲姟鍙�
-// command.getCrnNo(), // 绌挎杞闈炵┖]
+ BasSteOptService bean = SpringUtils.getBean(BasSteOptService.class);
+// BasSteOpt basSteOpt = new BasSteOpt(
+// command.getTaskNo(), // 浠诲姟鍙�
+// command.getSteNo(), // 绌挎杞闈炵┖]
// new Date(), // 涓嬪彂鏃堕棿
-// command.getTaskModeType().toString(), // 妯″紡
+// command.getTaskModeType().desc, // 妯″紡
// command.getSourcePosX().intValue(), // 婧愭帓
// command.getSourcePosY().intValue(), // 婧愬垪
// command.getSourcePosZ().intValue(), // 婧愬眰
@@ -254,7 +257,7 @@
// null, // 淇敼鏃堕棿
// null // 淇敼浜哄憳
// );
-// bean.insert(basCrnOpt);
+// bean.insert(basSteOpt);
} catch (Exception ignore) {}
if (result.IsSuccess) {
diff --git a/src/main/resources/mapper/BasSteOptMapper.xml b/src/main/resources/mapper/BasSteOptMapper.xml
new file mode 100644
index 0000000..bb1d51d
--- /dev/null
+++ b/src/main/resources/mapper/BasSteOptMapper.xml
@@ -0,0 +1,27 @@
+<?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.BasSteOptMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasSteOpt">
+ <id column="id" property="id" />
+ <result column="wrk_no" property="wrkNo" />
+ <result column="ste_no" property="steNo" />
+ <result column="send_time" property="sendTime" />
+ <result column="mode" property="mode" />
+ <result column="source_row" property="sourceRow" />
+ <result column="source_bay" property="sourceBay" />
+ <result column="source_lev" property="sourceLev" />
+ <result column="source_sta" property="sourceSta" />
+ <result column="pos_row" property="posRow" />
+ <result column="pos_bay" property="posBay" />
+ <result column="pos_lev" property="posLev" />
+ <result column="pos_sta" property="posSta" />
+ <result column="response" property="response" />
+ <result column="update_time" property="updateTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="memo" property="memo" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1