From 4dde90ee84b478d4f1eeaa7a31798484ce102759 Mon Sep 17 00:00:00 2001 From: xiejunyu Date: Tue, 14 Jun 2022 10:49:31 +0800 Subject: [PATCH] =?UTF-8?q?space=E6=95=B0=E6=8D=AE=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DummyInventoryBaseEOServiceImpl.java | 8 + .../impl/ProjectLibraryBaseServiceImpl.java | 3 +- .../modules/space/job/SpaceJobHandler.java | 186 ++---------------- 3 files changed, 28 insertions(+), 169 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java index 972700b6c..d087c27aa 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java @@ -194,6 +194,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl connectLambdaQueryWrapper = new LambdaQueryWrapper<>(); + connectLambdaQueryWrapper.in(DummyContentChangeEO::getConnectId,ids); + iDummyContentChangeEOService.remove(connectLambdaQueryWrapper); + LambdaQueryWrapperpidQueryWrapper = new LambdaQueryWrapper<>(); + pidQueryWrapper.in(DummyContentChangeEO::getParentId,ids); + iDummyContentChangeEOService.remove(pidQueryWrapper); + //关联删除虚拟清单log QueryWrapper logEOQueryWrapper = new QueryWrapper<>(); logEOQueryWrapper.in("dummy_inventory_base_id",ids); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 88d827fef..14ce2292c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -195,10 +195,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl lawsInventoryEOQueryWrapper = new QueryWrapper<>(); lawsInventoryEOQueryWrapper.eq("project_library_id ",id); - projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper); //关联删除-法规清单log diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java index 111f2f5e6..33560fecf 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/space/job/SpaceJobHandler.java @@ -36,172 +36,12 @@ public class SpaceJobHandler implements Job { @Autowired private ProjectYearNameInfoEOServiceImpl projectYearNameInfoEOService; - String jsonData = "{\n" + - " \"resultData\": [\n" + - " {\n" + - " \"modelCode\": \"ES8_00\",\n" + - " \"modelName\": \"ES8\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt1\",\n" + - " \"softwarePltName\": \"NT1\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f.e\",\n" + - " \"yearName\": \"G1.F.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_my2018\",\n" + - " \"yearName\": \"MY2018\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"FURY_00\",\n" + - " \"modelName\": \"FURY\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt1\",\n" + - " \"softwarePltName\": \"NT1\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.6\",\n" + - " \"yearName\": \"G1.6\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"FORCE_00\",\n" + - " \"modelName\": \"FORCE\",\n" + - " \"hardwarePltCode\": \"mhp_npb\",\n" + - " \"hardwarePltName\": \"NPB\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.2\",\n" + - " \"yearName\": \"G1.2\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.3\",\n" + - " \"yearName\": \"G1.3\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.f\",\n" + - " \"yearName\": \"G1.F\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.6\",\n" + - " \"yearName\": \"G1.6\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.5\",\n" + - " \"yearName\": \"G1.5\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"Gemini_00\",\n" + - " \"modelName\": \"Gemini\",\n" + - " \"hardwarePltCode\": \"mhp_npa\",\n" + - " \"hardwarePltName\": \"NPA\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " }\n" + - " ]\n" + - " },\n" + - " {\n" + - " \"modelCode\": \"Pegasus_00\",\n" + - " \"modelName\": \"Pegasus\",\n" + - " \"hardwarePltCode\": \"mhp_npc\",\n" + - " \"hardwarePltName\": \"NPC\",\n" + - " \"softwarePltCode\": \"msp_nt2\",\n" + - " \"softwarePltName\": \"NT2\",\n" + - " \"modelYearInfoList\": [\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1\",\n" + - " \"yearName\": \"G1.1\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_g1.1.e\",\n" + - " \"yearName\": \"G1.1.E\"\n" + - " },\n" + - " {\n" + - " \"yearCode\": \"mp_G1.1.RH\",\n" + - " \"yearName\": \"G1.1.RH\"\n" + - " }\n" + - " ]\n" + - " }\n" + - " ],\n" + - " \"resultCode\": \"WL-0000\",\n" + - " \"resultDesc\": \"Success\"\n" + - "}"; + @Override public void execute(JobExecutionContext context) throws JobExecutionException { -// String jsonData =""; + String jsonData =""; try { - - // jsonData = spaceService.getSign(); + jsonData = spaceService.getSign(); if(StringUtils.isNotBlank(jsonData)) { JSONObject result = (JSONObject) JSON.parse(jsonData); @@ -222,9 +62,19 @@ public class SpaceJobHandler implements Job { //校验重复:项目名,车型平台,数字平台 QueryWrapper nameInfoEOQueryWrapper = new QueryWrapper<>(); - nameInfoEOQueryWrapper.eq("project_name",modelName) - .eq("vehicle_platform",hardwarePltName) - .eq("digital_platform",softwarePltName); + + nameInfoEOQueryWrapper.eq("project_name",modelName); + if(StringUtils.isNotBlank(hardwarePltName)){ + nameInfoEOQueryWrapper.eq("vehicle_platform",hardwarePltName); + }else{ + nameInfoEOQueryWrapper.isNull("vehicle_platform"); + } + if(StringUtils.isNotBlank(softwarePltName)){ + nameInfoEOQueryWrapper.eq("digital_platform",softwarePltName); + }else{ + nameInfoEOQueryWrapper.isNull("digital_platform"); + } + Integer nameInfoEOSameCount = projectNameInfoEOMapper.selectCount(nameInfoEOQueryWrapper); if(nameInfoEOSameCount == 0) {//没有重复的,保存 @@ -273,7 +123,9 @@ public class SpaceJobHandler implements Job { //获得不同年款 for(String yearNameData : yearNameDataList) { - yearNameList.remove(yearNameData); + if (yearNameList.contains(yearNameData)) { + yearNameList.remove(yearNameData); + } } if(yearNameList.size()>0){//存在不同年款