From b506a879804357b4e3764e043399bf60d18b8ce4 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 7 Mar 2025 15:22:17 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetAppController.java | 10 +- .../tc/controller/AssetCurrentController.java | 370 ++++-- .../tc/controller/AssetEmailController.java | 10 +- .../AssetMiniProgramsController.java | 17 +- .../AssetOfficialAccountController.java | 11 +- .../java/com/ruoyi/tc/entity/AssetTask.java | 2 + .../tc/entity/dto/AssetCurrentCpDto.java | 1073 +++++++++++++++++ 7 files changed, 1351 insertions(+), 142 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java index 11d4d50..319cca0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java @@ -167,8 +167,14 @@ public class AssetAppController extends BaseController { AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId()); AssetApp aa = new AssetApp(); BeanUtil.copyProperties(byId, aa); - aa.setId(byId.getAssetId()); - assetAppService.save(aa); + if (byId.getAssetId()==null){ + assetAppService.save(aa); + }else { + assetAppService.updateById(aa); + } + //修改子表重的资产id + byId.setAssetId(aa.getId()); + assetAppJyService.updateById(byId); //任务同步 taskTb(byId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java index 92f1789..67b8823 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java @@ -144,9 +144,8 @@ public class AssetCurrentController extends BaseController { */ @ApiOperation(value = "新增数据") @PostMapping - @PreAuthorize("@ss.hasAnyRoles('admin,common')") @Transactional(rollbackFor = Exception.class) - public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) { + public AjaxResult insert(@RequestBody AssetCurrent assetCurrent) { if (assetCurrent.getXzType() == 1) { List list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list(); if (list == null || list.isEmpty()) { @@ -163,6 +162,7 @@ public class AssetCurrentController extends BaseController { BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo); assetCurrentCpPo.setAuditState("1"); assetCurrentCpPo.setXzType(1); + assetCurrentCpPo.setId(null); assetCurrentCpService.save(assetCurrentCpPo); //新增新监管业务形态 //根据资产id查询新监管业务形态主表id @@ -193,8 +193,6 @@ public class AssetCurrentController extends BaseController { } } else { - - List list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list(); if (list == null || list.isEmpty()) { throw new ServiceException("请选择已有单位!"); @@ -340,7 +338,6 @@ public class AssetCurrentController extends BaseController { if (one != null) { assetCurrentJyPo.setCurrentId(one.getCurrentId()); assetCurrentJyService.updateById(assetCurrentJyPo); - QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("asset_id", assetCurrentJyPo.getId()); queryWrapper2.isNull("task_id"); @@ -384,9 +381,27 @@ public class AssetCurrentController extends BaseController { } } else { + AssetCurrentJyPo two = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc()).eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).one(); AssetCurrentCpPo acc = new AssetCurrentCpPo(); BeanUtil.copyProperties(assetCurrentJyPo, acc); - assetCurrentCpService.save(acc); + acc.setCurrentId(two.getCurrentId()); + assetCurrentCpService.updateById(acc); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("asset_id", assetCurrentJyPo.getId()); + queryWrapper2.eq("task_id", two.getTaskId()); + assetSupplyChainJyService.remove(queryWrapper2); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.eq("asset_id", assetCurrentJyPo.getId()); + queryWrapper2.eq("task_id", two.getTaskId()); + assetBasicNetworkJyService.remove(queryWrapper3); + QueryWrapper queryWrapper4 = new QueryWrapper<>(); + queryWrapper4.eq("asset_id", assetCurrentJyPo.getId()); + queryWrapper2.eq("task_id", two.getTaskId()); + assetBusinessFormJyService.remove(queryWrapper4); + QueryWrapper queryWrapper5 = new QueryWrapper<>(); + queryWrapper2.eq("task_id", two.getTaskId()); + queryWrapper5.eq("asset_id", assetCurrentJyPo.getId()); + unitOtherConcatJyservice.remove(queryWrapper5); if (acc.getXjgywxt() != null) { acc.getXjgywxt().setAssetId(acc.getId()); assetBusinessFormCpService.save(acc.getXjgywxt()); @@ -446,10 +461,28 @@ public class AssetCurrentController extends BaseController { @GetMapping("/lookInfo/{id}") public AjaxResult lookInfo(@PathVariable Long id) { AssetCurrentCpPo byId = assetCurrentCpService.getById(id); - byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list()); - byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list()); - byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).one()); - byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list()); + if (byId.getId() != null) { + byId.setGylxxList(assetSupplyChainCpService + .lambdaQuery() + .eq(AssetSupplyChainCpPo::getAssetId, byId.getId()) + .isNull(AssetSupplyChainCpPo::getTaskId) + .list()); + byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list()); + byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).one()); + byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list()); + } else { + byId.setGylxxList(assetSupplyChainCpService + .lambdaQuery() + .eq(AssetSupplyChainCpPo::getCreateBy, byId.getDwmc()) + .isNull(AssetSupplyChainCpPo::getAssetId) // 或者根据实际逻辑选择其他条件 + .isNull(AssetSupplyChainCpPo::getTaskId) + .list()); + byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getCreateBy, byId.getDwmc()).isNull(AssetBasicNetworkCpPo::getAssetId).isNull(AssetBasicNetworkCpPo::getTaskId).list()); + byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getCreateBy, byId.getDwmc()).isNull(AssetBusinessFormCpPo::getAssetId).isNull(AssetBusinessFormCpPo::getTaskId).one()); + byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getCreateBy, byId.getDwmc()).isNull(UnitOtherConcatCpPo::getAssetId).isNull(UnitOtherConcatCpPo::getTaskId).list()); + } + + List a1 = new ArrayList<>(); if (byId.getGlym() != null) { Arrays.asList(byId.getGlym().split(",")).forEach(x -> { @@ -507,143 +540,222 @@ public class AssetCurrentController extends BaseController { assetCurrentCpService.updateById(ass); //通过数据同步 if ("2".equals(as.getAuditState()) && as.getXzType() != 1) { + //管理端填报 AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId()); AssetCurrent assetCurrent = new AssetCurrent(); BeanUtil.copyProperties(byId, assetCurrent); //修改主表 assetCurrentService.updateById(assetCurrent); //删除副表数据然后再添加 - Result result = getResult(assetCurrent, byId); - //如果有任务也修改任务这边 - taskTb(byId, result.list, result.list1, result.list2, result.list3); - } else { - AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId()); - AssetCurrent assetCurrent = new AssetCurrent(); - BeanUtil.copyProperties(byId, assetCurrent); - //修改主表 - assetCurrentService.save(assetCurrent); - //删除副表数据然后再添加 - Result result = getResult(assetCurrent, byId); - //如果有任务也修改任务这边 - taskTb(byId, result.list, result.list1, result.list2, result.list3); - } - return success(); - } - - private Result getResult(AssetCurrent assetCurrent, AssetCurrentCpPo byId) { - assetSupplyChainService.deleteByAssetIds(assetCurrent.getId()); - assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId()); - assetBusinessFormService.deleteByAssetIds(assetCurrent.getId()); - unitOtherConcatService.deleteByAssetIds(assetCurrent.getId()); - - List list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list(); - list.forEach(x -> { - AssetSupplyChain a1 = new AssetSupplyChain(); - BeanUtil.copyProperties(x, a1); - assetSupplyChainService.save(a1); - }); - - List list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list(); - list1.forEach(x -> { - AssetBasicNetwork a2 = new AssetBasicNetwork(); - BeanUtil.copyProperties(x, a2); - assetBasicNetworkService.save(a2); - }); - - List list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).list(); - list2.forEach(x -> { - AssetBusinessForm a3 = new AssetBusinessForm(); - BeanUtil.copyProperties(x, a3); - assetBusinessFormService.save(a3); - }); - - List list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list(); - list3.forEach(x -> { - UnitOtherConcat a4 = new UnitOtherConcat(); - BeanUtil.copyProperties(x, a4); - unitOtherConcatService.save(a4); - }); - Result result = new Result(list, list1, list2, list3); - return result; - } + assetSupplyChainService.deleteByAssetIds(assetCurrent.getId()); + assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId()); + assetBusinessFormService.deleteByAssetIds(assetCurrent.getId()); + unitOtherConcatService.deleteByAssetIds(assetCurrent.getId()); - private static class Result { - public final List list; - public final List list1; - public final List list2; - public final List list3; - - public Result(List list, List list1, List list2, List list3) { - this.list = list; - this.list1 = list1; - this.list2 = list2; - this.list3 = list3; - } - } - - private void taskTb(AssetCurrentCpPo byId, List list, List list1, List list2, List list3) { - AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery().isNotNull(AssetCurrentCpPo::getTaskId).ne(AssetCurrentCpPo::getStatus, 5).eq(AssetCurrentCpPo::getId, byId.getId()).one(); - if (one != null) { - Integer taskId = one.getTaskId(); - Long appId = one.getCurrentId(); - Integer status = one.getStatus(); - BeanUtil.copyProperties(byId, one); - one.setCurrentId(appId); - one.setTaskId(taskId); - one.setAuditState(null); - one.setAuditYy(null); - one.setStatus(status); - assetCurrentCpService.updateById(one); - - QueryWrapper queryWrapper2 = new QueryWrapper<>(); - queryWrapper2.eq("asset_id", one.getId()); - queryWrapper2.eq("task_id", taskId); - assetSupplyChainCpService.remove(queryWrapper2); - QueryWrapper queryWrapper3 = new QueryWrapper<>(); - queryWrapper3.eq("asset_id", one.getId()); - queryWrapper3.eq("task_id", taskId); - assetBasicNetworkCpService.remove(queryWrapper3); - QueryWrapper queryWrapper4 = new QueryWrapper<>(); - queryWrapper4.eq("asset_id", one.getId()); - queryWrapper4.eq("task_id", taskId); - assetBusinessFormCpService.remove(queryWrapper4); - QueryWrapper queryWrapper5 = new QueryWrapper<>(); - queryWrapper5.eq("task_id", taskId); - queryWrapper5.eq("asset_id", one.getId()); - unitOtherConcatCpService.remove(queryWrapper5); + List list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list(); list.forEach(x -> { - x.setTaskId(taskId); - assetSupplyChainCpService.save(x); + AssetSupplyChain a1 = new AssetSupplyChain(); + BeanUtil.copyProperties(x, a1); + assetSupplyChainService.save(a1); }); + + List list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list(); list1.forEach(x -> { - x.setTaskId(taskId); - assetBasicNetworkCpService.save(x); + AssetBasicNetwork a2 = new AssetBasicNetwork(); + BeanUtil.copyProperties(x, a2); + assetBasicNetworkService.save(a2); }); + + List list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).list(); list2.forEach(x -> { - x.setTaskId(taskId); - assetBusinessFormCpService.save(x); + AssetBusinessForm a3 = new AssetBusinessForm(); + BeanUtil.copyProperties(x, a3); + assetBusinessFormService.save(a3); }); + + List list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list(); list3.forEach(x -> { - x.setTaskId(taskId); - unitOtherConcatCpService.save(x); + UnitOtherConcat a4 = new UnitOtherConcat(); + BeanUtil.copyProperties(x, a4); + unitOtherConcatService.save(a4); }); - } - } + //如果有任务也修改任务这边 + AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery().isNotNull(AssetCurrentCpPo::getTaskId).ne(AssetCurrentCpPo::getStatus, 5).eq(AssetCurrentCpPo::getId, byId.getId()).one(); + if (one != null) { + Integer taskId = one.getTaskId(); + Long appId = one.getCurrentId(); + Integer status = one.getStatus(); + BeanUtil.copyProperties(byId, one); + one.setCurrentId(appId); + one.setTaskId(taskId); + one.setAuditState(null); + one.setAuditYy(null); + one.setStatus(status); + assetCurrentCpService.updateById(one); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("asset_id", one.getId()); + queryWrapper2.eq("task_id", taskId); + assetSupplyChainCpService.remove(queryWrapper2); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.eq("asset_id", one.getId()); + queryWrapper3.eq("task_id", taskId); + assetBasicNetworkCpService.remove(queryWrapper3); + QueryWrapper queryWrapper4 = new QueryWrapper<>(); + queryWrapper4.eq("asset_id", one.getId()); + queryWrapper4.eq("task_id", taskId); + assetBusinessFormCpService.remove(queryWrapper4); + QueryWrapper queryWrapper5 = new QueryWrapper<>(); + queryWrapper5.eq("task_id", taskId); + queryWrapper5.eq("asset_id", one.getId()); + unitOtherConcatCpService.remove(queryWrapper5); + list.forEach(x -> { + x.setTaskId(taskId); + assetSupplyChainCpService.save(x); + }); + list1.forEach(x -> { + x.setTaskId(taskId); + assetBasicNetworkCpService.save(x); + }); + list2.forEach(x -> { + x.setTaskId(taskId); + assetBusinessFormCpService.save(x); + }); + list3.forEach(x -> { + x.setTaskId(taskId); + unitOtherConcatCpService.save(x); + }); + } + } else if ("2".equals(as.getAuditState())) { + + //单位端填报 + AssetCurrentCpPo byId = assetCurrentCpService + .lambdaQuery() + .isNull(AssetCurrentCpPo::getId) + .one(); + + if (byId == null) { + //新增资产修改 + AssetCurrentCpPo finalById = assetCurrentCpService + .lambdaQuery() + .eq(AssetCurrentCpPo::getCurrentId, as.getCurrentId()) + .one(); + //查询该单位下是否有任务 + AssetTask assetTask = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, finalById.getCreateBy()).eq(AssetTask::getTaskStatus, 1).one(); + Integer taskId; + if (assetTask != null) { + taskId = assetTask.getId(); + } else { + taskId = null; + } + AssetCurrent assetCurrent = new AssetCurrent(); + BeanUtil.copyProperties(finalById, assetCurrent); + //修改主表 + assetCurrentService.updateById(assetCurrent); + //修改子表重的资产id + finalById.setTaskId(taskId); + assetCurrentCpService.updateById(finalById); + + List list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, finalById.getId()).list(); + list.forEach(x -> { + AssetSupplyChain a1 = new AssetSupplyChain(); + BeanUtil.copyProperties(x, a1); + x.setTaskId(taskId); + assetSupplyChainCpService.updateById(x); + assetSupplyChainService.updateById(a1); + }); + + List list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, finalById.getId()).list(); + list1.forEach(x -> { + AssetBasicNetwork a2 = new AssetBasicNetwork(); + BeanUtil.copyProperties(x, a2); + x.setTaskId(taskId); + assetBasicNetworkCpService.updateById(x); + assetBasicNetworkService.updateById(a2); + }); + + List list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, finalById.getId()).list(); + list2.forEach(x -> { + AssetBusinessForm a3 = new AssetBusinessForm(); + BeanUtil.copyProperties(x, a3); + x.setTaskId(taskId); + assetBusinessFormCpService.updateById(x); + assetBusinessFormService.updateById(a3); + }); + + List list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, finalById.getId()).list(); + list3.forEach(x -> { + UnitOtherConcat a4 = new UnitOtherConcat(); + BeanUtil.copyProperties(x, a4); + x.setTaskId(taskId); + unitOtherConcatCpService.updateById(x); + unitOtherConcatService.updateById(a4); + }); + + } else { + //查询该单位下是否有任务 + AssetTask assetTask = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, byId.getCreateBy()).eq(AssetTask::getTaskStatus, 1).one(); + Integer taskId; + if (assetTask != null) { + taskId = assetTask.getId(); + } else { + taskId = null; + } + //新增资产 + AssetCurrent assetCurrent = new AssetCurrent(); + BeanUtil.copyProperties(byId, assetCurrent); + assetCurrentService.save(assetCurrent); + //修改子表重的资产id + byId.setId(assetCurrent.getId()); + byId.setTaskId(taskId); + assetCurrentCpService.updateById(byId); + List list = assetSupplyChainCpService.lambdaQuery().isNull(AssetSupplyChainCpPo::getAssetId).isNull(AssetSupplyChainCpPo::getTaskId).list(); + list.forEach(x -> { + AssetSupplyChain a1 = new AssetSupplyChain(); + BeanUtil.copyProperties(x, a1); + a1.setAssetId(byId.getId()); + x.setAssetId(byId.getId()); + x.setTaskId(taskId); + assetSupplyChainCpService.updateById(x); + assetSupplyChainService.save(a1); + }); + + List list1 = assetBasicNetworkCpService.lambdaQuery().isNull(AssetBasicNetworkCpPo::getAssetId).isNull(AssetBasicNetworkCpPo::getTaskId).list(); + list1.forEach(x -> { + AssetBasicNetwork a2 = new AssetBasicNetwork(); + BeanUtil.copyProperties(x, a2); + a2.setAssetId(byId.getId()); + x.setAssetId(byId.getId()); + x.setTaskId(taskId); + assetBasicNetworkCpService.updateById(x); + assetBasicNetworkService.save(a2); + }); + List list2 = assetBusinessFormCpService.lambdaQuery().isNull(AssetBusinessFormCpPo::getAssetId).isNull(AssetBusinessFormCpPo::getTaskId).list(); + list2.forEach(x -> { + AssetBusinessForm a3 = new AssetBusinessForm(); + BeanUtil.copyProperties(x, a3); + a3.setAssetId(byId.getId()); + x.setAssetId(byId.getId()); + x.setTaskId(taskId); + assetBusinessFormCpService.updateById(x); + assetBusinessFormService.save(a3); + }); + + List list3 = unitOtherConcatCpService.lambdaQuery().isNull(UnitOtherConcatCpPo::getAssetId).isNull(UnitOtherConcatCpPo::getTaskId).list(); + list3.forEach(x -> { + UnitOtherConcat a4 = new UnitOtherConcat(); + BeanUtil.copyProperties(x, a4); + a4.setAssetId(byId.getId()); + x.setAssetId(byId.getId()); + x.setTaskId(taskId); + unitOtherConcatCpService.updateById(x); + unitOtherConcatService.save(a4); + }); + + } - private static class deleteFb { - public final List list; - public final List list1; - public final List list2; - public final List list3; - - public deleteFb(List list, List list1, List list2, List list3) { - this.list = list; - this.list1 = list1; - this.list2 = list2; - this.list3 = list3; } + return success(); } - //================================================= /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java index da0d2a7..9e5acdd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java @@ -175,8 +175,14 @@ public class AssetEmailController extends BaseController { AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId()); AssetEmail aa = new AssetEmail(); BeanUtil.copyProperties(byId, aa); - aa.setId(byId.getAssetId()); - assetEmailService.save(aa); + if (byId.getAssetId()==null){ + assetEmailService.save(aa); + }else { + assetEmailService.updateById(aa); + } + //修改子表重的资产id + byId.setAssetId(aa.getId()); + assetEmailJyService.updateById(byId); //任务同步 taskTb(byId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java index bcd669e..af0bf93 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java @@ -161,7 +161,7 @@ public class AssetMiniProgramsController extends BaseController { ass.setMiniId(as.getCurrentId()); assetMiniProgramsJyService.updateById(ass); //通过数据同步 - if ("2".equals(as.getAuditState()) && as.getXzType()!=1) { + if ("2".equals(as.getAuditState()) && as.getXzType() != 1) { AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId()); AssetMiniPrograms aa = new AssetMiniPrograms(); BeanUtil.copyProperties(byId, aa); @@ -170,12 +170,19 @@ public class AssetMiniProgramsController extends BaseController { assetMiniProgramsService.updateById(aa); //任务同步 taskTb(byId); - }else { + } else { AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId()); AssetMiniPrograms aa = new AssetMiniPrograms(); BeanUtil.copyProperties(byId, aa); - aa.setId(byId.getAssetId()); - assetMiniProgramsService.save(aa); + if (byId.getAssetId()==null){ + assetMiniProgramsService.save(aa); + }else { + assetMiniProgramsService.updateById(aa); + } + + //修改子表重的资产id + byId.setAssetId(aa.getId()); + assetMiniProgramsJyService.updateById(byId); //任务同步 taskTb(byId); } @@ -241,8 +248,6 @@ public class AssetMiniProgramsController extends BaseController { } - - /** * 编辑小程序数据 * diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java index 9ef73d2..e1ee4ea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java @@ -248,9 +248,14 @@ public class AssetOfficialAccountController { AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId()); AssetOfficialAccount aa = new AssetOfficialAccount(); BeanUtil.copyProperties(byId, aa); - aa.setId(byId.getAssetId()); - //修改主表 - assetOfficialAccountService.save(aa); + if (byId.getAssetId()==null){ + assetOfficialAccountService.save(aa); + }else { + assetOfficialAccountService.updateById(aa); + } + //修改子表重的资产id + byId.setAssetId(aa.getId()); + assetOfficialAccountJyService.updateById(byId); //任务同步 taskTb(byId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java index cc5a3f8..e37cdc6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java @@ -1,5 +1,6 @@ package com.ruoyi.tc.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,6 +29,7 @@ public class AssetTask implements Serializable { * 任务编号 */ @ApiModelProperty("任务编号") + @TableField(exist = false) private String taskId; /** * 任务名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java new file mode 100644 index 0000000..c397a0d --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java @@ -0,0 +1,1073 @@ +package com.ruoyi.tc.entity.dto; + +import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.entity.AssetBasicNetwork; +import com.ruoyi.tc.entity.AssetBusinessForm; +import com.ruoyi.tc.entity.AssetSupplyChain; +import com.ruoyi.tc.entity.UnitOtherConcat; +import com.ruoyi.tc.entity.request.Acomma; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Size; +import java.util.Date; +import java.util.List; + +/** + * @author dong + * @since 2025/3/6 11:09 + */ +@Data + +@TableName(value = "asset_current_cp") +public class AssetCurrentCpDto { + + /** + * 主键id + */ + + @TableId(type = IdType.AUTO, value = "current_id") + private Long currentId; + + + @TableId(value = "id") + @ApiModelProperty("资产id") + private Long assetId; + /** + * 系统名称 + */ + @NotBlank + @Size(max = 100, message = "系统名称长度不能超过100") + @ApiModelProperty("系统名称") + @Excel(name = "*系统名称", sort = 2, width = 40, required = true) + private String xtmc; + + + /** + * 建设(运营)单位: + */ + @ApiModelProperty("建设(运营)单位") + private String jsyydw; + + + /** + * DNS: + */ + @ApiModelProperty("DNS") + private String dns; + + /** + * 是否自建互联网专线ip + */ + @ApiModelProperty("是否自建互联网专线ip") + private String isZjhlwip; + + @ApiModelProperty("组织机构名称（部门名称）") + @TableField(exist = false) + private String deptName; + + /** + * 单位名称 + */ + @NotBlank + @Size(max = 50, message = "单位名称长度不能超过50") + @ApiModelProperty("单位名称") + @Excel(name = "*单位名称", sort = 1, width = 40, required = true) + private String dwmc; + /** + * 系统域名 + */ + @Size(max = 50, message = "系统域名长度不能超过50") + @ApiModelProperty("系统域名") + @Excel(name = "域名", sort = 3) + private String xtym; + + @Excel(name = "访问网址-协议类型", sort = 13, width = 26, dictType = "fwwzXylx", comboReadDict = true) + @ApiModelProperty("访问网址-协议类型") +// @TableField(exist = false) + private String fwwzXylx; + /** + * 0 + * 访问网址 + */ + @Excel(name = "访问网址", sort = 14) + @Size(max = 50, message = "访问网址长度不能超过50") + @ApiModelProperty("访问网址") + private String fwwz; + /** + * IPport-IP地址 + */ + //@NotBlank + @Size(max = 50, message = "IPport-IP地址长度不能超过50") + @ApiModelProperty("IPport-IP地址") + @Excel(name = "*ipv4", sort = 4) + private String ipAddress; + /** + * IPport-端口 + */ + //@NotBlank + @Excel(name = "*端口", sort = 5) + @Size(max = 50, message = "IPport-端口不能超过50") + @ApiModelProperty("IPport-端口") + private String ipPort; + /** + * 域名到期时间 + */ + @ApiModelProperty("域名到期时间") + private String ymdqsj; + /** + * 域名提醒人-姓名 + */ + @Size(max = 50, message = "域名提醒人-姓名长度不能超过50") + @ApiModelProperty("域名提醒人-姓名") + private String ymtxrXm; + /** + * 域名提醒人-联系方式 + */ + @Size(max = 50, message = "域名提醒人-联系方式不能超过50") + @ApiModelProperty("域名提醒人-联系方式") + private String ymtxrLxfs; + /** + * 关联域名（多个用,分隔） + */ + @Excel(name = "关联域名（多个关联域名用逗号隔开）", sort = 6, width = 42) + @Size(max = 500, message = "关联域名长度不能超过500") + @ApiModelProperty("关联域名（多个用,分隔）") + private String glym; + + + @ApiModelProperty("关联域名list") + @TableField(exist = false) + private List glymList; + + + @ApiModelProperty("关联iplist）") + @TableField(exist = false) + private List glIpList; + + /** + * 关联ip（多个用,分隔） + */ + @Excel(name = "关联资产（多个资产用逗号隔开,例如{\"ipv4\":[\"1.1.1.1:8080\",\"2.2.2.2:8080\"],\"ipv6\":[\"fe80::ec3e:9cff:fe25:687b\",\"de71::ec3e:9cff:fe25:687b\"]}）", sort = 7, width = 60) + @Size(max = 500, message = "关联ip长度不能超过500") + @ApiModelProperty("关联ip（多个用,分隔）") + private String glIp; + /** + * 系统类型（字典） + */ + @Excel(name = "*系统类型", dictType = "zc_xtlx", comboReadDict = true, sort = 8) + //@NotNull + @ApiModelProperty("系统类型（字典）") + private String xtlx; + /** + * 系统重要性（字典） + */ + @Excel(name = "系统重要性", dictType = "zc_xtzyx", comboReadDict = true, sort = 9) + @ApiModelProperty("系统重要性（字典）") + private String xtzyx; + /** + * 是否关基系统（字典） + */ + //@NotNull + @Excel(name = "是否关基系统", dictType = "is_no", comboReadDict = true, sort = 10) + @ApiModelProperty("是否关基系统（字典）") + private String gjxt; + /** + * 系统标签 + */ + @Excel(name = "系统标签（多个标签逗号隔开）", sort = 12, width = 32) + @Size(max = 255, message = "系统标签长度不能超过255") + @ApiModelProperty("系统标签") + private String xtbq; + /** + * 机房信息 + */ + //@NotBlank + @Excel(name = "*机房信息", sort = 11) + @Size(max = 500, message = "机房信息长度不能超过500") + @ApiModelProperty("机房信息") + private String jfxx; + /** + * 使用时间 + */ + //@NotBlank + @ApiModelProperty("使用时间") + @Excel(name = "使用时间", sort = 123, dateFormat = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sysj; + /** + * 是否是互联网系统（字典） + */ + //@NotNull + @Excel(name = "*是否是互联网系统", dictType = "is_no", comboReadDict = true, sort = 124) + @ApiModelProperty("是否是互联网系统（字典）") + private String hlwxt; + /** + * 系统编号 + */ + @Size(max = 50, message = "系统编号长度不能超过50") + @ApiModelProperty("系统编号") + @Excel(name = "系统编号", sort = 37) + private String xtbh; + /** + * 系统状态（字典） + */ + @Excel(name = "*系统状态", dictType = "zc_xtzt", comboReadDict = true, sort = 38) + //@NotNull + @ApiModelProperty("系统状态（字典）") + private String xtzt; + /** + * 在线状态（字典） + */ + @Excel(name = "在线状态", dictType = "zc_zxzt", comboReadDict = true, sort = 39) + @ApiModelProperty("在线状态（字典）") + private String zxzt; + + @TableField(exist = false) + @ApiModelProperty("使用人") + private String syr; + /** + * C-机密性（字典） + */ + @Excel(name = "机密性", dictType = "zc_c_i_a", comboReadDict = true, sort = 40) + @ApiModelProperty("C-机密性（字典）") + private String cjmx; + /** + * I-完整性（字典） + */ + @Excel(name = "完整性", dictType = "zc_c_i_a", comboReadDict = true, sort = 41) + @ApiModelProperty("I-完整性（字典）") + private String iwzx; + /** + * A-可用性(字典） + */ + @Excel(name = "可用性", dictType = "zc_c_i_a", comboReadDict = true, sort = 42) + @ApiModelProperty("A-可用性(字典）") + private String akyx; + /** + * 存活率（字典） + */ + @ApiModelProperty("存活率（字典）") + private String chl; +// /** +// * 地理位置 +// */ +// @Size(max= 255,message="地理位置长度不能超过255") +// @ApiModelProperty("地理位置") +// private String dlwz; + /** + * 经度 + */ + @Size(max = 50, message = "经度长度不能超过50") + @ApiModelProperty("经度") + private String jd; + /** + * 纬度 + */ + @Size(max = 50, message = "纬度长度不能超过50") + @ApiModelProperty("纬度") + private String wd; + /** + * 系统特征（,分隔） + */ + @Excel(width = 60, name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）", sort = 54) + @ApiModelProperty("系统特征（,分隔）") + private String xttz; + /** + * 用户规模 + */ + @Excel(name = "*用户规模", dictType = "zc_yhgm", comboReadDict = true, sort = 55) + //@NotNull + @ApiModelProperty("用户规模") + private String yhgm; + /** + * 互联网接入运营商 + */ + //@NotBlank + @Excel(name = "*互联网接入运营商", sort = 56) + @Size(max = 50, message = "互联网接入运营商长度不能超过50") + @ApiModelProperty("互联网接入运营商") + private String hlwjryys; + + @ApiModelProperty("*物理接入地址") + @TableField(exist = false) + private String wljrdz; + + /** + * 资产物理接入地址 + */ + @Excel(name = "*资产物理接入地址", sort = 57, width = 28) + @Size(max = 50, message = "资产物理接入地址长度不能超过50") + @ApiModelProperty("资产物理接入地址") + private String zcwljrdz; + /** + * 是否部署云平台（字典） + */ + //@NotNull + @Excel(name = "*是否部署云平台", sort = 58, dictType = "is_no", comboReadDict = true) + @ApiModelProperty("是否部署云平台（字典）") + private String bsypt; + /** + * 云服务商名称 + */ + @Excel(name = "云服务商名称（“是否部署云平台”选择“是”必须填写，选择“否”则无需填写）", sort = 59, width = 45) + @Size(max = 100, message = "云服务商名称长度不能超过100") + @ApiModelProperty("云服务商名称") + private String yfwsmc; + /** + * 网站访问协议/开通协议 + */ + @Excel(name = "*网站访问协议", sort = 60) + @Size(max = 255, message = "网站访问协议/开通协议长度不能超过255") + @ApiModelProperty("网站访问协议/开通协议") + private String wzfwxy; + /** + * 系统部署方式 + */ + @Excel(name = "*系统部署方式", dictType = "zc_xtbsfs", comboReadDict = true, sort = 61) + @ApiModelProperty("系统部署方式") + private String xtbsfs; + /** + * 托管单位 + */ + @Excel(name = "托管单位（系统部署方式选择“托管第三方”此项必填）", sort = 62, width = 45) + @Size(max = 100, message = "托管单位长度不能超过100") + @ApiModelProperty("托管单位") + private String tgdw; + /** + * 云服务商 + */ + @Excel(name = "云服务商（系统部署方式选择“云上”此项必填）", sort = 63) + @Size(max = 100, message = "云服务商长度不能超过100") + @ApiModelProperty("云服务商") + private String yfws; + /** + * 是否对公众开放（字典） + */ + @Excel(name = "*是否对公众开放", dictType = "is_no", comboReadDict = true, sort = 64, width = 22) + @ApiModelProperty("是否对公众开放（字典）") + private String dgzkf; + /** + * 互联网开放用途（字典） + */ + //@NotNull + @Excel(name = "*互联网开放用途", dictType = "zc_hlwkfyt", comboReadDict = true, sort = 65, width = 22) + @ApiModelProperty("互联网开放用途（字典）") + private String hlwkfyt; + /** + * 系统防护情况-防篡改(多选字典） + */ + @ApiModelProperty("系统防护情况-防篡改(多选字典）") + private String xtfhqkFcg; + /** + * 系统防护情况-防泄露(多选字典） + */ + @ApiModelProperty("系统防护情况-防泄露(多选字典）") + private String xtfhqkFxl; + /** + * 系统防护情况-防中断(多选字典） + */ + @ApiModelProperty("系统防护情况-防中断(多选字典）") + private String xtfhqkFzd; + /** + * 系统防护情况-防勒索(多选字典） + */ + @ApiModelProperty("系统防护情况-防勒索(多选字典）") + private String xtfhqkFls; + /** + * 相关业务-覆盖范围 + */ + @ApiModelProperty("相关业务-覆盖范围") + private String xgywFgfw; + /** + * 相关业务-网络性质 + */ + @ApiModelProperty("相关业务-网络性质") + private String xgywWlxz; + /** + * 相关业务-业务类型 + */ + @ApiModelProperty("相关业务-业务类型") + private String xgywYwlx; + /** + * 相关业务-互联情况 + */ + @ApiModelProperty("相关业务-互联情况") + private String xgywHlqk; + /** + * 相关业务-服务对象 + */ + @ApiModelProperty("相关业务-服务对象") + private String xgywFwdx; + /** + * 相关业务-服务范围 + */ + @ApiModelProperty("相关业务-服务范围") + private String xgywFwfw; + /** + * 相关业务-业务描述 + */ + //@NotNull + @Size(max = 500, message = "相关业务-业务描述长度不能超过255") + @Excel(name = "*业务描述", sort = 122) + @ApiModelProperty("相关业务-业务描述") + private String xgywYwms; + + @ApiModelProperty("责任人") + @TableField(exist = false) + private String zrr; + /** + * 分管负责人姓名 + */ + @Excel(name = "*分管负责人", sort = 15) + //@NotBlank + @Size(max = 50, message = "分管负责人姓名长度不能超过50") + @ApiModelProperty("分管负责人姓名") + private String fgfzrxm; + /** + * 分管负责人联系方式 + */ + @Excel(name = "*分管负责人电话", sort = 16, width = 24) + //@NotBlank + @Size(max = 50, message = "分管负责人联系方式长度不能超过50") + @ApiModelProperty("分管负责人联系方式") + private String fgfzrlxfs; + /** + * 分管负责人邮箱 + */ + @Excel(name = "*分管负责人邮箱", sort = 17, width = 24) + @Size(max = 50, message = "分管负责人邮箱长度不能超过50") + @ApiModelProperty("分管负责人邮箱") + private String fgfzryx; + /** + * 部门负责人姓名 + */ + @Excel(name = "*部门负责人", sort = 18) + //@NotBlank + @Size(max = 50, message = "部门负责人姓名长度不能超过50") + @ApiModelProperty("部门负责人姓名") + private String bmfzrxm; + /** + * 部门负责人联系方式 + */ + @Excel(name = "*部门负责人电话", sort = 19, width = 24) + //@NotBlank + @Size(max = 50, message = "部门负责人联系方式长度不能超过50") + @ApiModelProperty("部门负责人联系方式") + private String bmfzrlxfs; + /** + * 部门负责人邮箱 + */ + @Excel(name = "*部门负责人邮箱", sort = 20, width = 24) + @Size(max = 50, message = "部门负责人邮箱长度不能超过50") + @ApiModelProperty("部门负责人邮箱") + private String bmfzryx; + /** + * 第一联系人姓名 + */ + @Excel(name = "*第一联系人", sort = 21) + //@NotBlank + @Size(max = 50, message = "第一联系人姓名长度不能超过50") + @ApiModelProperty("第一联系人姓名") + private String dylxrxm; + /** + * 第一联系人联系方式 + */ + //@NotBlank + @Excel(name = "*第一联系人电话", sort = 22, width = 24) + @Size(max = 50, message = "第一联系人联系方式长度不能超过50") + @ApiModelProperty("第一联系人联系方式") + private String dylxrlxfs; + /** + * 第一联系人邮箱 + */ + @Excel(name = "*第一联系人邮箱", sort = 23, width = 24) + @Size(max = 50, message = "第一联系人邮箱长度不能超过50") + @ApiModelProperty("第一联系人邮箱") + private String dylxryx; + + @ApiModelProperty("其他联系人") + @TableField(exist = false) + private List otherConcat; + + /** + * ICP备案信息-是否备案 + */ + @Excel(name = "*ICP备案状态", dictType = "is_no", comboReadDict = true, sort = 24) + //@NotNull + @ApiModelProperty("ICP备案信息-是否备案") + private String ipcSfba; + /** + * ICP备案信息-备案有效性 + */ + @ApiModelProperty("ICP备案信息-备案有效性") + private String ipcBayxx; + /** + * ICP备案信息-备案网站名称 + */ + @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站名称") + private String ipcBawzmc; + /** + * ICP备案信息-备案网站首页 + */ + @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站首页") + private String ipcBawzsy; + /** + * ICP备案信息-ICP备案编号 + */ + @Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）", sort = 25, width = 46) + //@NotBlank + @Size(max = 50, message = "ICP备案信息-ICP备案编号长度不能超过50") + @ApiModelProperty("ICP备案信息-ICP备案编号") + private String ipcIpcbabh; + /** + * ICP备案信息-备案域名 + */ + @Excel(name = "备案域名（ICP备案状态选择为是则必填）", sort = 26) + //@NotBlank + @Size(max = 50, message = "ICP备案信息-备案域名长度不能超过50") + @ApiModelProperty("ICP备案信息-备案域名") + private String ipcBaym; + /** + * ICP备案信息-备案单位名称 + */ + @Size(max = 50, message = "ICP备案信息-备案单位名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案单位名称") + private String ipcBadwmc; + /** + * ICP备案信息-备案单位性质 + */ + @ApiModelProperty("ICP备案信息-备案单位性质") + private String ipcBadwxz; + /** + * ICP备案信息-备案联系人 + */ + @Size(max = 50, message = "ICP备案信息-备案联系人长度不能超过50") + @ApiModelProperty("ICP备案信息-备案联系人") + private String ipcBalxr; + /** + * ICP备案信息-备案联系人电话 + */ + @Size(max = 50, message = "ICP备案信息-备案联系人电话长度不能超过50") + @ApiModelProperty("ICP备案信息-备案联系人电话") + private String ipcBalxrdh; + /** + * 审核时间 + */ + @Size(max = 50, message = "审核时间长度不能超过50") + @ApiModelProperty("审核时间") + private String shsj; + /** + * 公安机关备案信息-是否备案 + */ + //@NotNull + @Excel(name = "*公安机关备案状态", dictType = "is_no", comboReadDict = true, sort = 27, width = 24) + @ApiModelProperty("公安机关备案信息-是否备案") + private String gajgSfba; + /** + * 公安机关备案信息-备案机关 + */ + @Size(max = 50, message = "公安机关备案信息-备案机关长度不能超过50") + @ApiModelProperty("公安机关备案信息-备案机关") + private String gajgBajg; + /** + * 公安机关备案信息-公安机关备案号 + */ + @Excel(name = "公安机关备案号（公安机关备案状态选择为是则必填）", sort = 28, width = 22) + @Size(max = 50, message = "公安机关备案信息-公安机关备案号长度不能超过50") + @ApiModelProperty("公安机关备案信息-公安机关备案号") + //@NotBlank + private String gajgBah; + /** + * 公安机关备案信息-备案日期 + */ + @Size(max = 50, message = "公安机关备案信息-备案日期长度不能超过50") + @ApiModelProperty("公安机关备案信息-备案日期") + private String gajgBarq; + /** + * 系统架构-开发商 + */ + //@NotBlank + @Excel(name = "*开发商", sort = 29) + @Size(max = 50, message = "系统架构-开发商长度不能超过50") + @ApiModelProperty("系统架构-开发商") + private String xtjgKfs; + /** + * 系统架构-系统版本 + */ + @Excel(name = "*系统版本", sort = 30) + //@NotBlank + @Size(max = 50, message = "系统架构-系统版本长度不能超过50") + @ApiModelProperty("系统架构-系统版本") + private String xtjgXtbb; + /** + * 系统架构-技术架构 + */ + @Excel(name = "*技术架构", sort = 31) + //@NotBlank + @Size(max = 50, message = "系统架构-技术架构长度不能超过50") + @ApiModelProperty("系统架构-技术架构") + private String xtjgJsjg; + /** + * 系统架构-服务组件 + */ + @Excel(name = "*服务组件", sort = 32) + //@NotBlank + @Size(max = 50, message = "系统架构-服务组件长度不能超过50") + @ApiModelProperty("系统架构-服务组件") + private String xtjgFwzj; + /** + * 系统架构-web容器名称 + */ + @Excel(name = "*Web容器版本", sort = 33) + //@NotBlank + @Size(max = 50, message = "系统架构-web容器名称长度不能超过50") + @ApiModelProperty("系统架构-web容器名称") + private String xtjgWebMc; + /** + * 系统架构-web容器版本 + */ + @Excel(name = "*Web容器名称", sort = 34) + //@NotBlank + @Size(max = 50, message = "系统架构-web容器版本长度不能超过50") + @ApiModelProperty("系统架构-web容器版本") + private String xtjgWebBb; + /** + * 系统架构-是否国产化系统 + */ + @Excel(name = "*是否国产化系统", dictType = "is_no", comboReadDict = true, sort = 35, width = 22) + //@NotNull + @ApiModelProperty("系统架构-是否国产化系统") + private String xtjgGcxt; + /** + * 系统架构-是否有国产设备 + */ + @Excel(name = "*是否有国产设备", dictType = "is_no", comboReadDict = true, sort = 36, width = 22) + //@NotNull + @ApiModelProperty("系统架构-是否有国产设备") + private String xtjgGcsb; + /** + * 系统架构-系统设备国产化率 + */ + @Size(max = 50, message = "系统架构-系统设备国产化率长度不能超过50") + @ApiModelProperty("系统架构-系统设备国产化率") + private String xtjgGchl; + /** + * 等保信息-是否等保系统 + */ + @Excel(name = "*是否是等保系统", dictType = "is_no", comboReadDict = true, sort = 43) + //@NotNull + @ApiModelProperty("等保信息-是否等保系统") + private String dbxxSfdbxt; + /** + * 等保信息-等保测评备案号 + */ + //@NotBlank + @Excel(name = "等保测评备案号（是否等保系统选择为是则必填）", sort = 44, width = 22) + @Size(max = 50, message = "等保信息-等保测评备案号长度不能超过50") + @ApiModelProperty("等保信息-等保测评备案号") + private String dbxxDbcpbah; + /** + * 等保信息-等保等级 + */ + //@NotNull + @Excel(name = "等保等级（是否等保系统选择为是则必填）", dictType = "dbxx_dbdj", comboReadDict = true, sort = 45) + @ApiModelProperty("等保信息-等保等级") + private String dbxxDbdj; + /** + * 等保信息-主管部门 + */ + @Size(max = 50, message = "等保信息-主管部门长度不能超过50") + @ApiModelProperty("等保信息-主管部门") + private String dbxxZgbm; + /** + * 等保信息-专家评审 + */ + @ApiModelProperty("等保信息-专家评审") + private String dbxxZjps; + /** + * 等保信息-主管部门评审 + */ + @ApiModelProperty("等保信息-主管部门评审") + private String dbxxZgbmps; + /** + * 等保信息-定级时间 + */ + //@NotBlank + @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）", sort = 46, width = 40) + @Size(max = 50, message = "等保信息-定级时间长度不能超过50") + @ApiModelProperty("等保信息-定级时间") + private String dbxxDjsj; + /** + * 等保信息-是否有第三方测评 + */ + @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）", width = 45, dictType = "is_no", comboReadDict = true, sort = 47) + @ApiModelProperty("等保信息-是否有第三方测评") + private String dbxxSfydsfcp; + + @ApiModelProperty("地理位置-省") + @Excel(name = "地理位置-省", sort = 49) + private String sheng; + + @ApiModelProperty("地理位置-市") + @Excel(name = "地理位置-市", sort = 50) + private String shi; + + @ApiModelProperty("地理位置-区（县）") + @Excel(name = "地理位置-区（县）", sort = 51) + private String qu; + /** + * 等保信息-测评得分 + */ + @Excel(name = "测评得分（是否是等保系统选择是则必填）", sort = 48) + @ApiModelProperty("等保信息-测评得分") + private Integer dbxxCpdf; + /** + * 第三方测评-测评机构名称 + */ + @Excel(name = "*测评单位名称", sort = 66) + @Size(max = 255, message = "第三方测评-测评机构名称长度不能超过255") + @ApiModelProperty("第三方测评-测评机构名称") + private String sfCpjgmc; + /** + * 第三方测评-测评机构联系人 + */ + @Size(max = 50, message = "第三方测评-测评机构联系人长度不能超过50") + @ApiModelProperty("第三方测评-测评机构联系人") + private String sfCpjglxr; + /** + * 第三方测评-测评机构地址 + */ + @Size(max = 255, message = "第三方测评-测评机构地址长度不能超过255") + @ApiModelProperty("第三方测评-测评机构地址") + private String sfCpjgdz; + /** + * 第三方测评-测评机构联系人电话 + */ + @Size(max = 50, message = "第三方测评-测评机构联系人电话长度不能超过50") + @ApiModelProperty("第三方测评-测评机构联系人电话") + private String sfCpjglxrdh; + /** + * 第三方测评-测评时联系人 + */ + @Size(max = 50, message = "第三方测评-测评时联系人长度不能超过50") + @ApiModelProperty("第三方测评-测评时联系人") + private String sfCpslxr; + /** + * 第三方测评-测评师姓名 + */ + @Size(max = 50, message = "第三方测评-测评师姓名长度不能超过50") + @ApiModelProperty("第三方测评-测评师姓名") + private String sfCpsxm; + /** + * 第三方测评-测评时联系人电话 + */ + @Size(max = 50, message = "第三方测评-测评时联系人电话长度不能超过50") + @ApiModelProperty("第三方测评-测评时联系人电话") + private String sfCpslxrdh; + /** + * 第三方测评-测评师电话 + */ + @Size(max = 50, message = "第三方测评-测评师电话长度不能超过50") + @ApiModelProperty("第三方测评-测评师电话") + private String sfCpsdh; + /** + * 第三方测评-推荐等保办 + */ + @Size(max = 255, message = "第三方测评-推荐等保办长度不能超过255") + @ApiModelProperty("第三方测评-推荐等保办") + private String sfTjdbb; + /** + * 第三方测评-测评师证书等级 + */ + @ApiModelProperty("第三方测评-测评师证书等级") + private String sfCpszsdj; + /** + * 第三方测评-测评等级 + */ + @ApiModelProperty("第三方测评-测评等级") + private String sfCpdj; + /** + * 第三方测评-推荐日期 + */ + @Size(max = 50, message = "第三方测评-推荐日期长度不能超过50") + @ApiModelProperty("第三方测评-推荐日期") + private String sfTjrq; + /** + * 第三方测评-报告日期 + */ + @Size(max = 50, message = "第三方测评-报告日期长度不能超过50") + @ApiModelProperty("第三方测评-报告日期") + private String sfBgrq; + /** + * 第三方测评-测评结论 + */ + @Size(max = 255, message = "第三方测评-测评结论长度不能超过255") + @ApiModelProperty("第三方测评-测评结论") + private String sfCpjl; + /** + * 密评信息-是否密评系统 + */ + @Excel(name = "是否密评系统", dictType = "is_no", comboReadDict = true, sort = 52, width = 22) + @Size(max = 50, message = "密评信息-是否密评系统长度不能超过50") + @ApiModelProperty("密评信息-是否密评系统") + private String mpSfmpxt; + /** + * 密评信息-密评得分 + */ + @Excel(name = "密评得分", sort = 53) + @ApiModelProperty("密评信息-密评得分") + private Integer mpMpdf; + + /** + * 供应链信息列表 + */ + @ApiModelProperty("供应链信息列表") + @TableField(exist = false) + private List gylxxList; + /** + * 基础网络列表 + */ + @ApiModelProperty("基础网络列表") + @TableField(exist = false) + private List jcwlList; + + /** + * 新监管业务形态 + */ + @ApiModelProperty("新监管业务形态") + @TableField(exist = false) + private AssetBusinessForm xjgywxt; + /** + * Whois信息-有效性 + */ + @ApiModelProperty("Whois信息-有效性") + private String whoisYxx; + /** + * Whois信息-注册名 + */ + @Size(max = 50, message = "Whois信息-注册名长度不能超过50") + @ApiModelProperty("Whois信息-注册名") + private String whoisZcm; + /** + * Whois信息-服务商 + */ + @Size(max = 50, message = "Whois信息-服务商长度不能超过50") + @ApiModelProperty("Whois信息-服务商") + private String whoisFws; + /** + * Whois信息-注册邮箱 + */ + @Size(max = 50, message = "Whois信息-注册邮箱长度不能超过50") + @ApiModelProperty("Whois信息-注册邮箱") + private String whoisZcyx; + /** + * Whois信息-注册国家 + */ + @Size(max = 50, message = "Whois信息-注册国家长度不能超过50") + @ApiModelProperty("Whois信息-注册国家") + private String whoisZcgj; + /** + * Whois信息-注册省 + */ + @Size(max = 50, message = "Whois信息-注册省长度不能超过50") + @ApiModelProperty("Whois信息-注册省") + private String whoisZcs; + /** + * Whois信息-注册地址 + */ + @Size(max = 255, message = "Whois信息-注册地址长度不能超过255") + @ApiModelProperty("Whois信息-注册地址") + private String whoisZcdz; + /** + * Whois信息-注册机构 + */ + @Size(max = 50, message = "Whois信息-注册机构长度不能超过50") + @ApiModelProperty("Whois信息-注册机构") + private String whoisZcjg; + /** + * Whois信息-注册时间 + */ + @Size(max = 50, message = "Whois信息-注册时间长度不能超过50") + @ApiModelProperty("Whois信息-注册时间") + private String whoisZcsj; + /** + * Whois信息-最后更新时间 + */ + @Size(max = 50, message = "Whois信息-最后更新时间长度不能超过50") + @ApiModelProperty("Whois信息-最后更新时间") + private String whoisZhgxsj; + /** + * Whois信息-到期时间 + */ + @Size(max = 50, message = "Whois信息-到期时间长度不能超过50") + @ApiModelProperty("Whois信息-到期时间") + private String whoisDqsj; + /** + * 数据资产-数据库名称 + */ + @Excel(name = "*数据库名称", sort = 105) + @Size(max = 50, message = "编码长度不能超过255") + @ApiModelProperty("数据资产-数据库名称") + private String sjzcSjkmc; + /** + * 数据资产-数据库类型 + */ + //@NotBlank + @Excel(name = "*数据库类型", sort = 106, dictType = "database_type", comboReadDict = true) + @Size(max = 50, message = "数据资产-数据库类型长度不能超过50") + @ApiModelProperty("数据资产-数据库类型") + private String sjzcSjklx; + /** + * 数据资产-端口 + */ + @Excel(name = "*数据库端口", sort = 107) + //@NotBlank + @Size(max = 50, message = "数据资产-端口长度不能超过50") + @ApiModelProperty("数据资产-端口") + private String sjzcDk; + /** + * 数据资产-数据库版本 + */ + @Excel(name = "*数据库版本", sort = 108) + //@NotBlank + @Size(max = 50, message = "数据资产-数据库版本长度不能超过255") + @ApiModelProperty("数据资产-数据库版本") + private String sjzcSjkbb; + /** + * 数据资产-数据库所在IP + */ + @Excel(name = "*数据库所在IP", sort = 109) + @Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50") + @ApiModelProperty("数据资产-数据库所在IP") + private String sjzcSjkIp; + /** + * 数据资产-共享属性 + */ + //@NotNull + @Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 110) + @ApiModelProperty("数据资产-共享属性") + private String sjzcGxsx; + /** + * 数据资产-开放属性 + */ + @Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 111) + //@NotNull + @ApiModelProperty("数据资产-开放属性") + private String sjzcKfsx; + /** + * 数据资产-数据领域 + */ + //@NotNull + @Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 112) + @ApiModelProperty("数据资产-数据领域") + private String sjzcSjly; + /** + * 数据资产-更新周期 + */ + //@NotNull + @Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 113) + @ApiModelProperty("数据资产-更新周期") + private String sjzcGxzq; + /** + * 数据资产-数据类型 + */ + //@NotBlank + @Excel(name = "*数据类型", sort = 114) + @Size(max = 255, message = "数据资产-数据类型长度不能超过255") + @ApiModelProperty("数据资产-数据类型") + private String sjzcSjlx; + /** + * 数据资产-数据量 + */ + //@NotBlank + @Excel(name = "*数据量", sort = 115) + @ApiModelProperty("数据资产-数据量") + private Integer sjzcSjl; + + @Excel(name = "*数据量单位", sort = 116, dictType = "sjzc_sjldw", comboReadDict = true) + @ApiModelProperty("数据资产-数据量单位") + private String sjzcSjldw; + /** + * 数据资产-是否为涉密数据 + */ + //@NotNull + @Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 117) + @ApiModelProperty("数据资产-是否为涉密数据") + private String sjzcSmsj; + /** + * 数据资产-数据是否出境 + */ + //@NotNull + @Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 118) + @ApiModelProperty("数据资产-数据是否出境") + private String sjzcCj; + /** + * 数据资产-数据分级分类 + */ + //@NotNull + @Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 119) + @ApiModelProperty("数据资产-数据分级分类") + private String sjzcSjfjfl; + /** + * 数据资产-数据重要程度 + */ + //@NotNull + @Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 120) + @ApiModelProperty("数据资产-数据重要程度") + private String sjzcSjzycd; + /** + * 数据资产-数据描述 + */ + @Size(max = 500, message = "数据资产-数据描述长度不能超过500") + @ApiModelProperty("数据资产-数据描述") + @Excel(name = "数据描述", sort = 121) + private String sjzcSjms; + + @ApiModelProperty("*业务描述") + @TableField(exist = false) + private String ywms; + /** + * 业务系统拓扑图 + */ + @Size(max = 500, message = "业务系统拓扑图长度不能超过500") + @ApiModelProperty("业务系统拓扑图") + private String ywxttpt; + + @Size(max = 500, message = "业务系统拓扑文件长度不能超过500") + @ApiModelProperty("业务系统拓扑文件") + private String ywxttpwj; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("是否报废（默认0不报废 2代表报废）") + private String isbf; + + @ApiModelProperty("报废原因") + private String bfyy; + @TableField(updateStrategy = FieldStrategy.IGNORED) + @ApiModelProperty("不通过原因") + private String btgyy; + + /** + * 审核 + */ + @ApiModelProperty("审核") + @TableField(exist = false) + private String auditState; + + + /** + * 审核 + */ + @ApiModelProperty("类型0:管理端，1：单位端") + private Integer xzType = 0; +}