From c84a8a63ee32201c1ed3a841e9e2e08293a3a2b0 Mon Sep 17 00:00:00 2001 From: root <8964602+zxylbj@user.noreply.gitee.com> Date: Mon, 5 Jul 2021 14:57:15 +0800 Subject: [PATCH] =?UTF-8?q?fetch:=E6=9C=BA=E6=9E=84=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarInstitution/controller/TsInstitutionController.java | 6 ++++-- .../service/impl/TsInstitutionServiceImpl.java | 3 +-- .../mybatis/mapper/sarInstitution/TsInstitutionMapper.xml | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java index ff987ba2..9e0b7c01 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/controller/TsInstitutionController.java @@ -71,9 +71,11 @@ public class TsInstitutionController extends BaseController { @ApiOperation("导入机构数据") @PostMapping("/import") - public ResponseMessage importInstitution(Map param){ - String json= (String) param.get("json"); + public ResponseMessage importInstitution(){ + String json="{\"status\":\"true\",\"message\":\"成功\",\"cookie\":null,\"returnCode\":\"0\",\"results\":[{\"orgStatus\":\"1\",\"departmentName\":\"信息技术部\",\"orgType\":\"E1\",\"orgName\":\"信息技术部\",\"parentOrgNumber\":\"31000000\",\"orgShortName\":\"信息技术部\",\"orgNumber\":\"30002337\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225061931Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"研发工程系统部\",\"orgType\":\"E1\",\"orgName\":\"研发工程系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"研发工程系统部\",\"orgNumber\":\"40009091\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/研发工程系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"生产与质量系统部\",\"orgType\":\"E1\",\"orgName\":\"生产与质量系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"生产与质量系统部\",\"orgNumber\":\"40009092\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/生产与质量系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"营销与售后系统部\",\"orgType\":\"E1\",\"orgName\":\"营销与售后系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"营销与售后系统部\",\"orgNumber\":\"40009093\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/营销与售后系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"财务系统部\",\"orgType\":\"E1\",\"orgName\":\"财务系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"财务系统部\",\"orgNumber\":\"40009094\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/财务系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"协作系统部\",\"orgType\":\"E1\",\"orgName\":\"协作系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"协作系统部\",\"orgNumber\":\"40009095\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/协作系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20200219011044Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"大数据部\",\"orgType\":\"E1\",\"orgName\":\"大数据部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"大数据部\",\"orgNumber\":\"40009096\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/大数据部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"福田智科\",\"orgType\":\"E1\",\"orgName\":\"福田智科\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"福田智科\",\"orgNumber\":\"40009385\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075123Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"系统集成与测试部\",\"orgType\":\"E1\",\"orgName\":\"系统集成与测试部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"系统集成与测试部\",\"orgNumber\":\"40009386\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/系统集成与测试部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"应用开发部\",\"orgType\":\"E1\",\"orgName\":\"应用开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"应用开发部\",\"orgNumber\":\"40009387\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/应用开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"营销部\",\"orgType\":\"E1\",\"orgName\":\"营销部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"营销部\",\"orgNumber\":\"40009388\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/营销部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"服务部\",\"orgType\":\"E1\",\"orgName\":\"服务部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"服务部\",\"orgNumber\":\"40009389\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/服务部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"综合管理部\",\"orgType\":\"E1\",\"orgName\":\"综合管理部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"综合管理部\",\"orgNumber\":\"40009390\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/综合管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075122Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40009391\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062001Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"规划与管理部\",\"orgType\":\"E1\",\"orgName\":\"规划与管理部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"规划与管理部\",\"orgNumber\":\"40009425\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/规划与管理部\",\"order\":\"null\",\"modifyTimestamp\":\"20200211123206Z\"},{\"orgStatus\":\"0\",\"departmentName\":\"车联网平台开发部\",\"orgType\":\"E1\",\"orgName\":\"车联网平台开发部\",\"parentOrgNumber\":\"40009385\",\"orgShortName\":\"车联网平台开发部\",\"orgNumber\":\"40012865\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/福田智科/车联网平台开发部\",\"order\":\"null\",\"modifyTimestamp\":\"20200218075121Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"服务支持系统部\",\"orgType\":\"E1\",\"orgName\":\"服务支持系统部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"服务支持系统部\",\"orgNumber\":\"40012871\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/服务支持系统部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"信息安全部\",\"orgType\":\"E1\",\"orgName\":\"信息安全部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"信息安全部\",\"orgNumber\":\"40012872\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/信息安全部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT基础设施部\",\"orgType\":\"E1\",\"orgName\":\"IT基础设施部\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT基础设施部\",\"orgNumber\":\"40012873\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT基础设施部\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT开发中心\",\"orgType\":\"E1\",\"orgName\":\"IT开发中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT开发中心\",\"orgNumber\":\"40012874\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT开发中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062018Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"IT共享服务中心\",\"orgType\":\"E1\",\"orgName\":\"IT共享服务中心\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"IT共享服务中心\",\"orgNumber\":\"40013000\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/IT共享服务中心\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062019Z\"},{\"orgStatus\":\"1\",\"departmentName\":\"工业4.0推进办公室\",\"orgType\":\"E1\",\"orgName\":\"工业4.0推进办公室\",\"parentOrgNumber\":\"30002337\",\"orgShortName\":\"工业4.0推进办公室\",\"orgNumber\":\"40013294\",\"orgFullPath\":\"foton/福田汽车集团/FU/信息技术部/工业4.0推进办公室\",\"order\":\"null\",\"modifyTimestamp\":\"20191225062021Z\"}]}"; + tsInstitutionService.parseInstitution(json); return Result.success(); } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java index 34d82201..93dc8780 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarInstitution/service/impl/TsInstitutionServiceImpl.java @@ -41,7 +41,7 @@ public class TsInstitutionServiceImpl extends ServiceImpl getInstitution() { //查询第一层机构 QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); - institutionQueryWrapper.eq("level",1); + institutionQueryWrapper.isNull("parent_id").or().eq("parent_id",""); List institutionRoot=tsInstitutionDao.selectList(institutionQueryWrapper); for(TsInstitution tsInstitution:institutionRoot){ tsInstitution.setChildren(recursionGetInstitution(tsInstitution)); @@ -57,7 +57,6 @@ public class TsInstitutionServiceImpl extends ServiceImpl institutionObject=new ArrayList<>(); QueryWrapper institutionQueryWrapper=new QueryWrapper<>(); institutionQueryWrapper.eq("parent_id",tsInstitution.getId()); - institutionQueryWrapper.eq("level",tsInstitution.getLevel()+1); List tsInstitutions=tsInstitutionDao.selectList(institutionQueryWrapper); for(TsInstitution tsInstitutionNode:tsInstitutions){ tsInstitutionNode.setChildren(recursionGetInstitution(tsInstitutionNode)); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml index b914694b..de116e00 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarInstitution/TsInstitutionMapper.xml @@ -29,10 +29,9 @@ insert into ts_institution (id,name,parent_id) values - ( - #{id},#{name},#{parentId} + ( #{institution.id},#{institution.name},#{institution.parentId} ) - ) +