From d85033771c1dcdd07eacf6c1dcd2c9feceba7798 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 19 九月 2024 15:08:25 +0800
Subject: [PATCH] 查询使用websockect实时推送数据
---
UI-Project/config.js | 8
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java | 39 ++++++
UI-Project/src/lang/zh.js | 62 ++++++++++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml | 2
UI-Project/src/utils/constants.js | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java | 4
hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java | 10 +
hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java | 47 +++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java | 4
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java | 22 ++-
/dev/null | 47 -------
hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java | 12 -
UI-Project/src/router/index.js | 13 +
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java | 57 +++++++++
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java | 5
16 files changed, 247 insertions(+), 93 deletions(-)
diff --git a/UI-Project/config.js b/UI-Project/config.js
index 8801d0c..9a4f798 100644
--- a/UI-Project/config.js
+++ b/UI-Project/config.js
@@ -1,10 +1,10 @@
export default {
-// serverUrl: "10.153.19.150:88/api",
+ serverUrl: "10.153.19.150:88/api",
// serverUrl: "192.168.1.199:88/api",
- serverUrl: "127.0.0.1:88/api",
- // serverUrl2: "10.153.19.150:88"
+// serverUrl: "127.0.0.1:88/api",
+ serverUrl2: "10.153.19.150:88"
// serverUrl2: "192.168.1.199:88"
- serverUrl2: "127.0.0.1:88"
+ // serverUrl2: "127.0.0.1:88"
//serverUrl:"res.abeim.cn"
}
\ No newline at end of file
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 8b3595d..0aec075 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -509,5 +509,65 @@
presponsibleequipment :'璇烽�夋嫨璐ｄ换璁惧',
remark :'澶囨敞',
premark :'璇疯緭鍏ュ娉�',
- }
+ },
+ film:{
+ mes:'鍘熺墖浠撳偍璇︽儏',
+ warehousing:'鍏ュ簱',
+ operate: '鎿嶄綔',
+ exit:'缂栬緫',
+ delete:'鍒犻櫎',
+ outbound:'鍑哄簱',
+ deviceid:'璁惧ID',
+ slot:'鏍呮牸鍙�',
+ enablestatea:'鍚敤鏍囪',
+ disable:'绂佺敤',
+ start:'鍚敤',
+ startslot:'寮�濮嬪伐浣�',
+ endslot:'鐩爣宸ヤ綅',
+ slotid:'鏍煎瓙ID',
+ width:'鍘熺墖瀹�',
+ widtha:'鍘熺墖瀹斤細',
+ inwidth:'璇疯緭鍏ュ師鐗囧',
+ height:'鍘熺墖楂�',
+ inheight:'璇疯緭鍏ュ師鐗囬珮',
+ heighta:'鍘熺墖楂橈細',
+ thickness:'鍘熺墖鍘氬害',
+ inthickness:'璇疯緭鍏ュ師鐗囧帤搴�',
+ thicknessa:'鍘熺墖鍘氬害锛�',
+ films:'鑶滅郴',
+ infilms:'璇疯緭鍏ヨ啘绯�',
+ filmsa:'鑶滅郴锛�',
+ createtime:'鍒涘缓鏃堕棿',
+ remainquantity:'鍓╀綑鏁伴噺',
+ thickremainquantity:'鍘熺墖鍓╀綑鏁伴噺锛堝紶锛夛細',
+ inquantity:'璇疯緭鍏ユ暟閲�',
+ quantitya:'鏁伴噺锛�',
+ enableid:'浠诲姟ID',
+ originateslot:'璧峰鏍煎瓙',
+ endslot:'鐩爣鏍煎瓙',
+ patternquantity:'鍘熺墖鏁伴噺',
+ enabletype:'浠诲姟绫诲瀷',
+ enablestate:'宸ヤ綅鐘舵��',
+ finish:'宸插畬鎴�',
+ unfinish:'鏈畬鎴�',
+ dedelete:'鏄惁鍒犻櫎璇ユ潯鍐呭锛�',
+ dedisable:'鏄惁绂佺敤璇ユ潯鍐呭锛�',
+ deoutbound:'鏄惁鍑哄簱璇ユ潯鍐呭锛�',
+ selectwarehousing:'璇烽�夋嫨鍚婅浣�',
+ inwarehousing:'鍚婅浣嶏細',
+ warehousing1:'鍚婅浣�1',
+ warehousing2:'鍚婅浣�2',
+ starttime :'寮�濮嬫椂闂�',
+ endtime :'缁撴潫鏃堕棿',
+ taskstatus :'浠诲姟鐘舵��',
+ built :'鏂板缓',
+ execution :'鎵ц涓�',
+ finish :'瀹屾垚',
+ tasktype :'浠诲姟绫诲瀷',
+ stocke :'鍏ュ簱',
+ outbound :'鍑哄簱',
+ dispatch :'璋冨害',
+ inquire :'鏌ヨ',
+ station :'宸ヤ綅',
+ },
}
\ No newline at end of file
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index d790e4b..f492054 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -186,19 +186,24 @@
}
]
},
-
- {
+ /*----------- 浠撳偍涓績 ----------------*/
+ {
path: 'GlassStorage',
name: 'GlassStorage',
- component: () => import('../views/GlassStorage/MaterialRackManagement.vue'),
+ component: () => import('../views/GlassStorage/GlassStorage.vue'),
children:[
{
path: '/GlassStorage/MaterialRackManagement',
name: 'MaterialRackManagement',
component: () => import('../views/GlassStorage/MaterialRackManagement.vue')
+ },
+ {
+ path: '/GlassStorage/rawfilmstorage',
+ name: 'rawfilmstorage',
+ component: () => import('../views/GlassStorage/rawfilmstorage.vue')
}
]
- },
+ },
/*----------- 鍙鍖栫郴缁� ----------------*/
{
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 69000bc..b551cfb 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
// export const WebSocketHost = "192.168.1.199";
-// export const WebSocketHost = "10.153.19.150";
-export const WebSocketHost = "127.0.0.1";
+export const WebSocketHost = "10.153.19.150";
+// export const WebSocketHost = "127.0.0.1";
export const host = "88";
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
index 295e4fd..5b5dcb7 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/controller/DamageController.java
@@ -1,7 +1,6 @@
package com.mes.damage.controller;
-import cn.hutool.core.date.DateTime;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import com.mes.damage.service.DamageService;
@@ -11,7 +10,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -39,7 +37,7 @@
int type =Integer.parseInt(map.get("type").toString());
int status =Integer.parseInt(map.get("status").toString());
String workingProcedure =map.get("workingProcedure").toString();
- return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type,status,workingProcedure));
+ return Result.build(200,"鏌ヨ鎴愬姛",damageService.selectDamage(startTime,endTime,type, workingProcedure));
}
@ApiOperation("鎶ュ伐")
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
index db1b3b5..3175d16 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/DamageService.java
@@ -1,12 +1,10 @@
package com.mes.damage.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import com.github.yulichang.base.MPJBaseService;
import com.mes.damage.entity.Damage;
import com.mes.damage.entity.DamagePrint;
import java.util.List;
-import java.util.Map;
/**
* <p>
@@ -18,7 +16,7 @@
*/
public interface DamageService extends MPJBaseService<Damage> {
- List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure);
+ List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure);
void submitDamage(List<Damage> damageList);
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
index b37edb4..8f6a1a6 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/damage/service/impl/DamageServiceImpl.java
@@ -1,8 +1,6 @@
package com.mes.damage.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.yulichang.base.MPJBaseServiceImpl;
import com.github.yulichang.query.MPJQueryWrapper;
import com.mes.common.config.Const;
@@ -21,8 +19,6 @@
import javax.annotation.Resource;
import java.sql.Timestamp;
import java.time.LocalDateTime;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -49,15 +45,15 @@
* 鏌ヨ鎶ュ伐淇℃伅
*/
@Override
- public List<Damage> selectDamage(String startTime, String endTime, int type, int status, String workingProcedure) {
+ public List<Damage> selectDamage(String startTime, String endTime, int type, String workingProcedure) {
LambdaQueryWrapper<Damage> damageSelectWrapper = new LambdaQueryWrapper<>();
damageSelectWrapper.between(Damage::getDamageTime, startTime, endTime);
if (type != 0) {
damageSelectWrapper.eq(Damage::getType, type);
}
- if (status != 0) {
- damageSelectWrapper.eq(Damage::getStatus, status);
- }
+// if (status != 0) {
+// damageSelectWrapper.eq(Damage::getStatus, status);
+// }
if (!"0".equals(workingProcedure)) {
damageSelectWrapper.eq(Damage::getWorkingProcedure, workingProcedure);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
index a323a39..ff76c67 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/tools/CodeGet.java
@@ -25,13 +25,13 @@
gc.setOutputDir("D:\\Documents\\hangzhoumesParent5\\");
gc.setServiceName("%sService"); //鍘绘帀Service鎺ュ彛鐨勯瀛楁瘝I
- gc.setAuthor("wu");
+ gc.setAuthor("wf");
gc.setOpen(false);
mpg.setGlobalConfig(gc);
// 3銆佹暟鎹簮閰嶇疆
DataSourceConfig dsc = new DataSourceConfig();
- dsc.setUrl("jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8");
+ dsc.setUrl("jdbc:mysql://10.153.19.150:3306/yiwumes?serverTimezone=GMT%2b8");
dsc.setDriverName("com.mysql.cj.jdbc.Driver");
dsc.setUsername("root");
dsc.setPassword("beibo.123/");
@@ -41,7 +41,7 @@
// 4銆佸寘閰嶇疆
PackageConfig pc = new PackageConfig();
pc.setParent("com.mes");
- pc.setModuleName("flow_card"); //妯″潡鍚�
+ pc.setModuleName("raw_glass_storage_station"); //妯″潡鍚�
pc.setController("controller");
pc.setService("service");
pc.setMapper("mapper");
@@ -50,7 +50,9 @@
// 5銆佺瓥鐣ラ厤缃�
StrategyConfig strategy = new StrategyConfig();
- strategy.setInclude("flow_card");
+// strategy.setInclude("raw_glass_storage_details");
+// strategy.setInclude("raw_glass_storage_station");
+ strategy.setInclude("raw_glass_storage_station");
strategy.setNaming(NamingStrategy.underline_to_camel);//鏁版嵁搴撹〃鏄犲皠鍒板疄浣撶殑鍛藉悕绛栫暐
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
index 9135a79..df39184 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/push.java
@@ -40,8 +40,8 @@
JSONObject jsonObject = new JSONObject();
List<RawGlassStorageDetails> rack = rawGlassStorageDetailsService.list();
List<RawGlassStorageStation> state = rawGlassStorageStationService.list();
- List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.list();
-
+ //List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.list();
+ List<RawGlassStorageTask> tasks = rawGlassStorageTaskService.findAll();
jsonObject.append("rack",rack);
jsonObject.append("state",state);
jsonObject.append("tasks",tasks);
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
index 97de824..979e67f 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/controller/RawGlassStorageTaskController.java
@@ -2,6 +2,7 @@
import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.utils.Result;
import io.swagger.annotations.ApiOperation;
@@ -26,8 +27,8 @@
private RawGlassStorageTaskService rwService; //杩欓噷鏄綘瀹氫箟璋冪敤鐨剆ervice锛岃繖涓槸鎶ュ伐鐨�
@ApiOperation("鍘熺墖浠撳偍鏁版嵁鏌ヨ")
@PostMapping("/selectRawglasstask")
- public Result selectDamage(@RequestBody RawGlassStorageTask rw) {
- return Result.build(200,"鏌ヨ鎴愬姛", rwService.selectTasking(rw));
+ public Result selectDamage(@RequestBody RawGlassTaskRequest rw) {
+ return Result.build(200,"鏌ヨ鎴愬姛", rwService.setRawGlassTaskRequest(rw));
}
}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java
new file mode 100644
index 0000000..91489d1
--- /dev/null
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/entity/request/RawGlassTaskRequest.java
@@ -0,0 +1,39 @@
+package com.mes.rawglasstask.entity.request;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.segments.MergeSegments;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class RawGlassTaskRequest {
+
+ /**
+ * 浠诲姟绫诲瀷 1 鍏ュ簱 2 鍑哄簱 3 璋冨害
+ */
+ private List<Integer> enableState;
+ /**
+ * 浠诲姟鐘舵�� 1 鏂板缓 2 鎵ц涓� 3 瀹屾垚
+ */
+ private List<Integer> enableType;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date patternQuantity;
+
+}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
index 58c1fbd..6353bcb 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/RawGlassStorageTaskService.java
@@ -1,22 +1,24 @@
package com.mes.rawglasstask.service;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import java.util.List;
+import java.util.Map;
/**
- * <p>
- * 鏈嶅姟绫�
- * </p>
- *
- * @author wf
- * @since 2024-09-10
+ * @author system
+ * @since 2024-07-09 14:51:27
*/
public interface RawGlassStorageTaskService extends IService<RawGlassStorageTask> {
- List<RawGlassStorageTask> selectTasks();
+
+ List<RawGlassStorageTask> findAll();
+ String setRawGlassTaskRequest(RawGlassTaskRequest request);
+
+ List<RawGlassStorageTask> selectTask();
+ List<RawGlassStorageTask> selectTasking(RawGlassStorageTask rawGlassStorageTask);
boolean updateRawGlassStorageTask(String originate_slot);
boolean deleteRawGlassStorageTask(String id);
boolean insertRawGlassStorageTask(RawGlassStorageTask rw);
-}
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
index 6afab45..ff99076 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassRawGlassStorageTaskServiceImpl.java
@@ -4,13 +4,20 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.mes.common.utils.RedisUtil;
import com.mes.pp.entity.request.Reportingdamage;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -21,6 +28,56 @@
@Service
@Slf4j
public class RawGlassRawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {
+
+
+ @Autowired
+ RedisUtil redisUtil;
+
+ @Override
+ public List<RawGlassStorageTask> findAll() {
+ RawGlassTaskRequest request = redisUtil.getCacheObject("rawGlassTaskRequest");
+ if (null == request) {
+ request = new RawGlassTaskRequest();
+ //璁剧疆榛樿鏃堕棿 startDate锛氬紑濮嬫椂闂� endDate锛氱粨鏉熸椂闂�
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Date startDate=null;
+ Date endDate=null;
+ try {
+ startDate= df.parse("2022-01-01");
+ endDate= df.parse("2025-01-01");
+ }catch (ParseException e){
+ e.printStackTrace();
+ }
+ request.setCreateTime(startDate);//
+ request.setPatternQuantity(endDate);
+ //return null;
+ }
+
+ QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
+ //涓嬮潰杩欎釜鍒楁槸鏌ヨ瀛楁锛屼笉瑕佸彲浠ュ垹鎺夐粯璁ゆ煡璇㈠叏閮�
+ queryWrapper.ge("create_time", request.getCreateTime())//澶т簬鏃堕棿
+ .le("create_time",request.getPatternQuantity());//灏忎簬鏃堕棿
+// .orderByDesc("enable_id");//鎺掑簭瀛楁
+ if(!request.getEnableType().isEmpty()&&request.getEnableType().size()>0){
+ queryWrapper.eq("enable_type", request.getEnableType().get(0));
+ }if(!request.getEnableState().isEmpty()&&request.getEnableState().size()>0){
+ queryWrapper.eq("enable_state", request.getEnableState().get(0));
+ }
+
+ return baseMapper.selectList(queryWrapper);
+ }
+
+ @Override
+ public String setRawGlassTaskRequest(RawGlassTaskRequest request) {
+ if (request == null) {
+ redisUtil.deleteObject("rawGlassTaskRequest");
+ } else {
+ redisUtil.setCacheObject("rawGlassTaskRequest", request);
+ }
+ log.info("鍓嶇浼犲叆鍙傛暟锛歿}",request);
+ return "success";
+ }
+
@Override
public List<RawGlassStorageTask> selectTask() {
return list();
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java
deleted file mode 100644
index ec055f0..0000000
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/rawglasstask/service/impl/RawGlassStorageTaskServiceImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.mes.rawglasstask.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
-import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
-import com.mes.rawglassstation.entity.RawGlassStorageStation;
-import com.mes.rawglasstask.entity.RawGlassStorageTask;
-import com.mes.rawglasstask.mapper.RawGlassStorageTaskMapper;
-import com.mes.rawglasstask.service.RawGlassStorageTaskService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * <p>
- * 鏈嶅姟瀹炵幇绫�
- * </p>
- *
- * @author wf
- * @since 2024-09-10
- */
-@Service
-public abstract class RawGlassStorageTaskServiceImpl extends ServiceImpl<RawGlassStorageTaskMapper, RawGlassStorageTask> implements RawGlassStorageTaskService {
-
- public List<RawGlassStorageTask> selectDetails() {
- return list();
- }
- @Override
- public boolean insertRawGlassStorageTask(RawGlassStorageTask rw) {
- return this.save(rw);
- }
- @Override
- public boolean updateRawGlassStorageTask(String originate_slot) {
- UpdateWrapper<RawGlassStorageTask> wrapper = new UpdateWrapper<>();
- wrapper.set("originate_slot","1005")
- .eq( "originate_slot",originate_slot);
- return update(wrapper);
- }
-
- @Override
- public boolean deleteRawGlassStorageTask(String id) {
- QueryWrapper<RawGlassStorageTask> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("id", id);
- return remove(queryWrapper);
- }
-}
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
index 8d43e9b..dd22447 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/test/java/mes/GlassStorageModuleApplicationTest.java
@@ -3,6 +3,9 @@
import com.mes.GlassStorageApplication;
import com.mes.rawglassdetails.entity.RawGlassStorageDetails;
import com.mes.rawglassdetails.service.RawGlassStorageDetailsService;
+import com.mes.rawglasstask.entity.RawGlassStorageTask;
+import com.mes.rawglasstask.entity.request.RawGlassTaskRequest;
+import com.mes.rawglasstask.service.RawGlassStorageTaskService;
import com.mes.rawusage.entity.RawUsage;
import com.mes.rawusage.service.RawUsageService;
import com.mes.shelfrack.service.ShelfRackService;
@@ -14,7 +17,12 @@
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -37,8 +45,9 @@
@Autowired
private RawUsageService rawUsageService;
@Autowired
- private RawGlassStorageDetailsService rawGlassStorageDetailsService;
-
+ private RawGlassStorageDetailsService rawGlassStorageDetailsService;
+ @Autowired
+ private RawGlassStorageTaskService rawGlassStorageTaskService;
@Test
public void testFindPath() {
@@ -63,6 +72,40 @@
shelfRackService.selectshelf_rack();
}
+ /**
+ * 娴嬭瘯
+ */
+ @Test
+ public void testWebSocket() {
+ List<RawGlassStorageTask> list=rawGlassStorageTaskService.findAll();
+ log.info("杩斿洖鍐呭锛歿}",list);
+ }
+
+ /**
+ * 娴嬭瘯淇敼WebSocket 鍙傛暟
+ */
+ @Test
+ public void testWebSocketArgument() {
+ RawGlassTaskRequest request=new RawGlassTaskRequest();
+ //璁剧疆鍙傛暟锛�
+ DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Date startDate=null;
+ Date endDate=null;
+ try {
+ startDate= df.parse("2022-01-01");
+ endDate= df.parse("2025-01-01");
+ }catch (ParseException e){
+ e.printStackTrace();
+
+ request.setCreateTime(startDate);//
+ request.setPatternQuantity(endDate);
+ request.setEnableState(new ArrayList<Integer>());
+ request.setEnableType(new ArrayList<Integer>());
+ String list=rawGlassStorageTaskService.setRawGlassTaskRequest(request);
+ log.info("杩斿洖鍐呭锛歿}",list);
+ }
+ }
+
@Test
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
index 471cdae..4eb19cc 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application.yml
@@ -2,7 +2,7 @@
port: 8084
spring:
profiles:
- active: dev
+ active: prod
application:
name: temperingGlass
liquibase:
--
Gitblit v1.8.0