Merge branch 'master' of http://47.109.37.87:3000/by2025/admin-vben5

apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/index.ts

@@ -59,3 +59,12 @@ export function groupUpdate(data: GroupForm) {
 export function groupRemove(id: ID | IDS) {
   return requestClient.deleteWithMsg<void>(`/Property/group/${id}`);
 }
+
+/**
+ * 获取节假日数据
+ * @param year
+ */
+export async function getHoliday(year: string) {
+  const response = await fetch(`https://timor.tech/api/holiday/year/${year}`);
+  return response.json();
+}

apps/web-antd/src/api/property/attendanceManagement/attendanceGroupSettings/model.d.ts

@@ -1,4 +1,4 @@
-import type { PageQuery, BaseEntity } from '#/api/common';
+import type {PageQuery, BaseEntity} from '#/api/common';
 
 export interface GroupVO {
   /**
@@ -63,7 +63,16 @@ export interface GroupQuery extends PageQuery {
   attendanceType?: number;
 
   /**
-    * 日期范围参数
-    */
+   * 日期范围参数
+   */
   params?: any;
 }
+
+/**
+ * 假期
+ */
+export interface Holiday {
+  holiday: boolean;
+  name: string;
+  date: string;
+}

apps/web-antd/src/api/property/costManagement/houseCharge/model.d.ts

@@ -58,6 +58,8 @@ export interface HouseChargeVO {
   costItemsVo: CostItemSettingVO;
 
   chargeStatus: string;
+
+  personId: string;
 }
 
 export interface HouseChargeForm extends BaseEntity {

apps/web-antd/src/api/sis/factory/index.ts

@@ -12,7 +12,7 @@ import { requestClient } from '#/api/request';
 * @returns 厂商管理列表
 */
 export function factoryList(params?: FactoryQuery) {
-  return requestClient.get<PageResult<FactoryVO>>('/property/factory/list', { params });
+  return requestClient.get<PageResult<FactoryVO>>('/sis/factory/list', { params });
 }
 
 /**
@@ -21,7 +21,7 @@ export function factoryList(params?: FactoryQuery) {
  * @returns 厂商管理列表
  */
 export function factoryExport(params?: FactoryQuery) {
-  return commonExport('/property/factory/export', params ?? {});
+  return commonExport('/sis/factory/export', params ?? {});
 }
 
 /**
@@ -30,7 +30,7 @@ export function factoryExport(params?: FactoryQuery) {
  * @returns 厂商管理详情
  */
 export function factoryInfo(id: ID) {
-  return requestClient.get<FactoryVO>(`/property/factory/${id}`);
+  return requestClient.get<FactoryVO>(`/sis/factory/${id}`);
 }
 
 /**
@@ -39,7 +39,7 @@ export function factoryInfo(id: ID) {
  * @returns void
  */
 export function factoryAdd(data: FactoryForm) {
-  return requestClient.postWithMsg<void>('/property/factory', data);
+  return requestClient.postWithMsg<void>('/sis/factory', data);
 }
 
 /**
@@ -48,7 +48,7 @@ export function factoryAdd(data: FactoryForm) {
  * @returns void
  */
 export function factoryUpdate(data: FactoryForm) {
-  return requestClient.putWithMsg<void>('/property/factory', data);
+  return requestClient.putWithMsg<void>('/sis/factory', data);
 }
 
 /**
@@ -57,5 +57,5 @@ export function factoryUpdate(data: FactoryForm) {
  * @returns void
  */
 export function factoryRemove(id: ID | IDS) {
-  return requestClient.deleteWithMsg<void>(`/property/factory/${id}`);
+  return requestClient.deleteWithMsg<void>(`/sis/factory/${id}`);
 }

apps/web-antd/src/api/sis/stream/index.ts

@@ -0,0 +1,13 @@
+import type { AddStreamProxyResult } from './model';
+import { requestClient } from '#/api/request';
+
+/**
+ * 添加拉流代理，如果成功会返回可播放的视频流地址
+ * @param params
+ * @returns 人像信息列表
+ */
+export function addStreamProxy(params?: any) {
+  return requestClient.post<AddStreamProxyResult>('sis/stream//realtime/add', {
+    params,
+  });
+}

apps/web-antd/src/api/sis/stream/model.d.ts

@@ -0,0 +1,22 @@
+export interface AddStreamProxyResult {
+  key:string;
+  rtsp:string;
+  rtmp:string;
+  flv:string;
+  wsFlv:string;
+  mp4:string;
+  hls:string;
+}
+
+export interface AddStreamProxyQuery {
+  videoIp:string;
+  videoPort:number;
+  factoryNo:string;
+  account:string;
+  pwd:string;
+  channelId:string;
+  startTime:string;
+  endTime:string;
+  stream:string;
+
+}