From fd9d66de9fd809925249dbb0fc71cd319c74084f Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 20 Nov 2024 15:37:39 +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 | 107 ++++- .../entity/request/AssestTaskXqRequest.java | 2 +- .../entity/response/AssestTaskXqresponse.java | 4 +- .../response/AssetBusinessFormCpResponse.java | 104 ++--- .../entity/response/AssetCurrentResponse.java | 394 +++++++----------- .../response/AssetSupplyChainCpResponse.java | 10 +- .../tc/mapper/AssetBasicNetWorkCpMapper.java | 15 +- .../tc/mapper/AssetBusinessFormCpMapper.java | 15 +- .../ruoyi/tc/mapper/AssetCurrentCpMapper.java | 19 +- .../tc/mapper/AssetSupplyChainCpMapper.java | 12 +- .../tc/mapper/UnitOtherConcatCpMapper.java | 11 + .../service/AssetBasicNetworkCpService.java | 9 + .../service/AssetBusinessFormCpService.java | 9 + .../tc/service/AssetCurrentCpService.java | 14 +- .../tc/service/AssetSupplyChainCpService.java | 10 + .../tc/service/UnitOtherConcatCpService.java | 9 + .../com/ruoyi/tc/service/UnitService.java | 2 +- .../impl/AssetBasicNetworkCpServiceImpl.java | 5 + .../impl/AssetBusinessFormCpServiceImpl.java | 5 + .../impl/AssetCurrentCpServiceImpl.java | 7 +- .../impl/AssetSupplyChainCpServiceImpl.java | 5 + .../impl/UnitOtherConcatCpServiceImpl.java | 5 + .../main/resources/mapper/AssetTaskDao.xml | 11 +- 23 files changed, 436 insertions(+), 348 deletions(-) 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 4db8a29..e53bb32 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 @@ -7,9 +7,8 @@ import com.ruoyi.tc.entity.AssetCurrent; import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; -import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.response.AssetTaskIdResponse; -import com.ruoyi.tc.service.AssetTaskService; +import com.ruoyi.tc.entity.response.*; +import com.ruoyi.tc.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.transaction.annotation.Transactional; @@ -17,6 +16,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; +import java.time.LocalDateTime; /** * 任务主表(AssetTask)表控制层 @@ -34,6 +34,20 @@ public class AssetTaskController extends BaseController { @Resource private AssetTaskService assetTaskService; + @Resource + private AssetCurrentCpService assetCurrentCpService; + + @Resource + private AssetBusinessFormCpService assetBusinessFormCpService; + + @Resource + private AssetBasicNetworkCpService assetBasicNetworkCpService; + @Resource + private AssetSupplyChainCpService assetSupplyChainCpService; + + @Resource + private UnitOtherConcatCpService unitOtherConcatCpService; + /** * 分页查询 * @@ -43,6 +57,7 @@ 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)); } @@ -69,6 +84,7 @@ public class AssetTaskController extends BaseController { @PostMapping("/add") @Transactional(rollbackFor = Exception.class) public AjaxResult add(@RequestBody @Valid AssetTask assetTask) { + assetTask.setTaskTime(LocalDateTime.now()); this.assetTaskService.insert(assetTask); return AjaxResult.success(); } @@ -99,17 +115,17 @@ public class AssetTaskController extends BaseController { /** - * 任务审核 + * 任务审核详情信息 * * @param taskId 任务id * @param assetId 资产id * @return */ - @ApiOperation(value = "任务审核", response = AssetCurrent.class) + @ApiOperation(value = "任务审核详情信息", response = AssetCurrent.class) @GetMapping("/taskSh") public AjaxResult taskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { - assetTaskService.taskSh(taskId,assetId); - return AjaxResult.success(); + + return AjaxResult.success(assetTaskService.taskSh(taskId, assetId)); } @@ -126,5 +142,82 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(assetTaskService.zcHc(page, pageRequest)); } + + + /** + * 单位端暂存报废 + * + * @param assetCurrent 现有资产复制表 + * @return + */ + @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()); + assetCurrent.setGlym(String.join(",", assetCurrent.getGlymList())); + assetCurrent.setGlIp(String.join(",", assetCurrent.getGlIpList())); + assetCurrentCpService.save(assetCurrent); + //新增新监管业务形态 + if (assetCurrent.getXjgywxt() != null) { + assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); + assetCurrent.getXjgywxt().setTaskId(assetCurrent.getTaskId()); + assetBusinessFormCpService.save(assetCurrent.getXjgywxt()); + } + if (!assetCurrent.getGylxxList().isEmpty()) { + for (AssetSupplyChainCpResponse items : assetCurrent.getGylxxList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增供应链 + assetSupplyChainCpService.saveBatch(assetCurrent.getGylxxList()); + } + if (!assetCurrent.getJcwlList().isEmpty()) { + for (AssetBasicNetworkCpResponse items : assetCurrent.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增基础网络 + assetBasicNetworkCpService.saveBatch(assetCurrent.getJcwlList()); + } + if (!assetCurrent.getOtherConcat().isEmpty()) { + for (UnitOtherConcatCpResponse items : assetCurrent.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(assetCurrent.getTaskId()); + } + //新增其他联系人 + unitOtherConcatCpService.saveBatch(assetCurrent.getOtherConcat()); + } + return success(); + } + + /** + * 单位端提交 + * + * @param assetCurrent 现有资产复制表 + * @return + */ + @ApiOperation(value = "单位端提交") + @PostMapping("/tj") + @Transactional(rollbackFor = Exception.class) + public AjaxResult tj(@RequestBody AssetCurrentResponse assetCurrent) { + + return AjaxResult.success(); + } + + + @ApiOperation(value = "管理端审核") + @PostMapping("/sh") + public AjaxResult sh(@RequestBody AssetCurrentResponse assetCurrent) { + + + return AjaxResult.success(); + } + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java index d0a6b4c..1555e01 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java @@ -22,7 +22,7 @@ public class AssestTaskXqRequest { * 资产类型 */ @ApiModelProperty("资产类型") - private String zclx; + private String xtlx; /** * 单位名称 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java index 85fb5fe..33223f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java @@ -43,8 +43,8 @@ public class AssestTaskXqresponse { /** - * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过） + * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废） */ - @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）") + @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废）") private String status; } 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/response/AssetBusinessFormCpResponse.java index 3916f20..5672129 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java @@ -31,7 +31,7 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 云平台-云平台服务商 */ - @Size(max= 50,message="云平台-云平台服务商长度不能超过50") + @ApiModelProperty("云平台-云平台服务商") private String yptFws; /** @@ -48,73 +48,73 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 云平台-硬件资源大小 */ - @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; /** @@ -125,13 +125,13 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 一般物联网设备-系统集成商名称 */ - @Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50") + @ApiModelProperty("一般物联网设备-系统集成商名称") private String wlwsbXtjcs; /** * 一般物联网设备-用户数量 */ - @Size(max= 50,message="一般物联网设备-用户数量长度不能超过50") + @ApiModelProperty("一般物联网设备-用户数量") private String wlwsbYhsl; /** @@ -142,7 +142,7 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 一般物联网设备-终端数量 */ - @Size(max= 50,message="一般物联网设备-终端数量长度不能超过50") + @ApiModelProperty("一般物联网设备-终端数量") private String wlwsbZdsl; /** @@ -153,7 +153,7 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 一般物联网设备-联系人 */ - @Size(max= 50,message="一般物联网设备-联系人长度不能超过50") + @ApiModelProperty("一般物联网设备-联系人") private String wlwsbLxr; /** @@ -164,97 +164,97 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 一般物联网设备-联系人电话 */ - @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; /** @@ -265,13 +265,13 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 工业控制-系统集成商名称 */ - @Size(max= 255,message="工业控制-系统集成商名称长度不能超过255") + @ApiModelProperty("工业控制-系统集成商名称") private String gykzJcs; /** * 工业控制-运行时间 */ - @Size(max= 255,message="工业控制-运行时间长度不能超过255") + @ApiModelProperty("工业控制-运行时间") private String gykzYxsj; /** @@ -282,7 +282,7 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 工业控制-集成商国内外情况 */ - @Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255") + @ApiModelProperty("工业控制-集成商国内外情况") private String gykzJcsqk; /** @@ -293,7 +293,7 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 工业控制-联系人 */ - @Size(max= 255,message="工业控制-联系人长度不能超过255") + @ApiModelProperty("工业控制-联系人") private String gykzLxr; /** @@ -304,61 +304,61 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 工业控制-联系人电话 */ - @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; /** @@ -369,31 +369,31 @@ public class AssetBusinessFormCpResponse extends BaseClass implements Serializab /** * 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; 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/response/AssetCurrentResponse.java index c5636b8..39473de 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java @@ -1,6 +1,8 @@ package com.ruoyi.tc.entity.response; +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; @@ -30,57 +32,50 @@ import java.util.List; public class AssetCurrentResponse extends BaseClass implements Serializable { private static final long serialVersionUID = 1L; + @ApiModelProperty("资产id") 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; /** @@ -91,120 +86,109 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 域名提醒人-姓名 */ - @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 = "关联资产（多个资产用逗号隔开,例如\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) + @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) - @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; /** @@ -215,44 +199,39 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 地理位置 */ - @Size(max = 255, message = "地理位置长度不能超过255") + @ApiModelProperty("地理位置") private String dlwz; /** * 经度 */ - @Size(max = 50, message = "经度长度不能超过50") + @ApiModelProperty("经度") private String jd; /** * 纬度 */ - @Size(max = 50, message = "纬度长度不能超过50") + @ApiModelProperty("纬度") private String wd; /** * 系统特征（,分隔） */ - @Excel(width = 60, name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）", sort = 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; @@ -260,65 +239,54 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 资产物理接入地址 */ - @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 = "云服务商名称（“是否部署云平台”选择“是”必须填写，选择\n“否”则无需填写）", 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; /** @@ -374,82 +342,68 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 相关业务-业务描述 */ - @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; @@ -460,8 +414,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * ICP备案信息-是否备案 */ - @Excel(name = "*ICP备案状态", dictType = "is_no", comboReadDict = true, sort = 24) - @NotNull + @ApiModelProperty("ICP备案信息-是否备案") private String ipcSfba; /** @@ -472,35 +425,32 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * ICP备案信息-备案网站名称 */ - @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站名称") private String ipcBawzmc; /** * ICP备案信息-备案网站首页 */ - @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站首页") private String ipcBawzsy; /** * ICP备案信息-ICP备案编号 */ - @Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）", sort = 25, width = 46) - @NotBlank - @Size(max = 50, message = "ICP备案信息-ICP备案编号长度不能超过50") +// @Excel(name = "ICP备案编号",sort = 25,width = 46) + @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; /** @@ -511,13 +461,13 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * ICP备案信息-备案联系人 */ - @Size(max = 50, message = "ICP备案信息-备案联系人长度不能超过50") + @ApiModelProperty("ICP备案信息-备案联系人") private String ipcBalxr; /** * ICP备案信息-备案联系人电话 */ - @Size(max = 50, message = "ICP备案信息-备案联系人电话长度不能超过50") + @ApiModelProperty("ICP备案信息-备案联系人电话") private String ipcBalxrdh; /** @@ -529,124 +479,107 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 公安机关备案信息-是否备案 */ - @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; /** @@ -662,93 +595,90 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 等保信息-定级时间 */ - @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) + @TableField(exist = false) private String sheng; @ApiModelProperty("地理位置-市") - @Excel(name = "地理位置-市", sort = 47) + @TableField(exist = false) private String shi; @ApiModelProperty("地理位置-区（县）") - @Excel(name = "地理位置-区（县）", sort = 48) @TableField(exist = false) 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; /** @@ -764,48 +694,34 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 第三方测评-推荐日期 */ - @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; -// /** -// * 供应链信息(id集合逗号分隔) -// */ -// @Size(max= 255,message="供应链信息长度不能超过255") -// @ApiModelProperty("供应链信息(id集合逗号分隔)") -// private String gylxx; -// /** -// * 基础网络(id集合逗号分隔） -// */ -// @Size(max= 255,message="基础网络长度不能超过255") -// @ApiModelProperty("基础网络(id集合逗号分隔）") -// private String jcwl; /** * 供应链信息列表 */ @@ -833,211 +749,191 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { /** * 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; + + @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 String status; - - @ApiModelProperty("任务id") - private Integer taskId; } 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/response/AssetSupplyChainCpResponse.java index 9b75cff..671b7df 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java @@ -35,31 +35,31 @@ public class AssetSupplyChainCpResponse extends BaseClass implements Serializabl /** * 名称 */ - @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; /** 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 47f6c29..d208dc4 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,14 +1,15 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.ruoyi.tc.entity.AssetBasicNetwork; import com.ruoyi.tc.entity.response.AssetBasicNetworkCpResponse; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import java.util.List; /** * 资产基础网络复制表(asset_basic_network_cp)表数据库访问层 + * * @author makejava * @since 2024-11-15 10:03:56 */ @@ -22,8 +23,16 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper findByassetId(Long assetId); + List findByassetId(Long assetId); -} + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_basic_network_cp where asset_id=#{assetId} and task_id ={taskId} ") + void deletByAssetIdandTaskId(Long assetId, 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 c45455f..e406e6f 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,8 +2,11 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; + import java.util.List; + /** * 资产新监管业务形态复制表(asset_business_form_cp)表数据库访问层 * @@ -20,7 +23,17 @@ public interface AssetBusinessFormCpMapper extends BaseMapper findByassetId(Long 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 a905a7c..a265c3c 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 @@ -5,6 +5,7 @@ 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 org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -16,22 +17,12 @@ import java.util.List; * @since 2024-11-15 10:03:56 */ public interface AssetCurrentCpMapper extends BaseMapper { - /** - * 分页查询所有数据 * - * @param page 分页对象 - * @param as 查询实体 - * @return 所有数据 - */ - Page page(Page page,@Param("req") AssetCurrentPageRequest as); - - List page(@Param("req") AssetCurrentPageRequest as); - - - /** - * 逻辑删除 + * @param assetId + * @param taskId */ - void deleteByUnitIds(List idList); + @Delete("delete from asset_current_cp where id=#{assetId} and task_id ={taskId} ") + void deletByAssetIdandTaskId(Long assetId,int taskId); } 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 c71c31b..22b799f 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 @@ -2,6 +2,7 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -15,7 +16,6 @@ import java.util.List; public interface AssetSupplyChainCpMapper extends BaseMapper { - /** * 根据资产id资产供应链原有id * @@ -25,5 +25,15 @@ public interface AssetSupplyChainCpMapper extends BaseMapper 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/UnitOtherConcatCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java index 1b9b108..f525a44 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 @@ -2,6 +2,7 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Select; import java.util.List; @@ -22,4 +23,14 @@ public interface UnitOtherConcatCpMapper extends BaseMapper findByassetId(Long assetId); + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from unit_other_contact_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/service/AssetBasicNetworkCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java index 6b694aa..afba7f7 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 @@ -22,4 +22,13 @@ public interface AssetBasicNetworkCpService extends IService findByassetId(Long assetId); + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, 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 02da68d..33a5716 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 @@ -21,5 +21,14 @@ public interface AssetBusinessFormCpService extends IService findByassetId(Long assetId); + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, 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 dfeca39..ccf7aa6 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,14 +1,8 @@ package com.ruoyi.tc.service; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; import com.ruoyi.tc.entity.response.AssetCurrentResponse; -import java.io.Serializable; -import java.util.List; - /** * 现有资产复制表(AssetCurrentResponse)表服务接口 * @@ -17,5 +11,13 @@ import java.util.List; */ public interface AssetCurrentCpService extends IService { + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); + } 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 14ba46b..5e2c559 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 @@ -22,4 +22,14 @@ public interface AssetSupplyChainCpService extends IService findByassetId(Long assetId); + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, 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 10d1e3a..ce52585 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 @@ -20,4 +20,13 @@ public interface UnitOtherConcatCpService extends IService findByassetId(Long assetId); + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java index f973dbc..20c89e9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java @@ -54,7 +54,7 @@ public interface UnitService extends IService { /** * 逻辑删除单位 */ - void deleteUnits(List ids); + void deleteUnits(Long ids); 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 659d011..be4c680 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 @@ -26,5 +26,10 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl findByassetId(Long assetId) { return assetBusinessFormCpMapper.findByassetId(assetId); } + + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + assetBusinessFormCpMapper.deletByAssetIdandTaskId(assetId,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 8670fb9..5fb68ec 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 @@ -23,6 +23,11 @@ import java.util.List; @Service("assetCurrentCpService") public class AssetCurrentCpServiceImpl extends ServiceImpl implements AssetCurrentCpService { - + @Resource + private AssetCurrentCpMapper assetCurrentCpMapper; + @Override + public void deletByAssetIdandTaskId(Long assetId,int taskId) { + assetCurrentCpMapper.deletByAssetIdandTaskId(assetId,taskId); + } } 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 e847620..7b6ff2e 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 @@ -27,4 +27,9 @@ public class AssetSupplyChainCpServiceImpl extends ServiceImpl findByassetId(Long assetId) { return assetSupplyChainCpMapper.findByassetId(assetId); } + + @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/UnitOtherConcatCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java index 91ac3fe..2f871f4 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 @@ -24,4 +24,9 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl findByassetId(Long assetId) { return unitOtherConcatCpMapper.findByassetId(assetId); } + + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + unitOtherConcatCpMapper.deletByAssetIdandTaskId(assetId,taskId); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 1e2fae3..e6abc1c 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -200,9 +200,10 @@ From ecfd4076acb3d7e99bd2910290d1919d6f5c7411 Mon Sep 17 00:00:00 2001 From: wu Date: Wed, 20 Nov 2024 17:20:37 +0800 Subject: [PATCH 2/3] bugfix --- .../tc/service/impl/AssetTaskServiceImpl.java | 54 +++++++++++-------- 1 file changed, 32 insertions(+), 22 deletions(-) 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 72b19c7..3c82e65 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,15 +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.*; +import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; 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.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.response.AssetTaskResponse; +import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; import com.ruoyi.tc.mapper.AssetTaskMapper; -import com.ruoyi.tc.service.*; +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 org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.ArrayList; import java.util.List; /** @@ -42,8 +54,6 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByDwmcAssetCurrent(part); - for (AssetCurrentResponse assetCurrentResponse:list){ - assetCurrentResponse.setTaskId(id); - } + for (AssetCurrentResponse assetCurrentResponse : list) { + assetCurrentResponse.setTaskId(id); + } assetCurrentCpService.saveBatch(list); + List assetBusinessFormCpResponseList = new ArrayList<>(); for (AssetCurrentResponse assetCurrentResponse : list) { //新增新监管业务形态 //根据资产id查询新监管业务形态主表id @@ -94,8 +105,9 @@ public class AssetTaskServiceImpl extends ServiceImpl supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); @@ -105,8 +117,8 @@ public class AssetTaskServiceImpl extends ServiceImpl BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); if (BasicNetworkCpList != null) { @@ -116,9 +128,8 @@ public class AssetTaskServiceImpl extends ServiceImpl unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); if (unitOtherConcatList != null) { @@ -128,9 +139,8 @@ public class AssetTaskServiceImpl extends ServiceImpl zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { - return assetTaskDao.zcHc(assetTask,pageRequest); + return assetTaskDao.zcHc(assetTask, pageRequest); } } From 0c71be162ab3aa175a5d710e9dd3bc41cd6826c6 Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 20 Nov 2024 17:20:56 +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/AssetTaskController.java | 34 ++++++++++++----- .../entity/request/AssetCurrentShRequest.java | 38 +++++++++++++++++++ .../entity/response/AssetCurrentResponse.java | 4 +- .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 11 ++++++ .../ruoyi/tc/service/AssetTaskService.java | 19 ++++++---- .../tc/service/impl/AssetTaskServiceImpl.java | 7 ++++ .../main/resources/mapper/AssetTaskDao.xml | 23 +++++++++-- 7 files changed, 115 insertions(+), 21 deletions(-) create mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.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 e53bb32..a72eb72 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 @@ -6,6 +6,7 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.tc.entity.AssetCurrent; 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.response.*; import com.ruoyi.tc.service.*; @@ -154,12 +155,19 @@ public class AssetTaskController extends BaseController { @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()); +// //根据资产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())); assetCurrentCpService.save(assetCurrent); @@ -211,13 +219,21 @@ public class AssetTaskController extends BaseController { } + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ @ApiOperation(value = "管理端审核") @PostMapping("/sh") - public AjaxResult sh(@RequestBody AssetCurrentResponse assetCurrent) { + public AjaxResult sh(@RequestBody AssetCurrentShRequest req) { + return AjaxResult.success(assetTaskService.sh(req)); + } + - return AjaxResult.success(); - } } 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 new file mode 100644 index 0000000..a968d1e --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java @@ -0,0 +1,38 @@ +package com.ruoyi.tc.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dong + * @since 2024/11/20 16:29 + */ +@Data +@ApiModel("管理端审核请求类") +public class AssetCurrentShRequest { + + /** + * 任务id + */ + @ApiModelProperty("任务id") + private Integer taskId; + + + + /** + * 资产id + */ + @ApiModelProperty("资产id") + private Integer assetId; + + + /** + * 审核状态（0待核查，1待审核，3审核通过，4审核不通过，5已报废） + */ + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + + +} 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/response/AssetCurrentResponse.java index 39473de..a43e4bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java @@ -934,6 +934,6 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @ApiModelProperty("报废原因") private String bfyy; - @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）") - private String status; + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; } 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 2ed74f7..0d7aebd 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 @@ -4,6 +4,7 @@ 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.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; @@ -125,5 +126,15 @@ public interface AssetTaskMapper extends BaseMapper { * @return */ AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); + + + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ + int sh(@Param("req") AssetCurrentShRequest 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 2ec3b66..b7dffe1 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 @@ -1,18 +1,14 @@ package com.ruoyi.tc.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.entity.AssetCurrent; import com.ruoyi.tc.entity.AssetTask; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.response.AssetTaskIdResponse; import com.ruoyi.tc.entity.response.AssetTaskResponse; -import org.springframework.data.domain.PageRequest; - -import java.util.List; /** * 任务主表(AssetTask)表服务接口 @@ -76,9 +72,18 @@ public interface AssetTaskService extends IService { /** * 资产核查信息 * - * @param page 分页参数 + * @param page 分页参数 * @param pageRequest 查询条件 * @return */ Page zcHc(Page page, AssestTaskXqRequest pageRequest); + + + /** + * 管理端审核 + * + * @param req 请求类 + * @return + */ + int sh(AssetCurrentShRequest 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 72b19c7..92442ff 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,6 +4,7 @@ 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.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.mapper.AssetTaskMapper; @@ -174,4 +175,10 @@ public class AssetTaskServiceImpl extends ServiceImpl zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { return assetTaskDao.zcHc(assetTask,pageRequest); } + + @Override + public int sh(AssetCurrentShRequest req) { + + return assetTaskDao.sh(req); + } } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index e6abc1c..9b9ea78 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -223,12 +223,15 @@ - insert into asset_task( task_name, task_time, task_deadline, task_finish_time, task_status, dwmc, + insert into asset_task(task_name, task_time, task_deadline, task_finish_time, task_status, dwmc, create_id, create_by, create_time, update_id, update_by, update_time, user_id, dept_id, version, reamark) values (#{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc}, @@ -253,7 +256,7 @@ (#{entity.taskName},#{entity.taskTime},#{entity.taskDeadline}#{entity.taskFinishTime}#{entity.taskStatus}#{entity.dwmc}#{entity.createId}#{entity.createBy}#{entity.createTime}#{entity.updateId}#{entity.updateBy}#{entity.updateTime}#{entity.userId}#{entity.deptId}#{entity.version}#{entity.reamark}) on duplicate key update - task_name = values(task_name)task_time = values(task_time)task_deadline = + task_name = values(task_name)task_time = values(task_time)task_deadline = values(task_deadline)task_finish_time = values(task_finish_time)task_status = values(task_status)dwmc = values(dwmc)create_id = values(create_id)create_by = values(create_by)create_time = values(create_time)update_id = values(update_id)update_by = values(update_by)update_time = @@ -317,6 +320,20 @@ where id = #{id} + + update asset_current_cp + + + task_id = #{req.taskId}, + + + id = #{req.assetId}, + + + status = #{req.status}, + + +