From 92e082ba4cd5e7e57e4697f84c8f05cc978d7687 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Wed, 4 Dec 2024 20:56:28 +0800 Subject: [PATCH] bugfix --- .../tc/controller/AssetAppController.java | 17 +- .../tc/controller/AssetCurrentController.java | 324 ++++++++++-------- .../tc/controller/AssetEmailController.java | 16 +- .../AssetMiniProgramsController.java | 19 +- .../AssetOfficialAccountController.java | 15 +- .../java/com/ruoyi/tc/mapper/UnitMapper.java | 6 + .../com/ruoyi/tc/service/AssetAppService.java | 17 + .../ruoyi/tc/service/AssetEmailService.java | 16 + .../tc/service/AssetMiniProgramsService.java | 17 + .../service/AssetOfficialAccountService.java | 16 + .../com/ruoyi/tc/service/UnitService.java | 6 + .../tc/service/impl/AssetAppServiceImpl.java | 48 +++ .../service/impl/AssetEmailServiceImpl.java | 56 ++- .../impl/AssetMiniProgramsServiceImpl.java | 47 ++- .../impl/AssetOfficialAccountServiceImpl.java | 56 ++- .../tc/service/impl/UnitServiceImpl.java | 9 + .../src/main/resources/mapper/UnitMapper.xml | 3 + 17 files changed, 524 insertions(+), 164 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java index b5259e4..7c75efd 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java @@ -7,6 +7,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; 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.AssetApp; import com.ruoyi.tc.entity.request.AssetAppPageRequest; @@ -51,6 +52,13 @@ public class AssetAppController extends BaseController { Page page = new Page<>(); page.setCurrent(req.getCurrent()); page.setSize(req.getSize()); + try { + if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) { + req.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName()); + } + } catch (Exception e) { + throw new ServiceException("获取用户信息异常"); + } return success(assetAppService.page(page, req)); } @@ -76,7 +84,8 @@ public class AssetAppController extends BaseController { @PostMapping @Log(title = "新增app数据", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody AssetApp assetApp) { - return success(assetAppService.save(assetApp)); + + return success(assetAppService.add(assetApp)); } /** @@ -89,7 +98,7 @@ public class AssetAppController extends BaseController { @Log(title = "编辑app数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AssetApp assetApp) { - return success(assetAppService.updateById(assetApp)); + return success(assetAppService.edit(assetApp)); } /** @@ -145,9 +154,9 @@ public class AssetAppController extends BaseController { .eq(AssetApp::getAppName, x.getAppName()).one(); if(one!=null){ x.setId(one.getId()); - assetAppService.updateById(x); + assetAppService.edit(x); }else { - assetAppService.save(x); + assetAppService.add(x); } }); } else { 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 bcc3aaa..10e9be2 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 @@ -2,47 +2,22 @@ package com.ruoyi.tc.controller; import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.tc.entity.AssetBasicNetwork; -import com.ruoyi.tc.entity.AssetCurrent; -import com.ruoyi.tc.entity.AssetExport; -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.AssetCurrentCpPo; -import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo; -import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo; +import com.ruoyi.tc.entity.*; +import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; -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.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 io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; @@ -99,6 +74,8 @@ public class AssetCurrentController extends BaseController { @Resource private UnitOtherConcatCpService unitOtherConcatCpService; + @Resource + private UnitService unitService; /** * 分页查询所有数据 @@ -191,46 +168,43 @@ public class AssetCurrentController extends BaseController { // 单位有进行中的任务时，管理端新增该单位下的资产则需同步至当前进行中的任务中。 //获取新增资产id Long id = assetCurrent.getId(); - List assetTasks = assetTaskService.taskList(assetCurrent.getDwmc()); - if (assetTasks != null) { - for (AssetTask assetTask : assetTasks) { - //新增资产复制主表 - AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); - BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo); - assetCurrentCpPo.setTaskId(assetTask.getId()); - assetCurrentCpService.save(assetCurrentCpPo); - //新增新监管业务形态 - //根据资产id查询新监管业务形态主表id - if (assetCurrent.getXjgywxt() != null) { - assetCurrentCpPo.getXjgywxt().setAssetId(id); - assetCurrentCpPo.getXjgywxt().setTaskId(assetTask.getId()); - assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt()); - } - if (assetCurrent.getGylxxList() != null) { - for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) { - items.setAssetId(id); - items.setTaskId(assetTask.getId()); - } - //新增供应链 - assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList()); - } - if (assetCurrent.getJcwlList() != null) { - for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) { - items.setAssetId(assetCurrent.getId()); - items.setTaskId(assetTask.getId()); - } - //新增基础网络 - assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList()); - } - if (assetCurrent.getOtherConcat() != null) { - for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) { - items.setAssetId(assetCurrent.getId()); - items.setTaskId(assetTask.getId()); - } - //新增其他联系人 - unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); - } + Integer i = unitService.selectTaskId(assetCurrent.getDwmc(), "0"); + + //新增资产复制主表 + AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); + BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo); + assetCurrentCpPo.setTaskId(i); + assetCurrentCpService.save(assetCurrentCpPo); + //新增新监管业务形态 + //根据资产id查询新监管业务形态主表id + if (assetCurrent.getXjgywxt() != null) { + assetCurrentCpPo.getXjgywxt().setAssetId(id); + assetCurrentCpPo.getXjgywxt().setTaskId(i); + assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt()); + } + if (assetCurrent.getGylxxList() != null) { + for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) { + items.setAssetId(id); + items.setTaskId(i); } + //新增供应链 + assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList()); + } + if (assetCurrent.getJcwlList() != null) { + for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(i); + } + //新增基础网络 + assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList()); + } + if (assetCurrent.getOtherConcat() != null) { + for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(i); + } + //新增其他联系人 + unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); } return success(); @@ -296,6 +270,62 @@ public class AssetCurrentController extends BaseController { //新增其他联系人 unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat()); } + //================================ + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("id", assetCurrent.getId()); + assetCurrentCpService.remove(queryWrapper1); + + Integer i = unitService.selectTaskId(assetCurrent.getDwmc(), "0"); + AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); + BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo); + assetCurrentCpPo.setTaskId(i); + assetCurrentCpService.save(assetCurrentCpPo); + + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("asset_id", assetCurrent.getId()); + assetSupplyChainCpService.remove(queryWrapper2); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.eq("asset_id", assetCurrent.getId()); + assetBasicNetworkCpService.remove(queryWrapper3); + QueryWrapper queryWrapper4 = new QueryWrapper<>(); + queryWrapper4.eq("asset_id", assetCurrent.getId()); + assetBusinessFormCpService.remove(queryWrapper4); + QueryWrapper queryWrapper5 = new QueryWrapper<>(); + queryWrapper5.eq("asset_id", assetCurrent.getId()); + unitOtherConcatCpService.remove(queryWrapper5); + + if (assetCurrent.getXjgywxt() != null) { + assetCurrentCpPo.getXjgywxt().setAssetId(assetCurrent.getId()); + assetCurrentCpPo.getXjgywxt().setTaskId(i); + assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt()); + } + if (assetCurrent.getGylxxList() != null) { + for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(i); + } + //新增供应链 + assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList()); + } + if (assetCurrent.getJcwlList() != null) { + for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(i); + } + //新增基础网络 + assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList()); + } + if (assetCurrent.getOtherConcat() != null) { + for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + items.setTaskId(i); + } + //新增其他联系人 + unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); + } + + return success(); } @@ -314,6 +344,24 @@ public class AssetCurrentController extends BaseController { assetBusinessFormService.deleteByAssetIds(id); unitOtherConcatService.deleteByAssetIds(id); assetCurrentService.deleteByUnitIds(id); + + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.eq("id", id); + assetCurrentCpService.remove(queryWrapper1); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); + queryWrapper2.eq("asset_id", id); + assetSupplyChainCpService.remove(queryWrapper2); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); + queryWrapper3.eq("asset_id", id); + assetBasicNetworkCpService.remove(queryWrapper3); + QueryWrapper queryWrapper4 = new QueryWrapper<>(); + queryWrapper4.eq("asset_id", id); + assetBusinessFormCpService.remove(queryWrapper4); + QueryWrapper queryWrapper5 = new QueryWrapper<>(); + queryWrapper5.eq("asset_id", id); + unitOtherConcatCpService.remove(queryWrapper5); + + return success(); } @@ -421,77 +469,75 @@ public class AssetCurrentController extends BaseController { //============= Long id = as.getId(); - List assetTasks = assetTaskService.taskList(as.getDwmc()); - if (assetTasks != null) { - for (AssetTask assetTask : assetTasks) { - //新增资产复制主表 - AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); - BeanUtil.copyProperties(as, assetCurrentCpPo); - assetCurrentCpPo.setTaskId(assetTask.getId()); - AssetCurrentCpPo two = assetCurrentCpService.lambdaQuery().eq(AssetCurrentCpPo::getXtmc, as.getXtmc()) - .eq(AssetCurrentCpPo::getDwmc, as.getDwmc()).one(); - if (two != null) { - assetCurrentCpPo.setId(two.getId()); - assetCurrentCpService.updateById(assetCurrentCpPo); - assetSupplyChainCpService.deletByAssetIdandTaskId(id,assetTask.getId()); - assetBasicNetworkCpService.deletByAssetIdandTaskId(id,assetTask.getId()); - } else { - assetCurrentCpService.save(assetCurrentCpPo); - } - //新增系统建设单位 - AssetSupplyChainCpPo co1 = new AssetSupplyChainCpPo(); - BeanUtil.copyProperties(items, co1); - co1.setType(5); - co1.setAssetId(id); - co1.setTaskId(assetTask.getId()); - assetSupplyChainCpService.save(co1); - - //新增系统运营单位 - AssetSupplyChainCpPo co2 = new AssetSupplyChainCpPo(); - co2.setGyszcdz(items.getGyszcdz1()); - co2.setLxr(items.getLxr1()); - co2.setLxdh(items.getLxdh1()); - co2.setSfwtc(items.getSfwtc1()); - co2.setName(items.getName1()); - co2.setTyshxydm(items.getTyshxydm1()); - co2.setType(7); - co2.setAssetId(as.getId()); - co2.setTaskId(assetTask.getId()); - assetSupplyChainCpService.save(co2); - - //新增服务器信息 - AssetBasicNetworkCpPo co3 = new AssetBasicNetworkCpPo(); - BeanUtil.copyProperties(items, co3); - co3.setType(1); - co3.setAssetId(id); - co3.setTaskId(assetTask.getId()); - assetBasicNetworkCpService.save(co3); - - //新增网络设备 - AssetBasicNetworkCpPo co4 = new AssetBasicNetworkCpPo(); - co4.setSblx(items.getWlsblx()); - co4.setPp(items.getWlpp()); - co4.setSbIp(items.getWlsbIp()); - co4.setYjxh(items.getWlyjxh()); - co4.setYjxlh(items.getWlyjxlh()); - co4.setYjbbxx(items.getWlyjbbxx()); - co4.setYjyt(items.getWlyjyt()); - co4.setYjbsxx(items.getWlyjbsxx()); - co4.setType(2); - co4.setAssetId(id); - co4.setTaskId(assetTask.getId()); - assetBasicNetworkCpService.save(co4); - //新增安全设备 - AssetBasicNetworkCpPo co5 = new AssetBasicNetworkCpPo(); - co5.setSblx(items.getAqwlsblx()); - co5.setPp(items.getAqwlpp()); - co5.setSbIp(items.getAqwlsbIp()); - co5.setType(3); - co5.setAssetId(id); - co5.setTaskId(assetTask.getId()); - assetBasicNetworkCpService.save(co5); - + Integer i = unitService.selectTaskId(as.getDwmc(), "0"); + if (i != null) { + //新增资产复制主表 + AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); + BeanUtil.copyProperties(as, assetCurrentCpPo); + assetCurrentCpPo.setTaskId(i); + AssetCurrentCpPo two = assetCurrentCpService.lambdaQuery().eq(AssetCurrentCpPo::getXtmc, as.getXtmc()) + .eq(AssetCurrentCpPo::getDwmc, as.getDwmc()).one(); + if (two != null) { + assetCurrentCpPo.setId(two.getId()); + assetCurrentCpService.updateById(assetCurrentCpPo); + assetSupplyChainCpService.deletByAssetIdandTaskId(id, i); + assetBasicNetworkCpService.deletByAssetIdandTaskId(id, i); + } else { + assetCurrentCpService.save(assetCurrentCpPo); } + //新增系统建设单位 + AssetSupplyChainCpPo co1 = new AssetSupplyChainCpPo(); + BeanUtil.copyProperties(items, co1); + co1.setType(5); + co1.setAssetId(id); + co1.setTaskId(i); + assetSupplyChainCpService.save(co1); + + //新增系统运营单位 + AssetSupplyChainCpPo co2 = new AssetSupplyChainCpPo(); + co2.setGyszcdz(items.getGyszcdz1()); + co2.setLxr(items.getLxr1()); + co2.setLxdh(items.getLxdh1()); + co2.setSfwtc(items.getSfwtc1()); + co2.setName(items.getName1()); + co2.setTyshxydm(items.getTyshxydm1()); + co2.setType(7); + co2.setAssetId(as.getId()); + co2.setTaskId(i); + assetSupplyChainCpService.save(co2); + + //新增服务器信息 + AssetBasicNetworkCpPo co3 = new AssetBasicNetworkCpPo(); + BeanUtil.copyProperties(items, co3); + co3.setType(1); + co3.setAssetId(id); + co3.setTaskId(i); + assetBasicNetworkCpService.save(co3); + + //新增网络设备 + AssetBasicNetworkCpPo co4 = new AssetBasicNetworkCpPo(); + co4.setSblx(items.getWlsblx()); + co4.setPp(items.getWlpp()); + co4.setSbIp(items.getWlsbIp()); + co4.setYjxh(items.getWlyjxh()); + co4.setYjxlh(items.getWlyjxlh()); + co4.setYjbbxx(items.getWlyjbbxx()); + co4.setYjyt(items.getWlyjyt()); + co4.setYjbsxx(items.getWlyjbsxx()); + co4.setType(2); + co4.setAssetId(id); + co4.setTaskId(i); + assetBasicNetworkCpService.save(co4); + //新增安全设备 + AssetBasicNetworkCpPo co5 = new AssetBasicNetworkCpPo(); + co5.setSblx(items.getAqwlsblx()); + co5.setPp(items.getAqwlpp()); + co5.setSbIp(items.getAqwlsbIp()); + co5.setType(3); + co5.setAssetId(id); + co5.setTaskId(i); + assetBasicNetworkCpService.save(co5); + } } return AjaxResult.success(); 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 31d17bb..62e43dc 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 @@ -7,6 +7,7 @@ import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; 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.request.AssetEmailPageRequest; @@ -49,6 +50,13 @@ public class AssetEmailController extends BaseController { Page page = new Page<>(); page.setCurrent(req.getCurrent()); page.setSize(req.getSize()); + try { + if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) { + req.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName()); + } + } catch (Exception e) { + throw new ServiceException("获取用户信息异常"); + } return success(assetEmailService.page(page, req)); } @@ -74,7 +82,7 @@ public class AssetEmailController extends BaseController { @PostMapping @Log(title = "新增email数据", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody AssetEmail assetEmail) { - return success(assetEmailService.save(assetEmail)); + return success(assetEmailService.add(assetEmail)); } /** @@ -87,7 +95,7 @@ public class AssetEmailController extends BaseController { @Log(title = "编辑email数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AssetEmail assetEmail) { - return success(assetEmailService.updateById(assetEmail)); + return success(assetEmailService.edit(assetEmail)); } /** @@ -143,9 +151,9 @@ public class AssetEmailController extends BaseController { .eq(AssetEmail::getSsdw, x.getSsdw()).one(); if(one!=null){ x.setId(one.getId()); - assetEmailService.updateById(x); + assetEmailService.edit(x); }else { - assetEmailService.save(x); + assetEmailService.add(x); } }); } else { 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 4fb80e5..8086f89 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 @@ -1,15 +1,19 @@ package com.ruoyi.tc.controller; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; 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.AssetMiniPrograms; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest; +import com.ruoyi.tc.service.AssetMiniProgramsCpService; import com.ruoyi.tc.service.AssetMiniProgramsService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -51,6 +55,13 @@ public class AssetMiniProgramsController extends BaseController { Page page = new Page<>(); page.setCurrent(req.getCurrent()); page.setSize(req.getSize()); + try { + if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) { + req.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName()); + } + } catch (Exception e) { + throw new ServiceException("获取用户信息异常"); + } return success(assetMiniProgramsService.page(page, req)); } @@ -76,7 +87,7 @@ public class AssetMiniProgramsController extends BaseController { @PostMapping @Log(title = "新增小程序数据", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody AssetMiniPrograms assetMiniPrograms) { - return success(assetMiniProgramsService.save(assetMiniPrograms)); + return success(assetMiniProgramsService.add(assetMiniPrograms)); } /** @@ -89,7 +100,7 @@ public class AssetMiniProgramsController extends BaseController { @Log(title = "编辑小程序数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AssetMiniPrograms assetMiniPrograms) { - return success(assetMiniProgramsService.updateById(assetMiniPrograms)); + return success(assetMiniProgramsService.edit(assetMiniPrograms)); } /** @@ -145,9 +156,9 @@ public class AssetMiniProgramsController extends BaseController { .eq(AssetMiniPrograms::getXcxmc, x.getXcxmc()).one(); if(one!=null){ x.setId(one.getId()); - assetMiniProgramsService.updateById(x); + assetMiniProgramsService.edit(x); }else { - assetMiniProgramsService.save(x); + assetMiniProgramsService.add(x); } }); } else { 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 ebba899..3236a75 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 @@ -52,6 +52,13 @@ public class AssetOfficialAccountController { Page page = new Page<>(); page.setCurrent(req.getCurrent()); page.setSize(req.getSize()); + try { + if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) { + req.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName()); + } + } catch (Exception e) { + throw new ServiceException("获取用户信息异常"); + } return success(assetOfficialAccountService.page(page, req)); } @@ -77,7 +84,7 @@ public class AssetOfficialAccountController { @PostMapping @Log(title = "新增公众号数据", businessType = BusinessType.INSERT) public AjaxResult add(@RequestBody AssetOfficialAccount assetOfficialAccount) { - return success(assetOfficialAccountService.save(assetOfficialAccount)); + return success(assetOfficialAccountService.add(assetOfficialAccount)); } /** @@ -90,7 +97,7 @@ public class AssetOfficialAccountController { @Log(title = "编辑公众号数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AssetOfficialAccount assetOfficialAccount) { - return success(assetOfficialAccountService.updateById(assetOfficialAccount)); + return success(assetOfficialAccountService.edit(assetOfficialAccount)); } /** @@ -146,9 +153,9 @@ public class AssetOfficialAccountController { .eq(AssetOfficialAccount::getGzhmc, x.getGzhmc()).one(); if(one!=null){ x.setId(one.getId()); - assetOfficialAccountService.updateById(x); + assetOfficialAccountService.edit(x); }else { - assetOfficialAccountService.save(x); + assetOfficialAccountService.add(x); } }); } else { 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 6034f13..a7d03fc 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 @@ -2,6 +2,7 @@ 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.AssetTask; import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.request.GeneralQueryRequest; import com.ruoyi.tc.entity.request.UnitRequest; @@ -78,4 +79,9 @@ public interface UnitMapper extends BaseMapper { * @return */ Integer findBydwmc(@Param("part") String part); + + /** + * 根据单位名称和5种资产类型查询 + */ + Integer selectTaskId(@Param("dwmc") String dwmc,@Param("type") String type); } 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 17ea5d6..d9c8e50 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 @@ -55,4 +55,21 @@ public interface AssetAppService extends IService { * @return */ Integer findBydwmc(String part); + + /** + * 新增数据 + * + * @param assetApp 实体 + * @return 新增结果 + */ + Boolean add(AssetApp assetApp); + + + /** + * 编辑数据 + * + * @param assetApp 实体 + * @return 编辑结果 + */ + Boolean edit(AssetApp assetApp); } 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 54ebad4..58e7ce3 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 @@ -54,5 +54,21 @@ public interface AssetEmailService extends IService { * @return */ Integer findBydwmc(String part); + + /** + * 新增email数据 + * + * @param assetEmail 实体 + * @return 新增结果 + */ + Boolean add(AssetEmail assetEmail); + + /** + * 编辑email数据 + * + * @param assetEmail 实体 + * @return 编辑结果 + */ + Boolean edit(AssetEmail assetEmail); } 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 03423cc..34938be 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.AssetMiniPrograms; import com.ruoyi.tc.entity.AssetMiniPrograms; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest; import java.util.List; @@ -52,4 +53,20 @@ public interface AssetMiniProgramsService extends IService { * @param idList */ void deleteIdList(List idList); + + /** + * 新增小程序数据 + * + * @param assetMiniPrograms 实体 + * @return 新增结果 + */ + Boolean add(AssetMiniPrograms assetMiniPrograms); + + /** + * 编辑小程序数据 + * + * @param assetMiniPrograms 实体 + * @return 编辑结果 + */ + Boolean edit(AssetMiniPrograms assetMiniPrograms); } 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 6042cd8..37d46cd 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 @@ -50,4 +50,20 @@ public interface AssetOfficialAccountService extends IService idList); + + /** + * 新增公众号数据 + * + * @param assetOfficialAccount 实体 + * @return 新增结果 + */ + Boolean add(AssetOfficialAccount assetOfficialAccount); + + /** + * 编辑公众号数据 + * + * @param assetOfficialAccount 实体 + * @return 编辑结果 + */ + Boolean edit(AssetOfficialAccount assetOfficialAccount); } 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 2432675..ded93c0 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 @@ -3,6 +3,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.AssetTask; import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.request.GeneralQueryRequest; import com.ruoyi.tc.entity.request.UnitRequest; @@ -74,6 +75,11 @@ public interface UnitService extends IService { */ List selectAllUnit(GeneralQueryRequest req); + /** + * 根据单位名称和5种资产类型查询 + */ + Integer selectTaskId(String dwmc,String type); + /** * 根据单位查询资产总数 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 da1d18f..59e4579 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 @@ -1,13 +1,20 @@ package com.ruoyi.tc.service.impl; +import cn.hutool.core.bean.BeanUtil; +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.tc.entity.AssetApp; +import com.ruoyi.tc.entity.po.AssetAppCpPo; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; import com.ruoyi.tc.entity.request.AssetAppPageRequest; import com.ruoyi.tc.mapper.AssetAppMapper; +import com.ruoyi.tc.service.AssetAppCpService; import com.ruoyi.tc.service.AssetAppService; +import com.ruoyi.tc.service.UnitService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -18,6 +25,12 @@ import java.util.List; */ @Service("assetAppService") public class AssetAppServiceImpl extends ServiceImpl implements AssetAppService{ + @Resource + private UnitService unitService; + + @Resource + private AssetAppCpService assetAppCpService; + /** * 分页查询所有数据 * @@ -36,6 +49,9 @@ public class AssetAppServiceImpl extends ServiceImpl i @Override public void deleteById(Long id) { baseMapper.deleteById(id); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", id); + assetAppCpService.remove(queryWrapper); } @@ -61,6 +77,38 @@ public class AssetAppServiceImpl extends ServiceImpl i } + /** + * 新增数据 + * + * @param assetApp 实体 + * @return 新增结果 + */ + @Override + public Boolean add(AssetApp assetApp) { + save(assetApp); + AssetAppCpPo a = new AssetAppCpPo(); + BeanUtil.copyProperties(assetApp, a); + a.setTaskId(unitService.selectTaskId(assetApp.getSsdw(), "4")); + a.setAssetId(assetApp.getId()); + return assetAppCpService.save(a); + } + + + /** + * 编辑数据 + * + * @param assetApp 实体 + * @return 编辑结果 + */ + @Override + public Boolean edit(AssetApp assetApp) { + updateById(assetApp); + AssetAppCpPo one = assetAppCpService.lambdaQuery().eq(AssetAppCpPo::getAssetId, assetApp.getId()).one(); + BeanUtil.copyProperties(assetApp, one); + one.setTaskId(unitService.selectTaskId(assetApp.getSsdw(), "4")); + one.setAssetId(assetApp.getId()); + return assetAppCpService.updateById(one); + } } 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 8821f41..33fffad 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 @@ -1,13 +1,20 @@ package com.ruoyi.tc.service.impl; +import cn.hutool.core.bean.BeanUtil; +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.tc.entity.AssetEmail; +import com.ruoyi.tc.entity.po.AssetEmailCpPo; +import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.request.AssetEmailPageRequest; import com.ruoyi.tc.mapper.AssetEmailMapper; +import com.ruoyi.tc.service.AssetEmailCpService; import com.ruoyi.tc.service.AssetEmailService; +import com.ruoyi.tc.service.UnitService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** @@ -18,6 +25,13 @@ import java.util.List; */ @Service("assetEmailService") public class AssetEmailServiceImpl extends ServiceImpl implements AssetEmailService { + @Resource + private UnitService unitService; + + @Resource + private AssetEmailCpService assetEmailCpService; + + /** * 分页查询所有数据 * @@ -27,7 +41,7 @@ public class AssetEmailServiceImpl extends ServiceImpl page(Page page, AssetEmailPageRequest as) { - return baseMapper.page(page,as); + return baseMapper.page(page, as); } /** @@ -35,14 +49,17 @@ public class AssetEmailServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", id); + assetEmailCpService.remove(queryWrapper); } /** * 查询所有数据 * - * @param as 查询实体 + * @param as 查询实体 * @return 所有数据 */ @Override @@ -56,9 +73,40 @@ public class AssetEmailServiceImpl extends ServiceImpl implements AssetMiniProgramsService{ + + @Resource + private AssetMiniProgramsCpService assetMiniProgramsCpService; + + @Resource + private UnitService unitService; /** * 分页查询所有数据 * @@ -35,7 +47,10 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", id); + assetMiniProgramsCpService.remove(queryWrapper); } @@ -55,7 +70,37 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl implements AssetOfficialAccountService{ +public class AssetOfficialAccountServiceImpl extends ServiceImpl implements AssetOfficialAccountService { + + + @Resource + private UnitService unitService; + + @Resource + private AssetOfficialAccountCpService assetOfficialAccountCpService; + /** * 分页查询所有数据 * @@ -27,7 +41,7 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl page(Page page, AssetOfficialAccountPageRequest as) { - return baseMapper.page(page,as); + return baseMapper.page(page, as); } /** @@ -35,14 +49,17 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("asset_id", id); + assetOfficialAccountCpService.remove(queryWrapper); } /** * 查询所有数据 * - * @param as 查询实体 + * @param as 查询实体 * @return 所有数据 */ @Override @@ -56,6 +73,37 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl implements Un return baseMapper.selectAllUnit(req); } + /** + * 根据单位名称和5种资产类型查询 + */ + @Override + public Integer selectTaskId(String dwmc, String type) { + return baseMapper.selectTaskId(dwmc,type); + } + @Override public Integer findBydwmc(String part) { return baseMapper.findBydwmc(part); diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml index 71767f0..ee19659 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml @@ -185,6 +185,9 @@ from unit_info where nick_name = #{part} + update unit_info