From bbc577bc32c9b0db6e07fe60b7d066e7a838793d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 13 六月 2024 16:43:03 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java | 4 ++--
zy-asrs-flow/src/pages/map/index.jsx | 34 ++++++++++++++++++++++++++++++++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java | 11 +++++++++++
3 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 7c039da..6e970a7 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -1,7 +1,7 @@
import * as React from 'react'
import * as TWEEDLE from 'tweedle.js';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
-import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented } from 'antd';
+import { Layout, Button, Flex, Row, Col, FloatButton, Select, notification, Segmented, message } from 'antd';
const { Header, Content } = Layout;
import {
AppstoreAddOutlined,
@@ -12,6 +12,7 @@
import './index.css'
import { createStyles } from 'antd-style';
import Edit from './components/device';
+import Http from '@/utils/http';
import Settings from './components/settings'
import * as Utils from './utils'
import WebSocketClient from './websocket'
@@ -133,7 +134,7 @@
initialize();
return () => {
- websocket.onMessage = (data) => {}
+ websocket.onMessage = (data) => { }
if (websocket) {
websocket.close();
}
@@ -249,6 +250,25 @@
}, [curSprite]);
const prevCurSprite = prevCurSpriteRef.current;
+ const clearLockPath = async (floor) => {
+ const hide = message.loading(intl.formatMessage({ id: 'page.clearing', defaultMessage: '姝ｅ湪娓呯┖' }));
+ try {
+ const resp = await Http.doGet('api/map/clearLockPath', { lev: floor });
+ if (resp.code === 200) {
+ message.success(intl.formatMessage({ id: 'page.clearing.success', defaultMessage: '娓呯┖鎴愬姛' }));
+ return true;
+ } else {
+ message.error(resp.msg);
+ return false;
+ }
+ } catch (error) {
+ message.error(intl.formatMessage({ id: 'page.clearing.fail', defaultMessage: '娓呯┖澶辫触璇烽噸璇曪紒' }));
+ return false;
+ } finally {
+ hide();
+ }
+ }
+
// fn switch floor
const switchFloor = async (floor) => {
await Utils.fetchMapData(floor);
@@ -329,6 +349,16 @@
className='map-header-button'
size={'large'}
onClick={() => {
+ clearLockPath(curFloor)
+ }}
+ >
+ <FormattedMessage id='map.clearLockPath' defaultMessage='娓呯┖璺緞' />
+ </Button>
+
+ <Button
+ className='map-header-button'
+ size={'large'}
+ onClick={() => {
switchFloor(curFloor)
}}
>
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
index 6fae409..ca4ee8d 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/controller/MapController.java
@@ -1,9 +1,12 @@
package com.zy.asrs.wcs.core.map.controller;
+import com.alibaba.fastjson.JSON;
import com.zy.asrs.framework.common.R;
import com.zy.asrs.wcs.core.map.controller.param.MapDataParam;
import com.zy.asrs.wcs.core.map.controller.param.MapQueryParam;
import com.zy.asrs.wcs.core.map.service.MapService;
+import com.zy.asrs.wcs.core.utils.RedisUtil;
+import com.zy.asrs.wcs.rcs.constant.DeviceRedisConstant;
import com.zy.asrs.wcs.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -17,6 +20,8 @@
@Autowired
private MapService mapService;
+ @Autowired
+ private RedisUtil redisUtil;
// @PreAuthorize("hasAuthority('core:map:list')")
@PostMapping("/floor/list")
@@ -70,4 +75,10 @@
// return R.ok().add(mapService.getShelfLocNoList(locNo));
// }
+ @GetMapping("/clearLockPath")
+ public R clearLockPath(@RequestParam Integer lev) {
+ redisUtil.del(DeviceRedisConstant.MAP + lev);
+ return R.ok();
+ }
+
}
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
index a1e99f0..ff07bf0 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/utils/CodeBuilder.java
@@ -22,8 +22,8 @@
// generator.username="sa";
// generator.password="Zoneyung@zy56$";
- generator.table="wcs_bas_led";
- generator.tableName="LED鏄剧ず灞忛厤缃�";
+ generator.table="wcs_bas_conveyor_path";
+ generator.tableName = "杈撻�佽矾寰勯厤缃�";
generator.packagePath="com.zy.asrs.wcs.core";
generator.build();
--
Gitblit v1.9.1