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 b56dd9f..001dde3 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 @@ -3,12 +3,11 @@ 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.domain.AssetLc; -import com.ruoyi.tc.domain.request.AssetLcRequest; +import com.ruoyi.tc.entity.AssetLc; +import com.ruoyi.tc.entity.request.AssetLcRequest; import com.ruoyi.tc.service.AssetLcService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.data.domain.PageRequest; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; 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 e48d079..90e998c 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,18 @@ 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.domain.AssetTask; +import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import com.ruoyi.tc.service.AssetTaskService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.PageRequest; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import javax.validation.Valid; /** * 任务主表(AssetTask)表控制层 @@ -16,6 +22,7 @@ import javax.annotation.Resource; * @author makejava * @since 2024-11-18 13:22:58 */ +@Api(tags = "任务主表") @RestController @RequestMapping("/unit/assetTask") public class AssetTaskController extends BaseController { @@ -32,8 +39,9 @@ public class AssetTaskController extends BaseController { * @param pageRequest 分页对象 * @return 查询结果 */ - @GetMapping - public AjaxResult queryByPage(Page assetTask, PageRequest pageRequest) { + @ApiOperation(value = "分页查询", response = AssetTask.class) + @GetMapping("/page") + public AjaxResult queryByPage(Page assetTask, AssetTaskPageRequest pageRequest) { return AjaxResult.success(this.assetTaskService.queryByPage(assetTask, pageRequest)); } @@ -43,6 +51,7 @@ public class AssetTaskController extends BaseController { * @param id 主键 * @return 单条数据 */ + @ApiOperation(value = "通过主键查询单条数据", response = AssetTaskIdResponse.class) @GetMapping("{id}") public AjaxResult queryById(@PathVariable("id") Integer id) { return AjaxResult.success(this.assetTaskService.queryById(id)); @@ -54,9 +63,12 @@ public class AssetTaskController extends BaseController { * @param assetTask 实体 * @return 新增结果 */ - @PostMapping - public AjaxResult add(AssetTask assetTask) { - return AjaxResult.success(this.assetTaskService.insert(assetTask)); + @ApiOperation(value = "新增数据") + @PostMapping("/add") + @Transactional(rollbackFor = Exception.class) + public AjaxResult add(@RequestBody @Valid AssetTask assetTask) { + this.assetTaskService.insert(assetTask); + return AjaxResult.success(); } /** @@ -65,8 +77,9 @@ public class AssetTaskController extends BaseController { * @param assetTask 实体 * @return 编辑结果 */ - @PutMapping - public AjaxResult edit(AssetTask assetTask) { + @ApiOperation(value = "编辑数据") + @PostMapping("/edit") + public AjaxResult edit(@RequestBody @Valid AssetTask assetTask) { return AjaxResult.success(this.assetTaskService.update(assetTask)); } @@ -76,8 +89,9 @@ public class AssetTaskController extends BaseController { * @param id 主键 * @return 删除是否成功 */ - @DeleteMapping - public AjaxResult deleteById(Integer id) { + @ApiOperation(value = "删除数据") + @PostMapping("/deleteById/{id}") + public AjaxResult deleteById(@PathVariable("id") Integer id) { return AjaxResult.success(this.assetTaskService.deleteById(id)); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetLc.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java similarity index 99% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetLc.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java index 46841a4..6c97c47 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetLc.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetLc.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.domain; +package com.ruoyi.tc.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetTask.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java similarity index 96% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetTask.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java index 265342d..01d9ce8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/AssetTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.domain; +package com.ruoyi.tc.entity; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -59,10 +59,10 @@ public class AssetTask implements Serializable { @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回") private String taskStatus; /** - * 单位id + * 单位名称 */ - @ApiModelProperty("单位id") - private Integer dwId; + @ApiModelProperty("单位名称") + private String dwmc; /** * 创建者id */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/request/AssetLcRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetLcRequest.java similarity index 97% rename from ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/request/AssetLcRequest.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetLcRequest.java index 42c989d..7088cc3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/request/AssetLcRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetLcRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.tc.domain.request; +package com.ruoyi.tc.entity.request; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; 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 new file mode 100644 index 0000000..b97e088 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetTaskPageRequest.java @@ -0,0 +1,55 @@ +package com.ruoyi.tc.entity.request; + +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/19 10:27 + */ +@Data +@ApiModel("任务主表分页请求类") +public class AssetTaskPageRequest { + + /** + * 任务名称 + */ + @ApiModelProperty("任务名称") + private String taskName; + + + /** + * 任务编号 + */ + @ApiModelProperty("任务编号") + private String taskId; + + + /** + * 任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回 + */ + @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回") + private String taskStatus; + + /** + * 任务开始时间 + */ + @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 begainTime; + + + /** + * 任务结束时间 + */ + @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 endTime; +} 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/response/AssetBasicNetworkCpResponse.java new file mode 100644 index 0000000..211a1cf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBasicNetworkCpResponse.java @@ -0,0 +1,89 @@ +package com.ruoyi.tc.entity.response; + +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 AssetBasicNetworkCpResponse extends BaseClass implements Serializable { + + + private Integer id; + + /** + * 资源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; + /** + * 操作系统 + */ + @ApiModelProperty("操作系统") + private Integer 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; +} 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 new file mode 100644 index 0000000..4a5dd64 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java @@ -0,0 +1,403 @@ +package com.ruoyi.tc.entity.response; + + +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_cp)实体类 + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("资产新监管业务形态复制表") +@TableName(value = "asset_business_form_cp") +public class AssetBusinessFormCpResponse extends BaseClass implements Serializable { + + + private Integer id; + /** + * 资源id + */ + @ApiModelProperty("资源id") + private Long assetId; + /** + * 云平台-云平台服务商 + */ + @Size(max= 50,message="云平台-云平台服务商长度不能超过50") + @ApiModelProperty("云平台-云平台服务商") + private String yptFws; + /** + * 云平台-是否租户级安全 + */ + @ApiModelProperty("云平台-是否租户级安全") + private Integer 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 Integer dsjSfsjsj; + /** + * 一般物联网设备-系统集成商名称 + */ + @Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50") + @ApiModelProperty("一般物联网设备-系统集成商名称") + private String wlwsbXtjcs; + /** + * 一般物联网设备-用户数量 + */ + @Size(max= 50,message="一般物联网设备-用户数量长度不能超过50") + @ApiModelProperty("一般物联网设备-用户数量") + private String wlwsbYhsl; + /** + * 一般物联网设备-服务对象 + */ + @ApiModelProperty("一般物联网设备-服务对象") + private Integer wlwsbFwdx; + /** + * 一般物联网设备-终端数量 + */ + @Size(max= 50,message="一般物联网设备-终端数量长度不能超过50") + @ApiModelProperty("一般物联网设备-终端数量") + private String wlwsbZdsl; + /** + * 一般物联网设备-网络互联情况 + */ + @ApiModelProperty("一般物联网设备-网络互联情况") + private Integer wlwsbWlhlqk; + /** + * 一般物联网设备-联系人 + */ + @Size(max= 50,message="一般物联网设备-联系人长度不能超过50") + @ApiModelProperty("一般物联网设备-联系人") + private String wlwsbLxr; + /** + * 一般物联网设备-服务范围 + */ + @ApiModelProperty("一般物联网设备-服务范围") + private Integer 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 Integer appSfysfrz; + /** + * 工业控制-系统集成商名称 + */ + @Size(max= 255,message="工业控制-系统集成商名称长度不能超过255") + @ApiModelProperty("工业控制-系统集成商名称") + private String gykzJcs; + /** + * 工业控制-运行时间 + */ + @Size(max= 255,message="工业控制-运行时间长度不能超过255") + @ApiModelProperty("工业控制-运行时间") + private String gykzYxsj; + /** + * 工业控制-服务对象 + */ + @ApiModelProperty("工业控制-服务对象") + private Integer gykzFwdx; + /** + * 工业控制-集成商国内外情况 + */ + @Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255") + @ApiModelProperty("工业控制-集成商国内外情况") + private String gykzJcsqk; + /** + * 工业控制-网络互联情况 + */ + @ApiModelProperty("工业控制-网络互联情况") + private Integer gykzWlhxqk; + /** + * 工业控制-联系人 + */ + @Size(max= 255,message="工业控制-联系人长度不能超过255") + @ApiModelProperty("工业控制-联系人") + private String gykzLxr; + /** + * 工业控制-服务范围 + */ + @ApiModelProperty("工业控制-服务范围") + private Integer 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 Integer 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; +} 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 new file mode 100644 index 0000000..87fb993 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java @@ -0,0 +1,1029 @@ +package com.ruoyi.tc.entity.response; + +import com.baomidou.mybatisplus.annotation.TableField; +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 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 AssetCurrentResponse extends BaseClass implements Serializable { + + private static final long serialVersionUID = 1L; + + + private Integer id; + + /** + * 系统名称 + */ + @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; + /** + * 关联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 Integer xtlx; + /** + * 系统重要性（字典） + */ + @Excel(name = "系统重要性", dictType = "zc_xtzyx", comboReadDict = true, sort = 9) + @ApiModelProperty("系统重要性（字典）") + private Integer xtzyx; + /** + * 是否关基系统（字典） + */ + @NotNull + @Excel(name = "*是否关基系统", dictType = "is_no", comboReadDict = true, sort = 10) + @ApiModelProperty("是否关基系统（字典）") + private Integer 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 Integer 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 Integer xtzt; + /** + * 在线状态（字典） + */ + @Excel(name = "在线状态", dictType = "zc_zxzt", comboReadDict = true, sort = 37) + @ApiModelProperty("在线状态（字典）") + private Integer 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 Integer cJmx; + /** + * I-完整性（字典） + */ + @Excel(name = "完整性", dictType = "zc_c_i_a", comboReadDict = true, sort = 40) + @ApiModelProperty("I-完整性（字典）") + private Integer iWzx; + /** + * A-可用性(字典） + */ + @Excel(name = "可用性", dictType = "zc_c_i_a", comboReadDict = true, sort = 41) + @ApiModelProperty("A-可用性(字典）") + private Integer aKyx; + /** + * 存活率（字典） + */ + @ApiModelProperty("存活率（字典）") + private Integer chl; + /** + * 地理位置 + */ + @Size(max = 255, message = "地理位置长度不能超过255") + @ApiModelProperty("地理位置") + private String dlwz; + /** + * 经度 + */ + @Size(max = 50, message = "经度长度不能超过50") + @ApiModelProperty("经度") + private String jd; + /** + * 纬度 + */ + @Size(max = 50, message = "纬度长度不能超过50") + @ApiModelProperty("纬度") + private String wd; + /** + * 系统特征（,分隔） + */ + @Excel(width = 60, name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）", sort = 52) + @ApiModelProperty("系统特征（,分隔）") + private String xttz; + /** + * 用户规模 + */ + @Excel(name = "*用户规模", dictType = "zc_yhgm", comboReadDict = true, sort = 53) + @NotNull + @ApiModelProperty("用户规模") + private Integer 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 Integer 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 Integer 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 Integer dgzkf; + /** + * 互联网开放用途（字典） + */ + @NotNull + @Excel(name = "*互联网开放用途", dictType = "zc_hlwkfyt", comboReadDict = true, sort = 63, width = 22) + @ApiModelProperty("互联网开放用途（字典）") + private Integer hlwkfyt; + /** + * 系统防护情况-防篡改(多选字典） + */ + @ApiModelProperty("系统防护情况-防篡改(多选字典）") + private String xtfhqkFcg; + /** + * 系统防护情况-防泄露(多选字典） + */ + @ApiModelProperty("系统防护情况-防泄露(多选字典）") + private String xtfhqkFxl; + /** + * 系统防护情况-防中断(多选字典） + */ + @ApiModelProperty("系统防护情况-防中断(多选字典）") + private String xtfhqkFzd; + /** + * 系统防护情况-防勒索(多选字典） + */ + @ApiModelProperty("系统防护情况-防勒索(多选字典）") + private String xtfhqkFls; + /** + * 相关业务-覆盖范围 + */ + @ApiModelProperty("相关业务-覆盖范围") + private Integer xgywFgfw; + /** + * 相关业务-网络性质 + */ + @ApiModelProperty("相关业务-网络性质") + private Integer xgywWlxz; + /** + * 相关业务-业务类型 + */ + @ApiModelProperty("相关业务-业务类型") + private Integer xgywYwlx; + /** + * 相关业务-互联情况 + */ + @ApiModelProperty("相关业务-互联情况") + private Integer xgywHlqk; + /** + * 相关业务-服务对象 + */ + @ApiModelProperty("相关业务-服务对象") + private Integer xgywFwdx; + /** + * 相关业务-服务范围 + */ + @ApiModelProperty("相关业务-服务范围") + private Integer 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 Integer ipcSfba; + /** + * ICP备案信息-备案有效性 + */ + @ApiModelProperty("ICP备案信息-备案有效性") + private Integer ipcBayxx; + /** + * ICP备案信息-备案网站名称 + */ + @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站名称") + private String ipcBawzmc; + /** + * ICP备案信息-备案网站首页 + */ + @Size(max = 50, message = "ICP备案信息-备案网站名称长度不能超过50") + @ApiModelProperty("ICP备案信息-备案网站首页") + private String ipcBawzsy; + /** + * ICP备案信息-ICP备案编号 + */ + @Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）", sort = 25, width = 46) + @NotBlank + @Size(max = 50, message = "ICP备案信息-ICP备案编号长度不能超过50") + @ApiModelProperty("ICP备案信息-ICP备案编号") + private String ipcIpcbabh; + /** + * ICP备案信息-备案域名 + */ + @Excel(name = "*备案域名", 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 Integer 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 Integer 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 Integer xtjgGcxt; + /** + * 系统架构-是否有国产设备 + */ + @Excel(name = "*是否有国产设备", dictType = "is_no", comboReadDict = true, sort = 35, width = 22) + @NotNull + @ApiModelProperty("系统架构-是否有国产设备") + private Integer xtjgGcsb; + /** + * 系统架构-系统设备国产化率 + */ + @Size(max = 50, message = "系统架构-系统设备国产化率长度不能超过50") + @ApiModelProperty("系统架构-系统设备国产化率") + private String xtjgGchl; + /** + * 等保信息-是否等保系统 + */ + @Excel(name = "*是否是等保系统", dictType = "is_no", comboReadDict = true, sort = 42) + @NotNull + @ApiModelProperty("等保信息-是否等保系统") + private Integer 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 Integer dbxxDbdj; + /** + * 等保信息-主管部门 + */ + @Size(max = 50, message = "等保信息-主管部门长度不能超过50") + @ApiModelProperty("等保信息-主管部门") + private String dbxxZgbm; + /** + * 等保信息-专家评审 + */ + @ApiModelProperty("等保信息-专家评审") + private Integer dbxxZjps; + /** + * 等保信息-主管部门评审 + */ + @ApiModelProperty("等保信息-主管部门评审") + private Integer dbxxZgbmps; + /** + * 等保信息-定级时间 + */ + @NotBlank + @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）", sort = 119, width = 40) + @Size(max = 50, message = "等保信息-定级时间长度不能超过50") + @ApiModelProperty("等保信息-定级时间") + private String dbxxDjsj; + /** + * 等保信息-是否有第三方测评 + */ + @ApiModelProperty("等保信息-是否有第三方测评") + @NotNull + @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）", width = 45, dictType = "is_no", comboReadDict = true, sort = 45) + private Integer 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; + /** + * 第三方测评-测评师证书等级 + */ + @ApiModelProperty("第三方测评-测评师证书等级") + private Integer sfCpszsdj; + /** + * 第三方测评-测评等级 + */ + @ApiModelProperty("第三方测评-测评等级") + private Integer 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; + +// /** +// * 供应链信息(id集合逗号分隔) +// */ +// @Size(max= 255,message="供应链信息长度不能超过255") +// @ApiModelProperty("供应链信息(id集合逗号分隔)") +// private String gylxx; +// /** +// * 基础网络(id集合逗号分隔） +// */ +// @Size(max= 255,message="基础网络长度不能超过255") +// @ApiModelProperty("基础网络(id集合逗号分隔）") +// private String jcwl; + /** + * 供应链信息列表 + */ + @ApiModelProperty("供应链信息列表") + @TableField(exist = false) + private List gylxxList; + /** + * 基础网络列表 + */ + @ApiModelProperty("基础网络列表") + @TableField(exist = false) + private List jcwlList; + + /** + * 新监管业务形态 + */ + @ApiModelProperty("新监管业务形态") + @TableField(exist = false) + private AssetBusinessFormCpResponse xjgywxt; + /** + * Whois信息-有效性 + */ + @ApiModelProperty("Whois信息-有效性") + private Integer 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 Integer sjzcGxsx; + /** + * 数据资产-开放属性 + */ + @Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 104) + @NotNull + @ApiModelProperty("数据资产-开放属性") + private Integer sjzcKfsx; + /** + * 数据资产-数据领域 + */ + @NotNull + @Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 105) + @ApiModelProperty("数据资产-数据领域") + private Integer sjzcSjly; + /** + * 数据资产-更新周期 + */ + @NotNull + @Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 106) + @ApiModelProperty("数据资产-更新周期") + private Integer 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 Integer sjzcSmsj; + /** + * 数据资产-数据是否出境 + */ + @NotNull + @Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 111) + @ApiModelProperty("数据资产-数据是否出境") + private Integer sjzcCj; + /** + * 数据资产-数据分级分类 + */ + @NotNull + @Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 112) + @ApiModelProperty("数据资产-数据分级分类") + private Integer sjzcSjfjfl; + /** + * 数据资产-数据重要程度 + */ + @NotNull + @Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 113) + @ApiModelProperty("数据资产-数据重要程度") + private Integer 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("删除标志（0代表存在 2代表删除）") + private String delFlag; +} 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 new file mode 100644 index 0000000..b747424 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSupplyChainCpResponse.java @@ -0,0 +1,73 @@ +package com.ruoyi.tc.entity.response; + +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_cp)实体类 + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("资产供应链信息复制表响应类") +@TableName(value = "asset_supply_chain_cp") +public class AssetSupplyChainCpResponse extends BaseClass implements Serializable { + + private Integer id; + /** + * 资产id + */ + @ApiModelProperty("资产id") + private Long assetId; + /** + * 1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 + */ + @ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位") + 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 Integer sfwtc; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java new file mode 100644 index 0000000..61d1a85 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java @@ -0,0 +1,131 @@ +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/19 9:58 + */ +@Data +@ApiModel("任务详情响应类") +public class AssetTaskIdResponse { + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Integer id; + /** + * 任务编号 + */ + @ApiModelProperty("任务编号") + private String taskId; + /** + * 任务名称 + */ + @ApiModelProperty("任务名称") + private String taskName; + /** + * 任务下发时间 + */ + @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 taskTime; + /** + * 任务截至时间 + */ + @ApiModelProperty("任务截至时间") + private String taskDeadline; + /** + * 任务完成时间 + */ + @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 taskFinishTime; + /** + * 任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回 + */ + @ApiModelProperty("任务状态1：进行中，2：正常完成，3：超期完成，4：正常完成，5：审核驳回") + private String taskStatus; + /** + * 单位名称 + */ + @ApiModelProperty("单位名称") + private Integer dwmc; + /** + * 创建者id + */ + /** + * 用户id + */ + @ApiModelProperty("用户id") + private Integer userId; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private Integer deptId; + /** + * 创建者id + */ + @ApiModelProperty("创建者id") + private Integer createId; + /** + * 创建人 + */ + @ApiModelProperty("创建人") + private String createBy; + /** + * 创建时间 + */ + @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 createTime; + /** + * 更新着id + */ + @ApiModelProperty("更新着id") + private Integer updateId; + /** + * 更新者 + */ + @ApiModelProperty("更新者") + private String updateBy; + /** + * 更新时间 + */ + @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 updateTime; + /** + * 版本 + */ + @ApiModelProperty("版本") + private String version; + /** + * 备注 + */ + @ApiModelProperty("备注") + private String reamark; + + /** + * 系统类型 + */ + @ApiModelProperty("系统类型") + private String xtlx; + + /** + * 系统名称 + */ + @ApiModelProperty("系统名称") + private String xtmc; +} 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/response/UnitOtherConcatCpResponse.java new file mode 100644 index 0000000..99c26a4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/UnitOtherConcatCpResponse.java @@ -0,0 +1,44 @@ +package com.ruoyi.tc.entity.response; + +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_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("单位其他联系人复制表") +@TableName(value = "unit_other_contact_cp") +public class UnitOtherConcatCpResponse extends BaseClass implements Serializable { + + 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; +} 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 new file mode 100644 index 0000000..bb36aec --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java @@ -0,0 +1,29 @@ +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.Select; + +import java.util.List; + +/** + * 资产基础网络复制表(asset_basic_network_cp)表数据库访问层 + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetBasicNetWorkCpMapper extends BaseMapper { + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + + @Select("select id from asset_basic_network_cp where asset_id=#{assetId} ") + int findByassetId(Integer assetId); + + +} + 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 new file mode 100644 index 0000000..16fd852 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java @@ -0,0 +1,26 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import org.apache.ibatis.annotations.Select; + +/** + * 资产新监管业务形态复制表(asset_business_form_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetBusinessFormCpMapper extends BaseMapper { + + + /** + * 根据资产id查询业务主表原有id + * + * @param assetId 资产id + * @return + */ + @Select("select id from asset_business_form_cp where asset_id =#{assetId}") + int findByassetId(Integer assetId); + +} + 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 new file mode 100644 index 0000000..a905a7c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java @@ -0,0 +1,37 @@ +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 org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 现有资产复制表(AssetCurrentResponse)表数据库访问层 + * + * @author makejava + * @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); + + + /** + * 逻辑删除 + */ + void deleteByUnitIds(List idList); +} + 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 57e02d9..cdd49eb 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 @@ -1,10 +1,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.tc.domain.AssetLc; -import com.ruoyi.tc.domain.request.AssetLcRequest; +import com.ruoyi.tc.entity.AssetLc; +import com.ruoyi.tc.entity.request.AssetLcRequest; import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import java.util.List; 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 new file mode 100644 index 0000000..a56af96 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainCpMapper.java @@ -0,0 +1,27 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import org.apache.ibatis.annotations.Select; + +/** + * 资产供应链信息复制(asset_supply_chain_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetSupplyChainCpMapper extends BaseMapper { + + + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + @Select("select id from asset_supply_chain_cp where asset_id=#{assetId}") + int findByassetId(Integer assetId); + +} + 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 edc980b..e064653 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 @@ -2,10 +2,14 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.tc.domain.AssetTask; +import com.ruoyi.tc.entity.AssetCurrent; +import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.response.AssetCurrentResponse; +import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import org.apache.ibatis.annotations.Param; -import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; + import java.util.List; /** @@ -20,24 +24,25 @@ public interface AssetTaskMapper extends BaseMapper { /** * 页条件查询 * - * @param page 分页条件 - * @param pageRequest 查询条件 + * @param page 分页条件 + * @param pageRequest 查询条件 * @return 填报任务 */ - Page queryByPage(Page page, @Param("req") PageRequest pageRequest); + Page queryByPage(Page page, @Param("req") AssetTaskPageRequest pageRequest); + /** * 通过ID查询单条数据 * * @param id 主键 * @return 实例对象 */ - AssetTask queryById(Integer id); + List queryById(Integer id); /** * 查询指定行数据 * * @param assetTask 查询条件 - * @param pageable 分页对象 + * @param pageable 分页对象 * @return 对象列表 */ List queryAllByLimit(AssetTask assetTask, @Param("pageable") Pageable pageable); @@ -91,5 +96,13 @@ public interface AssetTaskMapper extends BaseMapper { */ int deleteById(Integer id); + + /** + * 根据单位名称查询资产 + * + * @param dwmc 单位名称 + * @return + */ + AssetCurrentResponse findByDwmcAssetCurrent(String dwmc); } 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 new file mode 100644 index 0000000..163b91f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatCpMapper.java @@ -0,0 +1,23 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; +import org.apache.ibatis.annotations.Select; + +/** + * 单位其他联系人复制(unit_other_contact_cp)数据层 + * + * @author ruoyi + */ +public interface UnitOtherConcatCpMapper extends BaseMapper { + + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + @Select("select id from unit_other_contact_cp where asset_id =#{assetId}") + int findByassetId(Integer assetId); +} 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 new file mode 100644 index 0000000..3c8746a --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkCpService.java @@ -0,0 +1,25 @@ +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 java.util.List; + +/** + * 资产基础网络复制表(asset_basic_network)表服务接口 + * + * @author makejava + * @since 2024-11-15 16:05:26 + */ +public interface AssetBasicNetworkCpService extends IService { + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + int findByassetId(Integer assetId); + +} 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 new file mode 100644 index 0000000..253481c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java @@ -0,0 +1,23 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; + +/** + * 资产新监管业务形态复制(asset_business_form_cp)表服务接口 + * + * @author makejava + * @since 2024-11-15 16:06:53 + */ +public interface AssetBusinessFormCpService extends IService { + + /** + * 根据资产id查询业务主表原有id + * @param assetId 资产id + * @return + */ + int findByassetId(Integer assetId); + + +} + 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 new file mode 100644 index 0000000..dfeca39 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java @@ -0,0 +1,21 @@ +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)表服务接口 + * + * @author makejava + * @since 2024-11-15 10:04:03 + */ +public interface AssetCurrentCpService extends IService { + +} + 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 f83b674..ddf5e2e 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 @@ -1,9 +1,8 @@ package com.ruoyi.tc.service; -import com.ruoyi.tc.domain.AssetLc; +import com.ruoyi.tc.entity.AssetLc; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.tc.domain.request.AssetLcRequest; -import org.springframework.data.domain.PageRequest; +import com.ruoyi.tc.entity.request.AssetLcRequest; /** * 任务流程(AssetLc)表服务接口 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 new file mode 100644 index 0000000..a766b04 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainCpService.java @@ -0,0 +1,23 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; + +/** + * 资产供应链信息复制(asset_supply_chain_cp)表服务接口 + * + * @author makejava + * @since 2024-11-15 16:07:30 + */ +public interface AssetSupplyChainCpService extends IService { + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + int findByassetId(Integer assetId); + + +} 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 37417e5..57dba02 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,9 +1,12 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.tc.domain.AssetTask; +import com.ruoyi.tc.entity.AssetTask; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import org.springframework.data.domain.PageRequest; +import java.util.List; /** * 任务主表(AssetTask)表服务接口 @@ -19,7 +22,7 @@ public interface AssetTaskService extends IService { * @param id 主键 * @return 实例对象 */ - AssetTask queryById(Integer id); + List queryById(Integer id); /** * 分页查询 @@ -28,7 +31,7 @@ public interface AssetTaskService extends IService { * @param pageRequest 分页对象 * @return 查询结果 */ - Page queryByPage(Page assetTask, PageRequest pageRequest); + Page queryByPage(Page assetTask, AssetTaskPageRequest pageRequest); /** * 新增数据 @@ -36,7 +39,7 @@ public interface AssetTaskService extends IService { * @param assetTask 实例对象 * @return 实例对象 */ - AssetTask insert(AssetTask assetTask); + void insert(AssetTask assetTask); /** * 修改数据 @@ -44,7 +47,7 @@ public interface AssetTaskService extends IService { * @param assetTask 实例对象 * @return 实例对象 */ - AssetTask update(AssetTask assetTask); + int update(AssetTask assetTask); /** * 通过主键删除数据 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 new file mode 100644 index 0000000..89b1bac --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatCpService.java @@ -0,0 +1,23 @@ +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 java.util.List; + +/** + * 单位其他联系人复制(unit_other_contact_cp)业务层 + * @author du + * @since 2024/11/13 14:55 + */ +public interface UnitOtherConcatCpService extends IService { + + /** + * 根据资产id资产供应链原有id + * + * @param assetId 资产id + * @return + */ + int findByassetId(Integer assetId); +} 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 new file mode 100644 index 0000000..d3deffc --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkCpServiceImpl.java @@ -0,0 +1,27 @@ +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.mapper.AssetBasicNetWorkCpMapper; +import com.ruoyi.tc.service.AssetBasicNetworkCpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 资产基础网络复制表(AssetBasicNetworkCpResponse)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:05:26 + */ +@Service("assetBasicNetworkCpService") +public class AssetBasicNetworkCpServiceImpl extends ServiceImpl implements AssetBasicNetworkCpService { + + @Resource + private AssetBasicNetWorkCpMapper assetBasicNetWorkCpMapper; + + @Override + public int findByassetId(Integer assetId) { + return assetBasicNetWorkCpMapper.findByassetId(assetId); + } +} 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 new file mode 100644 index 0000000..52be9c4 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java @@ -0,0 +1,28 @@ +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.mapper.AssetBusinessFormCpMapper; +import com.ruoyi.tc.service.AssetBusinessFormCpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 资产新监管业务形态复制(AssetBusinessFormCp)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:06:53 + */ +@Service("assetBusinessFormCpService") +public class AssetBusinessFormCpServiceImpl extends ServiceImpl implements AssetBusinessFormCpService { + + @Resource + private AssetBusinessFormCpMapper assetBusinessFormCpMapper; + + @Override + public int findByassetId(Integer assetId) { + return assetBusinessFormCpMapper.findByassetId(assetId); + } +} + 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 new file mode 100644 index 0000000..8670fb9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java @@ -0,0 +1,28 @@ +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.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)表服务实现类 + * + * @author makejava + * @since 2024-11-15 10:04:03 + */ +@Service("assetCurrentCpService") +public class AssetCurrentCpServiceImpl extends ServiceImpl implements AssetCurrentCpService { + + +} + 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 bbdf617..e5a22e6 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 @@ -1,15 +1,11 @@ package com.ruoyi.tc.service.impl; -import com.ruoyi.tc.domain.AssetLc; +import com.ruoyi.tc.entity.AssetLc; -import com.ruoyi.tc.domain.AssetTask; -import com.ruoyi.tc.domain.request.AssetLcRequest; +import com.ruoyi.tc.entity.request.AssetLcRequest; import com.ruoyi.tc.mapper.AssetLcMapper; import com.ruoyi.tc.service.AssetLcService; -import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Service; -import org.springframework.data.domain.PageImpl; -import org.springframework.data.domain.PageRequest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import javax.annotation.Resource; 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 new file mode 100644 index 0000000..2deed95 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainCpServiceImpl.java @@ -0,0 +1,30 @@ +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.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; +import java.util.List; + +/** + * 资产供应链信息表复制(AssetSupplyChainCpResponse)表服务实现类 + * + * @author makejava + * @since 2024-11-15 16:07:30 + */ +@Service("assetSupplyChainCpService") +public class AssetSupplyChainCpServiceImpl extends ServiceImpl implements AssetSupplyChainCpService { + + @Resource + private AssetSupplyChainCpMapper assetSupplyChainCpMapper; + @Override + public int findByassetId(Integer assetId) { + return assetSupplyChainCpMapper.findByassetId(assetId); + } +} 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 abb5136..8148ed4 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,13 +2,15 @@ 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.domain.AssetTask; +import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.request.AssetTaskPageRequest; +import com.ruoyi.tc.entity.response.*; import com.ruoyi.tc.mapper.AssetTaskMapper; -import com.ruoyi.tc.service.AssetTaskService; -import org.springframework.data.domain.PageRequest; +import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 任务主表(AssetTask)表服务实现类 @@ -21,6 +23,23 @@ public class AssetTaskServiceImpl extends ServiceImpl queryById(Integer id) { return this.assetTaskDao.queryById(id); } @@ -40,7 +59,7 @@ public class AssetTaskServiceImpl extends ServiceImpl queryByPage(Page assetTask, PageRequest pageRequest) { + public Page queryByPage(Page assetTask, AssetTaskPageRequest pageRequest) { return assetTaskDao.queryByPage(assetTask, pageRequest); } @@ -51,9 +70,55 @@ public class AssetTaskServiceImpl extends ServiceImpl implements UnitOtherConcatCpService { + @Resource + private UnitOtherConcatCpMapper unitOtherConcatCpMapper; + + @Override + public int findByassetId(Integer assetId) { + return unitOtherConcatCpMapper.findByassetId(assetId); + } +} diff --git a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml index 1078686..75d7e99 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetLcDao.xml @@ -2,7 +2,7 @@ - + diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index b160744..76ca4d3 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -2,7 +2,7 @@ - + @@ -10,7 +10,7 @@ - + @@ -25,32 +25,33 @@ - select - id,task_id,task_name,task_time,task_deadline,task_finish_time,task_status,dw_id,create_id,create_by,create_time,update_id,update_by,update_time,user_id,dept_id,version,reamark + id,task_id,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 from asset_task - - and task_name = #{taskName} + + and task_name = #{req.taskName} - - and task_finish_time = #{taskFinishTime} - - - and task_finish_time >= #{begainTime} + + + and task_finish_time >= #{req.begainTime} - - and task_finish_time <= #{endTime} + + and task_finish_time <= #{req.endTime} - - and task_status = #{taskStatus} + + and task_status = #{req.taskStatus} - - and task_id = #{taskId} + + and task_id = #{req.taskId} + - insert into asset_task(task_id, task_name, task_time, task_deadline, task_finish_time, task_status, dw_id, + insert into asset_task(task_id, 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 (#{taskId}, #{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwId}, + values (#{taskId}, #{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc}, #{createId}, #{createBy}, #{createTime}, #{updateId}, #{updateBy}, #{updateTime}, #{userId}, #{deptId}, #{version}, #{reamark}) insert into - asset_task(task_id,task_name,task_time,task_deadline,task_finish_time,task_status,dw_id,create_id,create_by,create_time,update_id,update_by,update_time,user_id,dept_id,version,reamark) + asset_task(task_id,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 - (#{entity.taskId},#{entity.taskName},#{entity.taskTime},#{entity.taskDeadline},#{entity.taskFinishTime},#{entity.taskStatus},#{entity.dwId},#{entity.createId},#{entity.createBy},#{entity.createTime},#{entity.updateId},#{entity.updateBy},#{entity.updateTime},#{entity.userId},#{entity.deptId},#{entity.version},#{entity.reamark}) + (#{entity.taskId},#{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}) insert into - asset_task(task_id,task_name,task_time,task_deadline,task_finish_time,task_status,dw_id,create_id,create_by,create_time,update_id,update_by,update_time,user_id,dept_id,version,reamark) + asset_task(task_id,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 - (#{entity.taskId},#{entity.taskName},#{entity.taskTime},#{entity.taskDeadline}#{entity.taskFinishTime}#{entity.taskStatus}#{entity.dwId}#{entity.createId}#{entity.createBy}#{entity.createTime}#{entity.updateId}#{entity.updateBy}#{entity.updateTime}#{entity.userId}#{entity.deptId}#{entity.version}#{entity.reamark}) + (#{entity.taskId},#{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_id = values(task_id)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)dw_id = - values(dw_id)create_id = values(create_id)create_by = values(create_by)create_time = + 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 = values(update_time)user_id = values(user_id)dept_id = values(dept_id)version = values(version)reamark = values(reamark) @@ -256,8 +258,8 @@ task_status = #{taskStatus}, - - dw_id = #{dwId}, + + dwmc = #{dwmc}, create_id = #{createId}, 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 033a7e3..d3d4293 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("/tc/**").permitAll() + .antMatchers("/unit/assetTask/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); })