Browse Source

添加/api/前缀

feature/rail
zhangjiming 5 months ago
parent
commit
48068734ac
  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

@ -28,9 +28,9 @@ function App() {
// } else {
// 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));
} 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);
dispatch(updateDevice(data.data));
}

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

@ -256,11 +256,11 @@ export default function MeasureAction() {
};
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);
} else if (data.path === "/measurement-task/event") {
} else if (data.path === "/api/measurement-task/event") {
handleEventMessage(data.data);
} else if (data.path === "/measurement-task/point-report") {
} else if (data.path === "/api/measurement-task/point-report") {
handlePointReport(data.data);
}
});

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

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

2
src/services/device/deviceState.ts

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

26
src/services/measure/analysis.ts

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

4
src/services/user/user.ts

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

12
src/services/wsTypes.ts

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