From 1972dc80385b270ed14cb9fc63d4e24eb14238c4 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Thu, 21 Nov 2024 18:24:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetTaskController.java | 162 ++- .../java/com/ruoyi/tc/entity/AssetLc.java | 6 + .../AssetBasicNetworkCpPo.java} | 19 +- .../tc/entity/po/AssetBasicNetworkJyPo.java | 104 ++ .../AssetBusinessFormCpPo.java} | 11 +- .../tc/entity/po/AssetBusinessFormJyPo.java | 411 +++++++ .../AssetCurrentCpPo.java} | 51 +- .../ruoyi/tc/entity/po/AssetCurrentJyPo.java | 1058 +++++++++++++++++ .../AssetSupplyChainCpPo.java} | 15 +- .../tc/entity/po/AssetSupplyChainJyPo.java | 84 ++ .../UnitOtherConcatCpPo.java} | 13 +- .../tc/entity/po/UnitOtherConcatJyPo.java | 57 + .../tc/mapper/AssetBasicNetWorkCpMapper.java | 11 +- .../tc/mapper/AssetBasicNetWorkJyMapper.java | 14 + .../tc/mapper/AssetBusinessFormCpMapper.java | 11 +- .../tc/mapper/AssetBusinessFormJyMapper.java | 40 + .../ruoyi/tc/mapper/AssetCurrentCpMapper.java | 13 +- .../ruoyi/tc/mapper/AssetCurrentJyMapper.java | 15 + .../tc/mapper/AssetSupplyChainCpMapper.java | 12 +- .../tc/mapper/AssetSupplyChainJyMapper.java | 18 + .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 6 +- .../tc/mapper/UnitOtherConcatCpMapper.java | 11 +- .../tc/mapper/UnitOtherConcatJyMapper.java | 19 + .../service/AssetBasicNetworkCpService.java | 7 +- .../service/AssetBasicNetworkJyService.java | 18 + .../service/AssetBusinessFormCpService.java | 6 +- .../service/AssetBusinessFormJyService.java | 17 + .../tc/service/AssetCurrentCpService.java | 4 +- .../tc/service/AssetCurrentJyService.java | 16 + .../tc/service/AssetSupplyChainCpService.java | 6 +- .../tc/service/AssetSupplyChainJyService.java | 14 + .../ruoyi/tc/service/AssetTaskService.java | 4 +- .../tc/service/UnitOtherConcatCpService.java | 8 +- .../tc/service/UnitOtherConcatJyservice.java | 17 + .../impl/AssetBasicNetworkCpServiceImpl.java | 6 +- .../impl/AssetBasicNetworkJyServiceImpl.java | 25 + .../impl/AssetBusinessFormCpServiceImpl.java | 6 +- .../impl/AssetBusinessFormJyServiceImpl.java | 20 + .../impl/AssetCurrentCpServiceImpl.java | 10 +- .../impl/AssetCurrentJyServiceImpl.java | 20 + .../impl/AssetSupplyChainCpServiceImpl.java | 9 +- .../impl/AssetSupplyChainJyServiceImpl.java | 19 + .../tc/service/impl/AssetTaskServiceImpl.java | 89 +- .../impl/UnitOtherConcatCpServiceImpl.java | 6 +- .../impl/UnitOtherConcatJyServiceImpl.java | 24 + .../src/main/resources/mapper/AssetLcDao.xml | 4 +- .../main/resources/mapper/AssetTaskDao.xml | 11 +- 47 files changed, 2336 insertions(+), 191 deletions(-) rename ruoyi-admin/src/main/java/com/ruoyi/tc/entity/{response/AssetBasicNetworkCpResponse.java => po/AssetBasicNetworkCpPo.java} (85%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkJyPo.java rename ruoyi-admin/src/main/java/com/ruoyi/tc/entity/{response/AssetBusinessFormCpResponse.java => po/AssetBusinessFormCpPo.java} (97%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormJyPo.java rename ruoyi-admin/src/main/java/com/ruoyi/tc/entity/{response/AssetCurrentResponse.java => po/AssetCurrentCpPo.java} (95%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java rename ruoyi-admin/src/main/java/com/ruoyi/tc/entity/{response/AssetSupplyChainCpResponse.java => po/AssetSupplyChainCpPo.java} (88%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainJyPo.java rename ruoyi-admin/src/main/java/com/ruoyi/tc/entity/{response/UnitOtherConcatCpResponse.java => po/UnitOtherConcatCpPo.java} (78%) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatJyPo.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkJyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormJyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentJyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainJyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatJyMapper.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkJyService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormJyService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentJyService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainJyService.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatJyservice.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkJyServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormJyServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentJyServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainJyServiceImpl.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatJyServiceImpl.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index a72eb72..51ab6cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -3,12 +3,16 @@ package com.ruoyi.tc.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.StringUtils; import com.ruoyi.tc.entity.AssetCurrent; +import com.ruoyi.tc.entity.AssetLc; import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; -import com.ruoyi.tc.entity.response.*; +import com.ruoyi.tc.entity.response.AssestTaskXqresponse; +import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import com.ruoyi.tc.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -49,6 +53,25 @@ public class AssetTaskController extends BaseController { @Resource private UnitOtherConcatCpService unitOtherConcatCpService; + @Resource + private AssetCurrentJyService assetCurrentJyService; + + @Resource + private AssetBusinessFormJyService assetBusinessFormJyService; + + @Resource + private AssetSupplyChainJyService assetSupplyChainJyService; + + @Resource + AssetBasicNetworkJyService assetBasicNetworkJyService; + + @Resource + private UnitOtherConcatJyservice unitOtherConcatJyservice; + + + @Resource + private AssetLcService assetLcService; + /** * 分页查询 * @@ -140,7 +163,6 @@ public class AssetTaskController extends BaseController { @ApiOperation(value = "资产核查信息", response = AssestTaskXqresponse.class) @GetMapping("/zcHc") public AjaxResult zcHc(Page page, AssestTaskXqRequest pageRequest) { - return AjaxResult.success(assetTaskService.zcHc(page, pageRequest)); } @@ -154,22 +176,37 @@ public class AssetTaskController extends BaseController { @ApiOperation(value = "单位端暂存报废") @PostMapping("/zc") @Transactional(rollbackFor = Exception.class) - public AjaxResult zcHc(@RequestBody AssetCurrentResponse assetCurrent) { -// //根据资产id和任务id删除五张表数据 -// assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); -// assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); -// assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); -// unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); -// assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); - if(assetCurrent.getBfyy().isEmpty()) { - //待审批 - assetCurrent.setStatus(1); - }else{ - //已报废 - assetCurrent.setStatus(5); - } - assetCurrent.setGlym(String.join(",", assetCurrent.getGlymList())); - assetCurrent.setGlIp(String.join(",", assetCurrent.getGlIpList())); + public AjaxResult zcHc(@RequestBody AssetCurrentCpPo assetCurrent) { + //根据资产id和任务id删除五张表数据 + assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + if (StringUtils.isBlank(assetCurrent.getBfyy())) { + //待审批 + assetCurrent.setStatus(1); + } else { + //已报废 + assetCurrent.setStatus(5); + } + StringBuilder a = new StringBuilder(); + if (!assetCurrent.getGlymList().isEmpty()) { + assetCurrent.getGlymList().forEach(x -> { + a.append(x); + a.append(","); + }); + } + assetCurrent.setGlym(a.toString()); + StringBuilder b = new StringBuilder(); + if (!assetCurrent.getGlIpList().isEmpty()) { + assetCurrent.getGlymList().forEach(x -> { + b.append(x); + b.append(","); + }); + } + assetCurrent.setGlIp(b.toString()); +// assetCurrent.setCurrentId(null); assetCurrentCpService.save(assetCurrent); //新增新监管业务形态 if (assetCurrent.getXjgywxt() != null) { @@ -178,25 +215,28 @@ public class AssetTaskController extends BaseController { assetBusinessFormCpService.save(assetCurrent.getXjgywxt()); } if (!assetCurrent.getGylxxList().isEmpty()) { - for (AssetSupplyChainCpResponse items : assetCurrent.getGylxxList()) { + for (AssetSupplyChainCpPo items : assetCurrent.getGylxxList()) { items.setAssetId(assetCurrent.getId()); items.setTaskId(assetCurrent.getTaskId()); + } //新增供应链 assetSupplyChainCpService.saveBatch(assetCurrent.getGylxxList()); } if (!assetCurrent.getJcwlList().isEmpty()) { - for (AssetBasicNetworkCpResponse items : assetCurrent.getJcwlList()) { + for (AssetBasicNetworkCpPo items : assetCurrent.getJcwlList()) { items.setAssetId(assetCurrent.getId()); items.setTaskId(assetCurrent.getTaskId()); + } //新增基础网络 assetBasicNetworkCpService.saveBatch(assetCurrent.getJcwlList()); } if (!assetCurrent.getOtherConcat().isEmpty()) { - for (UnitOtherConcatCpResponse items : assetCurrent.getOtherConcat()) { + for (UnitOtherConcatCpPo items : assetCurrent.getOtherConcat()) { items.setAssetId(assetCurrent.getId()); items.setTaskId(assetCurrent.getTaskId()); + } //新增其他联系人 unitOtherConcatCpService.saveBatch(assetCurrent.getOtherConcat()); @@ -205,21 +245,85 @@ public class AssetTaskController extends BaseController { } /** - * 单位端提交 + * 单位端校验提交 * * @param assetCurrent 现有资产复制表 * @return */ - @ApiOperation(value = "单位端提交") - @PostMapping("/tj") + @ApiOperation(value = "单位端校验提交") + @PostMapping("/jyTj") @Transactional(rollbackFor = Exception.class) - public AjaxResult tj(@RequestBody AssetCurrentResponse assetCurrent) { + public AjaxResult tj(@RequestBody AssetCurrentJyPo assetCurrent) { + //根据资产id和任务id删除五张表数据 + assetCurrentCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetBusinessFormCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + //新增流程节点时间 + AssetLc assetLc = new AssetLc(); + assetLc.setTaskId(assetCurrent.getTaskId()); + assetLc.setAssetName(assetCurrent.getXtmc()); + //当审核状态为审核不通过 单位端重新提交 + if (assetCurrent.getStatus().equals(4)){ + assetLc.setDwcxhcTime(LocalDateTime.now()); + } - return AjaxResult.success(); + StringBuilder a = new StringBuilder(); + if (!assetCurrent.getGlymList().isEmpty()) { + assetCurrent.getGlymList().forEach(x -> { + a.append(x); + a.append(","); + }); + } + assetCurrent.setGlym(a.toString()); + StringBuilder b = new StringBuilder(); + if (!assetCurrent.getGlIpList().isEmpty()) { + assetCurrent.getGlymList().forEach(x -> { + b.append(x); + b.append(","); + }); + } + assetCurrent.setGlIp(b.toString()); + assetCurrentJyService.save(assetCurrent); + //当审核状态为带待核查 + if(assetCurrent.getStatus().equals(1)){ + assetLc.setDwhcTime(LocalDateTime.now()); + } + //新增新监管业务形态 + if (assetCurrent.getXjgywxt() != null) { + assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); + assetCurrent.getXjgywxt().setTaskId(assetCurrent.getTaskId()); + assetBusinessFormJyService.save(assetCurrent.getXjgywxt()); + } + if (!assetCurrent.getGylxxList().isEmpty()) { + for (AssetSupplyChainJyPo items : assetCurrent.getGylxxList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增供应链 + assetSupplyChainJyService.saveBatch(assetCurrent.getGylxxList()); + } + if (!assetCurrent.getJcwlList().isEmpty()) { + for (AssetBasicNetworkJyPo items : assetCurrent.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增基础网络 + assetBasicNetworkJyService.saveBatch(assetCurrent.getJcwlList()); + } + if (!assetCurrent.getOtherConcat().isEmpty()) { + for (UnitOtherConcatJyPo items : assetCurrent.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增其他联系人 + unitOtherConcatJyservice.saveBatch(assetCurrent.getOtherConcat()); + } + return success(); } - /** * 管理端审核 * @@ -231,9 +335,5 @@ public class AssetTaskController extends BaseController { public AjaxResult sh(@RequestBody AssetCurrentShRequest req) { return AjaxResult.success(assetTaskService.sh(req)); } - - - - } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java index 6c97c47..b2e1e0e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java @@ -119,6 +119,12 @@ public class AssetLc implements Serializable { @ApiModelProperty("备注") private String remark; + /** + * 资产名称 + */ + @ApiModelProperty("资产名称") + private String assetName; + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBasicNetworkCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkCpPo.java similarity index 85% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBasicNetworkCpResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkCpPo.java index a48e3d3..16260e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBasicNetworkCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkCpPo.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.entity.response; +package com.ruoyi.tc.entity.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,16 +12,21 @@ import java.io.Serializable; /** * 资产基础网络复制表(asset_basic_network)实体类 + * * @author du * @since 2024/11/13 14:44 -*/ + */ @Data @ApiModel("资产基础网络复制表") @TableName(value = "asset_basic_network_cp") -public class AssetBasicNetworkCpResponse extends BaseClass implements Serializable { +public class AssetBasicNetworkCpPo extends BaseClass implements Serializable { + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "network_id") + private Long networkId; - private Long id; /** * 资源id @@ -89,4 +94,10 @@ public class AssetBasicNetworkCpResponse extends BaseClass implements Serializab @ApiModelProperty("任务id") private Integer taskId; + + /** + * 设备IP类型 + */ + @ApiModelProperty("设备IP类型") + private String ipType; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkJyPo.java new file mode 100644 index 0000000..64561e0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBasicNetworkJyPo.java @@ -0,0 +1,104 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 资产基础网络表(asset_basic_network)实体类 + * @author du + * @since 2024/11/13 14:44 +*/ +@Data +@ApiModel("资产基础网络") +@TableName(value = "asset_basic_network_cp") +public class AssetBasicNetworkJyPo extends BaseClass implements Serializable { + + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "network_id") + private Long networkId; + + + + /** + * 资源id + */ + @ApiModelProperty("资源id") + private Long assetId; + /** + * 1.服务器信息2网络设备3安全设备 + */ + @ApiModelProperty("1.服务器信息2网络设备3安全设备") + private Integer type; + /** + * 设备类型 + */ + @ApiModelProperty("设备类型") + private String sblx; + /** + * 品牌 + */ + @ApiModelProperty("品牌") + private String pp; + /** + * 设备IP + */ + @ApiModelProperty("设备IP") + private String sbIp; + + /** + * 设备IP类型 + */ + @ApiModelProperty("设备IP类型") + private String ipType; + /** + * 操作系统 + */ + @ApiModelProperty("操作系统") + private String czxt; + /** + * 操作系统版本 + */ + @ApiModelProperty("操作系统版本") + private String czxtbb; + /** + * 硬件型号 + */ + @ApiModelProperty("硬件型号") + private String yjxh; + /** + * 硬件序列号 + */ + @ApiModelProperty("硬件序列号") + private String yjxlh; + /** + * 硬件版本信息 + */ + @ApiModelProperty("硬件版本信息") + private String yjbbxx; + /** + * 硬件用途 + */ + @ApiModelProperty("硬件用途") + private String yjyt; + /** + * 硬件部署位置 + */ + @ApiModelProperty("硬件部署位置") + private String yjbsxx; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + + @ApiModelProperty("任务id") + private Integer taskId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java index 5672129..a3d80b5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormCpPo.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.entity.response; +package com.ruoyi.tc.entity.po; import com.baomidou.mybatisplus.annotation.IdType; @@ -20,9 +20,14 @@ import java.io.Serializable; @Data @ApiModel("资产新监管业务形态复制表") @TableName(value = "asset_business_form_cp") -public class AssetBusinessFormCpResponse extends BaseClass implements Serializable { +public class AssetBusinessFormCpPo extends BaseClass implements Serializable { + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "business_id") + private Long businessId; + - private Long id; /** * 资源id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormJyPo.java new file mode 100644 index 0000000..e0b4f2c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetBusinessFormJyPo.java @@ -0,0 +1,411 @@ +package com.ruoyi.tc.entity.po; + + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 资产新监管业务形态(asset_business_form)实体类 + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("资产新监管业务形态") +@TableName(value = "asset_business_form_cp") +public class AssetBusinessFormJyPo extends BaseClass implements Serializable { + + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "business_id") + private Long businessId; + + + /** + * 资源id + */ + @ApiModelProperty("资源id") + private Long assetId; + /** + * 云平台-云平台服务商 + */ + @Size(max= 50,message="云平台-云平台服务商长度不能超过50") + @ApiModelProperty("云平台-云平台服务商") + private String yptFws; + /** + * 云平台-是否租户级安全 + */ + @ApiModelProperty("云平台-是否租户级安全") + private String yptSfzh; + /** + * 云平台-云平台类型 + */ + @Size(max= 50,message="云平台-云平台类型长度不能超过50") + @ApiModelProperty("云平台-云平台类型") + private String yptLx; + /** + * 云平台-硬件资源大小 + */ + @Size(max= 50,message="云平台-硬件资源大小长度不能超过50") + @ApiModelProperty("云平台-硬件资源大小") + private String yptYjzydx; + /** + * 云平台-平台架构 + */ + @Size(max= 50,message="云平台-平台架构长度不能超过50") + @ApiModelProperty("云平台-平台架构") + private String yptPtjg; + /** + * 云平台-互联网IP段 + */ + @Size(max= 50,message="云平台-互联网IP段长度不能超过50") + @ApiModelProperty("云平台-互联网IP段") + private String yptIp; + /** + * 云平台-机房联系人 + */ + @Size(max= 50,message="云平台-机房联系人长度不能超过50") + @ApiModelProperty("云平台-机房联系人") + private String yptJflxr; + /** + * 云平台-机房联系人电话 + */ + @Size(max= 50,message="云平台-机房联系人电话长度不能超过50") + @ApiModelProperty("云平台-机房联系人电话") + private String yptJflxrdh; + /** + * 云平台-服务器设备类型 + */ + @Size(max= 50,message="云平台-服务器设备类型长度不能超过50") + @ApiModelProperty("云平台-服务器设备类型") + private String yptFwqsblx; + /** + * 大数据平台-平台服务商 + */ + @Size(max= 50,message="大数据平台-平台服务商长度不能超过50") + @ApiModelProperty("大数据平台-平台服务商") + private String dsjPtfws; + /** + * 大数据平台-敏感数据类型 + */ + @Size(max= 50,message="大数据平台-敏感数据类型长度不能超过50") + @ApiModelProperty("大数据平台-敏感数据类型") + private String dsjMgsjlx; + /** + * 大数据平台-硬件资源 + */ + @Size(max= 50,message="大数据平台-硬件资源长度不能超过50") + @ApiModelProperty("大数据平台-硬件资源") + private String dsjYjzy; + /** + * 大数据平台-系统数据量 + */ + @Size(max= 50,message="大数据平台-系统数据量长度不能超过50") + @ApiModelProperty("大数据平台-系统数据量") + private String dsjXtsjl; + /** + * 大数据平台-机房联系人 + */ + @Size(max= 50,message="大数据平台-机房联系人长度不能超过50") + @ApiModelProperty("大数据平台-机房联系人") + private String dsjJflxr; + /** + * 大数据平台-机房联系人电话 + */ + @Size(max= 50,message="大数据平台-机房联系人电话长度不能超过50") + @ApiModelProperty("大数据平台-机房联系人电话") + private String dsjJflxrdh; + /** + * 大数据平台-是否数据审计 + */ + @ApiModelProperty("大数据平台-是否数据审计") + private String dsjSfsjsj; + /** + * 一般物联网设备-系统集成商名称 + */ + @Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50") + @ApiModelProperty("一般物联网设备-系统集成商名称") + private String wlwsbXtjcs; + /** + * 一般物联网设备-用户数量 + */ + @Size(max= 50,message="一般物联网设备-用户数量长度不能超过50") + @ApiModelProperty("一般物联网设备-用户数量") + private String wlwsbYhsl; + /** + * 一般物联网设备-服务对象 + */ + @ApiModelProperty("一般物联网设备-服务对象") + private String wlwsbFwdx; + /** + * 一般物联网设备-终端数量 + */ + @Size(max= 50,message="一般物联网设备-终端数量长度不能超过50") + @ApiModelProperty("一般物联网设备-终端数量") + private String wlwsbZdsl; + /** + * 一般物联网设备-网络互联情况 + */ + @ApiModelProperty("一般物联网设备-网络互联情况") + private String wlwsbWlhlqk; + /** + * 一般物联网设备-联系人 + */ + @Size(max= 50,message="一般物联网设备-联系人长度不能超过50") + @ApiModelProperty("一般物联网设备-联系人") + private String wlwsbLxr; + /** + * 一般物联网设备-服务范围 + */ + @ApiModelProperty("一般物联网设备-服务范围") + private String wlwsbFwfw; + /** + * 一般物联网设备-联系人电话 + */ + @Size(max= 50,message="一般物联网设备-联系人电话长度不能超过50") + @ApiModelProperty("一般物联网设备-联系人电话") + private String wlwsbLxrdh; + /** + * 一般物联网设备-服务内容 + */ + @Size(max= 500,message="一般物联网设备-服务内容长度不能超过500") + @ApiModelProperty("一般物联网设备-服务内容") + private String wlwsbFwnr; + /** + * 摄像头-摄像头品牌 + */ + @Size(max= 50,message="摄像头-摄像头品牌长度不能超过50") + @ApiModelProperty("摄像头-摄像头品牌") + private String sxtPp; + /** + * 摄像头-位置 + */ + @Size(max= 255,message="摄像头-位置长度不能超过255") + @ApiModelProperty("摄像头-位置") + private String sxtWz; + /** + * 摄像头-摄像头IP + */ + @Size(max= 50,message="摄像头-摄像头IP长度不能超过50") + @ApiModelProperty("摄像头-摄像头IP") + private String sxtIp; + /** + * 摄像头-区域 + */ + @Size(max= 50,message="摄像头-区域长度不能超过50") + @ApiModelProperty("摄像头-区域") + private String sxtQy; + /** + * 摄像头-摄像头数量 + */ + @Size(max= 50,message="摄像头-摄像头数量长度不能超过50") + @ApiModelProperty("摄像头-摄像头数量") + private String sxtSl; + /** + * 摄像头-端口 + */ + @Size(max= 50,message="摄像头-端口长度不能超过50") + @ApiModelProperty("摄像头-端口") + private String sxtDk; + /** + * 摄像头-设备型号 + */ + @Size(max= 50,message="摄像头-设备型号长度不能超过50") + @ApiModelProperty("摄像头-设备型号") + private String sxtSbxh; + /** + * 摄像头-固定版本 + */ + @Size(max= 50,message="摄像头-固定版本长度不能超过50") + @ApiModelProperty("摄像头-固定版本") + private String sxtGdbb; + /** + * 移动APP-移动APP系统 + */ + @Size(max= 50,message="移动APP-移动APP系统长度不能超过50") + @ApiModelProperty("移动APP-移动APP系统") + private String appXt; + /** + * 移动APP-服务端域名 + */ + @Size(max= 50,message="移动APP-服务端域名长度不能超过50") + @ApiModelProperty("移动APP-服务端域名") + private String appYm; + /** + * 移动APP-移动APP渠道 + */ + @Size(max= 50,message="移动APP-移动APP渠道长度不能超过50") + @ApiModelProperty("移动APP-移动APP渠道") + private String appQd; + /** + * 移动APP-服务端IP + */ + @Size(max= 50,message="移动APP-服务端IP长度不能超过50") + @ApiModelProperty("移动APP-服务端IP") + private String appIp; + /** + * 移动APP-联系人 + */ + @Size(max= 50,message="移动APP-联系人长度不能超过50") + @ApiModelProperty("移动APP-联系人") + private String appLxr; + /** + * 移动APP-联系人电话 + */ + @Size(max= 50,message="移动APP-联系人电话长度不能超过50") + @ApiModelProperty("移动APP-联系人电话") + private String appLxrdh; + /** + * 移动APP-APP是否有身份认证 + */ + @ApiModelProperty("移动APP-APP是否有身份认证") + private String appSfysfrz; + /** + * 工业控制-系统集成商名称 + */ + @Size(max= 255,message="工业控制-系统集成商名称长度不能超过255") + @ApiModelProperty("工业控制-系统集成商名称") + private String gykzJcs; + /** + * 工业控制-运行时间 + */ + @Size(max= 255,message="工业控制-运行时间长度不能超过255") + @ApiModelProperty("工业控制-运行时间") + private String gykzYxsj; + /** + * 工业控制-服务对象 + */ + @ApiModelProperty("工业控制-服务对象") + private String gykzFwdx; + /** + * 工业控制-集成商国内外情况 + */ + @Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255") + @ApiModelProperty("工业控制-集成商国内外情况") + private String gykzJcsqk; + /** + * 工业控制-网络互联情况 + */ + @ApiModelProperty("工业控制-网络互联情况") + private String gykzWlhxqk; + /** + * 工业控制-联系人 + */ + @Size(max= 255,message="工业控制-联系人长度不能超过255") + @ApiModelProperty("工业控制-联系人") + private String gykzLxr; + /** + * 工业控制-服务范围 + */ + @ApiModelProperty("工业控制-服务范围") + private String gykzFwfw; + /** + * 工业控制-联系人电话 + */ + @Size(max= 50,message="工业控制-联系人电话长度不能超过50") + @ApiModelProperty("工业控制-联系人电话") + private String gykzLxrdh; + /** + * 工业控制-设备名称 + */ + @Size(max= 50,message="工业控制-设备名称长度不能超过50") + @ApiModelProperty("工业控制-设备名称") + private String gykzSbmc; + /** + * 工业控制-设备品牌 + */ + @Size(max= 50,message="工业控制-设备品牌长度不能超过50") + @ApiModelProperty("工业控制-设备品牌") + private String gykzSbpp; + /** + * 工业控制-设备类别 + */ + @Size(max= 50,message="工业控制-设备类别长度不能超过50") + @ApiModelProperty("工业控制-设备类别") + private String gykzSblb; + /** + * 工业控制-运营商 + */ + @Size(max= 50,message="工业控制-运营商长度不能超过50") + @ApiModelProperty("工业控制-运营商") + private String gykzYys; + /** + * 工业控制-互联网IP + */ + @Size(max= 50,message="工业控制-互联网IP长度不能超过50") + @ApiModelProperty("工业控制-互联网IP") + private String gykzHlwIp; + /** + * 工业控制-网络层级 + */ + @Size(max= 50,message="工业控制-网络层级长度不能超过50") + @ApiModelProperty("工业控制-网络层级") + private String gykzWlcj; + /** + * 工业控制-控制台IP + */ + @Size(max= 50,message="工业控制-控制台IP长度不能超过50") + @ApiModelProperty("工业控制-控制台IP") + private String gykzKztIp; + /** + * 工业控制-描述 + */ + @Size(max= 500,message="工业控制-描述长度不能超过500") + @ApiModelProperty("工业控制-描述") + private String gykzMs; + /** + * CDN信息-CDN供应商 + */ + @Size(max= 255,message="CDN信息-CDN供应商长度不能超过255") + @ApiModelProperty("CDN信息-CDN供应商") + private String cdnGys; + /** + * CDN信息-CDN是否使用 + */ + @ApiModelProperty("CDN信息-CDN是否使用") + private String cdnSfsy; + /** + * CDN信息-CDN类型 + */ + @Size(max= 50,message="CDN信息-CDN类型长度不能超过50") + @ApiModelProperty("CDN信息-CDN类型") + private String cdnLx; + /** + * CDN信息-CDN域名 + */ + @Size(max= 50,message="CDN信息-CDN域名长度不能超过50") + @ApiModelProperty("CDN信息-CDN域名") + private String cdnYm; + /** + * CDN信息-联系人 + */ + @Size(max= 50,message="CDN信息-联系人长度不能超过50") + @ApiModelProperty("CDN信息-联系人") + private String cdnLxr; + /** + * CDN信息-联系人电话 + */ + @Size(max= 50,message="CDN信息-联系人电话长度不能超过50") + @ApiModelProperty("CDN信息-联系人电话") + private String cdnLxrdh; + /** + * CDN信息-CDN加速信息 + */ + @Size(max= 500,message="CDN信息-CDN加速信息长度不能超过500") + @ApiModelProperty("CDN信息-CDN加速信息") + private String cdnJsxx; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java similarity index 95% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java index a43e4bb..a4a76f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java @@ -1,21 +1,15 @@ -package com.ruoyi.tc.entity.response; +package com.ruoyi.tc.entity.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.annotation.Excel; import com.ruoyi.tc.baseClass.BaseClass; -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.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; import java.util.List; @@ -29,9 +23,15 @@ import java.util.List; @Data @ApiModel("现有资产复制表") @TableName(value = "asset_current_cp") -public class AssetCurrentResponse extends BaseClass implements Serializable { +public class AssetCurrentCpPo extends BaseClass implements Serializable { private static final long serialVersionUID = 1L; +// /** +// * 主键id +// */ +// @TableId(type = IdType.AUTO,value = "current_id") +// private Long currentId; + @ApiModelProperty("资产id") private Long id; @@ -104,12 +104,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @ApiModelProperty("关联域名list") @TableField(exist = false) - private List glymList; - + private List glymList; @ApiModelProperty("关联iplist）") @TableField(exist = false) - private List glIpList; + private List glIpList; + /** * 关联ip（多个用,分隔） @@ -196,12 +196,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { */ @ApiModelProperty("存活率（字典）") private String chl; - /** - * 地理位置 - */ - - @ApiModelProperty("地理位置") - private String dlwz; +// /** +// * 地理位置 +// */ +// +// @ApiModelProperty("地理位置") +// private String dlwz; /** * 经度 */ @@ -409,7 +409,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @ApiModelProperty("其他联系人") @TableField(exist = false) - private List otherConcat; + private List otherConcat; /** * ICP备案信息-是否备案 @@ -608,17 +608,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { private String dbxxSfydsfcp; @ApiModelProperty("地理位置-省") - - @TableField(exist = false) private String sheng; @ApiModelProperty("地理位置-市") - - @TableField(exist = false) private String shi; @ApiModelProperty("地理位置-区（县）") - @TableField(exist = false) private String qu; /** * 等保信息-测评得分 @@ -727,20 +722,20 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { */ @ApiModelProperty("供应链信息列表") @TableField(exist = false) - private List gylxxList; + private List gylxxList; /** * 基础网络列表 */ @ApiModelProperty("基础网络列表") @TableField(exist = false) - private List jcwlList; + private List jcwlList; /** * 新监管业务形态 */ @ApiModelProperty("新监管业务形态") @TableField(exist = false) - private AssetBusinessFormCpResponse xjgywxt; + private AssetBusinessFormCpPo xjgywxt; /** * Whois信息-有效性 */ @@ -935,5 +930,5 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { private String bfyy; @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") - private Integer status; + private Integer status=0; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java new file mode 100644 index 0000000..292cc45 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java @@ -0,0 +1,1058 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import com.ruoyi.tc.entity.AssetBasicNetwork; +import com.ruoyi.tc.entity.UnitOtherConcat; +import com.ruoyi.tc.entity.request.Acomma; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Size; +import java.io.Serializable; +import java.util.List; + +/** +* 现有资产表(asset_current)实体类 +* @author du +* @since 2024/11/13 14:44 +*/ +@Data +@ApiModel("现有资产表") +@TableName(value = "asset_current_cp") +public class AssetCurrentJyPo extends BaseClass implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "current_id") + private Long currentId; + + private Long id; + + /** + * 任务id + */ + + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 系统名称 + */ + @NotBlank + @Size(max= 100,message="系统名称长度不能超过100") + @Excel(name = "*系统名称",sort = 2,width = 40,required = true) + @ApiModelProperty("系统名称") + private String xtmc; + /** + * 单位名称 + */ + @NotBlank + @Size(max= 50,message="单位名称长度不能超过50") + @ApiModelProperty("单位名称") + @Excel(name = "*单位名称",sort = 1,width = 40) + private String dwmc; + /** + * 系统域名 + */ + @Size(max= 50,message="系统域名长度不能超过50") + @ApiModelProperty("系统域名") + @Excel(name = "域名",sort = 3) + private String xtym; + + @Excel(name ="访问网址-协议类型",sort = 12,width = 26) + @ApiModelProperty("访问网址-协议类型") + @TableField(exist = false) + private String fwwzXylx; + /** + * 访问网址 + */ + @Excel(name ="访问网址",sort = 13) + @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\"",sort = 7,width = 60) + @Excel(name ="关联资产（多个资产用逗号隔开,例如\n{\"ipv4\":[\"1.1.1.1:8080\",\"2.2.2.2:8080\"],\"ipv6\":\n[\"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) + @Excel(name = "*是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10) + @ApiModelProperty("是否关基系统（字典）") + private String gjxt; + /** + * 系统标签 + */ + @Excel(name = "系统标签（多个标签逗号隔开）",sort = 11,width = 32) + @Size(max= 255,message="系统标签长度不能超过255") + @ApiModelProperty("系统标签") + private String xtbq; + /** + * 机房信息 + */ + @NotBlank + @Excel(name = "*机房信息",sort = 58) + @Size(max= 500,message="机房信息长度不能超过500") + @ApiModelProperty("机房信息") + private String jfxx; + /** + * 使用时间 + */ + @NotBlank + @Size(max= 50,message="使用时间长度不能超过50") + @ApiModelProperty("使用时间") + @Excel(name = "使用时间",sort = 116) + private String sysj; + /** + * 是否是互联网系统（字典） + */ + @NotNull + @Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 117 ) + @ApiModelProperty("是否是互联网系统（字典）") + private String hlwxt; + /** + * 系统编号 + */ + @Size(max= 50,message="系统编号长度不能超过50") + @ApiModelProperty("系统编号") + @Excel(name = "系统编号",sort = 35) + private String xtbh; + /** + * 系统状态（字典） + */ +// @Excel(name = "系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36) + @Excel(name = "*系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36) + @NotNull + @ApiModelProperty("系统状态（字典）") + private String xtzt; + /** + * 在线状态（字典） + */ + @Excel(name = "在线状态",dictType = "zc_zxzt",comboReadDict = true,sort = 37) + @ApiModelProperty("在线状态（字典）") + private String zxzt; + + @Excel(name = "使用人",sort = 38) + @TableField(exist = false) + @ApiModelProperty("使用人") + private String syr; + /** + * C-机密性（字典） + */ + @Excel(name = "机密性",dictType = "zc_c_i_a",comboReadDict = true,sort = 39) + @ApiModelProperty("C-机密性（字典）") + private String cjmx; + /** + * I-完整性（字典） + */ + @Excel(name = "完整性",dictType = "zc_c_i_a",comboReadDict = true,sort = 40) + @ApiModelProperty("I-完整性（字典）") + private String iwzx; + /** + * A-可用性(字典） + */ + @Excel(name = "可用性",dictType = "zc_c_i_a",comboReadDict = true,sort = 41) + @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 = "系统特征（多选，多个特征用逗号隔开。选项为",sort = 52) + @Excel(width = 60,name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）",sort = 52) + @ApiModelProperty("系统特征（,分隔）") + private String xttz; + /** + * 用户规模 + */ + @Excel(name = "*用户规模",dictType ="zc_yhgm",comboReadDict = true,sort = 53) + @NotNull + @ApiModelProperty("用户规模") + private String yhgm; + /** + * 互联网接入运营商 + */ + @NotBlank + @Excel(name = "*互联网接入运营商",sort = 54) + @Size(max= 50,message="互联网接入运营商长度不能超过50") + @ApiModelProperty("互联网接入运营商") + private String hlwjryys; + + @Excel(name = "*物理接入地址",sort = 55) + @ApiModelProperty("*物理接入地址") + @TableField(exist = false) + private String wljrdz; + + /** + * 资产物理接入地址 + */ + @Excel(name = "*资产物理接入地址",sort = 118,width = 28) + @NotBlank + @Size(max= 50,message="资产物理接入地址长度不能超过50") + @ApiModelProperty("资产物理接入地址") + private String zcwljrdz; + /** + * 是否部署云平台（字典） + */ + @NotNull + @Excel(name = "*是否部署云平台",sort = 56,dictType = "is_no",comboReadDict = true) + @ApiModelProperty("是否部署云平台（字典）") + private String bsypt; + /** + * 云服务商名称 + */ + @Excel(name = "云服务商名称（“是否部署云平台”选择“是”必须填写，选择“否”则无需填写）",sort = 57,width = 45) + @Size(max= 100,message="云服务商名称长度不能超过100") + @ApiModelProperty("云服务商名称") + private String yfwsmc; + /** + * 网站访问协议/开通协议 + */ + @Excel(name = "*网站访问协议",sort = 64) + @Size(max= 255,message="网站访问协议/开通协议长度不能超过255") + @ApiModelProperty("网站访问协议/开通协议") + private String wzfwxy; + /** + * 系统部署方式 + */ + @Excel(name = "*系统部署方式",dictType = "zc_xtbsfs",comboReadDict = true,sort = 59) + @NotNull + @ApiModelProperty("系统部署方式") + private String xtbsfs; + /** + * 托管单位 + */ + @Excel(name = "托管单位（系统部署方式选择“托管第三方”此项必填）",sort = 60,width = 45) + @Size(max= 100,message="托管单位长度不能超过100") + @ApiModelProperty("托管单位") + private String tgdw; + /** + * 云服务商 + */ + @Excel(name = "云服务商（系统部署方式选择“云上”此项必填）",sort = 61) + @Size(max= 100,message="云服务商长度不能超过100") + @ApiModelProperty("云服务商") + private String yfws; + /** + * 是否对公众开放（字典） + */ + @Excel(name = "*是否对公众开放",dictType = "is_no",comboReadDict = true,sort = 62,width = 22) + @NotNull + @ApiModelProperty("是否对公众开放（字典）") + private String dgzkf; + /** + * 互联网开放用途（字典） + */ + @NotNull + @Excel(name = "*互联网开放用途",dictType = "zc_hlwkfyt",comboReadDict = true,sort = 63,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") + @ApiModelProperty("相关业务-业务描述") + private String xgywYwms; + + @Excel(name = "责任人",sort = 14) + @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备案编号",sort = 25,width = 46) + @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 = "*备案域名",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 = 35,width = 22) + @NotNull + @ApiModelProperty("系统架构-是否有国产设备") + private String xtjgGcsb; + /** + * 系统架构-系统设备国产化率 + */ + @Size(max= 50,message="系统架构-系统设备国产化率长度不能超过50") + @ApiModelProperty("系统架构-系统设备国产化率") + private String xtjgGchl; + /** + * 等保信息-是否等保系统 + */ + @Excel(name = "*是否是等保系统",dictType = "is_no",comboReadDict = true,sort = 42) + @NotNull + @ApiModelProperty("等保信息-是否等保系统") + private String dbxxSfdbxt; + /** + * 等保信息-等保测评备案号 + */ + @NotBlank + @Excel(name = "*等保测评备案号",sort = 43,width = 22) + @Size(max= 50,message="等保信息-等保测评备案号长度不能超过50") + @ApiModelProperty("等保信息-等保测评备案号") + private String dbxxDbcpbah; + /** + * 等保信息-等保等级 + */ + @NotNull + @Excel(name = "*等保等级",dictType = "dbxx_dbdj",comboReadDict = true,sort = 44) + @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 = 119,width = 40) + @Size(max= 50,message="等保信息-定级时间长度不能超过50") + @ApiModelProperty("等保信息-定级时间") + private String dbxxDjsj; + /** + * 等保信息-是否有第三方测评 + */ +// @Excel(name = "是否有第三方测评",width = 45,dictType = "is_no",comboReadDict = true,sort = 45) + @ApiModelProperty("等保信息-是否有第三方测评") + @NotNull + @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）",width = 45,dictType = "is_no",comboReadDict = true,sort = 45) + private String dbxxSfydsfcp; + + @ApiModelProperty("地理位置-省") + @Excel(name = "地理位置-省",sort = 46) + private String sheng; + + @ApiModelProperty("地理位置-市") + @Excel(name = "地理位置-市",sort = 47) + private String shi; + + @ApiModelProperty("地理位置-区（县）") + @Excel(name = "地理位置-区（县）",sort = 48) + private String qu; + /** + * 等保信息-测评得分 + */ + @NotBlank + @Excel(name = "*测评得分",sort = 49) + @Size(max= 50,message="等保信息-测评得分长度不能超过50") + @ApiModelProperty("等保信息-测评得分") + private String dbxxCpdf; + /** + * 第三方测评-测评机构名称 + */ + @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 = 50,width = 22) + @Size(max= 50,message="密评信息-是否密评系统长度不能超过50") + @ApiModelProperty("密评信息-是否密评系统") + private String mpSfmpxt; + /** + * 密评信息-密评得分 + */ + @Excel(name = "密评得分",sort = 51) + @Size(max= 50,message="密评信息-密评得分长度不能超过50") + @ApiModelProperty("密评信息-密评得分") + private String mpMpdf; + + /** + * 供应链信息列表 + */ + @ApiModelProperty("供应链信息列表") + @TableField(exist = false) + private List gylxxList; + /** + * 基础网络列表 + */ + @ApiModelProperty("基础网络列表") + @TableField(exist = false) + private List jcwlList; + + /** + * 新监管业务形态 + */ + @ApiModelProperty("新监管业务形态") + @TableField(exist = false) + private AssetBusinessFormJyPo 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 = 98) + @Size(max= 50,message="编码长度不能超过255") + @ApiModelProperty("数据资产-数据库名称") + private String sjzcSjkmc; + /** + * 数据资产-数据库类型 + */ + @NotBlank + @Excel(name = "*数据库类型",sort = 99) + @Size(max= 50,message="数据资产-数据库类型长度不能超过50") + @ApiModelProperty("数据资产-数据库类型") + private String sjzcSjklx; + /** + * 数据资产-端口 + */ + @Excel(name = "*数据库端口",sort = 100) + @NotBlank + @Size(max= 50,message="数据资产-端口长度不能超过50") + @ApiModelProperty("数据资产-端口") + private String sjzcDk; + /** + * 数据资产-数据库版本 + */ + @Excel(name = "*数据库版本",sort = 101) + @NotBlank + @Size(max= 50,message="数据资产-数据库版本长度不能超过255") + @ApiModelProperty("数据资产-数据库版本") + private String sjzcSjkbb; + /** + * 数据资产-数据库所在IP + */ + @Excel(name = "*数据库所在IP",sort = 102) + @Size(max= 50,message="数据资产-数据库所在IP长度不能超过50") + @ApiModelProperty("数据资产-数据库所在IP") + private String sjzcSjkIp; + /** + * 数据资产-共享属性 + */ + @NotNull + @Excel(name = "*共享属性",dictType = "sjzc_gxsx",comboReadDict = true,sort = 103) + @ApiModelProperty("数据资产-共享属性") + private String sjzcGxsx; + /** + * 数据资产-开放属性 + */ + @Excel(name = "*开放属性",dictType = "sjzc_kfsx",comboReadDict = true,sort = 104) + @NotNull + @ApiModelProperty("数据资产-开放属性") + private String sjzcKfsx; + /** + * 数据资产-数据领域 + */ + @NotNull + @Excel(name = "*数据领域",dictType = "sjzc_sjly",comboReadDict = true,sort = 105) + @ApiModelProperty("数据资产-数据领域") + private String sjzcSjly; + /** + * 数据资产-更新周期 + */ + @NotNull + @Excel(name = "*更新周期",dictType = "sjzc_gxzq",comboReadDict = true,sort = 106) + @ApiModelProperty("数据资产-更新周期") + private String sjzcGxzq; + /** + * 数据资产-数据类型 + */ + @NotBlank + @Excel(name = "*数据类型",sort = 107) + @Size(max= 255,message="数据资产-数据类型长度不能超过255") + @ApiModelProperty("数据资产-数据类型") + private String sjzcSjlx; + /** + * 数据资产-数据量 + */ + @NotBlank + @Excel(name = "*数据量",sort = 108) + @Size(max= 255,message="数据资产-数据量长度不能超过255") + @ApiModelProperty("数据资产-数据量") + private String sjzcSjl; + + @Excel(name = "*数据量单位",sort = 109) + @ApiModelProperty("数据资产-数据量单位") + @TableField(exist = false) + private String sjzcSjldw; + /** + * 数据资产-是否为涉密数据 + */ + @NotNull + @Excel(name = "*是否为涉密数据",dictType = "is_no",comboReadDict = true,sort = 110) + @ApiModelProperty("数据资产-是否为涉密数据") + private String sjzcSmsj; + /** + * 数据资产-数据是否出境 + */ + @NotNull + @Excel(name = "*数据是否出境",dictType = "is_no",comboReadDict = true,sort = 111) + @ApiModelProperty("数据资产-数据是否出境") + private String sjzcCj; + /** + * 数据资产-数据分级分类 + */ + @NotNull + @Excel(name = "*数据分级分类",dictType = "sjzc_sjfjfl",comboReadDict = true,sort = 112) + @ApiModelProperty("数据资产-数据分级分类") + private String sjzcSjfjfl; + /** + * 数据资产-数据重要程度 + */ + @NotNull + @Excel(name = "数据重要程度",dictType = "zc_xtzyx",comboReadDict = true,sort = 113) + @ApiModelProperty("数据资产-数据重要程度") + private String sjzcSjzycd; + /** + * 数据资产-数据描述 + */ + @Size(max= 500,message="数据资产-数据描述长度不能超过500") + @ApiModelProperty("数据资产-数据描述") + @Excel(name = "数据描述",sort = 114) + private String sjzcSjms; + + @ApiModelProperty("*业务描述") + @Excel(name = "*业务描述",sort = 115) + @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; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainCpPo.java similarity index 88% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainCpPo.java index 671b7df..1d39534 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainCpPo.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.entity.response; +package com.ruoyi.tc.entity.po; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -8,7 +8,6 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import javax.validation.constraints.Size; import java.io.Serializable; /** @@ -19,9 +18,17 @@ import java.io.Serializable; @Data @ApiModel("资产供应链信息复制表响应类") @TableName(value = "asset_supply_chain_cp") -public class AssetSupplyChainCpResponse extends BaseClass implements Serializable { +public class AssetSupplyChainCpPo extends BaseClass implements Serializable { + + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "supply_id") + private Long supplyId; + + + - private Long id; /** * 资产id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainJyPo.java new file mode 100644 index 0000000..234de59 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSupplyChainJyPo.java @@ -0,0 +1,84 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.Size; +import java.io.Serializable; + +/** + * 资产供应链信息(asset_supply_chain)实体类 + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("资产供应链信息") +@TableName(value = "asset_supply_chain_cp") +public class AssetSupplyChainJyPo extends BaseClass implements Serializable { + + /** + * 主键id + */ + @TableId(type = IdType.AUTO,value = "supply_id") + private Long supplyId; + + + + + /** + * 资产id + */ + @ApiModelProperty("资产id") + private Long assetId; + /** + * 1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位 + */ + @ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位") + private Integer type; + /** + * 名称 + */ + @Size(max= 50,message="名称长度不能超过50") + @ApiModelProperty("名称") + private String name; + /** + * 统一信用代码 + */ + @Size(max= 50,message="统一信用代码长度不能超过50") + @ApiModelProperty("统一信用代码") + private String tyshxydm; + /** + * 联系人 + */ + @Size(max= 50,message="联系人长度不能超过50") + @ApiModelProperty("联系人") + private String lxr; + /** + * 联系电话 + */ + @Size(max= 50,message="联系电话长度不能超过50") + @ApiModelProperty("联系电话") + private String lxdh; + /** + * 供应商注册地址 + */ + @Size(max= 500,message="供应商注册地址长度不能超过500") + @ApiModelProperty("供应商注册地址") + private String gyszcdz; + /** + * 注册地是否为太仓 + */ + @ApiModelProperty("注册地是否为太仓") + private String sfwtc; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/UnitOtherConcatCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatCpPo.java similarity index 78% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/UnitOtherConcatCpResponse.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatCpPo.java index bb7b2f6..5a4df3e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/UnitOtherConcatCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatCpPo.java @@ -1,5 +1,7 @@ -package com.ruoyi.tc.entity.response; +package com.ruoyi.tc.entity.po; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.tc.baseClass.BaseClass; import io.swagger.annotations.ApiModel; @@ -17,8 +19,13 @@ import java.io.Serializable; @Data @ApiModel("单位其他联系人复制表") @TableName(value = "unit_other_contact_cp") -public class UnitOtherConcatCpResponse extends BaseClass implements Serializable { - @ApiModelProperty("主键id") +public class UnitOtherConcatCpPo extends BaseClass implements Serializable { + + + + + @ApiModelProperty("主表id") + @TableId(type = IdType.AUTO,value = "concat_id") private Long concatId; @ApiModelProperty("单位id") diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatJyPo.java new file mode 100644 index 0000000..8c8231c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/UnitOtherConcatJyPo.java @@ -0,0 +1,57 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 单位其他联系人(unit_other_contact)实体类 + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("单位其他联系人") +@TableName(value = "unit_other_contact_cp") +public class UnitOtherConcatJyPo extends BaseClass implements Serializable { + + + + + + /** + * 主表id + */ + @TableId(type = IdType.AUTO,value = "concat_id") + @ApiModelProperty("主表id") + private Long concatId; + + @ApiModelProperty("单位id") + private Long unitId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("其他联系人姓名") + private String qtlxrxm; + + @ApiModelProperty("其他联系人联系方式") + private String qtlxrlxfs; + + @ApiModelProperty("其他联系人邮箱") + private String qtlxryx; + + @ApiModelProperty("其他联系人职务职称") + private String qtlxrzwzc; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java index d208dc4..58ff333 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * @author makejava * @since 2024-11-15 10:03:56 */ -public interface AssetBasicNetWorkCpMapper extends BaseMapper { +public interface AssetBasicNetWorkCpMapper extends BaseMapper { /** * 根据资产id资产供应链原有id @@ -23,7 +24,7 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper findByassetId(Long assetId); + List findByassetId(Long assetId); /** @@ -32,7 +33,7 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper { + +} \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java index e406e6f..4b74c5c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * @author makejava * @since 2024-11-15 10:03:56 */ -public interface AssetBusinessFormCpMapper extends BaseMapper { +public interface AssetBusinessFormCpMapper extends BaseMapper { /** @@ -23,7 +24,7 @@ public interface AssetBusinessFormCpMapper extends BaseMapper findByassetId(Long assetId); + List findByassetId(Long assetId); /** @@ -32,8 +33,8 @@ public interface AssetBusinessFormCpMapper extends BaseMapper { + + + /** + * 根据资产id查询业务主表原有id + * + * @param assetId 资产id + * @return + */ + @Select("select * from asset_business_form where asset_id =#{assetId}") + List findByassetId(Long assetId); + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_business_form_cp where asset_id=#{assetId} and task_id ={taskId} ") + void deletByAssetIdandTaskId(Long assetId, int taskId); + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java index a265c3c..490bcf4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java @@ -1,28 +1,23 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; -import java.util.List; - /** * 现有资产复制表(AssetCurrentResponse)表数据库访问层 * * @author makejava * @since 2024-11-15 10:03:56 */ -public interface AssetCurrentCpMapper extends BaseMapper { +public interface AssetCurrentCpMapper extends BaseMapper { /** * * @param assetId * @param taskId */ - @Delete("delete from asset_current_cp where id=#{assetId} and task_id ={taskId} ") - void deletByAssetIdandTaskId(Long assetId,int taskId); + @Delete("delete from asset_current_cp where id=#{assetId} and task_id =#{taskId} ") + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentJyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentJyMapper.java new file mode 100644 index 0000000..33e78c2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentJyMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetCurrentJyPo; + +/** + * 现有资产复制表(AssetCurrentResponse)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetCurrentJyMapper extends BaseMapper { + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java index 22b799f..73ab9f5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -13,7 +14,7 @@ import java.util.List; * @author makejava * @since 2024-11-15 10:03:56 */ -public interface AssetSupplyChainCpMapper extends BaseMapper { +public interface AssetSupplyChainCpMapper extends BaseMapper { /** @@ -23,7 +24,7 @@ public interface AssetSupplyChainCpMapper extends BaseMapper findByassetId(Long assetId); + List findByassetId(Long assetId); /** @@ -32,8 +33,7 @@ public interface AssetSupplyChainCpMapper extends BaseMapper { + + + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java index 0d7aebd..5f7b365 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java @@ -7,7 +7,7 @@ import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -105,7 +105,7 @@ public interface AssetTaskMapper extends BaseMapper { * @param dwmc 单位名称 * @return */ - List findByDwmcAssetCurrent(String dwmc); + List findByDwmcAssetCurrent(String dwmc); /** @@ -125,7 +125,7 @@ public interface AssetTaskMapper extends BaseMapper { * @param assetId 资产id * @return */ - AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); + AssetCurrentCpPo findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java index f525a44..21d9749 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java @@ -1,8 +1,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -12,7 +13,7 @@ import java.util.List; * * @author ruoyi */ -public interface UnitOtherConcatCpMapper extends BaseMapper { +public interface UnitOtherConcatCpMapper extends BaseMapper { /** @@ -22,7 +23,7 @@ public interface UnitOtherConcatCpMapper extends BaseMapper findByassetId(Long assetId); + List findByassetId(Long assetId); /** @@ -31,6 +32,6 @@ public interface UnitOtherConcatCpMapper extends BaseMapper { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java index afba7f7..e0f0102 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java @@ -1,8 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.AssetBasicNetwork; -import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import java.util.List; @@ -12,7 +11,7 @@ import java.util.List; * @author makejava * @since 2024-11-15 16:05:26 */ -public interface AssetBasicNetworkCpService extends IService { +public interface AssetBasicNetworkCpService extends IService { /** * 根据资产id资产供应链原有id @@ -20,7 +19,7 @@ public interface AssetBasicNetworkCpService extends IService findByassetId(Long assetId); + List findByassetId(Long assetId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkJyService.java new file mode 100644 index 0000000..8ff2160 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkJyService.java @@ -0,0 +1,18 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; +import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo; + +import java.util.List; + +/** + * 资产基础网络复制表(asset_basic_network)表服务接口 + * + * @author makejava + * @since 2024-11-15 16:05:26 + */ +public interface AssetBasicNetworkJyService extends IService { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java index 33a5716..de3469f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; import java.util.List; @@ -11,14 +11,14 @@ import java.util.List; * @author makejava * @since 2024-11-15 16:06:53 */ -public interface AssetBusinessFormCpService extends IService { +public interface AssetBusinessFormCpService extends IService { /** * 根据资产id查询业务主表原有id * @param assetId 资产id * @return */ - List findByassetId(Long assetId); + List findByassetId(Long assetId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormJyService.java new file mode 100644 index 0000000..b55c9d0 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormJyService.java @@ -0,0 +1,17 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo; + +/** + * 资产新监管业务形态复制(asset_business_form_cp)表服务接口 + * + * @author makejava + * @since 2024-11-15 16:06:53 + */ +public interface AssetBusinessFormJyService extends IService { + + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java index ccf7aa6..6c632fc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; /** * 现有资产复制表(AssetCurrentResponse)表服务接口 @@ -9,7 +9,7 @@ import com.ruoyi.tc.entity.response.AssetCurrentResponse; * @author makejava * @since 2024-11-15 10:04:03 */ -public interface AssetCurrentCpService extends IService { +public interface AssetCurrentCpService extends IService { /** * 根据资产id和任务id删除数据 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentJyService.java new file mode 100644 index 0000000..e0b7903 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentJyService.java @@ -0,0 +1,16 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetCurrentJyPo; + +/** + * 现有资产表(AssetCurrent)表服务接口 + * + * @author makejava + * @since 2024-11-15 10:04:03 + */ +public interface AssetCurrentJyService extends IService { + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java index 5e2c559..2cd34a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * @author makejava * @since 2024-11-15 16:07:30 */ -public interface AssetSupplyChainCpService extends IService { +public interface AssetSupplyChainCpService extends IService { /** * 根据资产id资产供应链原有id @@ -19,7 +19,7 @@ public interface AssetSupplyChainCpService extends IService findByassetId(Long assetId); + List findByassetId(Long assetId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainJyService.java new file mode 100644 index 0000000..de94677 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainJyService.java @@ -0,0 +1,14 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo; + +/** + * 资产供应链信息(asset_supply_chain)表服务接口 + * @author makejava + * @since 2024-11-15 16:07:30 + */ +public interface AssetSupplyChainJyService extends IService { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java index b7dffe1..1e77dea 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java @@ -7,7 +7,7 @@ import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; /** @@ -67,7 +67,7 @@ public interface AssetTaskService extends IService { * @param assetId 资产id * @return */ - AssetCurrentResponse taskSh(int taskId, int assetId); + AssetCurrentCpPo taskSh(int taskId, int assetId); /** * 资产核查信息 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java index ce52585..8a95ae6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java @@ -1,8 +1,8 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.UnitOtherConcat; -import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; +import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo; import java.util.List; @@ -11,7 +11,7 @@ import java.util.List; * @author du * @since 2024/11/13 14:55 */ -public interface UnitOtherConcatCpService extends IService { +public interface UnitOtherConcatCpService extends IService { /** * 根据资产id资产供应链原有id @@ -19,7 +19,7 @@ public interface UnitOtherConcatCpService extends IService findByassetId(Long assetId); + List findByassetId(Long assetId); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatJyservice.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatJyservice.java new file mode 100644 index 0000000..617bd0f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatJyservice.java @@ -0,0 +1,17 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; +import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo; + +import java.util.List; + +/** + * 单位其他联系人复制(unit_other_contact_cp)业务层 + * @author du + * @since 2024/11/13 14:55 + */ +public interface UnitOtherConcatJyservice extends IService { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java index be4c680..ee706f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import com.ruoyi.tc.mapper.AssetBasicNetWorkCpMapper; import com.ruoyi.tc.service.AssetBasicNetworkCpService; import org.springframework.stereotype.Service; @@ -16,13 +16,13 @@ import java.util.List; * @since 2024-11-15 16:05:26 */ @Service("assetBasicNetworkCpService") -public class AssetBasicNetworkCpServiceImpl extends ServiceImpl implements AssetBasicNetworkCpService { +public class AssetBasicNetworkCpServiceImpl extends ServiceImpl implements AssetBasicNetworkCpService { @Resource private AssetBasicNetWorkCpMapper assetBasicNetWorkCpMapper; @Override - public List findByassetId(Long assetId) { + public List findByassetId(Long assetId) { return assetBasicNetWorkCpMapper.findByassetId(assetId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkJyServiceImpl.java new file mode 100644 index 0000000..c121f75 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkJyServiceImpl.java @@ -0,0 +1,25 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; +import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo; +import com.ruoyi.tc.mapper.AssetBasicNetWorkCpMapper; +import com.ruoyi.tc.mapper.AssetBasicNetWorkJyMapper; +import com.ruoyi.tc.service.AssetBasicNetworkCpService; +import com.ruoyi.tc.service.AssetBasicNetworkJyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 资产基础网络复制表(AssetBasicNetworkCpResponse)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:05:26 + */ +@Service("assetBasicNetworkJyService") +public class AssetBasicNetworkJyServiceImpl extends ServiceImpl implements AssetBasicNetworkJyService { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java index a025496..b3a8b31 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; import com.ruoyi.tc.mapper.AssetBusinessFormCpMapper; import com.ruoyi.tc.service.AssetBusinessFormCpService; import org.springframework.stereotype.Service; @@ -16,13 +16,13 @@ import javax.annotation.Resource; * @since 2024-11-15 16:06:53 */ @Service("assetBusinessFormCpService") -public class AssetBusinessFormCpServiceImpl extends ServiceImpl implements AssetBusinessFormCpService { +public class AssetBusinessFormCpServiceImpl extends ServiceImpl implements AssetBusinessFormCpService { @Resource private AssetBusinessFormCpMapper assetBusinessFormCpMapper; @Override - public List findByassetId(Long assetId) { + public List findByassetId(Long assetId) { return assetBusinessFormCpMapper.findByassetId(assetId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormJyServiceImpl.java new file mode 100644 index 0000000..183ff8b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormJyServiceImpl.java @@ -0,0 +1,20 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo; +import com.ruoyi.tc.mapper.AssetBusinessFormJyMapper; +import com.ruoyi.tc.service.AssetBusinessFormJyService; +import org.springframework.stereotype.Service; + +/** + * 资产新监管业务形态复制(AssetBusinessFormCp)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:06:53 + */ +@Service("assetBusinessFormJyService") +public class AssetBusinessFormJyServiceImpl extends ServiceImpl implements AssetBusinessFormJyService { + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java index 5fb68ec..f25a3f1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java @@ -1,18 +1,12 @@ package com.ruoyi.tc.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.*; -import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.mapper.AssetCurrentCpMapper; -import com.ruoyi.tc.mapper.AssetCurrentMapper; import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.io.Serializable; -import java.util.List; /** * 现有资产复制表(AssetCurrentResponse)表服务实现类 @@ -21,7 +15,7 @@ import java.util.List; * @since 2024-11-15 10:04:03 */ @Service("assetCurrentCpService") -public class AssetCurrentCpServiceImpl extends ServiceImpl implements AssetCurrentCpService { +public class AssetCurrentCpServiceImpl extends ServiceImpl implements AssetCurrentCpService { @Resource private AssetCurrentCpMapper assetCurrentCpMapper; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentJyServiceImpl.java new file mode 100644 index 0000000..e5d15ec --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentJyServiceImpl.java @@ -0,0 +1,20 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetCurrentJyPo; +import com.ruoyi.tc.mapper.AssetCurrentJyMapper; +import com.ruoyi.tc.service.AssetCurrentJyService; +import org.springframework.stereotype.Service; + +/** + * 现有资产复制表(AssetCurrentResponse)表服务实现类 + * + * @author makejava + * @since 2024-11-15 10:04:03 + */ +@Service("assetCurrentJyService") +public class AssetCurrentJyServiceImpl extends ServiceImpl implements AssetCurrentJyService { + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java index 7b6ff2e..9180bd3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java @@ -1,12 +1,9 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.AssetSupplyChain; -import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import com.ruoyi.tc.mapper.AssetSupplyChainCpMapper; -import com.ruoyi.tc.mapper.AssetSupplyChainMapper; import com.ruoyi.tc.service.AssetSupplyChainCpService; -import com.ruoyi.tc.service.AssetSupplyChainService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -19,12 +16,12 @@ import java.util.List; * @since 2024-11-15 16:07:30 */ @Service("assetSupplyChainCpService") -public class AssetSupplyChainCpServiceImpl extends ServiceImpl implements AssetSupplyChainCpService { +public class AssetSupplyChainCpServiceImpl extends ServiceImpl implements AssetSupplyChainCpService { @Resource private AssetSupplyChainCpMapper assetSupplyChainCpMapper; @Override - public List findByassetId(Long assetId) { + public List findByassetId(Long assetId) { return assetSupplyChainCpMapper.findByassetId(assetId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainJyServiceImpl.java new file mode 100644 index 0000000..f81b1ea --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainJyServiceImpl.java @@ -0,0 +1,19 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo; +import com.ruoyi.tc.mapper.AssetSupplyChainJyMapper; +import com.ruoyi.tc.service.AssetSupplyChainJyService; +import org.springframework.stereotype.Service; + +/** + * 资产供应链信息表复制(AssetSupplyChainCpResponse)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:07:30 + */ +@Service("assetSupplyChainJyService") +public class AssetSupplyChainJyServiceImpl extends ServiceImpl implements AssetSupplyChainJyService { + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 71ba791..e7c0cbb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -2,28 +2,27 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.AssetLc; import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.request.Acomma; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse; -import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; -import com.ruoyi.tc.entity.response.AssetCurrentResponse; -import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; +import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; +import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; -import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; import com.ruoyi.tc.mapper.AssetTaskMapper; -import com.ruoyi.tc.service.AssetBasicNetworkCpService; -import com.ruoyi.tc.service.AssetBusinessFormCpService; -import com.ruoyi.tc.service.AssetCurrentCpService; -import com.ruoyi.tc.service.AssetSupplyChainCpService; -import com.ruoyi.tc.service.AssetTaskService; -import com.ruoyi.tc.service.UnitOtherConcatCpService; +import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -54,7 +53,8 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByDwmcAssetCurrent(part); - for (AssetCurrentResponse assetCurrentResponse : list) { + List list = assetTaskDao.findByDwmcAssetCurrent(part); + for (AssetCurrentCpPo assetCurrentResponse : list) { assetCurrentResponse.setTaskId(id); } assetCurrentCpService.saveBatch(list); - List assetBusinessFormCpResponseList = new ArrayList<>(); - for (AssetCurrentResponse assetCurrentResponse : list) { + List assetBusinessFormCpResponseList = new ArrayList<>(); + for (AssetCurrentCpPo assetCurrentResponse : list) { //新增新监管业务形态 //根据资产id查询新监管业务形态主表id - List bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); + List bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); if (bussList != null) { - for (AssetBusinessFormCpResponse assetBusinessFormCpResponse : bussList) { - assetCurrentResponse.getXjgywxt().setId(assetBusinessFormCpResponse.getId()); + for (AssetBusinessFormCpPo assetBusinessFormCpResponse : bussList) { + assetCurrentResponse.getXjgywxt().setBusinessId(assetBusinessFormCpResponse.getBusinessId()); assetCurrentResponse.getXjgywxt().setAssetId(assetCurrentResponse.getId()); assetCurrentResponse.getXjgywxt().setTaskId(id); assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt()); @@ -111,30 +116,30 @@ public class AssetTaskServiceImpl extends ServiceImpl supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); + List supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); if (supplyChainList != null) { - for (AssetSupplyChainCpResponse items : supplyChainList) { + for (AssetSupplyChainCpPo items : supplyChainList) { items.setAssetId(assetCurrentResponse.getId()); - items.setId(items.getId()); + items.setSupplyId(items.getSupplyId()); items.setTaskId(id); //新增供应链 } assetSupplyChainCpService.saveBatch(supplyChainList); } - List BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); + List BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); if (BasicNetworkCpList != null) { - for (AssetBasicNetworkCpResponse items : BasicNetworkCpList) { + for (AssetBasicNetworkCpPo items : BasicNetworkCpList) { //根据资产id查询基础网络主表id items.setAssetId(assetCurrentResponse.getId()); - items.setId(items.getId()); + items.setNetworkId(items.getNetworkId()); items.setTaskId(id); //新增基础网络 } assetBasicNetworkCpService.saveBatch(BasicNetworkCpList); } - List unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); + List unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); if (unitOtherConcatList != null) { - for (UnitOtherConcatCpResponse items : unitOtherConcatList) { + for (UnitOtherConcatCpPo items : unitOtherConcatList) { //根据资产id查询其他联系人主表id items.setAssetId(assetCurrentResponse.getId()); items.setConcatId(items.getConcatId()); @@ -172,17 +177,33 @@ public class AssetTaskServiceImpl extends ServiceImpl a1 = new ArrayList<>(); + Arrays.asList(byId.getGlym().split(",")).forEach(x->{ + Acomma acomma = new Acomma(); + acomma.setKey(x); + a1.add(acomma); + }); + byId.setGlymList(a1); + List a2 = new ArrayList<>(); + Arrays.asList(byId.getGlIp().split(",")).forEach(x->{ + Acomma acomma = new Acomma(); + acomma.setKey(x); + a2.add(acomma); + }); + byId.setGlIpList(a2); return byId; } @Override - public Page zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { + public Page zcHc(Page assetTask, AssestTaskXqRequest pageRequest) + { + assetTask.setOptimizeCountSql(false); return assetTaskDao.zcHc(assetTask, pageRequest); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java index 2f871f4..d8c8023 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java @@ -1,7 +1,7 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; import com.ruoyi.tc.mapper.UnitOtherConcatCpMapper; import com.ruoyi.tc.service.UnitOtherConcatCpService; import org.springframework.stereotype.Service; @@ -16,12 +16,12 @@ import java.util.List; * @since 2024/11/13 14:58 */ @Service("unitOtherConcatCpService") -public class UnitOtherConcatCpServiceImpl extends ServiceImpl implements UnitOtherConcatCpService { +public class UnitOtherConcatCpServiceImpl extends ServiceImpl implements UnitOtherConcatCpService { @Resource private UnitOtherConcatCpMapper unitOtherConcatCpMapper; @Override - public List findByassetId(Long assetId) { + public List findByassetId(Long assetId) { return unitOtherConcatCpMapper.findByassetId(assetId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatJyServiceImpl.java new file mode 100644 index 0000000..5630862 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatJyServiceImpl.java @@ -0,0 +1,24 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; +import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo; +import com.ruoyi.tc.mapper.UnitOtherConcatCpMapper; +import com.ruoyi.tc.mapper.UnitOtherConcatJyMapper; +import com.ruoyi.tc.service.UnitOtherConcatCpService; +import com.ruoyi.tc.service.UnitOtherConcatJyservice; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 单位其他联系人复制(unit_other_contact_cp)业务处理层 + * + * @author du + * @since 2024/11/13 14:58 + */ +@Service("unitOtherConcatJyservice") +public class UnitOtherConcatJyServiceImpl extends ServiceImpl implements UnitOtherConcatJyservice { + +} diff --git a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml index 75d7e99..6351a02 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml @@ -167,8 +167,8 @@ - insert into asset_lc(task_idxf_timedwhc_timeshbh_timedwcxhc_timeshtg_timeueser_iddept_idcreate_idcreate_bycreate_timeupdate_idupdate_byupdate_timeversionremark) - values (#{taskId}#{xfTime}#{dwhcTime}#{shbhTime}#{dwcxhcTime}#{shtgTime}#{ueserId}#{deptId}#{createId}#{createBy}#{createTime}#{updateId}#{updateBy}#{updateTime}#{version}#{remark}) + insert into asset_lc(task_id,xf_time,dwhc_time,shbh_time,dwcxhc_time,shtg_time,ueser_id,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark) + values (#{taskId},#{xfTime},#{dwhcTime},#{shbhTime},#{dwcxhcTime},#{shtgTime},#{ueserId},#{deptId},#{createId},#{createBy},#{createTime},#{updateId},#{updateBy},#{updateTime},#{version},#{remark}) diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 9b9ea78..020f1f0 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -188,7 +188,7 @@ - select * from asset_current del_flag = '0' and isbf = '0' @@ -222,7 +222,7 @@ - select * from asset_current_cp where task_id = #{taskId} @@ -323,16 +323,11 @@ update asset_current_cp - - task_id = #{req.taskId}, - - - id = #{req.assetId}, - status = #{req.status}, + where id = #{req.assetId} and task_id = #{req.taskId} From 1a36bc3da473af7b28a525e971c0133b16419366 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 22 Nov 2024 09:03:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetTaskController.java | 36 +++++++++++++-- .../java/com/ruoyi/tc/entity/AssetLc.java | 40 ++++------------- .../entity/request/AssetCurrentShRequest.java | 2 + .../tc/entity/request/AssetdwHcRequest.java | 23 ++++++++++ .../tc/entity/response/AssetdwHcResponse.java | 45 +++++++++++++++++++ .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 13 +++++- .../ruoyi/tc/service/AssetTaskService.java | 10 +++++ .../tc/service/impl/AssetTaskServiceImpl.java | 41 +++++++++++------ .../src/main/resources/mapper/AssetLcDao.xml | 23 ++++++++-- .../main/resources/mapper/AssetTaskDao.xml | 24 ++++++++++ 10 files changed, 203 insertions(+), 54 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index 51ab6cc..d002cbe 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -11,8 +11,10 @@ import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetTaskIdResponse; +import com.ruoyi.tc.entity.response.AssetdwHcResponse; import com.ruoyi.tc.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -185,7 +187,7 @@ public class AssetTaskController extends BaseController { assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); if (StringUtils.isBlank(assetCurrent.getBfyy())) { //待审批 - assetCurrent.setStatus(1); + assetCurrent.setStatus(0); } else { //已报废 assetCurrent.setStatus(5); @@ -266,7 +268,10 @@ public class AssetTaskController extends BaseController { assetLc.setAssetName(assetCurrent.getXtmc()); //当审核状态为审核不通过 单位端重新提交 if (assetCurrent.getStatus().equals(4)){ - assetLc.setDwcxhcTime(LocalDateTime.now()); + assetLc.setTaskId(assetCurrent.getTaskId()); + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setAssetName("单位重新核查提交时间"+assetCurrent.getXtmc()); + assetLcService.insert(assetLc); } StringBuilder a = new StringBuilder(); @@ -284,12 +289,18 @@ public class AssetTaskController extends BaseController { b.append(","); }); } + assetCurrent.setGlIp(b.toString()); - assetCurrentJyService.save(assetCurrent); + assetCurrent.setStatus(1); //当审核状态为带待核查 if(assetCurrent.getStatus().equals(1)){ - assetLc.setDwhcTime(LocalDateTime.now()); + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setTaskId(assetCurrent.getTaskId()); + assetLc.setAssetName("单位核查完成提交"+assetCurrent.getXtmc()); + assetLcService.insert(assetLc); } + assetCurrentJyService.save(assetCurrent); + //新增新监管业务形态 if (assetCurrent.getXjgywxt() != null) { assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); @@ -335,5 +346,22 @@ public class AssetTaskController extends BaseController { public AjaxResult sh(@RequestBody AssetCurrentShRequest req) { return AjaxResult.success(assetTaskService.sh(req)); } + + + + /** + * 管理端-单位核查情况 + * + * @param req 请求类 + * @return + */ + @ApiOperation(value = "管理端-单位核查情况",response =AssetdwHcResponse.class ) + @PostMapping("/dwHc") + public AjaxResult dwHc(Page assetdwHcResponsePage, AssetdwHcRequest req) { + return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage,req)); + } + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java index b2e1e0e..01f64d7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java @@ -32,38 +32,19 @@ public class AssetLc implements Serializable { /** * 管理员下发时间 */ - @ApiModelProperty("管理员下发时间") + @ApiModelProperty("时间") @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime xfTime; + + /** - * 单位核查完成提交时间 - */ - @ApiModelProperty("单位核查完成提交时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime dwhcTime; - /** - * 管理员审核驳回时间 - */ - @ApiModelProperty("管理员审核驳回时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime shbhTime; - /** - * 单位重新核查提交时间 - */ - @ApiModelProperty("单位重新核查提交时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime dwcxhcTime; - /** - * 管理员审核通过时间 + * 流程名称 */ - @ApiModelProperty("管理员审核通过时间") - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime shtgTime; + @ApiModelProperty("流程名称") + private String assetName; + + /** * 用户id */ @@ -119,11 +100,6 @@ public class AssetLc implements Serializable { @ApiModelProperty("备注") private String remark; - /** - * 资产名称 - */ - @ApiModelProperty("资产名称") - private String assetName; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java index a968d1e..b036b5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java @@ -27,6 +27,8 @@ public class AssetCurrentShRequest { private Integer assetId; + + /** * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废） */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java new file mode 100644 index 0000000..ae266d4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetdwHcRequest.java @@ -0,0 +1,23 @@ +package com.ruoyi.tc.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dong + * @since 2024/11/21 18:49 + */ +@Data +@ApiModel("单位核查情况请求类") +public class AssetdwHcRequest { + + + /** + * 单位名称 + */ + @ApiModelProperty("单位名称") + private String dwmc; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java new file mode 100644 index 0000000..e9b105f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java @@ -0,0 +1,45 @@ +package com.ruoyi.tc.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dong + * @since 2024/11/21 18:36 + */ +@Data +@ApiModel("核查单位信息响应类") +public class AssetdwHcResponse { + + + /** + * 单位名称 + */ + @ApiModelProperty("单位名称") + private String dwmc; + + + + + /** + * 核查资产数量 + */ + @ApiModelProperty("核查资产数量") + private Integer total; + + + /** + * 完成数量 + */ + @ApiModelProperty("完成数量") + private Integer checked; + + + /** + * 百分比 + */ + @ApiModelProperty("百分比") + private double checkedRatio; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java index 5f7b365..d836b23 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java @@ -6,9 +6,11 @@ import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; +import com.ruoyi.tc.entity.response.AssetdwHcResponse; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -128,7 +130,6 @@ public interface AssetTaskMapper extends BaseMapper { AssetCurrentCpPo findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); - /** * 管理端审核 * @@ -136,5 +137,15 @@ public interface AssetTaskMapper extends BaseMapper { * @return */ int sh(@Param("req") AssetCurrentShRequest req); + + + + + /** + * 管理端-单位核查情况 + * + * @return + */ + Page dwHc(Page assetdwHcResponsePage, @Param("req") AssetdwHcRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java index 1e77dea..a46021d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetTaskService.java @@ -6,9 +6,11 @@ import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; +import com.ruoyi.tc.entity.response.AssetdwHcResponse; /** * 任务主表(AssetTask)表服务接口 @@ -86,4 +88,12 @@ public interface AssetTaskService extends IService { * @return */ int sh(AssetCurrentShRequest req); + + + /** + * 管理端-单位核查情况 + * + * @return + */ + Page dwHc(Page assetdwHcResponsePage,AssetdwHcRequest req); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index e7c0cbb..17fc814 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -4,17 +4,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.tc.entity.AssetLc; import com.ruoyi.tc.entity.AssetTask; -import com.ruoyi.tc.entity.request.Acomma; -import com.ruoyi.tc.entity.request.AssestTaskXqRequest; -import com.ruoyi.tc.entity.request.AssetCurrentShRequest; -import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.po.*; +import com.ruoyi.tc.entity.request.*; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; -import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; -import com.ruoyi.tc.entity.po.AssetCurrentCpPo; -import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; -import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; +import com.ruoyi.tc.entity.response.AssetdwHcResponse; import com.ruoyi.tc.mapper.AssetTaskMapper; import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; @@ -55,6 +49,7 @@ public class AssetTaskServiceImpl extends ServiceImpl a1 = new ArrayList<>(); - Arrays.asList(byId.getGlym().split(",")).forEach(x->{ + Arrays.asList(byId.getGlym().split(",")).forEach(x -> { Acomma acomma = new Acomma(); acomma.setKey(x); a1.add(acomma); }); byId.setGlymList(a1); List a2 = new ArrayList<>(); - Arrays.asList(byId.getGlIp().split(",")).forEach(x->{ + Arrays.asList(byId.getGlIp().split(",")).forEach(x -> { Acomma acomma = new Acomma(); acomma.setKey(x); a2.add(acomma); @@ -201,15 +197,32 @@ public class AssetTaskServiceImpl extends ServiceImpl zcHc(Page assetTask, AssestTaskXqRequest pageRequest) - { + public Page zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { assetTask.setOptimizeCountSql(false); return assetTaskDao.zcHc(assetTask, pageRequest); } @Override public int sh(AssetCurrentShRequest req) { + AssetLc assetLc = new AssetLc(); + if (req.getStatus()==3) { + assetLc.setTaskId(req.getTaskId()); + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setAssetName("管理员审核通过"); + assetLcService.insert(assetLc); + } else if (req.getStatus()==4) { + assetLc.setTaskId(req.getTaskId()); + assetLc.setAssetName("管理员审核不通过"); + assetLc.setXfTime(LocalDateTime.now()); + assetLcService.insert(assetLc); + } + + return assetTaskDao.sh(req); + } + + @Override + public Page dwHc(Page assetdwHcResponsePage,AssetdwHcRequest req) { - return assetTaskDao.sh(req); + return assetTaskDao.dwHc(assetdwHcResponsePage,req); } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml index 6351a02..a9a6037 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml @@ -48,7 +48,7 @@ + - insert into asset_lc(task_id,xf_time,dwhc_time,shbh_time,dwcxhc_time,shtg_time,ueser_id,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark) - values (#{taskId},#{xfTime},#{dwhcTime},#{shbhTime},#{dwcxhcTime},#{shtgTime},#{ueserId},#{deptId},#{createId},#{createBy},#{createTime},#{updateId},#{updateBy},#{updateTime},#{version},#{remark}) + insert into asset_lc(task_id,xf_time,asset_name,ueser_id,dept_id,create_id,create_by,create_time,update_id,update_by,update_time,version,remark) + values (#{taskId},#{xfTime},#{assetName},#{ueserId},#{deptId},#{createId},#{createBy},#{createTime},#{updateId},#{updateBy},#{updateTime},#{version},#{remark}) diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 020f1f0..27000ed 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -221,6 +221,7 @@ and b.xtlx = #{req.xtlx} + order by b.current_id desc + From f36cdd51d14e396faa5f99dab633a48d74f4586d Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Fri, 22 Nov 2024 14:18:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tc/controller/AssetLcController.java | 12 +- .../tc/controller/AssetTaskController.java | 20 +-- .../java/com/ruoyi/tc/entity/AssetTask.java | 6 +- .../entity/request/AssetTaskPageRequest.java | 6 + .../response/AssetTaskStatusResponse.java | 35 +++++ .../tc/entity/response/AssetdwHcResponse.java | 7 + .../tc/mapper/AssetBasicNetWorkCpMapper.java | 11 ++ .../tc/mapper/AssetBusinessFormCpMapper.java | 12 ++ .../ruoyi/tc/mapper/AssetCurrentCpMapper.java | 16 ++ .../com/ruoyi/tc/mapper/AssetLcMapper.java | 4 +- .../tc/mapper/AssetSupplyChainCpMapper.java | 13 ++ .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 26 +++- .../tc/mapper/UnitOtherConcatCpMapper.java | 11 ++ .../service/AssetBasicNetworkCpService.java | 10 ++ .../service/AssetBusinessFormCpService.java | 11 ++ .../tc/service/AssetCurrentCpService.java | 11 ++ .../com/ruoyi/tc/service/AssetLcService.java | 4 +- .../tc/service/AssetSupplyChainCpService.java | 10 ++ .../tc/service/UnitOtherConcatCpService.java | 11 ++ .../impl/AssetBasicNetworkCpServiceImpl.java | 5 + .../impl/AssetBusinessFormCpServiceImpl.java | 5 + .../impl/AssetCurrentCpServiceImpl.java | 6 + .../tc/service/impl/AssetLcServiceImpl.java | 12 +- .../impl/AssetSupplyChainCpServiceImpl.java | 6 + .../tc/service/impl/AssetTaskServiceImpl.java | 143 +++++++++++++++++- .../impl/UnitOtherConcatCpServiceImpl.java | 5 + .../src/main/resources/application-test.yml | 61 ++++++++ .../src/main/resources/application.yml | 2 +- .../src/main/resources/mapper/AssetLcDao.xml | 14 +- .../main/resources/mapper/AssetTaskDao.xml | 67 ++++++-- .../framework/config/SecurityConfig.java | 2 +- 31 files changed, 497 insertions(+), 67 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskStatusResponse.java create mode 100644 ruoyi-admin/src/main/resources/application-test.yml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetLcController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetLcController.java index 001dde3..b0ce790 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetLcController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetLcController.java @@ -1,6 +1,5 @@ package com.ruoyi.tc.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.tc.entity.AssetLc; @@ -19,7 +18,7 @@ import javax.validation.Valid; * @author makejava * @since 2024-11-18 14:46:40 */ -@Api("任务流程") +@Api(tags = "任务流程") @RestController @RequestMapping("/unit/assetLc") public class AssetLcController extends BaseController { @@ -30,16 +29,15 @@ public class AssetLcController extends BaseController { private AssetLcService assetLcService; /** - * 分页查询 + * 查询 * - * @param assetLc 筛选条件 - * @param req 分页对象 + * @param req 对象 * @return 查询结果 */ @GetMapping("/page") @ApiOperation(value = "分页查询", response = AssetLc.class) - public AjaxResult queryByPage(Page assetLc, AssetLcRequest req) { - return AjaxResult.success(this.assetLcService.queryByPage(assetLc, req)); + public AjaxResult queryByPage(AssetLcRequest req) { + return AjaxResult.success(this.assetLcService.queryByPage(req)); } /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java index d002cbe..08f1f59 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java @@ -83,7 +83,6 @@ public class AssetTaskController extends BaseController { */ @ApiOperation(value = "分页查询", response = AssetTask.class) @GetMapping("/page") - public AjaxResult queryByPage(Page assetTask, AssetTaskPageRequest pageRequest) { return AjaxResult.success(this.assetTaskService.queryByPage(assetTask, pageRequest)); } @@ -267,10 +266,10 @@ public class AssetTaskController extends BaseController { assetLc.setTaskId(assetCurrent.getTaskId()); assetLc.setAssetName(assetCurrent.getXtmc()); //当审核状态为审核不通过 单位端重新提交 - if (assetCurrent.getStatus().equals(4)){ + if (assetCurrent.getStatus().equals(4)) { assetLc.setTaskId(assetCurrent.getTaskId()); assetLc.setXfTime(LocalDateTime.now()); - assetLc.setAssetName("单位重新核查提交时间"+assetCurrent.getXtmc()); + assetLc.setAssetName("单位重新核查提交时间" + assetCurrent.getXtmc()); assetLcService.insert(assetLc); } @@ -289,18 +288,16 @@ public class AssetTaskController extends BaseController { b.append(","); }); } - assetCurrent.setGlIp(b.toString()); assetCurrent.setStatus(1); //当审核状态为带待核查 - if(assetCurrent.getStatus().equals(1)){ + if (assetCurrent.getStatus().equals(1)) { assetLc.setXfTime(LocalDateTime.now()); assetLc.setTaskId(assetCurrent.getTaskId()); - assetLc.setAssetName("单位核查完成提交"+assetCurrent.getXtmc()); + assetLc.setAssetName("单位核查完成提交" + assetCurrent.getXtmc()); assetLcService.insert(assetLc); } assetCurrentJyService.save(assetCurrent); - //新增新监管业务形态 if (assetCurrent.getXjgywxt() != null) { assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); @@ -331,6 +328,7 @@ public class AssetTaskController extends BaseController { //新增其他联系人 unitOtherConcatJyservice.saveBatch(assetCurrent.getOtherConcat()); } + return success(); } @@ -348,20 +346,18 @@ public class AssetTaskController extends BaseController { } - /** * 管理端-单位核查情况 * * @param req 请求类 * @return */ - @ApiOperation(value = "管理端-单位核查情况",response =AssetdwHcResponse.class ) - @PostMapping("/dwHc") + @ApiOperation(value = "管理端-单位核查情况", response = AssetdwHcResponse.class) + @GetMapping("/dwHc") public AjaxResult dwHc(Page assetdwHcResponsePage, AssetdwHcRequest req) { - return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage,req)); + return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage, req)); } - } 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 01d9ce8..21593c8 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 @@ -54,10 +54,10 @@ public class AssetTask implements Serializable { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime taskFinishTime; /** - * 任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回 + * 任务状态1：进行中，2：正常完成，3：超期完成， */ - @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回") - private String taskStatus; + @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：审核驳回") + private Integer taskStatus=1; /** * 单位名称 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java index b97e088..ea0dc47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java @@ -16,6 +16,12 @@ import java.time.LocalDateTime; @ApiModel("任务主表分页请求类") public class AssetTaskPageRequest { + + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Integer id; /** * 任务名称 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskStatusResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskStatusResponse.java new file mode 100644 index 0000000..1c7cf5e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskStatusResponse.java @@ -0,0 +1,35 @@ +package com.ruoyi.tc.entity.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import java.time.LocalDateTime; + +/** + * @author dong + * @since 2024/11/22 9:35 + */ +@Data +@ApiModel("资产表状态时间详情类") +public class AssetTaskStatusResponse { + + + /** + * 审核状态 + */ + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + + /** + * 超期状态 + */ + + @ApiModelProperty("6已超期；7未超期") + private Integer deadstatus; + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java index e9b105f..22d0f91 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetdwHcResponse.java @@ -36,6 +36,13 @@ public class AssetdwHcResponse { private Integer checked; + /** + * 完成数量 + */ + @ApiModelProperty("完成数量") + private Integer notChecked; + + /** * 百分比 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java index 58ff333..d52cf3f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java @@ -36,4 +36,15 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper findByTaskId(int taskId); + } \ No newline at end of file diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java index 4b74c5c..3b2b96e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java @@ -2,6 +2,7 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; @@ -36,5 +37,16 @@ public interface AssetBusinessFormCpMapper extends BaseMapper findByTaskId(int taskId); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java index 490bcf4..e57daca 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; + +import java.util.List; /** * 现有资产复制表(AssetCurrentResponse)表数据库访问层 @@ -19,5 +22,18 @@ public interface AssetCurrentCpMapper extends BaseMapper { */ @Delete("delete from asset_current_cp where id=#{assetId} and task_id =#{taskId} ") void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId); + + + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from asset_current_cp where task_id=#{taskId}") + List findByTaskId(int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetLcMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetLcMapper.java index cdd49eb..05bb6e8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetLcMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetLcMapper.java @@ -19,11 +19,11 @@ public interface AssetLcMapper { /** * 页条件查询 * - * @param page 分页条件 + * @param pageRequest 查询条件 * @return 填报任务 */ - Page queryByPage(Page page, @Param("req") AssetLcRequest pageRequest); + List queryByPage( @Param("req") AssetLcRequest pageRequest); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java index 73ab9f5..a600789 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; @@ -35,5 +36,17 @@ public interface AssetSupplyChainCpMapper extends BaseMapper findByTaskId(int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java index d836b23..4033d34 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java @@ -3,17 +3,19 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; +import com.ruoyi.tc.entity.response.AssetTaskStatusResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; +import java.time.LocalDateTime; import java.util.List; /** @@ -139,13 +141,31 @@ public interface AssetTaskMapper extends BaseMapper { int sh(@Param("req") AssetCurrentShRequest req); - - /** * 管理端-单位核查情况 * * @return */ Page dwHc(Page assetdwHcResponsePage, @Param("req") AssetdwHcRequest req); + + + /** + * 查询当前任务下的所有资产状态和完成时间 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(Integer taskId); + + /** + * 修改主表任务状态 + * + * @param taskStatus 任务状态 + * @param taskId 任务id + * @return + */ + + int updateByTaskId(@Param("taskStatus") Integer taskStatus, @Param("taskId") Integer taskId,@Param("finishTime") LocalDateTime finishTime ); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java index 21d9749..56382dc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java @@ -34,4 +34,15 @@ public interface UnitOtherConcatCpMapper extends BaseMapper */ @Delete("delete from unit_other_contact_cp where asset_id=#{assetId} and task_id =#{taskId} ") void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId")int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from unit_other_contact_cp where task_id=#{taskId}") + List findByTaskId(int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java index e0f0102..44f952a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java @@ -2,6 +2,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; +import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; import java.util.List; @@ -30,4 +31,13 @@ public interface AssetBasicNetworkCpService extends IService findByTaskId(int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java index de3469f..1ea96bf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java @@ -2,6 +2,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import java.util.List; @@ -30,5 +31,15 @@ public interface AssetBusinessFormCpService extends IService findByTaskId(int taskId); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java index 6c632fc..04fa751 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java @@ -3,6 +3,8 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.po.AssetCurrentCpPo; +import java.util.List; + /** * 现有资产复制表(AssetCurrentResponse)表服务接口 * @@ -19,5 +21,14 @@ public interface AssetCurrentCpService extends IService { */ void deletByAssetIdandTaskId(Long assetId, int taskId); + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetLcService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetLcService.java index ddf5e2e..5da1e69 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetLcService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetLcService.java @@ -3,7 +3,9 @@ package com.ruoyi.tc.service; import com.ruoyi.tc.entity.AssetLc; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.tc.entity.request.AssetLcRequest; +import com.ruoyi.tc.entity.response.AssetTaskStatusResponse; +import java.util.List; /** * 任务流程(AssetLc)表服务接口 * @@ -27,7 +29,7 @@ public interface AssetLcService { * @param pageRequest 分页对象 * @return 查询结果 */ - Page queryByPage(PageassetLc, AssetLcRequest pageRequest); + List queryByPage( AssetLcRequest pageRequest); /** * 新增数据 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java index 2cd34a2..1aa8cab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import java.util.List; @@ -22,6 +23,15 @@ public interface AssetSupplyChainCpService extends IService findByassetId(Long assetId); + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + + /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java index 8a95ae6..267b52f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo; @@ -29,4 +30,14 @@ public interface UnitOtherConcatCpService extends IService * @param taskId 任务id */ void deletByAssetIdandTaskId(Long assetId, int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java index ee706f2..58ca5fd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java @@ -31,5 +31,10 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { + return assetBasicNetWorkCpMapper.findByTaskId(taskId); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java index b3a8b31..5194e7d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java @@ -30,5 +30,10 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { + return assetBusinessFormCpMapper.findByTaskId(taskId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java index f25a3f1..89a7074 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java @@ -7,6 +7,7 @@ import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 现有资产复制表(AssetCurrentResponse)表服务实现类 @@ -23,5 +24,10 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { + return assetCurrentCpMapper.findByTaskId(taskId); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetLcServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetLcServiceImpl.java index e5a22e6..20c033b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetLcServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetLcServiceImpl.java @@ -8,7 +8,7 @@ import com.ruoyi.tc.service.AssetLcService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import javax.annotation.Resource; - +import java.util.List; /** * 任务流程(AssetLc)表服务实现类 * @@ -34,15 +34,15 @@ public class AssetLcServiceImpl implements AssetLcService { } /** - * 分页查询 + * 查询 * - * @param assetLc 筛选条件 - * @param pageRequest 分页对象 + * @param + * @param pageRequest 对象 * @return 查询结果 */ @Override - public Page queryByPage(Page assetLc, AssetLcRequest pageRequest) { - return assetLcDao.queryByPage(assetLc, pageRequest); + public List queryByPage( AssetLcRequest pageRequest) { + return assetLcDao.queryByPage( pageRequest); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java index 9180bd3..f25c99f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; import com.ruoyi.tc.mapper.AssetSupplyChainCpMapper; import com.ruoyi.tc.service.AssetSupplyChainCpService; @@ -25,6 +26,11 @@ public class AssetSupplyChainCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { + return assetSupplyChainCpMapper.findByTaskId(taskId); + } + @Override public void deletByAssetIdandTaskId(Long assetId, int taskId) { assetSupplyChainCpMapper.deletByAssetIdandTaskId(assetId,taskId); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java index 17fc814..5dd04cf 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java @@ -2,12 +2,13 @@ package com.ruoyi.tc.service.impl; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.ruoyi.tc.entity.AssetLc; -import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.tc.entity.*; import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.*; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetTaskResponse; +import com.ruoyi.tc.entity.response.AssetTaskStatusResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse; import com.ruoyi.tc.mapper.AssetTaskMapper; import com.ruoyi.tc.service.*; @@ -18,6 +19,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; /** * 任务主表(AssetTask)表服务实现类 @@ -50,6 +52,22 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByTaskId(req.getTaskId()); + // 检查状态 + boolean hasPendingApproval = list.stream().anyMatch(item -> item.getStatus() == 0 || item.getStatus() == 1); + boolean allApproved = list.stream().allMatch(item -> item.getStatus() == 3); + boolean hasExpired = list.stream().anyMatch(item -> item.getDeadstatus() == 6); + boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4); + LocalDateTime finishTime = null; + if (hasPendingApproval) { + // 资产状态存在待审批，任务状态为进行中 + taskStatus = 1; + } else if (allApproved && !hasPendingApproval && !hasRejected && !hasExpired) { + // 资产状态全部为已通过中并且全部资产完成时间在任务期限之前 + taskStatus = 2; + finishTime = LocalDateTime.now(); + taskSaveOrDelete(req); + } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) { + // 资产状态全部为已通过，资产完成时间有超期的为超期完成 + taskStatus = 3; + finishTime = LocalDateTime.now(); + taskSaveOrDelete(req); + } else if (hasRejected) { + // 审核不通过 + taskStatus = 4; + } + //修改主表任务状态 + assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime); + return a; + } - return assetTaskDao.sh(req); + private void taskSaveOrDelete(AssetCurrentShRequest req) { + // 根据taskid查询五张数据 + List currentList = assetCurrentCpService.findByTaskId(req.getTaskId()); + List idList = currentList.stream() + .map(AssetCurrentCpPo::getId) + .collect(Collectors.toList()); + //删除原有数据 + assetCurrentService.removeBatchByIds(idList); + //将子表数据复制到主表中 + List currentNewList = currentList.stream() + .map(cpPo -> { + AssetCurrent current = new AssetCurrent(); + BeanUtils.copyProperties(cpPo, current); // 复制属性 + return current; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetCurrentService.saveBatch(currentNewList); + //AssetBusinessFormCpPo + List bussinessList = assetBusinessFormCpService.findByTaskId(req.getTaskId()); + List bussinessidList = bussinessList.stream() + .map(AssetBusinessFormCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + assetBusinessFormService.removeBatchByIds(bussinessidList); + //将子表数据复制到主表中 + List bussinessNewList = bussinessList.stream() + .map(cpPo -> { + AssetBusinessForm businessForm = new AssetBusinessForm(); + BeanUtils.copyProperties(cpPo, businessForm); // 复制属性 + return businessForm; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetBusinessFormService.saveBatch(bussinessNewList); + //AssetBasicNetworkCpPo + List netWorkList = assetBasicNetworkCpService.findByTaskId(req.getTaskId()); + List netWorkidList = netWorkList.stream() + .map(AssetBasicNetworkCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + assetBasicNetworkService.removeBatchByIds(netWorkidList); + //将子表数据复制到主表中 + List netWorkNewList = netWorkList.stream() + .map(cpPo -> { + AssetBasicNetwork network = new AssetBasicNetwork(); + BeanUtils.copyProperties(cpPo, network); // 复制属性 + return network; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetBasicNetworkService.saveBatch(netWorkNewList); + //AssetSupplyChainCpPo + List SupplyChainList = assetSupplyChainCpService.findByTaskId(req.getTaskId()); + List SupplyChainidList = SupplyChainList.stream() + .map(AssetSupplyChainCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + assetSupplyChainService.removeBatchByIds(SupplyChainidList); + List SupplyChainNewList = SupplyChainList.stream() + .map(cpPo -> { + AssetSupplyChain supplyChain = new AssetSupplyChain(); + BeanUtils.copyProperties(cpPo, supplyChain); // 复制属性 + return supplyChain; // 返回新对象 + }) + .collect(Collectors.toList()); + assetSupplyChainService.saveBatch(SupplyChainNewList); + //UnitOtherConcatCpPo + List UnitOtherConcatList = unitOtherConcatCpService.findByTaskId(req.getTaskId()); + List UnitOtherConcatidList = UnitOtherConcatList.stream() + .map(UnitOtherConcatCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + unitOtherConcatService.removeBatchByIds(UnitOtherConcatidList); + List UnitOtherConcatNewList = UnitOtherConcatList.stream() + .map(cpPo -> { + UnitOtherConcat unitOtherConcat = new UnitOtherConcat(); + BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性 + return unitOtherConcat; // 返回新对象 + }) + .collect(Collectors.toList()); + assetSupplyChainService.saveBatch(SupplyChainNewList); + unitOtherConcatService.saveBatch(UnitOtherConcatNewList); } @Override - public Page dwHc(Page assetdwHcResponsePage,AssetdwHcRequest req) { + public Page dwHc(Page assetdwHcResponsePage, AssetdwHcRequest req) { - return assetTaskDao.dwHc(assetdwHcResponsePage,req); + return assetTaskDao.dwHc(assetdwHcResponsePage, req); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java index d8c8023..5f9ac2c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java @@ -29,4 +29,9 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl findByTaskId(int taskId) { + return unitOtherConcatCpMapper.findByTaskId(taskId); + } } diff --git a/ruoyi-admin/src/main/resources/application-test.yml b/ruoyi-admin/src/main/resources/application-test.yml new file mode 100644 index 0000000..eaedbfc --- /dev/null +++ b/ruoyi-admin/src/main/resources/application-test.yml @@ -0,0 +1,61 @@ +# 数据源配置 +spring: + datasource: + type: com.alibaba.druid.pool.DruidDataSource + driverClassName: com.mysql.cj.jdbc.Driver + druid: + # 主库数据源 + master: + url: jdbc:mysql://localhost:3306/tc-asset-verification?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: root + password: adminadmin + # 从库数据源 + slave: + # 从数据源开关/默认关闭 + enabled: false + url: + username: + password: + # 初始连接数 + initialSize: 5 + # 最小连接池数量 + minIdle: 10 + # 最大连接池数量 + maxActive: 20 + # 配置获取连接等待超时的时间 + maxWait: 60000 + # 配置连接超时时间 + connectTimeout: 30000 + # 配置网络超时时间 + socketTimeout: 60000 + # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒 + timeBetweenEvictionRunsMillis: 60000 + # 配置一个连接在池中最小生存的时间，单位是毫秒 + minEvictableIdleTimeMillis: 300000 + # 配置一个连接在池中最大生存的时间，单位是毫秒 + maxEvictableIdleTimeMillis: 900000 + # 配置检测连接是否有效 + validationQuery: SELECT 1 FROM DUAL + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + webStatFilter: + enabled: true + statViewServlet: + enabled: true + # 设置白名单，不填则允许所有访问 + allow: + url-pattern: /druid/* + # 控制台管理用户名和密码 + login-username: ruoyi + login-password: 123456 + filter: + stat: + enabled: true + # 慢SQL记录 + log-slow-sql: true + slow-sql-millis: 1000 + merge-sql: true + wall: + config: + multi-statement-allow: true \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 6aee222..e11d951 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -52,7 +52,7 @@ spring: # 国际化资源文件路径 basename: i18n/messages profiles: - active: druid + active: test # 文件上传 servlet: multipart: diff --git a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml index a9a6037..7371308 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml @@ -166,18 +166,14 @@ diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 27000ed..0aad61c 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -186,6 +186,9 @@ and task_status = #{req.taskStatus} + + and id = #{req.id} + + + insert into asset_task(task_name, task_time, task_deadline, task_finish_time, task_status, dwmc, @@ -347,11 +369,26 @@ update asset_current_cp - + status = #{req.status}, + update_time=now() + + where id = #{req.assetId} and task_id = #{req.taskId} + + + update asset_task + + + task_status=#{taskStatus}, + + + task_finish_time=#{finishTime} + - where id = #{req.assetId} and task_id = #{req.taskId} + + where id =#{taskId} + diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 9bb9e48..dad24b0 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() - .antMatchers("/unit/assetTask/**","/tc/**").permitAll() + .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); })