From 0980fc2bb1b8ad54607e4325ac88781f27d378aa Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期六, 09 十一月 2024 13:12:09 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/header/FakeFab.jsx | 42 ++++++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeService.java | 25 ++++++++ zy-acs-flow/src/map/http.js | 18 +++++ zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeController.java | 26 ++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java | 34 +++++++++++ zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/SecurityConfig.java | 1 zy-acs-flow/src/map/MapPage.jsx | 25 +++++--- 7 files changed, 160 insertions(+), 11 deletions(-) diff --git a/zy-acs-flow/src/map/MapPage.jsx b/zy-acs-flow/src/map/MapPage.jsx index e1e916c..adfba19 100644 --- a/zy-acs-flow/src/map/MapPage.jsx +++ b/zy-acs-flow/src/map/MapPage.jsx @@ -23,6 +23,7 @@ import MapSearch from "./header/MapSearch"; import { startupOrShutdown } from "./http"; import PulseSignal from "../page/components/PulseSignal"; +import FakeFab from "./header/FakeFab"; let player; let websocket; @@ -406,16 +407,20 @@ }} > {mode !== MAP_MODE.MOVABLE_MODE && ( - <Fab - variant="extended" - color={showRoutes ? 'primary' : 'default'} - size="small" - onClick={() => { - showRoutes ? Tool.hideRoutes(curZone, setShowRoutes) : Tool.showRoutes(curZone, setShowRoutes) - }} - > - <AltRoute /> - </Fab> + <> + <Fab + variant="extended" + color={showRoutes ? 'primary' : 'default'} + size="small" + onClick={() => { + showRoutes ? Tool.hideRoutes(curZone, setShowRoutes) : Tool.showRoutes(curZone, setShowRoutes) + }} + > + <AltRoute /> + </Fab> + <FakeFab + /> + </> )} <Fab variant="extended" diff --git a/zy-acs-flow/src/map/header/FakeFab.jsx b/zy-acs-flow/src/map/header/FakeFab.jsx new file mode 100644 index 0000000..010b52c --- /dev/null +++ b/zy-acs-flow/src/map/header/FakeFab.jsx @@ -0,0 +1,42 @@ +import React, { useState, useRef, useEffect, useMemo } from "react"; +import { + Select, + MenuItem, + Button, + Box, + useTheme, + Fab, +} from '@mui/material'; +import LensBlurIcon from '@mui/icons-material/LensBlur'; +import { getFakeSign } from "../http"; + +const FakeFab = (props) => { + const [fakeRun, setFakeRun] = useState(false); + + const querySign = () => { + getFakeSign(null, (data) => { + }); + } + + useEffect(() => { + querySign(); + }, []); + + return ( + <> + <Fab + variant="extended" + color={fakeRun ? 'primary' : 'default'} + size="small" + onClick={() => { + setFakeRun(!fakeRun); + }} + > + <LensBlurIcon /> + {/* {translate('page.map.action.adapt')} */} + </Fab> + </> + ) +} + +export default FakeFab; \ No newline at end of file diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js index b8a6cfd..dfc2940 100644 --- a/zy-acs-flow/src/map/http.js +++ b/zy-acs-flow/src/map/http.js @@ -27,7 +27,7 @@ const commonList = common ? eval(common) : []; const pointList = point ? eval(point) : []; const mapItemList = [...commonList, ...pointList]; - + mapItemList.forEach(item => { if (item.type !== DEVICE_TYPE.AGV) { const sprite = Tool.generateSprite(item.type); @@ -244,3 +244,19 @@ console.error(error.message); }) } + +export const getFakeSign = async (param, callback) => { + await request.get('/fake/sign').then((res) => { + const { code, msg, data } = res.data; + if (code === 200) { + if (callback) { + callback(data) + } + } else { + notify.error(msg); + } + }).catch((error) => { + notify.error(error.message); + console.error(error.message); + }) +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/SecurityConfig.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/SecurityConfig.java index 03776f4..5a24b45 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/SecurityConfig.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/security/SecurityConfig.java @@ -36,6 +36,7 @@ public static final String[] FILTER_PATH = new String[]{ "/handler/**", "/test/**", + "/fake/**", "/digital/**", "/rpc/**", "/api/login", diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeController.java new file mode 100644 index 0000000..36ff7db --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeController.java @@ -0,0 +1,26 @@ +package com.zy.acs.manager.fake; + +import com.zy.acs.framework.common.R; +import com.zy.acs.manager.system.controller.BaseController; +import com.zy.acs.manager.system.service.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * Created by vincent on 11/9/2024 + */ +@RestController +@RequestMapping("/api/fake") +public class FakeController extends BaseController { + + @Autowired + private ConfigService configService; + + @GetMapping("/sign") + public R sign() { + return R.ok().add(configService.getVal("fakeSign", Boolean.class)); + } + +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java new file mode 100644 index 0000000..66800d0 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeProcessor.java @@ -0,0 +1,34 @@ +package com.zy.acs.manager.fake; + +import com.zy.acs.manager.manager.service.AgvDetailService; +import com.zy.acs.manager.manager.service.AgvService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +/** + * Created by vincent on 11/9/2024 + */ +@Component +public class FakeProcessor { + + @Autowired + private AgvService agvService; + @Autowired + private AgvDetailService agvDetailService; + + /** + * 1.AgvDataService.dataProcess [ agvDetail: vol, code, agvAngle, agvStatus ] + * 2.MainService.upDataSubscribe + * 3.AgvCmdService.executeRequest + * 4.AgvServiceImpl.judgeOnline + * 5. + */ + @Scheduled(cron = "0/1 * * * * ? ") + public void process() { + + + + } + +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeService.java new file mode 100644 index 0000000..fc53c78 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/fake/FakeService.java @@ -0,0 +1,25 @@ +package com.zy.acs.manager.fake; + +import com.zy.acs.manager.system.service.ConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * Created by vincent on 11/9/2024 + */ +@Service +public class FakeService { + + @Autowired + private ConfigService configService; + + public boolean fakeStartup() { + return configService.setVal("fakeSign", Boolean.TRUE); + } + + public boolean fakeShutdown() { + return configService.setVal("fakeSign", Boolean.FALSE); + } + + +} -- Gitblit v1.9.1