From b16a2ff89fc277360ff3dff7caf17ed49d7c29cc Mon Sep 17 00:00:00 2001 From: dongdingding <207595406@qq.com> Date: Wed, 15 Jan 2025 21:20:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E5=8F=AF=E5=9C=A8?= =?UTF-8?q?=E8=B5=84=E4=BA=A7=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E8=B5=84=E4=BA=A7=E6=89=80=E5=B1=9E=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=EF=BC=8C=E5=B9=B6=E5=90=8C=E6=AD=A5=E8=87=B3?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/tc/baseClass/BaseClass.java | 3 +- .../tc/controller/AssetCurrentController.java | 69 +++++----- .../tc/controller/AssetEmailController.java | 54 ++++---- .../AssetMiniProgramsController.java | 64 +++++----- .../AssetOfficialAccountController.java | 86 +++++++------ .../tc/controller/AssetTaskController.java | 21 +++- .../entity/history/AssetCurrentHistory.java | 2 +- .../com/ruoyi/tc/mapper/AssetAppCpMapper.java | 9 +- .../tc/mapper/AssetBusinessFormCpMapper.java | 2 +- .../ruoyi/tc/mapper/AssetCurrentCpMapper.java | 10 ++ .../ruoyi/tc/mapper/AssetEmailCpMapper.java | 11 +- .../tc/mapper/AssetMiniProgramsCpMapper.java | 10 +- .../mapper/AssetOfficialAccountCpMapper.java | 13 +- .../com/ruoyi/tc/mapper/AssetTaskMapper.java | 4 +- .../ruoyi/tc/service/AssetAppCpService.java | 5 +- .../service/AssetBusinessFormCpService.java | 2 +- .../tc/service/AssetCurrentCpService.java | 8 ++ .../ruoyi/tc/service/AssetCurrentService.java | 7 +- .../ruoyi/tc/service/AssetEmailCpService.java | 5 +- .../service/AssetMiniProgramsCpService.java | 5 +- .../AssetOfficialAccountCpService.java | 6 +- .../ruoyi/tc/service/AssetTaskService.java | 3 +- .../service/impl/AssetAppCpServiceImpl.java | 4 +- .../tc/service/impl/AssetAppServiceImpl.java | 41 +++--- .../impl/AssetBusinessFormCpServiceImpl.java | 2 +- .../impl/AssetCurrentCpServiceImpl.java | 5 +- .../service/impl/AssetCurrentServiceImpl.java | 5 +- .../service/impl/AssetEmailCpServiceImpl.java | 6 +- .../service/impl/AssetEmailServiceImpl.java | 30 ++--- .../impl/AssetMiniProgramsCpServiceImpl.java | 6 +- .../impl/AssetMiniProgramsServiceImpl.java | 30 ++--- .../AssetOfficialAccountCpServiceImpl.java | 6 +- .../impl/AssetOfficialAccountServiceImpl.java | 30 ++--- .../tc/service/impl/AssetTaskServiceImpl.java | 119 +++++++++++------- .../main/resources/mapper/AssetTaskDao.xml | 9 +- 35 files changed, 387 insertions(+), 305 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/BaseClass.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/BaseClass.java index e6f0f67..62e46ce 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/BaseClass.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/baseClass/BaseClass.java @@ -1,6 +1,7 @@ package com.ruoyi.tc.baseClass; import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.FieldStrategy; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; @@ -44,7 +45,7 @@ public class BaseClass { * 更新时间 */ @ApiModelProperty("更新时间") - @TableField(fill = FieldFill.INSERT_UPDATE) + @TableField(updateStrategy = FieldStrategy.IGNORED) @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updateTime; diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java index 0939376..4313a1f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java @@ -27,10 +27,9 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.Serializable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.*; /** * 现有资产表(AssetCurrent)表控制层 @@ -386,7 +385,7 @@ public class AssetCurrentController extends BaseController { a1.add(acomma); }); byId.setGlymList(a1); - }else { + } else { byId.setGlymList(new ArrayList<>()); } List a2 = new ArrayList<>(); @@ -397,7 +396,7 @@ public class AssetCurrentController extends BaseController { a2.add(acomma); }); byId.setGlIpList(a2); - }else { + } else { byId.setGlIpList(new ArrayList<>()); } return success(byId); @@ -519,25 +518,7 @@ public class AssetCurrentController extends BaseController { @PreAuthorize("@ss.hasAnyRoles('admin,common')") @PutMapping public AjaxResult update(@RequestBody @Valid AssetCurrent assetCurrent) { - //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 - List currentCpPo = assetCurrentCpService.findDwmc(assetCurrent.getId()); - if (currentCpPo != null) { - for (AssetCurrentCpPo s:currentCpPo) { - //查询任务是否为进行中 - AssetTask assetTask = assetTaskService.findByTaskId(s.getTaskId()); - if (assetTask.getTaskStatus().equals(1)){ - if (s.getStatus()==5 ){ - //修改任务中资产状态 - s.setStatus(0); - s.setBfyy(null); - assetTask.setTaskStatus(1); - assetTaskService.update(assetTask); - assetCurrentCpService.updateById(s); - } - } - } - } List list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrent.getDwmc()).eq(Unit::getDelFlag, 0).list(); if (list == null || list.isEmpty()) { throw new ServiceException("请选择已有单位!"); @@ -564,7 +545,9 @@ public class AssetCurrentController extends BaseController { }); } assetCurrent.setGlIp(b.toString()); - + if (!assetCurrent.getXtzt().equals("7")) { + assetCurrent.setBtgyy(null); + } assetCurrentService.updateById(assetCurrent); @@ -684,22 +667,28 @@ public class AssetCurrentController extends BaseController { unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); } }); - //根据修改的单位名称查询任务表中是否有此单位的任务，如果有修改资产中的任务id，如果没有删除 - AssetTask assetTask = assetTaskService.findByDwmc(assetCurrent.getDwmc()); - if (assetTask == null) { - delete(assetCurrent); - } else { - //根据资产id查询旧资产 - List assetCurrentCpPo = assetCurrentCpService.findDwmc(assetCurrent.getId()); - for (AssetCurrentCpPo s:assetCurrentCpPo){ - if (s!=null){ - s.setDwmc(assetCurrent.getDwmc()); - s.setTaskId(assetTask.getId()); - //修改 - assetCurrentCpService.updateById(s); - } - } + //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 + List currentCpPo = assetCurrentCpService.findDwmc(assetCurrent.getId()); + if (currentCpPo != null) { + for (AssetCurrentCpPo s : currentCpPo) { + //查询任务是否为进行中 + AssetTask assetTask = assetTaskService.findByTaskId(s.getTaskId()); + if (assetTask != null) { + if (assetTask.getTaskStatus().equals(1)) { + //修改任务中资产状态 + s.setStatus(0); + s.setBfyy(null); + s.setBtgyy(null); + assetTask.setTaskStatus(1); + assetTaskService.update(assetTask); + s.setCurrentId(s.getCurrentId()); + s.setUpdateTime(null); + assetCurrentCpService.updateById(s); + } + } + + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java index c6855cb..88355b7 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java @@ -12,16 +12,14 @@ import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.tc.entity.AssetEmail; import com.ruoyi.tc.entity.AssetTask; -import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.Unit; +import com.ruoyi.tc.entity.po.AssetCurrentCpPo; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; import com.ruoyi.tc.entity.po.AssetEmailJyPo; import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetEmailPageRequest; import com.ruoyi.tc.service.*; -import com.ruoyi.tc.service.AssetEmailJyService; -import com.ruoyi.tc.service.AssetEmailService; -import com.ruoyi.tc.service.UnitService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -32,6 +30,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; import java.util.List; /** @@ -60,6 +61,7 @@ public class AssetEmailController extends BaseController { private AssetTaskService assetTaskService; @Resource private AssetEmailCpService assetEmailCpService; + /** * 分页查询 * @@ -83,6 +85,7 @@ public class AssetEmailController extends BaseController { } //================================================= + /** * 单位自编辑进行校验 */ @@ -97,9 +100,8 @@ public class AssetEmailController extends BaseController { } - - AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw,assetEmailJyPo.getSsdw()) - .eq(AssetEmailJyPo::getDzyxhz,assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one(); + AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw, assetEmailJyPo.getSsdw()) + .eq(AssetEmailJyPo::getDzyxhz, assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one(); assetEmailJyPo.setAuditState("1"); assetEmailJyPo.setAuditYy(null); if (one != null) { @@ -107,8 +109,8 @@ public class AssetEmailController extends BaseController { assetEmailJyPo.setAssetId(one.getAssetId()); assetEmailJyService.updateById(assetEmailJyPo); } else { - assetEmailJyPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw,assetEmailJyPo.getSsdw()) - .eq(AssetEmail::getDzyxhz,assetEmailJyPo.getDzyxhz()).one().getId()); + assetEmailJyPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, assetEmailJyPo.getSsdw()) + .eq(AssetEmail::getDzyxhz, assetEmailJyPo.getDzyxhz()).one().getId()); assetEmailJyService.save(assetEmailJyPo); } return success(); @@ -162,7 +164,7 @@ public class AssetEmailController extends BaseController { //通过数据同步 if ("2".equals(as.getAuditState())) { AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId()); - AssetEmail aa = new AssetEmail(); + AssetEmail aa = new AssetEmail(); BeanUtil.copyProperties(byId, aa); aa.setId(byId.getAssetId()); //修改主表 @@ -172,7 +174,7 @@ public class AssetEmailController extends BaseController { .isNotNull(AssetEmailJyPo::getTaskId) .ne(AssetEmailJyPo::getStatus, 5) .eq(AssetEmailJyPo::getAssetId, byId.getAssetId()).one(); - if(one!=null){ + if (one != null) { Integer status = one.getStatus(); Integer taskId = one.getTaskId(); Long appId = one.getEmailId(); @@ -224,23 +226,29 @@ public class AssetEmailController extends BaseController { @Log(title = "编辑email数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AssetEmail assetEmail) { + assetEmailService.edit(assetEmail); //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 - AssetEmailCpPo assetEmailCpPo = assetEmailCpService.findDwmc(assetEmail.getId()); + List assetEmailCpPo = assetEmailCpService.findDwmc(assetEmail.getId()); if (assetEmailCpPo != null) { - //查询任务是否为进行中 - AssetTask assetTask = assetTaskService.findByTaskId(assetEmailCpPo.getTaskId()); - if (assetTask.getTaskStatus().equals(1)) { - if (assetEmailCpPo.getStatus()==5 ) { + for (AssetEmailCpPo s : assetEmailCpPo) { + //查询任务是否为进行中 + AssetTask assetTask = assetTaskService.findByTaskId(s.getTaskId()); + if (assetTask.getTaskStatus().equals(1)) { //修改任务中资产状态 - assetEmailCpPo.setStatus(0); - assetEmailCpPo.setBfyy(null); + s.setStatus(0); + s.setBfyy(null); + s.setBtgyy(null); assetTask.setTaskStatus(1); + + s.setUpdateTime(null); assetTaskService.update(assetTask); - assetEmailCpService.updateById(assetEmailCpPo); + s.setEmailId(s.getEmailId()); + assetEmailCpService.updateById(s); + } } } - return success(assetEmailService.edit(assetEmail)); + return success(); } /** @@ -291,13 +299,13 @@ public class AssetEmailController extends BaseController { ExcelUtil util = new ExcelUtil<>(AssetEmail.class); List list = util.importExcel(file.getInputStream()); if (list != null) { - list.forEach(x->{ + list.forEach(x -> { AssetEmail one = assetEmailService.lambdaQuery().eq(AssetEmail::getDzyxhz, x.getDzyxhz()) .eq(AssetEmail::getSsdw, x.getSsdw()).one(); - if(one!=null){ + if (one != null) { x.setId(one.getId()); assetEmailService.edit(x); - }else { + } else { assetEmailService.add(x); } }); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java index 4b2065b..f8cf4e0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java @@ -10,23 +10,15 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.AssetEmail; import com.ruoyi.tc.entity.AssetMiniPrograms; import com.ruoyi.tc.entity.AssetTask; -import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.Unit; -import com.ruoyi.tc.entity.po.AssetAppCpPo; -import com.ruoyi.tc.entity.po.AssetAppJyPo; -import com.ruoyi.tc.entity.po.AssetEmailJyPo; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo; import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest; import com.ruoyi.tc.service.*; -import com.ruoyi.tc.service.AssetMiniProgramsJyService; -import com.ruoyi.tc.service.AssetMiniProgramsService; -import com.ruoyi.tc.service.UnitService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -37,6 +29,9 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.Date; import java.util.List; /** @@ -66,6 +61,7 @@ public class AssetMiniProgramsController extends BaseController { @Resource private UnitService unitService; + /** * 分页查询 * @@ -89,6 +85,7 @@ public class AssetMiniProgramsController extends BaseController { } //================================================= + /** * 单位自编辑进行校验 */ @@ -102,10 +99,8 @@ public class AssetMiniProgramsController extends BaseController { } - - - AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw,assetMiniProgramsJyPo.getSsdw()) - .eq(AssetMiniProgramsJyPo::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).isNull(AssetMiniProgramsJyPo::getTaskId).one(); + AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw, assetMiniProgramsJyPo.getSsdw()) + .eq(AssetMiniProgramsJyPo::getXcxmc, assetMiniProgramsJyPo.getXcxmc()).isNull(AssetMiniProgramsJyPo::getTaskId).one(); assetMiniProgramsJyPo.setAuditState("1"); assetMiniProgramsJyPo.setAuditYy(null); if (one != null) { @@ -113,8 +108,8 @@ public class AssetMiniProgramsController extends BaseController { assetMiniProgramsJyPo.setAssetId(one.getAssetId()); assetMiniProgramsJyService.updateById(assetMiniProgramsJyPo); } else { - assetMiniProgramsJyPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw,assetMiniProgramsJyPo.getSsdw()) - .eq(AssetMiniPrograms::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).one().getId()); + assetMiniProgramsJyPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniProgramsJyPo.getSsdw()) + .eq(AssetMiniPrograms::getXcxmc, assetMiniProgramsJyPo.getXcxmc()).one().getId()); assetMiniProgramsJyService.save(assetMiniProgramsJyPo); } return success(); @@ -168,7 +163,7 @@ public class AssetMiniProgramsController extends BaseController { //通过数据同步 if ("2".equals(as.getAuditState())) { AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId()); - AssetMiniPrograms aa = new AssetMiniPrograms(); + AssetMiniPrograms aa = new AssetMiniPrograms(); BeanUtil.copyProperties(byId, aa); aa.setId(byId.getAssetId()); //修改主表 @@ -178,7 +173,7 @@ public class AssetMiniProgramsController extends BaseController { .isNotNull(AssetMiniProgramsJyPo::getTaskId) .ne(AssetMiniProgramsJyPo::getStatus, 5) .eq(AssetMiniProgramsJyPo::getAssetId, byId.getAssetId()).one(); - if(one!=null){ + if (one != null) { Integer taskId = one.getTaskId(); Long appId = one.getMiniId(); Integer status = one.getStatus(); @@ -233,18 +228,25 @@ public class AssetMiniProgramsController extends BaseController { public AjaxResult edit(@RequestBody AssetMiniPrograms assetMiniPrograms) { //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 - AssetMiniProgramsCpPo assetMiniProgramsCpPo = assetMiniProgramsCpService.findDwmc(assetMiniPrograms.getId()); + List assetMiniProgramsCpPo = assetMiniProgramsCpService.findDwmc(assetMiniPrograms.getId()); if (assetMiniProgramsCpPo != null) { - //查询任务是否为进行中 - AssetTask assetTask = assetTaskService.findByTaskId(assetMiniProgramsCpPo.getTaskId()); - if (assetTask.getTaskStatus().equals(1)) { - if (assetMiniProgramsCpPo.getStatus()==5) { - //修改任务中资产状态 - assetMiniProgramsCpPo.setStatus(0); - assetMiniProgramsCpPo.setBfyy(null); - assetTask.setTaskStatus(1); - assetMiniProgramsCpService.updateById(assetMiniProgramsCpPo); - assetTaskService.update(assetTask); + for (AssetMiniProgramsCpPo s : assetMiniProgramsCpPo) { + //查询任务是否为进行中 + AssetTask assetTask = assetTaskService.findByTaskId(s.getTaskId()); + if (assetTask != null) { + if (assetTask.getTaskStatus().equals(1)) { + //修改任务中资产状态 + s.setStatus(0); + s.setBfyy(null); + s.setBtgyy(null); + + s.setUpdateTime(null); + assetTask.setTaskStatus(1); + s.setMiniId(s.getMiniId()); + assetMiniProgramsCpService.updateById(s); + assetTaskService.update(assetTask); + + } } } } @@ -299,13 +301,13 @@ public class AssetMiniProgramsController extends BaseController { ExcelUtil util = new ExcelUtil<>(AssetMiniPrograms.class); List list = util.importExcel(file.getInputStream()); if (list != null) { - list.forEach(x->{ + list.forEach(x -> { AssetMiniPrograms one = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, x.getSsdw()) .eq(AssetMiniPrograms::getXcxmc, x.getXcxmc()).one(); - if(one!=null){ + if (one != null) { x.setId(one.getId()); assetMiniProgramsService.edit(x); - }else { + } else { assetMiniProgramsService.add(x); } }); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java index b834fad..6b19d10 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java @@ -9,23 +9,16 @@ import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.tc.entity.AssetEmail; -import com.ruoyi.tc.entity.AssetMiniPrograms; import com.ruoyi.tc.entity.AssetOfficialAccount; +import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.Unit; -import com.ruoyi.tc.entity.po.AssetAppJyPo; -import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo; +import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo; -import com.ruoyi.tc.entity.AssetTask; -import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetOfficialAccountMenu; import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest; import com.ruoyi.tc.service.*; -import com.ruoyi.tc.service.AssetOfficialAccountJyService; -import com.ruoyi.tc.service.AssetOfficialAccountService; -import com.ruoyi.tc.service.UnitService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -36,8 +29,10 @@ import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; -import java.security.Security; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Objects; @@ -107,13 +102,13 @@ public class AssetOfficialAccountController { String[] s3 = byId.getCdlx().split("\\|"); for (int i = 0; i < s1.length; i++) { AssetOfficialAccountMenu as = new AssetOfficialAccountMenu(); - if(s1[i]!=null&& !Objects.equals(s1[i], "")){ + if (s1[i] != null && !Objects.equals(s1[i], "")) { as.setCdmc(s1[i]); } - if(s2[i]!=null&& !Objects.equals(s2[i], "")){ + if (s2[i] != null && !Objects.equals(s2[i], "")) { as.setCdlj(s2[i]); } - if(s3[i]!=null&& !Objects.equals(s3[i], "")){ + if (s3[i] != null && !Objects.equals(s3[i], "")) { as.setCdlx(s3[i]); } a1.add(as); @@ -123,6 +118,7 @@ public class AssetOfficialAccountController { } //================================================= + /** * 单位自编辑进行校验 */ @@ -137,20 +133,18 @@ public class AssetOfficialAccountController { } - - if (ao.getCdList() != null && !ao.getCdList().isEmpty()) { StringBuilder a = new StringBuilder(); StringBuilder b = new StringBuilder(); StringBuilder c = new StringBuilder(); ao.getCdList().forEach(x -> { - if(!Objects.equals(x.getCdmc(), "") &&x.getCdmc()!=null){ + if (!Objects.equals(x.getCdmc(), "") && x.getCdmc() != null) { a.append(x.getCdmc()).append("|"); } - if(!Objects.equals(x.getCdlj(), "") &&x.getCdlj()!=null){ + if (!Objects.equals(x.getCdlj(), "") && x.getCdlj() != null) { b.append(x.getCdlj()).append("|"); } - if(!Objects.equals(x.getCdlx(), "") &&x.getCdlx()!=null){ + if (!Objects.equals(x.getCdlx(), "") && x.getCdlx() != null) { c.append(x.getCdlx()).append("|"); } }); @@ -160,8 +154,8 @@ public class AssetOfficialAccountController { } - AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery().eq(AssetOfficialAccountJyPo::getSsdw,ao.getSsdw()) - .eq(AssetOfficialAccountJyPo::getGzhmc,ao.getGzhmc()).isNull(AssetOfficialAccountJyPo::getTaskId).one(); + AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery().eq(AssetOfficialAccountJyPo::getSsdw, ao.getSsdw()) + .eq(AssetOfficialAccountJyPo::getGzhmc, ao.getGzhmc()).isNull(AssetOfficialAccountJyPo::getTaskId).one(); ao.setAuditState("1"); ao.setAuditYy(null); if (one != null) { @@ -169,8 +163,8 @@ public class AssetOfficialAccountController { ao.setAssetId(one.getAssetId()); assetOfficialAccountJyService.updateById(ao); } else { - ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw,ao.getSsdw()) - .eq(AssetOfficialAccount::getGzhmc,ao.getGzhmc()).one().getId()); + ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, ao.getSsdw()) + .eq(AssetOfficialAccount::getGzhmc, ao.getGzhmc()).one().getId()); assetOfficialAccountJyService.save(ao); } return success(); @@ -211,13 +205,13 @@ public class AssetOfficialAccountController { String[] s3 = byId.getCdlx().split("\\|"); for (int i = 0; i < s1.length; i++) { AssetOfficialAccountMenu as = new AssetOfficialAccountMenu(); - if(s1[i]!=null&& !Objects.equals(s1[i], "")){ + if (s1[i] != null && !Objects.equals(s1[i], "")) { as.setCdmc(s1[i]); } - if(s2[i]!=null&& !Objects.equals(s2[i], "")){ + if (s2[i] != null && !Objects.equals(s2[i], "")) { as.setCdlj(s2[i]); } - if(s3[i]!=null&& !Objects.equals(s3[i], "")){ + if (s3[i] != null && !Objects.equals(s3[i], "")) { as.setCdlx(s3[i]); } a1.add(as); @@ -243,7 +237,7 @@ public class AssetOfficialAccountController { //通过数据同步 if ("2".equals(as.getAuditState())) { AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId()); - AssetOfficialAccount aa = new AssetOfficialAccount(); + AssetOfficialAccount aa = new AssetOfficialAccount(); BeanUtil.copyProperties(byId, aa); aa.setId(byId.getAssetId()); //修改主表 @@ -253,7 +247,7 @@ public class AssetOfficialAccountController { .isNotNull(AssetOfficialAccountJyPo::getTaskId) .ne(AssetOfficialAccountJyPo::getStatus, 5) .eq(AssetOfficialAccountJyPo::getAssetId, byId.getAssetId()).one(); - if(one!=null){ + if (one != null) { Integer status = one.getStatus(); Integer taskId = one.getTaskId(); Long appId = one.getAccountId(); @@ -294,18 +288,28 @@ public class AssetOfficialAccountController { @PutMapping public AjaxResult edit(@RequestBody AssetOfficialAccount assetOfficialAccount) { //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 - AssetOfficialAccountCpPo assetOfficialAccountCpPo = assetOfficialAccountCpService.findDwmc(assetOfficialAccount.getId()); + List assetOfficialAccountCpPo = assetOfficialAccountCpService.findDwmc(assetOfficialAccount.getId()); if (assetOfficialAccountCpPo != null) { - //查询任务是否为进行中 - AssetTask assetTask = assetTaskService.findByTaskId(assetOfficialAccountCpPo.getTaskId()); - if (assetTask.getTaskStatus().equals(1)) { - if (assetOfficialAccountCpPo.getStatus()==5 ) { - //修改任务中资产状态 - assetOfficialAccountCpPo.setStatus(0); - assetOfficialAccountCpPo.setBtgyy(null); - assetTask.setTaskStatus(1); - assetTaskService.update(assetTask); - assetOfficialAccountCpService.updateById(assetOfficialAccountCpPo); + for (AssetOfficialAccountCpPo s : assetOfficialAccountCpPo) { + + //查询任务是否为进行中 + AssetTask assetTask = assetTaskService.findByTaskId(s.getTaskId()); + if (assetTask != null) { + + if (assetTask.getTaskStatus().equals(1)) { + + //修改任务中资产状态 + s.setStatus(0); + s.setBtgyy(null); + s.setBtgyy(null); + + s.setUpdateTime(null); + assetTask.setTaskStatus(1); + assetTaskService.update(assetTask); + s.setAccountId(s.getAccountId()); + assetOfficialAccountCpService.updateById(s); + + } } } } @@ -360,13 +364,13 @@ public class AssetOfficialAccountController { ExcelUtil util = new ExcelUtil<>(AssetOfficialAccount.class); List list = util.importExcel(file.getInputStream()); if (list != null) { - list.forEach(x->{ + list.forEach(x -> { AssetOfficialAccount one = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, x.getSsdw()) .eq(AssetOfficialAccount::getGzhmc, x.getGzhmc()).one(); - if(one!=null){ + if (one != null) { x.setId(one.getId()); assetOfficialAccountService.edit(x); - }else { + } else { assetOfficialAccountService.add(x); } }); 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 38f1a60..1262c67 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 @@ -577,6 +577,8 @@ public class AssetTaskController extends BaseController { } assetCurrent.setGlIp(b.toString()); assetCurrent.setStatus(1); + Date date=new Date(); + assetCurrent.setUpdateTime(date); //当审核状态为带待核查 if (assetCurrent.getStatus().equals(1)) { assetLc.setXfTime(LocalDateTime.now()); @@ -618,7 +620,7 @@ public class AssetTaskController extends BaseController { // 获取当前时间 LocalDateTime localDateTime = LocalDateTime.now(); // 转换为 Date - Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); //新增历史记录 StringBuilder c = new StringBuilder(); if (CollectionUtil.isNotEmpty(assetCurrent.getGlymList())) { @@ -959,6 +961,10 @@ public class AssetTaskController extends BaseController { assetLc.setTaskId(assetMiniProgramsJyPo.getTaskId()); assetLc.setAssetName(assetMiniProgramsJyPo.getXcxmc()); assetMiniProgramsJyPo.setStatus(1); + // 获取当前时间 + LocalDateTime localDateTime = LocalDateTime.now(); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + assetMiniProgramsJyPo.setUpdateTime(date); //当审核状态为带待核查 if (assetMiniProgramsJyPo.getStatus().equals(1)) { assetLc.setXfTime(LocalDateTime.now()); @@ -1018,6 +1024,11 @@ public class AssetTaskController extends BaseController { assetLc.setAssetName("单位核查完成提交" + assetOfficialAccountJyPo.getGzhmc()); assetLcService.insert(assetLc); } + // 获取当前时间 + LocalDateTime localDateTime = LocalDateTime.now(); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + + assetOfficialAccountJyPo.setUpdateTime(date); assetOfficialAccountJyService.save(assetOfficialAccountJyPo); //新增历史记录表 AssetOfficialAccountHistory assetOfficialAccountHistory = new AssetOfficialAccountHistory(); @@ -1052,6 +1063,10 @@ public class AssetTaskController extends BaseController { assetLc.setAssetName("单位核查完成提交" + assetAppJyPo.getAppName()); assetLcService.insert(assetLc); } + // 获取当前时间 + LocalDateTime localDateTime = LocalDateTime.now(); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + assetAppJyPo.setUpdateTime(date); assetAppJyService.save(assetAppJyPo); //新增历史记录表 AssetAppHistory assetAppHistory = new AssetAppHistory(); @@ -1086,6 +1101,10 @@ public class AssetTaskController extends BaseController { assetLc.setAssetName("单位核查完成提交" + assetEmailJyPo.getDzyxhz()); assetLcService.insert(assetLc); } + // 获取当前时间 + LocalDateTime localDateTime = LocalDateTime.now(); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + assetEmailJyPo.setUpdateTime(date); assetEmailJyService.save(assetEmailJyPo); //新增历史记录表 AssetEmailHistory assetEmailHistory = new AssetEmailHistory(); diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/history/AssetCurrentHistory.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/history/AssetCurrentHistory.java index 6e9084d..c2ef121 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/history/AssetCurrentHistory.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/history/AssetCurrentHistory.java @@ -877,7 +877,7 @@ public class AssetCurrentHistory extends BaseClass implements Serializable { @ApiModelProperty("数据资产-数据量单位") - @TableField(exist = false) + private String sjzcSjldw; /** * 数据资产-是否为涉密数据 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 index 6c33472..e60dc04 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java @@ -7,8 +7,6 @@ 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)表数据库访问层 * @@ -36,15 +34,16 @@ public interface AssetAppCpMapper extends BaseMapper { @Delete("delete from asset_app_cp where asset_id=#{assetId} ") void deletByAssetId(@Param("assetId") Long assetId); + /** * 根据assetId查询查询数据 * * @param assetId 资产id * @return + * @Param taskId 任务id */ - @Select("select * from asset_app_cp where asset_id=#{assetId}") - AssetAppCpPo findByTaskId(@Param("assetId") int assetId); - + @Select("select * from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId}") + AssetAppCpPo findByTaskId(int assetId, int taskId); /** * 修改不通过原因 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java index 6699354..e4d09e3 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormCpMapper.java @@ -56,6 +56,6 @@ public interface AssetBusinessFormCpMapper extends BaseMapper findByTaskId(@Param("assetId") int assetId, @Param("taskId") int taskId); + AssetBusinessFormCpPo findByTaskId(@Param("assetId") int assetId, @Param("taskId") int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java index 16df571..7a4cb82 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java @@ -72,5 +72,15 @@ public interface AssetCurrentCpMapper extends BaseMapper { @Delete("delete from asset_current_cp where id=#{assetId} ") void deletByAssetId(@Param("assetId") Long assetId); + + + + /** + * 删除 + * @param id + */ + @Delete(" DELETE FROM asset_current_cp " + + " WHERE id =#{id}") + void deleteIdList(@Param("id") Long id); } 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 index ef11460..0a7a9cd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailCpMapper.java @@ -34,16 +34,17 @@ public interface AssetEmailCpMapper extends BaseMapper { @Delete("delete from asset_email_cp where asset_id=#{assetId}") void deletByAssetId(@Param("assetId") Long assetId); + + /** * 根据assetId查询查询数据 * * @param assetId 资产id + * @Param taskId 任务id * @return */ - @Select("select * from asset_email_cp where asset_id=#{assetId}") - AssetEmailCpPo findByTaskId(@Param("assetId") int assetId); - - + @Select("select * from asset_email_cp where asset_id=#{assetId} and task_id =#{taskId}") + AssetEmailCpPo findByTaskId(int assetId,int taskId); /** * 修改不通过原因 * @@ -73,6 +74,6 @@ public interface AssetEmailCpMapper extends BaseMapper { * @return */ @Select(" select * from asset_email_cp where asset_id = #{id} ") - AssetEmailCpPo findDwmc(Long id); + List findDwmc(Long id); } 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 index 201ceac..2586309 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsCpMapper.java @@ -37,16 +37,16 @@ public interface AssetMiniProgramsCpMapper extends BaseMapper findDwmc(Long id); } 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 index 36ba2ce..5474c7b 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountCpMapper.java @@ -7,6 +7,8 @@ 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)表数据库访问层 * @@ -34,16 +36,17 @@ public interface AssetOfficialAccountCpMapper extends BaseMapper findDwmc(Long id); } 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 1cf92c0..0637a29 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetTaskMapper.java @@ -2,7 +2,9 @@ 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.AssetTask; +import com.ruoyi.tc.entity.po.AssetAppCpPo; import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.request.AssestTaskXqRequest; @@ -315,7 +317,7 @@ public interface AssetTaskMapper extends BaseMapper { * @param dwmc 单位名称 * @return */ - AssetTask findByDwmc(@Param("dwmc") String dwmc); + AssetAppCpPo findByDwmc(@Param("dwmc") String dwmc); 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 index c8ae5c5..3230b43 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java @@ -34,12 +34,13 @@ public interface AssetAppCpService extends IService { /** - * 根据资产id查询查询数据 + * 根据assetId查询查询数据 * * @param assetId 资产id + * @Param taskId 任务id * @return */ - AssetAppCpPo findByTaskId(int assetId); + AssetAppCpPo findByTaskId(int assetId,int taskId); /** diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java index 11199f0..aeb697e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormCpService.java @@ -44,7 +44,7 @@ public interface AssetBusinessFormCpService extends IService findByTaskId(int assetId, int taskId); + AssetBusinessFormCpPo findByTaskId(int assetId, int taskId); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java index a30587a..a703e84 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java @@ -69,5 +69,13 @@ public interface AssetCurrentCpService extends IService { * @param assetId 资产id */ void deletByAssetId(Long assetId); + + + /** + * 删除 + * + * @param idList + */ + void deleteIdList(Long idList); } 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 49d0e03..634e0a3 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 @@ -47,12 +47,7 @@ public interface AssetCurrentService extends IService { */ void deleteByUnitIds(Long id); - /** - * 删除 - * - * @param idList - */ - void deleteIdList(Long idList); + /** * 查询所有数据(带子表) 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 index 88c5cba..6767eed 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailCpService.java @@ -36,9 +36,10 @@ public interface AssetEmailCpService extends IService { * 根据assetId查询查询数据 * * @param assetId 资产id + * @Param taskId 任务id * @return */ - AssetEmailCpPo findByTaskId(int assetId); + AssetEmailCpPo findByTaskId(int assetId,int taskId); /** @@ -69,5 +70,5 @@ public interface AssetEmailCpService extends IService { * @param id * @return */ - AssetEmailCpPo findDwmc(Long id); + List findDwmc(Long id); } 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 index c71fec8..b0fc0d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsCpService.java @@ -39,9 +39,10 @@ public interface AssetMiniProgramsCpService extends IService findDwmc(Long id); } 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 index 19aaf9b..189aae8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountCpService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountCpService.java @@ -33,13 +33,15 @@ public interface AssetOfficialAccountCpService extends IService findDwmc(Long id); } 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 e237e47..205eb47 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 @@ -2,6 +2,7 @@ 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.AssetApp; import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.history.*; import com.ruoyi.tc.entity.po.*; @@ -234,7 +235,7 @@ public interface AssetTaskService extends IService { * @param dwmc 单位名称 * @return */ - AssetTask findByDwmc(String dwmc); + AssetAppCpPo findByDwmc(String dwmc); /** * 根据任务id查询数据 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 index 9b553e2..2d61fa8 100644 --- 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 @@ -38,8 +38,8 @@ public class AssetAppCpServiceImpl extends ServiceImpl i private AssetTaskService assetTaskService; - /** * 分页查询所有数据 * @@ -101,7 +102,7 @@ public class AssetAppServiceImpl extends ServiceImpl i List list1 = lambdaQuery().eq(AssetApp::getSsdw, assetApp.getSsdw()) .eq(AssetApp::getAppName, assetApp.getAppName()).list(); - if (list1 != null&& !list1.isEmpty()){ + if (list1 != null && !list1.isEmpty()) { throw new ServiceException("不允许新增重复资产!"); } save(assetApp); @@ -153,21 +154,27 @@ public class AssetAppServiceImpl extends ServiceImpl i assetAppCpService.updateById(x); }); - //根据修改的单位名称查询任务表中是否有此单位的任务，如果有修改资产中的任务id，如果没有删除 - AssetTask assetTask = assetTaskService.findByDwmc(assetApp.getAppName()); - if (assetTask == null) { - assetAppCpService.deletByAssetId(assetApp.getId()); - } else { - //根据资产id查询旧资产 - AssetAppCpPo assetAppCpPo = assetAppCpService.findDwmc(assetApp.getId()); - if (assetAppCpPo!=null){ - assetAppCpPo.setAppName(assetApp.getAppName()); - assetAppCpPo.setTaskId(assetTask.getId()); - assetAppCpPo.setBfyy(null); - //修改 - assetAppCpService.updateById(assetAppCpPo); - } + //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 + AssetAppCpPo assetTask = assetTaskService.findByDwmc(String.valueOf(assetApp.getId())); + if (assetTask != null) { + //查询任务是否为进行中 + AssetTask s = assetTaskService.findByTaskId(Integer.valueOf(assetTask.getTaskId())); + if (s.getTaskStatus().equals(1)) { + //修改任务中资产状态 + assetTask.setStatus(0); + assetTask.setBfyy(null); + assetTask.setBtgyy(null); + LocalDateTime localDateTime = LocalDateTime.now(); + Date date = Date.from(localDateTime.atZone(ZoneId.systemDefault()).toInstant()); + assetTask.setUpdateTime(date); + s.setTaskStatus(1); + assetTask.setAppId(assetTask.getAppId()); + assetAppCpService.updateById(assetTask); + + assetTaskService.update(s); + + } } return true; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java index 21283c6..e803a15 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormCpServiceImpl.java @@ -37,7 +37,7 @@ public class AssetBusinessFormCpServiceImpl extends ServiceImpl findByTaskId(int assetId,int taskId) { + public AssetBusinessFormCpPo findByTaskId(int assetId,int taskId) { return assetBusinessFormCpMapper.findByTaskId(assetId,taskId); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java index 1f3f864..a6d5df9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java @@ -55,7 +55,10 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl findDwmc(Long id) { return assetEmailCpMapper.findDwmc(id); } } 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 c0d9f55..181dbee 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 @@ -153,21 +153,21 @@ public class AssetEmailServiceImpl extends ServiceImpl findDwmc(Long id) { return assetMiniProgramsCpMapper.findDwmc(id); } } 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 7d1088e..7ba0af1 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 @@ -142,21 +142,21 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl findDwmc(Long id) { return assetOfficialAccountCpMapper.findDwmc(id); } } 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 115c60f..a74ff00 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 @@ -198,21 +198,21 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl businessFormCpPo = assetBusinessFormCpService.findByTaskId(req.getAssetId(), req.getTaskId()); - List businessList = businessFormCpPo.stream().map(AssetBusinessFormCpPo::getAssetId).collect(Collectors.toList()); + AssetBusinessFormCpPo businessFormCpPo = assetBusinessFormCpService.findByTaskId(req.getAssetId(), req.getTaskId()); //删除原有数据 - if (CollectionUtil.isNotEmpty(businessList)) { - assetBusinessFormService.deleteIdList(businessList); - + if (businessFormCpPo!=null) { + assetBusinessFormService.deleteIdList(Collections.singletonList(businessFormCpPo.getAssetId())); + //将子表数据复制到主表中 + AssetBusinessForm assetBusinessForm = new AssetBusinessForm(); + BeanUtils.copyProperties(businessFormCpPo, assetBusinessForm); // 复制属性 + assetBusinessForm.setId(null); + assetBusinessFormService.save(assetBusinessForm); }else{ //将子表数据复制到主表中 - List businessFormCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { - AssetBusinessForm assetBusinessForm = new AssetBusinessForm(); - BeanUtils.copyProperties(cpPo, assetBusinessForm); // 复制属性 - assetBusinessForm.setId(null); - return assetBusinessForm; // 返回新对象 - }).collect(Collectors.toList()); - - assetBusinessFormService.saveBatch(businessFormCpPoList); + AssetBusinessForm assetBusinessForm = new AssetBusinessForm(); + BeanUtils.copyProperties(businessFormCpPo, assetBusinessForm); // 复制属性 + assetBusinessForm.setId(null); + assetBusinessFormService.save(assetBusinessForm); } + + //AssetBasicNetworkCpPo List networkCpPo = assetBasicNetworkCpService.findByTaskId(req.getAssetId(), req.getTaskId()); List netWorkList = networkCpPo.stream().map(AssetBasicNetworkCpPo::getAssetId).collect(Collectors.toList()); //删除原有数据 if (CollectionUtil.isNotEmpty(netWorkList)) { assetBasicNetworkService.deleteIdList(netWorkList); - + List networksCpPoList = req.getAssetCurrentCpPo().getJcwlList().stream().map(cpPo -> { + AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork(); + BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性 + assetBasicNetwork.setId(null); + return assetBasicNetwork; // 返回新对象 + }).collect(Collectors.toList()); + assetBasicNetworkService.saveBatch(networksCpPoList); }else{ - List networksCpPoList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { + List networksCpPoList = req.getAssetCurrentCpPo().getJcwlList().stream().map(cpPo -> { AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork(); BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性 assetBasicNetwork.setId(null); @@ -1053,15 +1067,22 @@ public class AssetTaskServiceImpl extends ServiceImpl supplyChainCpPo = assetSupplyChainCpService.findByTaskId(req.getAssetId(), req.getTaskId()); List supplyList = supplyChainCpPo.stream().map(AssetSupplyChainCpPo::getAssetId).collect(Collectors.toList()); //删除原有数据 if (CollectionUtil.isNotEmpty(supplyList)) { assetSupplyChainService.deleteIdList(supplyList); - - }else{ - List supplyChainList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { + List supplyChainList = req.getAssetCurrentCpPo().getGylxxList().stream().map(cpPo -> { + AssetSupplyChain assetSupplyChain = new AssetSupplyChain(); + BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性 + assetSupplyChain.setId(null); + return assetSupplyChain; // 返回新对象 + }).collect(Collectors.toList()); + assetSupplyChainService.saveBatch(supplyChainList); + } else { + List supplyChainList = req.getAssetCurrentCpPo().getGylxxList().stream().map(cpPo -> { AssetSupplyChain assetSupplyChain = new AssetSupplyChain(); BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性 assetSupplyChain.setId(null); @@ -1075,8 +1096,14 @@ public class AssetTaskServiceImpl extends ServiceImpl unitOtherConcatList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { + UnitOtherConcat unitOtherConcat = new UnitOtherConcat(); + BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性 + unitOtherConcat.setConcatId(null); + return unitOtherConcat; // 返回新对象 + }).collect(Collectors.toList()); + unitOtherConcatService.saveBatch(unitOtherConcatList); + } else { List unitOtherConcatList = req.getAssetCurrentCpPo().getOtherConcat().stream().map(cpPo -> { UnitOtherConcat unitOtherConcat = new UnitOtherConcat(); BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性 @@ -1119,7 +1146,7 @@ public class AssetTaskServiceImpl extends ServiceImpl - + @@ -971,7 +969,10 @@ ) AS latest_update_time; +