zhangjiming
/
Outline
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

添加/api/前缀

feature/rail
zhangjiming 5 months ago
parent
e52077f7bc
commit
48068734ac
7 changed files with 29 additions and 29 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      src/App.tsx
  2. 6
      src/pages/measure/components/MeasureAction.tsx
  3. 4
      src/pages/measure/components/graph/ResultLayer.tsx
  4. 2
      src/services/device/deviceState.ts
  5. 26
      src/services/measure/analysis.ts
  6. 4
      src/services/user/user.ts
  7. 12
      src/services/wsTypes.ts

4
src/App.tsx
View File

@ -28,9 +28,9 @@ function App() {
// } else { // } else {
// navigate("/login"); // navigate("/login");
// } // }
} else if (data.messageType === "STATE" && data.path === "/subdevice/uartchanel/get-channel-state") {
} else if (data.messageType === "STATE" && data.path === "/api/subdevice/uartchanel/get-channel-state") {
dispatch(updateDeviceState(data.data)); dispatch(updateDeviceState(data.data));
} else if (data.messageType === "STATE" && data.path === "/profiler-state/get-state") {
} else if (data.messageType === "STATE" && data.path === "/api/profiler-state/get-state") {
// console.log(data.data); // console.log(data.data);
dispatch(updateDevice(data.data)); dispatch(updateDevice(data.data));
} }

6
src/pages/measure/components/MeasureAction.tsx
View File

@ -256,11 +256,11 @@ export default function MeasureAction() {
}; };
const subscription = wsClient.dataOb.subscribe((data) => { const subscription = wsClient.dataOb.subscribe((data) => {
if ( data.path === "/measurement-task/get-task-state") {
if ( data.path === "/api/measurement-task/get-task-state") {
handleStateMessage(data.data); handleStateMessage(data.data);
} else if (data.path === "/measurement-task/event") {
} else if (data.path === "/api/measurement-task/event") {
handleEventMessage(data.data); handleEventMessage(data.data);
} else if (data.path === "/measurement-task/point-report") {
} else if (data.path === "/api/measurement-task/point-report") {
handlePointReport(data.data); handlePointReport(data.data);
} }
}); });

4
src/pages/measure/components/graph/ResultLayer.tsx
View File

@ -48,7 +48,7 @@ export default function ResultLayer(props: {
useEffect(() => { useEffect(() => {
const subscription = wsClient.dataOb.subscribe(data => { const subscription = wsClient.dataOb.subscribe(data => {
let isRight = false; let isRight = false;
if (data.path === "/measurement-task/event") {
if (data.path === "/api/measurement-task/event") {
const canvas = canvasRef.current; const canvas = canvasRef.current;
if (!canvas) return; if (!canvas) return;
@ -73,7 +73,7 @@ export default function ResultLayer(props: {
// pointArr.length = 0; // pointArr.length = 0;
isRight = true; isRight = true;
} }
} else if (data.path === "/measurement-task/point-report") {
} else if (data.path === "/api/measurement-task/point-report") {
// console.log(data.data); // console.log(data.data);
// setRtPoints(rtPoints.concat([data.data])); // setRtPoints(rtPoints.concat([data.data]));
if(isRight){ if(isRight){

2
src/services/device/deviceState.ts
View File

@ -3,7 +3,7 @@ import type { Device } from "../../services/measure/type";
export function getDeviceInfo() { export function getDeviceInfo() {
return httpRequest<BaseResponse<{list:Device[]}>>({ return httpRequest<BaseResponse<{list:Device[]}>>({
url: "/measurement-data/getDevice",
url: "/api/measurement-data/getDevice",
method: "POST", method: "POST",
}); });
} }

26
src/services/measure/analysis.ts
View File

@ -6,35 +6,35 @@ import type {
export function startMeasurement() { export function startMeasurement() {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: "/measurement-task/start-measurement",
url: "/api/measurement-task/start-measurement",
method: "POST", method: "POST",
}); });
} }
export function stopMeasurement() { export function stopMeasurement() {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: "/measurement-task/stop-measurement",
url: "/api/measurement-task/stop-measurement",
method: "POST", method: "POST",
}); });
} }
export function analyzeMeasurement() { export function analyzeMeasurement() {
return httpRequest<BaseResponse<AnalyzeResult>>({ return httpRequest<BaseResponse<AnalyzeResult>>({
url: "/measurement-task/analyze-measurement",
url: "/api/measurement-task/analyze-measurement",
method: "POST", method: "POST",
}); });
} }
export function saveMeasurement() { export function saveMeasurement() {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: "/measurement-task/save-report",
url: "/api/measurement-task/save-report",
method: "POST", method: "POST",
}); });
} }
export function getDetailList(params: {name?:string, pageSize: number, pageNum: number }) { export function getDetailList(params: {name?:string, pageSize: number, pageNum: number }) {
return httpRequest<BaseResponse<{ list: DetailTable[], total: number }>>({ return httpRequest<BaseResponse<{ list: DetailTable[], total: number }>>({
url: "/measurement-data/list",
url: "/api/measurement-data/list",
params, params,
method: "POST", method: "POST",
}); });
@ -42,14 +42,14 @@ export function getDetailList(params: {name?:string, pageSize: number, pageNum:
export function delDetail(params: { ids: string | number }) { export function delDetail(params: { ids: string | number }) {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: `/measurement-data/delete/${params.ids}`,
url: `/api/measurement-data/delete/${params.ids}`,
method: "POST", method: "POST",
}); });
} }
export function createMeasure(params: MeasureRecord) { export function createMeasure(params: MeasureRecord) {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: "/measurement-task/cache-measurement",
url: "/api/measurement-task/cache-measurement",
params, params,
method: "POST", method: "POST",
}); });
@ -57,7 +57,7 @@ export function createMeasure(params: MeasureRecord) {
export function fetchAnalysisReport(code: string) { export function fetchAnalysisReport(code: string) {
return httpRequest<BaseResponse<AnalysisReport>>({ return httpRequest<BaseResponse<AnalysisReport>>({
url: `/measurement-task/save-analysis-report/${code}`,
url: `/api/measurement-task/save-analysis-report/${code}`,
method: "POST", method: "POST",
}); });
} }
@ -68,7 +68,7 @@ export function fetchAnalysisReport(code: string) {
*/ */
export function getRecordPointSetByUUID(uuid: string) { export function getRecordPointSetByUUID(uuid: string) {
return httpRequest<BaseResponse<ProfileRecordPointSet>>({ return httpRequest<BaseResponse<ProfileRecordPointSet>>({
url: `/measurement-analysis/point/${uuid}`,
url: `/api/measurement-analysis/point/${uuid}`,
method: "POST", method: "POST",
}); });
} }
@ -79,7 +79,7 @@ export function getRecordPointSetByUUID(uuid: string) {
*/ */
export function getBaseRecordPointSetByCode(code: string) { export function getBaseRecordPointSetByCode(code: string) {
return httpRequest<BaseResponse<BaseProfileRecordPointSet>>({ return httpRequest<BaseResponse<BaseProfileRecordPointSet>>({
url: `/measurement-analysis/base-point/${code}`,
url: `/api/measurement-analysis/base-point/${code}`,
method: "POST", method: "POST",
}); });
} }
@ -93,7 +93,7 @@ export function getBaseRecordPointSetByCode(code: string) {
*/ */
export function getReport(uuid: string, code: string) { export function getReport(uuid: string, code: string) {
return httpRequest<BaseResponse<AnalysisReport>>({ return httpRequest<BaseResponse<AnalysisReport>>({
url: `/measurement-analysis/report`,
url: `/api/measurement-analysis/report`,
method: "POST", method: "POST",
params: { uuid, code }, params: { uuid, code },
}); });
@ -105,7 +105,7 @@ export function getReport(uuid: string, code: string) {
*/ */
export function getDetail(params:{id:number}){ export function getDetail(params:{id:number}){
return httpRequest<BaseResponse<{uuid:string}>>({ return httpRequest<BaseResponse<{uuid:string}>>({
url: `/measurement-data/${params.id}`,
url: `/api/measurement-data/${params.id}`,
method: "POST", method: "POST",
params, params,
}); });
@ -113,7 +113,7 @@ export function getDetail(params:{id:number}){
export function getPointByUuid(params:{uuid:string}){ export function getPointByUuid(params:{uuid:string}){
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: `/measurement-analysis/point/${params.uuid}`,
url: `/api/measurement-analysis/point/${params.uuid}`,
method: "POST", method: "POST",
params, params,
}); });

4
src/services/user/user.ts
View File

@ -11,7 +11,7 @@ export type User = {
export function login(params: { account: string; password: string }) { export function login(params: { account: string; password: string }) {
return httpRequest<BaseResponse<User>>({ return httpRequest<BaseResponse<User>>({
url: "/auth/login",
url: "/api/auth/login",
params, params,
method: "POST", method: "POST",
}); });
@ -19,7 +19,7 @@ export function login(params: { account: string; password: string }) {
export function logout(params: {}) { export function logout(params: {}) {
return httpRequest<BaseResponse>({ return httpRequest<BaseResponse>({
url: "/auth/logout",
url: "/api/auth/logout",
params, params,
method: "POST", method: "POST",
}); });

12
src/services/wsTypes.ts
View File

@ -15,7 +15,7 @@ export type TaskState = {
// data: { // data: {
// event: "START_RECORD_SIG" | "END_RECORD_SIG" | "FINISHED" | "START_RECORD_LEFT" | "FINISH_RECORD_RIGHT" | "FINISH_RECORD" | "FINISH_RECORD_LEFT" | "END_RECORD_SIG" | "END_RECORD" | "START_RECORD_RIGHT"; // event: "START_RECORD_SIG" | "END_RECORD_SIG" | "FINISHED" | "START_RECORD_LEFT" | "FINISH_RECORD_RIGHT" | "FINISH_RECORD" | "FINISH_RECORD_LEFT" | "END_RECORD_SIG" | "END_RECORD" | "START_RECORD_RIGHT";
// }; // };
path: "/measurement-task/event";
path: "/api/measurement-task/event";
}; };
// 连续上报坐标点 // 连续上报坐标点
@ -25,7 +25,7 @@ export type TrackRecordSig = {
x: number; x: number;
y: number; y: number;
}; };
path: "/measurement-task/point-report";
path: "/api/measurement-task/point-report";
}; };
export const defaultContext: ContextMessage["data"] = { export const defaultContext: ContextMessage["data"] = {
@ -53,7 +53,7 @@ export type ContextMessage = {
isBuiltInUser: boolean; isBuiltInUser: boolean;
}>; }>;
}; };
path: "/deviceContext";
path: "/api/deviceContext";
}; };
export type loginUser = Partial<{ export type loginUser = Partial<{
@ -101,7 +101,7 @@ export type MeasureState = {
isWrongSide: boolean; //测量方向是错误的 isWrongSide: boolean; //测量方向是错误的
// profileRecordDescription: null; //用户填写的新测量信息 // profileRecordDescription: null; //用户填写的新测量信息
}; };
path: "/measurement-task/get-task-state";
path: "/api/measurement-task/get-task-state";
}; };
export const defaultMeasureState = { export const defaultMeasureState = {
@ -121,7 +121,7 @@ export type ChannelMessage = {
sn: string; sn: string;
descriptivePortName: string; descriptivePortName: string;
}; };
path: "/subdevice/uartchanel/get-channel-state";
path: "/api/subdevice/uartchanel/get-channel-state";
}; };
export type DeviceStatus = { export type DeviceStatus = {
@ -133,7 +133,7 @@ export type DeviceStatus = {
inclinatorY: number; //y轴倾斜 inclinatorY: number; //y轴倾斜
temperature: number; //温度 temperature: number; //温度
}; };
path: "/profiler-state/get-state";
path: "/api/profiler-state/get-state";
}; };
export type Datagram = TrackRecordSig | TaskState | ContextMessage | MeasureState | ChannelMessage | DeviceStatus; export type Datagram = TrackRecordSig | TaskState | ContextMessage | MeasureState | ChannelMessage | DeviceStatus;
Write Preview
Loading…
Cancel
Save