From b1ff5e3604773c79227ccff896662239bb9a5fd5 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 27 九月 2024 09:46:17 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java | 37 +++++++++ zy-acs-flow/package.json | 3 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java | 4 + zy-acs-flow/package-lock.json | 125 +++++++++++++++++++++++++++++++ zy-acs-flow/src/i18n/en.js | 1 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java | 10 ++ zy-acs-flow/src/i18n/zh.js | 1 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java | 11 ++ 8 files changed, 190 insertions(+), 2 deletions(-) diff --git a/zy-acs-flow/package-lock.json b/zy-acs-flow/package-lock.json index ac0b674..ee31750 100644 --- a/zy-acs-flow/package-lock.json +++ b/zy-acs-flow/package-lock.json @@ -7,6 +7,7 @@ "name": "cool-admin-flow", "dependencies": { "@fontsource/roboto": "^5.0.14", + "@hello-pangea/dnd": "^16.3.0", "@mui/icons-material": "^5.16.7", "@mui/material": "^5.16.7", "@mui/x-tree-view": "^7.16.0", @@ -942,6 +943,24 @@ "version": "5.0.14", "resolved": "https://registry.npmmirror.com/@fontsource/roboto/-/roboto-5.0.14.tgz", "integrity": "sha512-zHAxlTTm9RuRn9/StwclFJChf3z9+fBrOxC3fw71htjHP1BgXNISwRjdJtAKAmMe5S2BzgpnjkQR93P9EZYI/Q==" + }, + "node_modules/@hello-pangea/dnd": { + "version": "16.6.0", + "resolved": "https://registry.npmmirror.com/@hello-pangea/dnd/-/dnd-16.6.0.tgz", + "integrity": "sha512-vfZ4GydqbtUPXSLfAvKvXQ6xwRzIjUSjVU0Sx+70VOhc2xx6CdmJXJ8YhH70RpbTUGjxctslQTHul9sIOxCfFQ==", + "dependencies": { + "@babel/runtime": "^7.24.1", + "css-box-model": "^1.2.1", + "memoize-one": "^6.0.0", + "raf-schd": "^4.0.3", + "react-redux": "^8.1.3", + "redux": "^4.2.1", + "use-memo-one": "^1.1.3" + }, + "peerDependencies": { + "react": "^16.8.5 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0" + } }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", @@ -1992,6 +2011,15 @@ "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", "dev": true }, + "node_modules/@types/hoist-non-react-statics": { + "version": "3.3.5", + "resolved": "https://registry.npmmirror.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.5.tgz", + "integrity": "sha512-SbcrWzkKBw2cdwRTwQAswfpB9g9LJWfjtUeW/jvNwbhC8cpmmNYVePa+ncbUe0rGTQ7G3Ff6mYUN2VMfLVr+Sg==", + "dependencies": { + "@types/react": "*", + "hoist-non-react-statics": "^3.3.0" + } + }, "node_modules/@types/json-schema": { "version": "7.0.15", "resolved": "https://registry.npmmirror.com/@types/json-schema/-/json-schema-7.0.15.tgz", @@ -2030,7 +2058,7 @@ "version": "18.3.0", "resolved": "https://registry.npmmirror.com/@types/react-dom/-/react-dom-18.3.0.tgz", "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", - "dev": true, + "devOptional": true, "dependencies": { "@types/react": "*" } @@ -2048,6 +2076,11 @@ "resolved": "https://registry.npmmirror.com/@types/semver/-/semver-7.5.8.tgz", "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true + }, + "node_modules/@types/use-sync-external-store": { + "version": "0.0.3", + "resolved": "https://registry.npmmirror.com/@types/use-sync-external-store/-/use-sync-external-store-0.0.3.tgz", + "integrity": "sha512-EwmlvuaxPNej9+T4v5AuBPJa2x2UOJVdjCtDHgcDqitUeOtjnJKJ+apYjVcAoBEMjKW1VVFGZLUb5+qqa09XFA==" }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.62.0", @@ -2730,6 +2763,14 @@ }, "engines": { "node": ">= 8" + } + }, + "node_modules/css-box-model": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/css-box-model/-/css-box-model-1.2.1.tgz", + "integrity": "sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==", + "dependencies": { + "tiny-invariant": "^1.0.6" } }, "node_modules/css-mediaquery": { @@ -4563,6 +4604,11 @@ "yallist": "^3.0.2" } }, + "node_modules/memoize-one": { + "version": "6.0.0", + "resolved": "https://registry.npmmirror.com/memoize-one/-/memoize-one-6.0.0.tgz", + "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==" + }, "node_modules/merge2": { "version": "1.4.1", "resolved": "https://registry.npmmirror.com/merge2/-/merge2-1.4.1.tgz", @@ -5133,6 +5179,11 @@ "ra-core": "^5.1.2" } }, + "node_modules/raf-schd": { + "version": "4.0.3", + "resolved": "https://registry.npmmirror.com/raf-schd/-/raf-schd-4.0.3.tgz", + "integrity": "sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==" + }, "node_modules/react": { "version": "18.3.1", "resolved": "https://registry.npmmirror.com/react/-/react-18.3.1.tgz", @@ -5262,6 +5313,49 @@ "resolved": "https://registry.npmmirror.com/react-is/-/react-is-16.13.1.tgz", "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, + "node_modules/react-redux": { + "version": "8.1.3", + "resolved": "https://registry.npmmirror.com/react-redux/-/react-redux-8.1.3.tgz", + "integrity": "sha512-n0ZrutD7DaX/j9VscF+uTALI3oUPa/pO4Z3soOBIjuRn/FzVu6aehhysxZCLi6y7duMf52WNZGMl7CtuK5EnRw==", + "dependencies": { + "@babel/runtime": "^7.12.1", + "@types/hoist-non-react-statics": "^3.3.1", + "@types/use-sync-external-store": "^0.0.3", + "hoist-non-react-statics": "^3.3.2", + "react-is": "^18.0.0", + "use-sync-external-store": "^1.0.0" + }, + "peerDependencies": { + "@types/react": "^16.8 || ^17.0 || ^18.0", + "@types/react-dom": "^16.8 || ^17.0 || ^18.0", + "react": "^16.8 || ^17.0 || ^18.0", + "react-dom": "^16.8 || ^17.0 || ^18.0", + "react-native": ">=0.59", + "redux": "^4 || ^5.0.0-beta.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + }, + "react-dom": { + "optional": true + }, + "react-native": { + "optional": true + }, + "redux": { + "optional": true + } + } + }, + "node_modules/react-redux/node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmmirror.com/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" + }, "node_modules/react-refresh": { "version": "0.14.2", "resolved": "https://registry.npmmirror.com/react-refresh/-/react-refresh-0.14.2.tgz", @@ -5314,6 +5408,14 @@ "peerDependencies": { "react": ">=16.6.0", "react-dom": ">=16.6.0" + } + }, + "node_modules/redux": { + "version": "4.2.1", + "resolved": "https://registry.npmmirror.com/redux/-/redux-4.2.1.tgz", + "integrity": "sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==", + "dependencies": { + "@babel/runtime": "^7.9.2" } }, "node_modules/reflect.getprototypeof": { @@ -5782,6 +5884,11 @@ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", "dev": true }, + "node_modules/tiny-invariant": { + "version": "1.3.3", + "resolved": "https://registry.npmmirror.com/tiny-invariant/-/tiny-invariant-1.3.3.tgz", + "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==" + }, "node_modules/to-fast-properties": { "version": "2.0.0", "resolved": "https://registry.npmmirror.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz", @@ -6010,6 +6117,22 @@ "resolved": "https://registry.npmmirror.com/punycode/-/punycode-1.4.1.tgz", "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==" }, + "node_modules/use-memo-one": { + "version": "1.1.3", + "resolved": "https://registry.npmmirror.com/use-memo-one/-/use-memo-one-1.1.3.tgz", + "integrity": "sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/use-sync-external-store": { + "version": "1.2.2", + "resolved": "https://registry.npmmirror.com/use-sync-external-store/-/use-sync-external-store-1.2.2.tgz", + "integrity": "sha512-PElTlVMwpblvbNqQ82d2n6RjStvdSoNe9FG28kNfz3WiXilJm4DdNkEzRhCZuIDwY8U08WVihhGR5iRqAwfDiw==", + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/vite": { "version": "5.4.2", "resolved": "https://registry.npmmirror.com/vite/-/vite-5.4.2.tgz", diff --git a/zy-acs-flow/package.json b/zy-acs-flow/package.json index 4d0229e..6488736 100644 --- a/zy-acs-flow/package.json +++ b/zy-acs-flow/package.json @@ -11,13 +11,14 @@ }, "dependencies": { "@fontsource/roboto": "^5.0.14", + "@hello-pangea/dnd": "^16.3.0", "@mui/icons-material": "^5.16.7", "@mui/material": "^5.16.7", "@mui/x-tree-view": "^7.16.0", "axios": "^1.7.4", "date-fns": "^3.6.0", - "pixi.js": "^7.4.0", "papaparse": "^5.4.1", + "pixi.js": "^7.4.0", "react": "^18.3.0", "react-admin": "^5.1.0", "react-dom": "^18.3.0", diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 062ebb0..127411e 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -146,6 +146,7 @@ segment: 'Segment', jam: 'Jam', action: 'Action', + mission: 'Mission', }, table: { field: { diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index f3019f0..51c99d2 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -146,6 +146,7 @@ segment: '浣滀笟', jam: '閬胯', action: '鍔ㄤ綔', + mission: '鎵ц', }, table: { field: { diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java new file mode 100644 index 0000000..ef818dd --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MissionController.java @@ -0,0 +1,37 @@ +package com.zy.acs.manager.manager.controller; + +import com.zy.acs.framework.common.R; +import com.zy.acs.manager.common.domain.BaseParam; +import com.zy.acs.manager.common.domain.PageParam; +import com.zy.acs.manager.manager.entity.Route; +import com.zy.acs.manager.manager.service.MissionService; +import com.zy.acs.manager.system.controller.BaseController; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.Map; + +/** + * Created by vincent on 9/27/2024 + */ +@RestController +@RequestMapping("/api") +public class MissionController extends BaseController { + + @Autowired + private MissionService missionService; + + @PreAuthorize("hasAuthority('manager:mission:list')") + @PostMapping("/mission/page") + public R page(@RequestBody Map<String, Object> map) { + BaseParam baseParam = buildParam(map, BaseParam.class); + PageParam<Route, BaseParam> pageParam = new PageParam<>(baseParam, Route.class); + + return R.ok().add(null); + } + +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java new file mode 100644 index 0000000..c45565e --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MissionVo.java @@ -0,0 +1,10 @@ +package com.zy.acs.manager.manager.controller.result; + +import lombok.Data; + +/** + * Created by vincent on 9/27/2024 + */ +@Data +public class MissionVo { +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java new file mode 100644 index 0000000..3c6061c --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/MissionService.java @@ -0,0 +1,4 @@ +package com.zy.acs.manager.manager.service; + +public interface MissionService { +} diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java new file mode 100644 index 0000000..ff50244 --- /dev/null +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java @@ -0,0 +1,11 @@ +package com.zy.acs.manager.manager.service.impl; + +import com.zy.acs.manager.manager.service.MissionService; +import org.springframework.stereotype.Service; + +/** + * Created by vincent on 9/27/2024 + */ +@Service("missionService") +public class MissionServiceImpl implements MissionService { +} -- Gitblit v1.9.1