From 44810d2a6263c06044238a6f392d01622071f1d2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 17 十月 2024 15:47:09 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasCircularShuttle.java | 54 ++++++++++++++++++
src/main/java/com/zy/asrs/mapper/BasCircularShuttleMapper.java | 12 ++++
src/main/java/com/zy/asrs/controller/SiteController.java | 15 -----
src/main/java/com/zy/asrs/controller/RgvController.java | 3 +
src/main/java/com/zy/asrs/service/BasCircularShuttleService.java | 8 ++
src/main/resources/mapper/BasCircularShuttleMapper.xml | 14 ++++
src/main/java/com/zy/asrs/service/impl/BasCircularShuttleServiceImpl.java | 12 ++++
src/main/java/com/zy/common/CodeBuilder.java | 4
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 20 ------
9 files changed, 105 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/RgvController.java b/src/main/java/com/zy/asrs/controller/RgvController.java
index 8e7c781..33a715a 100644
--- a/src/main/java/com/zy/asrs/controller/RgvController.java
+++ b/src/main/java/com/zy/asrs/controller/RgvController.java
@@ -388,6 +388,9 @@
List<EnergyGatheringRingParam> result = new ArrayList<>();
try{
for (DevpSlave devp : slaveProperties.getDevp()) {
+ if (devp.getId()!=1){
+ break;
+ }
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
if (devpThread.isResult()){
if (true){
diff --git a/src/main/java/com/zy/asrs/controller/SiteController.java b/src/main/java/com/zy/asrs/controller/SiteController.java
index 9652c90..7923b03 100644
--- a/src/main/java/com/zy/asrs/controller/SiteController.java
+++ b/src/main/java/com/zy/asrs/controller/SiteController.java
@@ -45,21 +45,6 @@
@Autowired
private BasDevpService basDevpService;
- @GetMapping("/io/mode/info/site")
- @ManagerAuth(memo = "鍏ュ嚭搴撴ā寮�")
- public R ioMode(){
- List<Map<String, Object>> res = new ArrayList<>();
- for (DevpSlave devp : slaveProperties.getDevp()) {
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
- Map<String, Object> map2 = new HashMap<>();
- map2.put("floor", 2);
- map2.put("modeVal", devpThread.ioModeOf2F.id);
- map2.put("modeDesc", devpThread.ioModeOf2F.desc);
- res.add(map2);
- }
- return R.ok().add(res);
- }
-
@PostMapping("/table/site")
@ManagerAuth(memo = "绔欑偣淇℃伅琛�")
public R siteTable(){
diff --git a/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java b/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java
new file mode 100644
index 0000000..fcfd3be
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasCircularShuttle.java
@@ -0,0 +1,54 @@
+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 io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_circular_shuttle")
+public class BasCircularShuttle implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
+
+ @ApiModelProperty(value= "")
+ @TableField("ste_id")
+ private Integer steId;
+
+ @ApiModelProperty(value= "")
+ @TableField("ste_no")
+ private Integer steNo;
+
+ /**
+ * 0:姝ｅ父锛�1锛氱鐢�
+ */
+ @ApiModelProperty(value= "0:姝ｅ父锛�1锛氱鐢�")
+ private Integer status;
+
+ public BasCircularShuttle() {}
+
+ public BasCircularShuttle(Integer steId,Integer steNo,Integer status) {
+ this.steId = steId;
+ this.steNo = steNo;
+ this.status = status;
+ }
+
+// BasCircularShuttle basCircularShuttle = new BasCircularShuttle(
+// null, // [闈炵┖]
+// null, // [闈炵┖]
+// null // 0:姝ｅ父锛�1锛氱鐢╗闈炵┖]
+// );
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasCircularShuttleMapper.java b/src/main/java/com/zy/asrs/mapper/BasCircularShuttleMapper.java
new file mode 100644
index 0000000..8b817e6
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasCircularShuttleMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasCircularShuttle;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasCircularShuttleMapper extends BaseMapper<BasCircularShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/BasCircularShuttleService.java b/src/main/java/com/zy/asrs/service/BasCircularShuttleService.java
new file mode 100644
index 0000000..c58ffea
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasCircularShuttleService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasCircularShuttle;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasCircularShuttleService extends IService<BasCircularShuttle> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasCircularShuttleServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasCircularShuttleServiceImpl.java
new file mode 100644
index 0000000..c8adab9
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasCircularShuttleServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasCircularShuttleMapper;
+import com.zy.asrs.entity.BasCircularShuttle;
+import com.zy.asrs.service.BasCircularShuttleService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basCircularShuttleService")
+public class BasCircularShuttleServiceImpl extends ServiceImpl<BasCircularShuttleMapper, BasCircularShuttle> implements BasCircularShuttleService {
+
+}
diff --git a/src/main/java/com/zy/common/CodeBuilder.java b/src/main/java/com/zy/common/CodeBuilder.java
index 91f0ec4..90e6d5c 100644
--- a/src/main/java/com/zy/common/CodeBuilder.java
+++ b/src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@
// generator.table="sys_host";
// sqlserver
generator.sqlOsType = SqlOsType.SQL_SERVER;
- generator.url="192.168.4.15:1433;databasename=ahyxasrs";
+ generator.url="127.0.0.1:50948;databasename=gdhmasrs";
generator.username="sa";
generator.password="sa@123";
- generator.table="jar_wrk_mast_execute";
+ generator.table="asr_bas_circular_shuttle";
generator.packagePath="com.zy.asrs";
generator.controller = false;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a07b72a..4e4031f 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,8 +43,6 @@
private DevpSlave slave;
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- public boolean charge0; //璇锋眰鍏呯數
- public boolean charge1; //璇锋眰鍏呯數
private short heartBeatVal = 1;
private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
@@ -56,24 +54,6 @@
add(121);add(122);add(123);add(124);add(125);add(126);add(127);add(128);add(129);add(130);
add(131);add(132);add(133);
}};
-
- /**
- * 鏉＄爜鏁伴噺
- */
- private int barcodeSize = 5;
-
- /**
- * 鍏ュ嚭搴撴ā寮�
- * 0锛氭湭鐭�
- * 1锛氬叆搴撳惎鍔ㄤ腑
- * 2.鍏ュ簱妯″紡
- * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
- * 4.鍑哄簱妯″紡
- */
- public IoModeType ioModeOf2F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
- public IoModeType ioModeOf4F = IoModeType.NONE;
-// public IoModeType ioMode = IoModeType.NONE;
public SiemensDevpThread(DevpSlave slave) {
this.slave = slave;
diff --git a/src/main/resources/mapper/BasCircularShuttleMapper.xml b/src/main/resources/mapper/BasCircularShuttleMapper.xml
new file mode 100644
index 0000000..740145b
--- /dev/null
+++ b/src/main/resources/mapper/BasCircularShuttleMapper.xml
@@ -0,0 +1,14 @@
+<?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.BasCircularShuttleMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasCircularShuttle">
+ <id column="id" property="id" />
+ <result column="ste_id" property="steId" />
+ <result column="ste_no" property="steNo" />
+ <result column="status" property="status" />
+
+ </resultMap>
+
+</mapper>
--
Gitblit v1.9.1