suzhou-jichuang-lanhai
/
TcAssetVerificationJava
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: suzhou-jichuang-lanhai:170efa77b925295637228d95a22f90bd71e1568e
Branches Tags
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:main
...
compare: suzhou-jichuang-lanhai:1efd07019e044f0365e1b3b6baba3ff03fa38a3d
Branches Tags
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:main

17 Commits
170efa77b9 ... 1efd07019e

Author SHA1 Message Date
杜函宇 1efd07019e 注释
2 weeks ago
杜函宇 3b0284aa21 导出单位密码
2 weeks ago
杜函宇 c265650ddc 修改组织架构
2 weeks ago
杜函宇 ae7cfd790f 修改组织架构导入
2 weeks ago
杜函宇 f02efaa94a 修改web资产导入导出模板
2 weeks ago
杜函宇 4b89d0945a 修改web资产导入导出模板
2 weeks ago
杜函宇 3a7619eec7 bugfix
3 weeks ago
杜函宇 bcc992f5cb Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu
3 weeks ago
杜函宇 f0cd1f977a bugfix
3 weeks ago
杜函宇 cbe183333f 单位自编辑资产
3 weeks ago
杜函宇 eabcdd08b3 web资产增加字段
3 weeks ago
杜函宇 1c0a4cab4c Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu
3 weeks ago
杜函宇 c0b5a4a4cc 单位增加字段
1 month ago
杜函宇 6761277da9 bugfix
1 month ago
杜函宇 1497cb7751 Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu
1 month ago
杜函宇 cbdf33157e Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu
1 month ago
杜函宇 65c434f26e Merge branch 'dongdingding' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into duhanyu
1 month ago
77 changed files with 1923 additions and 285 deletions
Show Stats

98
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetAppController.java
Unescape View File

@ -1,6 +1,8 @@
package com.ruoyi.tc.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@ -9,17 +11,27 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetApp;
import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.Acomma;
import com.ruoyi.tc.entity.request.AssetAppPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.service.AssetAppCpService;
import com.ruoyi.tc.service.AssetAppJyService;
import com.ruoyi.tc.service.AssetAppService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.success;
@ -40,6 +52,9 @@ public class AssetAppController extends BaseController {
@Resource
private AssetAppService assetAppService;
@Resource
private AssetAppJyService assetAppJyService;
/**
* 分页查询
*
@ -61,6 +76,87 @@ public class AssetAppController extends BaseController {
}
return success(assetAppService.page(page, req));
}
//=================================================
/**
* 单位自编辑进行校验
*/
@ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetAppJyPo assetAppJyPo) {
AssetAppJyPo one = assetAppJyService.lambdaQuery().eq(AssetAppJyPo::getAppName,assetAppJyPo.getAppName())
.eq(AssetAppJyPo::getSsdw,assetAppJyPo.getSsdw()).isNull(AssetAppJyPo::getTaskId).one();
assetAppJyPo.setAuditState("1");
assetAppJyPo.setAuditYy(null);
if (one != null) {
assetAppJyPo.setAppId(one.getAppId());
assetAppJyPo.setAssetId(one.getAssetId());
assetAppJyService.updateById(assetAppJyPo);
} else {
assetAppJyPo.setAssetId(assetAppService.lambdaQuery().eq(AssetApp::getAppName,assetAppJyPo.getAppName())
.eq(AssetApp::getSsdw,assetAppJyPo.getSsdw()).one().getId());
assetAppJyService.save(assetAppJyPo);
}
return success();
}
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetAppJyPo.class)
@GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetAppJyPo> page = new Page<>();
page.setSize(as.getSize());
page.setCurrent(as.getCurrent());
try {
if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
}
} catch (Exception e) {
throw new ServiceException("获取用户信息异常");
}
return success(assetAppJyService.getAuditList(page, as));
}
/**
* 查看中间数据详情
*/
@ApiOperation(value = "单位端查看中间数据详情", response = AssetAppJyPo.class)
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetAppJyService.getById(id));
}
/**
* 管理端审核
*
* @param as 查询实体
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "管理端审核")
@PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetAppJyPo ass = new AssetAppJyPo();
BeanUtil.copyProperties(as, ass);
ass.setAppId(as.getCurrentId());
assetAppJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetAppService.updateById(aa);
}
return success();
}
//=================================================
/**
* 通过主键查询单条app数据

296
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
Unescape View File

@ -11,6 +11,9 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.Acomma;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
import com.ruoyi.tc.service.*;
import io.swagger.annotations.Api;
@ -25,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -77,6 +81,23 @@ public class AssetCurrentController extends BaseController {
@Resource
private UnitService unitService;
@Resource
private AssetCurrentJyService assetCurrentJyService;
@Resource
private AssetBusinessFormJyService assetBusinessFormJyService;
@Resource
private AssetSupplyChainJyService assetSupplyChainJyService ;
@Resource
private UnitOtherConcatJyservice unitOtherConcatJyservice;
@Resource
private AssetBasicNetworkJyService assetBasicNetworkJyService;
/**
* 分页查询所有数据
*
@ -169,46 +190,246 @@ public class AssetCurrentController extends BaseController {
//获取新增资产id
Long id = assetCurrent.getId();
Integer i = unitService.selectTaskId(assetCurrent.getDwmc(), "0");
//新增资产复制主表
AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
assetCurrentCpPo.setTaskId(i);
assetCurrentCpService.save(assetCurrentCpPo);
//新增新监管业务形态
//根据资产id查询新监管业务形态主表id
if (assetCurrent.getXjgywxt() != null) {
assetCurrentCpPo.getXjgywxt().setAssetId(id);
assetCurrentCpPo.getXjgywxt().setTaskId(i);
assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt());
}
if (assetCurrent.getGylxxList() != null) {
for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) {
items.setAssetId(id);
items.setTaskId(i);
if(i!=null){
//新增资产复制主表
AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
assetCurrentCpPo.setTaskId(i);
assetCurrentCpService.save(assetCurrentCpPo);
//新增新监管业务形态
//根据资产id查询新监管业务形态主表id
if (assetCurrent.getXjgywxt() != null) {
assetCurrentCpPo.getXjgywxt().setAssetId(id);
assetCurrentCpPo.getXjgywxt().setTaskId(i);
assetBusinessFormCpService.save(assetCurrentCpPo.getXjgywxt());
}
if (assetCurrent.getGylxxList() != null) {
for (AssetSupplyChainCpPo items : assetCurrentCpPo.getGylxxList()) {
items.setAssetId(id);
items.setTaskId(i);
}
//新增供应链
assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList());
}
if (assetCurrent.getJcwlList() != null) {
for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(i);
}
//新增基础网络
assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList());
}
if (assetCurrent.getOtherConcat() != null) {
for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(i);
}
//新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
}
//新增供应链
assetSupplyChainCpService.saveBatch(assetCurrentCpPo.getGylxxList());
}
if (assetCurrent.getJcwlList() != null) {
for (AssetBasicNetworkCpPo items : assetCurrentCpPo.getJcwlList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(i);
return success();
}
//=================================================
/**
* 单位自编辑进行校验
*/
@ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetCurrentJyPo assetCurrentJyPo) {
AssetCurrentJyPo one = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc())
.eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).isNull(AssetCurrentJyPo::getTaskId).one();
assetCurrentJyPo.setAuditState("1");
assetCurrentJyPo.setAuditYy(null);
if (one != null) {
assetCurrentJyPo.setCurrentId(one.getCurrentId());
assetCurrentJyService.updateById(assetCurrentJyPo);
QueryWrapper<AssetSupplyChainJyPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", assetCurrentJyPo.getId());
assetSupplyChainJyService.remove(queryWrapper2);
QueryWrapper<AssetBasicNetworkJyPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", assetCurrentJyPo.getId());
assetBasicNetworkJyService.remove(queryWrapper3);
QueryWrapper<AssetBusinessFormJyPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", assetCurrentJyPo.getId());
assetBusinessFormJyService.remove(queryWrapper4);
QueryWrapper<UnitOtherConcatJyPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.eq("asset_id", assetCurrentJyPo.getId());
unitOtherConcatJyservice.remove(queryWrapper5);
if (assetCurrentJyPo.getXjgywxt() != null) {
assetCurrentJyPo.getXjgywxt().setAssetId(assetCurrentJyPo.getId());
assetBusinessFormJyService.save(assetCurrentJyPo.getXjgywxt());
}
if (assetCurrentJyPo.getGylxxList() != null) {
for (AssetSupplyChainJyPo items : assetCurrentJyPo.getGylxxList()) {
items.setAssetId(assetCurrentJyPo.getId());
}
//新增供应链
assetSupplyChainJyService.saveBatch(assetCurrentJyPo.getGylxxList());
}
if (assetCurrentJyPo.getJcwlList() != null) {
for (AssetBasicNetworkJyPo items : assetCurrentJyPo.getJcwlList()) {
items.setAssetId(assetCurrentJyPo.getId());
}
//新增基础网络
assetBasicNetworkJyService.saveBatch(assetCurrentJyPo.getJcwlList());
}
if (assetCurrentJyPo.getOtherConcat() != null) {
for (UnitOtherConcatJyPo items : assetCurrentJyPo.getOtherConcat()) {
items.setAssetId(assetCurrentJyPo.getId());
}
//新增其他联系人
unitOtherConcatJyservice.saveBatch(assetCurrentJyPo.getOtherConcat());
}
} else {
AssetCurrentCpPo acc = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrentJyPo, acc);
assetCurrentCpService.save(acc);
if (acc.getXjgywxt() != null) {
acc.getXjgywxt().setAssetId(acc.getId());
assetBusinessFormCpService.save(acc.getXjgywxt());
}
if (acc.getGylxxList() != null) {
for (AssetSupplyChainCpPo items : acc.getGylxxList()) {
items.setAssetId(acc.getId());
}
//新增供应链
assetSupplyChainCpService.saveBatch(acc.getGylxxList());
}
if (acc.getJcwlList() != null) {
for (AssetBasicNetworkCpPo items : acc.getJcwlList()) {
items.setAssetId(acc.getId());
}
//新增基础网络
assetBasicNetworkCpService.saveBatch(acc.getJcwlList());
}
if (acc.getOtherConcat() != null) {
for (UnitOtherConcatCpPo items : acc.getOtherConcat()) {
items.setAssetId(acc.getId());
}
//新增其他联系人
unitOtherConcatCpService.saveBatch(acc.getOtherConcat());
}
//新增基础网络
assetBasicNetworkCpService.saveBatch(assetCurrentCpPo.getJcwlList());
}
if (assetCurrent.getOtherConcat() != null) {
for (UnitOtherConcatCpPo items : assetCurrentCpPo.getOtherConcat()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(i);
return success();
}
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetCurrentCpPo.class)
@GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetCurrentJyPo> page = new Page<>();
page.setSize(as.getSize());
page.setCurrent(as.getCurrent());
try {
if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
}
//新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
} catch (Exception e) {
throw new ServiceException("获取用户信息异常");
}
return success(assetCurrentJyService.getAuditList(page, as));
}
/**
* 查看中间数据详情
*/
@ApiOperation(value = "单位端查看中间数据详情", response = AssetCurrentCpPo.class)
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
AssetCurrentCpPo byId = assetCurrentCpService.getById(id);
byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId ,byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list());
byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list());
byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).one());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list());
List<Acomma> a1 = new ArrayList<>();
if(byId.getGlym()!=null){
Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
Acomma acomma = new Acomma();
acomma.setKey(x);
a1.add(acomma);
});
byId.setGlymList(a1);
}
List<Acomma> a2 = new ArrayList<>();
if(byId.getGlIp()!=null){
Arrays.asList(byId.getGlIp().split(",")).forEach(x -> {
Acomma acomma = new Acomma();
acomma.setKey(x);
a2.add(acomma);
});
byId.setGlIpList(a2);
}
return success(byId);
}
/**
* 管理端审核
*
* @param as 查询实体
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "管理端审核")
@PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetCurrentCpPo ass = new AssetCurrentCpPo();
BeanUtil.copyProperties(as, ass);
assetCurrentCpService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId());
AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(byId, assetCurrent);
//修改主表
assetCurrentService.updateById(assetCurrent);
//删除副表数据然后再添加
assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());
assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list();
list.forEach(x -> {
AssetSupplyChain a1 = new AssetSupplyChain();
BeanUtil.copyProperties(x, a1);
assetSupplyChainService.save(a1);
});
List<AssetBasicNetworkCpPo> list1 = assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkCpPo::getTaskId).list();
list1.forEach(x -> {
AssetBasicNetwork a2 = new AssetBasicNetwork();
BeanUtil.copyProperties(x, a2);
assetBasicNetworkService.save(a2);
});
List<AssetBusinessFormCpPo> list2 = assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).isNull(AssetBusinessFormCpPo::getTaskId).list();
list2.forEach(x -> {
AssetBusinessForm a3 = new AssetBusinessForm();
BeanUtil.copyProperties(x, a3);
assetBusinessFormService.save(a3);
});
List<UnitOtherConcatCpPo> list3 = unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list();
list3.forEach(x -> {
UnitOtherConcat a4 = new UnitOtherConcat();
BeanUtil.copyProperties(x, a4);
unitOtherConcatService.save(a4);
});
}
return success();
}
//=================================================
/**
* 修改数据
@ -463,6 +684,14 @@ public class AssetCurrentController extends BaseController {
a3.setSblx(items.getAqwlsblx());
a3.setPp(items.getAqwlpp());
a3.setSbIp(items.getAqwlsbIp());
a3.setYjxh(items.getAqyjxh());
a3.setYjxlh(items.getAqyjxlh());
a3.setYjbbxx(items.getAqyjbbxx());
a3.setYjyt(items.getAqyjyt());
a3.setYjbsxx(items.getAqyjbswz());
a3.setType(3);
a3.setAssetId(as.getId());
assetBasicNetworkService.save(a3);
@ -530,6 +759,11 @@ public class AssetCurrentController extends BaseController {
assetBasicNetworkCpService.save(co4);
//新增安全设备
AssetBasicNetworkCpPo co5 = new AssetBasicNetworkCpPo();
co5.setYjxh(items.getAqyjxh());
co5.setYjxlh(items.getAqyjxlh());
co5.setYjbbxx(items.getAqyjbbxx());
co5.setYjyt(items.getAqyjyt());
co5.setYjbsxx(items.getAqyjbswz());
co5.setSblx(items.getAqwlsblx());
co5.setPp(items.getAqwlpp());
co5.setSbIp(items.getAqwlsbIp());

92
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetEmailController.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.tc.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
@ -9,17 +10,24 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetApp;
import com.ruoyi.tc.entity.AssetEmail;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
import com.ruoyi.tc.service.AssetEmailJyService;
import com.ruoyi.tc.service.AssetEmailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
/**
@ -38,6 +46,8 @@ public class AssetEmailController extends BaseController {
@Resource
private AssetEmailService assetEmailService;
@Resource
private AssetEmailJyService assetEmailJyService;
/**
* 分页查询
*
@ -60,6 +70,88 @@ public class AssetEmailController extends BaseController {
return success(assetEmailService.page(page, req));
}
//=================================================
/**
* 单位自编辑进行校验
*/
@ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetEmailJyPo assetEmailJyPo) {
AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw,assetEmailJyPo.getSsdw())
.eq(AssetEmailJyPo::getDzyxhz,assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one();
assetEmailJyPo.setAuditState("1");
assetEmailJyPo.setAuditYy(null);
if (one != null) {
assetEmailJyPo.setEmailId(one.getEmailId());
assetEmailJyPo.setAssetId(one.getAssetId());
assetEmailJyService.updateById(assetEmailJyPo);
} else {
assetEmailJyPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw,assetEmailJyPo.getSsdw())
.eq(AssetEmail::getDzyxhz,assetEmailJyPo.getDzyxhz()).one().getId());
assetEmailJyService.save(assetEmailJyPo);
}
return success();
}
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetEmailJyPo.class)
@GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetEmailJyPo> page = new Page<>();
page.setSize(as.getSize());
page.setCurrent(as.getCurrent());
try {
if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
}
} catch (Exception e) {
throw new ServiceException("获取用户信息异常");
}
return success(assetEmailJyService.getAuditList(page, as));
}
/**
* 查看中间数据详情
*/
@ApiOperation(value = "单位端查看中间数据详情", response = AssetEmailJyPo.class)
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetEmailJyService.getById(id));
}
/**
* 管理端审核
*
* @param as 查询实体
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "管理端审核")
@PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetEmailJyPo ass = new AssetEmailJyPo();
BeanUtil.copyProperties(as, ass);
ass.setEmailId(as.getCurrentId());
assetEmailJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetEmailService.updateById(aa);
}
return success();
}
//=================================================
/**
* 通过主键查询单条email数据
*

97
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetMiniProgramsController.java
Unescape View File

@ -10,23 +10,27 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetEmail;
import com.ruoyi.tc.entity.AssetMiniPrograms;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest;
import com.ruoyi.tc.service.AssetMiniProgramsCpService;
import com.ruoyi.tc.service.AssetMiniProgramsJyService;
import com.ruoyi.tc.service.AssetMiniProgramsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.success;
/**
* 小程序资产表(asset_mini_programs)表控制层
*
@ -43,6 +47,8 @@ public class AssetMiniProgramsController extends BaseController {
@Resource
private AssetMiniProgramsService assetMiniProgramsService;
@Resource
private AssetMiniProgramsJyService assetMiniProgramsJyService;
/**
* 分页查询
*
@ -65,6 +71,89 @@ public class AssetMiniProgramsController extends BaseController {
return success(assetMiniProgramsService.page(page, req));
}
//=================================================
/**
* 单位自编辑进行校验
*/
@ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetMiniProgramsJyPo assetMiniProgramsJyPo) {
AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw,assetMiniProgramsJyPo.getSsdw())
.eq(AssetMiniProgramsJyPo::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).isNull(AssetMiniProgramsJyPo::getTaskId).one();
assetMiniProgramsJyPo.setAuditState("1");
assetMiniProgramsJyPo.setAuditYy(null);
if (one != null) {
assetMiniProgramsJyPo.setMiniId(one.getMiniId());
assetMiniProgramsJyPo.setAssetId(one.getAssetId());
assetMiniProgramsJyService.updateById(assetMiniProgramsJyPo);
} else {
assetMiniProgramsJyPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw,assetMiniProgramsJyPo.getSsdw())
.eq(AssetMiniPrograms::getXcxmc,assetMiniProgramsJyPo.getXcxmc()).one().getId());
assetMiniProgramsJyService.save(assetMiniProgramsJyPo);
}
return success();
}
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetMiniProgramsJyPo.class)
@GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetMiniProgramsJyPo> page = new Page<>();
page.setSize(as.getSize());
page.setCurrent(as.getCurrent());
try {
if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
}
} catch (Exception e) {
throw new ServiceException("获取用户信息异常");
}
return success(assetMiniProgramsJyService.getAuditList(page, as));
}
/**
* 查看中间数据详情
*/
@ApiOperation(value = "单位端查看中间数据详情", response = AssetMiniProgramsJyPo.class)
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetMiniProgramsJyService.getById(id));
}
/**
* 管理端审核
*
* @param as 查询实体
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "管理端审核")
@PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetMiniProgramsJyPo ass = new AssetMiniProgramsJyPo();
BeanUtil.copyProperties(as, ass);
ass.setMiniId(as.getCurrentId());
assetMiniProgramsJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetMiniProgramsService.updateById(aa);
}
return success();
}
//=================================================
/**
* 通过主键查询单条小程序数据
*

93
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetOfficialAccountController.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.tc.controller;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
@ -8,17 +9,25 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetMiniPrograms;
import com.ruoyi.tc.entity.AssetOfficialAccount;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
import com.ruoyi.tc.service.AssetOfficialAccountJyService;
import com.ruoyi.tc.service.AssetOfficialAccountService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.security.Security;
import java.util.List;
@ -40,6 +49,8 @@ public class AssetOfficialAccountController {
@Resource
private AssetOfficialAccountService assetOfficialAccountService;
@Resource
private AssetOfficialAccountJyService assetOfficialAccountJyService;
/**
* 分页查询
*
@ -74,6 +85,88 @@ public class AssetOfficialAccountController {
return success(assetOfficialAccountService.getById(id));
}
//=================================================
/**
* 单位自编辑进行校验
*/
@ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetOfficialAccountJyPo ao) {
AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery().eq(AssetOfficialAccountJyPo::getSsdw,ao.getSsdw())
.eq(AssetOfficialAccountJyPo::getGzhmc,ao.getGzhmc()).isNull(AssetOfficialAccountJyPo::getTaskId).one();
ao.setAuditState("1");
ao.setAuditYy(null);
if (one != null) {
ao.setAccountId(one.getAccountId());
ao.setAssetId(one.getAssetId());
assetOfficialAccountJyService.updateById(ao);
} else {
ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw,ao.getSsdw())
.eq(AssetOfficialAccount::getGzhmc,ao.getGzhmc()).one().getId());
assetOfficialAccountJyService.save(ao);
}
return success();
}
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetOfficialAccountJyPo.class)
@GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetOfficialAccountJyPo> page = new Page<>();
page.setSize(as.getSize());
page.setCurrent(as.getCurrent());
try {
if (!SecurityUtils.getLoginUser().getUser().isAdmin() && !SecurityUtils.hasRole("common")) {
as.setDwmc(SecurityUtils.getLoginUser().getUser().getNickName());
}
} catch (Exception e) {
throw new ServiceException("获取用户信息异常");
}
return success(assetOfficialAccountJyService.getAuditList(page, as));
}
/**
* 查看中间数据详情
*/
@ApiOperation(value = "单位端查看中间数据详情", response = AssetOfficialAccountJyPo.class)
@GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetOfficialAccountJyService.getById(id));
}
/**
* 管理端审核
*
* @param as 查询实体
* @return 所有数据
*/
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@ApiOperation(value = "管理端审核")
@PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetOfficialAccountJyPo ass = new AssetOfficialAccountJyPo();
BeanUtil.copyProperties(as, ass);
ass.setAccountId(as.getCurrentId());
assetOfficialAccountJyService.updateById(ass);
//通过数据同步
if ("2".equals(as.getAuditState())) {
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//修改主表
assetOfficialAccountService.updateById(aa);
}
return success();
}
//=================================================
/**
* 新增公众号数据
*

63
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/DeptSchemaController.java
Unescape View File

@ -1,21 +1,26 @@
package com.ruoyi.tc.controller;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.tc.entity.ExamineInfo;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.UnitOtherConcat;
import com.ruoyi.tc.service.ExamineInfoService;
import com.ruoyi.tc.service.UnitOtherConcatService;
import com.ruoyi.tc.service.UnitService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
/**
* 组织架构
*
* @author du
* @since 2024/12/9 10:42
*/
@ -27,6 +32,11 @@ public class DeptSchemaController {
@Resource
private UnitService unitService;
@Resource
private UnitOtherConcatService unitOtherConcatService;
@Resource
private ExamineInfoService examineInfoService;
/**
* 根据资产类型返回组织架构
*/
@ -39,4 +49,49 @@ public class DeptSchemaController {
return AjaxResult.success(unitService.getSchema(type));
}
/**
* 单位查看自己单位具体信息
*/
@ApiOperation(value = "单位查看自己单位具体信息")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@GetMapping("/unitOwnInfo")
public AjaxResult unitOwnInfo() {
Unit one = unitService.lambdaQuery().eq(Unit::getUserName, SecurityUtils.getLoginUser().getUsername()).one();
Unit byId = unitService.getById(one.getId());
return AjaxResult.success(byId);
}
/**
* 单位修改自己的单位信息
*/
@ApiOperation(value = "单位修改自己的单位信息")
@PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEditOwn")
public AjaxResult unitEditOwn(@RequestBody Unit x) {
Unit byId = unitService.getById(x.getId());
if (!byId.getUserName().equals(x.getUserName()) || !byId.getNickName().equals(x.getNickName())) {
throw new ServiceException("单位名称和社会信用代码不允许修改!");
}
unitService.updateById(x);
//先删除
unitOtherConcatService.deleteByUnitIds(x.getId());
examineInfoService.deleteByUnitIds(x.getId());
if (x.getOtherConcat() != null) {
x.getOtherConcat().forEach(y -> {
y.setUnitId(x.getId());
y.setConcatId(null);
});
unitOtherConcatService.saveBatch(x.getOtherConcat());
}
if (x.getJcxxList() != null) {
x.getJcxxList().forEach(y -> {
y.setUnitId(x.getId());
y.setJcid(null);
});
examineInfoService.saveBatch(x.getJcxxList());
}
return AjaxResult.success();
}
}

198
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java
Unescape View File

@ -1,6 +1,7 @@
package com.ruoyi.tc.controller;
import cn.hutool.core.util.CreditCodeUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.AjaxResult;
@ -11,15 +12,16 @@ import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.PasswordGenerator;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.UnitRequest;
import com.ruoyi.tc.entity.response.AssetSysUserExport;
import com.ruoyi.tc.regular.AssetCurrentChange;
import com.ruoyi.tc.regular.UnitChange;
import com.ruoyi.tc.service.ExamineInfoService;
import com.ruoyi.tc.service.UnitOtherConcatService;
import com.ruoyi.tc.service.UnitService;
import com.ruoyi.tc.service.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@ -31,6 +33,7 @@ import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.*;
import java.util.stream.Collectors;
/**
* 单位(unit)表控制层
@ -43,6 +46,8 @@ import java.util.*;
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@RequestMapping("/tc/unit")
public class UnitController {
@Resource
private AssetCurrentService assetCurrentService;
@Resource
private UnitService unitService;
@ -54,7 +59,7 @@ public class UnitController {
private ExamineInfoService examineInfoService;
@Resource
private ISysDeptService iSysDeptService;
private SysDeptMapper sysDeptMapper;
@Resource
private ISysUserService userService;
@ -64,7 +69,52 @@ public class UnitController {
@Resource
private AssetCurrentChange assetCurrentChange;
@Resource
private AssetCurrentCpService assetCurrentCpService;
@Resource
private AssetBusinessFormCpService assetBusinessFormCpService;
@Resource
private AssetSupplyChainCpService assetSupplyChainCpService;
@Resource
private AssetBasicNetworkCpService assetBasicNetworkCpService;
@Resource
private AssetSupplyChainService assetSupplyChainService;
@Resource
private AssetBasicNetworkService assetBasicNetworkService;
@Resource
private AssetBusinessFormService assetBusinessFormService;
@Resource
private UnitOtherConcatCpService unitOtherConcatCpService;
@Resource
private AssetAppService assetAppService;
@Resource
private AssetAppCpService assetAppCpService;
@Resource
private AssetEmailService assetEmailService;
@Resource
private AssetEmailCpService assetEmailCpService;
@Resource
private AssetOfficialAccountService assetOfficialAccountService;
@Resource
private AssetOfficialAccountCpService assetOfficialAccountCpService;
@Resource
private AssetMiniProgramsService assetMiniProgramsService;
@Resource
private AssetMiniProgramsCpService assetMiniProgramsCpService;
/**
* 获取单位列表
@ -120,6 +170,26 @@ public class UnitController {
util.exportExcel(response, list, "单位数据");
}
/**
* 所有单位生成随机密码并导出
*/
@ApiOperation(value = "所有单位生成随机密码并导出")
@PostMapping("/exportAllPassword")
public void exportAllPassword(HttpServletResponse response) {
List<AssetSysUserExport> list = unitService.exportAllPassword();
list.forEach(x->{
//以后二次修改
String ps = PasswordGenerator.password();
x.setPassword(ps);
AssetSysUserExport as = new AssetSysUserExport();
as.setUserId(x.getUserId());
as.setPassword(SecurityUtils.encryptPassword(ps));
unitService.updatePasswordUser(as);
});
ExcelUtil<AssetSysUserExport> util = new ExcelUtil<>(AssetSysUserExport.class);
util.exportExcel(response, list, "单位密码数据");
}
/**
* 单位导入
*/
@ -130,28 +200,38 @@ public class UnitController {
public AjaxResult importData(MultipartFile file) throws Exception {
ExcelUtil<Unit> util = new ExcelUtil<>(Unit.class);
List<Unit> list = util.importExcel(file.getInputStream());
List<Unit> collect = new ArrayList<>(list.stream()
.collect(Collectors.toMap(Unit::getUserName, entity -> entity, (e1, e2) -> e1))
.values());
//做组织架构的处理和更新处理
List<SysDept> sd = iSysDeptService.selectDeptList(new SysDept());
List<SysDept> sd = sysDeptMapper.selectDeptList(new SysDept());
Set<String> set = new HashSet<>();
for (SysDept i : sd) {
set.add(i.getDeptName());
}
List<Unit> list1 = unitService.list();
for (int i = 0; i < list.size(); i++) {
if(!CreditCodeUtil.isCreditCode(list.get(i).getUserName())){
for (int i = 0; i < collect.size(); i++) {
if(collect.get(i).getUserName().length()!=18){
throw new ServiceException("第" + i + "行,统一社会信用代码格式错误!");
}
for (Unit unit : list1) {
if (unit.getNickName().equals(list.get(i).getNickName())
&& unit.getUserName().equals(list.get(i).getUserName())
if (unit.getNickName().equals(collect.get(i).getNickName())
|| unit.getUserName().equals(collect.get(i).getUserName())
) {
list.get(i).setId(unit.getId());
collect.get(i).setId(unit.getId());
}
}
if (set.contains(list.get(i).getDeptName())) {
int lastIndex = collect.get(i).getDeptName().lastIndexOf("-");
String result = null;
if (lastIndex!= -1) {
result = collect.get(i).getDeptName().substring(lastIndex + 1);
}else {
result = collect.get(i).getDeptName();
}
if (set.contains(result)) {
for (SysDept s : sd) {
if (list.get(i).getDeptName().equals(s.getDeptName())) {
list.get(i).setDeptId(s.getDeptId());
if (result.equals(s.getDeptName())) {
collect.get(i).setDeptId(s.getDeptId());
}
}
} else {
@ -159,9 +239,9 @@ public class UnitController {
}
}
//批量新增或者修改单位
unitService.saveOrUpdateBatch(list);
unitService.saveOrUpdateBatch(collect);
Map<String, String> a1 = new HashMap<>();
for (Unit x : list) {
for (Unit x : collect) {
//查询用户表是否存在该用户
String s = unitService.validUser(x);
a1.put(x.getUserName(), s);
@ -196,6 +276,9 @@ public class UnitController {
if (!unitService.lambdaQuery().eq(Unit::getUserName, unit.getUserName()).eq(Unit::getDelFlag, "0").list().isEmpty()) {
throw new ServiceException(unit.getUserName() + "'已存在单位!");
}
if (!unitService.lambdaQuery().eq(Unit::getNickName, unit.getNickName()).eq(Unit::getDelFlag, "0").list().isEmpty()) {
throw new ServiceException(unit.getNickName() + "'已存在单位!");
}
//新增单位到单位信息表
unitService.save(unit);
//新增其他联系人
@ -274,18 +357,81 @@ public class UnitController {
@Log(title = "删除单位", businessType = BusinessType.DELETE)
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id) {
List<String> userNames = unitService.selectByIds(id);
//逻辑删除单位和用户
if (!userNames.isEmpty()) {
for (String it : userNames) {
if (it != null) {
unitService.deleteUsers(it);
}
String userNames = unitService.selectByIds(id);
//根据单位名称查询任务
List<AssetTask> units = unitService.selectTaskIdToDwmc(userNames);
if(units == null || units.isEmpty()){
unitService.deleteUsers(userNames);
unitService.deleteUnits(id);
unitOtherConcatService.deleteByUnitIds(id);
examineInfoService.deleteByUnitIds(id);
QueryWrapper<AssetCurrent> wrapper1 = new QueryWrapper<>();
wrapper1.eq("dwmc", userNames);
wrapper1.eq("del_flag","0");
List<AssetCurrent> list = assetCurrentService.list(wrapper1);
if(list!=null && !list.isEmpty()){
list.forEach(x->{
assetSupplyChainService.deleteByAssetIds(x.getId());
assetBasicNetworkService.deleteByAssetIds(x.getId());
assetBusinessFormService.deleteByAssetIds(x.getId());
unitOtherConcatService.deleteByAssetIds(x.getId());
QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", x.getId());
assetSupplyChainCpService.remove(queryWrapper2);
QueryWrapper<AssetBasicNetworkCpPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", x.getId());
assetBasicNetworkCpService.remove(queryWrapper3);
QueryWrapper<AssetBusinessFormCpPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", x.getId());
assetBusinessFormCpService.remove(queryWrapper4);
QueryWrapper<UnitOtherConcatCpPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.eq("asset_id", x.getId());
unitOtherConcatCpService.remove(queryWrapper5);
assetCurrentService.deleteByUnitIds(x.getId());
QueryWrapper<AssetCurrentCpPo> f1 = new QueryWrapper<>();
queryWrapper5.eq("id", x.getId());
assetCurrentCpService.remove(f1);
});
}
QueryWrapper<AssetApp> r1 = new QueryWrapper<>();
r1.eq("ssdw", userNames);
assetAppService.remove(r1);
QueryWrapper<AssetEmail> r2 = new QueryWrapper<>();
r2.eq("ssdw", userNames);
assetEmailService.remove( r2);
QueryWrapper<AssetOfficialAccount> r3 = new QueryWrapper<>();
r3.eq("ssdw", userNames);
assetOfficialAccountService.remove( r3);
QueryWrapper<AssetMiniPrograms> r4 = new QueryWrapper<>();
r4.eq("ssdw", userNames);
assetMiniProgramsService.remove( r4);
QueryWrapper<AssetAppCpPo> s1 = new QueryWrapper<>();
s1.eq("ssdw", userNames);
assetAppCpService.remove(s1);
QueryWrapper<AssetEmailCpPo> s2 = new QueryWrapper<>();
s2.eq("ssdw", userNames);
assetEmailCpService.remove(s2);
QueryWrapper<AssetOfficialAccountCpPo> s3 = new QueryWrapper<>();
s3.eq("ssdw", userNames);
assetOfficialAccountCpService.remove(s3);
QueryWrapper<AssetMiniProgramsCpPo> s4 = new QueryWrapper<>();
s4.eq("ssdw", userNames);
assetMiniProgramsCpService.remove(s4);
}else {
throw new ServiceException("该单位有在运行的任务,无法删除!");
}
unitService.deleteUnits(id);
unitOtherConcatService.deleteByUnitIds(id);
examineInfoService.deleteByUnitIds(id);
return AjaxResult.success();
}

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetApp.java
Unescape View File

@ -150,4 +150,12 @@ public class AssetApp extends BaseClass implements Serializable {
@ApiModelProperty("状态")
@Excel(name = "状态", dictType = "gzh_state",comboReadDict = true)
private String appState;
/**
* 审核
*/
@ApiModelProperty("审核")
@TableField(exist = false)
private String auditState;
}

159
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
Unescape View File

@ -43,6 +43,25 @@ public class AssetCurrent extends BaseClass implements Serializable {
private String xtmc;
/**
* 建设(运营)单位:
*/
@ApiModelProperty("建设(运营)单位")
private String jsyydw;
/**
* DNS:
*/
@ApiModelProperty("DNS")
private String dns;
/**
* 是否自建互联网专线ip
*/
@ApiModelProperty("是否自建互联网专线ip")
private String isZjhlwip;
@ApiModelProperty("组织机构名称（部门名称）")
@TableField(exist = false)
private String deptName;
@ -63,14 +82,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
@Excel(name = "域名",sort = 3)
private String xtym;
@Excel(name ="访问网址-协议类型",sort = 12,width = 26)
@Excel(name ="访问网址-协议类型",sort = 13,width = 26)
@ApiModelProperty("访问网址-协议类型")
@TableField(exist = false)
private String fwwzXylx;
/**
* 访问网址
*/
@Excel(name ="访问网址",sort = 13)
@Excel(name ="访问网址",sort = 14)
@Size(max= 50,message="访问网址长度不能超过50")
@ApiModelProperty("访问网址")
private String fwwz;
@ -128,15 +147,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 关联ip（多个用,分隔）
*/
@Excel(name ="关联资产（多个资产用逗号隔开,例如{\"ipv4\"",sort = 7,width = 60)
// @Excel(name ="关联资产（多个资产用逗号隔开,例如\n{\"ipv4\":[\"1.1.1.1:8080\",\"2.2.2.2:8080\"],\"ipv6\":\n[\"fe80::ec3e:9cff:fe25:687b\",\"de71::ec3e:9cff:fe25:687b\"]}）",sort = 7,width = 60)
@Excel(name ="关联资产（多个资产用逗号隔开,例如{\"ipv4\":[\"1.1.1.1:8080\",\"2.2.2.2:8080\"],\"ipv6\":[\"fe80::ec3e:9cff:fe25:687b\",\"de71::ec3e:9cff:fe25:687b\"]}）",sort = 7,width = 60)
@Size(max= 500,message="关联ip长度不能超过500")
@ApiModelProperty("关联ip（多个用,分隔）")
private String glIp;
/**
* 系统类型（字典）
*/
@Excel(name = "*系统类型",dictType="zc_xtlx",comboReadDict = true,sort =200)
@Excel(name = "*系统类型",dictType="zc_xtlx",comboReadDict = true,sort =8)
//@NotNull
@ApiModelProperty("系统类型（字典）")
private String xtlx;
@ -151,13 +169,12 @@ public class AssetCurrent extends BaseClass implements Serializable {
*/
//@NotNull
@Excel(name = "是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10)
// @Excel(name = "*是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10)
@ApiModelProperty("是否关基系统（字典）")
private String gjxt;
/**
* 系统标签
*/
@Excel(name = "系统标签（多个标签逗号隔开）",sort = 11,width = 32)
@Excel(name = "系统标签（多个标签逗号隔开）",sort = 12,width = 32)
@Size(max= 255,message="系统标签长度不能超过255")
@ApiModelProperty("系统标签")
private String xtbq;
@ -165,7 +182,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 机房信息
*/
//@NotBlank
@Excel(name = "*机房信息",sort = 58)
@Excel(name = "*机房信息",sort = 11)
@Size(max= 500,message="机房信息长度不能超过500")
@ApiModelProperty("机房信息")
private String jfxx;
@ -175,13 +192,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
//@NotBlank
@Size(max= 50,message="使用时间长度不能超过50")
@ApiModelProperty("使用时间")
// @Excel(name = "使用时间",sort = 116)
@Excel(name = "使用时间",sort = 123)
private String sysj;
/**
* 是否是互联网系统（字典）
*/
//@NotNull
// @Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 117 )
@Excel(name = "*是否是互联网系统",dictType = "is_no",comboReadDict = true,sort = 124 )
@ApiModelProperty("是否是互联网系统（字典）")
private String hlwxt;
/**
@ -189,43 +206,41 @@ public class AssetCurrent extends BaseClass implements Serializable {
*/
@Size(max= 50,message="系统编号长度不能超过50")
@ApiModelProperty("系统编号")
@Excel(name = "系统编号",sort = 35)
@Excel(name = "系统编号",sort = 37)
private String xtbh;
/**
* 系统状态（字典）
*/
@Excel(name = "系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36)
// @Excel(name = "*系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36)
@Excel(name = "*系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 38)
//@NotNull
@ApiModelProperty("系统状态（字典）")
private String xtzt;
/**
* 在线状态（字典）
*/
@Excel(name = "在线状态",dictType = "zc_zxzt",comboReadDict = true,sort = 37)
@Excel(name = "在线状态",dictType = "zc_zxzt",comboReadDict = true,sort = 39)
@ApiModelProperty("在线状态（字典）")
private String zxzt;
@Excel(name = "使用人",sort = 38)
@TableField(exist = false)
@ApiModelProperty("使用人")
private String syr;
/**
* C-机密性（字典）
*/
@Excel(name = "机密性",dictType = "zc_c_i_a",comboReadDict = true,sort = 39)
@Excel(name = "机密性",dictType = "zc_c_i_a",comboReadDict = true,sort = 40)
@ApiModelProperty("C-机密性（字典）")
private String cjmx;
/**
* I-完整性（字典）
*/
@Excel(name = "完整性",dictType = "zc_c_i_a",comboReadDict = true,sort = 40)
@Excel(name = "完整性",dictType = "zc_c_i_a",comboReadDict = true,sort = 41)
@ApiModelProperty("I-完整性（字典）")
private String iwzx;
/**
* A-可用性(字典）
*/
@Excel(name = "可用性",dictType = "zc_c_i_a",comboReadDict = true,sort = 41)
@Excel(name = "可用性",dictType = "zc_c_i_a",comboReadDict = true,sort = 42)
@ApiModelProperty("A-可用性(字典）")
private String akyx;
/**
@ -254,14 +269,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 系统特征（,分隔）
*/
@Excel(width = 60,name = "系统特征（多选，多个特征用逗号隔开。选项为",sort = 52)
// @Excel(width = 60,name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）",sort = 52)
@Excel(width = 60,name = "系统特征（多选，多个特征用逗号隔开。选项为：党政机关门户网站、重点新闻网站，大型网络平台，系统业务覆盖单个地市级行政区30%以上人口的工作、生活，系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行，存储超过5万人以上个人敏感信息，存储超过100万条以上地理、人口、资源等国家基础数据）",sort = 54)
@ApiModelProperty("系统特征（,分隔）")
private String xttz;
/**
* 用户规模
*/
@Excel(name = "*用户规模",dictType ="zc_yhgm",comboReadDict = true,sort = 53)
@Excel(name = "*用户规模",dictType ="zc_yhgm",comboReadDict = true,sort = 55)
//@NotNull
@ApiModelProperty("用户规模")
private String yhgm;
@ -269,12 +283,11 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 互联网接入运营商
*/
//@NotBlank
@Excel(name = "*互联网接入运营商",sort = 54)
@Excel(name = "*互联网接入运营商",sort = 56)
@Size(max= 50,message="互联网接入运营商长度不能超过50")
@ApiModelProperty("互联网接入运营商")
private String hlwjryys;
@Excel(name = "*物理接入地址",sort = 55)
@ApiModelProperty("*物理接入地址")
@TableField(exist = false)
private String wljrdz;
@ -282,8 +295,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 资产物理接入地址
*/
// @Excel(name = "*资产物理接入地址",sort = 118,width = 28)
//@NotBlank
@Excel(name = "*资产物理接入地址",sort = 57,width = 28)
@Size(max= 50,message="资产物理接入地址长度不能超过50")
@ApiModelProperty("资产物理接入地址")
private String zcwljrdz;
@ -291,56 +303,54 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 是否部署云平台（字典）
*/
//@NotNull
@Excel(name = "*是否部署云平台",sort = 56,dictType = "is_no",comboReadDict = true)
@Excel(name = "*是否部署云平台",sort = 58,dictType = "is_no",comboReadDict = true)
@ApiModelProperty("是否部署云平台（字典）")
private String bsypt;
/**
* 云服务商名称
*/
@Excel(name = "云服务商名称（“是否部署云平台”选择“是”必须填写，选择“否”则无需填写）",sort = 57,width = 45)
@Excel(name = "云服务商名称（“是否部署云平台”选择“是”必须填写，选择“否”则无需填写）",sort = 59,width = 45)
@Size(max= 100,message="云服务商名称长度不能超过100")
@ApiModelProperty("云服务商名称")
private String yfwsmc;
/**
* 网站访问协议/开通协议
*/
@Excel(name = "*网站访问协议",sort = 64)
@Excel(name = "*网站访问协议",sort = 60)
@Size(max= 255,message="网站访问协议/开通协议长度不能超过255")
@ApiModelProperty("网站访问协议/开通协议")
private String wzfwxy;
/**
* 系统部署方式
*/
@Excel(name = "*系统部署方式",dictType = "zc_xtbsfs",comboReadDict = true,sort = 59)
//@NotNull
@Excel(name = "*系统部署方式",dictType = "zc_xtbsfs",comboReadDict = true,sort = 61)
@ApiModelProperty("系统部署方式")
private String xtbsfs;
/**
* 托管单位
*/
@Excel(name = "托管单位（系统部署方式选择“托管第三方”此项必填）",sort = 60,width = 45)
@Excel(name = "托管单位（系统部署方式选择“托管第三方”此项必填）",sort = 62,width = 45)
@Size(max= 100,message="托管单位长度不能超过100")
@ApiModelProperty("托管单位")
private String tgdw;
/**
* 云服务商
*/
@Excel(name = "云服务商（系统部署方式选择“云上”此项必填）",sort = 61)
@Excel(name = "云服务商（系统部署方式选择“云上”此项必填）",sort = 63)
@Size(max= 100,message="云服务商长度不能超过100")
@ApiModelProperty("云服务商")
private String yfws;
/**
* 是否对公众开放（字典）
*/
@Excel(name = "*是否对公众开放",dictType = "is_no",comboReadDict = true,sort = 62,width = 22)
//@NotNull
@Excel(name = "*是否对公众开放",dictType = "is_no",comboReadDict = true,sort = 64,width = 22)
@ApiModelProperty("是否对公众开放（字典）")
private String dgzkf;
/**
* 互联网开放用途（字典）
*/
//@NotNull
@Excel(name = "*互联网开放用途",dictType = "zc_hlwkfyt",comboReadDict = true,sort = 63,width = 22)
@Excel(name = "*互联网开放用途",dictType = "zc_hlwkfyt",comboReadDict = true,sort = 65,width = 22)
@ApiModelProperty("互联网开放用途（字典）")
private String hlwkfyt;
/**
@ -401,7 +411,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
@ApiModelProperty("相关业务-业务描述")
private String xgywYwms;
@Excel(name = "责任人",sort = 14)
@ApiModelProperty("责任人")
@TableField(exist = false)
private String zrr;
@ -506,8 +515,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* ICP备案信息-ICP备案编号
*/
@Excel(name = "ICP备案编号",sort = 25,width = 46)
// @Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）",sort = 25,width = 46)
@Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）",sort = 25,width = 46)
//@NotBlank
@Size(max= 50,message="ICP备案信息-ICP备案编号长度不能超过50")
@ApiModelProperty("ICP备案信息-ICP备案编号")
@ -515,7 +523,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* ICP备案信息-备案域名
*/
@Excel(name = "*备案域名",sort = 26)
@Excel(name = "备案域名（ICP备案状态选择为是则必填）",sort = 26)
//@NotBlank
@Size(max= 50,message="ICP备案信息-备案域名长度不能超过50")
@ApiModelProperty("ICP备案信息-备案域名")
@ -565,7 +573,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 公安机关备案信息-公安机关备案号
*/
@Excel(name = "*公安机关备案号",sort = 28,width = 22)
@Excel(name = "公安机关备案号（公安机关备案状态选择为是则必填）",sort = 28,width = 22)
@Size(max= 50,message="公安机关备案信息-公安机关备案号长度不能超过50")
@ApiModelProperty("公安机关备案信息-公安机关备案号")
//@NotBlank
@ -634,7 +642,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 系统架构-是否有国产设备
*/
@Excel(name = "*是否有国产设备",dictType = "is_no",comboReadDict = true,sort = 35,width = 22)
@Excel(name = "*是否有国产设备",dictType = "is_no",comboReadDict = true,sort = 36,width = 22)
//@NotNull
@ApiModelProperty("系统架构-是否有国产设备")
private String xtjgGcsb;
@ -647,7 +655,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 等保信息-是否等保系统
*/
@Excel(name = "*是否是等保系统",dictType = "is_no",comboReadDict = true,sort = 42)
@Excel(name = "*是否是等保系统",dictType = "is_no",comboReadDict = true,sort = 43)
//@NotNull
@ApiModelProperty("等保信息-是否等保系统")
private String dbxxSfdbxt;
@ -655,7 +663,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 等保信息-等保测评备案号
*/
//@NotBlank
@Excel(name = "*等保测评备案号",sort = 43,width = 22)
@Excel(name = "等保测评备案号（是否等保系统选择为是则必填）",sort = 44,width = 22)
@Size(max= 50,message="等保信息-等保测评备案号长度不能超过50")
@ApiModelProperty("等保信息-等保测评备案号")
private String dbxxDbcpbah;
@ -663,7 +671,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 等保信息-等保等级
*/
//@NotNull
@Excel(name = "*等保等级",dictType = "dbxx_dbdj",comboReadDict = true,sort = 44)
@Excel(name = "等保等级（是否等保系统选择为是则必填）",dictType = "dbxx_dbdj",comboReadDict = true,sort = 45)
@ApiModelProperty("等保信息-等保等级")
private String dbxxDbdj;
/**
@ -686,41 +694,39 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 等保信息-定级时间
*/
//@NotBlank
// @Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 119,width = 40)
@Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 46,width = 40)
@Size(max= 50,message="等保信息-定级时间长度不能超过50")
@ApiModelProperty("等保信息-定级时间")
private String dbxxDjsj;
/**
* 等保信息-是否有第三方测评
*/
@Excel(name = "是否有第三方测评",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
@Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）",width = 45,dictType = "is_no",comboReadDict = true,sort = 47)
@ApiModelProperty("等保信息-是否有第三方测评")
//@NotNull
// @Excel(name = "是否有第三方测评（是否是等保系统选择是则必填）",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
private String dbxxSfydsfcp;
@ApiModelProperty("地理位置-省")
@Excel(name = "地理位置-省",sort = 46)
@Excel(name = "地理位置-省",sort = 49)
private String sheng;
@ApiModelProperty("地理位置-市")
@Excel(name = "地理位置-市",sort = 47)
@Excel(name = "地理位置-市",sort = 50)
private String shi;
@ApiModelProperty("地理位置-区（县）")
@Excel(name = "地理位置-区（县）",sort = 48)
@Excel(name = "地理位置-区（县）",sort = 51)
private String qu;
/**
* 等保信息-测评得分
*/
//@NotBlank
@Excel(name = "*测评得分",sort = 49)
@Excel(name = "测评得分（是否是等保系统选择是则必填）",sort = 48)
@Size(max= 50,message="等保信息-测评得分长度不能超过50")
@ApiModelProperty("等保信息-测评得分")
private String dbxxCpdf;
/**
* 第三方测评-测评机构名称
*/
@Excel(name = "*测评单位名称",sort = 66)
@Size(max= 255,message="第三方测评-测评机构名称长度不能超过255")
@ApiModelProperty("第三方测评-测评机构名称")
private String sfCpjgmc;
@ -803,14 +809,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 密评信息-是否密评系统
*/
@Excel(name = "是否密评系统",dictType = "is_no",comboReadDict = true,sort = 50,width = 22)
@Excel(name = "是否密评系统",dictType = "is_no",comboReadDict = true,sort = 52,width = 22)
@Size(max= 50,message="密评信息-是否密评系统长度不能超过50")
@ApiModelProperty("密评信息-是否密评系统")
private String mpSfmpxt;
/**
* 密评信息-密评得分
*/
@Excel(name = "密评得分",sort = 51)
@Excel(name = "密评得分",sort = 53)
@Size(max= 50,message="密评信息-密评得分长度不能超过50")
@ApiModelProperty("密评信息-密评得分")
private String mpMpdf;
@ -902,7 +908,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称",sort = 98)
@Excel(name = "*数据库名称",sort = 105)
@Size(max= 50,message="编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
@ -910,14 +916,14 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 数据资产-数据库类型
*/
//@NotBlank
@Excel(name = "*数据库类型",sort = 99)
@Excel(name = "*数据库类型",sort = 106)
@Size(max= 50,message="数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口",sort = 100)
@Excel(name = "*数据库端口",sort = 107)
//@NotBlank
@Size(max= 50,message="数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
@ -925,7 +931,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本",sort = 101)
@Excel(name = "*数据库版本",sort = 108)
//@NotBlank
@Size(max= 50,message="数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
@ -933,7 +939,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP",sort = 102)
@Excel(name = "*数据库所在IP",sort = 109)
@Size(max= 50,message="数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
@ -941,13 +947,13 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 数据资产-共享属性
*/
//@NotNull
@Excel(name = "*共享属性",dictType = "sjzc_gxsx",comboReadDict = true,sort = 103)
@Excel(name = "*共享属性",dictType = "sjzc_gxsx",comboReadDict = true,sort = 110)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性",dictType = "sjzc_kfsx",comboReadDict = true,sort = 104)
@Excel(name = "*开放属性",dictType = "sjzc_kfsx",comboReadDict = true,sort = 111)
//@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
@ -955,21 +961,21 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 数据资产-数据领域
*/
//@NotNull
@Excel(name = "*数据领域",dictType = "sjzc_sjly",comboReadDict = true,sort = 105)
@Excel(name = "*数据领域",dictType = "sjzc_sjly",comboReadDict = true,sort = 112)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
//@NotNull
@Excel(name = "*更新周期",dictType = "sjzc_gxzq",comboReadDict = true,sort = 106)
@Excel(name = "*更新周期",dictType = "sjzc_gxzq",comboReadDict = true,sort = 113)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
//@NotBlank
@Excel(name = "*数据类型",sort = 107)
@Excel(name = "*数据类型",sort = 114)
@Size(max= 255,message="数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
@ -977,12 +983,12 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 数据资产-数据量
*/
//@NotBlank
@Excel(name = "*数据量",sort = 108)
@Excel(name = "*数据量",sort = 115)
@Size(max= 255,message="数据资产-数据量长度不能超过255")
@ApiModelProperty("数据资产-数据量")
private String sjzcSjl;
@Excel(name = "*数据量单位",sort = 109)
@Excel(name = "*数据量单位",sort = 116)
@ApiModelProperty("数据资产-数据量单位")
@TableField(exist = false)
private String sjzcSjldw;
@ -990,28 +996,28 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 数据资产-是否为涉密数据
*/
//@NotNull
@Excel(name = "*是否为涉密数据",dictType = "is_no",comboReadDict = true,sort = 110)
@Excel(name = "*是否为涉密数据",dictType = "is_no",comboReadDict = true,sort = 117)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@Excel(name = "*数据是否出境",dictType = "is_no",comboReadDict = true,sort = 111)
@Excel(name = "*数据是否出境",dictType = "is_no",comboReadDict = true,sort = 118)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@Excel(name = "*数据分级分类",dictType = "sjzc_sjfjfl",comboReadDict = true,sort = 112)
@Excel(name = "*数据分级分类",dictType = "sjzc_sjfjfl",comboReadDict = true,sort = 119)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@Excel(name = "数据重要程度",dictType = "zc_xtzyx",comboReadDict = true,sort = 113)
@Excel(name = "数据重要程度",dictType = "zc_xtzyx",comboReadDict = true,sort = 120)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
@ -1019,11 +1025,11 @@ public class AssetCurrent extends BaseClass implements Serializable {
*/
@Size(max= 500,message="数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述",sort = 114)
@Excel(name = "数据描述",sort = 121)
private String sjzcSjms;
@ApiModelProperty("*业务描述")
@Excel(name = "*业务描述",sort = 115)
@Excel(name = "*业务描述",sort = 122)
@TableField(exist = false)
private String ywms;
/**
@ -1048,4 +1054,11 @@ public class AssetCurrent extends BaseClass implements Serializable {
@ApiModelProperty("不通过原因")
private String btgyy;
/**
* 审核
*/
@ApiModelProperty("审核")
@TableField(exist = false)
private String auditState;
}

7
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetEmail.java
Unescape View File

@ -144,4 +144,11 @@ public class AssetEmail extends BaseClass implements Serializable {
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
/**
* 审核
*/
@ApiModelProperty("审核")
@TableField(exist = false)
private String auditState;
}

81
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetExport.java
Unescape View File

@ -15,146 +15,161 @@ public class AssetExport extends AssetCurrent{
/**
* 名称
*/
@Excel(name = "*系统建设单位名称",width=26,sort = 65)
@Excel(name = "*系统建设单位名称",width=26,sort = 67)
private String name;
/**
* 统一信用代码
*/
@Excel(name = "*系统建设单位统一信用代码",width=26,sort = 66)
@Excel(name = "*系统建设单位统一信用代码",width=26,sort = 68)
private String tyshxydm;
/**
* 联系人
*/
@Excel(name = "*系统建设单位联系人",width=26,sort = 67)
@Excel(name = "*系统建设单位联系人",width=26,sort = 69)
private String lxr;
/**
* 联系电话
*/
@Excel(name = "*系统建设单位联系电话",width=26,sort = 68)
@Excel(name = "*系统建设单位联系电话",width=26,sort = 70)
private String lxdh;
/**
* 供应商注册地址
*/
@Excel(name = "*系统建设单位供应商注册地址",width=26,sort = 69)
@Excel(name = "*系统建设单位供应商注册地址",width=26,sort = 71)
private String gyszcdz;
/**
* 注册地是否为太仓
*/
@Excel(name = "*系统建设单位注册地址是否为太仓",width=26,sort = 70,dictType = "is_no",comboReadDict = true)
@Excel(name = "*系统建设单位注册地址是否为太仓",width=26,sort = 72,dictType = "is_no",comboReadDict = true)
private String sfwtc;
/**
* 名称
*/
@Excel(name = "*系统运营单位名称",width=26,sort = 71)
@Excel(name = "*系统运营单位名称",width=26,sort = 73)
private String name1;
/**
* 统一信用代码
*/
@Excel(name = "*系统运营单位统一信用代码",width=26,sort = 72)
@Excel(name = "*系统运营单位统一信用代码",width=26,sort = 74)
private String tyshxydm1;
/**
* 联系人
*/
@Excel(name = "*系统运营单位联系人",width=26,sort = 73)
@Excel(name = "*系统运营单位联系人",width=26,sort = 75)
private String lxr1;
/**
* 联系电话
*/
@Excel(name = "*系统运营单位联系电话",width=26,sort = 74)
@Excel(name = "*系统运营单位联系电话",width=26,sort = 76)
private String lxdh1;
/**
* 供应商注册地址
*/
@Excel(name = "*系统运营单位供应商注册地址",width=26,sort = 75)
@Excel(name = "*系统运营单位供应商注册地址",width=26,sort = 77)
private String gyszcdz1;
/**
* 注册地是否为太仓
*/
@Excel(name = "*系统运营单位注册地址是否为太仓",width=26,sort = 76,dictType = "is_no",comboReadDict = true)
@Excel(name = "*系统运营单位注册地址是否为太仓",width=26,sort = 78,dictType = "is_no",comboReadDict = true)
private String sfwtc1;
/**
* 设备类型
*/
@Excel(name = "*服务器信息-设备类型",width=26,sort = 77)
@Excel(name = "*服务器信息-设备类型",width=26,sort = 79)
private String sblx;
/**
* 品牌
*/
@Excel(name = "*服务器信息-品牌",width=26,sort = 78)
@Excel(name = "*服务器信息-品牌",width=26,sort = 80)
private String pp;
/**
* 设备IP
*/
@Excel(name = "*服务器信息-设备IP",width=26,sort = 79)
@Excel(name = "*服务器信息-设备IP",width=26,sort = 81)
private String sbIp;
/**
* 操作系统
*/
@Excel(name = "*服务器信息-操作系统",width=26,sort = 80,dictType = "fwq_czxt",comboReadDict = true)
@Excel(name = "*服务器信息-操作系统",width=26,sort = 82,dictType = "fwq_czxt",comboReadDict = true)
private String czxt;
/**
* 操作系统版本
*/
@Excel(name = "*服务器信息-操作系统版本",width=26,sort = 81)
@Excel(name = "*服务器信息-操作系统版本",width=26,sort = 83)
private String czxtbb;
/**
* 硬件型号
*/
@Excel(name = "*服务器信息-硬件型号",width=26,sort = 82)
@Excel(name = "*服务器信息-硬件型号",width=26,sort = 84)
private String yjxh;
/**
* 硬件序列号
*/
@Excel(name = "服务器信息-硬件序列号",width=26,sort = 83)
@Excel(name = "服务器信息-硬件序列号",width=26,sort = 85)
private String yjxlh;
/**
* 硬件版本信息
*/
@Excel(name = "服务器信息-硬件版本信息",width=26,sort = 84)
@Excel(name = "服务器信息-硬件版本信息",width=26,sort = 86)
private String yjbbxx;
/**
* 硬件用途
*/
@Excel(name = "*服务器信息-硬件用途",width=26,sort = 85)
@Excel(name = "*服务器信息-硬件用途",width=26,sort = 87)
private String yjyt;
/**
* 硬件部署位置
*/
@Excel(name = "*服务器信息-硬件部署位置",width=26,sort = 85)
@Excel(name = "*服务器信息-硬件部署位置",width=26,sort = 88)
private String yjbsxx;
@Excel(name = "*网络设备-设备类型",width=26,sort = 86)
@Excel(name = "*网络设备-设备类型",width=26,sort = 89)
private String wlsblx;
@Excel(name = "*网络设备-品牌",width=26,sort = 87)
@Excel(name = "*网络设备-品牌",width=26,sort = 90)
private String wlpp;
@Excel(name = "*网络设备-设备IP",width=26,sort = 88)
@Excel(name = "*网络设备-设备IP",width=26,sort = 91)
private String wlsbIp;
@Excel(name = "*网络设备-硬件型号",width=26,sort = 89)
@Excel(name = "*网络设备-硬件型号",width=26,sort = 92)
private String wlyjxh;
@Excel(name = "网络设备-硬件序列号",width=26,sort = 90)
@Excel(name = "网络设备-硬件序列号",width=26,sort = 93)
private String wlyjxlh;
@Excel(name = "网络设备-硬件版本信息",width=26,sort = 91)
@Excel(name = "网络设备-硬件版本信息",width=26,sort = 94)
private String wlyjbbxx;
@Excel(name = "*网络设备-硬件用途",width=26,sort = 92)
@Excel(name = "*网络设备-硬件用途",width=26,sort = 95)
private String wlyjyt;
@Excel(name = "*网络设备-硬件部署位置",width=26,sort = 93)
@Excel(name = "*网络设备-硬件部署位置",width=26,sort = 96)
private String wlyjbsxx;
@Excel(name = "*安全设备-设备类型",width=26,sort = 94)
@Excel(name = "*安全设备-设备类型",width=26,sort = 97)
private String aqwlsblx;
@Excel(name = "*安全设备-品牌",width=26,sort = 95)
@Excel(name = "*安全设备-品牌",width=26,sort = 98)
private String aqwlpp;
@Excel(name = "*安全设备-设备IP",width=26,sort = 96)
@Excel(name = "*安全设备-设备IP",width=26,sort = 99)
private String aqwlsbIp;
@Excel(name = "*安全设备-硬件型号",width=26,sort = 100)
private String aqyjxh;
@Excel(name = "安全设备-硬件序列号",width=26,sort = 101)
private String aqyjxlh;
@Excel(name = "安全设备-硬件版本信息",width=26,sort = 102)
private String aqyjbbxx;
@Excel(name = "*安全设备-硬件用途",width=26,sort = 103)
private String aqyjyt;
@Excel(name = "*安全设备-硬件部署位置",width=26,sort = 104)
private String aqyjbswz;
}

7
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetMiniPrograms.java
Unescape View File

@ -197,4 +197,11 @@ public class AssetMiniPrograms extends BaseClass implements Serializable {
@ApiModelProperty("是否报废")
private Integer isbf=0;
/**
* 审核
*/
@ApiModelProperty("审核")
@TableField(exist = false)
private String auditState;
}

19
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetOfficialAccount.java
Unescape View File

@ -173,4 +173,23 @@ public class AssetOfficialAccount extends BaseClass implements Serializable {
*/
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
/**
* 平台类型
*/
@ApiModelProperty("平台类型")
private String ptlx;
/**
* 粉丝数
*/
@ApiModelProperty("粉丝数")
private String fss;
/**
* 审核
*/
@ApiModelProperty("审核")
@TableField(exist = false)
private String auditState;
}

27
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/Unit.java
Unescape View File

@ -169,6 +169,31 @@ public class Unit implements Serializable {
@Excel(name="第一联系人职务职称")
private String dylxrzwzc;
@ApiModelProperty("首席数据官")
private String sxsjg;
@ApiModelProperty("首席数据官联系方式")
private String sxsjglxfs;
@ApiModelProperty("首席数据官邮箱")
private String sxsjgyx;
@ApiModelProperty("首席数据官职务职称")
private String sxsjgzwzc;
@ApiModelProperty("数据官联络人")
private String sjgllr;
@ApiModelProperty("数据官联络人联系方式")
private String sjgllrlxfs;
@ApiModelProperty("数据官联络人邮箱")
private String sjgllryx;
@ApiModelProperty("数据官联络人职务职称")
private String sjgllrzwzc;
@ApiModelProperty("单位其他联系人")
@TableField(exist = false)
private List<UnitOtherConcat> otherConcat;
@ -248,7 +273,7 @@ public class Unit implements Serializable {
private String delFlag;
@ApiModelProperty("组织机构名称（部门名称）")
@Excel(name = "*组织机构",required = true)
@Excel(name = "*组织机构",required = true,dictType="dwzzjg",comboReadDict = true)
@TableField(exist = false)
private String deptName;
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppCpPo.java
Unescape View File

@ -156,4 +156,14 @@ public class AssetAppCpPo extends BaseClass implements Serializable {
@ApiModelProperty("app状态")
private String appState;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetAppJyPo.java
Unescape View File

@ -159,4 +159,14 @@ public class AssetAppJyPo extends BaseClass implements Serializable {
@ApiModelProperty("app状态")
private String appState;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

32
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentCpPo.java
Unescape View File

@ -26,11 +26,11 @@ import java.util.List;
public class AssetCurrentCpPo extends BaseClass implements Serializable {
private static final long serialVersionUID = 1L;
// /**
// * 主键id
// */
// @TableId(type = IdType.AUTO,value = "current_id")
// private Long currentId;
/**
* 主键id
*/
@TableId(type = IdType.AUTO,value = "current_id")
private Long currentId;
@ApiModelProperty("资产id")
private Long id;
@ -944,4 +944,26 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
@ApiModelProperty("建设运营单位")
private String jsyydw;
/**
* DNS:
*/
@ApiModelProperty("DNS")
private String dns;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
* 是否自建互联网专线ip
*/
@TableField("is_zjhlwip")
@ApiModelProperty("是否自建互联网专线ip")
private String isZjhlwip;
}

28
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetCurrentJyPo.java
Unescape View File

@ -514,7 +514,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
*/
// @Excel(name = "ICP备案编号",sort = 25,width = 46)
@Excel(name = "ICP备案编号（ICP备案状态选择为是则必填）",sort = 25,width = 46)
@NotBlank
@Size(max= 50,message="ICP备案信息-ICP备案编号长度不能超过50")
@ApiModelProperty("ICP备案信息-ICP备案编号")
private String ipcIpcbabh;
@ -522,7 +521,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
* ICP备案信息-备案域名
*/
@Excel(name = "*备案域名",sort = 26)
@NotBlank
@Size(max= 50,message="ICP备案信息-备案域名长度不能超过50")
@ApiModelProperty("ICP备案信息-备案域名")
private String ipcBaym;
@ -574,7 +572,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
@Excel(name = "*公安机关备案号",sort = 28,width = 22)
@Size(max= 50,message="公安机关备案信息-公安机关备案号长度不能超过50")
@ApiModelProperty("公安机关备案信息-公安机关备案号")
@NotBlank
private String gajgBah;
/**
* 公安机关备案信息-备案日期
@ -660,7 +657,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
/**
* 等保信息-等保测评备案号
*/
@NotBlank
@Excel(name = "*等保测评备案号",sort = 43,width = 22)
@Size(max= 50,message="等保信息-等保测评备案号长度不能超过50")
@ApiModelProperty("等保信息-等保测评备案号")
@ -691,7 +687,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
/**
* 等保信息-定级时间
*/
@NotBlank
@Excel(name = "定级时间（是否是等保系统是则必填，样式如2024-11-02）",sort = 119,width = 40)
@Size(max= 50,message="等保信息-定级时间长度不能超过50")
@ApiModelProperty("等保信息-定级时间")
@ -719,7 +714,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
/**
* 等保信息-测评得分
*/
@NotBlank
@Excel(name = "*测评得分",sort = 49)
@Size(max= 50,message="等保信息-测评得分长度不能超过50")
@ApiModelProperty("等保信息-测评得分")
@ -1064,4 +1058,26 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
@ApiModelProperty("建设运营单位")
private String jsyydw;
/**
* DNS:
*/
@ApiModelProperty("DNS")
private String dns;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
* 是否自建互联网专线ip
*/
@ApiModelProperty("是否自建互联网专线ip")
private String isZjhlwip;
}

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailCpPo.java
Unescape View File

@ -156,5 +156,13 @@ public class AssetEmailCpPo extends BaseClass implements Serializable {
@ApiModelProperty("不通过次数")
private Integer count;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

8
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetEmailJyPo.java
Unescape View File

@ -154,5 +154,13 @@ public class AssetEmailJyPo extends BaseClass implements Serializable {
private Integer status;
@ApiModelProperty("不通过次数")
private Integer count;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsCpPo.java
Unescape View File

@ -205,4 +205,14 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetMiniProgramsJyPo.java
Unescape View File

@ -204,4 +204,14 @@ public class AssetMiniProgramsJyPo extends BaseClass implements Serializable {
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountCpPo.java
Unescape View File

@ -167,4 +167,26 @@ public class AssetOfficialAccountCpPo extends BaseClass implements Serializable
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
/**
* 平台类型
*/
@ApiModelProperty("平台类型")
private String ptlx;
/**
* 粉丝数
*/
@ApiModelProperty("粉丝数")
private String fss;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetOfficialAccountJyPo.java
Unescape View File

@ -188,4 +188,26 @@ public class AssetOfficialAccountJyPo extends BaseClass implements Serializable
@ApiModelProperty("不通过次数")
private Integer count;
/**
* 平台类型
*/
@ApiModelProperty("平台类型")
private String ptlx;
/**
* 粉丝数
*/
@ApiModelProperty("粉丝数")
private String fss;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

37
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAuditPageRequest.java
Unescape View File

@ -0,0 +1,37 @@
package com.ruoyi.tc.entity.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 管理端审核列表分页请求体
* @author du
* @since 2024/12/23 14:45
*/
@Data
public class AssetAuditPageRequest {
@ApiModelProperty("页码")
private Long current=1L;
@ApiModelProperty("页数")
private Long size=10L;
/**
* 资产名称
*/
@ApiModelProperty("资产名称")
private String name;
/**
* 审核状态
*/
@ApiModelProperty("审核状态")
private String auditState;
/**
* 单位名称
*/
@ApiModelProperty("单位名称")
private String dwmc;
}

29
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/request/AssetAuditRequest.java
Unescape View File

@ -0,0 +1,29 @@
package com.ruoyi.tc.entity.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
/**
* 管理端审核请求体
* @author du
* @since 2024/12/23 15:38
*/
@Data
public class AssetAuditRequest {
@NotNull
@ApiModelProperty("资产id")
private Long currentId;
@NotBlank
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
}

42
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/response/AssetSysUserExport.java
Unescape View File

@ -0,0 +1,42 @@
package com.ruoyi.tc.entity.response;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author du
* @since 2024/12/29 18:36
*/
@Data
@ApiModel("单位密码导出")
public class AssetSysUserExport {
/**
* 用户id
*/
@ApiModelProperty("用户id")
private String userId;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码")
@ApiModelProperty("统一社会信用代码")
private String userName;
/**
* 单位名称
*/
@Excel(name = "单位名称")
@ApiModelProperty("单位名称")
private String nickName;
/**
* 密码
*/
@Excel(name = "密码")
private String password;
}

4
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppCpMapper.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -58,6 +61,5 @@ public interface AssetAppCpMapper extends BaseMapper<AssetAppCpPo> {
*/
@Select("select * from asset_app_cp where asset_id=#{assetId} and task_id =#{taskId} ")
AssetAppCpPo findByassetIdandTaskId(@Param("assetId") Integer assetId, @Param("taskId")Integer taskId);
}

11
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAppJyMapper.java
Unescape View File

@ -1,8 +1,11 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Param;
/**
* 资产移动应用程序表(asset_app_cp)表数据库访问层
@ -11,7 +14,13 @@ import com.ruoyi.tc.entity.po.AssetAppJyPo;
*/
public interface AssetAppJyMapper extends BaseMapper<AssetAppJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, @Param("req") AssetAuditPageRequest as);
}

4
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentCpMapper.java
Unescape View File

@ -1,7 +1,9 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
@ -53,5 +55,7 @@ public interface AssetCurrentCpMapper extends BaseMapper<AssetCurrentCpPo> {
*/
@Select("select * from asset_current_cp where id=#{assetId} and task_id =#{taskId}")
AssetCurrentCpPo findByassetIdandTaskId(@Param("assetId") Integer assetId, @Param("taskId") Integer taskId);
}

12
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetCurrentJyMapper.java
Unescape View File

@ -1,7 +1,12 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Param;
/**
* 现有资产复制表(AssetCurrentResponse)表数据库访问层
@ -11,5 +16,12 @@ import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
*/
public interface AssetCurrentJyMapper extends BaseMapper<AssetCurrentJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, @Param("req") AssetAuditPageRequest as);
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetEmailJyMapper.java
Unescape View File

@ -1,8 +1,11 @@
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.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Param;
/**
* 电子邮件资产表(asset_email_cp)表数据库访问层
@ -12,5 +15,12 @@ import com.ruoyi.tc.entity.po.AssetEmailJyPo;
public interface AssetEmailJyMapper extends BaseMapper<AssetEmailJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page,@Param("req") AssetAuditPageRequest as);
}

12
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetMiniProgramsJyMapper.java
Unescape View File

@ -1,9 +1,12 @@
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.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
/**
* 小程序资产表(asset_mini_programs_cp)表数据库访问层
@ -14,7 +17,12 @@ import org.apache.ibatis.annotations.Delete;
public interface AssetMiniProgramsJyMapper extends BaseMapper<AssetMiniProgramsJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page,@Param("req") AssetAuditPageRequest as);
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetOfficialAccountJyMapper.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetOfficialAccountJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import org.apache.ibatis.annotations.Param;
/**
* 公众号资产表(asset_official_account_cp)表数据库访问层
@ -12,5 +15,12 @@ import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
public interface AssetOfficialAccountJyMapper extends BaseMapper<AssetOfficialAccountJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, @Param("req") AssetAuditPageRequest as);
}

2
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetSupplyChainMapper.java
Unescape View File

@ -21,7 +21,7 @@ public interface AssetSupplyChainMapper extends BaseMapper<AssetSupplyChain> {
AssetSupplyChain getJsdw(Long id);
/**
* 逻辑删除
* 删除
*/
void deleteByAssetIds(Long id);

19
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitMapper.java
Unescape View File

@ -3,10 +3,12 @@ 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.SysDept;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.request.GeneralQueryRequest;
import com.ruoyi.tc.entity.request.UnitRequest;
import com.ruoyi.tc.entity.response.AssetSysUserExport;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -36,7 +38,7 @@ public interface UnitMapper extends BaseMapper<Unit> {
/**
* 根据id列表查询单位
*/
List<String> selectByIds(Long id);
String selectByIds(Long id);
/**
* 逻辑删除单位
@ -86,6 +88,11 @@ public interface UnitMapper extends BaseMapper<Unit> {
*/
Integer selectTaskId(@Param("dwmc") String dwmc,@Param("type") String type);
/**
* 根据单位名称查询
*/
List<AssetTask> selectTaskIdToDwmc(@Param("dwmc") String dwmc);
/**
* app资产的单位组织架构不为空的部门
@ -114,4 +121,14 @@ public interface UnitMapper extends BaseMapper<Unit> {
* web资产的单位组织架构不为空的部门
*/
List<SysDept> getWebSchema();
/**
* 查询所有单位
*/
List<AssetSysUserExport> exportAllPassword();
/**
* 单位生成随机密码
*/
int updatePasswordUser(@Param("req") AssetSysUserExport x);
}

4
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/UnitOtherConcatMapper.java
Unescape View File

@ -13,12 +13,12 @@ import java.util.List;
public interface UnitOtherConcatMapper extends BaseMapper<UnitOtherConcat>
{
/**
* 根据unitId逻辑删除
* 根据unitId删除
*/
void deleteByUnitIds(Long id);
/**
* 根据assetId逻辑删除
* 根据assetId删除
*/
void deleteByAssetIds(Long id);

4
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppCpService.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import java.util.List;
@ -50,4 +53,5 @@ public interface AssetAppCpService extends IService<AssetAppCpPo> {
* @return
*/
AssetAppCpPo findByassetIdandTaskId(Integer assetId, Integer taskId);
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAppJyService.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
/**
* 资产移动应用程序表(asset_app_cp)表服务接口
@ -11,4 +14,11 @@ import com.ruoyi.tc.entity.po.AssetAppJyPo;
*/
public interface AssetAppJyService extends IService<AssetAppJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, AssetAuditPageRequest as);
}

3
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentCpService.java
Unescape View File

@ -1,7 +1,9 @@
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.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import java.util.List;
@ -13,6 +15,7 @@ import java.util.List;
*/
public interface AssetCurrentCpService extends IService<AssetCurrentCpPo> {
/**
* 根据资产id和任务id删除数据
*

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetCurrentJyService.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
/**
* 现有资产表(AssetCurrent)表服务接口
@ -11,6 +14,13 @@ import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
*/
public interface AssetCurrentJyService extends IService<AssetCurrentJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, AssetAuditPageRequest as);
}

9
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetEmailJyService.java
Unescape View File

@ -1,8 +1,10 @@
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.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
/**
* 电子邮件资产表(asset_email)表服务接口
@ -12,4 +14,11 @@ import com.ruoyi.tc.entity.po.AssetEmailJyPo;
*/
public interface AssetEmailJyService extends IService<AssetEmailJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page, AssetAuditPageRequest as);
}

12
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetMiniProgramsJyService.java
Unescape View File

@ -1,8 +1,10 @@
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.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
/**
* 小程序资产(asset_mini_programs_cp)表服务接口
@ -13,7 +15,11 @@ import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
public interface AssetMiniProgramsJyService extends IService<AssetMiniProgramsJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page, AssetAuditPageRequest as);
}

9
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetOfficialAccountJyService.java
Unescape View File

@ -1,7 +1,9 @@
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.po.AssetOfficialAccountJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
/**
@ -12,4 +14,11 @@ import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
*/
public interface AssetOfficialAccountJyService extends IService<AssetOfficialAccountJyPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, AssetAuditPageRequest as);
}

2
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetSupplyChainService.java
Unescape View File

@ -19,7 +19,7 @@ public interface AssetSupplyChainService extends IService<AssetSupplyChain> {
AssetSupplyChain getJsdw(Long id);
/**
* 逻辑删除
* 删除
*/
void deleteByAssetIds(Long id);

4
ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitOtherConcatService.java
Unescape View File

@ -26,7 +26,7 @@ public interface UnitOtherConcatService extends IService<UnitOtherConcat> {
/**
* 删除
* @param UnitOtherConcatidList
* @param unitOtherConcatidList
*/
void deleteIdList(List<Long> UnitOtherConcatidList);
void deleteIdList(List<Long> unitOtherConcatidList);
}

20
ruoyi-admin/src/main/java/com/ruoyi/tc/service/UnitService.java
Unescape View File

@ -4,10 +4,12 @@ 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.TreeSelect;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.request.GeneralQueryRequest;
import com.ruoyi.tc.entity.request.UnitRequest;
import com.ruoyi.tc.entity.response.AssetSysUserExport;
import java.util.List;
@ -48,7 +50,7 @@ public interface UnitService extends IService<Unit> {
/**
* 根据id列表查询单位
*/
List<String> selectByIds(Long id);
String selectByIds(Long id);
/**
* 逻辑删除用户
@ -81,6 +83,11 @@ public interface UnitService extends IService<Unit> {
*/
Integer selectTaskId(String dwmc,String type);
/**
* 根据单位名称查询
*/
List<AssetTask> selectTaskIdToDwmc(String dwmc);
/**
* 根据单位查询资产总数
@ -95,4 +102,15 @@ public interface UnitService extends IService<Unit> {
* 根据资产类型返回组织架构
*/
List<TreeSelect> getSchema(String type);
/**
* 查询所有单位
*/
List<AssetSysUserExport> exportAllPassword();
/**
* 单位生成随机密码
*/
int updatePasswordUser(AssetSysUserExport x);
}

5
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppCpServiceImpl.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetAppCpMapper;
import com.ruoyi.tc.service.AssetAppCpService;
import org.springframework.stereotype.Service;
@ -43,4 +46,6 @@ public class AssetAppCpServiceImpl extends ServiceImpl<AssetAppCpMapper, AssetAp
public AssetAppCpPo findByassetIdandTaskId(Integer assetId, Integer taskId) {
return baseMapper.findByassetIdandTaskId(assetId,taskId);
}
}

13
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppJyServiceImpl.java
Unescape View File

@ -1,8 +1,10 @@
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.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetAppCpMapper;
import com.ruoyi.tc.mapper.AssetAppJyMapper;
import com.ruoyi.tc.service.AssetAppCpService;
@ -18,4 +20,15 @@ import org.springframework.stereotype.Service;
@Service("assetAppJyService")
public class AssetAppJyServiceImpl extends ServiceImpl<AssetAppJyMapper, AssetAppJyPo> implements AssetAppJyService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetAppJyPo> getAuditList(Page<AssetAppJyPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAppServiceImpl.java
Unescape View File

@ -88,9 +88,13 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
save(assetApp);
AssetAppCpPo a = new AssetAppCpPo();
BeanUtil.copyProperties(assetApp, a);
a.setTaskId(unitService.selectTaskId(assetApp.getSsdw(), "4"));
a.setAssetId(assetApp.getId());
return assetAppCpService.save(a);
Integer i = unitService.selectTaskId(assetApp.getSsdw(), "4");
if(i!=null){
a.setTaskId(i);
a.setAssetId(assetApp.getId());
assetAppCpService.save(a);
}
return true;
}

4
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentCpServiceImpl.java
Unescape View File

@ -1,7 +1,9 @@
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.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetCurrentCpMapper;
import com.ruoyi.tc.service.*;
import org.springframework.stereotype.Service;
@ -20,6 +22,8 @@ public class AssetCurrentCpServiceImpl extends ServiceImpl<AssetCurrentCpMapper,
@Resource
private AssetCurrentCpMapper assetCurrentCpMapper;
@Override
public void deletByAssetIdandTaskId(Long assetId,int taskId) {
assetCurrentCpMapper.deletByAssetIdandTaskId(assetId,taskId);

14
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentJyServiceImpl.java
Unescape View File

@ -1,7 +1,10 @@
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.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetCurrentJyMapper;
import com.ruoyi.tc.service.AssetCurrentJyService;
import org.springframework.stereotype.Service;
@ -16,5 +19,16 @@ import org.springframework.stereotype.Service;
public class AssetCurrentJyServiceImpl extends ServiceImpl<AssetCurrentJyMapper, AssetCurrentJyPo> implements AssetCurrentJyService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetCurrentJyPo> getAuditList(Page<AssetCurrentJyPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

13
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailJyServiceImpl.java
Unescape View File

@ -1,8 +1,10 @@
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.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetEmailCpMapper;
import com.ruoyi.tc.mapper.AssetEmailJyMapper;
import com.ruoyi.tc.service.AssetEmailCpService;
@ -18,4 +20,15 @@ import org.springframework.stereotype.Service;
@Service("assetEmailJyService")
public class AssetEmailJyServiceImpl extends ServiceImpl<AssetEmailJyMapper, AssetEmailJyPo> implements AssetEmailJyService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetEmailJyPo> getAuditList(Page<AssetEmailJyPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetEmailServiceImpl.java
Unescape View File

@ -89,9 +89,13 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
save(assetEmail);
AssetEmailCpPo a = new AssetEmailCpPo();
BeanUtil.copyProperties(assetEmail, a);
a.setTaskId(unitService.selectTaskId(assetEmail.getSsdw(), "3"));
a.setAssetId(assetEmail.getId());
return assetEmailCpService.save(a);
Integer i = unitService.selectTaskId(assetEmail.getSsdw(), "3");
if(i!=null){
a.setTaskId(i);
a.setAssetId(assetEmail.getId());
assetEmailCpService.save(a);
}
return true;
}
/**

13
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsJyServiceImpl.java
Unescape View File

@ -1,7 +1,9 @@
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.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetMiniProgramsCpMapper;
import com.ruoyi.tc.mapper.AssetMiniProgramsJyMapper;
import com.ruoyi.tc.service.AssetMiniProgramsJyService;
@ -18,4 +20,15 @@ import javax.annotation.Resource;
@Service("assetMiniProgramsJyService")
public class AssetMiniProgramsJyServiceImpl extends ServiceImpl<AssetMiniProgramsJyMapper, AssetMiniProgramsJyPo> implements AssetMiniProgramsJyService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetMiniProgramsJyPo> getAuditList(Page<AssetMiniProgramsJyPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page, as);
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetMiniProgramsServiceImpl.java
Unescape View File

@ -81,9 +81,13 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
save(assetMiniPrograms);
AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
BeanUtil.copyProperties(assetMiniPrograms,assetMiniProgramsCpPo);
assetMiniProgramsCpPo.setTaskId(unitService.selectTaskId(assetMiniPrograms.getSsdw(),"1"));
assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
return assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1");
if(i!=null){
assetMiniProgramsCpPo.setTaskId(i);
assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
}
return true;
}
/**

12
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountJyServiceImpl.java
Unescape View File

@ -1,8 +1,10 @@
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.po.AssetOfficialAccountCpPo;
import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.mapper.AssetOfficialAccountCpMapper;
import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
import com.ruoyi.tc.service.AssetOfficialAccountCpService;
@ -18,4 +20,14 @@ import org.springframework.stereotype.Service;
@Service("assetOfficialAccountJyService")
public class AssetOfficialAccountJyServiceImpl extends ServiceImpl<AssetOfficialAccountJyMapper, AssetOfficialAccountJyPo> implements AssetOfficialAccountJyService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetOfficialAccountJyPo> getAuditList(Page<AssetOfficialAccountJyPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetOfficialAccountServiceImpl.java
Unescape View File

@ -84,9 +84,13 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
save(assetOfficialAccount);
AssetOfficialAccountCpPo a = new AssetOfficialAccountCpPo();
BeanUtil.copyProperties(assetOfficialAccount, a);
a.setTaskId(unitService.selectTaskId(assetOfficialAccount.getSsdw(), "2"));
a.setAssetId(assetOfficialAccount.getId());
return assetOfficialAccountCpService.save(a);
Integer i = unitService.selectTaskId(assetOfficialAccount.getSsdw(), "2");
if(i!=null){
a.setTaskId(i);
a.setAssetId(assetOfficialAccount.getId());
assetOfficialAccountCpService.save(a);
}
return true;
}
/**

2
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetSupplyChainServiceImpl.java
Unescape View File

@ -27,7 +27,7 @@ public class AssetSupplyChainServiceImpl extends ServiceImpl<AssetSupplyChainMap
}
/**
* 逻辑删除
* 删除
*/
@Override
public void deleteByAssetIds(Long id) {

28
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/UnitServiceImpl.java
Unescape View File

@ -11,15 +11,18 @@ import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.request.GeneralQueryRequest;
import com.ruoyi.tc.entity.request.UnitRequest;
import com.ruoyi.tc.entity.response.AssetSysUserExport;
import com.ruoyi.tc.mapper.UnitMapper;
import com.ruoyi.tc.service.UnitService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@ -102,7 +105,7 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
* 根据id列表查询单位
*/
@Override
public List<String> selectByIds(Long id) {
public String selectByIds(Long id) {
return baseMapper.selectByIds(id);
}
@ -145,6 +148,13 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
public Integer selectTaskId(String dwmc, String type) {
return baseMapper.selectTaskId(dwmc, type);
}
/**
* 根据单位名称查询
*/
@Override
public List<AssetTask> selectTaskIdToDwmc(String dwmc) {
return baseMapper.selectTaskIdToDwmc(dwmc);
}
@Override
public Integer findBydwmc(String part) {
@ -179,4 +189,20 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
return iSysDeptService.buildDeptTreeSelect(appSchema);
}
/**
* 查询所有单位
*/
@Override
public List<AssetSysUserExport> exportAllPassword() {
return baseMapper.exportAllPassword();
}
/**
* 单位生成随机密码
*/
@Override
public int updatePasswordUser(AssetSysUserExport x) {
return baseMapper.updatePasswordUser(x);
}
}

2
ruoyi-admin/src/main/resources/application.yml
Unescape View File

@ -144,4 +144,4 @@ unitDockingContact: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_dwlxrb_
#系统基础信息
systemInfo: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtxgxxb_1505
#系统等保信息
systemDb: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtdbxxb_4446
systemDb: http://2.35.109.131:9193/outApiData/tcjczhapi/org_dm_xtdbxxb_4446

21
ruoyi-admin/src/main/resources/mapper/AssetAppJyMapper.xml
Unescape View File

@ -0,0 +1,21 @@
<?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.AssetAppJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetAppJyPo">
select a.* from asset_app_cp a
<where>
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.app_name like concat('%',#{req.name},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and a.ssdw like concat('%',#{req.dwmc},'%')
</if>
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/AssetAppMapper.xml
Unescape View File

@ -1,11 +1,10 @@
<?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.AssetAppMapper">
<update id="deleteById">
update asset_app
set del_flag = '2'
<delete id="deleteById">
delete from asset_app
where id = #{id}
</update>
</delete>
<delete id="deleteIdList" >
DELETE FROM asset_app
WHERE id IN
@ -15,11 +14,12 @@
</delete>
<select id="page" resultType="com.ruoyi.tc.entity.AssetApp">
select a.*,c.dept_name as deptName from asset_app a
select a.*,c.dept_name as deptName,e.audit_state as auditState from asset_app a
left join unit_info b on a.ssdw = b.nick_name
left join sys_dept c on b.dept_id = c.dept_id
left join (select * from asset_app_cp where task_id is null) e on a.id = e.asset_id
<where>
a.del_flag = '0' and b.del_flag = '0'
a.del_flag = '0'
<if test="req.yymc!=null and req.yymc!='' ">
and a.app_name like concat('%',#{req.yymc},'%')
</if>

6
ruoyi-admin/src/main/resources/mapper/AssetBasicNetworkMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?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 = #{id}
</update>
<delete id="deleteByAssetIds">
delete from asset_basic_network where asset_id = #{id}
</delete>
<delete id="deleteIdList" >
DELETE FROM asset_basic_network
WHERE asset_id IN

6
ruoyi-admin/src/main/resources/mapper/AssetBusinessFormMapper.xml
Unescape View File

@ -2,9 +2,9 @@
<!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 = #{id}
</update>
<delete id="deleteByAssetIds">
delete from asset_business_form where asset_id = #{id}
</delete>
<delete id="deleteIdList">
DELETE FROM asset_business_form
WHERE asset_id IN

21
ruoyi-admin/src/main/resources/mapper/AssetCurrentJyMapper.xml
Unescape View File

@ -0,0 +1,21 @@
<?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.AssetCurrentJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetCurrentJyPo">
select a.* from asset_current_cp a
<where>
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.xtmc like concat('%',#{req.name},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and a.dwmc like concat('%',#{req.dwmc},'%')
</if>
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

21
ruoyi-admin/src/main/resources/mapper/AssetCurrentMapper.xml
Unescape View File

@ -13,11 +13,12 @@
<select id="page" resultType="com.ruoyi.tc.entity.AssetCurrent">
select a.* from asset_current a
select a.*,c.dept_name as deptName,e.audit_state as auditState from asset_current a
left join unit_info b on a.dwmc = b.nick_name
left join sys_dept c on b.dept_id = c.dept_id
left join (select * from asset_current_cp where task_id is null) e on a.id = e.id
<where>
a. del_flag = '0' and b.del_flag = '0'
a.del_flag = '0'
<if test="req.xtmc!=null and req.xtmc!='' ">
and a.xtmc like concat('%',#{req.xtmc},'%')
</if>
@ -123,8 +124,13 @@
pp,sb_ip,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx
) e ON a.id = e.asset_id
LEFT JOIN ( SELECT
asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp
FROM asset_basic_network WHERE type = 3 GROUP BY asset_id,sblx,pp,sb_ip ) l ON a.id = l.asset_id
asset_id, sblx AS aqwlsblx, pp AS aqwlpp, sb_ip AS aqwlsbIp,
yjxh AS aqyjxh,
yjxlh AS aqyjxlh,
yjbbxx AS aqyjbbxx,
yjyt AS aqyjyt,
yjbsxx AS aqyjbswz
FROM asset_basic_network WHERE type = 3 GROUP BY asset_id,sblx,pp,sb_ip,yjxh,yjxlh,yjbbxx,yjyt,yjbsxx ) l ON a.id = l.asset_id
<where>
a.del_flag = '0' and a.isbf = '0'
<if test="req.xtmc!=null and req.xtmc!='' ">
@ -148,11 +154,10 @@
</where>
order by create_time desc
</select>
<update id="deleteByUnitIds">
update asset_current
set del_flag = '2'
<delete id="deleteByUnitIds">
delete from asset_current
where id = #{id}
</update>
</delete>
<resultMap type="com.ruoyi.tc.entity.AssetCurrent" id="AssetCurrentMap">
<result property="id" column="id"/>
<result property="xtmc" column="xtmc"/>

21
ruoyi-admin/src/main/resources/mapper/AssetEmailJyMapper.xml
Unescape View File

@ -0,0 +1,21 @@
<?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.AssetEmailJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetEmailJyPo">
select a.* from asset_email_cp a
<where>
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.dzyxhz like concat('%',#{req.name},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and a.ssdw like concat('%',#{req.dwmc},'%')
</if>
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/AssetEmailMapper.xml
Unescape View File

@ -1,11 +1,10 @@
<?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.AssetEmailMapper">
<update id="deleteById">
update asset_email
set del_flag = '2'
<delete id="deleteById">
delete from asset_email
where id = #{id}
</update>
</delete>
<delete id="deleteIdList">
DELETE FROM asset_email
WHERE id IN
@ -15,11 +14,12 @@
</delete>
<select id="page" resultType="com.ruoyi.tc.entity.AssetEmail">
select a.* from asset_email a
select a.*,c.dept_name as deptName,e.audit_state as auditState from asset_email a
left join unit_info b on a.ssdw = b.nick_name
left join sys_dept c on b.dept_id = c.dept_id
left join (select * from asset_email_cp where task_id is null) e on a.id = e.asset_id
<where>
a.del_flag = '0' and b.del_flag = '0'
a.del_flag = '0'
<if test="req.dzyxhz!=null and req.dzyxhz!='' ">
and a.dzyxhz like concat('%',#{req.dzyxhz},'%')
</if>

21
ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsJyMapper.xml
Unescape View File

@ -0,0 +1,21 @@
<?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.AssetMiniProgramsJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo">
select a.* from asset_mini_programs_cp a
<where>
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.xcxmc like concat('%',#{req.name},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and a.ssdw like concat('%',#{req.dwmc},'%')
</if>
<if test="req.auditState!=null">
and a.audit_state = #{req.auditState}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsMapper.xml
Unescape View File

@ -1,11 +1,10 @@
<?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.AssetMiniProgramsMapper">
<update id="deleteById">
update asset_mini_programs
set del_flag = '2'
<delete id="deleteById">
delete from asset_mini_programs
where id = #{id}
</update>
</delete>
<delete id="deleteIdList" >
DELETE FROM asset_mini_programs
WHERE id IN
@ -15,11 +14,12 @@
</delete>
<select id="page" resultType="com.ruoyi.tc.entity.AssetMiniPrograms">
select a.* from asset_mini_programs a
select a.*,c.dept_name as deptName,e.audit_state as auditState from asset_mini_programs a
left join unit_info b on a.ssdw = b.nick_name
left join sys_dept c on b.dept_id = c.dept_id
left join (select * from asset_mini_programs_cp where task_id is null) e on a.id = e.asset_id
<where>
a.del_flag = '0' and b.del_flag = '0'
a.del_flag = '0'
<if test="req.xcxmc!=null and req.xcxmc!='' ">
and a.xcxmc like concat('%',#{req.xcxmc},'%')
</if>

21
ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountJyMapper.xml
Unescape View File

@ -0,0 +1,21 @@
<?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.AssetOfficialAccountJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo">
select a.* from asset_official_account_cp a
<where>
a.task_id is null
<if test="req.name!=null and req.name!='' ">
and a.gzhmc like concat('%',#{req.name},'%')
</if>
<if test="req.dwmc!=null and req.dwmc!='' ">
and a.ssdw like concat('%',#{req.dwmc},'%')
</if>
<if test="req.auditState!=null">
and a.audit_state =#{req.auditState}
</if>
</where>
order by a.create_time desc
</select>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountMapper.xml
Unescape View File

@ -1,11 +1,10 @@
<?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.AssetOfficialAccountMapper">
<update id="deleteById">
update asset_official_account
set del_flag = '2'
<delete id="deleteById">
delete from asset_official_account
where id = #{id}
</update>
</delete>
<delete id="deleteIdList" >
DELETE FROM asset_official_account
WHERE id IN
@ -19,11 +18,12 @@
where ssdw = #{part}and del_flag=0
</select>
<select id="page" resultType="com.ruoyi.tc.entity.AssetOfficialAccount">
select a.* from asset_official_account a
select a.*,c.dept_name as deptName,e.audit_state as auditState from asset_official_account a
left join unit_info b on a.ssdw = b.nick_name
left join sys_dept c on b.dept_id = c.dept_id
left join (select * from asset_official_account_cp where task_id is null) e on a.id = e.asset_id
<where>
a.del_flag = '0' and b.del_flag = '0'
a.del_flag = '0'
<if test="req.gzhmc!=null and req.gzhmc!='' ">
and a.gzhmc like concat('%',#{req.gzhmc},'%')
</if>

6
ruoyi-admin/src/main/resources/mapper/AssetSupplyChainMapper.xml
Unescape View File

@ -1,9 +1,9 @@
<?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 = #{id}
</update>
<delete id="deleteByAssetIds">
delete from asset_supply_chain where asset_id = #{id}
</delete>
<delete id="deleteIdList">
DELETE FROM asset_supply_chain
WHERE asset_id IN

6
ruoyi-admin/src/main/resources/mapper/ExamineInfoMapper.xml
Unescape View File

@ -1,8 +1,8 @@
<?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.ExamineInfoMapper">
<update id="deleteByUnitIds">
update unit_examine_info set del_flag = '2' where unit_id = #{id}
</update>
<delete id="deleteByUnitIds">
delete from unit_examine_info where unit_id = #{id}
</delete>
</mapper>

168
ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
Unescape View File

@ -52,6 +52,16 @@
<result property="delFlag" column="del_flag"/>
<result property="deptName" column="deptName"/>
<result property="ancestors" column="ancestors"/>
<result property="sxsjg" column="sxsjg"/>
<result property="sxsjglxfs" column="sxsjglxfs"/>
<result property="sxsjgyx" column="sxsjgyx"/>
<result property="sxsjgzwzc" column="sxsjgzwzc"/>
<result property="sjgllr" column="sjgllr"/>
<result property="sjgllrlxfs" column="sjgllrlxfs"/>
<result property="sjgllryx" column="sjgllryx"/>
<result property="sjgllrzwzc" column="sjgllrzwzc"/>
<collection property="otherConcat" javaType="java.util.List" ofType="com.ruoyi.tc.entity.UnitOtherConcat">
<id property="concatId" column="concat_id"/>
<result property="qtlxrxm" column="qtlxrlxfs"/>
@ -85,6 +95,14 @@
<result property="remark" column="remark"/>
</collection>
</resultMap>
<update id="updatePasswordUser" parameterType="AssetSysUserExport">
update sys_user
<set>
<if test="req.password != null and req.password != ''">password = #{req.password},</if>
update_time = sysdate()
</set>
where user_id = #{req.userId}
</update>
<select id="selectUnitList" parameterType="unit" resultMap="unitResult">
select a.*,b.dept_name as deptName from unit_info a
@ -118,14 +136,14 @@
left join unit_other_contact c on a.id = c.unit_id
left join unit_examine_info e on a.id = e.unit_id
left join sys_dept d on a.dept_id = d.dept_id
where id = #{id}
where a.id = #{id}
</select>
<select id="selectByIds" resultType="java.lang.String">
select user_name
select nick_name
from unit_info
where id = #{id}
where id = #{id} and del_flag= '0'
</select>
<select id="dwList" resultType="com.ruoyi.tc.entity.Unit">
SELECT distinct a.*
@ -212,6 +230,9 @@
<select id="selectTaskId" resultType="java.lang.Integer">
select id from asset_task where dwmc like concat('%',#{dwmc},'%') and type like concat('%',#{type},'%') and task_status = '1'
</select>
<select id="selectTaskIdToDwmc" resultType="com.ruoyi.tc.entity.AssetTask">
select id from asset_task where dwmc like concat('%',#{dwmc},'%') and task_status = '1'
</select>
<select id="getAppSchema" resultType="com.ruoyi.common.core.domain.entity.SysDept">
WITH RECURSIVE category_tree AS (-- 初始查询，找出根节点或特定parentid的记录
SELECT
@ -221,7 +242,7 @@
LEFT JOIN unit_info b ON a.ssdw = b.nick_name
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
WHERE
d.dept_id IS NOT NULL
d.dept_id IS NOT NULL and a.del_flag = '0' and d.del_flag = '0'
GROUP BY
d.dept_id,
@ -235,7 +256,10 @@
d.STATUS,
d.del_flag,
d.create_by,
d.create_time UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
d.create_time,
d.update_by,
d.update_time
UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
SELECT
d.*
FROM
@ -245,6 +269,21 @@
*
FROM
category_tree
group by
dept_id,
parent_id,
ancestors,
dept_name,
order_num,
leader,
phone,
email,
STATUS,
del_flag,
create_by,
create_time,
update_by,
update_time
ORDER BY dept_id desc
</select>
<select id="getEmailSchema" resultType="com.ruoyi.common.core.domain.entity.SysDept">
@ -256,7 +295,7 @@
LEFT JOIN unit_info b ON a.ssdw = b.nick_name
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
WHERE
d.dept_id IS NOT NULL
d.dept_id IS NOT NULL and a.del_flag = '0' and d.del_flag = '0'
GROUP BY
d.dept_id,
@ -270,7 +309,10 @@
d.STATUS,
d.del_flag,
d.create_by,
d.create_time UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
d.create_time,
d.update_by,
d.update_time
UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
SELECT
d.*
FROM
@ -280,6 +322,21 @@
*
FROM
category_tree
group by
dept_id,
parent_id,
ancestors,
dept_name,
order_num,
leader,
phone,
email,
STATUS,
del_flag,
create_by,
create_time,
update_by,
update_time
ORDER BY dept_id desc
</select>
<select id="getMiniSchema" resultType="com.ruoyi.common.core.domain.entity.SysDept">
@ -291,7 +348,7 @@
LEFT JOIN unit_info b ON a.ssdw = b.nick_name
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
WHERE
d.dept_id IS NOT NULL
d.dept_id IS NOT NULL and a.del_flag = '0' and d.del_flag = '0'
GROUP BY
d.dept_id,
@ -305,7 +362,10 @@
d.STATUS,
d.del_flag,
d.create_by,
d.create_time UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
d.create_time,
d.update_time,
d.update_by
UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
SELECT
d.*
FROM
@ -315,6 +375,21 @@
*
FROM
category_tree
group by
dept_id,
parent_id,
ancestors,
dept_name,
order_num,
leader,
phone,
email,
STATUS,
del_flag,
create_by,
create_time,
update_by,
update_time
ORDER BY dept_id desc
</select>
<select id="getGzpSchema" resultType="com.ruoyi.common.core.domain.entity.SysDept">
@ -326,7 +401,7 @@
LEFT JOIN unit_info b ON a.ssdw = b.nick_name
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
WHERE
d.dept_id IS NOT NULL
d.dept_id IS NOT NULL and a.del_flag = '0' and d.del_flag = '0'
GROUP BY
d.dept_id,
@ -340,7 +415,11 @@
d.STATUS,
d.del_flag,
d.create_by,
d.create_time UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
d.create_time,
d.update_by,
d.update_time
UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
SELECT
d.*
FROM
@ -350,6 +429,21 @@
*
FROM
category_tree
group by
dept_id,
parent_id,
ancestors,
dept_name,
order_num,
leader,
phone,
email,
STATUS,
del_flag,
create_by,
create_time,
update_by,
update_time
ORDER BY dept_id desc
</select>
<select id="getWebSchema" resultType="com.ruoyi.common.core.domain.entity.SysDept">
@ -361,7 +455,7 @@
LEFT JOIN unit_info b ON a.dwmc = b.nick_name
LEFT JOIN sys_dept d ON b.dept_id = d.dept_id
WHERE
d.dept_id IS NOT NULL
d.dept_id IS NOT NULL and a.del_flag = '0' and d.del_flag = '0'
GROUP BY
d.dept_id,
d.parent_id,
@ -374,7 +468,10 @@
d.STATUS,
d.del_flag,
d.create_by,
d.create_time UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
d.create_time,
d.update_by,
d.update_time
UNION ALL-- 递归查询，根据parentid为上级id继续查询下一级数据
SELECT
d.*
FROM
@ -384,17 +481,46 @@
*
FROM
category_tree
group by
dept_id,
parent_id,
ancestors,
dept_name,
order_num,
leader,
phone,
email,
STATUS,
del_flag,
create_by,
create_time,
update_by,
update_time
ORDER BY dept_id desc
</select>
<select id="exportAllPassword" resultType="com.ruoyi.tc.entity.response.AssetSysUserExport">
SELECT
b.user_id as userId,
b.user_name as userName,
b.nick_name as nickName,
b.password
FROM
unit_info a
LEFT JOIN sys_user b ON a.user_name = b.user_name
GROUP BY
b.user_id,
b.user_name,
b.nick_name,
b.password
</select>
<update id="deleteUnits">
update unit_info
set del_flag = '2'
<delete id="deleteUnits">
delete from unit_info
where id = #{id}
</update>
<update id="deleteUsers">
update sys_user
set del_flag = '2'
</delete>
<delete id="deleteUsers">
delete from sys_user
where user_name = #{userNames}
</update>
</delete>
</mapper>

12
ruoyi-admin/src/main/resources/mapper/UnitOtherConcat.xml
Unescape View File

@ -4,12 +4,12 @@ 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 unit_other_contact set del_flag = '2' where unit_id = #{id}
</update>
<update id="deleteByAssetIds">
update unit_other_contact set del_flag = '2' where asset_id = #{id}
</update>
<delete id="deleteByUnitIds">
delete from unit_other_contact where unit_id = #{id}
</delete>
<delete id="deleteByAssetIds">
delete from unit_other_contact where asset_id = #{id}
</delete>
<delete id="deleteIdList">
DELETE FROM unit_other_contact
WHERE asset_id IN

Write Preview
Loading…
Cancel
Save