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 90e998c..4db8a29 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,13 +3,15 @@ package com.ruoyi.tc.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.tc.entity.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 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.*; @@ -95,5 +97,34 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(this.assetTaskService.deleteById(id)); } + + /** + * 任务审核 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + @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(); + } + + + /** + * 资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + @ApiOperation(value = "资产核查信息", response = AssestTaskXqresponse.class) + @GetMapping("/zcHc") + public AjaxResult zcHc(Page page, AssestTaskXqRequest pageRequest) { + + return AjaxResult.success(assetTaskService.zcHc(page, pageRequest)); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java index 5c3014e..a48fefd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java @@ -31,7 +31,7 @@ import java.util.List; */ @Api(tags = "单位表控制层") @RestController -@PreAuthorize("@ss.hasAnyRoles('admin,common')") +//@PreAuthorize("@ss.hasAnyRoles('admin,common')") @RequestMapping("/tc/unit") public class UnitController { @@ -165,4 +165,16 @@ public class UnitController { examineInfoService.deleteByUnitIds(id); return AjaxResult.success(); } + + /** + * 单位列表过滤 + */ + @ApiOperation(value = "单位列表过滤", response = Unit.class) + @GetMapping("/dwList") + public AjaxResult dwList(UnitRequest unit) { + Page page = new Page<>(); + page.setSize(unit.getSize()); + page.setCurrent(unit.getCurrent()); + return AjaxResult.success(unitService.dwList(page, unit)); + } } 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 new file mode 100644 index 0000000..d0a6b4c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java @@ -0,0 +1,38 @@ +package com.ruoyi.tc.entity.request; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.bind.annotation.RequestParam; + +/** + * @author dong + * @since 2024/11/19 18:21 + */ +@Data +@ApiModel("资产核查请求类") +public class AssestTaskXqRequest { + /** + * 任务id + */ + @ApiModelProperty("任务id") + private String taskId; + + /** + * 资产类型 + */ + @ApiModelProperty("资产类型") + private String zclx; + + /** + * 单位名称 + */ + @ApiModelProperty("单位名称") + private String dwmc; + + /** + * 审核状态（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/AssestTaskXqresponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java new file mode 100644 index 0000000..85fb5fe --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssestTaskXqresponse.java @@ -0,0 +1,50 @@ +package com.ruoyi.tc.entity.response; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author dong + * @since 2024/11/19 15:09 + */ +@Data +@ApiModel("资产核查响应类") +public class AssestTaskXqresponse { + + /** + * 资产id + */ + @ApiModelProperty("资产id") + private Integer id; + /** + * 任务id + */ + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 系统类型 + */ + @ApiModelProperty("系统类型") + private String xtlx; + + /** + * 系统名称 + */ + @ApiModelProperty("系统名称") + private String xtmc; + + + /** + * 资产单位名称 + */ + @ApiModelProperty("资产单位名称") + private String zcdwmc; + + + /** + * 审核状态（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/AssetBasicNetworkCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBasicNetworkCpResponse.java index 211a1cf..a48e3d3 100644 --- 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 @@ -21,69 +21,72 @@ import java.io.Serializable; public class AssetBasicNetworkCpResponse extends BaseClass implements Serializable { - private Integer id; + private Long id; /** - * 资源id - */ + * 资源id + */ @ApiModelProperty("资源id") private Long assetId; /** - * 1.服务器信息2网络设备3安全设备 - */ + * 1.服务器信息2网络设备3安全设备 + */ @ApiModelProperty("1.服务器信息2网络设备3安全设备") private Integer type; /** - * 设备类型 - */ + * 设备类型 + */ @ApiModelProperty("设备类型") private String sblx; /** - * 品牌 - */ + * 品牌 + */ @ApiModelProperty("品牌") private String pp; /** - * 设备IP - */ + * 设备IP + */ @ApiModelProperty("设备IP") private String sbIp; /** - * 操作系统 - */ + * 操作系统 + */ @ApiModelProperty("操作系统") - private Integer czxt; + private String czxt; /** - * 操作系统版本 - */ + * 操作系统版本 + */ @ApiModelProperty("操作系统版本") private String czxtbb; /** - * 硬件型号 - */ + * 硬件型号 + */ @ApiModelProperty("硬件型号") private String yjxh; /** - * 硬件序列号 - */ + * 硬件序列号 + */ @ApiModelProperty("硬件序列号") private String yjxlh; /** - * 硬件版本信息 - */ + * 硬件版本信息 + */ @ApiModelProperty("硬件版本信息") private String yjbbxx; /** - * 硬件用途 - */ + * 硬件用途 + */ @ApiModelProperty("硬件用途") private String yjyt; /** - * 硬件部署位置 - */ + * 硬件部署位置 + */ @ApiModelProperty("硬件部署位置") private String yjbsxx; @ApiModelProperty("删除标志（0代表存在 2代表删除）") private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetBusinessFormCpResponse.java index 4a5dd64..3916f20 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 @@ -22,382 +22,385 @@ import java.io.Serializable; @TableName(value = "asset_business_form_cp") public class AssetBusinessFormCpResponse extends BaseClass implements Serializable { - - private Integer id; + private Long id; /** - * 资源id - */ + * 资源id + */ @ApiModelProperty("资源id") private Long assetId; /** - * 云平台-云平台服务商 - */ + * 云平台-云平台服务商 + */ @Size(max= 50,message="云平台-云平台服务商长度不能超过50") @ApiModelProperty("云平台-云平台服务商") private String yptFws; /** - * 云平台-是否租户级安全 - */ + * 云平台-是否租户级安全 + */ @ApiModelProperty("云平台-是否租户级安全") - private Integer yptSfzh; + private String yptSfzh; /** - * 云平台-云平台类型 - */ + * 云平台-云平台类型 + */ @Size(max= 50,message="云平台-云平台类型长度不能超过50") @ApiModelProperty("云平台-云平台类型") private String yptLx; /** - * 云平台-硬件资源大小 - */ + * 云平台-硬件资源大小 + */ @Size(max= 50,message="云平台-硬件资源大小长度不能超过50") @ApiModelProperty("云平台-硬件资源大小") private String yptYjzydx; /** - * 云平台-平台架构 - */ + * 云平台-平台架构 + */ @Size(max= 50,message="云平台-平台架构长度不能超过50") @ApiModelProperty("云平台-平台架构") private String yptPtjg; /** - * 云平台-互联网IP段 - */ + * 云平台-互联网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; + private String dsjSfsjsj; /** - * 一般物联网设备-系统集成商名称 - */ + * 一般物联网设备-系统集成商名称 + */ @Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50") @ApiModelProperty("一般物联网设备-系统集成商名称") private String wlwsbXtjcs; /** - * 一般物联网设备-用户数量 - */ + * 一般物联网设备-用户数量 + */ @Size(max= 50,message="一般物联网设备-用户数量长度不能超过50") @ApiModelProperty("一般物联网设备-用户数量") private String wlwsbYhsl; /** - * 一般物联网设备-服务对象 - */ + * 一般物联网设备-服务对象 + */ @ApiModelProperty("一般物联网设备-服务对象") - private Integer wlwsbFwdx; + private String wlwsbFwdx; /** - * 一般物联网设备-终端数量 - */ + * 一般物联网设备-终端数量 + */ @Size(max= 50,message="一般物联网设备-终端数量长度不能超过50") @ApiModelProperty("一般物联网设备-终端数量") private String wlwsbZdsl; /** - * 一般物联网设备-网络互联情况 - */ + * 一般物联网设备-网络互联情况 + */ @ApiModelProperty("一般物联网设备-网络互联情况") - private Integer wlwsbWlhlqk; + private String wlwsbWlhlqk; /** - * 一般物联网设备-联系人 - */ + * 一般物联网设备-联系人 + */ @Size(max= 50,message="一般物联网设备-联系人长度不能超过50") @ApiModelProperty("一般物联网设备-联系人") private String wlwsbLxr; /** - * 一般物联网设备-服务范围 - */ + * 一般物联网设备-服务范围 + */ @ApiModelProperty("一般物联网设备-服务范围") - private Integer wlwsbFwfw; + private String wlwsbFwfw; /** - * 一般物联网设备-联系人电话 - */ + * 一般物联网设备-联系人电话 + */ @Size(max= 50,message="一般物联网设备-联系人电话长度不能超过50") @ApiModelProperty("一般物联网设备-联系人电话") private String wlwsbLxrdh; /** - * 一般物联网设备-服务内容 - */ + * 一般物联网设备-服务内容 + */ @Size(max= 500,message="一般物联网设备-服务内容长度不能超过500") @ApiModelProperty("一般物联网设备-服务内容") private String wlwsbFwnr; /** - * 摄像头-摄像头品牌 - */ + * 摄像头-摄像头品牌 + */ @Size(max= 50,message="摄像头-摄像头品牌长度不能超过50") @ApiModelProperty("摄像头-摄像头品牌") private String sxtPp; /** - * 摄像头-位置 - */ + * 摄像头-位置 + */ @Size(max= 255,message="摄像头-位置长度不能超过255") @ApiModelProperty("摄像头-位置") private String sxtWz; /** - * 摄像头-摄像头IP - */ + * 摄像头-摄像头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系统 - */ + * 移动APP-移动APP系统 + */ @Size(max= 50,message="移动APP-移动APP系统长度不能超过50") @ApiModelProperty("移动APP-移动APP系统") private String appXt; /** - * 移动APP-服务端域名 - */ + * 移动APP-服务端域名 + */ @Size(max= 50,message="移动APP-服务端域名长度不能超过50") @ApiModelProperty("移动APP-服务端域名") private String appYm; /** - * 移动APP-移动APP渠道 - */ + * 移动APP-移动APP渠道 + */ @Size(max= 50,message="移动APP-移动APP渠道长度不能超过50") @ApiModelProperty("移动APP-移动APP渠道") private String appQd; /** - * 移动APP-服务端IP - */ + * 移动APP-服务端IP + */ @Size(max= 50,message="移动APP-服务端IP长度不能超过50") @ApiModelProperty("移动APP-服务端IP") private String appIp; /** - * 移动APP-联系人 - */ + * 移动APP-联系人 + */ @Size(max= 50,message="移动APP-联系人长度不能超过50") @ApiModelProperty("移动APP-联系人") private String appLxr; /** - * 移动APP-联系人电话 - */ + * 移动APP-联系人电话 + */ @Size(max= 50,message="移动APP-联系人电话长度不能超过50") @ApiModelProperty("移动APP-联系人电话") private String appLxrdh; /** - * 移动APP-APP是否有身份认证 - */ + * 移动APP-APP是否有身份认证 + */ @ApiModelProperty("移动APP-APP是否有身份认证") - private Integer appSfysfrz; + private String appSfysfrz; /** - * 工业控制-系统集成商名称 - */ + * 工业控制-系统集成商名称 + */ @Size(max= 255,message="工业控制-系统集成商名称长度不能超过255") @ApiModelProperty("工业控制-系统集成商名称") private String gykzJcs; /** - * 工业控制-运行时间 - */ + * 工业控制-运行时间 + */ @Size(max= 255,message="工业控制-运行时间长度不能超过255") @ApiModelProperty("工业控制-运行时间") private String gykzYxsj; /** - * 工业控制-服务对象 - */ + * 工业控制-服务对象 + */ @ApiModelProperty("工业控制-服务对象") - private Integer gykzFwdx; + private String gykzFwdx; /** - * 工业控制-集成商国内外情况 - */ + * 工业控制-集成商国内外情况 + */ @Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255") @ApiModelProperty("工业控制-集成商国内外情况") private String gykzJcsqk; /** - * 工业控制-网络互联情况 - */ + * 工业控制-网络互联情况 + */ @ApiModelProperty("工业控制-网络互联情况") - private Integer gykzWlhxqk; + private String gykzWlhxqk; /** - * 工业控制-联系人 - */ + * 工业控制-联系人 + */ @Size(max= 255,message="工业控制-联系人长度不能超过255") @ApiModelProperty("工业控制-联系人") private String gykzLxr; /** - * 工业控制-服务范围 - */ + * 工业控制-服务范围 + */ @ApiModelProperty("工业控制-服务范围") - private Integer gykzFwfw; + private String gykzFwfw; /** - * 工业控制-联系人电话 - */ + * 工业控制-联系人电话 + */ @Size(max= 50,message="工业控制-联系人电话长度不能超过50") @ApiModelProperty("工业控制-联系人电话") private String gykzLxrdh; /** - * 工业控制-设备名称 - */ + * 工业控制-设备名称 + */ @Size(max= 50,message="工业控制-设备名称长度不能超过50") @ApiModelProperty("工业控制-设备名称") private String gykzSbmc; /** - * 工业控制-设备品牌 - */ + * 工业控制-设备品牌 + */ @Size(max= 50,message="工业控制-设备品牌长度不能超过50") @ApiModelProperty("工业控制-设备品牌") private String gykzSbpp; /** - * 工业控制-设备类别 - */ + * 工业控制-设备类别 + */ @Size(max= 50,message="工业控制-设备类别长度不能超过50") @ApiModelProperty("工业控制-设备类别") private String gykzSblb; /** - * 工业控制-运营商 - */ + * 工业控制-运营商 + */ @Size(max= 50,message="工业控制-运营商长度不能超过50") @ApiModelProperty("工业控制-运营商") private String gykzYys; /** - * 工业控制-互联网IP - */ + * 工业控制-互联网IP + */ @Size(max= 50,message="工业控制-互联网IP长度不能超过50") @ApiModelProperty("工业控制-互联网IP") private String gykzHlwIp; /** - * 工业控制-网络层级 - */ + * 工业控制-网络层级 + */ @Size(max= 50,message="工业控制-网络层级长度不能超过50") @ApiModelProperty("工业控制-网络层级") private String gykzWlcj; /** - * 工业控制-控制台IP - */ + * 工业控制-控制台IP + */ @Size(max= 50,message="工业控制-控制台IP长度不能超过50") @ApiModelProperty("工业控制-控制台IP") private String gykzKztIp; /** - * 工业控制-描述 - */ + * 工业控制-描述 + */ @Size(max= 500,message="工业控制-描述长度不能超过500") @ApiModelProperty("工业控制-描述") private String gykzMs; /** - * CDN信息-CDN供应商 - */ + * CDN信息-CDN供应商 + */ @Size(max= 255,message="CDN信息-CDN供应商长度不能超过255") @ApiModelProperty("CDN信息-CDN供应商") private String cdnGys; /** - * CDN信息-CDN是否使用 - */ + * CDN信息-CDN是否使用 + */ @ApiModelProperty("CDN信息-CDN是否使用") - private Integer cdnSfsy; + private String cdnSfsy; /** - * CDN信息-CDN类型 - */ + * CDN信息-CDN类型 + */ @Size(max= 50,message="CDN信息-CDN类型长度不能超过50") @ApiModelProperty("CDN信息-CDN类型") private String cdnLx; /** - * CDN信息-CDN域名 - */ + * CDN信息-CDN域名 + */ @Size(max= 50,message="CDN信息-CDN域名长度不能超过50") @ApiModelProperty("CDN信息-CDN域名") private String cdnYm; /** - * CDN信息-联系人 - */ + * CDN信息-联系人 + */ @Size(max= 50,message="CDN信息-联系人长度不能超过50") @ApiModelProperty("CDN信息-联系人") private String cdnLxr; /** - * CDN信息-联系人电话 - */ + * CDN信息-联系人电话 + */ @Size(max= 50,message="CDN信息-联系人电话长度不能超过50") @ApiModelProperty("CDN信息-联系人电话") private String cdnLxrdh; /** - * CDN信息-CDN加速信息 - */ + * CDN信息-CDN加速信息 + */ @Size(max= 500,message="CDN信息-CDN加速信息长度不能超过500") @ApiModelProperty("CDN信息-CDN加速信息") private String cdnJsxx; @ApiModelProperty("删除标志（0代表存在 2代表删除）") private String delFlag; + + + @ApiModelProperty("任务id") + private Integer taskId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetCurrentResponse.java index 87fb993..c5636b8 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 @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.annotation.Excel; import com.ruoyi.tc.baseClass.BaseClass; import com.ruoyi.tc.entity.AssetBasicNetwork; +import com.ruoyi.tc.entity.AssetBusinessForm; +import com.ruoyi.tc.entity.AssetSupplyChain; import com.ruoyi.tc.entity.UnitOtherConcat; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -28,9 +30,7 @@ import java.util.List; public class AssetCurrentResponse extends BaseClass implements Serializable { private static final long serialVersionUID = 1L; - - - private Integer id; + private Long id; /** * 系统名称 @@ -120,20 +120,20 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*系统类型", dictType = "zc_xtlx", comboReadDict = true, sort = 8) @NotNull @ApiModelProperty("系统类型（字典）") - private Integer xtlx; + private String xtlx; /** * 系统重要性（字典） */ @Excel(name = "系统重要性", dictType = "zc_xtzyx", comboReadDict = true, sort = 9) @ApiModelProperty("系统重要性（字典）") - private Integer xtzyx; + private String xtzyx; /** * 是否关基系统（字典） */ @NotNull @Excel(name = "*是否关基系统", dictType = "is_no", comboReadDict = true, sort = 10) @ApiModelProperty("是否关基系统（字典）") - private Integer gjxt; + private String gjxt; /** * 系统标签 */ @@ -163,7 +163,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*是否是互联网系统", dictType = "is_no", comboReadDict = true, sort = 117) @ApiModelProperty("是否是互联网系统（字典）") - private Integer hlwxt; + private String hlwxt; /** * 系统编号 */ @@ -177,13 +177,13 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*系统状态", dictType = "zc_xtzt", comboReadDict = true, sort = 36) @NotNull @ApiModelProperty("系统状态（字典）") - private Integer xtzt; + private String xtzt; /** * 在线状态（字典） */ @Excel(name = "在线状态", dictType = "zc_zxzt", comboReadDict = true, sort = 37) @ApiModelProperty("在线状态（字典）") - private Integer zxzt; + private String zxzt; @Excel(name = "使用人", sort = 38) @TableField(exist = false) @@ -194,24 +194,24 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { */ @Excel(name = "机密性", dictType = "zc_c_i_a", comboReadDict = true, sort = 39) @ApiModelProperty("C-机密性（字典）") - private Integer cJmx; + private String cjmx; /** * I-完整性（字典） */ @Excel(name = "完整性", dictType = "zc_c_i_a", comboReadDict = true, sort = 40) @ApiModelProperty("I-完整性（字典）") - private Integer iWzx; + private String iwzx; /** * A-可用性(字典） */ @Excel(name = "可用性", dictType = "zc_c_i_a", comboReadDict = true, sort = 41) @ApiModelProperty("A-可用性(字典）") - private Integer aKyx; + private String akyx; /** * 存活率（字典） */ @ApiModelProperty("存活率（字典）") - private Integer chl; + private String chl; /** * 地理位置 */ @@ -242,7 +242,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*用户规模", dictType = "zc_yhgm", comboReadDict = true, sort = 53) @NotNull @ApiModelProperty("用户规模") - private Integer yhgm; + private String yhgm; /** * 互联网接入运营商 */ @@ -271,7 +271,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*是否部署云平台", sort = 56, dictType = "is_no", comboReadDict = true) @ApiModelProperty("是否部署云平台（字典）") - private Integer bsypt; + private String bsypt; /** * 云服务商名称 */ @@ -292,7 +292,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*系统部署方式", dictType = "zc_xtbsfs", comboReadDict = true, sort = 59) @NotNull @ApiModelProperty("系统部署方式") - private Integer xtbsfs; + private String xtbsfs; /** * 托管单位 */ @@ -313,14 +313,14 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*是否对公众开放", dictType = "is_no", comboReadDict = true, sort = 62, width = 22) @NotNull @ApiModelProperty("是否对公众开放（字典）") - private Integer dgzkf; + private String dgzkf; /** * 互联网开放用途（字典） */ @NotNull @Excel(name = "*互联网开放用途", dictType = "zc_hlwkfyt", comboReadDict = true, sort = 63, width = 22) @ApiModelProperty("互联网开放用途（字典）") - private Integer hlwkfyt; + private String hlwkfyt; /** * 系统防护情况-防篡改(多选字典） */ @@ -345,32 +345,32 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { * 相关业务-覆盖范围 */ @ApiModelProperty("相关业务-覆盖范围") - private Integer xgywFgfw; + private String xgywFgfw; /** * 相关业务-网络性质 */ @ApiModelProperty("相关业务-网络性质") - private Integer xgywWlxz; + private String xgywWlxz; /** * 相关业务-业务类型 */ @ApiModelProperty("相关业务-业务类型") - private Integer xgywYwlx; + private String xgywYwlx; /** * 相关业务-互联情况 */ @ApiModelProperty("相关业务-互联情况") - private Integer xgywHlqk; + private String xgywHlqk; /** * 相关业务-服务对象 */ @ApiModelProperty("相关业务-服务对象") - private Integer xgywFwdx; + private String xgywFwdx; /** * 相关业务-服务范围 */ @ApiModelProperty("相关业务-服务范围") - private Integer xgywFwfw; + private String xgywFwfw; /** * 相关业务-业务描述 */ @@ -463,12 +463,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*ICP备案状态", dictType = "is_no", comboReadDict = true, sort = 24) @NotNull @ApiModelProperty("ICP备案信息-是否备案") - private Integer ipcSfba; + private String ipcSfba; /** * ICP备案信息-备案有效性 */ @ApiModelProperty("ICP备案信息-备案有效性") - private Integer ipcBayxx; + private String ipcBayxx; /** * ICP备案信息-备案网站名称 */ @@ -507,7 +507,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { * ICP备案信息-备案单位性质 */ @ApiModelProperty("ICP备案信息-备案单位性质") - private Integer ipcBadwxz; + private String ipcBadwxz; /** * ICP备案信息-备案联系人 */ @@ -532,7 +532,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*公安机关备案状态", dictType = "is_no", comboReadDict = true, sort = 27, width = 24) @ApiModelProperty("公安机关备案信息-是否备案") - private Integer gajgSfba; + private String gajgSfba; /** * 公安机关备案信息-备案机关 */ @@ -607,14 +607,14 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*是否国产化系统", dictType = "is_no", comboReadDict = true, sort = 35, width = 22) @NotNull @ApiModelProperty("系统架构-是否国产化系统") - private Integer xtjgGcxt; + private String xtjgGcxt; /** * 系统架构-是否有国产设备 */ @Excel(name = "*是否有国产设备", dictType = "is_no", comboReadDict = true, sort = 35, width = 22) @NotNull @ApiModelProperty("系统架构-是否有国产设备") - private Integer xtjgGcsb; + private String xtjgGcsb; /** * 系统架构-系统设备国产化率 */ @@ -627,7 +627,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @Excel(name = "*是否是等保系统", dictType = "is_no", comboReadDict = true, sort = 42) @NotNull @ApiModelProperty("等保信息-是否等保系统") - private Integer dbxxSfdbxt; + private String dbxxSfdbxt; /** * 等保信息-等保测评备案号 */ @@ -642,7 +642,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*等保等级", dictType = "dbxx_dbdj", comboReadDict = true, sort = 44) @ApiModelProperty("等保信息-等保等级") - private Integer dbxxDbdj; + private String dbxxDbdj; /** * 等保信息-主管部门 */ @@ -653,12 +653,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { * 等保信息-专家评审 */ @ApiModelProperty("等保信息-专家评审") - private Integer dbxxZjps; + private String dbxxZjps; /** * 等保信息-主管部门评审 */ @ApiModelProperty("等保信息-主管部门评审") - private Integer dbxxZgbmps; + private String dbxxZgbmps; /** * 等保信息-定级时间 */ @@ -673,7 +673,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @ApiModelProperty("等保信息-是否有第三方测评") @NotNull @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）", width = 45, dictType = "is_no", comboReadDict = true, sort = 45) - private Integer dbxxSfydsfcp; + private String dbxxSfydsfcp; @ApiModelProperty("地理位置-省") @Excel(name = "地理位置-省", sort = 46) @@ -755,12 +755,12 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { * 第三方测评-测评师证书等级 */ @ApiModelProperty("第三方测评-测评师证书等级") - private Integer sfCpszsdj; + private String sfCpszsdj; /** * 第三方测评-测评等级 */ @ApiModelProperty("第三方测评-测评等级") - private Integer sfCpdj; + private String sfCpdj; /** * 第三方测评-推荐日期 */ @@ -829,7 +829,7 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { * Whois信息-有效性 */ @ApiModelProperty("Whois信息-有效性") - private Integer whoisYxx; + private String whoisYxx; /** * Whois信息-注册名 */ @@ -934,28 +934,28 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 103) @ApiModelProperty("数据资产-共享属性") - private Integer sjzcGxsx; + private String sjzcGxsx; /** * 数据资产-开放属性 */ @Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 104) @NotNull @ApiModelProperty("数据资产-开放属性") - private Integer sjzcKfsx; + private String sjzcKfsx; /** * 数据资产-数据领域 */ @NotNull @Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 105) @ApiModelProperty("数据资产-数据领域") - private Integer sjzcSjly; + private String sjzcSjly; /** * 数据资产-更新周期 */ @NotNull @Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 106) @ApiModelProperty("数据资产-更新周期") - private Integer sjzcGxzq; + private String sjzcGxzq; /** * 数据资产-数据类型 */ @@ -983,28 +983,28 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @NotNull @Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 110) @ApiModelProperty("数据资产-是否为涉密数据") - private Integer sjzcSmsj; + private String sjzcSmsj; /** * 数据资产-数据是否出境 */ @NotNull @Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 111) @ApiModelProperty("数据资产-数据是否出境") - private Integer sjzcCj; + private String sjzcCj; /** * 数据资产-数据分级分类 */ @NotNull @Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 112) @ApiModelProperty("数据资产-数据分级分类") - private Integer sjzcSjfjfl; + private String sjzcSjfjfl; /** * 数据资产-数据重要程度 */ @NotNull @Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 113) @ApiModelProperty("数据资产-数据重要程度") - private Integer sjzcSjzycd; + private String sjzcSjzycd; /** * 数据资产-数据描述 */ @@ -1026,4 +1026,18 @@ public class AssetCurrentResponse extends BaseClass implements Serializable { @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 b747424..9b75cff 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 @@ -21,53 +21,56 @@ import java.io.Serializable; @TableName(value = "asset_supply_chain_cp") public class AssetSupplyChainCpResponse extends BaseClass implements Serializable { - private Integer id; + private Long id; /** - * 资产id - */ + * 资产id + */ @ApiModelProperty("资产id") private Long assetId; /** - * 1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 - */ + * 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; + private String sfwtc; @ApiModelProperty("删除标志（0代表存在 2代表删除）") private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskIdResponse.java index 61d1a85..1661ed6 100644 --- 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 @@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; - +import java.util.List; import java.time.LocalDateTime; /** @@ -58,7 +58,7 @@ public class AssetTaskIdResponse { * 单位名称 */ @ApiModelProperty("单位名称") - private Integer dwmc; + private String dwmc; /** * 创建者id */ @@ -117,15 +117,6 @@ public class AssetTaskIdResponse { @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/AssetTaskResponse.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskResponse.java new file mode 100644 index 0000000..3aeaeab --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskResponse.java @@ -0,0 +1,125 @@ +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; +import java.util.List; + +/** + * @author dong + * @since 2024/11/19 9:58 + */ +@Data +@ApiModel("任务详情响应类") +public class AssetTaskResponse { + /** + * 主键id + */ + @ApiModelProperty("主键id") + private Integer id; + + /** + * 任务名称 + */ + @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 String 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; + + + + + /** + * 审核状态（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/AssetTaskShRespons.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskShRespons.java new file mode 100644 index 0000000..e686525 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetTaskShRespons.java @@ -0,0 +1,67 @@ +package com.ruoyi.tc.entity.response; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.tc.entity.AssetCurrent; +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 15:02 + */ +@Data +@ApiModel("任务审核") +public class AssetTaskShRespons { + /** + * 任务编号 + */ + @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 String dwmc; + + /** + * 资产主表 + */ + @ApiModelProperty("资产主表") + private AssetCurrent assetCurrent; + +} 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 index 99c26a4..bb7b2f6 100644 --- 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 @@ -18,7 +18,7 @@ import java.io.Serializable; @ApiModel("单位其他联系人复制表") @TableName(value = "unit_other_contact_cp") public class UnitOtherConcatCpResponse extends BaseClass implements Serializable { - + @ApiModelProperty("主键id") private Long concatId; @ApiModelProperty("单位id") @@ -41,4 +41,7 @@ public class UnitOtherConcatCpResponse extends BaseClass implements Serializable @ApiModelProperty("删除标志（0代表存在 2代表删除）") private String delFlag; + + @ApiModelProperty("任务id") + private Integer taskId; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkCpMapper.java index bb36aec..47f6c29 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 @@ -21,8 +21,8 @@ public interface AssetBasicNetWorkCpMapper extends BaseMapper findByassetId(Long 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 index 16fd852..c45455f 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 @@ -3,7 +3,7 @@ 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; - +import java.util.List; /** * 资产新监管业务形态复制表(asset_business_form_cp)表数据库访问层 * @@ -19,8 +19,8 @@ public interface AssetBusinessFormCpMapper extends BaseMapper findByassetId(Long assetId); } 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 a56af96..c71c31b 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 @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * 资产供应链信息复制(asset_supply_chain_cp)表数据库访问层 * @@ -20,8 +22,8 @@ public interface AssetSupplyChainCpMapper extends BaseMapper findByassetId(Long 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 e064653..2ed74f7 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,11 +2,12 @@ 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.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.AssetCurrentResponse; -import com.ruoyi.tc.entity.response.AssetTaskIdResponse; +import com.ruoyi.tc.entity.response.AssetTaskResponse; import org.apache.ibatis.annotations.Param; import org.springframework.data.domain.Pageable; @@ -36,7 +37,7 @@ public interface AssetTaskMapper extends BaseMapper { * @param id 主键 * @return 实例对象 */ - List queryById(Integer id); + AssetTaskResponse queryById(Integer id); /** * 查询指定行数据 @@ -103,6 +104,26 @@ public interface AssetTaskMapper extends BaseMapper { * @param dwmc 单位名称 * @return */ - AssetCurrentResponse findByDwmcAssetCurrent(String dwmc); + List findByDwmcAssetCurrent(String dwmc); + + + /** + * 资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page zcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + + + /** + * 根据任务id，资产id查询资产主表信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetCurrentResponse findBytaskIdandAssestId(@Param("taskId") int taskId, @Param("assetId") int assetId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java index 13c1ab2..ce451bb 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java @@ -50,4 +50,13 @@ public interface UnitMapper extends BaseMapper { * 根据id获取详细信息 */ Unit getById(Long id); + + + /** + * 分页条件查询单位列表过滤 + * + * @param unit 用户信息 + * @return 用户信息集合信息 + */ + Page dwList(Page page, @Param("req") UnitRequest unit); } 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 163b91f..1b9b108 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 @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.response.UnitOtherConcatCpResponse; import org.apache.ibatis.annotations.Select; +import java.util.List; + /** * 单位其他联系人复制(unit_other_contact_cp)数据层 * @@ -18,6 +20,6 @@ public interface UnitOtherConcatCpMapper extends BaseMapper findByassetId(Long 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 index 3c8746a..6b694aa 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 @@ -20,6 +20,6 @@ public interface AssetBasicNetworkCpService extends IService findByassetId(Long 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 index 253481c..02da68d 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 @@ -3,6 +3,8 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.response.AssetBusinessFormCpResponse; +import java.util.List; + /** * 资产新监管业务形态复制(asset_business_form_cp)表服务接口 * @@ -16,7 +18,7 @@ public interface AssetBusinessFormCpService extends IService findByassetId(Long assetId); } 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 a766b04..14ba46b 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 @@ -3,6 +3,8 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.response.AssetSupplyChainCpResponse; +import java.util.List; + /** * 资产供应链信息复制(asset_supply_chain_cp)表服务接口 * @@ -17,7 +19,7 @@ public interface AssetSupplyChainCpService extends IService findByassetId(Long 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 57dba02..2ec3b66 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,11 +1,17 @@ package com.ruoyi.tc.service; 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.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; /** @@ -14,7 +20,7 @@ import java.util.List; * @author makejava * @since 2024-11-18 13:23:09 */ -public interface AssetTaskService extends IService { +public interface AssetTaskService extends IService { /** * 通过ID查询单条数据 @@ -22,13 +28,13 @@ public interface AssetTaskService extends IService { * @param id 主键 * @return 实例对象 */ - List queryById(Integer id); + AssetTaskResponse queryById(Integer id); /** * 分页查询 * - * @param assetTask 筛选条件 - * @param pageRequest 分页对象 + * @param assetTask 筛选条件 + * @param pageRequest 分页对象 * @return 查询结果 */ Page queryByPage(Page assetTask, AssetTaskPageRequest pageRequest); @@ -57,4 +63,22 @@ public interface AssetTaskService extends IService { */ boolean deleteById(Integer id); + + /** + * 任务审核 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetCurrentResponse taskSh(int taskId, int assetId); + + /** + * 资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page zcHc(Page page, AssestTaskXqRequest pageRequest); } 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 89b1bac..10d1e3a 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 @@ -19,5 +19,5 @@ public interface UnitOtherConcatCpService extends IService findByassetId(Long assetId); } 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 1488ea2..f973dbc 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,5 +54,15 @@ public interface UnitService extends IService { /** * 逻辑删除单位 */ - void deleteUnits(Long id); + void deleteUnits(List ids); + + + + /** + * 分页条件查询单位列表过滤 + * + * @param unit 用户信息 + * @return 用户信息集合信息 + */ + Page dwList(Page page, UnitRequest unit); } 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 d3deffc..659d011 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 @@ -7,6 +7,7 @@ import com.ruoyi.tc.service.AssetBasicNetworkCpService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 资产基础网络复制表(AssetBasicNetworkCpResponse)表服务实现类 @@ -21,7 +22,9 @@ public class AssetBasicNetworkCpServiceImpl extends ServiceImpl findByassetId(Long 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 index 52be9c4..fdd46e6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.tc.mapper.AssetBusinessFormCpMapper; import com.ruoyi.tc.service.AssetBusinessFormCpService; import org.springframework.stereotype.Service; +import java.util.List; import javax.annotation.Resource; /** @@ -21,7 +22,7 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl findByassetId(Long assetId) { return assetBusinessFormCpMapper.findByassetId(assetId); } } 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 2deed95..e847620 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 @@ -24,7 +24,7 @@ public class AssetSupplyChainCpServiceImpl extends ServiceImpl findByassetId(Long 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 8148ed4..72b19c7 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,7 +2,8 @@ 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.AssetTask; +import com.ruoyi.tc.entity.*; +import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.response.*; import com.ruoyi.tc.mapper.AssetTaskMapper; @@ -40,6 +41,9 @@ public class AssetTaskServiceImpl extends ServiceImpl queryById(Integer id) { - return this.assetTaskDao.queryById(id); + public AssetTaskResponse queryById(Integer id) { + return assetTaskDao.queryById(id); } /** @@ -72,50 +76,62 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByDwmcAssetCurrent(part); + for (AssetCurrentResponse assetCurrentResponse:list){ + assetCurrentResponse.setTaskId(id); + } + assetCurrentCpService.saveBatch(list); + for (AssetCurrentResponse assetCurrentResponse : list) { + //新增新监管业务形态 //根据资产id查询新监管业务形态主表id - int businessId = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); - assetCurrentResponse.getXjgywxt().setId(businessId); - assetCurrentResponse.getXjgywxt().setAssetId(Long.valueOf(assetCurrentResponse.getId())); - assetBusinessFormCpService.save(assetCurrentResponse.getXjgywxt()); - } - if (!assetCurrentResponse.getGylxxList().isEmpty()) { - - for (AssetSupplyChainCpResponse items : assetCurrentResponse.getGylxxList()) { - //根据资产id查询供应链主表id - int supplyChainId = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); - items.setAssetId(Long.valueOf(assetCurrentResponse.getId())); - items.setId(supplyChainId); + List bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); + if (bussList != null) { + for (AssetBusinessFormCpResponse assetBusinessFormCpResponse : bussList) { + assetCurrentResponse.getXjgywxt().setId(assetBusinessFormCpResponse.getId()); + assetCurrentResponse.getXjgywxt().setAssetId(assetCurrentResponse.getId()); + assetCurrentResponse.getXjgywxt().setTaskId(id); + assetBusinessFormCpService.save(assetCurrentResponse.getXjgywxt()); + } } - //新增供应链 - assetSupplyChainCpService.saveBatch(assetCurrentResponse.getGylxxList()); - } - if (!assetCurrentResponse.getJcwlList().isEmpty()) { - for (AssetBasicNetworkCpResponse items : assetCurrentResponse.getJcwlList()) { - //根据资产id查询基础网络主表id - int basicNetworkId = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); - items.setAssetId(Long.valueOf(assetCurrentResponse.getId())); - items.setId(basicNetworkId); + //根据资产id查询供应链主表id- + List supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); + if (supplyChainList != null) { + for (AssetSupplyChainCpResponse items : supplyChainList) { + items.setAssetId(assetCurrentResponse.getId()); + items.setId(items.getId()); + items.setTaskId(id); + //新增供应链 + assetSupplyChainCpService.save(items); + } } - //新增基础网络 - assetBasicNetworkCpService.saveBatch(assetCurrentResponse.getJcwlList()); - } - if (!assetCurrentResponse.getOtherConcat().isEmpty()) { - for (UnitOtherConcatCpResponse items : assetCurrentResponse.getOtherConcat()) { - //根据资产id查询其他联系人主表id - int unitOtherConcatId = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); - items.setAssetId(Long.valueOf(assetCurrentResponse.getId())); - items.setConcatId((long) unitOtherConcatId); + List BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); + if (BasicNetworkCpList != null) { + for (AssetBasicNetworkCpResponse items : BasicNetworkCpList) { + //根据资产id查询基础网络主表id + items.setAssetId(assetCurrentResponse.getId()); + items.setId(items.getId()); + items.setTaskId(id); + //新增基础网络 + assetBasicNetworkCpService.save(items); + } + + } + List unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); + if (unitOtherConcatList != null) { + for (UnitOtherConcatCpResponse items : unitOtherConcatList) { + //根据资产id查询其他联系人主表id + items.setAssetId(assetCurrentResponse.getId()); + items.setConcatId(items.getConcatId()); + items.setTaskId(id); + //新增其他联系人 + unitOtherConcatCpService.save(items); + } + } - //新增其他联系人 - unitOtherConcatCpService.saveBatch(assetCurrentResponse.getOtherConcat()); } } @@ -143,4 +159,19 @@ public class AssetTaskServiceImpl extends ServiceImpl 0; } + + @Override + public AssetCurrentResponse taskSh(int taskId,int assetId) { + AssetCurrentResponse byId = assetTaskDao.findBytaskIdandAssestId(taskId,assetId); + byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpResponse::getAssetId,assetId).eq(AssetSupplyChainCpResponse::getDelFlag,"0").eq(AssetSupplyChainCpResponse::getTaskId,taskId).list()); + byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpResponse::getAssetId,assetId).eq(AssetBasicNetworkCpResponse::getDelFlag,"0").eq(AssetBasicNetworkCpResponse::getTaskId,taskId).list()); + byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpResponse::getAssetId,assetId).eq(AssetBusinessFormCpResponse::getDelFlag,"0").eq(AssetBusinessFormCpResponse::getTaskId,taskId).one()); + byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpResponse::getAssetId,assetId).eq(UnitOtherConcatCpResponse::getDelFlag,"0").eq(UnitOtherConcatCpResponse::getTaskId,taskId).list()); + return byId; + } + + @Override + public Page zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { + return assetTaskDao.zcHc(assetTask,pageRequest); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatCpServiceImpl.java index 2cef969..91ac3fe 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 @@ -7,6 +7,7 @@ import com.ruoyi.tc.service.UnitOtherConcatCpService; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 单位其他联系人复制(unit_other_contact_cp)业务处理层 @@ -20,7 +21,7 @@ public class UnitOtherConcatCpServiceImpl extends ServiceImpl findByassetId(Long assetId) { return unitOtherConcatCpMapper.findByassetId(assetId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java index 72d7292..714897b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java @@ -35,6 +35,8 @@ public class UnitServiceImpl extends ServiceImpl implements Un */ @Override public Page page(Page page, UnitRequest unit) { + + return baseMapper.selectUnitList(page,unit); } @@ -100,4 +102,9 @@ public class UnitServiceImpl extends ServiceImpl implements Un baseMapper.deleteUnits(id); } + @Override + public Page dwList(Page page, UnitRequest unit) { + return baseMapper.dwList(page,unit); + } + } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml index 76ca4d3..1e2fae3 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetTaskDao.xml @@ -4,7 +4,6 @@ - @@ -24,9 +23,8 @@ - select a.id, - a.task_id, a.task_name, a.task_time, a.task_deadline, @@ -42,24 +40,23 @@ a.user_id, a.dept_id, a.version, - a.reamark, - b.xtlx,b.xtmc - from asset_task a left join asset_current b on a.dwmc =b.dwmc + a.reamark + + from asset_task a + where a.id = #{id} + + - insert into asset_task(task_id, 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 (#{taskId}, #{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc}, + values (#{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,dwmc,create_id,create_by,create_time,update_id,update_by,update_time,user_id,dept_id,version,reamark) + 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 - (#{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}) + (#{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,dwmc,create_id,create_by,create_time,update_id,update_by,update_time,user_id,dept_id,version,reamark) + 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 - (#{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}) + (#{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 = + 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 = @@ -240,9 +264,7 @@ update asset_task - - task_id = #{taskId}, - + task_name = #{taskName}, diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 3d1c8d3..f3c666d 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -112,6 +112,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + update unit_info set del_flag = '2' where id = #{id} 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 d3d4293..9bb9e48 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() - .antMatchers("/unit/assetTask/**").permitAll() + .antMatchers("/unit/assetTask/**","/tc/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .anyRequest().authenticated(); })