单位和资产修改

duhanyu
杜函宇 6 months ago
parent 644e4719fa
commit 13a7763cf3

@ -1,46 +1,21 @@
package com.ruoyi.tc.domain; package com.ruoyi.tc.baseClass;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date; import java.util.Date;
/** /**
* (unit_other_contact) *
* @author du * @author du
* @since 2024/11/13 14:44 * @since 2024/11/15 16:01
*/ */
@Data @Data
@ApiModel("单位其他联系人") public class BaseClass {
@TableName(value = "unit_other_contact")
public class UnitOtherConcat implements Serializable {
@TableId(type = IdType.AUTO,value = "id")
private Long id;
@ApiModelProperty("单位id")
@NotNull
private Long unitId;
@ApiModelProperty("其他联系人姓名")
private String qtlxrxm;
@ApiModelProperty("其他联系人联系方式")
private String qtlxrlxfs;
@ApiModelProperty("其他联系人邮箱")
private String qtlxryx;
@ApiModelProperty("其他联系人职务职称")
private String qtlxrzwzc;
/** /**
* *
*/ */
@ -74,4 +49,18 @@ public class UnitOtherConcat implements Serializable {
private Date updateTime; private Date updateTime;
private String remark; private String remark;
/**
* ID
*/
@ApiModelProperty("创建ID")
@TableField(fill = FieldFill.INSERT)
private Long createId;
/**
* ID
*/
@ApiModelProperty("更新者ID")
@TableField(fill = FieldFill.UPDATE)
private Long updateId;
} }

@ -0,0 +1,218 @@
package com.ruoyi.tc.controller;
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.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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
/**
* (AssetCurrent)
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
@Api(tags = "现有资产表")
@RestController
@RequestMapping("/tc/assetCurrent")
public class AssetCurrentController extends BaseController {
/**
*
*/
@Resource
private AssetCurrentService assetCurrentService;
@Resource
private AssetSupplyChainService assetSupplyChainService;
@Resource
private AssetBasicNetworkService assetBasicNetworkService;
/**
*
*
* @param page
* @param as
* @return
*/
@ApiOperation(value = "分页查询所有数据", response = AssetCurrent.class)
@GetMapping
public AjaxResult selectAll(Page<AssetCurrent> page, AssetCurrentPageRequest as) {
return success(assetCurrentService.page(page, as));
}
/**
*
*
* @param id
* @return
*/
@ApiOperation(value = "通过主键查询单条数据", response = AssetCurrent.class)
@GetMapping("{id}")
public AjaxResult selectOne(@PathVariable Serializable id) {
return success(assetCurrentService.getById(id));
}
/**
*
*
* @param assetCurrent
* @return
*/
@ApiOperation(value = "新增数据")
@PostMapping
public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) {
return success(assetCurrentService.save(assetCurrent));
}
/**
*
*
* @param assetCurrent
* @return
*/
@ApiOperation(value = "修改数据")
@PutMapping
public AjaxResult update(@RequestBody @Valid AssetCurrent assetCurrent) {
return success(assetCurrentService.updateById(assetCurrent));
}
/**
*
*
* @param idList
* @return
*/
@ApiOperation(value = "删除数据")
@DeleteMapping
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
return success(assetCurrentService.removeByIds(idList));
}
/**
*
*/
@ApiOperation(value = "下载资产导入模板")
@PostMapping("/importTemplate")
public void importTemplate(HttpServletResponse response) {
ExcelUtil<AssetExport> util = new ExcelUtil<>(AssetExport.class);
util.importTemplateExcel(response, "资产导入模板");
}
/**
*
*/
@ApiOperation(value = "导出现有资产")
@PostMapping("/export")
public void exportProject(HttpServletResponse response, AssetCurrentPageRequest as) {
List<AssetCurrent> list = assetCurrentService.page(as);
List<AssetExport> proList = new ArrayList<>();
for (AssetCurrent x : list) {
//对应的资产
AssetExport assetExport = new AssetExport();
BeanUtil.copyProperties(x,assetExport);
//查找对应的系统建设单位
AssetSupplyChain jsdw = assetSupplyChainService.getJsdw(x.getId());
BeanUtil.copyProperties(jsdw,assetExport);
List<AssetBasicNetwork> byList = assetBasicNetworkService.getByAssetId(x.getId());
for (AssetBasicNetwork items : byList) {
if(items.getType() == 1){
//查找对应的服务器信息
BeanUtil.copyProperties(items,assetExport);
}
if(items.getType() == 2){
//查找对应网络设备
assetExport.setWlpp(items.getPp());
assetExport.setWlyjxh(items.getYjxh());
assetExport.setWlyjbsxx(items.getYjbsxx());
assetExport.setWlsblx(items.getSblx());
assetExport.setWlyjbbxx(items.getYjbbxx());
assetExport.setWlyjxlh(items.getYjxlh());
assetExport.setWlsbIp(items.getSbIp());
assetExport.setWlyjyt(items.getYjyt());
}
if(items.getType() == 3){
//查找对应安全设备
assetExport.setAqwlpp(items.getPp());
assetExport.setAqwlsblx(items.getSblx());
assetExport.setAqwlsbIp(items.getSbIp());
}
}
proList.add(assetExport);
}
ExcelUtil<AssetExport> util = new ExcelUtil<>(AssetExport.class);
util.exportExcel(response, proList, "现有资产记录");
}
/**
*
*/
@ApiOperation(value = "导入现有资产")
@PostMapping(value = "/import", consumes = "multipart/form-data")
public AjaxResult export(@RequestPart("file") MultipartFile file) throws Exception {
//读取所有的字段
ExcelUtil<AssetExport> util = new ExcelUtil<>(AssetExport.class);
List<AssetExport> proList = util.importExcel(file.getInputStream());
for (AssetExport items : proList) {
AssetCurrent as = new AssetCurrent();
//copy新增到新的现有资产表里面
BeanUtil.copyProperties(items,as);
assetCurrentService.save(as);
//新增系统建设单位
AssetSupplyChain s1 = new AssetSupplyChain();
BeanUtil.copyProperties(items,s1);
s1.setType(5);
s1.setAssetId(as.getId());
assetSupplyChainService.save(s1);
//新增服务器信息
AssetBasicNetwork a1 = new AssetBasicNetwork();
BeanUtil.copyProperties(items,a1);
a1.setType(1);
a1.setAssetId(as.getId());
assetBasicNetworkService.save(a1);
//新增网络设备
AssetBasicNetwork a2 = new AssetBasicNetwork();
a2.setSblx(items.getWlsblx());
a2.setPp(items.getWlpp());
a2.setSbIp(items.getWlsbIp());
a2.setYjxh(items.getWlyjxh());
a2.setYjxlh(items.getWlyjxlh());
a2.setYjbbxx(items.getWlyjbbxx());
a2.setYjyt(items.getWlyjyt());
a2.setYjbsxx(items.getWlyjbsxx());
a2.setType(2);
a2.setAssetId(as.getId());
assetBasicNetworkService.save(a2);
//新增安全设备
AssetBasicNetwork a3 = new AssetBasicNetwork();
a3.setSblx(items.getAqwlsblx());
a3.setPp(items.getAqwlpp());
a3.setSbIp(items.getAqwlsbIp());
a3.setType(3);
a3.setAssetId(as.getId());
assetBasicNetworkService.save(a3);
}
return AjaxResult.success();
}
}

@ -1,25 +1,17 @@
package com.ruoyi.tc.controller; package com.ruoyi.tc.controller;
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.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType; import com.ruoyi.tc.entity.UnitOtherConcat;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.domain.UnitOtherConcat;
import com.ruoyi.tc.service.UnitOtherConcatService; import com.ruoyi.tc.service.UnitOtherConcatService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.io.Serializable; import java.io.Serializable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
/** /**
* (unit_other_contact) * (unit_other_contact)
@ -27,7 +19,7 @@ import java.util.List;
* @since 2024/11/13 14:50 * @since 2024/11/13 14:50
*/ */
@RestController @RestController
@RequestMapping("/unit/otherConcat") @RequestMapping("/tc/unit/otherConcat")
@Api(tags = "单位其他联系人控制层") @Api(tags = "单位其他联系人控制层")
public class UnitOtherConcatController extends BaseController { public class UnitOtherConcatController extends BaseController {
/** /**

@ -0,0 +1,86 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* (asset_basic_network)
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("资产基础网络")
@TableName(value = "asset_basic_network")
public class AssetBasicNetwork extends BaseClass implements Serializable {
@TableId(type = IdType.AUTO,value = "id")
private Integer id;
/**
* id
*/
@ApiModelProperty("资源id")
private Long assetId;
/**
* 1.23
*/
@ApiModelProperty("1.服务器信息2网络设备3安全设备")
private Integer type;
/**
*
*/
@ApiModelProperty("设备类型")
private String sblx;
/**
*
*/
@ApiModelProperty("品牌")
private String pp;
/**
* IP
*/
@ApiModelProperty("设备IP")
private String sbIp;
/**
*
*/
@ApiModelProperty("操作系统")
private Integer czxt;
/**
*
*/
@ApiModelProperty("操作系统版本")
private String czxtbb;
/**
*
*/
@ApiModelProperty("硬件型号")
private String yjxh;
/**
*
*/
@ApiModelProperty("硬件序列号")
private String yjxlh;
/**
*
*/
@ApiModelProperty("硬件版本信息")
private String yjbbxx;
/**
*
*/
@ApiModelProperty("硬件用途")
private String yjyt;
/**
*
*/
@ApiModelProperty("硬件部署位置")
private String yjbsxx;
}

@ -0,0 +1,400 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* (asset_business_form)
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("资产新监管业务形态")
@TableName(value = "asset_business_form")
public class AssetBusinessForm extends BaseClass implements Serializable {
@TableId(type = IdType.AUTO,value = "id")
private Integer id;
/**
* id
*/
@ApiModelProperty("资源id")
private Long assetId;
/**
* -
*/
@Size(max= 50,message="云平台-云平台服务商长度不能超过50")
@ApiModelProperty("云平台-云平台服务商")
private String yptFws;
/**
* -
*/
@ApiModelProperty("云平台-是否租户级安全")
private Integer yptSfzh;
/**
* -
*/
@Size(max= 50,message="云平台-云平台类型长度不能超过50")
@ApiModelProperty("云平台-云平台类型")
private String yptLx;
/**
* -
*/
@Size(max= 50,message="云平台-硬件资源大小长度不能超过50")
@ApiModelProperty("云平台-硬件资源大小")
private String yptYjzydx;
/**
* -
*/
@Size(max= 50,message="云平台-平台架构长度不能超过50")
@ApiModelProperty("云平台-平台架构")
private String yptPtjg;
/**
* -IP
*/
@Size(max= 50,message="云平台-互联网IP段长度不能超过50")
@ApiModelProperty("云平台-互联网IP段")
private String yptIp;
/**
* -
*/
@Size(max= 50,message="云平台-机房联系人长度不能超过50")
@ApiModelProperty("云平台-机房联系人")
private String yptJflxr;
/**
* -
*/
@Size(max= 50,message="云平台-机房联系人电话长度不能超过50")
@ApiModelProperty("云平台-机房联系人电话")
private String yptJflxrdh;
/**
* -
*/
@Size(max= 50,message="云平台-服务器设备类型长度不能超过50")
@ApiModelProperty("云平台-服务器设备类型")
private String yptFwqsblx;
/**
* -
*/
@Size(max= 50,message="大数据平台-平台服务商长度不能超过50")
@ApiModelProperty("大数据平台-平台服务商")
private String dsjPtfws;
/**
* -
*/
@Size(max= 50,message="大数据平台-敏感数据类型长度不能超过50")
@ApiModelProperty("大数据平台-敏感数据类型")
private String dsjMgsjlx;
/**
* -
*/
@Size(max= 50,message="大数据平台-硬件资源长度不能超过50")
@ApiModelProperty("大数据平台-硬件资源")
private String dsjYjzy;
/**
* -
*/
@Size(max= 50,message="大数据平台-系统数据量长度不能超过50")
@ApiModelProperty("大数据平台-系统数据量")
private String dsjXtsjl;
/**
* -
*/
@Size(max= 50,message="大数据平台-机房联系人长度不能超过50")
@ApiModelProperty("大数据平台-机房联系人")
private String dsjJflxr;
/**
* -
*/
@Size(max= 50,message="大数据平台-机房联系人电话长度不能超过50")
@ApiModelProperty("大数据平台-机房联系人电话")
private String dsjJflxrdh;
/**
* -
*/
@ApiModelProperty("大数据平台-是否数据审计")
private Integer dsjSfsjsj;
/**
* -
*/
@Size(max= 50,message="一般物联网设备-系统集成商名称长度不能超过50")
@ApiModelProperty("一般物联网设备-系统集成商名称")
private String wlwsbXtjcs;
/**
* -
*/
@Size(max= 50,message="一般物联网设备-用户数量长度不能超过50")
@ApiModelProperty("一般物联网设备-用户数量")
private String wlwsbYhsl;
/**
* -
*/
@ApiModelProperty("一般物联网设备-服务对象")
private Integer wlwsbFwdx;
/**
* -
*/
@Size(max= 50,message="一般物联网设备-终端数量长度不能超过50")
@ApiModelProperty("一般物联网设备-终端数量")
private String wlwsbZdsl;
/**
* -
*/
@ApiModelProperty("一般物联网设备-网络互联情况")
private Integer wlwsbWlhlqk;
/**
* -
*/
@Size(max= 50,message="一般物联网设备-联系人长度不能超过50")
@ApiModelProperty("一般物联网设备-联系人")
private String wlwsbLxr;
/**
* -
*/
@ApiModelProperty("一般物联网设备-服务范围")
private Integer wlwsbFwfw;
/**
* -
*/
@Size(max= 50,message="一般物联网设备-联系人电话长度不能超过50")
@ApiModelProperty("一般物联网设备-联系人电话")
private String wlwsbLxrdh;
/**
* -
*/
@Size(max= 500,message="一般物联网设备-服务内容长度不能超过500")
@ApiModelProperty("一般物联网设备-服务内容")
private String wlwsbFwnr;
/**
* -
*/
@Size(max= 50,message="摄像头-摄像头品牌长度不能超过50")
@ApiModelProperty("摄像头-摄像头品牌")
private String sxtPp;
/**
* -
*/
@Size(max= 255,message="摄像头-位置长度不能超过255")
@ApiModelProperty("摄像头-位置")
private String sxtWz;
/**
* -IP
*/
@Size(max= 50,message="摄像头-摄像头IP长度不能超过50")
@ApiModelProperty("摄像头-摄像头IP")
private String sxtIp;
/**
* -
*/
@Size(max= 50,message="摄像头-区域长度不能超过50")
@ApiModelProperty("摄像头-区域")
private String sxtQy;
/**
* -
*/
@Size(max= 50,message="摄像头-摄像头数量长度不能超过50")
@ApiModelProperty("摄像头-摄像头数量")
private String sxtSl;
/**
* -
*/
@Size(max= 50,message="摄像头-端口长度不能超过50")
@ApiModelProperty("摄像头-端口")
private String sxtDk;
/**
* -
*/
@Size(max= 50,message="摄像头-设备型号长度不能超过50")
@ApiModelProperty("摄像头-设备型号")
private String sxtSbxh;
/**
* -
*/
@Size(max= 50,message="摄像头-固定版本长度不能超过50")
@ApiModelProperty("摄像头-固定版本")
private String sxtGdbb;
/**
* APP-APP
*/
@Size(max= 50,message="移动APP-移动APP系统长度不能超过50")
@ApiModelProperty("移动APP-移动APP系统")
private String appXt;
/**
* APP-
*/
@Size(max= 50,message="移动APP-服务端域名长度不能超过50")
@ApiModelProperty("移动APP-服务端域名")
private String appYm;
/**
* APP-APP
*/
@Size(max= 50,message="移动APP-移动APP渠道长度不能超过50")
@ApiModelProperty("移动APP-移动APP渠道")
private String appQd;
/**
* APP-IP
*/
@Size(max= 50,message="移动APP-服务端IP长度不能超过50")
@ApiModelProperty("移动APP-服务端IP")
private String appIp;
/**
* APP-
*/
@Size(max= 50,message="移动APP-联系人长度不能超过50")
@ApiModelProperty("移动APP-联系人")
private String appLxr;
/**
* APP-
*/
@Size(max= 50,message="移动APP-联系人电话长度不能超过50")
@ApiModelProperty("移动APP-联系人电话")
private String appLxrdh;
/**
* APP-APP
*/
@ApiModelProperty("移动APP-APP是否有身份认证")
private Integer appSfysfrz;
/**
* -
*/
@Size(max= 255,message="工业控制-系统集成商名称长度不能超过255")
@ApiModelProperty("工业控制-系统集成商名称")
private String gykzJcs;
/**
* -
*/
@Size(max= 255,message="工业控制-运行时间长度不能超过255")
@ApiModelProperty("工业控制-运行时间")
private String gykzYxsj;
/**
* -
*/
@ApiModelProperty("工业控制-服务对象")
private Integer gykzFwdx;
/**
* -
*/
@Size(max= 255,message="工业控制-集成商国内外情况长度不能超过255")
@ApiModelProperty("工业控制-集成商国内外情况")
private String gykzJcsqk;
/**
* -
*/
@ApiModelProperty("工业控制-网络互联情况")
private Integer gykzWlhxqk;
/**
* -
*/
@Size(max= 255,message="工业控制-联系人长度不能超过255")
@ApiModelProperty("工业控制-联系人")
private String gykzLxr;
/**
* -
*/
@ApiModelProperty("工业控制-服务范围")
private Integer gykzFwfw;
/**
* -
*/
@Size(max= 50,message="工业控制-联系人电话长度不能超过50")
@ApiModelProperty("工业控制-联系人电话")
private String gykzLxrdh;
/**
* -
*/
@Size(max= 50,message="工业控制-设备名称长度不能超过50")
@ApiModelProperty("工业控制-设备名称")
private String gykzSbmc;
/**
* -
*/
@Size(max= 50,message="工业控制-设备品牌长度不能超过50")
@ApiModelProperty("工业控制-设备品牌")
private String gykzSbpp;
/**
* -
*/
@Size(max= 50,message="工业控制-设备类别长度不能超过50")
@ApiModelProperty("工业控制-设备类别")
private String gykzSblb;
/**
* -
*/
@Size(max= 50,message="工业控制-运营商长度不能超过50")
@ApiModelProperty("工业控制-运营商")
private String gykzYys;
/**
* -IP
*/
@Size(max= 50,message="工业控制-互联网IP长度不能超过50")
@ApiModelProperty("工业控制-互联网IP")
private String gykzHlwIp;
/**
* -
*/
@Size(max= 50,message="工业控制-网络层级长度不能超过50")
@ApiModelProperty("工业控制-网络层级")
private String gykzWlcj;
/**
* -IP
*/
@Size(max= 50,message="工业控制-控制台IP长度不能超过50")
@ApiModelProperty("工业控制-控制台IP")
private String gykzKztIp;
/**
* -
*/
@Size(max= 500,message="工业控制-描述长度不能超过500")
@ApiModelProperty("工业控制-描述")
private String gykzMs;
/**
* CDN-CDN
*/
@Size(max= 255,message="CDN信息-CDN供应商长度不能超过255")
@ApiModelProperty("CDN信息-CDN供应商")
private String cdnGys;
/**
* CDN-CDN使
*/
@ApiModelProperty("CDN信息-CDN是否使用")
private Integer cdnSfsy;
/**
* CDN-CDN
*/
@Size(max= 50,message="CDN信息-CDN类型长度不能超过50")
@ApiModelProperty("CDN信息-CDN类型")
private String cdnLx;
/**
* CDN-CDN
*/
@Size(max= 50,message="CDN信息-CDN域名长度不能超过50")
@ApiModelProperty("CDN信息-CDN域名")
private String cdnYm;
/**
* CDN-
*/
@Size(max= 50,message="CDN信息-联系人长度不能超过50")
@ApiModelProperty("CDN信息-联系人")
private String cdnLxr;
/**
* CDN-
*/
@Size(max= 50,message="CDN信息-联系人电话长度不能超过50")
@ApiModelProperty("CDN信息-联系人电话")
private String cdnLxrdh;
/**
* CDN-CDN
*/
@Size(max= 500,message="CDN信息-CDN加速信息长度不能超过500")
@ApiModelProperty("CDN信息-CDN加速信息")
private String cdnJsxx;
}

@ -0,0 +1,129 @@
package com.ruoyi.tc.entity;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import lombok.Data;
/**
*
* @author du
* @since 2024/11/18 8:55
*/
@Data
@ApiModel("导入导出模板读取字段")
public class AssetExport extends AssetCurrent{
/**
*
*/
@Excel(name = "*系统建设单位名称",width=26,sort = 65)
private String name;
/**
*
*/
@Excel(name = "*系统建设单位统一信用代码",width=26,sort = 66)
private String tyshxydm;
/**
*
*/
@Excel(name = "*系统建设单位联系人",width=26,sort = 67)
private String lxr;
/**
*
*/
@Excel(name = "*系统建设单位联系电话",width=26,sort = 68)
private String lxdh;
/**
*
*/
@Excel(name = "*系统建设单位供应商注册地址",width=26,sort = 69)
private String gyszcdz;
/**
*
*/
@Excel(name = "*系统建设单位注册地址是否为太仓",width=26,sort = 70,dictType = "is_no",comboReadDict = true)
private Integer sfwtc;
/**
*
*/
@Excel(name = "*服务器信息-设备类型",width=26,sort = 77)
private String sblx;
/**
*
*/
@Excel(name = "*服务器信息-品牌",width=26,sort = 78)
private String pp;
/**
* IP
*/
@Excel(name = "*服务器信息-设备IP",width=26,sort = 79)
private String sbIp;
/**
*
*/
@Excel(name = "*服务器信息-操作系统",width=26,sort = 80,dictType = "fwq_czxt",comboReadDict = true)
private Integer czxt;
/**
*
*/
@Excel(name = "*服务器信息-操作系统版本",width=26,sort = 81)
private String czxtbb;
/**
*
*/
@Excel(name = "*服务器信息-硬件型号",width=26,sort = 82)
private String yjxh;
/**
*
*/
@Excel(name = "服务器信息-硬件序列号",width=26,sort = 83)
private String yjxlh;
/**
*
*/
@Excel(name = "服务器信息-硬件版本信息",width=26,sort = 84)
private String yjbbxx;
/**
*
*/
@Excel(name = "*服务器信息-硬件用途",width=26,sort = 85)
private String yjyt;
/**
*
*/
@Excel(name = "*服务器信息-硬件部署位置",width=26,sort = 85)
private String yjbsxx;
@Excel(name = "*网络设备-设备类型",width=26,sort = 86)
private String wlsblx;
@Excel(name = "*网络设备-品牌",width=26,sort = 87)
private String wlpp;
@Excel(name = "*网络设备-设备IP",width=26,sort = 88)
private String wlsbIp;
@Excel(name = "*网络设备-硬件型号",width=26,sort = 89)
private String wlyjxh;
@Excel(name = "网络设备-硬件序列号",width=26,sort = 90)
private String wlyjxlh;
@Excel(name = "网络设备-硬件版本信息",width=26,sort = 91)
private String wlyjbbxx;
@Excel(name = "*网络设备-硬件用途",width=26,sort = 92)
private String wlyjyt;
@Excel(name = "*网络设备-硬件部署位置",width=26,sort = 93)
private String wlyjbsxx;
@Excel(name = "*安全设备-设备类型",width=26,sort = 94)
private String aqwlsblx;
@Excel(name = "*安全设备-品牌",width=26,sort = 95)
private String aqwlpp;
@Excel(name = "*安全设备-设备IP",width=26,sort = 96)
private String aqwlsbIp;
}

@ -0,0 +1,75 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.Date;
/**
* (asset_supply_chain)
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("资产供应链信息")
@TableName(value = "asset_supply_chain")
public class AssetSupplyChain extends BaseClass implements Serializable {
@TableId(value = "id",type = IdType.AUTO)
private Integer id;
/**
* id
*/
@ApiModelProperty("资产id")
private Long assetId;
/**
* 1.2.3.4.5.6.
*/
@ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位")
private Integer type;
/**
*
*/
@Size(max= 50,message="名称长度不能超过50")
@ApiModelProperty("名称")
private String name;
/**
*
*/
@Size(max= 50,message="统一信用代码长度不能超过50")
@ApiModelProperty("统一信用代码")
private String tyshxydm;
/**
*
*/
@Size(max= 50,message="联系人长度不能超过50")
@ApiModelProperty("联系人")
private String lxr;
/**
*
*/
@Size(max= 50,message="联系电话长度不能超过50")
@ApiModelProperty("联系电话")
private String lxdh;
/**
*
*/
@Size(max= 500,message="供应商注册地址长度不能超过500")
@ApiModelProperty("供应商注册地址")
private String gyszcdz;
/**
*
*/
@ApiModelProperty("注册地是否为太仓")
private Integer sfwtc;
}

@ -0,0 +1,42 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.*;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* (unit_other_contact)
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("单位其他联系人")
@TableName(value = "unit_other_contact")
public class UnitOtherConcat extends BaseClass implements Serializable {
@TableId(type = IdType.AUTO,value = "id")
private Long id;
@ApiModelProperty("单位id")
@NotNull
private Long unitId;
@ApiModelProperty("其他联系人姓名")
private String qtlxrxm;
@ApiModelProperty("其他联系人联系方式")
private String qtlxrlxfs;
@ApiModelProperty("其他联系人邮箱")
private String qtlxryx;
@ApiModelProperty("其他联系人职务职称")
private String qtlxrzwzc;
}

@ -0,0 +1,57 @@
package com.ruoyi.tc.entity.request;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
*
* @author du
* @since 2024/11/15 15:37
*/
@Data
public class AssetCurrentPageRequest {
/**
*
*/
@ApiModelProperty("系统名称")
private String xtmc;
/**
*
*/
@ApiModelProperty("系统类型(字典)")
private Integer xtlx;
/**
*
*/
@ApiModelProperty("单位名称")
private String dwmc;
/**
*
*/
@ApiModelProperty("系统状态(字典)")
private Integer xtzt;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("开始时间")
private Date startTime;
/**
*
*/
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("结束时间")
private Date endTime;
}

@ -0,0 +1,19 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.AssetBasicNetwork;
import java.util.List;
/**
* (asset_basic_network)访
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetBasicNetWorkMapper extends BaseMapper<AssetBasicNetwork> {
/**
* id
*/
List<AssetBasicNetwork> getByAssetId(Long id);
}

@ -0,0 +1,14 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.AssetBusinessForm;
/**
* (asset_business_form)访
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetBusinessFormMapper extends BaseMapper<AssetBusinessForm> {
}

@ -0,0 +1,30 @@
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.AssetCurrent;
import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* (AssetCurrent)访
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetCurrentMapper extends BaseMapper<AssetCurrent> {
/**
*
*
* @param page
* @param as
* @return
*/
Page<AssetCurrent> page(Page<AssetCurrent> page,@Param("req") AssetCurrentPageRequest as);
List<AssetCurrent> page(@Param("req") AssetCurrentPageRequest as);
}

@ -0,0 +1,19 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.AssetSupplyChain;
/**
* (asset_supply_chain)访
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetSupplyChainMapper extends BaseMapper<AssetSupplyChain> {
/**
* id
*/
AssetSupplyChain getJsdw(Long id);
}

@ -1,11 +1,7 @@
package com.ruoyi.tc.mapper; package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.common.core.domain.entity.SysDept; import com.ruoyi.tc.entity.UnitOtherConcat;
import com.ruoyi.tc.domain.UnitOtherConcat;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/** /**
* (unit_other_contact) * (unit_other_contact)

@ -0,0 +1,20 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.AssetBasicNetwork;
import java.util.List;
/**
* (asset_basic_network)
*
* @author makejava
* @since 2024-11-15 16:05:26
*/
public interface AssetBasicNetworkService extends IService<AssetBasicNetwork> {
/**
* id
*/
List<AssetBasicNetwork> getByAssetId(Long id);
}

@ -0,0 +1,15 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.AssetBusinessForm;
/**
* (asset_business_form)
*
* @author makejava
* @since 2024-11-15 16:06:53
*/
public interface AssetBusinessFormService extends IService<AssetBusinessForm> {
}

@ -0,0 +1,36 @@
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.AssetCurrent;
import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
import java.util.List;
/**
* (AssetCurrent)
*
* @author makejava
* @since 2024-11-15 10:04:03
*/
public interface AssetCurrentService extends IService<AssetCurrent> {
/**
*
*
* @param page
* @param as
* @return
*/
Page<AssetCurrent> page(Page<AssetCurrent> page, AssetCurrentPageRequest as );
/**
*
*
* @param as
* @return
*/
List<AssetCurrent> page( AssetCurrentPageRequest as );
}

@ -0,0 +1,17 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.AssetSupplyChain;
/**
* (asset_supply_chain)
* @author makejava
* @since 2024-11-15 16:07:30
*/
public interface AssetSupplyChainService extends IService<AssetSupplyChain> {
/**
* id
*/
AssetSupplyChain getJsdw(Long id);
}

@ -1,8 +1,7 @@
package com.ruoyi.tc.service; package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.domain.UnitOtherConcat; import com.ruoyi.tc.entity.UnitOtherConcat;
/** /**
* (unit_other_contact) * (unit_other_contact)

@ -0,0 +1,26 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.AssetBasicNetwork;
import com.ruoyi.tc.mapper.AssetBasicNetWorkMapper;
import com.ruoyi.tc.service.AssetBasicNetworkService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (AssetBasicNetwork)
*
* @author makejava
* @since 2024-11-15 16:05:26
*/
@Service("assetBasicNetworkService")
public class AssetBasicNetworkServiceImpl extends ServiceImpl<AssetBasicNetWorkMapper, AssetBasicNetwork> implements AssetBasicNetworkService {
/**
* id
*/
@Override
public List<AssetBasicNetwork> getByAssetId(Long id) {
return baseMapper.getByAssetId(id);
}
}

@ -0,0 +1,19 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.AssetBusinessForm;
import com.ruoyi.tc.mapper.AssetBusinessFormMapper;
import com.ruoyi.tc.service.AssetBusinessFormService;
import org.springframework.stereotype.Service;
/**
* (AssetBusinessForm)
*
* @author makejava
* @since 2024-11-15 16:06:53
*/
@Service("assetBusinessFormService")
public class AssetBusinessFormServiceImpl extends ServiceImpl<AssetBusinessFormMapper, AssetBusinessForm> implements AssetBusinessFormService {
}

@ -0,0 +1,45 @@
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.request.AssetCurrentPageRequest;
import com.ruoyi.tc.mapper.AssetCurrentMapper;
import com.ruoyi.tc.service.AssetCurrentService;
import org.springframework.stereotype.Service;
import java.util.List;
/**
* (AssetCurrent)
*
* @author makejava
* @since 2024-11-15 10:04:03
*/
@Service("assetCurrentService")
public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, AssetCurrent> implements AssetCurrentService {
/**
*
*
* @param page
* @param as
* @return
*/
@Override
public Page<AssetCurrent> page(Page<AssetCurrent> page, AssetCurrentPageRequest as) {
return baseMapper.page(page,as);
}
/**
*
*
* @param as
* @return
*/
@Override
public List<AssetCurrent> page(AssetCurrentPageRequest as) {
return baseMapper.page(as);
}
}

@ -0,0 +1,25 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.AssetSupplyChain;
import com.ruoyi.tc.mapper.AssetSupplyChainMapper;
import com.ruoyi.tc.service.AssetSupplyChainService;
import org.springframework.stereotype.Service;
/**
* (AssetSupplyChain)
*
* @author makejava
* @since 2024-11-15 16:07:30
*/
@Service("assetSupplyChainService")
public class AssetSupplyChainServiceImpl extends ServiceImpl<AssetSupplyChainMapper, AssetSupplyChain> implements AssetSupplyChainService {
/**
* id
*/
@Override
public AssetSupplyChain getJsdw(Long id) {
return baseMapper.getJsdw(id);
}
}

@ -1,7 +1,7 @@
package com.ruoyi.tc.service.impl; package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.domain.UnitOtherConcat; import com.ruoyi.tc.entity.UnitOtherConcat;
import com.ruoyi.tc.mapper.UnitOtherConcatMapper; import com.ruoyi.tc.mapper.UnitOtherConcatMapper;
import com.ruoyi.tc.service.UnitOtherConcatService; import com.ruoyi.tc.service.UnitOtherConcatService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system; package com.ruoyi.web.controller.system;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ruoyi.common.annotation.Log; import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -15,6 +14,8 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.*; import com.ruoyi.system.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -33,6 +34,7 @@ import java.util.stream.Collectors;
* @author ruoyi * @author ruoyi
*/ */
@RestController @RestController
@Api(tags = "用户信息")
@RequestMapping("/system/user") @RequestMapping("/system/user")
public class SysUserController extends BaseController { public class SysUserController extends BaseController {
@Autowired @Autowired
@ -53,6 +55,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "获取用户列表")
@PreAuthorize("@ss.hasPermi('system:user:list')") @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(SysUser user) { public TableDataInfo list(SysUser user) {
@ -60,7 +63,7 @@ public class SysUserController extends BaseController {
List<SysUser> list = userService.selectUserList(user); List<SysUser> list = userService.selectUserList(user);
return getDataTable(list); return getDataTable(list);
} }
@ApiOperation(value = "用户单位导出")
@Log(title = "用户单位管理", businessType = BusinessType.EXPORT) @Log(title = "用户单位管理", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')") @PreAuthorize("@ss.hasPermi('system:user:export')")
@PostMapping("/export") @PostMapping("/export")
@ -72,7 +75,7 @@ public class SysUserController extends BaseController {
ExcelUtil<Unit> util = new ExcelUtil<>(Unit.class); ExcelUtil<Unit> util = new ExcelUtil<>(Unit.class);
util.exportExcel(response, list, "单位数据"); util.exportExcel(response, list, "单位数据");
} }
@ApiOperation(value = "用户单位导入")
@Log(title = "用户单位管理", businessType = BusinessType.IMPORT) @Log(title = "用户单位管理", businessType = BusinessType.IMPORT)
@PreAuthorize("@ss.hasPermi('system:user:import')") @PreAuthorize("@ss.hasPermi('system:user:import')")
@PostMapping("/importData") @PostMapping("/importData")
@ -109,6 +112,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "根据用户编号获取详细信息")
@PreAuthorize("@ss.hasPermi('system:user:query')") @PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping(value = {"/", "/{userId}"}) @GetMapping(value = {"/", "/{userId}"})
public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) { public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId) {
@ -131,6 +135,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "新增用户")
@PreAuthorize("@ss.hasPermi('system:user:add')") @PreAuthorize("@ss.hasPermi('system:user:add')")
@Log(title = "用户管理", businessType = BusinessType.INSERT) @Log(title = "用户管理", businessType = BusinessType.INSERT)
@PostMapping @PostMapping
@ -161,6 +166,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "修改用户")
@PreAuthorize("@ss.hasPermi('system:user:edit')") @PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping @PutMapping
@ -191,6 +197,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "删除用户")
@PreAuthorize("@ss.hasPermi('system:user:remove')") @PreAuthorize("@ss.hasPermi('system:user:remove')")
@Log(title = "用户管理", businessType = BusinessType.DELETE) @Log(title = "用户管理", businessType = BusinessType.DELETE)
@DeleteMapping("/{userIds}") @DeleteMapping("/{userIds}")
@ -204,6 +211,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "重置密码")
@PreAuthorize("@ss.hasPermi('system:user:resetPwd')") @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/resetPwd") @PutMapping("/resetPwd")
@ -218,6 +226,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "状态修改")
@PreAuthorize("@ss.hasPermi('system:user:edit')") @PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.UPDATE) @Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping("/changeStatus") @PutMapping("/changeStatus")
@ -231,6 +240,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "根据用户编号获取授权角色")
@PreAuthorize("@ss.hasPermi('system:user:query')") @PreAuthorize("@ss.hasPermi('system:user:query')")
@GetMapping("/authRole/{userId}") @GetMapping("/authRole/{userId}")
public AjaxResult authRole(@PathVariable("userId") Long userId) { public AjaxResult authRole(@PathVariable("userId") Long userId) {
@ -245,6 +255,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "用户授权角色")
@PreAuthorize("@ss.hasPermi('system:user:edit')") @PreAuthorize("@ss.hasPermi('system:user:edit')")
@Log(title = "用户管理", businessType = BusinessType.GRANT) @Log(title = "用户管理", businessType = BusinessType.GRANT)
@PutMapping("/authRole") @PutMapping("/authRole")
@ -258,6 +269,7 @@ public class SysUserController extends BaseController {
/** /**
* *
*/ */
@ApiOperation(value = "获取部门树列表")
@PreAuthorize("@ss.hasPermi('system:user:list')") @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree") @GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) { public AjaxResult deptTree(SysDept dept) {

@ -101,9 +101,9 @@ token:
# mybatis-plus配置 # mybatis-plus配置
mybatis-plus: mybatis-plus:
# 搜索指定包别名 # 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.entity,
# 配置mapper的扫描找到所有的mapper.xml映射文件 # 配置mapper的扫描找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper/**/*.xml
# 加载全局的配置文件 # 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml configLocation: classpath:mybatis/mybatis-config.xml

@ -0,0 +1,24 @@
<?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">
<select id="getByAssetId" resultType="com.ruoyi.tc.entity.AssetBasicNetwork">
select *
from asset_basic_network
where asset_id = #{id}
group by type,
id,
sblx,
pp,
sb_ip,
czxt,
czxtbb,
yjxh,
yjxlh,
yjbbxx,
yjyt,
yjbsxx
order by create_time asc
</select>
</mapper>

@ -0,0 +1,6 @@
<?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.AssetBusinessFormMapper">
</mapper>

@ -0,0 +1,30 @@
<?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.AssetCurrentMapper">
<select id="page" resultType="com.ruoyi.tc.entity.AssetCurrent">
select * from asset_current
<where>
<if test="req.xtmc!=null and req.xtmc!='' ">
and xtmc like concat('%',#{req.xtmc},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and dwmc like concat('%',#{req.dwmc},'%')
</if>
<if test="req.xtmc!=null">
and xtlx = #{req.xtmc}
</if>
<if test="req.xtzt!=null">
and xtzt = #{req.xtmc}
</if>
<if test="req.startTime != null ">
and create_time &gt;= #{req.startTime}
</if>
<if test="req.endTime != null">
and create_time &lt;= #{req.endTime}
</if>
</where>
</select>
</mapper>

@ -0,0 +1,13 @@
<?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">
<select id="getJsdw" resultType="com.ruoyi.tc.entity.AssetSupplyChain">
select *
from asset_supply_chain
where asset_id = #{id} and type = 5
order by create_time asc
limit 1
</select>
</mapper>

@ -20,7 +20,7 @@ public @interface Excel
{ {
/** /**
* excel *
*/ */
public boolean required() default false; public boolean required() default false;

@ -202,4 +202,7 @@ public class Unit implements Serializable {
@ApiModelProperty("备注") @ApiModelProperty("备注")
@Excel(name = "备注") @Excel(name = "备注")
private String remark; private String remark;
@ApiModelProperty("删除标志0代表存在 2代表删除")
private String delFlag;
} }

@ -115,7 +115,7 @@ public class SecurityConfig
// 静态资源,可匿名访问 // 静态资源,可匿名访问
.antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll() .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
.antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll()
.antMatchers("/system/user/**").permitAll() .antMatchers("/tc/**").permitAll()
// 除上面外的所有请求全部需要鉴权认证 // 除上面外的所有请求全部需要鉴权认证
.anyRequest().authenticated(); .anyRequest().authenticated();
}) })

@ -109,6 +109,9 @@ public interface SysUserMapper
*/ */
public SysUser checkUserNameUnique(String userName); public SysUser checkUserNameUnique(String userName);
List<SysUser> selectUserByIds(Long[] userIds);
// /** // /**
// * 校验手机号码是否唯一 // * 校验手机号码是否唯一
// * // *

@ -21,4 +21,9 @@ public interface UnitMapper extends BaseMapper<Unit> {
* @return * @return
*/ */
List<Unit> selectUnitList(@Param("req") UnitRequest a); List<Unit> selectUnitList(@Param("req") UnitRequest a);
/**
*
*/
void deleteInCode(List<String> code);
} }

@ -1,7 +1,6 @@
package com.ruoyi.system.service; package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.Unit; import com.ruoyi.common.core.domain.entity.Unit;
import com.ruoyi.common.core.domain.request.UnitRequest; import com.ruoyi.common.core.domain.request.UnitRequest;
@ -21,4 +20,9 @@ public interface UnitService extends IService<Unit> {
* @return * @return
*/ */
List<Unit> selectUnitList(UnitRequest unit); List<Unit> selectUnitList(UnitRequest unit);
/**
*
*/
void deleteInCode(List<String> code);
} }

@ -3,7 +3,10 @@ package com.ruoyi.system.service.impl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.validation.Validator; import javax.validation.Validator;
import com.ruoyi.system.service.UnitService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -65,6 +68,8 @@ public class SysUserServiceImpl implements ISysUserService
@Autowired @Autowired
protected Validator validator; protected Validator validator;
@Resource
private UnitService unitService;
/** /**
* *
* *
@ -471,6 +476,12 @@ public class SysUserServiceImpl implements ISysUserService
userRoleMapper.deleteUserRole(userIds); userRoleMapper.deleteUserRole(userIds);
// 删除用户与岗位关联 // 删除用户与岗位关联
userPostMapper.deleteUserPost(userIds); userPostMapper.deleteUserPost(userIds);
List<SysUser> sysUsers = userMapper.selectUserByIds(userIds);
List<String> nl = new ArrayList<>();
sysUsers.forEach(x->{
nl.add(x.getUserName());
});
unitService.deleteInCode(nl);
return userMapper.deleteUserByIds(userIds); return userMapper.deleteUserByIds(userIds);
} }

@ -28,4 +28,12 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
public List<Unit> selectUnitList(UnitRequest unit) { public List<Unit> selectUnitList(UnitRequest unit) {
return baseMapper.selectUnitList(unit); return baseMapper.selectUnitList(unit);
} }
/**
*
*/
@Override
public void deleteInCode(List<String> code) {
baseMapper.deleteInCode(code);
}
} }

@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1 select user_id, user_name from sys_user where user_name = #{userName} and del_flag = '0' limit 1
</select> </select>
<!-- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">--> <!-- <select id="checkPhoneUnique" parameterType="String" resultMap="SysUserResult">-->
<!-- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1--> <!-- select user_id, phonenumber from sys_user where phonenumber = #{phonenumber} and del_flag = '0' limit 1-->
<!-- </select>--> <!-- </select>-->
@ -208,5 +209,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{userId} #{userId}
</foreach> </foreach>
</delete> </delete>
<select id="selectUserByIds" resultType="com.ruoyi.common.core.domain.entity.SysUser">
select * from sys_user where user_id in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{userId}
</foreach>
</select>
</mapper> </mapper>

@ -48,6 +48,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="updateTime" column="update_time"/> <result property="updateTime" column="update_time"/>
<result property="remark" column="remark"/> <result property="remark" column="remark"/>
</resultMap> </resultMap>
<delete id="deleteInCode">
update unit_info set del_flag = '2' where user_name in
<foreach collection="array" item="userId" open="(" separator="," close=")">
#{code}
</foreach>
</delete>
<select id="selectUnitList" parameterType="unit" resultMap="unitResult"> <select id="selectUnitList" parameterType="unit" resultMap="unitResult">
select * from unit_info select * from unit_info

Loading…
Cancel
Save