杜函宇 3 months ago
parent f28e09acc1
commit a277ceb764

@ -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<AssetCurrent> page, AssetCurrentPageRequest as) {
public AjaxResult selectAll(AssetCurrentPageRequest as) {
Page<AssetCurrent> 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<Long> 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<AssetBasicNetwork> 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);

@ -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<Unit> page, UnitRequest unit) {
return AjaxResult.success(unitService.page(page,unit));
public AjaxResult list(UnitRequest unit) {
Page<Unit> 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<Unit> 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<Long> ids) {
List<String> userNames = unitService.selectByIds(ids);
//逻辑删除单位和用户
unitService.deleteUsers(userNames);
unitService.deleteUnits(ids);
unitOtherConcatService.deleteByUnitIds(ids);
return AjaxResult.success();
}
}

@ -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)));
}
}

@ -83,4 +83,7 @@ public class AssetBasicNetwork extends BaseClass implements Serializable {
*/
@ApiModelProperty("硬件部署位置")
private String yjbsxx;
@ApiModelProperty("删除标志0代表存在 2代表删除")
private String delFlag;
}

@ -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;
}

@ -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<UnitOtherConcat> 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<AssetSupplyChain> 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<AssetBasicNetwork> 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;
}

@ -72,4 +72,6 @@ public class AssetSupplyChain extends BaseClass implements Serializable {
@ApiModelProperty("注册地是否为太仓")
private Integer sfwtc;
@ApiModelProperty("删除标志0代表存在 2代表删除")
private String delFlag;
}

@ -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<UnitOtherConcat> 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;
/**
*
*/

@ -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;
}

@ -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;
}

@ -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;
}

@ -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<AssetBasicNetwork> {
* id
*/
List<AssetBasicNetwork> getByAssetId(Long id);
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<AssetBusinessForm> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -26,5 +26,11 @@ public interface AssetCurrentMapper extends BaseMapper<AssetCurrent> {
Page<AssetCurrent> page(Page<AssetCurrent> page,@Param("req") AssetCurrentPageRequest as);
List<AssetCurrent> page(@Param("req") AssetCurrentPageRequest as);
/**
*
*/
void deleteByUnitIds(List<Long> idList);
}

@ -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<AssetSupplyChain> {
* id
*/
AssetSupplyChain getJsdw(Long id);
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<Unit> {
/**
* id
*/
List<String> selectByIds(Long[] ids);
List<String> selectByIds(List<Long> ids);
/**
*
*/
void deleteUnits(Long[] ids);
void deleteUnits(List<Long> ids);
/**
*
*/
void deleteUsers(List<String> userNames);
/**
* id
*/
Unit getById(Long id);
}

@ -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<UnitOtherConcat>
{
/**
* unitId
*/
void deleteByUnitIds(List<Long> idList);
/**
* assetId
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<AssetBasicNetwork> {
* id
*/
List<AssetBasicNetwork> getByAssetId(Long id);
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<AssetBusinessForm> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<AssetCurrent> {
*/
List<AssetCurrent> page( AssetCurrentPageRequest as );
/**
*
*
* @param id
* @return
*/
AssetCurrent selectOne(Serializable id);
/**
*
*/
void deleteByUnitIds(List<Long> idList);
}

@ -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<AssetSupplyChain> {
* id
*/
AssetSupplyChain getJsdw(Long id);
/**
*
*/
void deleteByAssetIds(List<Long> idList);
}

@ -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<UnitOtherConcat> {
/**
* assetId
*/
void deleteByAssetIds(List<Long> idList);
/**
* unitId
*/
void deleteByUnitIds(List<Long> ids);
}

@ -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<Unit> {
* @param unit
* @return
*/
Page<Unit> page(Page<Unit> page,UnitRequest unit);
Page<Unit> page(Page<Unit> page, UnitRequest unit);
/**
*
@ -30,7 +32,10 @@ public interface UnitService extends IService<Unit> {
*/
List<Unit> selectUnitList(UnitRequest unit);
/**
* id
*/
Unit getById(Long id);
/**
*
@ -40,7 +45,7 @@ public interface UnitService extends IService<Unit> {
/**
* id
*/
List<String> selectByIds(Long[] ids);
List<String> selectByIds(List<Long> ids);
/**
*
@ -49,5 +54,5 @@ public interface UnitService extends IService<Unit> {
/**
*
*/
void deleteUnits(Long[] ids);
void deleteUnits(List<Long> ids);
}

@ -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<AssetBasicNetWorkM
public List<AssetBasicNetwork> getByAssetId(Long id) {
return baseMapper.getByAssetId(id);
}
/**
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
}
}

@ -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<AssetBusinessFormMapper, AssetBusinessForm> implements AssetBusinessFormService {
/**
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
}
}

@ -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<AssetCurrentMapper, AssetCurrent> 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<AssetCurrentMapper, Ass
public List<AssetCurrent> 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<Long> idList) {
baseMapper.deleteByUnitIds(idList);
}
}

@ -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<AssetSupplyChainMap
public AssetSupplyChain getJsdw(Long id) {
return baseMapper.getJsdw(id);
}
/**
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
}
}

@ -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<UnitOtherConcatMapper, UnitOtherConcat> implements UnitOtherConcatService {
/**
* assetId
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
}
/**
* unitId
*/
@Override
public void deleteByUnitIds(List<Long> ids) {
baseMapper.deleteByUnitIds(ids);
}
}

@ -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<UnitMapper, Unit> 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<UnitMapper, Unit> implements Un
* id
*/
@Override
public List<String> selectByIds(Long[] ids) {
public List<String> selectByIds(List<Long> ids) {
return baseMapper.selectByIds(ids);
}
/**
@ -87,7 +96,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
*
*/
@Override
public void deleteUnits(Long[] ids) {
public void deleteUnits(List<Long> ids) {
baseMapper.deleteUnits(ids);
}

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetBasicNetWorkMapper">
<update id="deleteByAssetIds">
update asset_basic_network set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="getByAssetId" resultType="com.ruoyi.tc.entity.AssetBasicNetwork">
select *

@ -2,5 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetBusinessFormMapper">
<update id="deleteByAssetIds">
update asset_business_form set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>

@ -4,9 +4,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetCurrentMapper">
<select id="page" resultType="com.ruoyi.tc.entity.AssetCurrent">
select * from asset_current
<where>
del_flag = '0'
<if test="req.xtmc!=null and req.xtmc!='' ">
and xtmc like concat('%',#{req.xtmc},'%')
</if>
@ -27,4 +29,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
</where>
</select>
<update id="deleteByUnitIds">
update asset_current set del_flag = '2' where id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>

@ -1,6 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetSupplyChainMapper">
<update id="deleteByAssetIds">
update asset_supply_chain set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="getJsdw" resultType="com.ruoyi.tc.entity.AssetSupplyChain">
select *

@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.UnitMapper">
<mapper namespace="com.ruoyi.tc.mapper.UnitMapper">
<resultMap id="unitResult" type="Unit">
<id property="id" column="id" />
@ -43,45 +43,67 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dtwd" column="dtwd"/>
<result property="sjdw" column="sjdw"/>
<result property="createBy" column="create_by"/>
<result property="createId" column="create_id"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateId" column="update_id"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
<result property="delFlag" column="del_flag"/>
<collection property="otherConcat" javaType="java.util.List" ofType="com.ruoyi.tc.entity.UnitOtherConcat" >
<id property="concatId" column="concat_id" />
<result property="qtlxrxm" column="qtlxrlxfs" />
<result property="qtlxrlxfs" column="qtlxrlxfs" />
<result property="qtlxryx" column="qtlxryx" />
<result property="qtlxrzwzc" column="qtlxrzwzc" />
<result property="createBy" column="create_by"/>
<result property="createId" column="create_id"/>
<result property="createTime" column="create_time"/>
<result property="updateBy" column="update_by"/>
<result property="updateId" column="update_id"/>
<result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/>
</collection>
</resultMap>
<update id="deleteUnits">
update unit_info set del_flag = '2' where id in
<foreach collection="array" item="ids" open="(" separator="," close=")">
#{ids}
</foreach>
</update>
<update id="deleteUsers">
update sys_user set del_flag = '2' where user_name in
<foreach collection="array" item="userNames" open="(" separator="," close=")">
#{userNames}
</foreach>
</update>
<select id="selectUnitList" parameterType="unit" resultMap="unitResult">
select * from unit_info
select a.* from unit_info a
<where>
del_flag = '0'
a.del_flag = '0'
<if test="req.nickName != null and req.nickName != '' ">
and nick_name like concat('%',#{req.nickName},'%')
and a.nick_name like concat('%',#{req.nickName},'%')
</if>
<if test="req.dwlx != null">
and dwlx = #{req.dwlx}
and a.dwlx = #{req.dwlx}
</if>
<if test="req.userName != null and req.userName != '' ">
and user_name like concat('%',#{req.userName},'%')
and a.user_name like concat('%',#{req.userName},'%')
</if>
</where>
</select>
<select id="getById" parameterType="unit" resultMap="unitResult">
select a.*,c.* from unit_info a
left join unit_other_contact c on a.id = c.unit_id
where id = #{id}
</select>
<select id="selectByIds" resultType="java.lang.String">
select user_name from unit_info where id in
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
<update id="deleteUnits">
update unit_info set del_flag = '2' where id in
<foreach collection="array" item="ids" open="(" separator="," close=")">
#{ids}
</foreach>
</select>
</update>
<update id="deleteUsers">
update sys_user set del_flag = '2' where user_name in
<foreach collection="array" item="userNames" open="(" separator="," close=")">
#{userNames}
</foreach>
</update>
</mapper>

@ -4,4 +4,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.UnitOtherConcatMapper">
<update id="deleteByUnitIds">
update asset_supply_chain set del_flag = '2' where unit_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<update id="deleteByAssetIds">
update asset_supply_chain set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
</mapper>

@ -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 = "用户邮箱")

@ -24,14 +24,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
<association property="dept" javaType="SysDept" resultMap="deptResult" />
<association property="unitInfo"
javaType="Unit"
column="user_name"
select="UnitList"/>
<!-- <association property="unitInfo"-->
<!-- javaType="Unit"-->
<!-- column="user_name"-->
<!-- select="UnitList"/>-->
<collection property="roles" javaType="java.util.List" resultMap="RoleResult" />
</resultMap>
<select id="UnitList" parameterType="Unit" resultMap="com.ruoyi.system.mapper.UnitMapper.unitResult">
<select id="UnitList" parameterType="Unit" resultMap="com.ruoyi.tc.mapper.UnitMapper.unitResult">
select * from unit_info where user_name = #{user_name}
</select>
@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
select u.user_id, u.dept_id, u.nick_name, u.user_name, u.avatar, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
left join sys_dept d on u.dept_id = d.dept_id
left join unit_info c on u.user_name = c.user_name
where u.del_flag = '0'
<if test="userId != null and userId != 0">
AND u.user_id = #{userId}

Loading…
Cancel
Save