chore(api): 更新接口

src/api/index.ts

@@ -5,18 +5,22 @@ import { request } from '@/utils';
 import type {
   AddInterface,
   AgreementUpdate,
+  AllDevicesList,
   CustomParameters,
+  DeviceBindQuery,
   DeviceGroupItem,
   DevicesList,
   DevicesListItemData,
   DictTypeData,
   DictTypeDataParams,
+  EquipmentDetailsItem,
   EquipmentInformationForm,
   EquipmentTypeItem,
   EquipmentUpdateForm,
   GatewayBody,
   GatewayInformation,
   GatewayInterface,
+  GatewayLinkProtocolQuery,
   GatewayListItemData,
   GatewayModelInfo,
   GatewayParameterBody,
@@ -30,6 +34,8 @@ import type {
   ListInterfaces,
   ListPhysicalInterfaces,
   ParameterVerification,
+  ParamValueListAutomaticData,
+  ParamValueListAutomaticQuery,
   PostProtocolPage,
   PostProtocolPageItem,
   PostProtocolPageItemData,
@@ -46,6 +52,7 @@ import type {
   ProtocolReset,
   ProtocolStandardParamData,
   ProtocolStandardParamQuery,
+  SerialNumberItem,
   SerialNumberItemData,
   SubmitSorting,
   VerificationAgreement,
@@ -132,6 +139,13 @@ export const deviceAdd = async (equipmentInformationForm: EquipmentInformationFo
   return data;
 };
 
+export const addDeviceBind = async (params: DeviceBindQuery) => {
+  await request(apiBiz('/device/bind'), {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+};
+
 export const deviceDeletion = async (ids: number[]) => {
   await request(apiBiz('/device/delete/batch'), {
     method: 'POST',
@@ -139,6 +153,13 @@ export const deviceDeletion = async (ids: number[]) => {
   });
 };
 
+export const equipmentDetails = async (id: number) => {
+  const data = await request<EquipmentDetailsItem>(apiBiz(`/device/getBasicInfo/${id}`), {
+    method: 'POST',
+  });
+  return data;
+};
+
 export const queryDevicesList = async (devicesList: DevicesList) => {
   const data = await request<DevicesListItemData>(apiBiz('/device/getPageList'), {
     method: 'POST',
@@ -147,6 +168,13 @@ export const queryDevicesList = async (devicesList: DevicesList) => {
   return data;
 };
 
+export const noPaginationDevicesList = async () => {
+  const data = await request<AllDevicesList[]>(apiBiz('/device/getList'), {
+    method: 'POST',
+  });
+  return data;
+};
+
 // 设备网关
 
 export const deviceGatewayUpdate = async (equipmentUpdateForm: EquipmentUpdateForm[]) => {
@@ -207,6 +235,13 @@ export const addGateway = async () => {
   await request(apiBiz('/gateway/add'));
 };
 
+export const getAllGatewayList = async () => {
+  const data = await request<SerialNumberItem[]>(apiBiz('/gateway/getGtwLinkList'), {
+    method: 'POST',
+  });
+  return data;
+};
+
 export const validateGatewayInfo = async (registerGatewayForm: VerificationEquipment) => {
   const data = await request<GatewayInformation>(apiBiz('/gateway/validate', registerGatewayForm), {
     method: 'POST',
@@ -232,13 +267,13 @@ export const gatewayLinkAdd = async (addInterface: AddInterface) => {
 };
 
 export const gatewayLinkDelete = async (id: number) => {
-  await request(apiBiz(`${'/gatewayLink/delete/'}${id}`), {
+  await request(apiBiz(`/gatewayLink/delete/${id}`), {
     method: 'POST',
   });
 };
 
 export const gatewayLinkGetList = async (gatewayId: number) => {
-  const data = await request<InterfaceData[]>(apiBiz(`${'/gatewayLink/getList/'}${gatewayId}`), {
+  const data = await request<InterfaceData[]>(apiBiz(`/gatewayLink/getList/${gatewayId}`), {
     method: 'POST',
   });
   return data;
@@ -254,12 +289,12 @@ export const gatewayLinkUpdate = async (agreementUpdate: AgreementUpdate) => {
 // 网关型号
 
 export const getGatewayModelInfo = async (id: number) => {
-  const data = await request<GatewayModelInfo>(apiBiz(`${'/gatewayModel/info/'}${id}`));
+  const data = await request<GatewayModelInfo>(apiBiz(`/gatewayModel/info/${id}`));
   return data;
 };
 
 export const getGatewayModelInterfaces = async (id: number) => {
-  const data = await request<GatewayInterface[]>(apiBiz(`${'/gatewayModel/interfaces/'}${id}`), {
+  const data = await request<GatewayInterface[]>(apiBiz(`/gatewayModel/interfaces/${id}`), {
     method: 'POST',
   });
   return data;
@@ -268,19 +303,35 @@ export const getGatewayModelInterfaces = async (id: number) => {
 // 网关物理接口协议
 
 export const obtainListPhysicalInterfaces = async (id: number) => {
-  const data = await request<ListPhysicalInterfaces[]>(apiBiz(`${'/gatewayInterfaceProtocol/getProtocols/'}${id}`));
+  const data = await request<ListPhysicalInterfaces[]>(apiBiz(`/gatewayInterfaceProtocol/getProtocols/${id}`));
   return data;
 };
 
 // 网关型号物理接口
 
 export const obtainListInterfaces = async (id: number) => {
-  const data = await request<ListInterfaces[]>(apiBiz(`${'/gatewayPhysicalInterface/getInterfaces/'}${id}`));
+  const data = await request<ListInterfaces[]>(apiBiz(`/gatewayPhysicalInterface/getInterfaces/${id}`));
   return data;
 };
 
 // 网关接口协议
 
+export const getParamValueListAutomatic = async (params: ParamValueListAutomaticQuery) => {
+  const data = await request<ParamValueListAutomaticData[]>(apiBiz('/gatewayLinkProtocol/getParamValueListAutomatic'), {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+  return data;
+};
+
+export const getAllGatewayLinkProtocol = async <T>(params: GatewayLinkProtocolQuery) => {
+  const data = await request<T>(apiBiz('/gatewayLinkProtocol/getLinkParams'), {
+    method: 'POST',
+    body: JSON.stringify(params),
+  });
+  return data;
+};
+
 export const gatewayLinkProtocolList = async <T>(protocolListItem: ProtocolListItem) => {
   const data = await request<T>(apiBiz('/gatewayLinkProtocol/getParamPageList'), {
     method: 'POST',
@@ -301,7 +352,7 @@ export const gatewayLinkProtocolGatewayList = async (protocolGatewayListListItem
 };
 
 export const gatewayLinkList = async (id: number) => {
-  const data = await request<VerificationAgreement[]>(apiBiz(`${'/gatewayLinkProtocol/getProtocolInfoList/'}${id}`), {
+  const data = await request<VerificationAgreement[]>(apiBiz(`/gatewayLinkProtocol/getProtocolInfoList/${id}`), {
     method: 'POST',
   });
   return data;
@@ -315,7 +366,7 @@ export const gatewayLinkProtocolReset = async (protocolReset: ProtocolReset) =>
 };
 
 export const postProtocolCandidatesList = async (protocolList: ProtocolList, gatewayId: number) => {
-  const data = await request<ProtocolItemData>(apiBiz(`${'/gatewayLinkProtocol/getProtocolCandidates/'}${gatewayId}`), {
+  const data = await request<ProtocolItemData>(apiBiz(`/gatewayLinkProtocol/getProtocolCandidates/${gatewayId}`), {
     method: 'POST',
     body: JSON.stringify(protocolList),
   });

src/types/index.ts

@@ -446,6 +446,7 @@ export interface EquipmentInformationForm {
   status: string;
   remarks: string;
   devId: number;
+  imgUrl: string;
 }
 
 export interface EquipmentTypeItem {
@@ -578,8 +579,8 @@ export interface SerialNumberItem {
   id: number;
   createTime: string;
   updateTime: string;
-  createUserId: number | null;
-  updateUserId: number | null;
+  createUserId: number;
+  updateUserId: number;
   snCode: string;
   password: string;
   modelId: number;
@@ -587,45 +588,34 @@ export interface SerialNumberItem {
   state: number;
   deleted: number;
   modelName: string;
+  links: PhysicalInterfaceList[];
+}
+
+export interface PhysicalInterfaceList {
+  linkId: number;
+  linkName: string;
 }
 
 export type ListEquipmentParametersItemData = PageData<ListEquipmentParametersItem>;
 
 export interface ListEquipmentParametersItem {
+  gatewayParamCode: string;
+  gatewayParamName: string;
   id: number;
-  createTime: string;
-  updateTime: string;
-  createUserId: number;
-  updateUserId: number;
-  baseInfoId: number;
-  platformParamCode: string | null;
-  platformParamName: string | null;
-  gatewayParamCode: string | null;
-  gatewayParamName: string | null;
-  paramCode: string;
-  paramName: string;
-  unit: string | null;
-  module: string;
-  readWriteType: string;
-  readWriteTypeCode: string;
-  readFuncCode: string;
-  writeFuncCode: string | null;
-  registerAddr: string;
-  addrNumber: string | null;
-  registerType: string | null;
-  registerTypeCode: string | null;
-  parsingType: string;
-  parsingTypeCode: string;
-  addrLength: number;
-  wordLength: number | null;
-  wordLengthCode: string | null;
-  quantity: number | null;
-  coefficient: number;
-  isHighFreqParam: string;
-  isHighFreqParamCode: string;
-  readCalcFormula: string | null;
-  writeCalcFormula: string | null;
-  decimalPlace: number | null;
+  parsingType?: number;
+  readWriteType?: string;
+  readWriteTypeCode?: string;
+  unit: string;
+  groupId?: number;
+  groupSerialNum?: number;
+  groupParamSerialNum?: number;
+  isProcessData: boolean;
+  gatewayId: number;
+  deviceParamCode: string;
+  deviceParamName: string;
+  groupName: string;
+  groupIdShow: boolean;
+  linkId: number;
 }
 
 export interface EquipmentUpdateForm {
@@ -755,7 +745,6 @@ export interface ParameterVerificationList {
 export interface GroupingList {
   groupName: string;
   serialNum?: number;
-  deviceId: number;
 }
 
 export interface GroupingListData {
@@ -779,6 +768,8 @@ export interface DevicesList {
   modelName?: string;
   gatewaySnCode?: string;
   deviceName?: string;
+  runningStatus?: number;
+  errorStatus?: number;
 }
 
 export interface ListInterfaces {
@@ -804,9 +795,9 @@ export interface ListPhysicalInterfaces {
 }
 
 export interface CustomizationData {
-  paramNum: string;
+  deviceParamCode: string;
   paramNumShow: boolean;
-  paramName: string;
+  deviceParamName: string;
   paramNameShow: boolean;
   customFormula: string;
   customFormulaShow: boolean;
@@ -815,6 +806,7 @@ export interface CustomizationData {
   decimalDigits?: number;
   decimalDigitsShow: boolean;
   paramGroupId?: number;
+  paramGroupName: string;
   paramGroupIdShow: boolean;
   groupSerialNum?: number;
   groupSerialNumShow: boolean;
@@ -833,6 +825,7 @@ export interface CustomParameters {
   paramType?: number;
   deviceParamCode: string;
   deviceParamName: string;
+  paramGroupName: string;
 }
 
 export interface SubmitSorting {
@@ -1038,3 +1031,258 @@ export interface GatewayParameterItem {
   time: string;
   monitorStatus: string;
 }
+
+export interface EquipmentDetailsItem {
+  deviceQueryVo: BasicInformation;
+  gatewayInfoVos: AssociatedGatewayParameters[];
+  protocolParamDeviceInfoVos: ConfigureDeviceParameters[];
+  protocolParamCustomDevVos: CustomParametersItem[];
+}
+
+export interface AssociatedGatewayParameters {
+  id: number;
+  createTime: string;
+  updateTime: string;
+  createUserId: number;
+  updateUserId: number;
+  snCode: string;
+  password: string;
+  modelId: number;
+  isRegister: string;
+  state: string;
+  deleted: string;
+  modelName: string;
+  linkName: string;
+  linkId: number;
+  protocolParamInfoQueryVos: protocolParamInfo[];
+}
+
+export interface BasicInformation {
+  id: number;
+  deviceName: string;
+  groupId: number;
+  deviceType: number;
+  userId: number;
+  brand: number;
+  model: number;
+  modelType: number;
+  controlType: number;
+  compressionLevel: number;
+  voltageLevel: number;
+  powerRating: number;
+  powerUnload: number;
+  maximumFlow: number;
+  pressure: number;
+  pressureMax: number;
+  productionDate: string;
+  productionNum: string;
+  mainTechData: string;
+  mountedPosition: string;
+  department: string;
+  respPerson: string;
+  phone: string;
+  serviceLife: number;
+  status: number;
+  remarks: string;
+  deviceNum: string;
+  runningStatus: number;
+  deleted: boolean;
+  deviceGroup: DeviceGroup;
+  gatewayInfos: GatewayInfos[];
+  protocolParamInfos: ProtocolParamInfos[];
+  groupName: string;
+  deviceTypeName: string;
+  brandName: string;
+  modelName: string;
+  modelTypeName: string;
+  controlTypeName: string;
+  compressionLevelName: string;
+  voltageLevelName: string;
+  errorStatus: number;
+}
+
+export interface ConfigureDeviceParameters {
+  baseInfoId: number;
+  orgId: number;
+  recognizeResult: string;
+  candidateResults: string;
+  platformParamCode: string;
+  platformParamName: string;
+  gatewayParamCode: string;
+  gatewayParamName: string;
+  paramCode: string;
+  paramName: string;
+  unit: string;
+  module: string;
+  readWriteType: string;
+  readWriteTypeCode: string;
+  readFuncCode: string;
+  writeFuncCode: string;
+  registerAddr: string;
+  addrNumber: string;
+  registerType: string;
+  registerTypeCode: string;
+  parsingType: string;
+  parsingTypeCode: string;
+  addrLength: number;
+  wordLength: string;
+  wordLengthCode: string;
+  quantity: number;
+  coefficient: number;
+  isHighFreqParam: string;
+  isHighFreqParamCode: string;
+  readCalcFormula: string;
+  writeCalcFormula: string;
+  decimalPlace: number;
+  isDraft: string;
+  id: number;
+  deviceParamCode: string;
+  deviceParamName: string;
+  isProcessData: number;
+  gatewayId: string;
+  groupSerialNum: number;
+  groupParamSerialNum: number;
+  groupId: number;
+  snCode: string;
+  serialNum: number;
+  groupName: string;
+  linkId: string;
+}
+
+export interface CustomParametersItem {
+  id: number;
+  customFormula: string;
+  unit: string;
+  decimalDigits: number;
+  deviceId: number;
+  serialNum: number;
+  isProcessData: boolean;
+  groupSerialNum: number;
+  groupParamSerialNum: number;
+  deviceParamCode: string;
+  deviceParamName: string;
+  groupName: string;
+}
+
+export interface AllDevicesList {
+  id: number;
+  createTime: string;
+  updateTime: string;
+  createUserId: number;
+  updateUserId: number;
+  deviceName: string;
+  groupId: number;
+  deviceType: number;
+  userId: number;
+  brand: number;
+  model: number;
+  modelType: number;
+  controlType: number;
+  compressionLevel: number;
+  voltageLevel: number;
+  powerRating: number;
+  powerUnload: number;
+  maximumFlow: number;
+  pressure: number;
+  pressureMax: number;
+  productionDate: string;
+  productionNum: string;
+  mainTechData: string;
+  mountedPosition: string;
+  department: string;
+  respPerson: string;
+  phone: string;
+  serviceLife: number;
+  status: number;
+  remarks: string;
+  deleted: number;
+  deviceNum: string;
+  runningStatus: string;
+}
+
+export interface GatewayQuery extends PageParams {
+  searchContent: string;
+  state: number;
+  total: number;
+}
+
+export interface GatewayLinkProtocolQuery {
+  linkId: number;
+  monitorType: string;
+  searchContent: string;
+}
+
+export interface DeviceBindQuery {
+  deviceParamGroups: DeviceParamGroups[];
+  deviceGateways: DeviceGateways[];
+  deviceParamGroupRels: DeviceParamGroupRels[];
+  protocolParamCustomDevDTOS: CustomParameters[];
+}
+
+export interface DeviceParamGroups {
+  groupName: string;
+  deviceId: number;
+  serialNum?: number;
+}
+
+export interface DeviceGateways {
+  deviceId: number;
+  gatewayId: number;
+  gatewayProtocolId: number;
+  linkId: number;
+}
+
+export interface DeviceParamGroupRels {
+  protocolParamId: number;
+  paramGroupName: string;
+  paramType: number;
+  deviceParamCode: string;
+  deviceParamName: string;
+  isProcessData: boolean;
+}
+
+export interface ParamValueListAutomaticQuery {
+  linkId: number;
+  deviceTypeId: number;
+}
+
+export interface ParamValueListAutomaticData {
+  id: number;
+  createTime: string;
+  updateTime: string;
+  createUserId: number;
+  updateUserId: number;
+  baseInfoId: number;
+  orgId: number;
+  recognizeResult: string;
+  candidateResults: string;
+  platformParamCode: string;
+  platformParamName: string;
+  gatewayParamCode: string;
+  gatewayParamName: string;
+  paramCode: string;
+  paramName: string;
+  unit: string;
+  module: string;
+  readWriteType: string;
+  readWriteTypeCode: string;
+  readFuncCode: string;
+  writeFuncCode: string;
+  registerAddr: string;
+  addrNumber: string;
+  registerType: string;
+  registerTypeCode: string;
+  parsingType: string;
+  parsingTypeCode: string;
+  addrLength: number;
+  wordLength: string;
+  wordLengthCode: string;
+  quantity: number;
+  coefficient: number;
+  isHighFreqParam: string;
+  isHighFreqParamCode: string;
+  readCalcFormula: string;
+  writeCalcFormula: string;
+  decimalPlace: number;
+  isDraft: string;
+}