From 55155a370b34e193a7d753402a26149710a3e206 Mon Sep 17 00:00:00 2001 From: wangzhongjie Date: Tue, 16 Sep 2025 15:48:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/api/judgeNew.ts | 66 ++++++++++++------- entry/src/main/ets/pages/UserInfo.ets | 2 +- .../judge/BoardPrePareSetPopup.ets | 10 +-- 3 files changed, 49 insertions(+), 29 deletions(-) diff --git a/entry/src/main/ets/api/judgeNew.ts b/entry/src/main/ets/api/judgeNew.ts index 9fac6e5d..58565964 100644 --- a/entry/src/main/ets/api/judgeNew.ts +++ b/entry/src/main/ets/api/judgeNew.ts @@ -1,8 +1,11 @@ import { getSyncData } from '../common/service/initable'; import request from "../common/utils/request" + let baseHost = globalThis.host; import FileUtil from '../common/utils/File'; import FileLog from '../pages/judgeSDK/utils/fileLog'; +import pasteboard from '@ohos.pasteboard'; +import Want from '@ohos.app.ability.Want'; //监管接口序列号映射 const gjxlhObj = { @@ -14,38 +17,43 @@ const gjxlhObj = { '17C56': '02-21-000014', } -interface WR{ - message?:string - code:number +interface WR { + message?: string + code: number } -export default async function writeObjectOutNew(data,filePath): Promise { +export default async function writeObjectOutNew(data, filePath, externalTransmission): Promise { const fileUtil = new FileUtil(globalThis.context); const {jkid , drvexam} = data; const basic = await getBasicConfig(jkid); const params = await getParams(jkid, drvexam); const {wglb,jkxlh,glbm,jgbh,sjbs} = basic; - if(filePath){ - await fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify({ - wglb,jkxlh,glbm,jgbh,sjbs, - data:params.data, - file:{...params.file,param:[]}, + if (filePath) { + await fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`, JSON.stringify({ + wglb, + jkxlh, + glbm, + jgbh, + sjbs, + data: params.data, + file: { + ...params.file, param: [] + }, })); } // let connectTimeout = sjbs === '02-21-000014' ?60000:1 - console.info('surenjun','调用新监管') + console.info('surenjun', '调用新监管') let temp - try { - temp = await request({ - host: globalThis.JGHOST, - method: 'post', - //是否是新中心 - isNewCenter: true, - xml: true, - url: '/dems_ws/services/TmriOutAccess?wsdl', - data: ` + let requestData = { + host: globalThis.JGHOST, + method: 'post', + //是否是新中心 + isNewCenter: true, + xml: true, + url: '/dems_ws/services/TmriOutAccess?wsdl', + data: ` { `, - }) + } + try { + if (!externalTransmission) { + temp = await request(requestData) + } else { + let systemPasteboard = pasteboard.getSystemPasteboard() + let pasteData = pasteboard.createData(pasteboard.MIMETYPE_TEXT_PLAIN, JSON.stringify(requestData)) + await systemPasteboard.clear() + await systemPasteboard.setData(pasteData) + + temp = { + code: 1 + } + } } catch (e) { console.log("新监管错误") temp = e } console.log("temp message: ", JSON.stringify(temp)) - if(filePath){ - await fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`,JSON.stringify(temp) +`\n`); + if (filePath) { + await fileUtil.editFile(`${filePath}/wuxi_exam_data.txt`, JSON.stringify(temp) + `\n`); } return temp - } export async function getParams(jkid, drvexam) { diff --git a/entry/src/main/ets/pages/UserInfo.ets b/entry/src/main/ets/pages/UserInfo.ets index 4c96617a..6990ee19 100644 --- a/entry/src/main/ets/pages/UserInfo.ets +++ b/entry/src/main/ets/pages/UserInfo.ets @@ -1094,7 +1094,7 @@ struct UserInfo { jkid: '17C51', } console.info('surenjunjianguan', JSON.stringify(param)) - const temp = await writeObjectOut(param); + const temp = await writeObjectOut(param,false); globalThis.lsh = this.currentUser.lsh globalThis.ksyh = this.currentUser.ksy1sfzmhm return temp diff --git a/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets b/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets index af91316a..69cfb085 100644 --- a/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets +++ b/entry/src/main/ets/pages/compontents/judge/BoardPrePareSetPopup.ets @@ -226,7 +226,7 @@ export default struct DeductedPopup { kssj: time }, } - const code = await writeObjectOut(beginData) + const code = await writeObjectOut(beginData,false) //TODO code待处理 // if (code == 1) { // @@ -257,7 +257,7 @@ export default struct DeductedPopup { ksdd: decodeURI(ksdd) } }; - const code = await writeObjectOut(photoData); + const code = await writeObjectOut(photoData,false); console.info('surenjun uploadProgressPhoto end',) } @@ -285,7 +285,7 @@ export default struct DeductedPopup { kfsj: time } } - const code = await writeObjectOut(kfData); + const code = await writeObjectOut(kfData,false); } // 项目结束 @@ -309,7 +309,7 @@ export default struct DeductedPopup { jssj: time } } - const code = await writeObjectOut(endProjectData); + const code = await writeObjectOut(endProjectData,false); } //考试结束 @@ -335,7 +335,7 @@ export default struct DeductedPopup { dwlc: '', } } - const code = await writeObjectOut(endData); + const code = await writeObjectOut(endData,false); } //获取sysset表数据