space数据校验修改
This commit is contained in:
xiejunyu
+8
@@ -194,6 +194,14 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
|
||||
wrapper.in(DummyInventoryInfoEO::getDummyInventoryBaseId,ids);
|
||||
iDummyInventoryInfoEOService.remove(wrapper);
|
||||
|
||||
//关联删除虚拟清单保存的变动信息
|
||||
LambdaQueryWrapper<DummyContentChangeEO> connectLambdaQueryWrapper = new LambdaQueryWrapper<>();
|
||||
connectLambdaQueryWrapper.in(DummyContentChangeEO::getConnectId,ids);
|
||||
iDummyContentChangeEOService.remove(connectLambdaQueryWrapper);
|
||||
LambdaQueryWrapper<DummyContentChangeEO>pidQueryWrapper = new LambdaQueryWrapper<>();
|
||||
pidQueryWrapper.in(DummyContentChangeEO::getParentId,ids);
|
||||
iDummyContentChangeEOService.remove(pidQueryWrapper);
|
||||
|
||||
//关联删除虚拟清单log
|
||||
QueryWrapper<DummyLogEO> logEOQueryWrapper = new QueryWrapper<>();
|
||||
logEOQueryWrapper.in("dummy_inventory_base_id",ids);
|
||||
|
||||
+1
-2
@@ -195,10 +195,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
|
||||
taskPlanningQueryWrapper.eq("project_id",id);
|
||||
projectTaskPlanningService.remove(taskPlanningQueryWrapper);
|
||||
|
||||
//关联删除-法规清单log
|
||||
//关联删除-法规清单
|
||||
QueryWrapper<ProjectLawsInventoryEO> lawsInventoryEOQueryWrapper = new QueryWrapper<>();
|
||||
lawsInventoryEOQueryWrapper.eq("project_library_id ",id);
|
||||
|
||||
projectLawsInventoryEOService.remove(lawsInventoryEOQueryWrapper);
|
||||
|
||||
//关联删除-法规清单log
|
||||
|
||||
+19
-167
@@ -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<ProjectNameInfoEO> 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){//存在不同年款
|
||||
|
||||
Reference in New Issue
Block a user