From 6f01df95aaf3c4143069bb9a0fc814e092684723 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 18 三月 2024 11:11:43 +0800
Subject: [PATCH] 添加文件
---
springboot-vue3/src/main/java/com/example/springboot/mapper/MeasureSettingMapper.java | 20 ++++++++++
springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java | 35 +++++++++++++++++
springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java | 6 +-
springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java | 2
springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java | 31 +++++++++++++++
5 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
index c4f12d1..15d5259 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/entity/StorageTask.java
@@ -12,7 +12,7 @@
private String loadrack;//鐩爣浣�
private Integer count;//鐜荤拑鏁伴噺
private Integer glasstype;//鐜荤拑绫诲瀷
- private Integer flowcard;//娴佺▼鍗�
+ private String flowcard;//娴佺▼鍗�
private Integer mateid;//閰嶇墖id
private Integer tier;//鐗囧簭
@@ -88,11 +88,11 @@
public void setGlasstype(Integer glasstype) {
this.glasstype = glasstype;
}
- public Integer getFlowcard() {
+ public String getFlowcard() {
return flowcard;
}
- public void setFlowcard(Integer flowcard) {
+ public void setFlowcard(String flowcard) {
this.flowcard = flowcard;
} public Integer getMateid() {
return mateid;
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
new file mode 100644
index 0000000..da2a843
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/GlassInfoMapper.java
@@ -0,0 +1,31 @@
+package com.example.springboot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.springboot.entity.GlassInfo;
+import com.example.springboot.entity.RolePermission;
+
+
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface GlassInfoMapper extends BaseMapper<GlassInfo> {
+
+ @Select("SELECT * FROM glassinfo where width<=#{maxwidth} and width>=#{minwidth} and height<=#{maxheight} and height>=#{minheight}")
+ List<GlassInfo> selectGlassInfos(@Param("maxwidth") double maxwidth, @Param("minwidth") double minwidth, @Param("maxheight") double maxheight, @Param("minheight") double minheight);
+
+ // @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
+ // boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId);
+
+
+ // @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
+ // void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
+
+ // @Insert("INSERT INTO role_permission (role_id, permission_id, state) VALUES (#{roleId}, #{permissionId}, #{state})")
+ // void insert(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
+
+}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
index 66857b4..8683f1d 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/HomeMapper.java
@@ -284,7 +284,7 @@
void UpdateQueue(String flowcard,double width,double height,Integer glasstype);
@Update("update glassinfo set finishnumber=finishnumber+1 where flowcard=#{flowcard} and mateid=#{mateid} and tier=#{geTier}")
- void AddGlassNo(Integer flowcard, Integer mateid, Integer geTier);
+ void AddGlassNo(String flowcard, Integer mateid, Integer geTier);
}
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/MeasureSettingMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/MeasureSettingMapper.java
new file mode 100644
index 0000000..8feee4c
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/MeasureSettingMapper.java
@@ -0,0 +1,20 @@
+package com.example.springboot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.springboot.entity.GlassInfo;
+import com.example.springboot.entity.MeasureSetting;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Mapper
+@Repository
+public interface MeasureSettingMapper extends BaseMapper<MeasureSetting> {
+ @Select("SELECT * FROM measuresetting where line=#{line}")
+ MeasureSetting SelectMeasureSetting(@Param("line") String line);
+
+
+}
\ No newline at end of file
diff --git a/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
new file mode 100644
index 0000000..27c6fb1
--- /dev/null
+++ b/springboot-vue3/src/main/java/com/example/springboot/mapper/QueueMapper.java
@@ -0,0 +1,35 @@
+package com.example.springboot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.example.springboot.entity.Queue;
+import com.example.springboot.entity.RolePermission;
+
+
+import org.apache.ibatis.annotations.*;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+@Repository
+public interface QueueMapper extends BaseMapper<Queue> {
+ @Select("SELECT * FROM queue where glassid=#{glassid}")
+ List<Queue> selectQueues(@Param("glassid") int glassid);
+
+ // @Select("SELECT COUNT(*) FROM role_permission WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
+ // boolean checkExists(@Param("roleId") int roleId, @Param("permissionId") int permissionId);
+
+
+ // @Update("UPDATE role_permission SET state = #{state} WHERE role_id = #{roleId} AND permission_id = #{permissionId}")
+ // void updateState(@Param("roleId") int roleId, @Param("permissionId") int permissionId, @Param("state") int state);
+
+ @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
+ "select glassid,flowcard,null,null,width,height,#{glasswidthmm},#{glassheightmm},glasstype,#{state},NOW() from glassinfo where glassid=#{glassid}")
+ void insert(@Param("glassid") String glassid, @Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm,@Param("state") int state);
+
+ @Insert("insert into queue (glassid,flowcard,listid,boxid,glasswidth,glassheight,glasswidthmm,glassheightmm,glasstype,state,time) "+
+ "values (null,null,null,null,null,null,#{glasswidthmm},#{glassheightmm},null,null,NOW())")
+ void insertMatchFailure(@Param("glasswidthmm") double glasswidthmm, @Param("glassheightmm") double glassheightmm);
+
+}
--
Gitblit v1.8.0