From a277ceb76452250e57330326527e369413e5d276 Mon Sep 17 00:00:00 2001 From: du <1725534722@qq.com> Date: Mon, 18 Nov 2024 21:18:59 +0800 Subject: [PATCH] 1 --- .../tc/controller/AssetCurrentController.java | 112 +++++++++++++++--- .../ruoyi/tc/controller/UnitController.java | 39 ++++-- .../controller/UnitOtherConcatController.java | 96 --------------- .../ruoyi/tc/entity/AssetBasicNetwork.java | 3 + .../ruoyi/tc/entity/AssetBusinessForm.java | 3 + .../com/ruoyi/tc/entity/AssetCurrent.java | 51 +++++--- .../com/ruoyi/tc/entity/AssetSupplyChain.java | 2 + .../main/java/com/ruoyi/tc}/entity/Unit.java | 23 +++- .../com/ruoyi/tc/entity/UnitOtherConcat.java | 11 +- .../request/AssetCurrentPageRequest.java | 6 + .../ruoyi/tc/entity}/request/UnitRequest.java | 9 +- .../tc/mapper/AssetBasicNetWorkMapper.java | 7 ++ .../tc/mapper/AssetBusinessFormMapper.java | 6 + .../ruoyi/tc/mapper/AssetCurrentMapper.java | 6 + .../tc/mapper/AssetSupplyChainMapper.java | 8 ++ .../java/com/ruoyi/tc}/mapper/UnitMapper.java | 16 ++- .../tc/mapper/UnitOtherConcatMapper.java | 11 ++ .../tc/service/AssetBasicNetworkService.java | 6 + .../tc/service/AssetBusinessFormService.java | 6 + .../ruoyi/tc/service/AssetCurrentService.java | 13 ++ .../tc/service/AssetSupplyChainService.java | 8 ++ .../tc/service/UnitOtherConcatService.java | 13 ++ .../com/ruoyi/tc}/service/UnitService.java | 19 +-- .../impl/AssetBasicNetworkServiceImpl.java | 9 ++ .../impl/AssetBusinessFormServiceImpl.java | 9 ++ .../service/impl/AssetCurrentServiceImpl.java | 41 ++++++- .../impl/AssetSupplyChainServiceImpl.java | 11 ++ .../impl/UnitOtherConcatServiceImpl.java | 17 +++ .../tc}/service/impl/UnitServiceImpl.java | 23 ++-- .../mapper/AssetBasicNetworkMapper.xml | 6 + .../mapper/AssetBusinessFormMapper.xml | 6 + .../resources/mapper/AssetCurrentMapper.xml | 9 ++ .../mapper/AssetSupplyChainMapper.xml | 6 + .../src/main/resources/mapper}/UnitMapper.xml | 62 ++++++---- .../main/resources/mapper/UnitOtherConcat.xml | 12 ++ .../common/core/domain/entity/SysUser.java | 7 -- .../resources/mapper/system/SysUserMapper.xml | 12 +- 37 files changed, 505 insertions(+), 199 deletions(-) delete mode 100644 ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitOtherConcatController.java rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain => ruoyi-admin/src/main/java/com/ruoyi/tc}/entity/Unit.java (92%) rename {ruoyi-common/src/main/java/com/ruoyi/common/core/domain => ruoyi-admin/src/main/java/com/ruoyi/tc/entity}/request/UnitRequest.java (72%) rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-admin/src/main/java/com/ruoyi/tc}/mapper/UnitMapper.java (77%) rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-admin/src/main/java/com/ruoyi/tc}/service/UnitService.java (73%) rename {ruoyi-system/src/main/java/com/ruoyi/system => ruoyi-admin/src/main/java/com/ruoyi/tc}/service/impl/UnitServiceImpl.java (84%) rename {ruoyi-system/src/main/resources/mapper/system => ruoyi-admin/src/main/resources/mapper}/UnitMapper.xml (68%) 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 48c48cf..a497979 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 @@ -5,14 +5,15 @@ import cn.hutool.core.bean.BeanUtil; 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.*; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; -import com.ruoyi.tc.service.AssetBasicNetworkService; -import com.ruoyi.tc.service.AssetCurrentService; -import com.ruoyi.tc.service.AssetSupplyChainService; +import com.ruoyi.tc.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -44,17 +45,33 @@ public class AssetCurrentController extends BaseController { @Resource private AssetBasicNetworkService assetBasicNetworkService; + @Resource + private AssetBusinessFormService assetBusinessFormService; + + @Resource + private UnitOtherConcatService unitOtherConcatService; /** * 分页查询所有数据 * - * @param page 分页对象 * @param as 查询实体 * @return 所有数据 */ @ApiOperation(value = "分页查询所有数据", response = AssetCurrent.class) @GetMapping - public AjaxResult selectAll(Page page, AssetCurrentPageRequest as) { + public AjaxResult selectAll(AssetCurrentPageRequest as) { + Page page = new Page<>(); + page.setSize(as.getSize()); + page.setCurrent(as.getCurrent()); + String nickName = null; + try { + if (!SecurityUtils.getLoginUser().getUser().isAdmin() || !SecurityUtils.hasRole("common")) { + nickName = SecurityUtils.getLoginUser().getUser().getNickName(); + as.setDwmc(nickName); + } + } catch (Exception e) { + throw new ServiceException("获取用户信息异常"); + } return success(assetCurrentService.page(page, as)); } @@ -67,7 +84,7 @@ public class AssetCurrentController extends BaseController { @ApiOperation(value = "通过主键查询单条数据", response = AssetCurrent.class) @GetMapping("{id}") public AjaxResult selectOne(@PathVariable Serializable id) { - return success(assetCurrentService.getById(id)); + return success(assetCurrentService.selectOne(id)); } /** @@ -78,8 +95,36 @@ public class AssetCurrentController extends BaseController { */ @ApiOperation(value = "新增数据") @PostMapping + @Transactional(rollbackFor = Exception.class) public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) { - return success(assetCurrentService.save(assetCurrent)); + assetCurrentService.save(assetCurrent); + //新增新监管业务形态 + if (assetCurrent.getXjgywxt() != null) { + assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); + assetBusinessFormService.save(assetCurrent.getXjgywxt()); + } + if (!assetCurrent.getGylxxList().isEmpty()) { + for (AssetSupplyChain items : assetCurrent.getGylxxList()) { + items.setAssetId(assetCurrent.getId()); + } + //新增供应链 + assetSupplyChainService.saveBatch(assetCurrent.getGylxxList()); + } + if (!assetCurrent.getJcwlList().isEmpty()) { + for (AssetBasicNetwork items : assetCurrent.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + } + //新增基础网络 + assetBasicNetworkService.saveBatch(assetCurrent.getJcwlList()); + } + if (!assetCurrent.getOtherConcat().isEmpty()) { + for (UnitOtherConcat items : assetCurrent.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + } + //新增其他联系人 + unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat()); + } + return success(); } /** @@ -91,7 +136,33 @@ public class AssetCurrentController extends BaseController { @ApiOperation(value = "修改数据") @PutMapping public AjaxResult update(@RequestBody @Valid AssetCurrent assetCurrent) { - return success(assetCurrentService.updateById(assetCurrent)); + assetCurrentService.updateById(assetCurrent); + if (assetCurrent.getXjgywxt() != null) { + assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); + assetBusinessFormService.saveOrUpdate(assetCurrent.getXjgywxt()); + } + if (!assetCurrent.getGylxxList().isEmpty()) { + for (AssetSupplyChain items : assetCurrent.getGylxxList()) { + items.setAssetId(assetCurrent.getId()); + } + //新增供应链 + assetSupplyChainService.saveOrUpdateBatch(assetCurrent.getGylxxList()); + } + if (!assetCurrent.getJcwlList().isEmpty()) { + for (AssetBasicNetwork items : assetCurrent.getJcwlList()) { + items.setAssetId(assetCurrent.getId()); + } + //新增基础网络 + assetBasicNetworkService.saveOrUpdateBatch(assetCurrent.getJcwlList()); + } + if (!assetCurrent.getOtherConcat().isEmpty()) { + for (UnitOtherConcat items : assetCurrent.getOtherConcat()) { + items.setAssetId(assetCurrent.getId()); + } + //新增其他联系人 + unitOtherConcatService.saveOrUpdateBatch(assetCurrent.getOtherConcat()); + } + return success(); } /** @@ -103,7 +174,12 @@ public class AssetCurrentController extends BaseController { @ApiOperation(value = "删除数据") @DeleteMapping public AjaxResult delete(@RequestParam("idList") List idList) { - return success(assetCurrentService.removeByIds(idList)); + assetSupplyChainService.deleteByAssetIds(idList); + assetBasicNetworkService.deleteByAssetIds(idList); + assetBusinessFormService.deleteByAssetIds(idList); + unitOtherConcatService.deleteByAssetIds(idList); + assetCurrentService.deleteByUnitIds(idList); + return success(); } /** @@ -128,18 +204,18 @@ public class AssetCurrentController extends BaseController { for (AssetCurrent x : list) { //对应的资产 AssetExport assetExport = new AssetExport(); - BeanUtil.copyProperties(x,assetExport); + BeanUtil.copyProperties(x, assetExport); //查找对应的系统建设单位 AssetSupplyChain jsdw = assetSupplyChainService.getJsdw(x.getId()); - BeanUtil.copyProperties(jsdw,assetExport); + BeanUtil.copyProperties(jsdw, assetExport); List byList = assetBasicNetworkService.getByAssetId(x.getId()); for (AssetBasicNetwork items : byList) { - if(items.getType() == 1){ + if (items.getType() == 1) { //查找对应的服务器信息 - BeanUtil.copyProperties(items,assetExport); + BeanUtil.copyProperties(items, assetExport); } - if(items.getType() == 2){ + if (items.getType() == 2) { //查找对应网络设备 assetExport.setWlpp(items.getPp()); assetExport.setWlyjxh(items.getYjxh()); @@ -150,7 +226,7 @@ public class AssetCurrentController extends BaseController { assetExport.setWlsbIp(items.getSbIp()); assetExport.setWlyjyt(items.getYjyt()); } - if(items.getType() == 3){ + if (items.getType() == 3) { //查找对应安全设备 assetExport.setAqwlpp(items.getPp()); assetExport.setAqwlsblx(items.getSblx()); @@ -175,17 +251,17 @@ public class AssetCurrentController extends BaseController { for (AssetExport items : proList) { AssetCurrent as = new AssetCurrent(); //copy新增到新的现有资产表里面 - BeanUtil.copyProperties(items,as); + BeanUtil.copyProperties(items, as); assetCurrentService.save(as); //新增系统建设单位 AssetSupplyChain s1 = new AssetSupplyChain(); - BeanUtil.copyProperties(items,s1); + BeanUtil.copyProperties(items, s1); s1.setType(5); s1.setAssetId(as.getId()); assetSupplyChainService.save(s1); //新增服务器信息 AssetBasicNetwork a1 = new AssetBasicNetwork(); - BeanUtil.copyProperties(items,a1); + BeanUtil.copyProperties(items, a1); a1.setType(1); a1.setAssetId(as.getId()); assetBasicNetworkService.save(a1); 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 eb0f0cf..8cd59f0 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 @@ -3,12 +3,13 @@ package com.ruoyi.tc.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.core.domain.entity.Unit; -import com.ruoyi.common.core.domain.request.UnitRequest; +import com.ruoyi.tc.entity.Unit; +import com.ruoyi.tc.entity.request.UnitRequest; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.system.service.UnitService; +import com.ruoyi.tc.service.UnitOtherConcatService; +import com.ruoyi.tc.service.UnitService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; @@ -23,6 +24,7 @@ import java.util.List; /** * 单位(unit)表控制层 + * * @author du * @since 2024/11/18 17:11 */ @@ -35,14 +37,21 @@ public class UnitController { @Resource private UnitService unitService; + @Resource + private UnitOtherConcatService unitOtherConcatService; + /** * 获取单位列表 */ - @ApiOperation(value = "获取单位列表",response = Unit.class) + @ApiOperation(value = "获取单位列表", response = Unit.class) @GetMapping("/list") - public AjaxResult list(Page page, UnitRequest unit) { - return AjaxResult.success(unitService.page(page,unit)); + public AjaxResult list(UnitRequest unit) { + Page page = new Page<>(); + page.setSize(unit.getSize()); + page.setCurrent(unit.getCurrent()); + return AjaxResult.success(unitService.page(page, unit)); } + /** * 单位导出 */ @@ -54,6 +63,7 @@ public class UnitController { ExcelUtil util = new ExcelUtil<>(Unit.class); util.exportExcel(response, list, "单位数据"); } + /** * 单位导入 */ @@ -90,15 +100,17 @@ public class UnitController { * 新增单位 */ @ApiOperation(value = "新增单位") - @Log(title = "用户管理", businessType = BusinessType.INSERT) + @Log(title = "新增单位", businessType = BusinessType.INSERT) @PostMapping @Transactional(rollbackFor = Exception.class) public AjaxResult add(@Valid @RequestBody Unit unit) { - if (!unitService.lambdaQuery().eq(Unit::getUserName, unit.getUserName()).eq(Unit::getDelFlag,"0").list().isEmpty()) { + if (!unitService.lambdaQuery().eq(Unit::getUserName, unit.getUserName()).eq(Unit::getDelFlag, "0").list().isEmpty()) { throw new ServiceException(unit.getUserName() + "'已存在单位!"); } //新增单位到单位信息表 unitService.save(unit); + //新增其他联系人 + unitOtherConcatService.saveBatch(unit.getOtherConcat()); //查询用户表是否存在该用户 unitService.validUser(unit); return AjaxResult.success(); @@ -113,10 +125,16 @@ public class UnitController { @Transactional(rollbackFor = Exception.class) public AjaxResult edit(@Valid @RequestBody Unit x) { Unit byId = unitService.getById(x.getId()); - if (!byId.getUserName().equals(x.getUserName())||!byId.getNickName().equals(x.getNickName())) { + if (!byId.getUserName().equals(x.getUserName()) || !byId.getNickName().equals(x.getNickName())) { throw new ServiceException("不允许修改单位名称和统一信用代码!"); } unitService.updateById(x); + if(!x.getOtherConcat().isEmpty()){ + x.getOtherConcat().forEach(y->{ + y.setUnitId(x.getId()); + }); + } + unitOtherConcatService.saveOrUpdateBatch(x.getOtherConcat()); return AjaxResult.success(); } @@ -126,11 +144,12 @@ public class UnitController { @ApiOperation(value = "删除单位") @Log(title = "删除单位", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { + public AjaxResult remove(@PathVariable List ids) { List userNames = unitService.selectByIds(ids); //逻辑删除单位和用户 unitService.deleteUsers(userNames); unitService.deleteUnits(ids); + unitOtherConcatService.deleteByUnitIds(ids); return AjaxResult.success(); } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitOtherConcatController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitOtherConcatController.java deleted file mode 100644 index c25c3f2..0000000 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitOtherConcatController.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.ruoyi.tc.controller; - -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.tc.entity.UnitOtherConcat; -import com.ruoyi.tc.service.UnitOtherConcatService; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiOperation; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.validation.Valid; -import java.io.Serializable; -import java.util.Arrays; - -/** - * 单位其他联系人(unit_other_contact)控制层 - * @author du - * @since 2024/11/13 14:50 - */ -@RestController -@RequestMapping("/tc/unit/otherConcat") -@Api(tags = "单位其他联系人控制层") -public class UnitOtherConcatController extends BaseController { - /** - * 服务对象 - */ - @Resource - private UnitOtherConcatService unitOtherConcatService; - - /** - * 根据unit_id查询该单位所有数据 - * - * @param unitId 查询unit_id - * @return 所有数据 - */ -// @PreAuthorize("@ss.hasAnyRoles('admin')") - @ApiOperation(value = "根据unit_id查询该单位所有数据", response = UnitOtherConcat.class) - @GetMapping("/selectAll/{unitId}") - public AjaxResult selectAll(@PathVariable Long unitId) { - return success(unitOtherConcatService.lambdaQuery().eq(UnitOtherConcat::getUnitId,unitId).list()); - } - - - /** - * 通过主键查询单条数据 - * - * @param id 主键 - * @return 单条数据 - */ - @ApiOperation(value = "通过主键查询单条数据", response = UnitOtherConcat.class) - @GetMapping("/{id}") - public AjaxResult selectOne(@PathVariable Serializable id) { - return success(unitOtherConcatService.getById(id)); - } - - /** - * 新增数据 - * - * @param u 实体对象 - * @return 新增结果 - */ -// @PreAuthorize("@ss.hasAnyRoles('admin')") - @ApiOperation(value = "新增数据") - @PostMapping - public AjaxResult insert(@Valid @RequestBody UnitOtherConcat u) { - return success(unitOtherConcatService.save(u)); - } - - - /** - * 修改数据 - * - * @param u 实体对象 - * @return 修改结果 - */ -// @PreAuthorize("@ss.hasAnyRoles('admin')") - @ApiOperation(value = "修改数据") - @PostMapping("/edit") - public AjaxResult update(@RequestBody UnitOtherConcat u) { - return success(unitOtherConcatService.updateById(u)); - } - - /** - * 删除数据 - * - * @param ids 主键结合 - * @return 删除结果 - */ -// @PreAuthorize("@ss.hasAnyRoles('admin')") - @ApiOperation(value = "删除数据") - @PostMapping("/ids") - public AjaxResult delete(Long[] ids) { - return success(unitOtherConcatService.removeBatchByIds(Arrays.asList(ids))); - } -} diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBasicNetwork.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBasicNetwork.java index ea73bea..a4da125 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBasicNetwork.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBasicNetwork.java @@ -83,4 +83,7 @@ public class AssetBasicNetwork extends BaseClass implements Serializable { */ @ApiModelProperty("硬件部署位置") private String yjbsxx; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBusinessForm.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBusinessForm.java index 629da4d..9b9fa51 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBusinessForm.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetBusinessForm.java @@ -397,4 +397,7 @@ public class AssetBusinessForm extends BaseClass implements Serializable { @Size(max= 500,message="CDN信息-CDN加速信息长度不能超过500") @ApiModelProperty("CDN信息-CDN加速信息") private String cdnJsxx; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java index d4f3e42..2f61909 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java @@ -14,6 +14,7 @@ import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.io.Serializable; +import java.util.List; /** * 现有资产表(asset_current)实体类 @@ -450,6 +451,11 @@ public class AssetCurrent extends BaseClass implements Serializable { @Size(max= 50,message="第一联系人邮箱长度不能超过50") @ApiModelProperty("第一联系人邮箱") private String dylxryx; + + @ApiModelProperty("其他联系人") + @TableField(exist = false) + private List otherConcat; + /** * ICP备案信息-是否备案 */ @@ -787,23 +793,37 @@ public class AssetCurrent extends BaseClass implements Serializable { @ApiModelProperty("密评信息-密评得分") private String mpMpdf; +// /** +// * 供应链信息(id集合逗号分隔) +// */ +// @Size(max= 255,message="供应链信息长度不能超过255") +// @ApiModelProperty("供应链信息(id集合逗号分隔)") +// private String gylxx; +// /** +// * 基础网络(id集合逗号分隔） +// */ +// @Size(max= 255,message="基础网络长度不能超过255") +// @ApiModelProperty("基础网络(id集合逗号分隔）") +// private String jcwl; + /** + * 供应链信息列表 + */ + @ApiModelProperty("供应链信息列表") + @TableField(exist = false) + private List gylxxList; /** - * 供应链信息(id集合逗号分隔) - */ - @Size(max= 255,message="供应链信息长度不能超过255") - @ApiModelProperty("供应链信息(id集合逗号分隔)") - private String gylxx; - /** - * 基础网络(id集合逗号分隔） - */ - @Size(max= 255,message="基础网络长度不能超过255") - @ApiModelProperty("基础网络(id集合逗号分隔）") - private String jcwl; + * 基础网络列表 + */ + @ApiModelProperty("基础网络列表") + @TableField(exist = false) + private List jcwlList; + /** - * 新监管业务形态id + * 新监管业务形态 */ - @ApiModelProperty("新监管业务形态id") - private Long xjgywxt; + @ApiModelProperty("新监管业务形态") + @TableField(exist = false) + private AssetBusinessForm xjgywxt; /** * Whois信息-有效性 */ @@ -1002,4 +1022,7 @@ public class AssetCurrent extends BaseClass implements Serializable { @Size(max= 500,message="业务系统拓扑图长度不能超过500") @ApiModelProperty("业务系统拓扑图") private String ywxttpt; + + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetSupplyChain.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetSupplyChain.java index 163db5c..095a945 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetSupplyChain.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetSupplyChain.java @@ -72,4 +72,6 @@ public class AssetSupplyChain extends BaseClass implements Serializable { @ApiModelProperty("注册地是否为太仓") private Integer sfwtc; + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Unit.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java similarity index 92% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Unit.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java index 46e1221..5d5056c 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Unit.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java @@ -1,5 +1,6 @@ -package com.ruoyi.common.core.domain.entity; +package com.ruoyi.tc.entity; +import com.alibaba.fastjson2.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.annotation.Excel; @@ -11,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.Valid; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * 单位信息 @@ -148,6 +150,11 @@ public class Unit implements Serializable { @Excel(name="第一联系人职务职称") private String dylxrzwzc; + @ApiModelProperty("第一联系人职务职称") + @TableField(exist = false) + private List otherConcat; + + @ApiModelProperty("检查信息") private String jcxx; @@ -174,6 +181,20 @@ public class Unit implements Serializable { @TableField(fill = FieldFill.INSERT) private String createBy; + /** + * 创建id + */ + @JSONField(serialize = false) + @TableField(fill = FieldFill.INSERT) + private Long createId; + + /** + * 更新id + */ + @JSONField(serialize = false) + @TableField(fill = FieldFill.INSERT_UPDATE) + private Long updateId; + /** * 创建时间 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/UnitOtherConcat.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/UnitOtherConcat.java index 7570843..730f97e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/UnitOtherConcat.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/UnitOtherConcat.java @@ -19,13 +19,15 @@ import java.io.Serializable; @TableName(value = "unit_other_contact") public class UnitOtherConcat extends BaseClass implements Serializable { - @TableId(type = IdType.AUTO,value = "id") - private Long id; + @TableId(type = IdType.AUTO,value = "concat_id") + private Long concatId; @ApiModelProperty("单位id") - @NotNull private Long unitId; + @ApiModelProperty("资产id") + private Long assetId; + @ApiModelProperty("其他联系人姓名") private String qtlxrxm; @@ -38,5 +40,6 @@ public class UnitOtherConcat extends BaseClass implements Serializable { @ApiModelProperty("其他联系人职务职称") private String qtlxrzwzc; - + @ApiModelProperty("删除标志（0代表存在 2代表删除）") + private String delFlag; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentPageRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentPageRequest.java index 9c3628c..cb98f92 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentPageRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetCurrentPageRequest.java @@ -54,4 +54,10 @@ public class AssetCurrentPageRequest { @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty("结束时间") private Date endTime; + + @ApiModelProperty("页码") + private Long current=1L; + + @ApiModelProperty("页数") + private Long size=10L; } diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/request/UnitRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java similarity index 72% rename from ruoyi-common/src/main/java/com/ruoyi/common/core/domain/request/UnitRequest.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java index 1eea4c4..4c8a9f6 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/request/UnitRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/UnitRequest.java @@ -1,6 +1,5 @@ -package com.ruoyi.common.core.domain.request; +package com.ruoyi.tc.entity.request; -import com.ruoyi.common.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -20,4 +19,10 @@ public class UnitRequest { @ApiModelProperty("单位类型,传字典数字") private Integer dwlx; + + @ApiModelProperty("页码") + private Long current=1L; + + @ApiModelProperty("页数") + private Long size=10L; } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java index bee7e16..45290f6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBasicNetWorkMapper.java @@ -3,6 +3,7 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.AssetBasicNetwork; +import java.io.Serializable; import java.util.List; /** @@ -15,5 +16,11 @@ public interface AssetBasicNetWorkMapper extends BaseMapper { * 根据资产id查询对应的基础网络 */ List getByAssetId(Long id); + + /** + * 逻辑删除 + */ + void deleteByAssetIds(List idList); + } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java index 6136895..a482d28 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetBusinessFormMapper.java @@ -3,6 +3,8 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.AssetBusinessForm; +import java.util.List; + /** * 资产新监管业务形态(asset_business_form)表数据库访问层 * @@ -10,5 +12,9 @@ import com.ruoyi.tc.entity.AssetBusinessForm; * @since 2024-11-15 10:03:56 */ public interface AssetBusinessFormMapper extends BaseMapper { + /** + * 逻辑删除 + */ + void deleteByAssetIds(List idList); } 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 1f71965..b47dcc5 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 @@ -26,5 +26,11 @@ public interface AssetCurrentMapper extends BaseMapper { Page page(Page page,@Param("req") AssetCurrentPageRequest as); List page(@Param("req") AssetCurrentPageRequest as); + + + /** + * 逻辑删除 + */ + void deleteByUnitIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java index 534b61f..088f4cc 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java @@ -3,6 +3,9 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.AssetSupplyChain; +import java.io.Serializable; +import java.util.List; + /** * 资产供应链信息(asset_supply_chain)表数据库访问层 * @@ -15,5 +18,10 @@ public interface AssetSupplyChainMapper extends BaseMapper { * 根据现有资产id查找最新一条的系统建设单位 */ AssetSupplyChain getJsdw(Long id); + + /** + * 逻辑删除 + */ + void deleteByAssetIds(List idList); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UnitMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java similarity index 77% rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/UnitMapper.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java index c827ecc..64bd1c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/UnitMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java @@ -1,9 +1,10 @@ -package com.ruoyi.system.mapper; +package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.core.domain.entity.Unit; -import com.ruoyi.common.core.domain.request.UnitRequest; + +import com.ruoyi.tc.entity.Unit; +import com.ruoyi.tc.entity.request.UnitRequest; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -33,15 +34,20 @@ public interface UnitMapper extends BaseMapper { /** * 根据id列表查询单位 */ - List selectByIds(Long[] ids); + List selectByIds(List ids); /** * 逻辑删除单位 */ - void deleteUnits(Long[] ids); + void deleteUnits(List ids); /** * 逻辑删除用户 */ void deleteUsers(List userNames); + + /** + * 根据id获取详细信息 + */ + Unit getById(Long id); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java index 102376a..fb495e5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java @@ -3,10 +3,21 @@ package com.ruoyi.tc.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.tc.entity.UnitOtherConcat; +import java.util.List; + /** * 单位其他联系人(unit_other_contact)数据层 * @author ruoyi */ public interface UnitOtherConcatMapper extends BaseMapper { + /** + * 根据unitId逻辑删除 + */ + void deleteByUnitIds(List idList); + + /** + * 根据assetId逻辑删除 + */ + void deleteByAssetIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java index 24f2ba3..2cb8706 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBasicNetworkService.java @@ -3,6 +3,7 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.AssetBasicNetwork; +import java.io.Serializable; import java.util.List; /** @@ -17,4 +18,9 @@ public interface AssetBasicNetworkService extends IService { * 根据资产id查询对应的基础网络 */ List getByAssetId(Long id); + + /** + * 逻辑删除 + */ + void deleteByAssetIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java index 572cf2c..81a2548 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetBusinessFormService.java @@ -3,6 +3,8 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.AssetBusinessForm; +import java.util.List; + /** * 资产新监管业务形态(asset_business_form)表服务接口 * @@ -11,5 +13,9 @@ import com.ruoyi.tc.entity.AssetBusinessForm; */ public interface AssetBusinessFormService extends IService { + /** + * 逻辑删除 + */ + void deleteByAssetIds(List 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 a1d65c4..2289e57 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 @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.AssetCurrent; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; +import java.io.Serializable; import java.util.List; /** @@ -32,5 +33,17 @@ public interface AssetCurrentService extends IService { */ List page( AssetCurrentPageRequest as ); + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + AssetCurrent selectOne(Serializable id); + + /** + * 逻辑删除 + */ + void deleteByUnitIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java index 178bc5a..04d346c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java @@ -3,6 +3,9 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.AssetSupplyChain; +import java.io.Serializable; +import java.util.List; + /** * 资产供应链信息(asset_supply_chain)表服务接口 * @author makejava @@ -14,4 +17,9 @@ public interface AssetSupplyChainService extends IService { * 根据现有资产id查找最新一条的系统建设单位 */ AssetSupplyChain getJsdw(Long id); + + /** + * 逻辑删除 + */ + void deleteByAssetIds(List idList); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java index 6af1304..398790c 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java @@ -3,10 +3,23 @@ package com.ruoyi.tc.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.tc.entity.UnitOtherConcat; +import java.util.List; + /** * 单位其他联系人(unit_other_contact)业务层 * @author du * @since 2024/11/13 14:55 */ public interface UnitOtherConcatService extends IService { + + + /** + * 根据assetId逻辑删除 + */ + void deleteByAssetIds(List idList); + + /** + * 根据unitId逻辑删除 + */ + void deleteByUnitIds(List ids); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/UnitService.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java similarity index 73% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/UnitService.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java index a5cda20..931b773 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/UnitService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java @@ -1,9 +1,11 @@ -package com.ruoyi.system.service; +package com.ruoyi.tc.service; + + import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; -import com.ruoyi.common.core.domain.entity.Unit; -import com.ruoyi.common.core.domain.request.UnitRequest; +import com.ruoyi.tc.entity.Unit; +import com.ruoyi.tc.entity.request.UnitRequest; import java.util.List; @@ -20,7 +22,7 @@ public interface UnitService extends IService { * @param unit 用户信息 * @return 用户信息集合信息 */ - Page page(Page page,UnitRequest unit); + Page page(Page page, UnitRequest unit); /** * 根据条件查询所有单位列表 @@ -30,7 +32,10 @@ public interface UnitService extends IService { */ List selectUnitList(UnitRequest unit); - + /** + * 根据id获取详细信息 + */ + Unit getById(Long id); /** * 检查用户表是否存在该用户 @@ -40,7 +45,7 @@ public interface UnitService extends IService { /** * 根据id列表查询单位 */ - List selectByIds(Long[] ids); + List selectByIds(List ids); /** * 逻辑删除用户 @@ -49,5 +54,5 @@ public interface UnitService extends IService { /** * 逻辑删除单位 */ - void deleteUnits(Long[] ids); + void deleteUnits(List ids); } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java index 6bccdeb..7a98cd9 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBasicNetworkServiceImpl.java @@ -6,6 +6,7 @@ import com.ruoyi.tc.mapper.AssetBasicNetWorkMapper; import com.ruoyi.tc.service.AssetBasicNetworkService; import org.springframework.stereotype.Service; +import java.io.Serializable; import java.util.List; /** @@ -23,4 +24,12 @@ public class AssetBasicNetworkServiceImpl extends ServiceImpl getByAssetId(Long id) { return baseMapper.getByAssetId(id); } + + /** + * 逻辑删除 + */ + @Override + public void deleteByAssetIds(List idList) { + baseMapper.deleteByAssetIds(idList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java index ad22690..347569a 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetBusinessFormServiceImpl.java @@ -6,6 +6,8 @@ import com.ruoyi.tc.mapper.AssetBusinessFormMapper; import com.ruoyi.tc.service.AssetBusinessFormService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 资产新监管业务形态(AssetBusinessForm)表服务实现类 * @@ -15,5 +17,12 @@ import org.springframework.stereotype.Service; @Service("assetBusinessFormService") public class AssetBusinessFormServiceImpl extends ServiceImpl implements AssetBusinessFormService { + /** + * 逻辑删除 + */ + @Override + public void deleteByAssetIds(List idList) { + baseMapper.deleteByAssetIds(idList); + } } 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 8e3f6bf..77bd3bd 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 @@ -2,12 +2,14 @@ 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.AssetCurrent; +import com.ruoyi.tc.entity.*; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; import com.ruoyi.tc.mapper.AssetCurrentMapper; -import com.ruoyi.tc.service.AssetCurrentService; +import com.ruoyi.tc.service.*; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.io.Serializable; import java.util.List; /** @@ -19,6 +21,17 @@ import java.util.List; @Service("assetCurrentService") public class AssetCurrentServiceImpl extends ServiceImpl implements AssetCurrentService { + @Resource + private AssetSupplyChainService assetSupplyChainService; + + @Resource + private AssetBasicNetworkService assetBasicNetworkService; + + @Resource + private AssetBusinessFormService assetBusinessFormService; + + @Resource + private UnitOtherConcatService unitOtherConcatService; /** * 分页查询所有数据 * @@ -41,5 +54,29 @@ public class AssetCurrentServiceImpl extends ServiceImpl page(AssetCurrentPageRequest as) { return baseMapper.page(as); } + + /** + * 通过主键查询单条数据 + * + * @param id 主键 + * @return 单条数据 + */ + @Override + public AssetCurrent selectOne(Serializable id) { + AssetCurrent byId = getById(id); + byId.setGylxxList(assetSupplyChainService.lambdaQuery().eq(AssetSupplyChain::getAssetId,id).eq(AssetSupplyChain::getDelFlag,"0").list()); + byId.setJcwlList(assetBasicNetworkService.lambdaQuery().eq(AssetBasicNetwork::getAssetId,id).eq(AssetBasicNetwork::getDelFlag,"0").list()); + byId.setXjgywxt(assetBusinessFormService.lambdaQuery().eq(AssetBusinessForm::getAssetId,id).eq(AssetBusinessForm::getDelFlag,"0").one()); + byId.setOtherConcat(unitOtherConcatService.lambdaQuery().eq(UnitOtherConcat::getAssetId,id).eq(UnitOtherConcat::getDelFlag,"0").list()); + return byId; + } + + /** + * 逻辑删除 + */ + @Override + public void deleteByUnitIds(List idList) { + baseMapper.deleteByUnitIds(idList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java index f7f746b..0b84dac 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java @@ -6,6 +6,9 @@ import com.ruoyi.tc.mapper.AssetSupplyChainMapper; import com.ruoyi.tc.service.AssetSupplyChainService; import org.springframework.stereotype.Service; +import java.io.Serializable; +import java.util.List; + /** * 资产供应链信息表(AssetSupplyChain)表服务实现类 * @@ -22,4 +25,12 @@ public class AssetSupplyChainServiceImpl extends ServiceImpl idList) { + baseMapper.deleteByAssetIds(idList); + } } diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java index 788dff5..0484e5f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitOtherConcatServiceImpl.java @@ -6,6 +6,8 @@ import com.ruoyi.tc.mapper.UnitOtherConcatMapper; import com.ruoyi.tc.service.UnitOtherConcatService; import org.springframework.stereotype.Service; +import java.util.List; + /** * 单位其他联系人(unit_other_contact)业务处理层 * @author du @@ -13,4 +15,19 @@ import org.springframework.stereotype.Service; */ @Service public class UnitOtherConcatServiceImpl extends ServiceImpl implements UnitOtherConcatService { + + /** + * 根据assetId逻辑删除 + */ + @Override + public void deleteByAssetIds(List idList) { + baseMapper.deleteByAssetIds(idList); + } + /** + * 根据unitId逻辑删除 + */ + @Override + public void deleteByUnitIds(List ids) { + baseMapper.deleteByUnitIds(ids); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java similarity index 84% rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitServiceImpl.java rename to ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java index 9a664ff..78c7b6e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UnitServiceImpl.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java @@ -1,16 +1,17 @@ -package com.ruoyi.system.service.impl; +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.common.core.domain.entity.SysUser; -import com.ruoyi.common.core.domain.entity.Unit; -import com.ruoyi.common.core.domain.request.UnitRequest; + import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.system.mapper.UnitMapper; import com.ruoyi.system.service.ISysUserService; -import com.ruoyi.system.service.UnitService; +import com.ruoyi.tc.entity.Unit; +import com.ruoyi.tc.entity.request.UnitRequest; +import com.ruoyi.tc.mapper.UnitMapper; +import com.ruoyi.tc.service.UnitService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,6 +49,14 @@ public class UnitServiceImpl extends ServiceImpl implements Un return baseMapper.selectUnitList(unit); } + /** + * 根据id获取详细信息 + */ + @Override + public Unit getById(Long id) { + return baseMapper.getById(id); + } + /** * 检查用户表是否存在该用户 @@ -72,7 +81,7 @@ public class UnitServiceImpl extends ServiceImpl implements Un * 根据id列表查询单位 */ @Override - public List selectByIds(Long[] ids) { + public List selectByIds(List ids) { return baseMapper.selectByIds(ids); } /** @@ -87,7 +96,7 @@ public class UnitServiceImpl extends ServiceImpl implements Un * 逻辑删除单位 */ @Override - public void deleteUnits(Long[] ids) { + public void deleteUnits(List ids) { baseMapper.deleteUnits(ids); } diff --git a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml index 073be82..49dc501 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml @@ -1,6 +1,12 @@ + + update asset_basic_network set del_flag = '2' where asset_id in + + #{id} + + select * from asset_current + del_flag = '0' and xtmc like concat('%',#{req.xtmc},'%') @@ -27,4 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + update asset_current set del_flag = '2' where id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml b/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml index 3abbf0a..4bef4ba 100644 --- a/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml +++ b/ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml @@ -1,6 +1,12 @@ + + update asset_supply_chain set del_flag = '2' where asset_id in + + #{id} + + - select * from unit_info + select a.* from unit_info a - del_flag = '0' + a.del_flag = '0' - and nick_name like concat('%',#{req.nickName},'%') + and a.nick_name like concat('%',#{req.nickName},'%') - and dwlx = #{req.dwlx} + and a.dwlx = #{req.dwlx} - and user_name like concat('%',#{req.userName},'%') + and a.user_name like concat('%',#{req.userName},'%') + + + + + update unit_info set del_flag = '2' where id in #{ids} - - + + + update sys_user set del_flag = '2' where user_name in + + #{userNames} + + \ No newline at end of file diff --git a/ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml b/ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml index fbbbbb8..842e451 100644 --- a/ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml +++ b/ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml @@ -4,4 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + update asset_supply_chain set del_flag = '2' where unit_id in + + #{id} + + + + update asset_supply_chain set del_flag = '2' where asset_id in + + #{id} + + \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index 46dc687..64f7ae0 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -38,15 +38,8 @@ public class SysUser extends BaseEntity private String nickName; - public Unit getUnitInfo() { - return unitInfo; - } - public void setUnitInfo(Unit unitInfo) { - this.unitInfo = unitInfo; - } - private Unit unitInfo; // /** 用户邮箱 */ // @Excel(name = "用户邮箱") diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index afd7288..9ced28b 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + + + + - select * from unit_info where user_name = #{user_name} @@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"