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 12d4155..35aacf3 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 @@ -5,9 +5,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.AssetLc; -import com.ruoyi.tc.entity.AssetTask; +import com.ruoyi.tc.entity.*; import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; @@ -16,6 +14,7 @@ import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetTaskIdResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse; +import com.ruoyi.tc.mapper.AssetTaskMapper; import com.ruoyi.tc.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -25,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.validation.Valid; import java.time.LocalDateTime; +import java.util.Optional; /** * 任务主表(AssetTask)表控制层 @@ -42,7 +42,8 @@ public class AssetTaskController extends BaseController { */ @Resource private AssetTaskService assetTaskService; - + @Resource + private AssetMiniProgramsService assetMiniProgramsService; @Resource private AssetCurrentCpService assetCurrentCpService; @@ -78,7 +79,46 @@ public class AssetTaskController extends BaseController { @Resource - private AssetCurrentService assetCurrentService; + private AssetCurrentService assetCurrentService; + + @Resource + private AssetMiniProgramsCpService assetMiniProgramsCpService; + + @Resource + private AssetOfficialAccountCpService assetOfficialAccountCpService; + + @Resource + private AssetAppCpService assetAppCpService; + + + @Resource + private AssetEmailCpService assetEmailCpService; + + + @Resource + private AssetMiniProgramsJyService assetMiniProgramsJyService; + + @Resource + private AssetOfficialAccountJyService assetOfficialAccountJyService; + + @Resource + private AssetAppJyService assetAppJyService; + + @Resource + private AssetEmailJyService assetEmailJyService; + + @Resource + private AssetOfficialAccountService assetOfficialAccountService; + + @Resource + private AssetAppService assetAppService; + + @Resource + private AssetEmailService assetEmailService; + + @Resource + private AssetTaskMapper assetTaskDao; + /** * 分页查询 * @@ -145,19 +185,75 @@ public class AssetTaskController extends BaseController { /** - * 任务审核详情信息 + * web资产任务审核详情信息 * * @param taskId 任务id * @param assetId 资产id * @return */ - @ApiOperation(value = "任务审核详情信息", response = AssetCurrent.class) + @ApiOperation(value = "web资产任务审核详情信息", response = AssetCurrent.class) @GetMapping("/taskSh") public AjaxResult taskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { return AjaxResult.success(assetTaskService.taskSh(taskId, assetId)); } + /** + * 小程序资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + @ApiOperation(value = "小程序资产任务审核详情信息", response = AssetCurrent.class) + @GetMapping("/minitaskSh") + public AjaxResult minitaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { + + return AjaxResult.success(assetTaskService.minitaskSh(taskId, assetId)); + } + + /** + * 公众号资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + @ApiOperation(value = "公众号资产任务审核详情信息", response = AssetCurrent.class) + @GetMapping("/officetaskSh") + public AjaxResult officetaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { + + return AjaxResult.success(assetTaskService.officetaskSh(taskId, assetId)); + } + + + /** + * 电子邮件资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + @ApiOperation(value = "电子邮件资产任务审核详情信息", response = AssetCurrent.class) + @GetMapping("/emailtaskSh") + public AjaxResult emailtaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { + + return AjaxResult.success( assetTaskService.emailtaskSh(taskId, assetId)); + } + + /** + * 移动应用程序资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + @ApiOperation(value = "移动应用程序资产", response = AssetCurrent.class) + @GetMapping("/apptaskSh") + public AjaxResult apptaskSh(@RequestParam("taskId") int taskId, @RequestParam("assetId") int assetId) { + + return AjaxResult.success(assetTaskService.apptaskSh(taskId, assetId)); + } /** * 资产核查信息 @@ -174,12 +270,12 @@ public class AssetTaskController extends BaseController { /** - * 单位端暂存报废 + * web单位端暂存报废 * * @param assetCurrent 现有资产复制表 * @return */ - @ApiOperation(value = "单位端暂存报废") + @ApiOperation(value = "web单位端暂存报废") @PostMapping("/zc") @Transactional(rollbackFor = Exception.class) public AjaxResult zcHc(@RequestBody AssetCurrentCpPo assetCurrent) { @@ -189,6 +285,9 @@ public class AssetTaskController extends BaseController { assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); + //根据taskid获取当前任务的count数量 + AssetTask assetTask = assetTaskDao.getByTaskId(assetCurrent.getTaskId()); + int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); AssetCurrent ac = new AssetCurrent(); if (StringUtils.isBlank(assetCurrent.getBfyy())) { //待审批 @@ -197,6 +296,9 @@ public class AssetTaskController extends BaseController { //已报废 assetCurrent.setStatus(5); assetCurrent.setXtzt("5"); + //已关停 + ygt++; + assetTaskService.updateYgtByTaskId(assetCurrent.getTaskId(),ygt); } StringBuilder a = new StringBuilder(); @@ -216,7 +318,7 @@ public class AssetTaskController extends BaseController { } assetCurrent.setGlIp(b.toString()); // assetCurrent.setCurrentId(null); - BeanUtils.copyProperties(assetCurrent,ac); + BeanUtils.copyProperties(assetCurrent, ac); assetCurrentService.updateById(ac); assetCurrentCpService.save(assetCurrent); //新增新监管业务形态 @@ -368,6 +470,257 @@ public class AssetTaskController extends BaseController { return AjaxResult.success(assetTaskService.dwHc(assetdwHcResponsePage, req)); } + /** + * 小程序单位端暂存报废 + * + * @param assetMiniProgramsCpPo 小程序复制表 + * @return + */ + @ApiOperation(value = "小程序单位端暂存报废") + @PostMapping("/xcxzc") + @Transactional(rollbackFor = Exception.class) + public AjaxResult xcxzc(@RequestBody AssetMiniProgramsCpPo assetMiniProgramsCpPo) { + //根据资产id和任务id删除数据 + assetMiniProgramsCpService.deletByAssetIdandTaskId(assetMiniProgramsCpPo.getAssetId(), assetMiniProgramsCpPo.getTaskId()); + //根据taskid获取当前任务的count数量 + AssetTask assetTask = assetTaskDao.getByTaskId(assetMiniProgramsCpPo.getTaskId()); + int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); + AssetMiniPrograms ac = new AssetMiniPrograms(); + if (StringUtils.isBlank(assetMiniProgramsCpPo.getBfyy())) { + //待审批 + assetMiniProgramsCpPo.setStatus(0); + } else { + //已报废 + assetMiniProgramsCpPo.setStatus(5); + ac.setIsbf(2); + ac.setId(assetMiniProgramsCpPo.getAssetId()); + assetMiniProgramsService.updateById(ac); + //已关停 + ygt++; + assetTaskService.updateYgtByTaskId(assetMiniProgramsCpPo.getTaskId(),ygt); + } + assetMiniProgramsCpService.save(assetMiniProgramsCpPo); + return success(); + } + + + /** + * 公众号单位端暂存报废 + * + * @param assetOfficialAccountCpPo 公众号复制表 + * @return + */ + @ApiOperation(value = "公众号单位端暂存报废") + @PostMapping("/gzhzc") + @Transactional(rollbackFor = Exception.class) + public AjaxResult gzhzc(@RequestBody AssetOfficialAccountCpPo assetOfficialAccountCpPo) { + //根据资产id和任务id删除数据 + assetOfficialAccountCpService.deletByAssetIdandTaskId(assetOfficialAccountCpPo.getAssetId(), assetOfficialAccountCpPo.getTaskId()); + //根据taskid获取当前任务的count数量 + AssetTask assetTask = assetTaskDao.getByTaskId(assetOfficialAccountCpPo.getTaskId()); + int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); + AssetOfficialAccount ac = new AssetOfficialAccount(); + if (StringUtils.isBlank(assetOfficialAccountCpPo.getBfyy())) { + //待审批 + assetOfficialAccountCpPo.setStatus(0); + } else { + //已报废 + assetOfficialAccountCpPo.setStatus(5); + ac.setIsbf(2); + ac.setId(assetOfficialAccountCpPo.getAssetId()); + assetOfficialAccountService.updateById(ac); + //已关停 + ygt++; + assetTaskService.updateYgtByTaskId(assetOfficialAccountCpPo.getTaskId(),ygt); + } + + assetOfficialAccountCpService.save(assetOfficialAccountCpPo); + return success(); + } + + + /** + * 资产移动应用程序单位端暂存报废 + * + * @param assetAppCpPo 资产移动应用程序复制表 + * @return + */ + @ApiOperation(value = "资产移动应用程序单位端暂存报废") + @PostMapping("/appzc") + @Transactional(rollbackFor = Exception.class) + public AjaxResult appzc(@RequestBody AssetAppCpPo assetAppCpPo) { + //根据资产id和任务id删除数据 + assetAppCpService.deletByAssetIdandTaskId(assetAppCpPo.getAssetId(), assetAppCpPo.getTaskId()); + //根据taskid获取当前任务的count数量 + AssetTask assetTask = assetTaskDao.getByTaskId(assetAppCpPo.getTaskId()); + int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); + AssetApp ac = new AssetApp(); + if (StringUtils.isBlank(assetAppCpPo.getBfyy())) { + //待审批 + assetAppCpPo.setStatus(0); + } else { + //已报废 + assetAppCpPo.setStatus(5); + ac.setIsbf(2); + ac.setId(assetAppCpPo.getAssetId()); + assetAppService.updateById(ac); + //已关停 + ygt++; + assetTaskService.updateYgtByTaskId(assetAppCpPo.getTaskId(),ygt); + } + + assetAppCpService.save(assetAppCpPo); + return success(); + } + + + /** + * 电子邮件单位端暂存报废 + * + * @param assetEmailCpPo 电子邮件复制表 + * @return + */ + @ApiOperation(value = "电子邮件单位端暂存报废") + @PostMapping("/emailzc") + @Transactional(rollbackFor = Exception.class) + public AjaxResult emailzc(@RequestBody AssetEmailCpPo assetEmailCpPo) { + //根据资产id和任务id删除数据 + assetEmailCpService.deletByAssetIdandTaskId(assetEmailCpPo.getAssetId(), assetEmailCpPo.getTaskId()); + //根据taskid获取当前任务的count数量 + AssetTask assetTask = assetTaskDao.getByTaskId(assetEmailCpPo.getTaskId()); + int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); + AssetEmail ac = new AssetEmail(); + if (StringUtils.isBlank(assetEmailCpPo.getBfyy())) { + //待审批 + assetEmailCpPo.setStatus(0); + } else { + //已报废 + assetEmailCpPo.setStatus(5); + ac.setIsbf(2); + ac.setId(assetEmailCpPo.getAssetId()); + assetEmailService.updateById(ac); + //已关停 + ygt++; + assetTaskService.updateYgtByTaskId(assetEmailCpPo.getTaskId(),ygt); + } + + + assetEmailCpService.save(assetEmailCpPo); + return success(); + } + + + /** + * 小程序单位端校验提交 + * + * @param assetMiniProgramsJyPo 小程序资产复制表 + * @return + */ + @ApiOperation(value = "小程序单位端校验提交") + @PostMapping("/xcxjyTj") + @Transactional(rollbackFor = Exception.class) + public AjaxResult xcxJyTj(@RequestBody AssetMiniProgramsJyPo assetMiniProgramsJyPo) { + assetMiniProgramsCpService.deletByAssetIdandTaskId(assetMiniProgramsJyPo.getAssetId(), assetMiniProgramsJyPo.getTaskId()); + //新增流程节点时间 + AssetLc assetLc = new AssetLc(); + assetLc.setTaskId(assetMiniProgramsJyPo.getTaskId()); + assetLc.setAssetName(assetMiniProgramsJyPo.getXcxmc()); + assetMiniProgramsJyPo.setStatus(1); + //当审核状态为带待核查 + if (assetMiniProgramsJyPo.getStatus().equals(1)) { + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setTaskId(assetMiniProgramsJyPo.getTaskId()); + assetLc.setAssetName("单位核查完成提交" + assetMiniProgramsJyPo.getXcxmc()); + assetLcService.insert(assetLc); + } + assetMiniProgramsJyService.save(assetMiniProgramsJyPo); + return success(); + } + + /** + * 公众号单位端校验提交 + * + * @param assetOfficialAccountJyPo 公众号资产复制表 + * @return + */ + @ApiOperation(value = "公众号单位端校验提交") + @PostMapping("/gzhjyTj") + @Transactional(rollbackFor = Exception.class) + public AjaxResult gzhjyTj(@RequestBody AssetOfficialAccountJyPo assetOfficialAccountJyPo) { + assetOfficialAccountCpService.deletByAssetIdandTaskId(assetOfficialAccountJyPo.getAssetId(), assetOfficialAccountJyPo.getTaskId()); + //新增流程节点时间 + AssetLc assetLc = new AssetLc(); + assetLc.setTaskId(assetOfficialAccountJyPo.getTaskId()); + assetLc.setAssetName(assetOfficialAccountJyPo.getGzhmc()); + assetOfficialAccountJyPo.setStatus(1); + //当审核状态为带待核查 + if (assetOfficialAccountJyPo.getStatus().equals(1)) { + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setTaskId(assetOfficialAccountJyPo.getTaskId()); + assetLc.setAssetName("单位核查完成提交" + assetOfficialAccountJyPo.getGzhmc()); + assetLcService.insert(assetLc); + } + assetOfficialAccountJyService.save(assetOfficialAccountJyPo); + return success(); + } + + + /** + * 资产移动应用程序单位端校验提交 + * + * @param assetAppJyPo 资产移动应用程序资产复制表 + * @return + */ + @ApiOperation(value = "资产移动应用程序单位端校验提交") + @PostMapping("/appjyTj") + @Transactional(rollbackFor = Exception.class) + public AjaxResult appjyTj(@RequestBody AssetAppJyPo assetAppJyPo) { + //根据资产id和任务id删除数据 + assetAppCpService.deletByAssetIdandTaskId(assetAppJyPo.getAssetId(), assetAppJyPo.getTaskId()); + //新增流程节点时间 + AssetLc assetLc = new AssetLc(); + assetLc.setTaskId(assetAppJyPo.getTaskId()); + assetLc.setAssetName(assetAppJyPo.getAppName()); + assetAppJyPo.setStatus(1); + //当审核状态为带待核查 + if (assetAppJyPo.getStatus().equals(1)) { + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setTaskId(assetAppJyPo.getTaskId()); + assetLc.setAssetName("单位核查完成提交" + assetAppJyPo.getAppName()); + assetLcService.insert(assetLc); + } + assetAppJyService.save(assetAppJyPo); + return success(); + } + + + /** + * 电子邮件单位端校验提交 + * + * @param assetEmailJyPo 电子邮件资产复制表 + * @return + */ + @ApiOperation(value = "电子邮件单位端校验提交") + @PostMapping("/emailjyTj") + @Transactional(rollbackFor = Exception.class) + public AjaxResult emailjyTj(@RequestBody AssetEmailJyPo assetEmailJyPo) { + //根据资产id和任务id删除数据 + assetEmailCpService.deletByAssetIdandTaskId(assetEmailJyPo.getAssetId(), assetEmailJyPo.getTaskId()); + //新增流程节点时间 + AssetLc assetLc = new AssetLc(); + assetLc.setTaskId(assetEmailJyPo.getTaskId()); + assetLc.setAssetName(assetEmailJyPo.getDzyxhz()); + assetEmailJyPo.setStatus(1); + //当审核状态为带待核查 + if (assetEmailJyPo.getStatus().equals(1)) { + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setTaskId(assetEmailJyPo.getTaskId()); + assetLc.setAssetName("单位核查完成提交" + assetEmailJyPo.getDzyxhz()); + assetLcService.insert(assetLc); + } + assetEmailJyService.save(assetEmailJyPo); + return success(); + } } 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 93cc74f..d0f9ce0 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 @@ -34,7 +34,7 @@ import java.util.*; */ @Api(tags = "单位表控制层") @RestController -@PreAuthorize("@ss.hasAnyRoles('admin,common')") +//@PreAuthorize("@ss.hasAnyRoles('admin,common')") @RequestMapping("/tc/unit") public class UnitController { diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java index 5f96f24..3557df0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java @@ -32,6 +32,9 @@ public class AssetApp extends BaseClass implements Serializable { @ApiModelProperty("所属单位") @Excel(name = "所属单位", sort = 1, width = 24) private String ssdw; + + @ApiModelProperty("是否报废") + private Integer isbf=0; /** * 移动应用名称 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetEmail.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetEmail.java index 87c90e6..464e048 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetEmail.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetEmail.java @@ -31,6 +31,9 @@ public class AssetEmail extends BaseClass implements Serializable { @Excel(name = "所属单位", sort = 1, width = 24) @ApiModelProperty("所属单位") private String ssdw; + + @ApiModelProperty("是否报废") + private Integer isbf=0; /** * 电子邮箱后缀 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetMiniPrograms.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetMiniPrograms.java index 916c87e..32608ec 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetMiniPrograms.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetMiniPrograms.java @@ -187,4 +187,9 @@ public class AssetMiniPrograms extends BaseClass implements Serializable { */ @ApiModelProperty("删除标志（0代表存在 2代表删除）") private String delFlag; + + + + @ApiModelProperty("是否报废") + private Integer isbf=0; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java index 0f511dd..c812f12 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java @@ -161,6 +161,8 @@ public class AssetOfficialAccount extends BaseClass implements Serializable { @ApiModelProperty("菜单类型") private String cdlx; + @ApiModelProperty("是否报废") + private Integer isbf=0; /** * 删除标志（0代表存在 2代表删除） */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java index 21593c8..dd4c666 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java @@ -121,5 +121,37 @@ public class AssetTask implements Serializable { @ApiModelProperty("备注") private String reamark; + + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private String type; + + + /** + * 单位全部资产数量 + */ + @ApiModelProperty("单位全部资产数量") + private Integer totalCount; + + + /** + * 通过数量 + */ + @ApiModelProperty("通过数量") + private Integer count; + + /** + * 超期数量 + */ + @ApiModelProperty("超期数量") + private Integer deadlineCount; + + /** + * 超期数量 + */ + @ApiModelProperty("已关停") + private Integer ygt; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java new file mode 100644 index 0000000..9a7fcad --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java @@ -0,0 +1,153 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 资产移动应用程序(asset_app_cp)表 + * + * @author du + */ +@Data +@ApiModel("资产移动应用程序") +@TableName(value = "asset_app_cp") +public class AssetAppCpPo extends BaseClass implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + @TableId(value = "app_id", type = IdType.AUTO) + private Long appId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 所属单位 + */ + @ApiModelProperty("所属单位") + + private String ssdw; + /** + * 移动应用名称 + */ + @ApiModelProperty("移动应用名称") + + private String appName; + /** + * 包名 + */ + + @ApiModelProperty("包名") + private String pack; + /** + * icp备案状态（字典） + */ + + @ApiModelProperty("icp备案状态（字典）") + private String icpState; + /** + * icp备案号 + */ + + @ApiModelProperty("icp备案号") + private String icpbah; + /** + * 统一社会信用代码 + */ + + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 文件名 + */ + + @ApiModelProperty("文件名") + private String wjm; + /** + * 所属行业（字典） + */ + @ApiModelProperty("所属行业（字典）") + + private String sshy; + /** + * 重点行业（字典） + */ + + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 简介 + */ + + @ApiModelProperty("简介") + private String jj; + /** + * 安全加固情况（字典） + */ + + @ApiModelProperty("安全加固情况（字典）") + private String aqjgqk; + /** + * 版本信息 + */ + + @ApiModelProperty("版本信息") + private String bbxx; + /** + * 版本号 + */ + + @ApiModelProperty("版本号") + private String bbh; + /** + * 版本信息（MD5） + */ + + @ApiModelProperty("版本信息（MD5）") + private String bbxxMd5; + /** + * 版本信息（上架平台） + */ + + @ApiModelProperty("版本信息（上架平台）") + private String bbxxSjpt; + /** + * 文件大小 + */ + + @ApiModelProperty("文件大小") + private String wjdx; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + @ApiModelProperty("报废原因") + private String bfyy; + + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java new file mode 100644 index 0000000..c6f5d5f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java @@ -0,0 +1,159 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 资产移动应用程序(asset_app_cp)表 + * + * @author du + */ +@Data +@ApiModel("资产移动应用程序") +@TableName(value = "asset_app_cp") +public class AssetAppJyPo extends BaseClass implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty("id") + @TableId(value = "app_id", type = IdType.AUTO) + private Long appId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 所属单位 + */ + @ApiModelProperty("所属单位") + @Excel(name = "所属单位", sort = 1, width = 24) + private String ssdw; + /** + * 移动应用名称 + */ + @ApiModelProperty("移动应用名称") + @Excel(name = "移动应用名称", sort = 2, width = 22) + private String appName; + /** + * 包名 + */ + @Excel(name = "包名", sort = 3, width = 28) + @ApiModelProperty("包名") + private String pack; + /** + * icp备案状态（字典） + */ + @Excel(name = "icp备案状态", dictType = "app_icp_state", comboReadDict = true, sort = 4, width = 22) + @ApiModelProperty("icp备案状态（字典）") + private String icpState; + /** + * icp备案号 + */ + @Excel(name = "icp备案号", sort = 5) + @ApiModelProperty("icp备案号") + private String icpbah; + /** + * 统一社会信用代码 + */ + @Excel(name = "统一社会信用代码", sort = 6, width = 22) + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 文件名 + */ + @Excel(name = "文件名", sort = 7, width = 22) + @ApiModelProperty("文件名") + private String wjm; + /** + * 所属行业（字典） + */ + @ApiModelProperty("所属行业（字典）") + @Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 8, width = 18) + private String sshy; + /** + * 重点行业（字典） + */ + @Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 9, width = 18) + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + @Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 10, width = 18) + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 简介 + */ + @Excel(name = "简介", sort = 11, width = 28) + @ApiModelProperty("简介") + private String jj; + /** + * 安全加固情况（字典） + */ + @Excel(name = "安全加固情况", dictType = "app_aqjgqk", comboReadDict = true, sort = 12, width = 18) + @ApiModelProperty("安全加固情况（字典）") + private String aqjgqk; + /** + * 版本信息 + */ + @Excel(name = "版本信息", sort = 13, width = 20) + @ApiModelProperty("版本信息") + private String bbxx; + /** + * 版本号 + */ + @Excel(name = "版本信息（版本号）", sort = 14, width = 24) + @ApiModelProperty("版本号") + private String bbh; + /** + * 版本信息（MD5） + */ + @Excel(name = "版本信息（MD5）", sort = 15, width = 28) + @ApiModelProperty("版本信息（MD5）") + private String bbxxMd5; + /** + * 版本信息（上架平台） + */ + @Excel(name = "版本信息（上架平台）", sort = 16, width = 24) + @ApiModelProperty("版本信息（上架平台）") + private String bbxxSjpt; + /** + * 文件大小 + */ + @Excel(name = "文件大小", sort = 17, width = 20) + @ApiModelProperty("文件大小") + private String wjdx; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("报废原因") + private String bfyy; + + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailCpPo.java new file mode 100644 index 0000000..441cbdd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailCpPo.java @@ -0,0 +1,159 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 电子邮件资产表(asset_email_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("电子邮件资产表") +@TableName(value = "asset_email_cp") +public class AssetEmailCpPo extends BaseClass implements Serializable { + + + @ApiModelProperty("email_id") + @TableId(value = "email_id", type = IdType.AUTO) + private Long emailId; + + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 所属单位 + */ + + @ApiModelProperty("所属单位") + private String ssdw; + /** + * 电子邮箱后缀 + */ + + @ApiModelProperty("电子邮箱后缀") + private String dzyxhz; + /** + * 建设类型（字典） + */ + + @ApiModelProperty("建设类型（字典）") + private String jslx; + /** + * 邮件系统供应商 + */ + + @ApiModelProperty("邮件系统供应商") + private String yjxtgys; + /** + * 密码算法 + */ + + @ApiModelProperty("密码算法") + private String mmsf; + /** + * 邮件系统状态（字典) + */ + + @ApiModelProperty("邮件系统状态（字典)") + private String yjxtzc; + /** + * 安全防护系统（字典） + */ + + @ApiModelProperty("安全防护系统（字典）") + private String aqfhxt; + /** + * 安全备份环境(字典） + */ + + @ApiModelProperty("安全备份环境(字典）") + private String aqbfhj; + /** + * 数字证书厂商 + */ + + @ApiModelProperty("数字证书厂商") + private String szzscs; + /** + * 上线时间 + */ + + @ApiModelProperty("上线时间") + private String sxsj; + /** + * 所属行业（字典） + */ + + @ApiModelProperty("所属行业（字典）") + private String sshy; + /** + * 重点行业（字典） + */ + + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 简介 + */ + + @ApiModelProperty("简介") + private String jj; + /** + * 系统责任人 + */ + + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("报废原因") + private String bfyy; + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailJyPo.java new file mode 100644 index 0000000..862db01 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailJyPo.java @@ -0,0 +1,157 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 电子邮件资产表(asset_email_cp)实体类 + * @author du + * @since 2024/11/13 14:44 +*/ +@Data +@ApiModel("电子邮件资产表") +@TableName(value = "asset_email_cp") +public class AssetEmailJyPo extends BaseClass implements Serializable { + + + @ApiModelProperty("email_id") + @TableId(value = "email_id",type = IdType.AUTO) + private Long emailId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + /** + * 所属单位 + */ + @Excel(name = "所属单位", sort = 1, width = 24) + @ApiModelProperty("所属单位") + private String ssdw; + /** + * 电子邮箱后缀 + */ + @Excel(name = "电子邮箱后缀", sort = 2, width = 20) + @ApiModelProperty("电子邮箱后缀") + private String dzyxhz; + /** + * 建设类型（字典） + */ + @Excel(name = "建设类型", sort = 3, width = 20,dictType = "email_jslx",comboReadDict = true) + @ApiModelProperty("建设类型（字典）") + private String jslx; + /** + * 邮件系统供应商 + */ + @Excel(name = "邮件系统供应商", sort = 4, width = 24) + @ApiModelProperty("邮件系统供应商") + private String yjxtgys; + /** + * 密码算法 + */ + @Excel(name = "密码算法", sort = 5, width = 22) + @ApiModelProperty("密码算法") + private String mmsf; + /** + * 邮件系统状态（字典) + */ + @Excel(name = "邮件系统状态", sort = 6, width = 20,dictType = "email_state",comboReadDict = true) + @ApiModelProperty("邮件系统状态（字典)") + private String yjxtzc; + /** + * 安全防护系统（字典） + */ + @Excel(name = "安全防护系统", sort = 7, dictType = "email_hasorno",comboReadDict = true) + @ApiModelProperty("安全防护系统（字典）") + private String aqfhxt; + /** + * 安全备份环境(字典） + */ + @Excel(name = "安全备份环境", sort = 8, dictType = "email_hasorno",comboReadDict = true) + @ApiModelProperty("安全备份环境(字典）") + private String aqbfhj; + /** + * 数字证书厂商 + */ + @Excel(name = "数字证书厂商", sort = 9) + @ApiModelProperty("数字证书厂商") + private String szzscs; + /** + * 上线时间 + */ + @Excel(name = "上线时间", sort = 10) + @ApiModelProperty("上线时间") + private String sxsj; + /** + * 所属行业（字典） + */ + @Excel(name = "所属行业",dictType = "app_sshy",comboReadDict = true,sort = 11, width = 18) + @ApiModelProperty("所属行业（字典）") + private String sshy; + /** + * 重点行业（字典） + */ + @Excel(name = "重点行业",dictType = "app_zdhy",comboReadDict = true,sort = 12, width = 18) + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + @Excel(name = "行政区划",dictType = "app_xzqh",comboReadDict = true,sort = 13, width = 18) + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 简介 + */ + @Excel(name = "简介",sort = 14, width = 28) + @ApiModelProperty("简介") + private String jj; + /** + * 系统责任人 + */ + @Excel(name = "系统责任人",sort = 15) + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + @Excel(name = "系统责任人电话",sort = 16) + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + @Excel(name = "系统责任人邮箱",sort = 17) + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + @Excel(name = "系统责任人地址",sort = 18) + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("报废原因") + private String bfyy; + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsCpPo.java new file mode 100644 index 0000000..2173cd5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsCpPo.java @@ -0,0 +1,207 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 小程序资产表(asset_mini_programs_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("小程序资产表") +@TableName(value = "asset_mini_programs_cp") +public class AssetMiniProgramsCpPo extends BaseClass implements Serializable { + + /** + * + */ + @ApiModelProperty("mini_id") + @TableId(value = "mini_id", type = IdType.AUTO) + private Long miniId; + + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + + /** + * 所属单位 + */ + + @ApiModelProperty("所属单位") + private String ssdw; + /** + * 小程序名称 + */ + + @ApiModelProperty("小程序名称") + private String xcxmc; + /** + * appid + */ + + @ApiModelProperty("appid") + private String appId; + /** + * 认证主体 + */ + + @ApiModelProperty("认证主体") + private String rzzt; + /** + * 统一社会信用代码 + */ + + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 小程序状态（字典） + */ + + @ApiModelProperty("小程序状态（字典）") + private String state; + /** + * 账号原始ID + */ + + @ApiModelProperty("账号原始ID") + private String ysId; + /** + * 小程序包状态(字典) + */ + @ApiModelProperty("小程序包状态(字典)") + private String packState; + /** + * 认证状态(字典） + */ + + @ApiModelProperty("认证状态(字典）") + private String rzState; + /** + * 认证时间 + */ + + @ApiModelProperty("认证时间") + private String rzsj; + /** + * 认证类型（字典） + */ + + @ApiModelProperty("认证类型（字典）") + private String rzlx; + /** + * icp备案状态 + */ + @ApiModelProperty("icp备案状态") + + private String icpState; + /** + * 域命白名单 + */ + + @ApiModelProperty("域命白名单") + private String ymbmd; + /** + * 服务类目 + */ + + @ApiModelProperty("服务类目") + private String fwlm; + /** + * 行业电子邮箱 + */ + + @ApiModelProperty("行业电子邮箱") + private String hydzyx; + /** + * 所属行业（字典） + */ + @ApiModelProperty("所属行业（字典）") + + private String sshy; + /** + * 重点行业(字典) + */ + + @ApiModelProperty("重点行业(字典)") + private String zdhy; + /** + * 行政区划（字典) + */ + + @ApiModelProperty("行政区划（字典)") + private String xzqh; + /** + * 系统简介 + */ + + @ApiModelProperty("系统简介") + private String xtjj; + /** + * 系统责任人 + */ + + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + /** + * 引用插件appid + */ + + @ApiModelProperty("引用插件appid") + private String yycjAppid; + /** + * 引用插件开发者 + */ + + @ApiModelProperty("引用插件开发者") + private String yycjKfz; + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + + @ApiModelProperty("报废原因") + private String bfyy; + + + + + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsJyPo.java new file mode 100644 index 0000000..fa7bfea --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsJyPo.java @@ -0,0 +1,206 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 小程序资产表(asset_mini_programs_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("小程序资产表") +@TableName(value = "asset_mini_programs_cp") +public class AssetMiniProgramsJyPo extends BaseClass implements Serializable { + + /** + * + */ + @ApiModelProperty("mini_id") + @TableId(value = "mini_id",type = IdType.AUTO) + private Long miniId; + + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + + /** + * 所属单位 + */ + @Excel(name = "所属单位", sort = 1, width = 22) + @ApiModelProperty("所属单位") + private String ssdw; + /** + * 小程序名称 + */ + @Excel(name = "小程序名称", sort = 2, width = 22) + @ApiModelProperty("小程序名称") + private String xcxmc; + /** + * appid + */ + @Excel(name = "APPID", sort = 3, width = 22) + @ApiModelProperty("appid") + private String appId; + /** + * 认证主体 + */ + @Excel(name = "认证主体", sort = 4, width = 26) + @ApiModelProperty("认证主体") + private String rzzt; + /** + * 统一社会信用代码 + */ + @Excel(name = "统一社会信用代码", sort = 5) + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 小程序状态（字典） + */ + @Excel(name = "小程序状态", sort = 6,dictType = "gzh_state",comboReadDict = true) + @ApiModelProperty("小程序状态（字典）") + private String state; + /** + * 账号原始ID + */ + @Excel(name = "账号原始ID", sort = 7) + @ApiModelProperty("账号原始ID") + private String ysId; + /** + * 小程序包状态(字典) + */ + @Excel(name = "小程序包状态", sort = 8,dictType = "email_state",comboReadDict = true) + @ApiModelProperty("小程序包状态(字典)") + private String packState; + /** + * 认证状态(字典） + */ + @Excel(name = "认证状态", sort = 9,dictType = "gzh_rzzt",comboReadDict = true) + @ApiModelProperty("认证状态(字典）") + private String rzState; + /** + * 认证时间 + */ + @Excel(name = "认证时间", sort = 10) + @ApiModelProperty("认证时间") + private String rzsj; + /** + * 认证类型（字典） + */ + @Excel(name = "认证类型", sort = 11,dictType = "gzh_rzlx",comboReadDict = true) + @ApiModelProperty("认证类型（字典）") + private String rzlx; + /** + * icp备案状态 + */ + @ApiModelProperty("icp备案状态") + @Excel(name = "icp备案状态", sort = 12) + private String icpState; + /** + * 域命白名单 + */ + @Excel(name = "域名白名单", sort = 13) + @ApiModelProperty("域命白名单") + private String ymbmd; + /** + * 服务类目 + */ + @Excel(name = "服务类目", sort = 14) + @ApiModelProperty("服务类目") + private String fwlm; + /** + * 行业电子邮箱 + */ + @Excel(name = "行业电子邮箱", sort = 15) + @ApiModelProperty("行业电子邮箱") + private String hydzyx; + /** + * 所属行业（字典） + */ + @ApiModelProperty("所属行业（字典）") + @Excel(name = "所属行业",dictType = "app_sshy",comboReadDict = true,sort = 16, width = 18) + private String sshy; + /** + * 重点行业(字典) + */ + @Excel(name = "重点行业",dictType = "app_zdhy",comboReadDict = true,sort = 17, width = 18) + @ApiModelProperty("重点行业(字典)") + private String zdhy; + /** + * 行政区划（字典) + */ + @Excel(name = "行政区划",dictType = "app_xzqh",comboReadDict = true,sort = 18, width = 18) + @ApiModelProperty("行政区划（字典)") + private String xzqh; + /** + * 系统简介 + */ + @Excel(name = "系统简介",sort = 19, width = 24) + @ApiModelProperty("系统简介") + private String xtjj; + /** + * 系统责任人 + */ + @Excel(name = "系统责任人",sort = 20) + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + @Excel(name = "系统责任人电话",sort = 21) + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + @Excel(name = "系统责任人邮箱",sort = 22) + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + @Excel(name = "系统责任人地址",sort = 23,width = 24) + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + /** + * 引用插件appid + */ + @Excel(name = "引用插件（APPID）",sort = 24) + @ApiModelProperty("引用插件appid") + private String yycjAppid; + /** + * 引用插件开发者 + */ + @Excel(name = "引用插件（开发者）",sort = 25) + @ApiModelProperty("引用插件开发者") + private String yycjKfz; + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("报废原因") + private String bfyy; + + + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountCpPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountCpPo.java new file mode 100644 index 0000000..d11b36c --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountCpPo.java @@ -0,0 +1,169 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 公众号资产表(asset_official_account_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("公众号资产表") +@TableName(value = "asset_official_account_cp") +public class AssetOfficialAccountCpPo extends BaseClass implements Serializable { + + + @ApiModelProperty("id") + @TableId(value = "account_id", type = IdType.AUTO) + private Long accountId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + + /** + * 所属单位 + */ + + @ApiModelProperty("所属单位") + private String ssdw; + + /** + * 公众号名称 + */ + + @ApiModelProperty("公众号名称") + private String gzhmc; + /** + * 微信号 + */ + + @ApiModelProperty("微信号") + private String wxh; + /** + * 认证主体 + */ + + @ApiModelProperty("认证主体") + private String rzzt; + /** + * 统一社会信用代码 + */ + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 公众号状态（字典） + */ + @ApiModelProperty("公众号状态（字典）") + private String gzhzt; + /** + * 公众号id + */ + @ApiModelProperty("公众号id") + private String gzhId; + /** + * 公众号类型（字典） + */ + @ApiModelProperty("公众号类型（字典）") + private String gzhlx; + /** + * 认证状态（字典） + */ + @ApiModelProperty("认证状态（字典）") + private String rzState; + /** + * 认证时间 + */ + @ApiModelProperty("认证时间") + private String rzsj; + /** + * 认证类型（字典） + */ + @ApiModelProperty("认证类型（字典）") + private String rzlx; + /** + * 所属行业（字典） + */ + @ApiModelProperty("所属行业（字典）") + private String sshy; + /** + * 重点行业（字典） + */ + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 系统简介 + */ + @ApiModelProperty("系统简介") + private String xtjj; + /** + * 系统责任人 + */ + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + /** + * 菜单名称 + */ + @ApiModelProperty("菜单名称") + private String cdmc; + /** + * 菜单链接 + */ + @ApiModelProperty("菜单链接") + private String cdlj; + /** + * 菜单类型 + */ + @ApiModelProperty("菜单类型") + private String cdlx; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + + @ApiModelProperty("报废原因") + private String bfyy; + + + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountJyPo.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountJyPo.java new file mode 100644 index 0000000..474a054 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountJyPo.java @@ -0,0 +1,188 @@ +package com.ruoyi.tc.entity.po; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.tc.baseClass.BaseClass; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +/** + * 公众号资产表(asset_official_account_cp)实体类 + * + * @author du + * @since 2024/11/13 14:44 + */ +@Data +@ApiModel("公众号资产表") +@TableName(value = "asset_official_account_cp") +public class AssetOfficialAccountJyPo extends BaseClass implements Serializable { + + + @ApiModelProperty("id") + @TableId(value = "account_id", type = IdType.AUTO) + private Long accountId; + + @ApiModelProperty("资产id") + private Long assetId; + + @ApiModelProperty("任务id") + private Integer taskId; + + /** + * 所属单位 + */ + @Excel(name = "所属单位", sort = 1, width = 24) + @ApiModelProperty("所属单位") + private String ssdw; + + /** + * 公众号名称 + */ + @Excel(name = "公众号名称", sort = 2, width = 20) + @ApiModelProperty("公众号名称") + private String gzhmc; + /** + * 微信号 + */ + @Excel(name = "微信号", sort = 3, width = 22) + @ApiModelProperty("微信号") + private String wxh; + /** + * 认证主体 + */ + @Excel(name = "认证主体", sort = 4, width = 24) + @ApiModelProperty("认证主体") + private String rzzt; + /** + * 统一社会信用代码 + */ + @Excel(name = "统一社会信用代码", sort = 5, width = 24) + @ApiModelProperty("统一社会信用代码") + private String tyshxydm; + /** + * 公众号状态（字典） + */ + @Excel(name = "公众号状态", sort = 6, dictType = "gzh_state", comboReadDict = true) + @ApiModelProperty("公众号状态（字典）") + private String gzhzt; + /** + * 公众号id + */ + @Excel(name = "公众号ID", sort = 7) + @ApiModelProperty("公众号id") + private String gzhId; + /** + * 公众号类型（字典） + */ + @Excel(name = "公众号类型", sort = 8, dictType = "gzh_lx", comboReadDict = true) + @ApiModelProperty("公众号类型（字典）") + private String gzhlx; + /** + * 认证状态（字典） + */ + @Excel(name = "认证状态", sort = 9, dictType = "gzh_rzzt", comboReadDict = true) + @ApiModelProperty("认证状态（字典）") + private String rzState; + /** + * 认证时间 + */ + @Excel(name = "认证时间", sort = 10) + @ApiModelProperty("认证时间") + private String rzsj; + /** + * 认证类型（字典） + */ + @Excel(name = "认证类型", sort = 11, dictType = "gzh_rzlx", comboReadDict = true) + @ApiModelProperty("认证类型（字典）") + private String rzlx; + /** + * 所属行业（字典） + */ + @Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 12, width = 18) + @ApiModelProperty("所属行业（字典）") + private String sshy; + /** + * 重点行业（字典） + */ + @Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 13, width = 18) + @ApiModelProperty("重点行业（字典）") + private String zdhy; + /** + * 行政区划（字典） + */ + @Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 14, width = 18) + @ApiModelProperty("行政区划（字典）") + private String xzqh; + /** + * 系统简介 + */ + @Excel(name = "系统简介", sort = 15, width = 26) + @ApiModelProperty("系统简介") + private String xtjj; + /** + * 系统责任人 + */ + @Excel(name = "系统责任人", sort = 16) + @ApiModelProperty("系统责任人") + private String xtzrr; + /** + * 系统责任人电话 + */ + @Excel(name = "系统责任人电话", sort = 17) + @ApiModelProperty("系统责任人电话") + private String xtzrrdh; + /** + * 系统责任人邮箱 + */ + @Excel(name = "系统责任人邮箱", sort = 18) + @ApiModelProperty("系统责任人邮箱") + private String xtzrryx; + /** + * 系统责任人地址 + */ + @Excel(name = "系统责任人地址", sort = 19) + @ApiModelProperty("系统责任人地址") + private String xtzrrdz; + /** + * 菜单名称 + */ + @Excel(name = "菜单信息（菜单名称）", sort = 20) + @ApiModelProperty("菜单名称") + private String cdmc; + /** + * 菜单链接 + */ + @Excel(name = "菜单信息（菜单链接）", sort = 21, width = 28) + @ApiModelProperty("菜单链接") + private String cdlj; + /** + * 菜单类型 + */ + @Excel(name = "菜单信息（菜单类型）", sort = 22) + @ApiModelProperty("菜单类型") + private String cdlx; + + /** + * 删除标志（0代表存在 2代表删除） + */ + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; + + @ApiModelProperty("报废原因") + private String bfyy; + + @ApiModelProperty("是否报废") + private Integer isbf; + + + @ApiModelProperty("不通过原因") + private String btgyy; + + @ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）") + private Integer status; +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java index 1555e01..f7d89f3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssestTaskXqRequest.java @@ -35,4 +35,11 @@ public class AssestTaskXqRequest { */ @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）") private String status; + + + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private String type; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java index b4eb92e..d5cc32f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentShRequest.java @@ -18,6 +18,13 @@ public class AssetCurrentShRequest { @ApiModelProperty("任务id") private Integer taskId; + + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private Integer type; + /** * 系统名称 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java index 7470407..f7cfe41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java @@ -32,4 +32,10 @@ public class UnitRequest { @ApiModelProperty("页数") private Long size=10L; + + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private String type; } 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 1661ed6..edfc913 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 @@ -118,5 +118,10 @@ public class AssetTaskIdResponse { private String reamark; + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private String type; } 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 index 3aeaeab..4ec85c3 100644 --- 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 @@ -122,4 +122,11 @@ public class AssetTaskResponse { */ @ApiModelProperty("审核状态（0待核查，1待审核，3审核通过，4审核不通过，5审核不通过）") private String status; + + + /** + * 资产类型 + */ + @ApiModelProperty("0:web资产，1:小程序资产，2：公众号资产，3：电子邮件资产，4：移动应用程序资产") + private String type; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java new file mode 100644 index 0000000..48bba95 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java @@ -0,0 +1,61 @@ +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.AssetApp; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.request.AssetAppPageRequest; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * 资产移动应用程序表(asset_app_cp)表数据库访问层 + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetAppCpMapper extends BaseMapper { + + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId} ") + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId); + + + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from asset_app_cp where task_id=#{taskId}") + List findByTaskId(@Param("taskId") int taskId); + + + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppJyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppJyMapper.java new file mode 100644 index 0000000..c3468ca --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppJyMapper.java @@ -0,0 +1,17 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetAppJyPo; + +/** + * 资产移动应用程序表(asset_app_cp)表数据库访问层 + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetAppJyMapper extends BaseMapper { + + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppMapper.java index 643944a..4c36a1b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppMapper.java @@ -10,6 +10,7 @@ import java.util.List; /** * 资产移动应用程序表(asset_app)表数据库访问层 + * * @author makejava * @since 2024-11-15 10:03:56 */ @@ -22,16 +23,15 @@ public interface AssetAppMapper extends BaseMapper { * @param as 查询实体 * @return 所有数据 */ - Page page(Page page,@Param("req") AssetAppPageRequest as); + Page page(Page page, @Param("req") AssetAppPageRequest as); /** * 查询所有数据 * - * @param as 查询实体 + * @param as 查询实体 * @return 所有数据 */ - List page(@Param("req")AssetAppPageRequest as); - + List page(@Param("req") AssetAppPageRequest as); /** @@ -41,5 +41,21 @@ public interface AssetAppMapper extends BaseMapper { */ void deleteById(Long id); + + /** + * 删除 + * + * @param idList + */ + void deleteIdList(@Param("idList") List idList); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java index e3fd7ed..3cc40c8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentMapper.java @@ -58,5 +58,15 @@ public interface AssetCurrentMapper extends BaseMapper { * 查询所有数据(带子表) */ List selectAllAsset(@Param("req") AssetCurrentPageRequest as); + + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java new file mode 100644 index 0000000..a3218e3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java @@ -0,0 +1,52 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * 电子邮件资产表(asset_email_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetEmailCpMapper extends BaseMapper { + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_email_cp where asset_id=#{assetId} and task_id =#{taskId} ") + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from asset_email_cp where task_id=#{taskId}") + List findByTaskId(@Param("taskId") int taskId); + + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailJyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailJyMapper.java new file mode 100644 index 0000000..4f6c122 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailJyMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.po.AssetEmailJyPo; + +/** + * 电子邮件资产表(asset_email_cp)表数据库访问层 + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetEmailJyMapper extends BaseMapper { + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailMapper.java index 23029dc..bc3099d 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailMapper.java @@ -41,5 +41,21 @@ public interface AssetEmailMapper extends BaseMapper { */ void deleteById(Long id); + + /** + * 删除 + * @param idList + */ + void deleteIdList(@Param("idList") List idList); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsCpMapper.java new file mode 100644 index 0000000..63996cd --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsCpMapper.java @@ -0,0 +1,54 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * 小程序资产表(asset_mini_programs_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetMiniProgramsCpMapper extends BaseMapper { + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_mini_programs_cp where asset_id=#{assetId} and task_id =#{taskId} ") + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from asset_mini_programs_cp where task_id=#{taskId}") + List findByTaskId(@Param("taskId") int taskId); + + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsJyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsJyMapper.java new file mode 100644 index 0000000..0f7fedf --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsJyMapper.java @@ -0,0 +1,20 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; +import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo; +import org.apache.ibatis.annotations.Delete; + +/** + * 小程序资产表(asset_mini_programs_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetMiniProgramsJyMapper extends BaseMapper { + + + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsMapper.java index 0870ef0..4f0a03c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsMapper.java @@ -42,5 +42,21 @@ public interface AssetMiniProgramsMapper extends BaseMapper { */ void deleteById(Long id); + + + /** + * 删除 + * @param idList + */ + void deleteIdList(@Param("idList") List idList); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java new file mode 100644 index 0000000..a9e4b26 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java @@ -0,0 +1,53 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; + +import java.util.List; + +/** + * 公众号资产表(asset_official_account_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetOfficialAccountCpMapper extends BaseMapper { + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + @Delete("delete from asset_official_account_cp where asset_id=#{assetId} and task_id =#{taskId} ") + void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId); + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + @Select("select * from asset_official_account_cp where task_id=#{taskId}") + List findByTaskId(@Param("taskId") int taskId); + + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + @Update("update asset_mini_programs_cp set btgyy=#{btgyy} where asset_id=#{assetId} and task_id =#{taskId} ") + void updateByAssetId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId, @Param("btgyy")String btgyy); + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountJyMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountJyMapper.java new file mode 100644 index 0000000..fb8a50f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountJyMapper.java @@ -0,0 +1,16 @@ +package com.ruoyi.tc.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo; + +/** + * 公众号资产表(asset_official_account_cp)表数据库访问层 + * + * @author makejava + * @since 2024-11-15 10:03:56 + */ +public interface AssetOfficialAccountJyMapper extends BaseMapper { + + +} + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountMapper.java index 5a080ae..d5343a7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountMapper.java @@ -41,5 +41,19 @@ public interface AssetOfficialAccountMapper extends BaseMapper idList); + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); } 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 02825ac..b6eaa90 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 @@ -113,7 +113,7 @@ public interface AssetTaskMapper extends BaseMapper { /** - * 资产核查信息 + * web资产核查信息 * * @param page 分页参数 * @param pageRequest 查询条件 @@ -122,6 +122,46 @@ public interface AssetTaskMapper extends BaseMapper { Page zcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + /** + * 小程序资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page xcxZcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + + + /** + * 公众号资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page gzhZcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + + + /** + * 邮件资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page emailZcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + + + /** + * 移动应用程序资产核查信息 + * + * @param page 分页参数 + * @param pageRequest 查询条件 + * @return + */ + Page appZcHc(Page page, @Param("req") AssestTaskXqRequest pageRequest); + + /** * 根据任务id，资产id查询资产主表信息 * @@ -141,6 +181,41 @@ public interface AssetTaskMapper extends BaseMapper { int sh(@Param("req") AssetCurrentShRequest req); + /** + * 小程序管理端审核 + * + * @param req 请求类 + * @return + */ + int xcxsh(@Param("req") AssetCurrentShRequest req); + + + /** + * 公众号管理端审核 + * + * @param req 请求类 + * @return + */ + int gzhsh(@Param("req") AssetCurrentShRequest req); + + + /** + * 电子邮件管理端审核 + * + * @param req 请求类 + * @return + */ + int emailsh(@Param("req") AssetCurrentShRequest req); + + + /** + * app管理端审核 + * + * @param req 请求类 + * @return + */ + int appsh(@Param("req") AssetCurrentShRequest req); + /** * 管理端-单位核查情况 * @@ -175,5 +250,22 @@ public interface AssetTaskMapper extends BaseMapper { * @return */ List taskList(@Param("dwmc") String dwmc); + + + /** + * 修改已关停 + * + * @param taskId 任务id + */ + + void updateYgtByTaskId(@Param("taskId") Integer taskId,@Param("count") int count); + + /** + * 根据taskid获取当前任务的count数量 + * + * @param taskId 任务id + * @return + */ + AssetTask getByTaskId(@Param("taskId") int taskId); } 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 06e2cd0..6034f13 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 @@ -67,4 +67,15 @@ public interface UnitMapper extends BaseMapper { * @return 单位 */ List selectAllUnit(@Param("req") GeneralQueryRequest req); + + + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(@Param("part") String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java new file mode 100644 index 0000000..542e60f --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java @@ -0,0 +1,44 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; + +import java.util.List; + +/** + * 资产移动应用程序表(asset_app_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetAppCpService extends IService { + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + void updateByAssetId(Integer assetId, Integer taskId, String btgyy); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppJyService.java new file mode 100644 index 0000000..b07657b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppJyService.java @@ -0,0 +1,14 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetAppJyPo; + +/** + * 资产移动应用程序表(asset_app_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetAppJyService extends IService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppService.java index d9a6fa2..17ea5d6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppService.java @@ -36,4 +36,23 @@ public interface AssetAppService extends IService { * @return 所有数据 */ List getAllList(AssetAppPageRequest as); + + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); + + + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java index dc0b311..96d9bc4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentService.java @@ -57,5 +57,14 @@ public interface AssetCurrentService extends IService { * 查询所有数据(带子表) */ List selectAllAsset(AssetCurrentPageRequest as); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailCpService.java new file mode 100644 index 0000000..1b18c07 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailCpService.java @@ -0,0 +1,50 @@ +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.AssetEmail; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.po.AssetEmailJyPo; +import com.ruoyi.tc.entity.request.AssetEmailPageRequest; + +import java.util.List; + +/** + * 电子邮件资产表(asset_email)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetEmailCpService extends IService { + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + void updateByAssetId(Integer assetId, Integer taskId, String btgyy); + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailJyService.java new file mode 100644 index 0000000..f8fac84 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailJyService.java @@ -0,0 +1,15 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.po.AssetEmailJyPo; + +/** + * 电子邮件资产表(asset_email)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetEmailJyService extends IService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailService.java index b59b588..54ebad4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailService.java @@ -37,4 +37,22 @@ public interface AssetEmailService extends IService { * @return 所有数据 */ List getAllList(AssetEmailPageRequest as); + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); + + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); } + diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsCpService.java new file mode 100644 index 0000000..6363c5b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsCpService.java @@ -0,0 +1,53 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; + +import java.util.List; + +/** + * 小程序资产(asset_mini_programs_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetMiniProgramsCpService extends IService { + + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + + + + + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + void updateByAssetId(Integer assetId, Integer taskId, String btgyy); + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsJyService.java new file mode 100644 index 0000000..572fba5 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsJyService.java @@ -0,0 +1,19 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; +import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo; + +/** + * 小程序资产(asset_mini_programs_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetMiniProgramsJyService extends IService { + + + + + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsService.java index bd7d22b..03423cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsService.java @@ -36,4 +36,20 @@ public interface AssetMiniProgramsService extends IService { * @return 所有数据 */ List getAllList(AssetMiniProgramsPageRequest as); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); + + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountCpService.java new file mode 100644 index 0000000..f24f53b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountCpService.java @@ -0,0 +1,47 @@ +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.AssetOfficialAccount; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; +import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest; +import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper; + +import java.util.List; + +/** + * 公众号资产(asset_official_account_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetOfficialAccountCpService extends IService { + + /** + * 根据资产id和任务id删除数据 + * + * @param assetId 资产id + * @param taskId 任务id + */ + void deletByAssetIdandTaskId(Long assetId, int taskId); + + + + /** + * 根据taskid查询查询数据 + * + * @param taskId 任务id + * @return + */ + List findByTaskId(int taskId); + + /** + * 修改不通过原因 + * + * @param assetId 资产id + * @param taskId 任务id + * @param btgyy 不通过原因 + */ + void updateByAssetId(Integer assetId, Integer taskId, String btgyy); +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountJyService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountJyService.java new file mode 100644 index 0000000..c782e7b --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountJyService.java @@ -0,0 +1,15 @@ +package com.ruoyi.tc.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo; +import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper; + +/** + * 公众号资产(asset_official_account_cp)表服务接口 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +public interface AssetOfficialAccountJyService extends IService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountService.java index 0c0d969..6042cd8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountService.java @@ -35,4 +35,19 @@ public interface AssetOfficialAccountService extends IService getAllList(AssetOfficialAccountPageRequest as); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); + + /** + * 删除 + * @param idList + */ + void deleteIdList(List idList); } 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 12fcd51..3b351a2 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 @@ -3,14 +3,15 @@ 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.AssetTask; +import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; import com.ruoyi.tc.entity.request.AssetCurrentShRequest; import com.ruoyi.tc.entity.request.AssetTaskPageRequest; import com.ruoyi.tc.entity.request.AssetdwHcRequest; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; -import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.response.AssetTaskResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse; +import io.swagger.models.auth.In; import java.util.List; @@ -65,7 +66,7 @@ public interface AssetTaskService extends IService { /** - * 任务审核 + * web资产任务审核详情信息 * * @param taskId 任务id * @param assetId 资产id @@ -73,6 +74,45 @@ public interface AssetTaskService extends IService { */ AssetCurrentCpPo taskSh(int taskId, int assetId); + + /** + * 小程序资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetMiniProgramsCpPo minitaskSh(int taskId, int assetId); + + + /** + * 公众号资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetOfficialAccountCpPo officetaskSh(int taskId, int assetId); + + + /** + * 电子邮件资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetEmailCpPo emailtaskSh(int taskId, int assetId); + + /** + * 电子邮件资产任务审核详情信息 + * + * @param taskId 任务id + * @param assetId 资产id + * @return + */ + AssetAppCpPo apptaskSh(int taskId, int assetId); + /** * 资产核查信息 * @@ -107,4 +147,12 @@ public interface AssetTaskService extends IService { * @return */ List taskList(String dwmc); + + /** + * 修改已关停 + * + * @param taskId 任务id + */ + + void updateYgtByTaskId(Integer taskId,Integer count); } 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 6497463..2432675 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 @@ -1,7 +1,6 @@ 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.Unit; @@ -12,6 +11,7 @@ import java.util.List; /** * 单位信息（unit_info）表业务层 + * * @author du * @since 2024/11/13 15:02 */ @@ -46,16 +46,17 @@ public interface UnitService extends IService { /** * 根据id列表查询单位 */ - List selectByIds(Long id); + List selectByIds(Long id); /** * 逻辑删除用户 */ void deleteUsers(String userNames); + /** * 逻辑删除单位 */ - void deleteUnits(Long ids); + void deleteUnits(Long ids); /** * 分页条件查询单位列表过滤 @@ -72,4 +73,13 @@ public interface UnitService extends IService { * @return 单位 */ List selectAllUnit(GeneralQueryRequest req); + + + /** + * 根据单位查询资产总数 + * + * @param part 单位 + * @return + */ + Integer findBydwmc(String part); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppCpServiceImpl.java new file mode 100644 index 0000000..71725aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppCpServiceImpl.java @@ -0,0 +1,41 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.mapper.AssetAppCpMapper; +import com.ruoyi.tc.service.AssetAppCpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 资产移动应用程序表(asset_app_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetAppCpService") +public class AssetAppCpServiceImpl extends ServiceImpl implements AssetAppCpService { + + + @Resource + private AssetAppCpMapper assetAppCpMapper; + + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + + assetAppCpMapper.deletByAssetIdandTaskId(assetId, taskId); + + } + + @Override + public List findByTaskId(int taskId) { + return assetAppCpMapper.findByTaskId(taskId); + } + + @Override + public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) { + baseMapper.updateByAssetId(assetId,taskId,btgyy); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppJyServiceImpl.java new file mode 100644 index 0000000..dd075e9 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppJyServiceImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetAppJyPo; +import com.ruoyi.tc.mapper.AssetAppCpMapper; +import com.ruoyi.tc.mapper.AssetAppJyMapper; +import com.ruoyi.tc.service.AssetAppCpService; +import com.ruoyi.tc.service.AssetAppJyService; +import org.springframework.stereotype.Service; + +/** + * 资产移动应用程序表(asset_app_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetAppJyService") +public class AssetAppJyServiceImpl extends ServiceImpl implements AssetAppJyService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java index 089c434..da1d18f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java @@ -49,4 +49,18 @@ public class AssetAppServiceImpl extends ServiceImpl i public List getAllList(AssetAppPageRequest as) { return baseMapper.page(as); } + + @Override + public void deleteIdList(List idList) { + baseMapper.deleteIdList(idList); + } + + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } + + + + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java index 2160b34..92db5a2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java @@ -109,5 +109,10 @@ public class AssetCurrentServiceImpl extends ServiceImpl selectAllAsset(AssetCurrentPageRequest as) { return baseMapper.selectAllAsset(as); } + + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailCpServiceImpl.java new file mode 100644 index 0000000..bd238af --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailCpServiceImpl.java @@ -0,0 +1,48 @@ +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.AssetEmail; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.request.AssetEmailPageRequest; +import com.ruoyi.tc.mapper.AssetAppCpMapper; +import com.ruoyi.tc.mapper.AssetEmailCpMapper; +import com.ruoyi.tc.mapper.AssetEmailMapper; +import com.ruoyi.tc.service.AssetEmailCpService; +import com.ruoyi.tc.service.AssetEmailService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 电子邮件资产表(asset_email)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetEmailCpService") +public class AssetEmailCpServiceImpl extends ServiceImpl implements AssetEmailCpService { + + + + @Resource + private AssetEmailCpMapper assetEmailCpMapper; + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + + assetEmailCpMapper.deletByAssetIdandTaskId(assetId,taskId); + + } + + @Override + public List findByTaskId(int taskId) { + return assetEmailCpMapper.findByTaskId(taskId); + } + + + @Override + public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) { + assetEmailCpMapper.updateByAssetId(assetId,taskId,btgyy); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailJyServiceImpl.java new file mode 100644 index 0000000..301b5aa --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailJyServiceImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.po.AssetEmailJyPo; +import com.ruoyi.tc.mapper.AssetEmailCpMapper; +import com.ruoyi.tc.mapper.AssetEmailJyMapper; +import com.ruoyi.tc.service.AssetEmailCpService; +import com.ruoyi.tc.service.AssetEmailJyService; +import org.springframework.stereotype.Service; + +/** + * 电子邮件资产表(asset_email)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetEmailJyService") +public class AssetEmailJyServiceImpl extends ServiceImpl implements AssetEmailJyService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java index 17f34d0..8821f41 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java @@ -49,4 +49,16 @@ public class AssetEmailServiceImpl extends ServiceImpl getAllList(AssetEmailPageRequest as) { return baseMapper.page(as); } + + @Override + public void deleteIdList(List idList) { + baseMapper.deleteIdList(idList); + } + + + + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsCpServiceImpl.java new file mode 100644 index 0000000..26e3cd2 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsCpServiceImpl.java @@ -0,0 +1,39 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; +import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper; +import com.ruoyi.tc.service.AssetMiniProgramsCpService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 小程序资产(asset_mini_programs_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetMiniProgramsCpService") +public class AssetMiniProgramsCpServiceImpl extends ServiceImpl implements AssetMiniProgramsCpService { + + @Resource + private AssetMiniProgramsCpMapper assetMiniProgramsCpMapper; + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + + assetMiniProgramsCpMapper.deletByAssetIdandTaskId(assetId,taskId); + + } + + @Override + public List findByTaskId(int taskId) { + return assetMiniProgramsCpMapper.findByTaskId(taskId); + } + + @Override + public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) { + assetMiniProgramsCpMapper.updateByAssetId(assetId,taskId,btgyy); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsJyServiceImpl.java new file mode 100644 index 0000000..d9ea095 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsJyServiceImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo; +import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper; +import com.ruoyi.tc.mapper.AssetMiniProgramsJyMapper; +import com.ruoyi.tc.service.AssetMiniProgramsJyService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +/** + * 小程序资产(asset_mini_programs_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetMiniProgramsJyService") +public class AssetMiniProgramsJyServiceImpl extends ServiceImpl implements AssetMiniProgramsJyService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java index 83a3fe2..2e12695 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java @@ -49,4 +49,17 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl getAllList(AssetMiniProgramsPageRequest as) { return baseMapper.page(as); } + + @Override + public void deleteIdList(List idList) { + baseMapper.deleteIdList(idList); + } + + + + + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountCpServiceImpl.java new file mode 100644 index 0000000..19d6cd3 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountCpServiceImpl.java @@ -0,0 +1,47 @@ +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.AssetOfficialAccount; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; +import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest; +import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper; +import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper; +import com.ruoyi.tc.mapper.AssetOfficialAccountMapper; +import com.ruoyi.tc.service.AssetOfficialAccountCpService; +import com.ruoyi.tc.service.AssetOfficialAccountService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 公众号资产(asset_official_account_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetOfficialAccountCpService") +public class AssetOfficialAccountCpServiceImpl extends ServiceImpl implements AssetOfficialAccountCpService { + + + @Resource + private AssetOfficialAccountCpMapper assetOfficialAccountCpMapper; + @Override + public void deletByAssetIdandTaskId(Long assetId, int taskId) { + + assetOfficialAccountCpMapper.deletByAssetIdandTaskId(assetId,taskId); + + } + + @Override + public List findByTaskId(int taskId) { + return assetOfficialAccountCpMapper.findByTaskId(taskId); + } + + @Override + public void updateByAssetId(Integer assetId, Integer taskId, String btgyy) { + assetOfficialAccountCpMapper.updateByAssetId(assetId,taskId,btgyy); + } +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountJyServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountJyServiceImpl.java new file mode 100644 index 0000000..f5c1e89 --- /dev/null +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountJyServiceImpl.java @@ -0,0 +1,21 @@ +package com.ruoyi.tc.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; +import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo; +import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper; +import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper; +import com.ruoyi.tc.service.AssetOfficialAccountCpService; +import com.ruoyi.tc.service.AssetOfficialAccountJyService; +import org.springframework.stereotype.Service; + +/** + * 公众号资产(asset_official_account_cp)表服务实现类 + * + * @author makejava + * @since 2024-11-28 17:13:07 + */ +@Service("assetOfficialAccountJyService") +public class AssetOfficialAccountJyServiceImpl extends ServiceImpl implements AssetOfficialAccountJyService { + +} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java index d4708d1..cc422b1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java @@ -49,4 +49,17 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl getAllList(AssetOfficialAccountPageRequest as) { return baseMapper.page(as); } + + + @Override + public void deleteIdList(List idList) { + baseMapper.deleteIdList(idList); + } + + + + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } } 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 7e4d9ee..9d3fc2c 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 @@ -1,50 +1,28 @@ package com.ruoyi.tc.service.impl; import cn.hutool.core.collection.CollectionUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.tc.entity.AssetBasicNetwork; -import com.ruoyi.tc.entity.AssetBusinessForm; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.AssetLc; -import com.ruoyi.tc.entity.AssetSupplyChain; -import com.ruoyi.tc.entity.AssetTask; -import com.ruoyi.tc.entity.UnitOtherConcat; -import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; -import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo; -import com.ruoyi.tc.entity.po.AssetCurrentCpPo; -import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; -import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; -import com.ruoyi.tc.entity.request.Acomma; -import com.ruoyi.tc.entity.request.AssestTaskXqRequest; -import com.ruoyi.tc.entity.request.AssetCurrentShRequest; -import com.ruoyi.tc.entity.request.AssetTaskPageRequest; -import com.ruoyi.tc.entity.request.AssetdwHcRequest; +import com.ruoyi.tc.entity.*; +import com.ruoyi.tc.entity.po.*; +import com.ruoyi.tc.entity.request.*; import com.ruoyi.tc.entity.response.AssestTaskXqresponse; import com.ruoyi.tc.entity.response.AssetTaskResponse; -import com.ruoyi.tc.entity.response.AssetTaskStatusResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse; import com.ruoyi.tc.mapper.AssetTaskMapper; -import com.ruoyi.tc.service.AssetBasicNetworkCpService; -import com.ruoyi.tc.service.AssetBasicNetworkService; -import com.ruoyi.tc.service.AssetBusinessFormCpService; -import com.ruoyi.tc.service.AssetBusinessFormService; -import com.ruoyi.tc.service.AssetCurrentCpService; -import com.ruoyi.tc.service.AssetCurrentService; -import com.ruoyi.tc.service.AssetLcService; -import com.ruoyi.tc.service.AssetSupplyChainCpService; -import com.ruoyi.tc.service.AssetSupplyChainService; -import com.ruoyi.tc.service.AssetTaskService; -import com.ruoyi.tc.service.UnitOtherConcatCpService; -import com.ruoyi.tc.service.UnitOtherConcatService; +import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Optional; import java.util.stream.Collectors; /** @@ -81,7 +59,8 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByDwmcAssetCurrent(part); - for (AssetCurrentCpPo assetCurrentResponse : list) { - assetCurrentResponse.setTaskId(id); - } - assetCurrentCpService.saveBatch(list); - List assetBusinessFormCpResponseList = new ArrayList<>(); - for (AssetCurrentCpPo assetCurrentResponse : list) { - //新增新监管业务形态 - //根据资产id查询新监管业务形态主表id - List bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); - if (bussList != null) { - for (AssetBusinessFormCpPo assetBusinessFormCpResponse : bussList) { - if (assetCurrentResponse.getXjgywxt() != null) { - assetCurrentResponse.getXjgywxt().setAssetId(assetBusinessFormCpResponse.getAssetId()); - assetCurrentResponse.getXjgywxt().setTaskId(id); - assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt()); + // 遍历资产类型字段 + String[] assetParts = assetTask.getType().split(","); + for (String assetPart : assetParts) { + if (assetPart.equals("0")) { + //遍历单位 + String[] parts = assetTask.getDwmc().split(","); + for (String part : parts) { + //根据单位名称查询资产 + List list = assetTaskDao.findByDwmcAssetCurrent(part); + for (AssetCurrentCpPo assetCurrentResponse : list) { + assetCurrentResponse.setTaskId(id); + } + assetCurrentCpService.saveBatch(list); + List assetBusinessFormCpResponseList = new ArrayList<>(); + for (AssetCurrentCpPo assetCurrentResponse : list) { + //新增新监管业务形态 + //根据资产id查询新监管业务形态主表id + List bussList = assetBusinessFormCpService.findByassetId(assetCurrentResponse.getId()); + if (bussList != null) { + for (AssetBusinessFormCpPo assetBusinessFormCpResponse : bussList) { + if (assetCurrentResponse.getXjgywxt() != null) { + assetCurrentResponse.getXjgywxt().setAssetId(assetBusinessFormCpResponse.getAssetId()); + assetCurrentResponse.getXjgywxt().setTaskId(id); + assetBusinessFormCpResponseList.add(assetCurrentResponse.getXjgywxt()); + } + } + assetBusinessFormCpService.saveBatch(assetBusinessFormCpResponseList); + } + //根据资产id查询供应链主表id- + List supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); + if (supplyChainList != null) { + for (AssetSupplyChainCpPo items : supplyChainList) { + items.setAssetId(assetCurrentResponse.getId()); + items.setSupplyId(items.getSupplyId()); + items.setTaskId(id); + //新增供应链 + } + assetSupplyChainCpService.saveBatch(supplyChainList); + } + List BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); + if (BasicNetworkCpList != null) { + for (AssetBasicNetworkCpPo items : BasicNetworkCpList) { + //根据资产id查询基础网络主表id + items.setAssetId(assetCurrentResponse.getId()); + items.setNetworkId(items.getNetworkId()); + items.setTaskId(id); + //新增基础网络 + } + assetBasicNetworkCpService.saveBatch(BasicNetworkCpList); + } + List unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); + if (unitOtherConcatList != null) { + for (UnitOtherConcatCpPo items : unitOtherConcatList) { + //根据资产id查询其他联系人主表id + items.setAssetId(assetCurrentResponse.getId()); + items.setConcatId(items.getConcatId()); + items.setTaskId(id); + //新增其他联系人 + } + unitOtherConcatCpService.saveBatch(unitOtherConcatList); } } - assetBusinessFormCpService.saveBatch(assetBusinessFormCpResponseList); } - //根据资产id查询供应链主表id- - List supplyChainList = assetSupplyChainCpService.findByassetId(assetCurrentResponse.getId()); - if (supplyChainList != null) { - for (AssetSupplyChainCpPo items : supplyChainList) { - items.setAssetId(assetCurrentResponse.getId()); - items.setSupplyId(items.getSupplyId()); - items.setTaskId(id); - //新增供应链 - } - assetSupplyChainCpService.saveBatch(supplyChainList); + } else if (assetPart.equals("1")) { + //遍历小程序资产单位 + String[] parts = assetTask.getDwmc().split(","); + for (String part : parts) { + //根据单位名称查询资产 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ssdw", part); + queryWrapper.eq("isbf", 0); + List list = assetMiniProgramsService.list(queryWrapper); + List miniProgramsNewList = list.stream() + .map(cpPo -> { + AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo(); + assetMiniProgramsCpPo.setTaskId(id); + assetMiniProgramsCpPo.setStatus(0); + assetMiniProgramsCpPo.setAssetId(cpPo.getId()); + BeanUtils.copyProperties(cpPo, assetMiniProgramsCpPo); // 复制属性 + return assetMiniProgramsCpPo; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetMiniProgramsCpService.saveBatch(miniProgramsNewList); } - List BasicNetworkCpList = assetBasicNetworkCpService.findByassetId(assetCurrentResponse.getId()); - if (BasicNetworkCpList != null) { - for (AssetBasicNetworkCpPo items : BasicNetworkCpList) { - //根据资产id查询基础网络主表id - items.setAssetId(assetCurrentResponse.getId()); - items.setNetworkId(items.getNetworkId()); - items.setTaskId(id); - //新增基础网络 - } - assetBasicNetworkCpService.saveBatch(BasicNetworkCpList); + } else if (assetPart.equals("2")) { + //遍历公众号资产单位 + String[] parts = assetTask.getDwmc().split(","); + for (String part : parts) { + //根据单位名称查询资产 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ssdw", part); + queryWrapper.eq("isbf", 0); + List list = assetOfficialAccountService.list(queryWrapper); + List officialAccountProgramsNewList = list.stream() + .map(cpPo -> { + AssetOfficialAccountCpPo assetOfficialAccountCpPo = new AssetOfficialAccountCpPo(); + assetOfficialAccountCpPo.setTaskId(id); + assetOfficialAccountCpPo.setStatus(0); + assetOfficialAccountCpPo.setAssetId(cpPo.getId()); + BeanUtils.copyProperties(cpPo, assetOfficialAccountCpPo); // 复制属性 + return assetOfficialAccountCpPo; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetOfficialAccountCpService.saveBatch(officialAccountProgramsNewList); } - List unitOtherConcatList = unitOtherConcatCpService.findByassetId(assetCurrentResponse.getId()); - if (unitOtherConcatList != null) { - for (UnitOtherConcatCpPo items : unitOtherConcatList) { - //根据资产id查询其他联系人主表id - items.setAssetId(assetCurrentResponse.getId()); - items.setConcatId(items.getConcatId()); - items.setTaskId(id); - //新增其他联系人 - } - unitOtherConcatCpService.saveBatch(unitOtherConcatList); + } else if (assetPart.equals("3")) { + //遍历电子邮件资产单位 + String[] parts = assetTask.getDwmc().split(","); + for (String part : parts) { + //根据单位名称查询资产 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ssdw", part); + queryWrapper.eq("isbf", 0); + List list = assetEmailService.list(queryWrapper); + List emailCpNewList = list.stream() + .map(cpPo -> { + AssetEmailCpPo emailCpPo = new AssetEmailCpPo(); + emailCpPo.setTaskId(id); + emailCpPo.setAssetId(cpPo.getId()); + emailCpPo.setStatus(0); + BeanUtils.copyProperties(cpPo, emailCpPo); // 复制属性 + return emailCpPo; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetEmailCpService.saveBatch(emailCpNewList); + } + } else if (assetPart.equals("4")) { + //遍历资产移动应用程序资产单位 + String[] parts = assetTask.getDwmc().split(","); + for (String part : parts) { + //根据单位名称查询资产 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ssdw", part); + queryWrapper.eq("isbf", 0); + List list = assetAppService.list(queryWrapper); + List appCpNewList = list.stream() + .map(cpPo -> { + AssetAppCpPo appCpPo = new AssetAppCpPo(); + appCpPo.setTaskId(id); + appCpPo.setAssetId(cpPo.getId()); + appCpPo.setStatus(0); + BeanUtils.copyProperties(cpPo, appCpPo); // 复制属性 + return appCpPo; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetAppCpService.saveBatch(appCpNewList); } } - } + } } /** @@ -220,6 +356,7 @@ public class AssetTaskServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", assetId); + queryWrapper.eq("task_id", taskId); + return assetMiniProgramsCpService.getOne(queryWrapper); + } + + @Override + public AssetOfficialAccountCpPo officetaskSh(int taskId, int assetId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", assetId); + queryWrapper.eq("task_id", taskId); + return assetOfficialAccountCpService.getOne(queryWrapper); + } + + @Override + public AssetEmailCpPo emailtaskSh(int taskId, int assetId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", assetId); + queryWrapper.eq("task_id", taskId); + return assetEmailCpService.getOne(queryWrapper); + } + + @Override + public AssetAppCpPo apptaskSh(int taskId, int assetId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", assetId); + queryWrapper.eq("task_id", taskId); + return assetAppCpService.getOne(queryWrapper); } @Override public Page zcHc(Page assetTask, AssestTaskXqRequest pageRequest) { assetTask.setOptimizeCountSql(false); - Page result = assetTaskDao.zcHc(assetTask, pageRequest); + Page result = null; + if (pageRequest.getType().equals("0")) { + result = assetTaskDao.zcHc(assetTask, pageRequest); + } else if (pageRequest.getType().equals("1")) { + result = assetTaskDao.xcxZcHc(assetTask, pageRequest); + } else if (pageRequest.getType().equals("2")) { + result = assetTaskDao.gzhZcHc(assetTask, pageRequest); + } else if (pageRequest.getType().equals("3")) { + result = assetTaskDao.emailZcHc(assetTask, pageRequest); + } else if (pageRequest.getType().equals("4")) { + result = assetTaskDao.appZcHc(assetTask, pageRequest); + } // 确保 records 不为 null if (result.getRecords() == null) { result.setRecords(new ArrayList<>()); // 设置为空数组 @@ -255,69 +437,214 @@ public class AssetTaskServiceImpl extends ServiceImpl list = assetTaskDao.findByTaskId(req.getTaskId()); - // 检查状态 - boolean hasPendingApproval = list.stream().anyMatch(item -> item.getStatus() == 0 || item.getStatus() == 1); - boolean allApproved = list.stream().allMatch(item -> item.getStatus() == 3); - boolean hasExpired = list.stream().anyMatch(item -> item.getDeadstatus() == 6); - boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4); - boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5); + AssetTask finalTask = assetTaskDao.getByTaskId(req.getTaskId()); + //判断当前任务资产是否全部审核完成 + int deadlineCount = Optional.ofNullable(finalTask.getDeadlineCount()).orElse(0); + int count = Optional.ofNullable(finalTask.getCount()).orElse(0); + int totalCount = Optional.ofNullable(finalTask.getTotalCount()).orElse(0); + int ygt = Optional.ofNullable(finalTask.getYgt()).orElse(0); LocalDateTime finishTime = null; - String btgyy=null; - if (hasPendingApproval) { - // 资产状态存在待审批，任务状态为进行中 - taskStatus = 1; - } else if (allApproved && !hasPendingApproval && !hasRejected && !hasExpired) { - // 资产状态全部为已通过中并且全部资产完成时间在任务期限之前 - taskStatus = 2; + if (ygt + count >= totalCount && deadlineCount == 0) { + //关停和通过数量=全部数量并且超期完成数量为0 状态是正常完成 status=2 + finalTask.setTaskStatus(2); finishTime = LocalDateTime.now(); + finalTask.setTaskFinishTime(finishTime); + assetTaskService.update(finalTask); + //同步主表数据 web taskSaveOrDelete(req); - } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) { - // 资产状态全部为已通过，资产完成时间有超期的为超期完成 - taskStatus = 3; + syb(req); + + } else if (deadlineCount + count + ygt >= totalCount && deadlineCount != 0) { + //超期完成和通过数量=全部数量并且超期完成数量不为0 状态是超期完成 status=3 + finalTask.setTaskStatus(3); finishTime = LocalDateTime.now(); + finalTask.setTaskFinishTime(finishTime); + assetTaskService.update(finalTask); + + //同步主表数据 web taskSaveOrDelete(req); - } else if (hasRejected) { - // 审核不通过 - taskStatus = 1; - btgyy=req.getBtgyy(); + syb(req); + } else { + // 状态是进行中 status=1 + finalTask.setTaskStatus(1); + String btgyy = req.getBtgyy(); + assetTaskService.update(finalTask); //修改不通过原因 - assetCurrentCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); - } else if (hased && !hasRejected && !hasExpired) { - //存在已报废并且其他都已完成 且未超期 - taskStatus = 2; - finishTime = LocalDateTime.now(); - taskSaveOrDelete(req); + if (req.getType()==0){ + assetCurrentCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); + }else if(req.getType()==1){ + assetMiniProgramsCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); + }else if(req.getType()==2){ + assetOfficialAccountCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); + }else if(req.getType()==3){ + assetEmailCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); + }else if(req.getType()==4){ + assetAppCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); } - else if(hased && !hasRejected && hasExpired){ - //存在已报废并且其他都已完成 且未超期 - taskStatus = 3; - finishTime = LocalDateTime.now(); - taskSaveOrDelete(req); - } else if (hased && !hasPendingApproval && !allApproved && ! hasExpired && !hasRejected) { - taskStatus = 3; + + + } + return 0; + } + + private void syb(AssetCurrentShRequest req) { + //app 小程序 邮件 公众号 + List appList = assetAppCpService.findByTaskId(req.getTaskId()); + List emailCpPoListList = assetEmailCpService.findByTaskId(req.getTaskId()); + List miniProgramsCpPoListList = assetMiniProgramsCpService.findByTaskId(req.getTaskId()); + List officialAccountCpPoListList = assetOfficialAccountCpService.findByTaskId(req.getTaskId()); + //app + List appidList = appList.stream() + .map(AssetAppCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + if (CollectionUtil.isNotEmpty(appidList)) { + assetAppService.deleteIdList(appidList); + } + //将子表数据复制到主表中 + List appNewList = appList.stream() + .map(cpPo -> { + AssetApp current = new AssetApp(); + BeanUtils.copyProperties(cpPo, current); // 复制属性 + return current; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetAppService.saveBatch(appNewList); + + //邮件 + List emailidList = emailCpPoListList.stream() + .map(AssetEmailCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + if (CollectionUtil.isNotEmpty(emailidList)) { + assetEmailService.deleteIdList(emailidList); + } + //将子表数据复制到主表中 + List emailNewList = appList.stream() + .map(cpPo -> { + AssetEmail current = new AssetEmail(); + BeanUtils.copyProperties(cpPo, current); // 复制属性 + return current; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetEmailService.saveBatch(emailNewList); + + //小程序 + List miniidList = miniProgramsCpPoListList.stream() + .map(AssetMiniProgramsCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + if (CollectionUtil.isNotEmpty(miniidList)) { + assetMiniProgramsService.deleteIdList(miniidList); + } + //将子表数据复制到主表中 + List miniNewList = appList.stream() + .map(cpPo -> { + AssetMiniPrograms current = new AssetMiniPrograms(); + BeanUtils.copyProperties(cpPo, current); // 复制属性 + return current; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetMiniProgramsService.saveBatch(miniNewList); + + + //公众号 + List officialidList = officialAccountCpPoListList.stream() + .map(AssetOfficialAccountCpPo::getAssetId) + .collect(Collectors.toList()); + //删除原有数据 + if (CollectionUtil.isNotEmpty(officialidList)) { + assetOfficialAccountService.deleteIdList(officialidList); + } + //将子表数据复制到主表中 + List officialNewList = appList.stream() + .map(cpPo -> { + AssetOfficialAccount current = new AssetOfficialAccount(); + BeanUtils.copyProperties(cpPo, current); // 复制属性 + return current; // 返回新对象 + }) + .collect(Collectors.toList()); // 收集到列表中 + assetOfficialAccountService.saveBatch(officialNewList); + } + + private void ifCq(AssetCurrentShRequest req, AssetTask assetTask) { + + if (req.getStatus().equals(3)) { + AssetTask newAssetTask = new AssetTask(); + //比较是否超期 + int deadlineStatus = extracted(assetTask); + int deadlineCount = Optional.ofNullable(assetTask.getDeadlineCount()).orElse(0); + int count = Optional.ofNullable(assetTask.getCount()).orElse(0); + BeanUtils.copyProperties(assetTask, newAssetTask); + if (deadlineStatus == 1) { + //超期 + newAssetTask.setDeadlineCount(deadlineCount + 1); + assetTaskService.update(newAssetTask); + } else { + newAssetTask.setCount(count + 1); + assetTaskService.update(newAssetTask); + } + } - //修改主表任务状态 - assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime); - return a; } + //当前时间喝任务截至时间比较 + private int extracted(AssetTask assetTask) { + int status = 0; + // 获取当前时间 + LocalDate now = LocalDate.now(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); + String formattedDateTime = formatter.format(now); + //获取任务截至时间 + String deadLine = assetTask.getTaskDeadline(); + // 转换为 LocalDateTime + LocalDate deadlineDate = LocalDate.parse(deadLine, formatter); + LocalDate currentDate = LocalDate.parse(formattedDateTime, formatter); + if (deadlineDate.isBefore(currentDate)) { + //超期 + status = 1; + } else { + //未超期 + status = 2; + } + return status; + } + + //web private void taskSaveOrDelete(AssetCurrentShRequest req) { // 根据taskid查询五张数据 List currentList = assetCurrentCpService.findByTaskId(req.getTaskId()); @@ -424,4 +751,74 @@ public class AssetTaskServiceImpl extends ServiceImpl taskList(String dwmc) { return assetTaskDao.taskList(dwmc); } -} + + @Override + public void updateYgtByTaskId(Integer taskId, Integer count) { + assetTaskDao.updateYgtByTaskId(taskId, count); + } + + //创建任务流程 + private void getTaskStatus(AssetCurrentShRequest req) { + AssetLc assetLc = new AssetLc(); + int taskStatus = 0; + if (req.getStatus() == 3) { + assetLc.setTaskId(req.getTaskId()); + assetLc.setXfTime(LocalDateTime.now()); + assetLc.setAssetName("管理员审核通过" + req.getXtmc()); + assetLcService.insert(assetLc); + } else if (req.getStatus() == 4) { + assetLc.setTaskId(req.getTaskId()); + assetLc.setAssetName("管理员审核不通过" + req.getXtmc()); + assetLc.setXfTime(LocalDateTime.now()); + assetLcService.insert(assetLc); + } + + } + + + // //单位端资产审核，更新任务表状态 + // //查询当前任务下的所有资产状态和完成时间 + // List list = assetTaskDao.findByTaskId(req.getTaskId()); + // // 检查状态 + // boolean hasPendingApproval = list.stream().anyMatch(item -> item.getStatus() == 0 || item.getStatus() == 1); + // boolean allApproved = list.stream().allMatch(item -> item.getStatus() == 3); + // boolean hasExpired = list.stream().anyMatch(item -> item.getDeadstatus() == 6); + // boolean hasRejected = list.stream().anyMatch(item -> item.getStatus() == 4); + // boolean hased = list.stream().anyMatch(item -> item.getStatus() == 5); + // LocalDateTime finishTime = null; + // String btgyy = null; + // if (hasPendingApproval) { + // // 资产状态存在待审批，任务状态为进行中 + // taskStatus = 1; + // } else if (allApproved && !hasPendingApproval && !hasRejected && !hasExpired) { + // // 资产状态全部为已通过中并且全部资产完成时间在任务期限之前 + // taskStatus = 2; + // finishTime = LocalDateTime.now(); + // taskSaveOrDelete(req); + // } else if (allApproved && !hasPendingApproval && !hasRejected && hasExpired) { + // // 资产状态全部为已通过，资产完成时间有超期的为超期完成 + // taskStatus = 3; + // finishTime = LocalDateTime.now(); + // taskSaveOrDelete(req); + // } else if (hasRejected) { + // // 审核不通过 + // taskStatus = 1; + // btgyy = req.getBtgyy(); + // //修改不通过原因 + // assetCurrentCpService.updateByAssetId(req.getAssetId(), req.getTaskId(), btgyy); + // } else if (hased && !hasRejected && !hasExpired) { + // //存在已报废并且其他都已完成 且未超期 + // taskStatus = 2; + // finishTime = LocalDateTime.now(); + // taskSaveOrDelete(req); + // } else if (hased && !hasRejected && hasExpired) { + // //存在已报废并且其他都已完成 且未超期 + // taskStatus = 3; + // finishTime = LocalDateTime.now(); + // taskSaveOrDelete(req); + // } else if (hased && !hasPendingApproval && !allApproved && !hasExpired && !hasRejected) { + // taskStatus = 3; + // } + // //修改主表任务状态 + // assetTaskDao.updateByTaskId(taskStatus, req.getTaskId(), finishTime); +} \ No newline at end of file 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 0fb9f6d..a365ffb 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 @@ -130,4 +130,9 @@ public class UnitServiceImpl extends ServiceImpl implements Un return baseMapper.selectAllUnit(req); } + @Override + public Integer findBydwmc(String part) { + return baseMapper.findBydwmc(part); + } + } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml index 8b9d0ab..1e847a5 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml @@ -6,6 +6,13 @@ set del_flag = '2' where id = #{id} + + DELETE FROM asset_app + WHERE id IN + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml index 005d903..61aa4bc 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml @@ -4,7 +4,7 @@ update asset_basic_network set del_flag = '2' where asset_id = #{id} - + DELETE FROM asset_basic_network WHERE asset_id IN diff --git a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml index d9721de..d1d6cc7 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml @@ -458,4 +458,10 @@ order by a.create_time + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml index 6551e3c..d7c82c5 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml @@ -6,6 +6,13 @@ set del_flag = '2' where id = #{id} + + DELETE FROM asset_email + WHERE id IN + + #{id} + + + diff --git a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml index a615a01..adf6d1b 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml @@ -6,6 +6,13 @@ set del_flag = '2' where id = #{id} + + DELETE FROM asset_mini_programs + WHERE id IN + + #{id} + + + + diff --git a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml index a58ee7b..8b56f72 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml @@ -6,7 +6,18 @@ set del_flag = '2' where id = #{id} - + + DELETE FROM asset_official_account + WHERE id IN + + #{id} + + + SELECT dwmc, - COUNT(*) AS total, - SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, - SUM(CASE WHEN status = 3 or status = 5 THEN 1 ELSE 0 END) AS checked, + SUM(total) AS total, + SUM(notChecked) AS notChecked, + SUM(checked) AS checked, ROUND( CASE - WHEN COUNT(*) > 0 THEN - SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) * 100 / COUNT(*) + WHEN SUM(total) > 0 THEN + SUM(notChecked) * 100 / SUM(total) ELSE 0 END, 2) AS checkedRatio + FROM ( + SELECT + dwmc , + COUNT(*) AS total, + SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, + SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked FROM asset_current_cp @@ -267,12 +274,95 @@ GROUP BY dwmc + UNION ALL + + SELECT + ssdw AS dwmc, + COUNT(*) AS total, + SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, + SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked + FROM + asset_mini_programs_cp + + + and ssdw like concat('%',#{req.ssdw},'%') + + + + and task_id =#{req.taskId} + + + GROUP BY + ssdw + + UNION ALL + + SELECT + ssdw AS dwmc, + COUNT(*) AS total, + SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, + SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked + FROM + asset_app_cp + + + and ssdw like concat('%',#{req.ssdw},'%') + + + + and task_id =#{req.taskId} + + + GROUP BY + ssdw + UNION ALL + SELECT + ssdw AS dwmc, + COUNT(*) AS total, + SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, + SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked + FROM + asset_official_account_cp + + + and ssdw like concat('%',#{req.ssdw},'%') + + + + and task_id =#{req.taskId} + + + GROUP BY + ssdw + UNION ALL + SELECT + ssdw AS dwmc, + COUNT(*) AS total, + SUM(CASE WHEN status = 0 THEN 1 ELSE 0 END) AS notChecked, + SUM(CASE WHEN status = 3 OR status = 5 THEN 1 ELSE 0 END) AS checked + FROM + asset_email_cp + + + and ssdw like concat('%',#{req.ssdw},'%') + + + + and task_id =#{req.taskId} + + + GROUP BY + ssdw + ) AS combined_results + GROUP BY + dwmc + + + + + + + + + update asset_mini_programs_cp + + + status = #{req.status}, + + update_time=now() + + where asset_id = #{req.assetId} and task_id = #{req.taskId} + + + + update asset_official_account_cp + + + status = #{req.status}, + + update_time=now() + + where asset_id = #{req.assetId} and task_id = #{req.taskId} + + + + update asset_email_cp + + + status = #{req.status}, + + update_time=now() + + where asset_id = #{req.assetId} and task_id = #{req.taskId} + + 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) + version, reamark,type,total_count,count,deadline_count,ygt) values (#{taskName}, #{taskTime}, #{taskDeadline}, #{taskFinishTime}, #{taskStatus}, #{dwmc}, #{createId}, #{createBy}, #{createTime}, #{updateId}, #{updateBy}, #{updateTime}, #{userId}, #{deptId}, - #{version}, #{reamark}) + #{version}, #{reamark},#{type},#{totalCount},#{count},#{deadlineCount},#{ygt}) @@ -385,6 +625,19 @@ reamark = #{reamark}, + + count = #{count}, + + + total_count = #{totalCount}, + + + deadline_count = #{deadlineCount}, + + + + ygt = #{ygt}, + where id = #{id} @@ -412,6 +665,20 @@ where id =#{taskId} + + update asset_app_cp + + + status = #{req.status}, + + update_time=now() + + where asset_id = #{req.assetId} and task_id = #{req.taskId} + + + + update asset_task set ygt=#{count} where id =#{taskId} + diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 3dba46c..66ff94b 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -1,11 +1,11 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -50,12 +50,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - + + + + + + @@ -64,16 +64,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - - - - - - - - - - + + + + + + + + + + @@ -85,7 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - update unit_info set del_flag = '2' where id = #{id} + update unit_info + set del_flag = '2' + where id = #{id} - update sys_user set del_flag = '2' where user_name = #{userNames} + update sys_user + set del_flag = '2' + where user_name = #{userNames} \ No newline at end of file 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 04cab7d..5d83220 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -115,7 +115,7 @@ public class SecurityConfig // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() -// .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll() + .antMatchers("/unit/assetTask/**","/tc/**","/unit/assetLc/**","/tc/unit/**").permitAll() // 除上面外的所有请求全部需要鉴权认证 .antMatchers("/tc/without/**").permitAll() .anyRequest().authenticated();