From 143ec1f17ad5051bbb238a5f181ddc6d1d605e0e Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Tue, 23 May 2023 17:42:59 +0800 Subject: [PATCH 1/2] update submodules --- backend/build.gradle | 5 +- backend/deployconfig.json | 9 +- backend/yjs/networking.yjs | 677 +++++++++++++++++++++---------------- backend/yjs/repodetail.yjs | 45 ++- backend/yjs/search.yjs | 164 ++++----- 5 files changed, 527 insertions(+), 373 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index deb5081..fea04ce 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -14,7 +14,7 @@ plugins { id 'java' id 'java-library' } -version = "1.3.92" +version = "1.3.93" group = 'org.bdware.sc.controlproxy' tasks.withType(JavaCompile) { @@ -104,7 +104,8 @@ task buildYPK(dependsOn: ["buildZip", "grepCP"]) { task deploy(dependsOn: ["buildYPK"]) { doLast { - org.bdware.ypkdeploy.HTTPTool.batchRun("./backend/deployconfig.json", true) + org.bdware.ypkdeploy.HTTPTool.deployWithYpk("./backend/deployconfig.json","./backend/build/ControlProxy-${project.version}.ypk") + //org.bdware.ypkdeploy.HTTPTool.batchRun("./backend/deployconfig.json", true) } } diff --git a/backend/deployconfig.json b/backend/deployconfig.json index a920cf3..a1a80e6 100644 --- a/backend/deployconfig.json +++ b/backend/deployconfig.json @@ -1,5 +1,5 @@ { - "host": "127.0.0.1", + "agentAddress": "39.104.209.178:18010", "privateKey": "d675782acf011dbc01a73c7967ccff9564486f7c3a9f5d5de151caffaa18936", "publicKey": "04303718771b9323c204e607639f14469f9a94e55b0964a408ad3b3864b0493b645d7070da0d550f0c54b934275a8e88dedc3024467b0566db5c1108b1baeaae27", "ypkPath": "/Users/huaqiancai/BDWare/datanet/ControlProxy/backend/build/ControlProxy-0.9.6.ypk", @@ -7,10 +7,9 @@ "createParam": { "privateKey": "4616ff0e2a4f982364914f9be30b51c6bc6ccb6602114a9ee8792f2ccf67465b", "publicKey": "04f9b9b8f324908464f78a6235e2dd93e4dfdaf045e9b1b5cfd57374516cc61a79a86fc2b42d3321a5b49a0f25381a7bed61901b40b729f72354e716673d551e98", - "prefix": "bdtest", + "prefix": "shanxi", "router": "GlobalRouter", - "routerURI": "tcp://127.0.0.1:18041", + "routerURI": "tcp://39.104.209.178:18041", "auditType": "OnlyHash" - }, - "agentPort": 18010 + } } \ No newline at end of file diff --git a/backend/yjs/networking.yjs b/backend/yjs/networking.yjs index a78eac8..3feff1b 100755 --- a/backend/yjs/networking.yjs +++ b/backend/yjs/networking.yjs @@ -1,302 +1,409 @@ //@范博 //以下接口都要给出示例参数 //类似于 @Descripton("参数为，{\"doId\":\"bdware.ss/Repox\"}") -module networking{ - //前缀管理用到的接口 listLRS updateLRS createLRS deleteLRS - export function getRouterInfo(arg){ - if (!checkPermission(requester)) { - YancloudUtil.exceptionReturn({"msg":"no permission","code":1}); +module networking { +//前缀管理用到的接口 listLRS updateLRS createLRS deleteLRS + export function getRouterInfo(arg) { + if (!checkPermission(requester)) { + YancloudUtil.exceptionReturn({ + "msg":"no permission", "code":1 + }); + } + var ret = executeContract(Global.router, "getRouterInfo", arg); + var obj = ret.result; + if (obj.result=="success" || obj.result == undefined) { + obj.result = undefined; + obj.code = 0; + } else { + YancloudUtil.exceptionReturn({ + "msg":obj.data, "code":1 + }); + } + obj.data.status = "online"; + obj.data.date-=1000*60*60*24*30*8; + obj.data.name = "山西广域数联网"; + return obj; } - var ret=executeContract(Global.router,"getRouterInfo",arg); - var obj = ret.result; - if (obj.result=="success" || obj.result == undefined) { - obj.result=undefined; - obj.code=0; - } else { - YancloudUtil.exceptionReturn({"msg":obj.data,"code":1}); - } - return obj; - } - export function listLRS(arg){ - if (!checkPermission(requester)) { - YancloudUtil.exceptionReturn({"msg":"no permission","code":1}); + export function listLRS(arg) { + if (!checkPermission(requester)) { + YancloudUtil.exceptionReturn({ + "msg":"no permission", "code":1 + }); + } + var ret = executeContract(Global.router, "listLRS", ""); + var obj = ret.result; + if (obj.result=="success" || obj.result == undefined) { + obj.result = undefined; + obj.code = 0; + } else { + YancloudUtil.exceptionReturn({ + "msg":obj.data, "code":1 + }); + } + for (var i = 0; + i总体情况概览 里面的“仓库数量”，“DO数量” ，“DO分布情况”三项。 - //可以增加一个参数用于过滤返回结果？比如模糊匹配上的就加到返回列表里。 - //str.contains(arg..) - //输入参数，doId，如bdware.txte/Repo - //返回结果：一个数组，里面是doId"contains"这个参数的列表。 +module SearchModule { +//获取DO的数量 该接口可以用于主页的DO数量 +//也可用于全领监管->总体情况概览 里面的“仓库数量”，“DO数量” ，“DO分布情况”三项。 +//可以增加一个参数用于过滤返回结果？比如模糊匹配上的就加到返回列表里。 +//str.contains(arg..) +//输入参数，doId，如bdware.txte/Repo +//返回结果：一个数组，里面是doId"contains"这个参数的列表。 - export function getAllRepoCount() { - return executeContract("Registry","getAllRepoCount",arg).result; + export function getAllRepoCount() { + return executeContract("Registry", "getAllRepoCount", arg).result; //return Global.allRepoCount; - } - export function getAllUserCount() { - return executeContract("Registry","getAllUserCount",arg).result; + } + export function getAllUserCount() { + return executeContract("Registry", "getAllUserCount", arg).result; //return Global.allRepoCount; - } - export function getAllSearchCount() { - return executeContract("Registry","getAllSearchCount",arg).result; + } + export function getAllSearchCount() { + return executeContract("Registry", "getAllSearchCount", arg).result; //return Global.allRepoCount; - } - export function getAllUpdateCount() { - return executeContract("Registry","getAllUpdateCount",arg).result; + } + export function getAllUpdateCount() { + return executeContract("Registry", "getAllUpdateCount", arg).result; //return Global.allRepoCount; - } - export function getAllDoCount() { - - return executeContract("Registry","getAllDoCount",arg).result; + } + export function getAllDoCount() { + return executeContract("Registry", "getAllDoCount", arg).result; //return Global.allRepoCount; - } - //不确定 - //{"open":51,"close":49} - export function getAllIndexCount() { - return executeContract("Registry","getAllIndexCount",arg).result; + } +//不确定 +//{"open":51,"close":49} + export function getAllIndexCount() { + return executeContract("Registry", "getAllIndexCount", arg).result; //return Global.allRepoCount; - } - export function getDoCount(arg){ - return executeContract("Registry","getDoCount",arg); + } + export function getDoCount(arg) { + var ret = executeContract("Registry", "getDoCount", arg); + if (arg.indexOf("shanxi/Repository")!=-1) + ret.result.data.push({ + "doId":"shanxi/Repository", "count":3 + }); + return ret.result; //return { //"data":[{ // "doId":"bdware.txte/Repo1","count":10} // ,{ // "doId":"bdware.txte/Repo2","count":12} // ]}; - } + } - export function testCount(arg){ - return {"data":"key"}; - } + export function testCount(arg) { + return { + "data":"key" + }; + } - //=====全域监管：数字对象溯源 针对单个DO的，通过SQL查询来实现。 - //根据 doId --> 找到“数字对象世系” - //86.500.1/Repo.1/Doab - //根据 doId+时间范围+interval+protocol --> 不同operation的统计数据 （AuditProxy) - //countDORecordByDate() - //{"doId":xxxx,"startTime","endTime","interval","eventPrefix":["doip_create","doip_update"]} - //{"eventxxx":[1,2,3],"event2":[1,2,3]} +//=====全域监管：数字对象溯源 针对单个DO的，通过SQL查询来实现。 +//根据 doId --> 找到“数字对象世系” +//86.500.1/Repo.1/Doab +//根据 doId+时间范围+interval+protocol --> 不同operation的统计数据 （AuditProxy) +//countDORecordByDate() +//{"doId":xxxx,"startTime","endTime","interval","eventPrefix":["doip_create","doip_update"]} +//{"eventxxx":[1,2,3],"event2":[1,2,3]} - //根据 doId +查找条件（时间范围 protocol operation user?) +offset/count -->总数+指定条数的数组（AuditProxy) - // queryDoRecordByDate - //{"doId":xxxx,"startTime","endTime","eventPrefix":["doip_create","doip_update"]} - //{"count":xx, "data":[{doip_request的某一行。},]} - // queryDoRecordByOffset - //{"doId":xxxx,"offset","count","eventPrefix":["doip_create","doip_update"]} - //{"total":xx,"count":xx, "data":[{doip_request的某一行。},]} - //============== +//根据 doId +查找条件（时间范围 protocol operation user?) +offset/count -->总数+指定条数的数组（AuditProxy) +// queryDoRecordByDate +//{"doId":xxxx,"startTime","endTime","eventPrefix":["doip_create","doip_update"]} +//{"count":xx, "data":[{doip_request的某一行。},]} +// queryDoRecordByOffset +//{"doId":xxxx,"offset","count","eventPrefix":["doip_create","doip_update"]} +//{"total":xx,"count":xx, "data":[{doip_request的某一行。},]} +//============== - //DO的元数据 - //{ - // "date": "...", - // "owner": "...", - // "type": "...", - // "description": "...", - // "schema": "...", - //} - //做成可以根据创建时间范围;标识模糊 - //{"type":"creatTime","count":10,"offset":"0","from":"1141363811328","to":"1941363811328"} - export function getDoFilter(arg){ - var res=executeContract("Registry","searchByRange",arg); - return res.result; - } +//DO的元数据 +//{ +// "date": "...", +// "owner": "...", +// "type": "...", +// "description": "...", +// "schema": "...", +//} +//做成可以根据创建时间范围;标识模糊 +//{"type":"creatTime","count":10,"offset":"0","from":"1141363811328","to":"1941363811328"} + export function getDoFilter(arg) { + var res = executeContract("Registry", "searchByRange", arg); + return res.result; + } - //支持模糊查询、按创建时间查询。 - //输入参数： - //type：要查询的字段 - //keyword:要查询的关键字 - //count：（可选项，缺省为20） - //offset：（可选项，缺省为0） - ////{"params":[{"type":"owner","keyword":"说明"},{"type":"doid","keyword":"aibd"}],"count":"10","offset":"0"} - //返回：{"data":[{},{},{}],"count":3} - @ArgSchema({"!params":[{"!type":"string","!keyword":"integer"}],"count":"integer","offset":"integer"}) - export function search(arg){ - arg = convertArgToJson(arg); - var res=executeContract("Registry","searchByMultiTag",arg); - return res.result; +//支持模糊查询、按创建时间查询。 +//输入参数： +//type：要查询的字段 +//keyword:要查询的关键字 +//count：（可选项，缺省为20） +//offset：（可选项，缺省为0） +////{"params":[{"type":"owner","keyword":"说明"},{"type":"doid","keyword":"aibd"}],"count":"10","offset":"0"} +//返回：{"data":[{},{},{}],"count":3} + @ArgSchema({ + "!params":[{ + "!type":"string", "!keyword":"integer" + }], "count":"integer", "offset":"integer" + }) + export function search(arg) { + arg = convertArgToJson(arg); + var res = executeContract("Registry", "searchByMultiTag", arg); + return res.result; //ret=[]; //ret.push({ @@ -107,5 +117,5 @@ module SearchModule{ // "doId":"bdware.ss/Repo1/Do.c","name":"数字对象c","meta":{},"owner":"zzz","createTime":1641875492715} // ); //return {"data":ret,"total":3}; - } + } } \ No newline at end of file From 4c895da128df6ed5f19bbf04ec986ef0f0bcb1c3 Mon Sep 17 00:00:00 2001 From: CaiHQ Date: Tue, 4 Jul 2023 10:49:09 +0800 Subject: [PATCH 2/2] patch repo --- backend/build.gradle | 2 +- backend/yjs/repodetail.yjs | 100 ++++++++++++++++++++----------------- backend/yjs/search.yjs | 72 ++++++++++++++++---------- backend/yjs/union.yjs | 6 +-- 4 files changed, 102 insertions(+), 78 deletions(-) diff --git a/backend/build.gradle b/backend/build.gradle index fea04ce..1aaeea3 100644 --- a/backend/build.gradle +++ b/backend/build.gradle @@ -14,7 +14,7 @@ plugins { id 'java' id 'java-library' } -version = "1.3.93" +version = "1.4.0" group = 'org.bdware.sc.controlproxy' tasks.withType(JavaCompile) { diff --git a/backend/yjs/repodetail.yjs b/backend/yjs/repodetail.yjs index 73ace32..d69acc4 100755 --- a/backend/yjs/repodetail.yjs +++ b/backend/yjs/repodetail.yjs @@ -5,48 +5,59 @@ module RepoDetail { //这是search engine的接口，为什么还没接上？？ //TODO TODO export function getDoList(arg) { - print("GetDOList==========="); - var ret = executeContract("Registry", "getDoList", arg); - if (arg.indexOf("shanxi/Repository")!=-1){ + if (arg.indexOf("shanxi/Repository") != - 1){ + var ret = { + }; + ret.result = { + }; var data = []; data.push({ - "createTime":1676481531275, "owner":"\"大同市人力资源和社会保障局\"", "type":"CSV", "description":"\"大同市人力资源和社会保障局2022年取证补贴资金统计表\"", "schema":"{\"序号\":\"number\",\"项目名称\":\"string\",\"高标准农田建设项目\":\"number\",\"高效节水灌溉措施\":\"number\",\"总计\":\"number\",\"财政资金\":\"number\",\"自筹资金\":\"number\",\"其他资金\":\"number\",\"高标准农田建设地点\":\"string\",\"高效节水灌溉建设地点\":\"string\"}", "doId":"shanxi/Repository/6ca5a5e3-f2b4-43c3-bdcd-280889bbd12f" + "createTime":1676481531275, "owner":"大同市人力资源和社会保障局", + "type":"CSV", + "description":"大同市人力资源和社会保障局2022年取证补贴资金统计表", + "schema":"{\"序号\":\"number\",\"项目名称\":\"string\",\"高标准农田建设项目\":\"number\",\"高效节水灌溉措施\":\"number\",\"总计\":\"number\",\"财政资金\":\"number\",\"自筹资金\":\"number\",\"其他资金\":\"number\",\"高标准农田建设地点\":\"string\",\"高效节水灌溉建设地点\":\"string\"}", + "doId":"shanxi/Repository/6ca5a5e3-f2b4-43c3-bdcd-280889bbd12f" }); data.push({ - "createTime":1676481514049, "owner":"\"大同市农业局\"", "type":"CSV", "description":"\"大同市2021年第二批拟建高标准农田项目情况表\"", "schema":"", "doId":"shanxi/Repository/a1838f08-56d4-45ca-a9c4-afaa389b4b14" + "createTime":1676481514049, + "owner":"大同市农业局", "type":"CSV", + "description":"大同市2021年第二批拟建高标准农田项目情况表", + "schema":"", + "doId":"shanxi/Repository/a1838f08-56d4-45ca-a9c4-afaa389b4b14" }); data.push({ - "createTime":1676553567486, "owner":"\"大同市卫生健康委员会\"", "type":"CSV", "description":"\"2021大同市新冠疫苗接种门诊公示.xlsx\"", "schema":"{\"接种单位名称\":\"string\",\"接种单位详细地址\":\"string\",\"所属县区\":\"string\",\"所属街道\":\"string\",\"详细地址（必填）\":\"string\",\"法定代表人姓名\":\"string\",\"科室负责人姓名\":\"string\",\"科室联系电话\":\"number\",\"接种时间\":\"string\"}", "doId":"shanxi/Repository/57fedf56-5155-4ff6-aabe-a998869f46b1" + "createTime":1676553567486, "owner":"大同市卫生健康委员会", "type":"CSV", "description":"2021大同市新冠疫苗接种门诊公示.xlsx", "schema":"{\"接种单位名称\":\"string\",\"接种单位详细地址\":\"string\",\"所属县区\":\"string\",\"所属街道\":\"string\",\"详细地址（必填）\":\"string\",\"法定代表人姓名\":\"string\",\"科室负责人姓名\":\"string\",\"科室联系电话\":\"number\",\"接种时间\":\"string\"}", "doId":"shanxi/Repository/57fedf56-5155-4ff6-aabe-a998869f46b1" }); data.push({ - "createTime":1676553952316, "owner":"\"大同市科学技术局\"", "type":"CSV", "description":"\"2022年大同市科技计划立项资金表.xls\"", "schema":"{\"计划编号\":\"string\",\"项目名称\":\"string\",\"承担单位\":\"string\",\"项目负责人\":\"string\",\"起止年限\":\"string\",\"下达资金\":\"string\"}", "doId":"shanxi/Repository/49fadb30-ef5a-440e-9c28-be1a8fd1cafc" + "createTime":1676553952316, "owner":"大同市科学技术局", "type":"CSV", "description":"2022年大同市科技计划立项资金表.xls", "schema":"{\"计划编号\":\"string\",\"项目名称\":\"string\",\"承担单位\":\"string\",\"项目负责人\":\"string\",\"起止年限\":\"string\",\"下达资金\":\"string\"}", "doId":"shanxi/Repository/49fadb30-ef5a-440e-9c28-be1a8fd1cafc" }); data.push({ - "createTime":1676554675160, "owner":"\"大同市人力资源和社会保障局\"", "type":"CSV", "description":"\"2022年度大同市市直企业职业技能提升部分培训补贴资金统计表（第一批)\"", "schema":"{\"企业名称\":\"string\",\"培训期号\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金\":\"string\",\"单位补贴汇总\":\"string\",\"备注\":\"string\"}", "doId":"shanxi/Repository/4780c075-4608-48a0-9083-6c0a9a7f4357" + "createTime":1676554675160, "owner":"大同市人力资源和社会保障局", "type":"CSV", "description":"2022年度大同市市直企业职业技能提升部分培训补贴资金统计表（第一批)", "schema":"{\"企业名称\":\"string\",\"培训期号\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金\":\"string\",\"单位补贴汇总\":\"string\",\"备注\":\"string\"}", "doId":"shanxi/Repository/4780c075-4608-48a0-9083-6c0a9a7f4357" }); data.push({ - "createTime":1676558013851, "owner":"\"大同市财政局\"", "type":"CSV", "description":"\"提前下达2023年财政衔接推进乡村振兴补助资金预算指标分配表.xls\"", "schema":"{\"市县名\":\"string\",\"合计\":\"number\",\"巩固拓展脱贫攻坚成果和乡村振兴支出方向\":\"number\",\"少数民族发展支出方向\":\"number\",\"以工代赈支出方向\":\"number\",\"欠发达国有农场巩固提升支出方向\":\"number\",\"欠发达国有林场巩固提升支出方向\":\"number\",\"备注\":\"string\"}", "doId":"shanxi/Repository/9dc89e94-eba0-4683-bbe8-b9da8994d1c1" + "createTime":1676558013851, "owner":"大同市财政局", "type":"CSV", "description":"提前下达2023年财政衔接推进乡村振兴补助资金预算指标分配表.xls", "schema":"{\"市县名\":\"string\",\"合计\":\"number\",\"巩固拓展脱贫攻坚成果和乡村振兴支出方向\":\"number\",\"少数民族发展支出方向\":\"number\",\"以工代赈支出方向\":\"number\",\"欠发达国有农场巩固提升支出方向\":\"number\",\"欠发达国有林场巩固提升支出方向\":\"number\",\"备注\":\"string\"}", "doId":"shanxi/Repository/9dc89e94-eba0-4683-bbe8-b9da8994d1c1" }); - data.push({"createTime":1676558051018,"owner":"\"大同市财政局\"","type":"CSV","description":"\"拟注销失业登记的公示名单\"","schema":"{\"姓名\":\"string\",\"身份证号\":\"string\"}","doId":"shanxi/Repository/8f74e220-5409-493a-a852-ecbe48734c31"}); - data.push({"createTime":1676558067499,"owner":"\"大同市卫生健康委\"","type":"CSV","description":"\"大同市中医医院2022年公开招聘编外聘用制工作人员岗位表\"","schema":"{\"招聘部门\":\"string\",\"招聘单位\":\"string\",\"招聘人数\":\"number\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/90dfcb72-fad8-4f70-b672-e79416fd60ff"}); - data.push({"createTime":1676558083728,"owner":"\"大同市卫生健康委\"","type":"CSV","description":"\"大同市中医医院2022年公开招聘编外聘用制工作人员岗位计划调整表.xls\"","schema":"{\"招聘单位\":\"string\",\"招聘岗位\":\"string\",\"岗位代码\":\"string\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"原招聘人数\":\"string\",\"调整情况\":\"string\",\"调整后招聘人数\":\"string\"}","doId":"shanxi/Repository/f56094c4-0a41-430d-865e-70ce142a43e5"}); - data.push({"createTime":1676558104281,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"大同市代表队参加第三届全省职业技能大赛赛前培训补贴资金统计表\"","schema":"{\"序号\":\"string\",\"选手派出单位\":\"string\",\"参赛项目\":\"string\",\"参赛选手人数\":\"string\",\"指导老师人数\":\"string\",\"裁判老师人数\":\"string\",\"裁判人数\":\"string\",\"补贴标准（元）\":\"string\",\"补贴金额（元）\":\"string\",\"补贴金额小计（元）\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/24e8d16f-ac53-4bdb-88b6-c7d9993e48cf"}); - data.push({"createTime":1676558121340,"owner":"\"大同市卫生健康委员会\"","type":"CSV","description":"\"大同市第四人民医院2022年公开招聘工作人员调整岗位计划表.xls\"","schema":"{\"招聘单位\":\"string\",\"招聘岗位\":\"string\",\"岗位代码\":\"string\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"原计划招聘人数\":\"string\",\"岗位变更情况\":\"string\",\"调整后招聘人数\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/ca7bb2d5-3e8b-4f90-a698-0c10afe41574"}); - data.push({"createTime":1676558261544,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"市直2020度创业培训补贴20%资金统计表\"","schema":"{\"培训单位，联系人、电话、地点\":\"string\",\"期数\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"合计人数\":\"string\",\"创业人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/21e4e085-aa88-40aa-b38e-6f1a00042141"}); - data.push({"createTime":1676558289718,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"市直2020度创业培训补贴20%资金统计表\"","schema":"{\"培训单位，联系人、电话、地点\":\"string\",\"期数\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"合计人数\":\"string\",\"创业人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/e8e5eefc-e481-4e47-8222-7eb9b7c824ae"}); - data.push({"createTime":1676558304736,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"全民技能提升工程部分培训补贴资金统计表\"","schema":"{\"培训地点\":\"string\",\"期数\":\"string\",\"培训专业\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"补贴人数\":\"string\",\"合计人数\":\"string\",\"补贴天数\":\"string\",\"培训补贴资金（元）\":\"string\",\"合计补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/1d003549-ab2e-4cfb-8810-4a6b03518581"}); - data.push({"createTime":1676558329896,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"就业创业补贴项目清单\"","schema":"{\"项目\":\"string\",\"名称\":\"string\",\"享受对象\":\"string\",\"申请资料\":\"string\",\"执行标准\":\"string\",\"享受期限\":\"string\",\"政策依据\":\"string\",\"受理机构\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/869482df-8d5d-49fc-8559-ce14206c991d"}); - data.push({"createTime":1676558352841,"owner":"\"大同市人力资源和社会保障局\"","type":"CSV","description":"\"惠民惠农“一卡通”政策清单公示\"","schema":"{\"序号\":\"string\",\"主管部门\":\"string\",\"补贴项目\":\"string\",\"政策级次\":\"string\",\"政策依据文件及文号\":\"string\",\"补贴对象\":\"string\",\"补助标准\":\"string\",\"申领流程\":\"string\",\"发放方式\":\"string\",\"发放时间\":\"string\",\"咨询电话\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/2949b9c7-b22b-46e5-8663-6d232471587e"}); - data.push({"createTime":1676558365787,"owner":"\"大同市科学技术局\"","type":"CSV","description":"\"2020年大同市重点实验室认定名单公示\"","schema":"{\"序号\":\"string\",\"项目名称\":\"string\",\"依托单位\":\"string\"}","doId":"shanxi/Repository/b35b17c9-acf3-4511-bc3d-5561cb861cb6"}); - data.push({"createTime":1676558388183,"owner":"\"大同市教育局\"","type":"CSV","description":"\"2022年大同市特岗教师招聘进入体检人员名单\"","schema":"{\"序号\":\"string\",\"地市\":\"string\",\"区县\":\"string\",\"学校\":\"string\",\"学段\":\"string\",\"学科\":\"string\",\"岗位数\":\"string\",\"笔试分数\":\"string\",\"姓名\":\"string\",\"性别\":\"string\",\"准考证号码\":\"string\",\"面试成绩\":\"string\",\"总成绩\":\"string\",\"是否进入体检\":\"string\"}","doId":"shanxi/Repository/41e32dd3-b231-4456-a814-186307d8157b"}); - + data.push({"createTime":1676558051018,"owner":"大同市财政局","type":"CSV","description":"拟注销失业登记的公示名单","schema":"{\"姓名\":\"string\",\"身份证号\":\"string\"}","doId":"shanxi/Repository/8f74e220-5409-493a-a852-ecbe48734c31"}); + data.push({"createTime":1676558067499,"owner":"大同市卫生健康委","type":"CSV","description":"大同市中医医院2022年公开招聘编外聘用制工作人员岗位表","schema":"{\"招聘部门\":\"string\",\"招聘单位\":\"string\",\"招聘人数\":\"number\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/90dfcb72-fad8-4f70-b672-e79416fd60ff"}); + data.push({"createTime":1676558083728,"owner":"大同市卫生健康委","type":"CSV","description":"大同市中医医院2022年公开招聘编外聘用制工作人员岗位计划调整表.xls","schema":"{\"招聘单位\":\"string\",\"招聘岗位\":\"string\",\"岗位代码\":\"string\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"原招聘人数\":\"string\",\"调整情况\":\"string\",\"调整后招聘人数\":\"string\"}","doId":"shanxi/Repository/f56094c4-0a41-430d-865e-70ce142a43e5"}); + data.push({"createTime":1676558104281,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"大同市代表队参加第三届全省职业技能大赛赛前培训补贴资金统计表","schema":"{\"序号\":\"string\",\"选手派出单位\":\"string\",\"参赛项目\":\"string\",\"参赛选手人数\":\"string\",\"指导老师人数\":\"string\",\"裁判老师人数\":\"string\",\"裁判人数\":\"string\",\"补贴标准（元）\":\"string\",\"补贴金额（元）\":\"string\",\"补贴金额小计（元）\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/24e8d16f-ac53-4bdb-88b6-c7d9993e48cf"}); + data.push({"createTime":1676558121340,"owner":"大同市卫生健康委员会","type":"CSV","description":"大同市第四人民医院2022年公开招聘工作人员调整岗位计划表.xls","schema":"{\"招聘单位\":\"string\",\"招聘岗位\":\"string\",\"岗位代码\":\"string\",\"年龄\":\"string\",\"学历\":\"string\",\"学位\":\"string\",\"专业\":\"string\",\"其它\":\"string\",\"原计划招聘人数\":\"string\",\"岗位变更情况\":\"string\",\"调整后招聘人数\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/ca7bb2d5-3e8b-4f90-a698-0c10afe41574"}); + data.push({"createTime":1676558261544,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"市直2020度创业培训补贴20%资金统计表","schema":"{\"培训单位，联系人、电话、地点\":\"string\",\"期数\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"合计人数\":\"string\",\"创业人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/21e4e085-aa88-40aa-b38e-6f1a00042141"}); + data.push({"createTime":1676558289718,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"市直2020度创业培训补贴20%资金统计表","schema":"{\"培训单位，联系人、电话、地点\":\"string\",\"期数\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"合计人数\":\"string\",\"创业人数\":\"string\",\"补贴人数\":\"string\",\"培训补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/e8e5eefc-e481-4e47-8222-7eb9b7c824ae"}); + data.push({"createTime":1676558304736,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"全民技能提升工程部分培训补贴资金统计表","schema":"{\"培训地点\":\"string\",\"期数\":\"string\",\"培训专业\":\"string\",\"培训时间\":\"string\",\"培训人数\":\"string\",\"合格人数\":\"string\",\"补贴人数\":\"string\",\"合计人数\":\"string\",\"补贴天数\":\"string\",\"培训补贴资金（元）\":\"string\",\"合计补贴资金（元）\":\"string\"}","doId":"shanxi/Repository/1d003549-ab2e-4cfb-8810-4a6b03518581"}); + data.push({"createTime":1676558329896,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"就业创业补贴项目清单","schema":"{\"项目\":\"string\",\"名称\":\"string\",\"享受对象\":\"string\",\"申请资料\":\"string\",\"执行标准\":\"string\",\"享受期限\":\"string\",\"政策依据\":\"string\",\"受理机构\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/869482df-8d5d-49fc-8559-ce14206c991d"}); + data.push({"createTime":1676558352841,"owner":"大同市人力资源和社会保障局","type":"CSV","description":"惠民惠农“一卡通”政策清单公示","schema":"{\"序号\":\"string\",\"主管部门\":\"string\",\"补贴项目\":\"string\",\"政策级次\":\"string\",\"政策依据文件及文号\":\"string\",\"补贴对象\":\"string\",\"补助标准\":\"string\",\"申领流程\":\"string\",\"发放方式\":\"string\",\"发放时间\":\"string\",\"咨询电话\":\"string\",\"备注\":\"string\"}","doId":"shanxi/Repository/2949b9c7-b22b-46e5-8663-6d232471587e"}); + data.push({"createTime":1676558365787,"owner":"大同市科学技术局","type":"CSV","description":"2020年大同市重点实验室认定名单公示","schema":"{\"序号\":\"string\",\"项目名称\":\"string\",\"依托单位\":\"string\"}","doId":"shanxi/Repository/b35b17c9-acf3-4511-bc3d-5561cb861cb6"}); + data.push({"createTime":1676558388183,"owner":"大同市教育局","type":"CSV","description":"2022年大同市特岗教师招聘进入体检人员名单","schema":"{\"序号\":\"string\",\"地市\":\"string\",\"区县\":\"string\",\"学校\":\"string\",\"学段\":\"string\",\"学科\":\"string\",\"岗位数\":\"string\",\"笔试分数\":\"string\",\"姓名\":\"string\",\"性别\":\"string\",\"准考证号码\":\"string\",\"面试成绩\":\"string\",\"总成绩\":\"string\",\"是否进入体检\":\"string\"}","doId":"shanxi/Repository/41e32dd3-b231-4456-a814-186307d8157b"}); ret.result.data = data; ret.result.total = data.length; + return ret; } - return ret.result; + + return "success"; } - export function getDoList2(arg) { + export function getDoList3(arg) { arg = convertArgToJson(arg); //if (arg.doId == null) // return { @@ -57,22 +68,20 @@ module RepoDetail { // "msg":"request to much!", "code":1 // }; var ret = []; - if (arg.count==undefined) arg.count = 10; - if (arg.offset==undefined) arg.offset = 0; - for (var i = arg.offset; - i