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

Compare commits

base: suzhou-jichuang-lanhai:b0eb6f4e58e3cea22d70a3a50b91fd425fee4b93
Branches Tags
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:main
...
compare: suzhou-jichuang-lanhai:f3fc510577b0708a8a7d1cdcf33faa7e25bd1839
Branches Tags
suzhou-jichuang-lanhai:dongdingding
suzhou-jichuang-lanhai:duhanyu
suzhou-jichuang-lanhai:main

8 Commits
b0eb6f4e58 ... f3fc510577

Author SHA1 Message Date
dongdingding f3fc510577 Merge remote-tracking branch 'origin/dongdingding' into dongdingding
3 months ago
dongdingding 83deb5dca7 管理端审核代码修改
3 months ago
dongdingding 2d325ce270 单位端自主填报修改
3 months ago
dongdingding d0115b20c4 Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding
3 months ago
dongdingding b506a87980 管理端审核代码修改
4 months ago
dongdingding 9ac02bffb9 Merge branch 'duhanyu' of http://39.101.188.84:7000/suzhou-jichuang-lanhai/TcAssetVerificationJava into dongdingding
4 months ago
dongdingding 0456470ece 管理端审核代码修改
4 months ago
dongdingding 623b0c657a xzType新增type类型字段
4 months ago
91 changed files with 7007 additions and 811 deletions
Show Stats

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

@ -11,13 +11,19 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.*; import com.ruoyi.tc.entity.AssetApp;
import com.ruoyi.tc.entity.po.*; import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.request.Acomma; import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.request.AssetAppPageRequest; import com.ruoyi.tc.entity.request.AssetAppPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.AssetAppZztbService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -28,12 +34,8 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import static com.ruoyi.common.core.domain.AjaxResult.success;
/** /**
* 资产移动应用程序表(asset_app)表控制层 * 资产移动应用程序表(asset_app)表控制层
* *
@ -60,6 +62,10 @@ public class AssetAppController extends BaseController {
@Resource @Resource
private UnitService unitService; private UnitService unitService;
@Resource
private AssetAppZztbService assetAppZztbService;
/** /**
* 分页查询 * 分页查询
* *
@ -82,31 +88,31 @@ public class AssetAppController extends BaseController {
return success(assetAppService.page(page, req)); return success(assetAppService.page(page, req));
} }
//================================================= //=================================================
/** /**
* 单位自编辑进行校验 * 单位自编辑进行校验
*/ */
@ApiOperation(value = "单位自编辑进行校验") @ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')") @PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit") @PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetAppJyPo assetAppJyPo) { public AjaxResult unitEdit(@RequestBody @Valid AssetAppZztbPo assetAppZztbPo) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetAppJyPo.getSsdw()).eq(Unit::getDelFlag, 0).list(); List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetAppZztbPo.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!"); throw new ServiceException("请选择已有单位!");
} }
AssetAppZztbPo one = assetAppZztbService.lambdaQuery().eq(AssetAppZztbPo::getAppName, assetAppZztbPo.getAppName())
AssetAppJyPo one = assetAppJyService.lambdaQuery().eq(AssetAppJyPo::getAppName,assetAppJyPo.getAppName()) .eq(AssetAppZztbPo::getSsdw, assetAppZztbPo.getSsdw()).isNull(AssetAppZztbPo::getTaskId).one();
.eq(AssetAppJyPo::getSsdw,assetAppJyPo.getSsdw()).isNull(AssetAppJyPo::getTaskId).one(); assetAppZztbPo.setAuditState("1");
assetAppJyPo.setAuditState("1"); assetAppZztbPo.setAuditYy(null);
assetAppJyPo.setAuditYy(null);
if (one != null) { if (one != null) {
assetAppJyPo.setAppId(one.getAppId()); assetAppZztbPo.setAppId(one.getAppId());
assetAppJyPo.setAssetId(one.getAssetId()); assetAppZztbPo.setAssetId(one.getAssetId());
assetAppJyService.updateById(assetAppJyPo); assetAppZztbService.updateById(assetAppZztbPo);
} else { } else {
assetAppJyPo.setAssetId(assetAppService.lambdaQuery().eq(AssetApp::getAppName, assetAppJyPo.getAppName()) assetAppZztbPo.setAssetId(assetAppService.lambdaQuery().eq(AssetApp::getAppName, assetAppZztbPo.getAppName())
.eq(AssetApp::getSsdw, assetAppJyPo.getSsdw()).one().getId()); .eq(AssetApp::getSsdw, assetAppZztbPo.getSsdw()).one().getId());
assetAppJyService.save(assetAppJyPo); assetAppZztbService.save(assetAppZztbPo);
} }
return success(); return success();
} }
@ -117,10 +123,10 @@ public class AssetAppController extends BaseController {
* @param as 查询实体 * @param as 查询实体
* @return 所有数据 * @return 所有数据
*/ */
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetAppJyPo.class) @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetAppZztbPo.class)
@GetMapping("/getAuditList") @GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) { public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetAppJyPo> page = new Page<>(); Page<AssetAppZztbPo> page = new Page<>();
page.setSize(as.getSize()); page.setSize(as.getSize());
page.setCurrent(as.getCurrent()); page.setCurrent(as.getCurrent());
try { try {
@ -130,7 +136,7 @@ public class AssetAppController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常"); throw new ServiceException("获取用户信息异常");
} }
return success(assetAppJyService.getAuditList(page, as)); return success(assetAppZztbService.getAuditList(page, as));
} }
/** /**
@ -139,7 +145,7 @@ public class AssetAppController extends BaseController {
@ApiOperation(value = "单位端查看中间数据详情", response = AssetAppJyPo.class) @ApiOperation(value = "单位端查看中间数据详情", response = AssetAppJyPo.class)
@GetMapping("/lookInfo/{id}") @GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) { public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetAppJyService.getById(id)); return success(assetAppZztbService.getById(id));
} }
/** /**
@ -152,12 +158,12 @@ public class AssetAppController extends BaseController {
@ApiOperation(value = "管理端审核") @ApiOperation(value = "管理端审核")
@PostMapping("/audit") @PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) { public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetAppJyPo ass = new AssetAppJyPo(); AssetAppZztbPo ass = new AssetAppZztbPo();
BeanUtil.copyProperties(as, ass); BeanUtil.copyProperties(as, ass);
ass.setAppId(as.getCurrentId()); ass.setAppId(as.getCurrentId());
assetAppJyService.updateById(ass); assetAppZztbService.updateById(ass);
//通过数据同步 //通过数据同步
if ("2".equals(as.getAuditState())) { if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId()); AssetAppJyPo byId = assetAppJyService.getById(as.getCurrentId());
AssetApp aa = new AssetApp(); AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa); BeanUtil.copyProperties(byId, aa);
@ -168,8 +174,13 @@ public class AssetAppController extends BaseController {
AssetAppJyPo one = assetAppJyService.lambdaQuery() AssetAppJyPo one = assetAppJyService.lambdaQuery()
.isNotNull(AssetAppJyPo::getTaskId) .isNotNull(AssetAppJyPo::getTaskId)
.ne(AssetAppJyPo::getStatus, 5) .ne(AssetAppJyPo::getStatus, 5)
.eq(AssetAppJyPo::getAssetId, byId.getAssetId()).one(); .eq(AssetAppJyPo::getAssetId, byId.getAssetId())
if(one!=null){ .orderByDesc(AssetAppJyPo::getAppId)
.last("LIMIT 1").one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus(); Integer status = one.getStatus();
Integer taskId = one.getTaskId(); Integer taskId = one.getTaskId();
Long appId = one.getAppId(); Long appId = one.getAppId();
@ -181,6 +192,91 @@ public class AssetAppController extends BaseController {
one.setStatus(status); one.setStatus(status);
assetAppJyService.updateById(one); assetAppJyService.updateById(one);
} }
}
}
else if("2".equals(as.getAuditState())) {
AssetAppZztbPo byId = assetAppZztbService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetApp assetApp = assetAppService.lambdaQuery().eq(AssetApp::getAppName, byId.getAppName()).eq(AssetApp::getSsdw, byId.getSsdw()).one();
if (assetApp != null) {
//修改主表
if (assetApp.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetApp, "id");
assetApp.setXzType(0);
assetApp.setDelFlag("0");
assetAppService.updateById(assetApp);
}else{
BeanUtil.copyProperties(aa, assetApp, "id");
assetAppService.updateById(assetApp);
}
//如果有任务也修改任务这边
AssetAppJyPo one = assetAppJyService.lambdaQuery()
.ne(AssetAppJyPo::getStatus, 5)
.eq(AssetAppJyPo::getAppName, byId.getAppName())
.orderByDesc(AssetAppJyPo::getAppId)
.last("LIMIT 1").one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus();
Integer taskId = one.getTaskId();
Long appId = one.getAppId();
BeanUtil.copyProperties(byId, one);
one.setAppId(appId);
one.setTaskId(taskId);
one.setAuditState(null);
one.setAuditYy(null);
one.setStatus(status);
assetAppJyService.updateById(one);
}
}
} else {
//新增主表
assetAppService.save(aa);
//查询改单位下是否有进行中的任务
AssetTask task= assetTaskService.lambdaQuery().like(AssetTask::getDwmc,aa.getSsdw()).like(AssetTask::getType,"1").eq(AssetTask::getTaskStatus,1).one();
if (task!=null){
AssetAppCpPo bb = new AssetAppCpPo();
BeanUtil.copyProperties(byId, bb);
bb.setAssetId(aa.getId());
bb.setTaskId(task.getId());
bb.setAppId(null);
assetAppCpService.save(bb);
}
}
}
else if ("3".equals(as.getAuditState())){
AssetAppZztbPo byId = assetAppZztbService.getById(as.getCurrentId());
AssetApp aa = new AssetApp();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetApp assetApp = assetAppService.lambdaQuery().eq(AssetApp::getAppName, byId.getAppName()).eq(AssetApp::getSsdw, byId.getSsdw()).one();
if (assetApp != null) {
//修改主表
if (assetApp.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetApp, "id");
assetApp.setXzType(0);
assetApp.setDelFlag("1");
assetAppService.updateById(assetApp);
} else {
BeanUtil.copyProperties(aa, assetApp, "id");
assetApp.setDelFlag("1");
assetAppService.updateById(assetApp);
}
}
} }
return success(); return success();
} }

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

@ -17,9 +17,12 @@ import com.ruoyi.tc.entity.request.Acomma;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetCurrentPageRequest; import com.ruoyi.tc.entity.request.AssetCurrentPageRequest;
import com.ruoyi.tc.entity.zztb.*;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.*;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.beans.BeanUtils;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@ -33,6 +36,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.stream.Collectors;
/** /**
* 现有资产表(AssetCurrent)表控制层 * 现有资产表(AssetCurrent)表控制层
@ -102,6 +106,37 @@ public class AssetCurrentController extends BaseController {
private AssetBasicNetworkJyService assetBasicNetworkJyService; private AssetBasicNetworkJyService assetBasicNetworkJyService;
@Resource
private AssetCurrentZztbService assetCurrentZztbService;
@Resource
private AssetBasicNetworkZztbService assetBasicNetworkZztbService;
@Resource
private AssetBusinessFormZztbService assetBusinessFormZztbService;
@Resource
private AssetSupplyChainZztbService assetSupplyChainZztbService;
@Resource
private UnitOtherConcatZztbservice unitOtherConcatZztbservice;
@Resource
private AssetAssetSjCpService assetAssetSjCpService;
@Resource
private AssetAssetSjZztbService assetAssetSjZztbService;
@Resource
private AssetAssetSjService assetAssetSjService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
* *
@ -144,7 +179,6 @@ public class AssetCurrentController extends BaseController {
*/ */
@ApiOperation(value = "新增数据") @ApiOperation(value = "新增数据")
@PostMapping @PostMapping
@PreAuthorize("@ss.hasAnyRoles('admin,common')")
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) { public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) {
@ -157,6 +191,8 @@ public class AssetCurrentController extends BaseController {
throw new ServiceException("不允许新增重复资产!"); throw new ServiceException("不允许新增重复资产!");
} }
if (assetCurrent.getXzType() != 1) {
//管理端新增
StringBuilder a = new StringBuilder(); StringBuilder a = new StringBuilder();
if (assetCurrent.getGlymList() != null) { if (assetCurrent.getGlymList() != null) {
assetCurrent.getGlymList().forEach(x -> { assetCurrent.getGlymList().forEach(x -> {
@ -186,7 +222,7 @@ public class AssetCurrentController extends BaseController {
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
@ -225,7 +261,13 @@ public class AssetCurrentController extends BaseController {
//新增其他联系人 //新增其他联系人
unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat()); unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat());
} }
if (assetCurrent.getSjzcList() != null) {
for (AssetSj items : assetCurrent.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
}
//新增数据资产
assetAssetSjService.saveBatch(assetCurrent.getSjzcList());
}
// 单位有进行中的任务时，管理端新增该单位下的资产则需同步至当前进行中的任务中。 // 单位有进行中的任务时，管理端新增该单位下的资产则需同步至当前进行中的任务中。
//获取新增资产id //获取新增资产id
Long id = assetCurrent.getId(); Long id = assetCurrent.getId();
@ -235,6 +277,7 @@ public class AssetCurrentController extends BaseController {
AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo(); AssetCurrentCpPo assetCurrentCpPo = new AssetCurrentCpPo();
BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo); BeanUtil.copyProperties(assetCurrent, assetCurrentCpPo);
assetCurrentCpPo.setTaskId(i); assetCurrentCpPo.setTaskId(i);
assetCurrentCpPo.setXzType(1);
assetCurrentCpService.save(assetCurrentCpPo); assetCurrentCpService.save(assetCurrentCpPo);
//新增新监管业务形态 //新增新监管业务形态
//根据资产id查询新监管业务形态主表id //根据资产id查询新监管业务形态主表id
@ -267,7 +310,133 @@ public class AssetCurrentController extends BaseController {
//新增其他联系人 //新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
} }
if (assetCurrent.getSjzcList() != null) {
for (AssetSjCpPo items : assetCurrentCpPo.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(i);
}
//新增数据资产
assetAssetSjCpService.saveBatch(assetCurrentCpPo.getSjzcList());
}
}
} else {
//单位端新增
StringBuilder a = new StringBuilder();
if (assetCurrent.getGlymList() != null) {
assetCurrent.getGlymList().forEach(x -> {
if (!Objects.equals(x.getKey(), "") && x.getKey() != null) {
a.append(x.getKey());
a.append(",");
}
});
} }
assetCurrent.setGlym(a.toString());
List<Acomma> a2 = new ArrayList<>();
if (assetCurrent.getGlIpList() != null) {
if (assetCurrent.getGlIp() != null && !assetCurrent.getGlIp().isEmpty()) {
for (Object o : JSONArray.parseArray(assetCurrent.getGlIp())) {
Acomma acomma = new Acomma();
JSONObject jsonObject = JSONObject.parseObject(o.toString());
if (BeanUtil.isNotEmpty(jsonObject.get("key"))) {
acomma.setKey(jsonObject.get("key").toString());
} else {
acomma.setKey("");
}
if (BeanUtil.isNotEmpty(jsonObject.get("ipType"))) {
acomma.setIpType(jsonObject.get("ipType").toString());
} else {
acomma.setIpType("");
}
Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString());
} else {
acomma.setPort("");
}
a2.add(acomma);
}
assetCurrent.setGlIpList(a2);
}
} else {
assetCurrent.setGlIpList(new ArrayList<>());
}
AssetCurrentZztbPo assetCurrentZztbPo = new AssetCurrentZztbPo();
BeanUtils.copyProperties(assetCurrent, assetCurrentZztbPo);
assetCurrentZztbPo.setAuditState("1");
assetCurrentZztbPo.setAuditYy(null);
assetCurrentZztbService.save(assetCurrentZztbPo);
//新增新监管业务形态
if (assetCurrent.getXjgywxt() != null) {
AssetBusinessForm assetBusinessForm = assetCurrent.getXjgywxt();
AssetBusinessFormZztbPo assetBusinessFormZztbPo = new AssetBusinessFormZztbPo();
BeanUtils.copyProperties(assetBusinessForm, assetBusinessFormZztbPo);
assetBusinessFormZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
assetBusinessFormZztbService.save(assetBusinessFormZztbPo);
}
if (assetCurrent.getGylxxList() != null) {
List<AssetSupplyChainZztbPo> supplyChainZztbPos = assetCurrent.getGylxxList().stream().map(cpPo -> {
AssetSupplyChainZztbPo assetBasicNetworkZztbPo = new AssetSupplyChainZztbPo();
BeanUtils.copyProperties(cpPo, assetBasicNetworkZztbPo); // 复制属性
assetBasicNetworkZztbPo.setSupplyId(null);
assetBasicNetworkZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
return assetBasicNetworkZztbPo; // 返回新对象
}).collect(Collectors.toList());
// 新增供应链
boolean savedSuccessfully = assetSupplyChainZztbService.saveBatch(supplyChainZztbPos);
if (!savedSuccessfully) {
// 处理保存失败的情况
System.err.println("保存供应链数据失败");
}
}
if (assetCurrent.getJcwlList() != null) {
List<AssetBasicNetworkZztbPo> networksCpPoList = assetCurrent.getJcwlList().stream().map(cpPo -> {
AssetBasicNetworkZztbPo assetBasicNetworkZztbPo = new AssetBasicNetworkZztbPo();
BeanUtils.copyProperties(cpPo, assetBasicNetworkZztbPo); // 复制属性
assetBasicNetworkZztbPo.setNetworkId(null);
assetBasicNetworkZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
return assetBasicNetworkZztbPo; // 返回新对象
}).collect(Collectors.toList());
//新增基础网络
assetBasicNetworkZztbService.saveBatch(networksCpPoList);
}
if (assetCurrent.getOtherConcat() != null) {
List<UnitOtherConcatZztbPo> unitOtherConcatZztbPos = assetCurrent.getOtherConcat().stream().map(cpPo -> {
UnitOtherConcatZztbPo unitOtherConcatZztbPo = new UnitOtherConcatZztbPo();
BeanUtils.copyProperties(cpPo, unitOtherConcatZztbPo); // 复制属性
unitOtherConcatZztbPo.setUnitId(null);
unitOtherConcatZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
return unitOtherConcatZztbPo; // 返回新对象
}).collect(Collectors.toList());
//新增其他联系人
unitOtherConcatZztbservice.saveBatch(unitOtherConcatZztbPos);
}
if (assetCurrent.getSjzcList() != null) {
List<AssetSjZztbPo> assetSjZztbPoList = assetCurrent.getSjzcList().stream().map(cpPo -> {
AssetSjZztbPo assetSjZztbPo = new AssetSjZztbPo();
BeanUtils.copyProperties(cpPo, assetSjZztbPo); // 复制属性
assetSjZztbPo.setSjId(null);
assetSjZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
return assetSjZztbPo; // 返回新对象
}).collect(Collectors.toList());
//新增数据资产
assetAssetSjZztbService.saveBatch(assetSjZztbPoList);
}
}
return success(); return success();
} }
@ -279,89 +448,119 @@ public class AssetCurrentController extends BaseController {
@ApiOperation(value = "单位自编辑进行校验") @ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')") @PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit") @PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetCurrentJyPo assetCurrentJyPo) { public AjaxResult unitEdit(@RequestBody @Valid AssetCurrentZztbPo assetCurrentZztbPo) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrentJyPo.getDwmc()).eq(Unit::getDelFlag, 0).list(); List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetCurrentZztbPo.getDwmc()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!"); throw new ServiceException("请选择已有单位!");
} }
AssetCurrentJyPo one = assetCurrentJyService.lambdaQuery().eq(AssetCurrentJyPo::getXtmc, assetCurrentJyPo.getXtmc()).eq(AssetCurrentJyPo::getDwmc, assetCurrentJyPo.getDwmc()).isNull(AssetCurrentJyPo::getTaskId).one(); AssetCurrentZztbPo one = assetCurrentZztbService.lambdaQuery().eq(AssetCurrentZztbPo::getXtmc, assetCurrentZztbPo.getXtmc()).eq(AssetCurrentZztbPo::getDwmc, assetCurrentZztbPo.getDwmc()).isNull(AssetCurrentZztbPo::getTaskId).one();
assetCurrentJyPo.setAuditState("1"); assetCurrentZztbPo.setAuditState("1");
assetCurrentJyPo.setAuditYy(null); assetCurrentZztbPo.setAuditYy(null);
if (one != null) { if (one != null) {
assetCurrentJyPo.setCurrentId(one.getCurrentId()); //编辑
assetCurrentJyService.updateById(assetCurrentJyPo); assetCurrentZztbPo.setCurrentId(one.getCurrentId());
assetCurrentZztbService.updateById(assetCurrentZztbPo);
QueryWrapper<AssetSupplyChainJyPo> queryWrapper2 = new QueryWrapper<>(); QueryWrapper<AssetSupplyChainZztbPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", assetCurrentJyPo.getId()); queryWrapper2.eq("asset_id", assetCurrentZztbPo.getId());
queryWrapper2.isNull("task_id"); queryWrapper2.isNull("task_id");
assetSupplyChainJyService.remove(queryWrapper2); assetSupplyChainZztbService.remove(queryWrapper2);
QueryWrapper<AssetBasicNetworkJyPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", assetCurrentJyPo.getId()); QueryWrapper<AssetBasicNetworkZztbPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", assetCurrentZztbPo.getId());
queryWrapper3.isNull("task_id"); queryWrapper3.isNull("task_id");
assetBasicNetworkJyService.remove(queryWrapper3); assetBasicNetworkZztbService.remove(queryWrapper3);
QueryWrapper<AssetBusinessFormJyPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", assetCurrentJyPo.getId()); QueryWrapper<AssetBusinessFormZztbPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", assetCurrentZztbPo.getId());
queryWrapper4.isNull("task_id"); queryWrapper4.isNull("task_id");
assetBusinessFormJyService.remove(queryWrapper4); assetBusinessFormZztbService.remove(queryWrapper4);
QueryWrapper<UnitOtherConcatJyPo> queryWrapper5 = new QueryWrapper<>(); QueryWrapper<UnitOtherConcatZztbPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.isNull("task_id"); queryWrapper5.isNull("task_id");
queryWrapper5.eq("asset_id", assetCurrentJyPo.getId()); queryWrapper5.eq("asset_id", assetCurrentZztbPo.getId());
unitOtherConcatJyservice.remove(queryWrapper5); unitOtherConcatZztbservice.remove(queryWrapper5);
if (assetCurrentJyPo.getXjgywxt() != null) { QueryWrapper<AssetSjZztbPo> queryWrapper6 = new QueryWrapper<>();
assetCurrentJyPo.getXjgywxt().setAssetId(assetCurrentJyPo.getId()); queryWrapper6.isNull("task_id");
assetBusinessFormJyService.save(assetCurrentJyPo.getXjgywxt()); queryWrapper6.eq("asset_id", assetCurrentZztbPo.getId());
assetAssetSjZztbService.remove(queryWrapper6);
if (assetCurrentZztbPo.getXjgywxt() != null) {
AssetBusinessForm assetBusinessForm = assetCurrentZztbPo.getXjgywxt();
AssetBusinessFormZztbPo assetBusinessFormZztbPo = new AssetBusinessFormZztbPo();
BeanUtils.copyProperties(assetBusinessForm, assetBusinessFormZztbPo);
assetBusinessFormZztbPo.setAssetId(assetCurrentZztbPo.getId());
assetBusinessFormZztbService.save(assetBusinessFormZztbPo);
} }
if (assetCurrentJyPo.getGylxxList() != null) { if (assetCurrentZztbPo.getGylxxList() != null) {
for (AssetSupplyChainJyPo items : assetCurrentJyPo.getGylxxList()) { for (AssetSupplyChainZztbPo items : assetCurrentZztbPo.getGylxxList()) {
items.setAssetId(assetCurrentJyPo.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增供应链 //新增供应链
assetSupplyChainJyService.saveBatch(assetCurrentJyPo.getGylxxList()); assetSupplyChainZztbService.saveBatch(assetCurrentZztbPo.getGylxxList());
} }
if (assetCurrentJyPo.getJcwlList() != null) { if (assetCurrentZztbPo.getJcwlList() != null) {
for (AssetBasicNetworkJyPo items : assetCurrentJyPo.getJcwlList()) { for (AssetBasicNetworkZztbPo items : assetCurrentZztbPo.getJcwlList()) {
items.setAssetId(assetCurrentJyPo.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增基础网络 //新增基础网络
assetBasicNetworkJyService.saveBatch(assetCurrentJyPo.getJcwlList()); assetBasicNetworkZztbService.saveBatch(assetCurrentZztbPo.getJcwlList());
} }
if (assetCurrentJyPo.getOtherConcat() != null) { if (assetCurrentZztbPo.getOtherConcat() != null) {
for (UnitOtherConcatJyPo items : assetCurrentJyPo.getOtherConcat()) { for (UnitOtherConcatZztbPo items : assetCurrentZztbPo.getOtherConcat()) {
items.setAssetId(assetCurrentJyPo.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增其他联系人 //新增其他联系人
unitOtherConcatJyservice.saveBatch(assetCurrentJyPo.getOtherConcat()); unitOtherConcatZztbservice.saveBatch(assetCurrentZztbPo.getOtherConcat());
}
if (assetCurrentZztbPo.getSjzcList() != null) {
for (AssetSjZztbPo items : assetCurrentZztbPo.getSjzcList()) {
items.setAssetId(assetCurrentZztbPo.getId());
}
//新增数据资产
assetAssetSjZztbService.saveBatch(assetCurrentZztbPo.getSjzcList());
} }
} else { } else {
AssetCurrentCpPo acc = new AssetCurrentCpPo(); //新增
BeanUtil.copyProperties(assetCurrentJyPo, acc); assetCurrentZztbService.save(assetCurrentZztbPo);
assetCurrentCpService.save(acc); if (assetCurrentZztbPo.getXjgywxt() != null) {
if (acc.getXjgywxt() != null) {
acc.getXjgywxt().setAssetId(acc.getId()); AssetBusinessForm assetBusinessForm = assetCurrentZztbPo.getXjgywxt();
assetBusinessFormCpService.save(acc.getXjgywxt()); AssetBusinessFormZztbPo assetBusinessFormZztbPo = new AssetBusinessFormZztbPo();
BeanUtils.copyProperties(assetBusinessForm, assetBusinessFormZztbPo);
assetBusinessFormZztbPo.setAssetId(assetCurrentZztbPo.getCurrentId());
assetBusinessFormZztbService.save(assetBusinessFormZztbPo);
} }
if (acc.getGylxxList() != null) { if (assetCurrentZztbPo.getGylxxList() != null) {
for (AssetSupplyChainCpPo items : acc.getGylxxList()) { for (AssetSupplyChainZztbPo items : assetCurrentZztbPo.getGylxxList()) {
items.setAssetId(acc.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增供应链 //新增供应链
assetSupplyChainCpService.saveBatch(acc.getGylxxList()); assetSupplyChainZztbService.saveBatch(assetCurrentZztbPo.getGylxxList());
} }
if (acc.getJcwlList() != null) { if (assetCurrentZztbPo.getJcwlList() != null) {
for (AssetBasicNetworkCpPo items : acc.getJcwlList()) { for (AssetBasicNetworkZztbPo items : assetCurrentZztbPo.getJcwlList()) {
items.setAssetId(acc.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增基础网络 //新增基础网络
assetBasicNetworkCpService.saveBatch(acc.getJcwlList()); assetBasicNetworkZztbService.saveBatch(assetCurrentZztbPo.getJcwlList());
} }
if (acc.getOtherConcat() != null) { if (assetCurrentZztbPo.getOtherConcat() != null) {
for (UnitOtherConcatCpPo items : acc.getOtherConcat()) { for (UnitOtherConcatZztbPo items : assetCurrentZztbPo.getOtherConcat()) {
items.setAssetId(acc.getId()); items.setAssetId(assetCurrentZztbPo.getId());
} }
//新增其他联系人 //新增其他联系人
unitOtherConcatCpService.saveBatch(acc.getOtherConcat()); unitOtherConcatZztbservice.saveBatch(assetCurrentZztbPo.getOtherConcat());
}
if (assetCurrentZztbPo.getSjzcList() != null) {
for (AssetSjZztbPo items : assetCurrentZztbPo.getSjzcList()) {
items.setAssetId(assetCurrentZztbPo.getId());
}
//新增数据资产
assetAssetSjZztbService.saveBatch(assetCurrentZztbPo.getSjzcList());
} }
} }
@ -374,10 +573,10 @@ public class AssetCurrentController extends BaseController {
* @param as 查询实体 * @param as 查询实体
* @return 所有数据 * @return 所有数据
*/ */
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetCurrentCpPo.class) @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetCurrentZztbPo.class)
@GetMapping("/getAuditList") @GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) { public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetCurrentJyPo> page = new Page<>(); Page<AssetCurrentZztbPo> page = new Page<>();
page.setSize(as.getSize()); page.setSize(as.getSize());
page.setCurrent(as.getCurrent()); page.setCurrent(as.getCurrent());
try { try {
@ -387,20 +586,48 @@ public class AssetCurrentController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常"); throw new ServiceException("获取用户信息异常");
} }
return success(assetCurrentJyService.getAuditList(page, as)); return success(assetCurrentZztbService.getAuditList(page, as));
} }
/** /**
* 查看中间数据详情 * 查看中间数据详情
*/ */
@ApiOperation(value = "单位端查看中间数据详情", response = AssetCurrentCpPo.class) @ApiOperation(value = "单位端查看中间数据详情", response = AssetCurrentZztbPo.class)
@GetMapping("/lookInfo/{id}") @GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) { public AjaxResult lookInfo(@PathVariable Long id) {
AssetCurrentCpPo byId = assetCurrentCpService.getById(id); AssetCurrentZztbPo byId = assetCurrentZztbService.getById(id);
byId.setGylxxList(assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list()); if (byId.getId() == null) {
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.setGylxxList(assetSupplyChainZztbService.lambdaQuery().eq(AssetSupplyChainZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetSupplyChainZztbPo::getTaskId).list());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).isNull(UnitOtherConcatCpPo::getTaskId).list()); byId.setJcwlList(assetBasicNetworkZztbService.lambdaQuery().eq(AssetBasicNetworkZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetBasicNetworkZztbPo::getTaskId).list());
AssetBusinessFormZztbPo assetBusinessFormZztbPo = assetBusinessFormZztbService.lambdaQuery().eq(AssetBusinessFormZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetBusinessFormZztbPo::getTaskId).one();
if (assetBusinessFormZztbPo != null) {
AssetBusinessForm assetBusinessForm = new AssetBusinessForm();
BeanUtils.copyProperties(assetBusinessFormZztbPo, assetBusinessForm);
byId.setXjgywxt(assetBusinessForm);
} else {
byId.setXjgywxt(null);
}
byId.setOtherConcat(unitOtherConcatZztbservice.lambdaQuery().eq(UnitOtherConcatZztbPo::getAssetId, byId.getCurrentId()).isNull(UnitOtherConcatZztbPo::getTaskId).list());
byId.setSjzcList(assetAssetSjZztbService.lambdaQuery().eq(AssetSjZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetSjZztbPo::getTaskId).list());
} else {
//管理端新增查看
byId.setGylxxList(assetSupplyChainZztbService.lambdaQuery().eq(AssetSupplyChainZztbPo::getAssetId, byId.getId()).isNull(AssetSupplyChainZztbPo::getTaskId).list());
byId.setJcwlList(assetBasicNetworkZztbService.lambdaQuery().eq(AssetBasicNetworkZztbPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkZztbPo::getTaskId).list());
AssetBusinessFormZztbPo assetBusinessFormZztbPo = assetBusinessFormZztbService.lambdaQuery().eq(AssetBusinessFormZztbPo::getAssetId, byId.getId()).isNull(AssetBusinessFormZztbPo::getTaskId).one();
if (assetBusinessFormZztbPo != null) {
AssetBusinessForm assetBusinessForm = new AssetBusinessForm();
BeanUtils.copyProperties(assetBusinessFormZztbPo, assetBusinessForm);
byId.setXjgywxt(assetBusinessForm);
} else {
byId.setXjgywxt(null);
}
byId.setOtherConcat(unitOtherConcatZztbservice.lambdaQuery().eq(UnitOtherConcatZztbPo::getAssetId, byId.getId()).isNull(UnitOtherConcatZztbPo::getTaskId).list());
byId.setSjzcList(assetAssetSjZztbService.lambdaQuery().eq(AssetSjZztbPo::getAssetId, byId.getId()).isNull(AssetSjZztbPo::getTaskId).list());
}
List<Acomma> a1 = new ArrayList<>(); List<Acomma> a1 = new ArrayList<>();
if (byId.getGlym() != null) { if (byId.getGlym() != null) {
Arrays.asList(byId.getGlym().split(",")).forEach(x -> { Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
@ -413,7 +640,7 @@ public class AssetCurrentController extends BaseController {
byId.setGlymList(new ArrayList<>()); byId.setGlymList(new ArrayList<>());
} }
List<Acomma> a2 = new ArrayList<>(); List<Acomma> a2 = new ArrayList<>();
if(byId.getGlIp()!=null&& !byId.getGlIp().isEmpty()){ if (byId.getGlIp() != null && !byId.getGlIp().isEmpty()) {
for (Object o : JSONArray.parseArray(byId.getGlIp())) { for (Object o : JSONArray.parseArray(byId.getGlIp())) {
Acomma acomma = new Acomma(); Acomma acomma = new Acomma();
JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = JSONObject.parseObject(o.toString());
@ -430,13 +657,13 @@ public class AssetCurrentController extends BaseController {
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
} }
byId.setGlIpList(a2); byId.setGlIpList(a2);
}else { } else {
byId.setGlIpList(new ArrayList<>()); byId.setGlIpList(new ArrayList<>());
} }
@ -453,22 +680,23 @@ public class AssetCurrentController extends BaseController {
@ApiOperation(value = "管理端审核") @ApiOperation(value = "管理端审核")
@PostMapping("/audit") @PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) { public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetCurrentCpPo ass = new AssetCurrentCpPo(); AssetCurrentZztbPo ass = new AssetCurrentZztbPo();
BeanUtil.copyProperties(as, ass); BeanUtil.copyProperties(as, ass);
assetCurrentCpService.updateById(ass); assetCurrentZztbService.updateById(ass);
//通过数据同步 //通过数据同步
if ("2".equals(as.getAuditState())) { if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId()); AssetCurrentCpPo byId = assetCurrentCpService.getById(as.getCurrentId());
AssetCurrent assetCurrent = new AssetCurrent(); AssetCurrent assetCurrent = new AssetCurrent();
BeanUtil.copyProperties(byId, assetCurrent); BeanUtil.copyProperties(byId, assetCurrent);
//修改主表 //修改主表
assetCurrent.setDelFlag("0");
assetCurrentService.updateById(assetCurrent); assetCurrentService.updateById(assetCurrent);
//删除副表数据然后再添加 //删除副表数据然后再添加
assetSupplyChainService.deleteByAssetIds(assetCurrent.getId()); assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());
assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId()); assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
assetBusinessFormService.deleteByAssetIds(assetCurrent.getId()); assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
unitOtherConcatService.deleteByAssetIds(assetCurrent.getId()); unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
assetAssetSjService.deleteByAssetIds(assetCurrent.getId());
List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list(); List<AssetSupplyChainCpPo> list = assetSupplyChainCpService.lambdaQuery().eq(AssetSupplyChainCpPo::getAssetId, byId.getId()).isNull(AssetSupplyChainCpPo::getTaskId).list();
list.forEach(x -> { list.forEach(x -> {
AssetSupplyChain a1 = new AssetSupplyChain(); AssetSupplyChain a1 = new AssetSupplyChain();
@ -497,8 +725,14 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatService.save(a4); unitOtherConcatService.save(a4);
}); });
//如果有任务也修改任务这边 //如果有任务也修改任务这边
AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery().isNotNull(AssetCurrentCpPo::getTaskId).ne(AssetCurrentCpPo::getStatus, 5).eq(AssetCurrentCpPo::getId, byId.getId()).one(); AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery().isNotNull(AssetCurrentCpPo::getTaskId).ne(AssetCurrentCpPo::getStatus, 5).
eq(AssetCurrentCpPo::getId, byId.getId())
.orderByDesc(AssetCurrentCpPo::getCurrentId)
.last("LIMIT 1").one();
if (one != null) { if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer taskId = one.getTaskId(); Integer taskId = one.getTaskId();
Long appId = one.getCurrentId(); Long appId = one.getCurrentId();
Integer status = one.getStatus(); Integer status = one.getStatus();
@ -543,10 +777,330 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatCpService.save(x); unitOtherConcatCpService.save(x);
}); });
} }
}
} else if ("2".equals(as.getAuditState())) {
AssetCurrentZztbPo byId = assetCurrentZztbService.getById(as.getCurrentId());
AssetCurrent aa = new AssetCurrent();
BeanUtil.copyProperties(byId, aa);
//根据资产名称和所属单位查询主表是否有数据
AssetCurrent assetCurrent = assetCurrentService.lambdaQuery().eq(AssetCurrent::getXtmc, byId.getXtmc()).eq(AssetCurrent::getDwmc, byId.getDwmc()).one();
if (assetCurrent != null) {
//修改主表
if (assetCurrent.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetCurrent, "id");
assetCurrent.setXzType(0);
assetCurrent.setDelFlag("0");
assetCurrent.setBtgyy(null);
assetCurrentService.updateById(assetCurrent);
} else {
BeanUtil.copyProperties(aa, assetCurrent, "id");
assetCurrent.setDelFlag("0");
assetCurrent.setBtgyy(null);
assetCurrentService.updateById(assetCurrent);
}
//删除子表数据
assetSupplyChainService.deleteByAssetIds(assetCurrent.getId());
assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
assetAssetSjService.deleteByAssetIds(assetCurrent.getId());
//供应链
List<AssetSupplyChainZztbPo> supplyChainZztbPoList = assetSupplyChainZztbService.lambdaQuery().eq(AssetSupplyChainZztbPo::getAssetId, byId.getId()).isNull(AssetSupplyChainZztbPo::getTaskId).list();
List<AssetSupplyChain> assetSupplyChainList = supplyChainZztbPoList.stream().map(cpPo -> {
AssetSupplyChain assetSupplyChain = new AssetSupplyChain();
BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性
assetSupplyChain.setId(null);
assetSupplyChain.setAssetId(aa.getId());
return assetSupplyChain; // 返回新对象
}).collect(Collectors.toList());
assetSupplyChainService.saveBatch(assetSupplyChainList);
//newtwork
List<AssetBasicNetworkZztbPo> networkZztbPoList = assetBasicNetworkZztbService.lambdaQuery().eq(AssetBasicNetworkZztbPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkZztbPo::getTaskId).list();
List<AssetBasicNetwork> networkList = networkZztbPoList.stream().map(cpPo -> {
AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork();
BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性
assetBasicNetwork.setId(null);
assetBasicNetwork.setAssetId(aa.getId());
return assetBasicNetwork; // 返回新对象
}).collect(Collectors.toList());
assetBasicNetworkService.saveBatch(networkList);
//business
List<AssetBusinessFormZztbPo> businessFormZztbPoList = assetBusinessFormZztbService.lambdaQuery().eq(AssetBusinessFormZztbPo::getAssetId, byId.getId()).isNull(AssetBusinessFormZztbPo::getTaskId).list();
List<AssetBusinessForm> businessFormList = businessFormZztbPoList.stream().map(cpPo -> {
AssetBusinessForm assetBusinessForm = new AssetBusinessForm();
BeanUtils.copyProperties(cpPo, assetBusinessForm); // 复制属性
assetBusinessForm.setId(null);
assetBusinessForm.setAssetId(aa.getId());
return assetBusinessForm; // 返回新对象
}).collect(Collectors.toList());
assetBusinessFormService.saveBatch(businessFormList);
//unitother
List<UnitOtherConcatZztbPo> unitOtherConcatZztbPoList = unitOtherConcatZztbservice.lambdaQuery().eq(UnitOtherConcatZztbPo::getAssetId, byId.getId()).isNull(UnitOtherConcatZztbPo::getTaskId).list();
List<UnitOtherConcat> unitOtherConcatList = unitOtherConcatZztbPoList.stream().map(cpPo -> {
UnitOtherConcat unitOtherConcat = new UnitOtherConcat();
BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性
unitOtherConcat.setConcatId(null);
unitOtherConcat.setAssetId(aa.getId());
return unitOtherConcat; // 返回新对象
}).collect(Collectors.toList());
unitOtherConcatService.saveBatch(unitOtherConcatList);
//数据资产
List<AssetSjZztbPo> assetSjZztbPoList = assetAssetSjZztbService.lambdaQuery().eq(AssetSjZztbPo::getAssetId, byId.getId()).isNull(AssetSjZztbPo::getTaskId).list();
List<AssetSj> assetSjList = assetSjZztbPoList.stream().map(cpPo -> {
AssetSj assetSj = new AssetSj();
BeanUtils.copyProperties(cpPo, assetSj); // 复制属性
assetSj.setId(null);
assetSj.setAssetId(aa.getId());
return assetSj; // 返回新对象
}).collect(Collectors.toList());
assetAssetSjService.saveBatch(assetSjList);
//如果有任务也修改任务这边
AssetCurrentCpPo one = assetCurrentCpService.lambdaQuery()
.isNotNull(AssetCurrentCpPo::getTaskId)
.ne(AssetCurrentCpPo::getStatus, 5)
.eq(AssetCurrentCpPo::getId, byId.getId())
.orderByDesc(AssetCurrentCpPo::getCurrentId)
.last("LIMIT 1")
.one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer taskId = one.getTaskId();
Long appId = one.getCurrentId();
Integer status = one.getStatus();
BeanUtil.copyProperties(byId, one);
one.setCurrentId(appId);
one.setTaskId(taskId);
one.setAuditState(null);
one.setAuditYy(null);
one.setStatus(status);
assetCurrentCpService.updateById(one);
//删除子表数据
QueryWrapper<AssetSupplyChainCpPo> queryWrapper2 = new QueryWrapper<>();
queryWrapper2.eq("asset_id", one.getId());
queryWrapper2.eq("task_id", taskId);
assetSupplyChainCpService.remove(queryWrapper2);
QueryWrapper<AssetBasicNetworkCpPo> queryWrapper3 = new QueryWrapper<>();
queryWrapper3.eq("asset_id", one.getId());
queryWrapper3.eq("task_id", taskId);
assetBasicNetworkCpService.remove(queryWrapper3);
QueryWrapper<AssetBusinessFormCpPo> queryWrapper4 = new QueryWrapper<>();
queryWrapper4.eq("asset_id", one.getId());
queryWrapper4.eq("task_id", taskId);
assetBusinessFormCpService.remove(queryWrapper4);
QueryWrapper<UnitOtherConcatCpPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.eq("task_id", taskId);
queryWrapper5.eq("asset_id", one.getId());
unitOtherConcatCpService.remove(queryWrapper5);
QueryWrapper<AssetSjCpPo> queryWrapper6 = new QueryWrapper<>();
queryWrapper6.eq("task_id", taskId);
queryWrapper6.eq("asset_id", one.getId());
assetAssetSjCpService.remove(queryWrapper6);
List<AssetSupplyChainZztbPo> list = assetSupplyChainZztbService.lambdaQuery().eq(AssetSupplyChainZztbPo::getAssetId, byId.getId()).isNull(AssetSupplyChainZztbPo::getTaskId).list();
list.forEach(x -> {
AssetSupplyChainCpPo a1 = new AssetSupplyChainCpPo();
BeanUtil.copyProperties(x, a1);
a1.setTaskId(taskId);
a1.setSupplyId(null);
assetSupplyChainCpService.save(a1);
});
List<AssetBasicNetworkZztbPo> list1 = assetBasicNetworkZztbService.lambdaQuery().eq(AssetBasicNetworkZztbPo::getAssetId, byId.getId()).isNull(AssetBasicNetworkZztbPo::getTaskId).list();
list1.forEach(x -> {
AssetBasicNetworkCpPo a2 = new AssetBasicNetworkCpPo();
BeanUtil.copyProperties(x, a2);
a2.setTaskId(taskId);
a2.setNetworkId(null);
assetBasicNetworkCpService.save(a2);
});
List<AssetBusinessFormZztbPo> list2 = assetBusinessFormZztbService.lambdaQuery().eq(AssetBusinessFormZztbPo::getAssetId, byId.getId()).isNull(AssetBusinessFormZztbPo::getTaskId).list();
list2.forEach(x -> {
AssetBusinessFormCpPo a3 = new AssetBusinessFormCpPo();
BeanUtil.copyProperties(x, a3);
a3.setTaskId(taskId);
a3.setBusinessId(null);
assetBusinessFormCpService.save(a3);
});
List<UnitOtherConcatZztbPo> list3 = unitOtherConcatZztbservice.lambdaQuery().eq(UnitOtherConcatZztbPo::getAssetId, byId.getId()).isNull(UnitOtherConcatZztbPo::getTaskId).list();
list3.forEach(x -> {
UnitOtherConcatCpPo a4 = new UnitOtherConcatCpPo();
BeanUtil.copyProperties(x, a4);
a4.setTaskId(taskId);
a4.setConcatId(null);
unitOtherConcatCpService.save(a4);
});
List<AssetSjZztbPo> list4 = assetAssetSjZztbService.lambdaQuery().eq(AssetSjZztbPo::getAssetId, byId.getId()).isNull(AssetSjZztbPo::getTaskId).list();
list4.forEach(x -> {
AssetSjCpPo a5 = new AssetSjCpPo();
BeanUtil.copyProperties(x, a5);
a5.setTaskId(taskId);
a5.setSjId(null);
assetAssetSjCpService.save(a5);
});
}
}
} else {
//新增主表
assetCurrentService.save(aa);
//供应链
List<AssetSupplyChainZztbPo> assetSupplyChainZztbPoList = assetSupplyChainZztbService.lambdaQuery().eq(AssetSupplyChainZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetSupplyChainZztbPo::getTaskId).list();
List<AssetSupplyChain> assetSupplyChainList1 = assetSupplyChainZztbPoList.stream().map(cpPo -> {
AssetSupplyChain assetSupplyChain = new AssetSupplyChain();
BeanUtils.copyProperties(cpPo, assetSupplyChain); // 复制属性
assetSupplyChain.setId(null);
assetSupplyChain.setAssetId(aa.getId());
return assetSupplyChain; // 返回新对象
}).collect(Collectors.toList());
assetSupplyChainService.saveBatch(assetSupplyChainList1);
//newtwork
List<AssetBasicNetworkZztbPo> networkZztbPoList1 = assetBasicNetworkZztbService.lambdaQuery().eq(AssetBasicNetworkZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetBasicNetworkZztbPo::getTaskId).list();
List<AssetBasicNetwork> networkList1 = networkZztbPoList1.stream().map(cpPo -> {
AssetBasicNetwork assetBasicNetwork = new AssetBasicNetwork();
BeanUtils.copyProperties(cpPo, assetBasicNetwork); // 复制属性
assetBasicNetwork.setId(null);
assetBasicNetwork.setAssetId(aa.getId());
return assetBasicNetwork; // 返回新对象
}).collect(Collectors.toList());
assetBasicNetworkService.saveBatch(networkList1);
//business
List<AssetBusinessFormZztbPo> businessFormZztbPoList1 = assetBusinessFormZztbService.lambdaQuery().eq(AssetBusinessFormZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetBusinessFormZztbPo::getTaskId).list();
List<AssetBusinessForm> businessFormList1 = businessFormZztbPoList1.stream().map(cpPo -> {
AssetBusinessForm assetBusinessForm = new AssetBusinessForm();
BeanUtils.copyProperties(cpPo, assetBusinessForm); // 复制属性
assetBusinessForm.setId(null);
assetBusinessForm.setAssetId(aa.getId());
return assetBusinessForm; // 返回新对象
}).collect(Collectors.toList());
assetBusinessFormService.saveBatch(businessFormList1);
//unitother
List<UnitOtherConcatZztbPo> unitOtherConcatZztbPoList1 = unitOtherConcatZztbservice.lambdaQuery().eq(UnitOtherConcatZztbPo::getAssetId, byId.getCurrentId()).isNull(UnitOtherConcatZztbPo::getTaskId).list();
List<UnitOtherConcat> unitOtherConcatList1 = unitOtherConcatZztbPoList1.stream().map(cpPo -> {
UnitOtherConcat unitOtherConcat = new UnitOtherConcat();
BeanUtils.copyProperties(cpPo, unitOtherConcat); // 复制属性
unitOtherConcat.setConcatId(null);
unitOtherConcat.setAssetId(aa.getId());
return unitOtherConcat; // 返回新对象
}).collect(Collectors.toList());
unitOtherConcatService.saveBatch(unitOtherConcatList1);
//数据资产
List<AssetSjZztbPo> assetSjZztbPoList1 = assetAssetSjZztbService.lambdaQuery().eq(AssetSjZztbPo::getAssetId, byId.getCurrentId()).isNull(AssetSjZztbPo::getTaskId).list();
List<AssetSj> assetSjList1 = assetSjZztbPoList1.stream().map(cpPo -> {
AssetSj assetSj = new AssetSj();
BeanUtils.copyProperties(cpPo, assetSj); // 复制属性
assetSj.setId(null);
assetSj.setAssetId(aa.getId());
return assetSj; // 返回新对象
}).collect(Collectors.toList());
assetAssetSjService.saveBatch(assetSjList1);
//查询改单位下是否有进行中的任务
AssetTask task = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, aa.getDwmc()).like(AssetTask::getType, "1").eq(AssetTask::getTaskStatus, 1).one();
if (task != null) {
AssetCurrentCpPo bb = new AssetCurrentCpPo();
BeanUtil.copyProperties(byId, bb);
bb.setId(aa.getId());
bb.setTaskId(task.getId());
bb.setCurrentId(null);
assetCurrentCpService.save(bb);
//供应链
List<AssetSupplyChainCpPo> assetSupplyChainCpPos = assetSupplyChainZztbPoList.stream().map(cpPo -> {
AssetSupplyChainCpPo assetSupplyChainCpPo = new AssetSupplyChainCpPo();
BeanUtils.copyProperties(cpPo, assetSupplyChainCpPo); // 复制属性
assetSupplyChainCpPo.setSupplyId(null);
assetSupplyChainCpPo.setAssetId(aa.getId());
assetSupplyChainCpPo.setTaskId(task.getId());
return assetSupplyChainCpPo; // 返回新对象
}).collect(Collectors.toList());
assetSupplyChainCpService.saveBatch(assetSupplyChainCpPos);
//netWork
List<AssetBasicNetworkCpPo> networkCpPos = networkZztbPoList1.stream().map(cpPo -> {
AssetBasicNetworkCpPo assetBasicNetworkCpPo = new AssetBasicNetworkCpPo();
BeanUtils.copyProperties(cpPo, assetBasicNetworkCpPo); // 复制属性
assetBasicNetworkCpPo.setNetworkId(null);
assetBasicNetworkCpPo.setAssetId(aa.getId());
assetBasicNetworkCpPo.setTaskId(task.getId());
return assetBasicNetworkCpPo; // 返回新对象
}).collect(Collectors.toList());
assetBasicNetworkCpService.saveBatch(networkCpPos);
//bussiness
List<AssetBusinessFormCpPo> businessFormCpPos = businessFormZztbPoList1.stream().map(cpPo -> {
AssetBusinessFormCpPo assetBusinessFormCpPo = new AssetBusinessFormCpPo();
BeanUtils.copyProperties(cpPo, assetBusinessFormCpPo); // 复制属性
assetBusinessFormCpPo.setBusinessId(null);
assetBusinessFormCpPo.setAssetId(aa.getId());
assetBusinessFormCpPo.setTaskId(task.getId());
return assetBusinessFormCpPo; // 返回新对象
}).collect(Collectors.toList());
assetBusinessFormCpService.saveBatch(businessFormCpPos);
//unitother
List<UnitOtherConcatCpPo> unitOtherConcatCpPos = unitOtherConcatZztbPoList1.stream().map(cpPo -> {
UnitOtherConcatCpPo unitOtherConcatCpPo = new UnitOtherConcatCpPo();
BeanUtils.copyProperties(cpPo, unitOtherConcatCpPo); // 复制属性
unitOtherConcatCpPo.setConcatId(null);
unitOtherConcatCpPo.setAssetId(aa.getId());
unitOtherConcatCpPo.setTaskId(task.getId());
return unitOtherConcatCpPo; // 返回新对象
}).collect(Collectors.toList());
unitOtherConcatCpService.saveBatch(unitOtherConcatCpPos);
//数据资产
List<AssetSjCpPo> assetSjCpPos = assetSjZztbPoList1.stream().map(cpPo -> {
AssetSjCpPo assetSjCpPo = new AssetSjCpPo();
BeanUtils.copyProperties(cpPo, assetSjCpPo); // 复制属性
assetSjCpPo.setSjId(null);
assetSjCpPo.setTaskId(task.getId());
assetSjCpPo.setAssetId(aa.getId());
return assetSjCpPo; // 返回新对象
}).collect(Collectors.toList());
assetAssetSjCpService.saveBatch(assetSjCpPos);
}
}
} else if ("3".equals(as.getAuditState())) {
//审核不通过
AssetCurrentZztbPo byId = assetCurrentZztbService.getById(as.getCurrentId());
AssetCurrent aa = new AssetCurrent();
BeanUtil.copyProperties(byId, aa);
//根据资产名称和所属单位查询主表是否有数据
AssetCurrent assetCurrent = assetCurrentService.lambdaQuery().eq(AssetCurrent::getXtmc, byId.getXtmc()).eq(AssetCurrent::getDwmc, byId.getDwmc()).one();
if (assetCurrent != null) {
//修改主表
if (assetCurrent.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetCurrent, "id");
assetCurrent.setXzType(0);
assetCurrent.setDelFlag("1");
assetCurrentService.updateById(assetCurrent);
} else {
BeanUtil.copyProperties(aa, assetCurrent, "id");
assetCurrent.setDelFlag("1");
assetCurrentService.updateById(assetCurrent);
}
}
} }
return success(); return success();
} }
//=================================================
/** /**
@ -595,7 +1149,7 @@ public class AssetCurrentController extends BaseController {
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
@ -617,7 +1171,7 @@ public class AssetCurrentController extends BaseController {
assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId()); assetBasicNetworkService.deleteByAssetIds(assetCurrent.getId());
assetBusinessFormService.deleteByAssetIds(assetCurrent.getId()); assetBusinessFormService.deleteByAssetIds(assetCurrent.getId());
unitOtherConcatService.deleteByAssetIds(assetCurrent.getId()); unitOtherConcatService.deleteByAssetIds(assetCurrent.getId());
assetAssetSjService.deleteByAssetIds(assetCurrent.getId());
if (assetCurrent.getXjgywxt() != null) { if (assetCurrent.getXjgywxt() != null) {
assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId()); assetCurrent.getXjgywxt().setAssetId(assetCurrent.getId());
assetCurrent.getXjgywxt().setId(null); assetCurrent.getXjgywxt().setId(null);
@ -648,6 +1202,16 @@ public class AssetCurrentController extends BaseController {
unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat()); unitOtherConcatService.saveBatch(assetCurrent.getOtherConcat());
} }
if (assetCurrent.getSjzcList() != null) {
for (AssetSj items : assetCurrent.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
items.setId(null);
}
//新增数据资产
assetAssetSjService.saveBatch(assetCurrent.getSjzcList());
}
//================================ //================================
//根据未修改之前的单位名称去寻找正在进行中的任务,报废的任务,单位自编辑的任务 //根据未修改之前的单位名称去寻找正在进行中的任务,报废的任务,单位自编辑的任务
@ -700,6 +1264,16 @@ public class AssetCurrentController extends BaseController {
} }
unitOtherConcatCpService.remove(queryWrapper5); unitOtherConcatCpService.remove(queryWrapper5);
QueryWrapper<AssetSjCpPo> queryWrapper6 = new QueryWrapper<>();
queryWrapper5.eq("asset_id", assetCurrent.getId());
if (taskId == null) {
queryWrapper5.isNull("task_id");
} else {
queryWrapper5.eq("task_id", taskId);
}
assetAssetSjCpService.remove(queryWrapper6);
if (assetCurrent.getXjgywxt() != null) { if (assetCurrent.getXjgywxt() != null) {
assetCurrentCpPo.getXjgywxt().setAssetId(assetCurrent.getId()); assetCurrentCpPo.getXjgywxt().setAssetId(assetCurrent.getId());
assetCurrentCpPo.getXjgywxt().setTaskId(taskId); assetCurrentCpPo.getXjgywxt().setTaskId(taskId);
@ -729,6 +1303,15 @@ public class AssetCurrentController extends BaseController {
//新增其他联系人 //新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat()); unitOtherConcatCpService.saveBatch(assetCurrentCpPo.getOtherConcat());
} }
if (assetCurrent.getSjzcList() != null) {
for (AssetSjCpPo items : assetCurrentCpPo.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(taskId);
}
//新增其他联系人
assetAssetSjCpService.saveBatch(assetCurrentCpPo.getSjzcList());
}
}); });
//根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态 //根据资产id查询资产子表,判断是否有此资产进行中的任务,如果资产状态是已关停与修改的数据不符，则修改任务中的资产状态
List<AssetCurrentCpPo> currentCpPo = assetCurrentCpService.findDwmc(assetCurrent.getId()); List<AssetCurrentCpPo> currentCpPo = assetCurrentCpService.findDwmc(assetCurrent.getId());
@ -781,7 +1364,7 @@ public class AssetCurrentController extends BaseController {
assetBusinessFormService.deleteByAssetIds(id); assetBusinessFormService.deleteByAssetIds(id);
unitOtherConcatService.deleteByAssetIds(id); unitOtherConcatService.deleteByAssetIds(id);
assetCurrentService.deleteByUnitIds(id); assetCurrentService.deleteByUnitIds(id);
assetAssetSjService.deleteByAssetIds(id);
QueryWrapper<AssetCurrentCpPo> queryWrapper1 = new QueryWrapper<>(); QueryWrapper<AssetCurrentCpPo> queryWrapper1 = new QueryWrapper<>();
queryWrapper1.eq("id", id); queryWrapper1.eq("id", id);
assetCurrentCpService.remove(queryWrapper1); assetCurrentCpService.remove(queryWrapper1);
@ -797,7 +1380,9 @@ public class AssetCurrentController extends BaseController {
QueryWrapper<UnitOtherConcatCpPo> queryWrapper5 = new QueryWrapper<>(); QueryWrapper<UnitOtherConcatCpPo> queryWrapper5 = new QueryWrapper<>();
queryWrapper5.eq("asset_id", id); queryWrapper5.eq("asset_id", id);
unitOtherConcatCpService.remove(queryWrapper5); unitOtherConcatCpService.remove(queryWrapper5);
QueryWrapper<AssetSjCpPo> queryWrapper6 = new QueryWrapper<>();
queryWrapper6.eq("asset_id", id);
assetAssetSjCpService.remove(queryWrapper6);
return success(); return success();
} }

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

@ -10,16 +10,18 @@ import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.tc.entity.AssetApp;
import com.ruoyi.tc.entity.AssetEmail; import com.ruoyi.tc.entity.AssetEmail;
import com.ruoyi.tc.entity.AssetTask; import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo; import com.ruoyi.tc.entity.po.*;
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.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetEmailPageRequest; import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.entity.zztb.AssetEmailZztbPo;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.AssetEmailZztbService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -62,6 +64,10 @@ public class AssetEmailController extends BaseController {
@Resource @Resource
private AssetEmailCpService assetEmailCpService; private AssetEmailCpService assetEmailCpService;
@Resource
private AssetEmailZztbService assetEmailZztbService;
/** /**
* 分页查询 * 分页查询
* *
@ -92,26 +98,27 @@ public class AssetEmailController extends BaseController {
@ApiOperation(value = "单位自编辑进行校验") @ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')") @PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit") @PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetEmailJyPo assetEmailJyPo) { public AjaxResult unitEdit(@RequestBody @Valid AssetEmailZztbPo assetEmailZztbPo) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetEmailJyPo.getSsdw()).eq(Unit::getDelFlag, 0).list(); List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetEmailZztbPo.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!"); throw new ServiceException("请选择已有单位!");
} }
AssetEmailJyPo one = assetEmailJyService.lambdaQuery().eq(AssetEmailJyPo::getSsdw, assetEmailJyPo.getSsdw()) AssetEmailZztbPo one = assetEmailZztbService.lambdaQuery().eq(AssetEmailZztbPo::getDzyxhz, assetEmailZztbPo.getDzyxhz())
.eq(AssetEmailJyPo::getDzyxhz, assetEmailJyPo.getDzyxhz()).isNull(AssetEmailJyPo::getTaskId).one(); .eq(AssetEmailZztbPo::getSsdw, assetEmailZztbPo.getSsdw()).isNull(AssetEmailZztbPo::getTaskId).one();
assetEmailJyPo.setAuditState("1");
assetEmailJyPo.setAuditYy(null); assetEmailZztbPo.setAuditState("1");
assetEmailZztbPo.setAuditYy(null);
if (one != null) { if (one != null) {
assetEmailJyPo.setEmailId(one.getEmailId()); assetEmailZztbPo.setEmailId(one.getEmailId());
assetEmailJyPo.setAssetId(one.getAssetId()); assetEmailZztbPo.setAssetId(one.getAssetId());
assetEmailJyService.updateById(assetEmailJyPo); assetEmailZztbService.updateById(assetEmailZztbPo);
} else { } else {
assetEmailJyPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, assetEmailJyPo.getSsdw()) assetEmailZztbPo.setAssetId(assetEmailService.lambdaQuery().eq(AssetEmail::getSsdw, assetEmailZztbPo.getSsdw())
.eq(AssetEmail::getDzyxhz, assetEmailJyPo.getDzyxhz()).one().getId()); .eq(AssetEmail::getDzyxhz, assetEmailZztbPo.getDzyxhz()).one().getId());
assetEmailJyService.save(assetEmailJyPo); assetEmailZztbService.save(assetEmailZztbPo);
} }
return success(); return success();
} }
@ -122,10 +129,10 @@ public class AssetEmailController extends BaseController {
* @param as 查询实体 * @param as 查询实体
* @return 所有数据 * @return 所有数据
*/ */
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetEmailJyPo.class) @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetEmailZztbPo.class)
@GetMapping("/getAuditList") @GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) { public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetEmailJyPo> page = new Page<>(); Page<AssetEmailZztbPo> page = new Page<>();
page.setSize(as.getSize()); page.setSize(as.getSize());
page.setCurrent(as.getCurrent()); page.setCurrent(as.getCurrent());
try { try {
@ -135,16 +142,16 @@ public class AssetEmailController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常"); throw new ServiceException("获取用户信息异常");
} }
return success(assetEmailJyService.getAuditList(page, as)); return success(assetEmailZztbService.getAuditList(page, as));
} }
/** /**
* 查看中间数据详情 * 查看中间数据详情
*/ */
@ApiOperation(value = "单位端查看中间数据详情", response = AssetEmailJyPo.class) @ApiOperation(value = "单位端查看中间数据详情", response = AssetEmailZztbPo.class)
@GetMapping("/lookInfo/{id}") @GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) { public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetEmailJyService.getById(id)); return success(assetEmailZztbService.getById(id));
} }
/** /**
@ -157,24 +164,30 @@ public class AssetEmailController extends BaseController {
@ApiOperation(value = "管理端审核") @ApiOperation(value = "管理端审核")
@PostMapping("/audit") @PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) { public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetEmailJyPo ass = new AssetEmailJyPo(); AssetEmailZztbPo ass = new AssetEmailZztbPo();
BeanUtil.copyProperties(as, ass); BeanUtil.copyProperties(as, ass);
ass.setEmailId(as.getCurrentId()); ass.setEmailId(as.getCurrentId());
assetEmailJyService.updateById(ass); assetEmailZztbService.updateById(ass);
//通过数据同步 //通过数据同步
if ("2".equals(as.getAuditState())) { if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId()); AssetEmailJyPo byId = assetEmailJyService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail(); AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa); BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId()); aa.setId(byId.getAssetId());
//修改主表 //修改主表
aa.setDelFlag("0");
assetEmailService.updateById(aa); assetEmailService.updateById(aa);
//如果有任务也修改任务这边 //如果有任务也修改任务这边
AssetEmailJyPo one = assetEmailJyService.lambdaQuery() AssetEmailJyPo one = assetEmailJyService.lambdaQuery()
.isNotNull(AssetEmailJyPo::getTaskId) .isNotNull(AssetEmailJyPo::getTaskId)
.ne(AssetEmailJyPo::getStatus, 5) .ne(AssetEmailJyPo::getStatus, 5)
.eq(AssetEmailJyPo::getAssetId, byId.getAssetId()).one(); .eq(AssetEmailJyPo::getAssetId, byId.getAssetId())
.orderByDesc(AssetEmailJyPo::getEmailId)
.last("LIMIT 1").one();
if (one != null) { if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus(); Integer status = one.getStatus();
Integer taskId = one.getTaskId(); Integer taskId = one.getTaskId();
Long appId = one.getEmailId(); Long appId = one.getEmailId();
@ -186,6 +199,91 @@ public class AssetEmailController extends BaseController {
one.setStatus(status); one.setStatus(status);
assetEmailJyService.updateById(one); assetEmailJyService.updateById(one);
} }
}
}
else if("2".equals(as.getAuditState()) ){
AssetEmailZztbPo byId = assetEmailZztbService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetEmail assetEmail = assetEmailService.lambdaQuery().eq(AssetEmail::getDzyxhz, byId.getDzyxhz()).eq(AssetEmail::getSsdw, byId.getSsdw()).one();
if (assetEmail != null) {
//修改主表
if (assetEmail.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetEmail, "id");
assetEmail.setXzType(0);
assetEmail.setDelFlag("0");
assetEmailService.updateById(assetEmail);
}else{
BeanUtil.copyProperties(aa, assetEmail, "id");
assetEmail.setDelFlag("0");
assetEmailService.updateById(assetEmail);
}
//如果有任务也修改任务这边
AssetEmailJyPo one = assetEmailJyService.lambdaQuery()
.ne(AssetEmailJyPo::getStatus, 5)
.eq(AssetEmailJyPo::getDzyxhz, byId.getDzyxhz())
.orderByDesc(AssetEmailJyPo::getEmailId)
.last("LIMIT 1").one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus();
Integer taskId = one.getTaskId();
Long appId = one.getEmailId();
BeanUtil.copyProperties(byId, one);
one.setEmailId(appId);
one.setTaskId(taskId);
one.setAuditState(null);
one.setAuditYy(null);
one.setStatus(status);
assetEmailJyService.updateById(one);
}
}
} else {
//新增主表
assetEmailService.save(aa);
//查询改单位下是否有进行中的任务
AssetTask task= assetTaskService.lambdaQuery().like(AssetTask::getDwmc,aa.getSsdw()).like(AssetTask::getType,"1").eq(AssetTask::getTaskStatus,1).one();
if (task!=null){
AssetEmailCpPo bb = new AssetEmailCpPo();
BeanUtil.copyProperties(byId, bb);
bb.setAssetId(aa.getId());
bb.setEmailId(null);
bb.setTaskId(task.getId());
assetEmailCpService.save(bb);
}
}
}
else if("3".equals(as.getAuditState()) ){
AssetEmailZztbPo byId = assetEmailZztbService.getById(as.getCurrentId());
AssetEmail aa = new AssetEmail();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetEmail assetEmail = assetEmailService.lambdaQuery().eq(AssetEmail::getDzyxhz, byId.getDzyxhz()).eq(AssetEmail::getSsdw, byId.getSsdw()).one();
if (assetEmail != null) {
//修改主表
if (assetEmail.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetEmail, "id");
assetEmail.setXzType(0);
assetEmail.setDelFlag("1");
assetEmailService.updateById(assetEmail);
} else {
BeanUtil.copyProperties(aa, assetEmail, "id");
assetEmail.setDelFlag("1");
assetEmailService.updateById(assetEmail);
}
}
} }
return success(); return success();
} }

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

@ -18,7 +18,9 @@ import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest; import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest; import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest;
import com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.AssetMiniProgramsZztbService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -29,9 +31,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -62,6 +61,11 @@ public class AssetMiniProgramsController extends BaseController {
@Resource @Resource
private UnitService unitService; private UnitService unitService;
@Resource
private AssetMiniProgramsZztbService assetMiniProgramsZztbService;
/** /**
* 分页查询 * 分页查询
* *
@ -92,25 +96,25 @@ public class AssetMiniProgramsController extends BaseController {
@ApiOperation(value = "单位自编辑进行校验") @ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')") @PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit") @PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetMiniProgramsJyPo assetMiniProgramsJyPo) { public AjaxResult unitEdit(@RequestBody @Valid AssetMiniProgramsZztbPo assetMiniProgramsZztbPo) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetMiniProgramsJyPo.getSsdw()).eq(Unit::getDelFlag, 0).list(); List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, assetMiniProgramsZztbPo.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!"); throw new ServiceException("请选择已有单位!");
} }
AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery().eq(AssetMiniProgramsJyPo::getSsdw, assetMiniProgramsJyPo.getSsdw()) AssetMiniProgramsZztbPo one = assetMiniProgramsZztbService.lambdaQuery().eq(AssetMiniProgramsZztbPo::getSsdw, assetMiniProgramsZztbPo.getSsdw())
.eq(AssetMiniProgramsJyPo::getXcxmc, assetMiniProgramsJyPo.getXcxmc()).isNull(AssetMiniProgramsJyPo::getTaskId).one(); .eq(AssetMiniProgramsZztbPo::getXcxmc, assetMiniProgramsZztbPo.getXcxmc()).isNull(AssetMiniProgramsZztbPo::getTaskId).one();
assetMiniProgramsJyPo.setAuditState("1"); assetMiniProgramsZztbPo.setAuditState("1");
assetMiniProgramsJyPo.setAuditYy(null); assetMiniProgramsZztbPo.setAuditYy(null);
if (one != null) { if (one != null) {
assetMiniProgramsJyPo.setMiniId(one.getMiniId()); assetMiniProgramsZztbPo.setMiniId(one.getMiniId());
assetMiniProgramsJyPo.setAssetId(one.getAssetId()); assetMiniProgramsZztbPo.setAssetId(one.getAssetId());
assetMiniProgramsJyService.updateById(assetMiniProgramsJyPo); assetMiniProgramsZztbService.updateById(assetMiniProgramsZztbPo);
} else { } else {
assetMiniProgramsJyPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniProgramsJyPo.getSsdw()) assetMiniProgramsZztbPo.setAssetId(assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniProgramsZztbPo.getSsdw())
.eq(AssetMiniPrograms::getXcxmc, assetMiniProgramsJyPo.getXcxmc()).one().getId()); .eq(AssetMiniPrograms::getXcxmc, assetMiniProgramsZztbPo.getXcxmc()).one().getId());
assetMiniProgramsJyService.save(assetMiniProgramsJyPo); assetMiniProgramsZztbService.save(assetMiniProgramsZztbPo);
} }
return success(); return success();
} }
@ -121,10 +125,10 @@ public class AssetMiniProgramsController extends BaseController {
* @param as 查询实体 * @param as 查询实体
* @return 所有数据 * @return 所有数据
*/ */
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetMiniProgramsJyPo.class) @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetMiniProgramsZztbPo.class)
@GetMapping("/getAuditList") @GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) { public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetMiniProgramsJyPo> page = new Page<>(); Page<AssetMiniProgramsZztbPo> page = new Page<>();
page.setSize(as.getSize()); page.setSize(as.getSize());
page.setCurrent(as.getCurrent()); page.setCurrent(as.getCurrent());
try { try {
@ -134,7 +138,7 @@ public class AssetMiniProgramsController extends BaseController {
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常"); throw new ServiceException("获取用户信息异常");
} }
return success(assetMiniProgramsJyService.getAuditList(page, as)); return success(assetMiniProgramsZztbService.getAuditList(page, as));
} }
/** /**
@ -143,7 +147,7 @@ public class AssetMiniProgramsController extends BaseController {
@ApiOperation(value = "单位端查看中间数据详情", response = AssetMiniProgramsJyPo.class) @ApiOperation(value = "单位端查看中间数据详情", response = AssetMiniProgramsJyPo.class)
@GetMapping("/lookInfo/{id}") @GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) { public AjaxResult lookInfo(@PathVariable Long id) {
return success(assetMiniProgramsJyService.getById(id)); return success(assetMiniProgramsZztbService.getById(id));
} }
/** /**
@ -156,24 +160,30 @@ public class AssetMiniProgramsController extends BaseController {
@ApiOperation(value = "管理端审核") @ApiOperation(value = "管理端审核")
@PostMapping("/audit") @PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) { public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetMiniProgramsJyPo ass = new AssetMiniProgramsJyPo(); AssetMiniProgramsZztbPo ass = new AssetMiniProgramsZztbPo();
BeanUtil.copyProperties(as, ass); BeanUtil.copyProperties(as, ass);
ass.setMiniId(as.getCurrentId()); ass.setMiniId(as.getCurrentId());
assetMiniProgramsJyService.updateById(ass); assetMiniProgramsZztbService.updateById(ass);
//通过数据同步 //通过数据同步
if ("2".equals(as.getAuditState())) { if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId()); AssetMiniProgramsJyPo byId = assetMiniProgramsJyService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms(); AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa); BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId()); aa.setId(byId.getAssetId());
//修改主表 //修改主表
aa.setDelFlag("0");
assetMiniProgramsService.updateById(aa); assetMiniProgramsService.updateById(aa);
//如果有任务也修改任务这边 //如果有任务也修改任务这边
AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery() AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery()
.isNotNull(AssetMiniProgramsJyPo::getTaskId) .isNotNull(AssetMiniProgramsJyPo::getTaskId)
.ne(AssetMiniProgramsJyPo::getStatus, 5) .ne(AssetMiniProgramsJyPo::getStatus, 5)
.eq(AssetMiniProgramsJyPo::getAssetId, byId.getAssetId()).one(); .eq(AssetMiniProgramsJyPo::getAssetId, byId.getAssetId())
.orderByDesc(AssetMiniProgramsJyPo::getMiniId)
.last("LIMIT 1").one();
if (one != null) { if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer taskId = one.getTaskId(); Integer taskId = one.getTaskId();
Long appId = one.getMiniId(); Long appId = one.getMiniId();
Integer status = one.getStatus(); Integer status = one.getStatus();
@ -185,6 +195,90 @@ public class AssetMiniProgramsController extends BaseController {
one.setStatus(status); one.setStatus(status);
assetMiniProgramsJyService.updateById(one); assetMiniProgramsJyService.updateById(one);
} }
}
}
else if("2".equals(as.getAuditState())){
AssetMiniProgramsZztbPo byId = assetMiniProgramsZztbService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetMiniPrograms assetMiniPrograms = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getXcxmc, byId.getXcxmc()).eq(AssetMiniPrograms::getSsdw, byId.getSsdw()).one();
if (assetMiniPrograms != null) {
//修改主表
if (assetMiniPrograms.getXzType()==0){
BeanUtil.copyProperties(aa, assetMiniPrograms, "id");
//区分数据是管理端新增还是单位端新增
assetMiniPrograms.setXzType(0);
assetMiniPrograms.setDelFlag("0");
assetMiniProgramsService.updateById(assetMiniPrograms);
}else{
BeanUtil.copyProperties(aa, assetMiniPrograms, "id");
assetMiniPrograms.setDelFlag("0");
assetMiniProgramsService.updateById(assetMiniPrograms);
}
//如果有任务也修改任务这边
AssetMiniProgramsJyPo one = assetMiniProgramsJyService.lambdaQuery()
.ne(AssetMiniProgramsJyPo::getStatus, 5)
.eq(AssetMiniProgramsJyPo::getXcxmc, byId.getXcxmc())
.orderByDesc(AssetMiniProgramsJyPo::getMiniId)
.last("LIMIT 1").one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus();
Integer taskId = one.getTaskId();
Long appId = one.getMiniId();
BeanUtil.copyProperties(byId, one);
one.setMiniId(appId);
one.setTaskId(taskId);
one.setAuditState(null);
one.setAuditYy(null);
one.setStatus(status);
assetMiniProgramsJyService.updateById(one);
}
}
} else {
//新增主表
assetMiniProgramsService.save(aa);
//查询改单位下是否有进行中的任务
AssetTask task= assetTaskService.lambdaQuery().like(AssetTask::getDwmc,aa.getSsdw()).like(AssetTask::getType,"1").eq(AssetTask::getTaskStatus,1).one();
if (task!=null){
AssetMiniProgramsCpPo bb = new AssetMiniProgramsCpPo();
BeanUtil.copyProperties(byId, bb);
bb.setAssetId(aa.getId());
bb.setMiniId(null);
bb.setTaskId(task.getId());
assetMiniProgramsCpService.save(bb);
}
}
}
else if("3".equals(as.getAuditState())){
AssetMiniProgramsZztbPo byId = assetMiniProgramsZztbService.getById(as.getCurrentId());
AssetMiniPrograms aa = new AssetMiniPrograms();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetMiniPrograms assetMiniPrograms = assetMiniProgramsService.lambdaQuery().eq(AssetMiniPrograms::getXcxmc, byId.getXcxmc()).eq(AssetMiniPrograms::getSsdw, byId.getSsdw()).one();
if (assetMiniPrograms != null) {
//修改主表
if (assetMiniPrograms.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetMiniPrograms, "id");
//区分数据是管理端新增还是单位端新增
assetMiniPrograms.setXzType(0);
assetMiniPrograms.setDelFlag("1");
assetMiniProgramsService.updateById(assetMiniPrograms);
} else {
BeanUtil.copyProperties(aa, assetMiniPrograms, "id");
assetMiniPrograms.setDelFlag("1");
assetMiniProgramsService.updateById(assetMiniPrograms);
}
}
} }
return success(); return success();
} }

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

@ -18,7 +18,9 @@ import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.request.AssetAuditRequest; import com.ruoyi.tc.entity.request.AssetAuditRequest;
import com.ruoyi.tc.entity.request.AssetOfficialAccountMenu; import com.ruoyi.tc.entity.request.AssetOfficialAccountMenu;
import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest; import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
import com.ruoyi.tc.entity.zztb.AssetOfficialAccountZztbPo;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.AssetOfficialAccountZztbService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
@ -29,10 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid; import javax.validation.Valid;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -64,6 +63,10 @@ public class AssetOfficialAccountController {
@Resource @Resource
private AssetOfficialAccountCpService assetOfficialAccountCpService; private AssetOfficialAccountCpService assetOfficialAccountCpService;
@Resource
private AssetOfficialAccountZztbService assetOfficialAccountZztbService;
/** /**
* 分页查询 * 分页查询
* *
@ -125,7 +128,7 @@ public class AssetOfficialAccountController {
@ApiOperation(value = "单位自编辑进行校验") @ApiOperation(value = "单位自编辑进行校验")
@PreAuthorize("@ss.hasAnyRoles('unit')") @PreAuthorize("@ss.hasAnyRoles('unit')")
@PostMapping("/unitEdit") @PostMapping("/unitEdit")
public AjaxResult unitEdit(@RequestBody @Valid AssetOfficialAccountJyPo ao) { public AjaxResult unitEdit(@RequestBody @Valid AssetOfficialAccountZztbPo ao) {
List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, ao.getSsdw()).eq(Unit::getDelFlag, 0).list(); List<Unit> list = unitService.lambdaQuery().eq(Unit::getNickName, ao.getSsdw()).eq(Unit::getDelFlag, 0).list();
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
@ -153,19 +156,18 @@ public class AssetOfficialAccountController {
ao.setCdlx(c.toString()); ao.setCdlx(c.toString());
} }
AssetOfficialAccountZztbPo one = assetOfficialAccountZztbService.lambdaQuery().eq(AssetOfficialAccountZztbPo::getGzhmc, ao.getGzhmc())
AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery().eq(AssetOfficialAccountJyPo::getSsdw, ao.getSsdw()) .eq(AssetOfficialAccountZztbPo::getSsdw, ao.getSsdw()).isNull(AssetOfficialAccountZztbPo::getTaskId).one();
.eq(AssetOfficialAccountJyPo::getGzhmc, ao.getGzhmc()).isNull(AssetOfficialAccountJyPo::getTaskId).one();
ao.setAuditState("1"); ao.setAuditState("1");
ao.setAuditYy(null); ao.setAuditYy(null);
if (one != null) { if (one != null) {
ao.setAccountId(one.getAccountId()); ao.setAccountId(one.getAccountId());
ao.setAssetId(one.getAssetId()); ao.setAssetId(one.getAssetId());
assetOfficialAccountJyService.updateById(ao); assetOfficialAccountZztbService.updateById(ao);
} else { } else {
ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, ao.getSsdw()) ao.setAssetId(assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getSsdw, ao.getSsdw())
.eq(AssetOfficialAccount::getGzhmc, ao.getGzhmc()).one().getId()); .eq(AssetOfficialAccount::getGzhmc, ao.getGzhmc()).one().getId());
assetOfficialAccountJyService.save(ao); assetOfficialAccountZztbService.save(ao);
} }
return success(); return success();
} }
@ -176,10 +178,10 @@ public class AssetOfficialAccountController {
* @param as 查询实体 * @param as 查询实体
* @return 所有数据 * @return 所有数据
*/ */
@ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetOfficialAccountJyPo.class) @ApiOperation(value = "分页查询管理端或者单位端审核列表", response = AssetOfficialAccountZztbPo.class)
@GetMapping("/getAuditList") @GetMapping("/getAuditList")
public AjaxResult getAuditList(AssetAuditPageRequest as) { public AjaxResult getAuditList(AssetAuditPageRequest as) {
Page<AssetOfficialAccountJyPo> page = new Page<>(); Page<AssetOfficialAccountZztbPo> page = new Page<>();
page.setSize(as.getSize()); page.setSize(as.getSize());
page.setCurrent(as.getCurrent()); page.setCurrent(as.getCurrent());
try { try {
@ -189,16 +191,16 @@ public class AssetOfficialAccountController {
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("获取用户信息异常"); throw new ServiceException("获取用户信息异常");
} }
return success(assetOfficialAccountJyService.getAuditList(page, as)); return success(assetOfficialAccountZztbService.getAuditList(page, as));
} }
/** /**
* 查看中间数据详情 * 查看中间数据详情
*/ */
@ApiOperation(value = "单位端查看中间数据详情", response = AssetOfficialAccountJyPo.class) @ApiOperation(value = "单位端查看中间数据详情", response = AssetOfficialAccountZztbPo.class)
@GetMapping("/lookInfo/{id}") @GetMapping("/lookInfo/{id}")
public AjaxResult lookInfo(@PathVariable Long id) { public AjaxResult lookInfo(@PathVariable Long id) {
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(id); AssetOfficialAccountZztbPo byId = assetOfficialAccountZztbService.getById(id);
List<AssetOfficialAccountMenu> a1 = new ArrayList<>(); List<AssetOfficialAccountMenu> a1 = new ArrayList<>();
String[] s1 = byId.getCdmc().split("\\|"); String[] s1 = byId.getCdmc().split("\\|");
String[] s2 = byId.getCdlj().split("\\|"); String[] s2 = byId.getCdlj().split("\\|");
@ -230,24 +232,76 @@ public class AssetOfficialAccountController {
@ApiOperation(value = "管理端审核") @ApiOperation(value = "管理端审核")
@PostMapping("/audit") @PostMapping("/audit")
public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) { public AjaxResult audit(@Valid @RequestBody AssetAuditRequest as) {
AssetOfficialAccountJyPo ass = new AssetOfficialAccountJyPo(); AssetOfficialAccountZztbPo ass = new AssetOfficialAccountZztbPo();
BeanUtil.copyProperties(as, ass); BeanUtil.copyProperties(as, ass);
ass.setAccountId(as.getCurrentId()); ass.setAccountId(as.getCurrentId());
assetOfficialAccountJyService.updateById(ass); assetOfficialAccountZztbService.updateById(ass);
//通过数据同步 //通过数据同步
if ("2".equals(as.getAuditState())) { if ("2".equals(as.getAuditState()) && as.getXzType() != 1) {
AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId()); AssetOfficialAccountJyPo byId = assetOfficialAccountJyService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount(); AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa); BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId()); aa.setId(byId.getAssetId());
//修改主表 //修改主表
aa.setDelFlag("0");
assetOfficialAccountService.updateById(aa); assetOfficialAccountService.updateById(aa);
//如果有任务也修改任务这边 //如果有任务也修改任务这边
AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery() AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery()
.isNotNull(AssetOfficialAccountJyPo::getTaskId) .isNotNull(AssetOfficialAccountJyPo::getTaskId)
.ne(AssetOfficialAccountJyPo::getStatus, 5) .ne(AssetOfficialAccountJyPo::getStatus, 5)
.eq(AssetOfficialAccountJyPo::getAssetId, byId.getAssetId()).one(); .eq(AssetOfficialAccountJyPo::getAssetId, byId.getAssetId())
.orderByDesc(AssetOfficialAccountJyPo::getAccountId)
.last("LIMIT 1").one();
if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus();
Integer taskId = one.getTaskId();
Long appId = one.getAccountId();
BeanUtil.copyProperties(byId, one);
one.setAccountId(appId);
one.setTaskId(taskId);
one.setAuditState(null);
one.setAuditYy(null);
one.setStatus(status);
assetOfficialAccountJyService.updateById(one);
}
}
}
else if("2".equals(as.getAuditState()) ) {
AssetOfficialAccountZztbPo byId = assetOfficialAccountZztbService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetOfficialAccount assetOfficialAccount = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getGzhmc, byId.getGzhmc()).eq(AssetOfficialAccount::getSsdw, byId.getSsdw()).one();
if (assetOfficialAccount != null) {
//修改主表
if (assetOfficialAccount.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetOfficialAccount, "id");
assetOfficialAccount.setXzType(0);
assetOfficialAccount.setDelFlag("0");
assetOfficialAccountService.updateById(assetOfficialAccount);
} else {
BeanUtil.copyProperties(aa, assetOfficialAccount, "id");
assetOfficialAccount.setDelFlag("0");
assetOfficialAccountService.updateById(assetOfficialAccount);
}
//如果有任务也修改任务这边
AssetOfficialAccountJyPo one = assetOfficialAccountJyService.lambdaQuery()
.ne(AssetOfficialAccountJyPo::getStatus, 5)
.eq(AssetOfficialAccountJyPo::getGzhmc, byId.getGzhmc())
.orderByDesc(AssetOfficialAccountJyPo::getAccountId)
.last("LIMIT 1").one();
if (one != null) { if (one != null) {
//根据任务id查询任务是否关闭
AssetTask two = assetTaskService.lambdaQuery().eq(AssetTask::getId, one.getTaskId()).eq(AssetTask::getTaskStatus, 0).one();
if (two == null) {
Integer status = one.getStatus(); Integer status = one.getStatus();
Integer taskId = one.getTaskId(); Integer taskId = one.getTaskId();
Long appId = one.getAccountId(); Long appId = one.getAccountId();
@ -259,6 +313,47 @@ public class AssetOfficialAccountController {
one.setStatus(status); one.setStatus(status);
assetOfficialAccountJyService.updateById(one); assetOfficialAccountJyService.updateById(one);
} }
}
} else {
//新增主表
assetOfficialAccountService.save(aa);
//查询改单位下是否有进行中的任务
AssetTask task = assetTaskService.lambdaQuery().like(AssetTask::getDwmc, aa.getSsdw()).like(AssetTask::getType, "1").eq(AssetTask::getTaskStatus, 1).one();
if (task != null) {
AssetOfficialAccountCpPo bb = new AssetOfficialAccountCpPo();
BeanUtil.copyProperties(byId, bb);
bb.setAssetId(aa.getId());
bb.setTaskId(task.getId());
bb.setAccountId(null);
assetOfficialAccountCpService.save(bb);
}
}
}
else if("3".equals(as.getAuditState()) ){
AssetOfficialAccountZztbPo byId = assetOfficialAccountZztbService.getById(as.getCurrentId());
AssetOfficialAccount aa = new AssetOfficialAccount();
BeanUtil.copyProperties(byId, aa);
aa.setId(byId.getAssetId());
//根据资产名称和所属单位查询主表是否有数据
AssetOfficialAccount assetOfficialAccount = assetOfficialAccountService.lambdaQuery().eq(AssetOfficialAccount::getGzhmc, byId.getGzhmc()).eq(AssetOfficialAccount::getSsdw, byId.getSsdw()).one();
if (assetOfficialAccount != null) {
//修改主表
if (assetOfficialAccount.getXzType() == 0) {
BeanUtil.copyProperties(aa, assetOfficialAccount, "id");
assetOfficialAccount.setXzType(0);
assetOfficialAccount.setDelFlag("1");
assetOfficialAccountService.updateById(assetOfficialAccount);
} else {
BeanUtil.copyProperties(aa, assetOfficialAccount, "id");
assetOfficialAccount.setDelFlag("1");
assetOfficialAccountService.updateById(assetOfficialAccount);
}
}
} }
return success(); return success();
} }
@ -274,6 +369,8 @@ public class AssetOfficialAccountController {
@PostMapping @PostMapping
@Log(title = "新增公众号数据", businessType = BusinessType.INSERT) @Log(title = "新增公众号数据", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody AssetOfficialAccount assetOfficialAccount) { public AjaxResult add(@RequestBody AssetOfficialAccount assetOfficialAccount) {
return success(assetOfficialAccountService.add(assetOfficialAccount)); return success(assetOfficialAccountService.add(assetOfficialAccount));
} }

31
ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetTaskController.java
Unescape View File

@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject; import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.AjaxResult;
@ -158,8 +157,13 @@ public class AssetTaskController extends BaseController {
@Resource @Resource
private UnitOtherConcatHistoryService unitOtherConcatHistoryService; private UnitOtherConcatHistoryService unitOtherConcatHistoryService;
@Resource
private AssetAssetSjCpService assetAssetSjCpService;
@Resource
private AssetAssetSjJyService assetAssetSjJyService;
/** /**
* 分页查询 * 分页查询
* *
@ -357,6 +361,7 @@ public class AssetTaskController extends BaseController {
assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
assetAssetSjCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
//根据taskid获取当前任务的count数量 //根据taskid获取当前任务的count数量
AssetTask assetTask = assetTaskDao.getByTaskId(assetCurrent.getTaskId()); AssetTask assetTask = assetTaskDao.getByTaskId(assetCurrent.getTaskId());
int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0); int ygt = Optional.ofNullable(assetTask.getYgt()).orElse(0);
@ -403,7 +408,7 @@ public class AssetTaskController extends BaseController {
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
@ -451,6 +456,16 @@ public class AssetTaskController extends BaseController {
//新增其他联系人 //新增其他联系人
unitOtherConcatCpService.saveBatch(assetCurrent.getOtherConcat()); unitOtherConcatCpService.saveBatch(assetCurrent.getOtherConcat());
} }
if (!assetCurrent.getSjzcList().isEmpty()) {
for (AssetSjCpPo items : assetCurrent.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(assetCurrent.getTaskId());
}
//新增其他联系人
assetAssetSjCpService.saveBatch(assetCurrent.getSjzcList());
}
// 获取当前时间 // 获取当前时间
LocalDateTime localDateTime = LocalDateTime.now(); LocalDateTime localDateTime = LocalDateTime.now();
// 转换为 Date // 转换为 Date
@ -568,6 +583,8 @@ public class AssetTaskController extends BaseController {
assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetSupplyChainCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); unitOtherConcatCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId()); assetBasicNetworkCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
assetAssetSjCpService.deletByAssetIdandTaskId(assetCurrent.getId(), assetCurrent.getTaskId());
//新增流程节点时间 //新增流程节点时间
AssetLc assetLc = new AssetLc(); AssetLc assetLc = new AssetLc();
assetLc.setTaskId(assetCurrent.getTaskId()); assetLc.setTaskId(assetCurrent.getTaskId());
@ -610,7 +627,7 @@ public class AssetTaskController extends BaseController {
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
@ -662,6 +679,14 @@ public class AssetTaskController extends BaseController {
//新增其他联系人 //新增其他联系人
unitOtherConcatJyservice.saveBatch(assetCurrent.getOtherConcat()); unitOtherConcatJyservice.saveBatch(assetCurrent.getOtherConcat());
} }
if (!assetCurrent.getSjzcList().isEmpty()) {
for (AssetSjJyPo items : assetCurrent.getSjzcList()) {
items.setAssetId(assetCurrent.getId());
items.setTaskId(assetCurrent.getTaskId());
}
//新增其他联系人
assetAssetSjJyService.saveBatch(assetCurrent.getSjzcList());
}
// 获取当前时间 // 获取当前时间
LocalDateTime localDateTime = LocalDateTime.now(); LocalDateTime localDateTime = LocalDateTime.now();
// 转换为 Date // 转换为 Date

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

@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size; import javax.validation.constraints.Size;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -87,6 +88,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
// @TableField(exist = false) // @TableField(exist = false)
private String fwwzXylx; private String fwwzXylx;
/** /**
* 0
* 访问网址 * 访问网址
*/ */
@Excel(name = "访问网址", sort = 14) @Excel(name = "访问网址", sort = 14)
@ -490,6 +492,10 @@ public class AssetCurrent extends BaseClass implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private List<UnitOtherConcat> otherConcat; private List<UnitOtherConcat> otherConcat;
@ApiModelProperty("数据资产")
@TableField(exist = false)
private List<AssetSj> sjzcList = new ArrayList<>();
/** /**
* ICP备案信息-是否备案 * ICP备案信息-是否备案
*/ */
@ -905,126 +911,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
@Size(max = 50, message = "Whois信息-到期时间长度不能超过50") @Size(max = 50, message = "Whois信息-到期时间长度不能超过50")
@ApiModelProperty("Whois信息-到期时间") @ApiModelProperty("Whois信息-到期时间")
private String whoisDqsj; private String whoisDqsj;
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称", sort = 105)
@Size(max = 50, message = "编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
//@NotBlank
@Excel(name = "*数据库类型", sort = 106, dictType = "database_type", comboReadDict = true)
@Size(max = 50, message = "数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口", sort = 107)
//@NotBlank
@Size(max = 50, message = "数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本", sort = 108)
//@NotBlank
@Size(max = 50, message = "数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP", sort = 109)
@Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
//@NotNull
@Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 110)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 111)
//@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
//@NotNull
@Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 112)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
//@NotNull
@Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 113)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
//@NotBlank
@Excel(name = "*数据类型", sort = 114)
@Size(max = 255, message = "数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
//@NotBlank
@Excel(name = "*数据量", sort = 115)
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@Excel(name = "*数据量单位", sort = 116, dictType = "sjzc_sjldw", comboReadDict = true)
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
//@NotNull
@Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 117)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 118)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 119)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 120)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述", sort = 121)
private String sjzcSjms;
@ApiModelProperty("*业务描述") @ApiModelProperty("*业务描述")
@TableField(exist = false) @TableField(exist = false)
@ -1064,6 +951,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
* 审核 * 审核
*/ */
@ApiModelProperty("类型0:管理端，1：单位端") @ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0; private Integer xzType = 0;
} }

171
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetSj.java
Unescape View File

@ -0,0 +1,171 @@
package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* @author dong
* @since 2025/3/18 9:35
*/
@Data
@ApiModel("数据资产")
@TableName(value = "asset_sjzc")
public class AssetSj implements Serializable {
@TableId(value = "id", type = IdType.AUTO)
private Long id;
@ApiModelProperty("资产id")
private Long assetId;
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称", sort = 105)
@Size(max = 50, message = "编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
//@NotBlank
@Excel(name = "*数据库类型", sort = 106, dictType = "database_type", comboReadDict = true)
@Size(max = 50, message = "数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口", sort = 107)
//@NotBlank
@Size(max = 50, message = "数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本", sort = 108)
//@NotBlank
@Size(max = 50, message = "数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP", sort = 109)
@Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
//@NotNull
@Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 110)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 111)
//@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
//@NotNull
@Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 112)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
//@NotNull
@Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 113)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
//@NotBlank
@Excel(name = "*数据类型", sort = 114)
@Size(max = 255, message = "数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
//@NotBlank
@Excel(name = "*数据量", sort = 115)
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@Excel(name = "*数据量单位", sort = 116, dictType = "sjzc_sjldw", comboReadDict = true)
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
//@NotNull
@Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 117)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 118)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 119)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 120)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述", sort = 121)
private String sjzcSjms;
/**
* 数据资产-是否涉及个人信息
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-是否涉及个人信息")
@Excel(name = "数据资产-是否涉及个人信息", sort = 121)
private String sfsjgrxx;
/**
* 数据资产-个人信息数据量
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-个人信息数据量")
@Excel(name = "数据资产-个人信息数据量", sort = 121)
private String grxxsjl;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
}

2
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetTask.java
Unescape View File

@ -1,5 +1,6 @@
package com.ruoyi.tc.entity; package com.ruoyi.tc.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -28,6 +29,7 @@ public class AssetTask implements Serializable {
* 任务编号 * 任务编号
*/ */
@ApiModelProperty("任务编号") @ApiModelProperty("任务编号")
@TableField(exist = false)
private String taskId; private String taskId;
/** /**
* 任务名称 * 任务名称

1073
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/dto/AssetCurrentCpDto.java
View File

File diff suppressed because it is too large Load Diff

10
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/history/AssetCurrentHistory.java
Unescape View File

@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass; import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.po.AssetBasicNetworkCpPo; import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
import com.ruoyi.tc.entity.po.AssetSupplyChainCpPo;
import com.ruoyi.tc.entity.po.UnitOtherConcatCpPo;
import com.ruoyi.tc.entity.request.Acomma; import com.ruoyi.tc.entity.request.Acomma;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
@ -728,6 +725,11 @@ public class AssetCurrentHistory extends BaseClass implements Serializable {
@ApiModelProperty("供应链信息列表") @ApiModelProperty("供应链信息列表")
@TableField(exist = false) @TableField(exist = false)
private List<AssetSupplyChainCpPo> gylxxList; private List<AssetSupplyChainCpPo> gylxxList;
@ApiModelProperty("数据资产")
@TableField(exist = false)
private List<AssetSjCpPo> sjzcList;
/** /**
* 基础网络列表 * 基础网络列表
*/ */

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

@ -164,4 +164,10 @@ public class AssetAppCpPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -185,4 +185,10 @@ public class AssetAppJyPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -458,6 +458,11 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private List<UnitOtherConcatCpPo> otherConcat; private List<UnitOtherConcatCpPo> otherConcat;
@ApiModelProperty("数据资产")
@TableField(exist = false)
private List<AssetSjCpPo> sjzcList;
/** /**
* ICP备案信息-是否备案 * ICP备案信息-是否备案
*/ */
@ -865,125 +870,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
*/ */
@ApiModelProperty("Whois信息-到期时间")
private String whoisDqsj;
/**
* 数据资产-数据库名称
*/
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
@ApiModelProperty("数据资产-数据领域")
private Integer sjzcSjly;
/**
* 数据资产-更新周期
*/
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
@ApiModelProperty("数据资产-数据量")
private String sjzcSjl;
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@ApiModelProperty("数据资产-数据描述")
private String sjzcSjms;
@ApiModelProperty("*业务描述") @ApiModelProperty("*业务描述")
@TableField(exist = false) @TableField(exist = false)
@ -1054,7 +941,7 @@ public class AssetCurrentCpPo extends BaseClass implements Serializable {
/** /**
* 审核 * 审核
*/ */
@ApiModelProperty("类型1:管理端，2：单位端") @ApiModelProperty("类型0:管理端，1：单位端")
private Integer type; private Integer xzType=0;
} }

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

@ -899,126 +899,6 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
@Size(max = 50, message = "Whois信息-到期时间长度不能超过50") @Size(max = 50, message = "Whois信息-到期时间长度不能超过50")
@ApiModelProperty("Whois信息-到期时间") @ApiModelProperty("Whois信息-到期时间")
private String whoisDqsj; private String whoisDqsj;
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称", sort = 98)
@Size(max = 50, message = "编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
@NotBlank
@Excel(name = "*数据库类型", sort = 99)
@Size(max = 50, message = "数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口", sort = 100)
@NotBlank
@Size(max = 50, message = "数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本", sort = 101)
@NotBlank
@Size(max = 50, message = "数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP", sort = 102)
@Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
@NotNull
@Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 103)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 104)
@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
@NotNull
@Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 105)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
@NotNull
@Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 106)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
@NotBlank
@Excel(name = "*数据类型", sort = 107)
@Size(max = 255, message = "数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
@NotNull
@Excel(name = "*数据量", sort = 108)
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@Excel(name = "*数据量单位",sort = 116,readConverterExp = "1=Gb,2=条")
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
@NotNull
@Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 110)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
@NotNull
@Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 111)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
@NotNull
@Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 112)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
@NotNull
@Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 113)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述", sort = 114)
private String sjzcSjms;
@ApiModelProperty("*业务描述") @ApiModelProperty("*业务描述")
@Excel(name = "*业务描述", sort = 115) @Excel(name = "*业务描述", sort = 115)
@ -1082,7 +962,13 @@ public class AssetCurrentJyPo extends BaseClass implements Serializable {
/** /**
* 审核 * 审核
*/ */
@ApiModelProperty("类型1:管理端，2：单位端") @ApiModelProperty("类型0:管理端，1：单位端")
private Integer type; private Integer xzType=0;
@ApiModelProperty("数据资产")
@TableField(exist = false)
private List<AssetSjJyPo> sjzcList;
} }

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

@ -169,4 +169,10 @@ public class AssetEmailCpPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -182,4 +182,11 @@ public class AssetEmailJyPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -222,4 +222,11 @@ public class AssetMiniProgramsCpPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -239,4 +239,11 @@ public class AssetMiniProgramsJyPo extends BaseClass implements Serializable {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -216,4 +216,10 @@ public class AssetOfficialAccountCpPo extends BaseClass implements Serializable
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

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

@ -244,4 +244,11 @@ public class AssetOfficialAccountJyPo extends BaseClass implements Serializable
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
} }

158
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSjCpPo.java
Unescape View File

@ -0,0 +1,158 @@
package com.ruoyi.tc.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
/**
* @author dong
* @since 2025/3/18 9:36
*/
@Data
@ApiModel("数据资产")
@TableName(value = "asset_sjzc_cp")
public class AssetSjCpPo {
@ApiModelProperty("id")
@TableId(value = "sj_id", type = IdType.AUTO)
private Long sjId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 数据资产-数据库名称
*/
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
//@NotBlank
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
//@NotNull
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@ApiModelProperty("数据资产-数据描述")
private String sjzcSjms;
/**
* 数据资产-是否涉及个人信息
*/
@ApiModelProperty("数据资产-是否涉及个人信息")
private String sfsjgrxx;
/**
* 数据资产-个人信息数据量
*/
@ApiModelProperty("数据资产-个人信息数据量")
private String grxxsjl;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
}

170
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/po/AssetSjJyPo.java
Unescape View File

@ -0,0 +1,170 @@
package com.ruoyi.tc.entity.po;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
/**
* @author dong
* @since 2025/3/18 9:39
*/
@Data
@ApiModel("数据资产")
@TableName(value = "asset_sjzc_cp")
public class AssetSjJyPo {
@ApiModelProperty("id")
@TableId(value = "sj_id", type = IdType.AUTO)
private Long sjId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称", sort = 105)
@Size(max = 50, message = "编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
//@NotBlank
@Excel(name = "*数据库类型", sort = 106, dictType = "database_type", comboReadDict = true)
@Size(max = 50, message = "数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口", sort = 107)
//@NotBlank
@Size(max = 50, message = "数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本", sort = 108)
//@NotBlank
@Size(max = 50, message = "数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP", sort = 109)
@Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
//@NotNull
@Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 110)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 111)
//@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
//@NotNull
@Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 112)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
//@NotNull
@Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 113)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
//@NotBlank
@Excel(name = "*数据类型", sort = 114)
@Size(max = 255, message = "数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
//@NotBlank
@Excel(name = "*数据量", sort = 115)
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@Excel(name = "*数据量单位", sort = 116, dictType = "sjzc_sjldw", comboReadDict = true)
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
//@NotNull
@Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 117)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 118)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 119)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 120)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述", sort = 121)
private String sjzcSjms;
/**
* 数据资产-是否涉及个人信息
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-是否涉及个人信息")
@Excel(name = "数据资产-是否涉及个人信息", sort = 121)
private String sfsjgrxx;
/**
* 数据资产-个人信息数据量
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-个人信息数据量")
@Excel(name = "数据资产-个人信息数据量", sort = 121)
private String grxxsjl;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
}

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

@ -26,4 +26,9 @@ public class AssetAuditRequest {
@ApiModelProperty("单位自己编辑的 不通过原因") @ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy; private String auditYy;
@ApiModelProperty("1单位端")
private Integer xzType;
} }

194
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetAppZztbPo.java
Unescape View File

@ -0,0 +1,194 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 资产移动应用程序(asset_app_cp)表
*
* @author du
*/
@Data
@ApiModel("资产移动应用程序自主填报")
@TableName(value = "asset_app_zztb")
public class AssetAppZztbPo extends BaseClass implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty("id")
@TableId(value = "app_id", type = IdType.AUTO)
private Long appId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 所属单位
*/
@ApiModelProperty("所属单位")
@Excel(name = "所属单位", sort = 1, width = 24)
private String ssdw;
/**
* 移动应用名称
*/
@ApiModelProperty("移动应用名称")
@Excel(name = "移动应用名称", sort = 2, width = 22)
private String appName;
/**
* 包名
*/
@Excel(name = "包名", sort = 3, width = 28)
@ApiModelProperty("包名")
private String pack;
/**
* icp备案状态（字典）
*/
@Excel(name = "icp备案状态", dictType = "app_icp_state", comboReadDict = true, sort = 4, width = 22)
@ApiModelProperty("icp备案状态（字典）")
private String icpState;
/**
* icp备案号
*/
@Excel(name = "icp备案号", sort = 5)
@ApiModelProperty("icp备案号")
private String icpbah;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码", sort = 6, width = 22)
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 文件名
*/
@Excel(name = "文件名", sort = 7, width = 22)
@ApiModelProperty("文件名")
private String wjm;
/**
* 所属行业（字典）
*/
@ApiModelProperty("所属行业（字典）")
@Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 8, width = 18)
private String sshy;
/**
* 重点行业（字典）
*/
@Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 9, width = 18)
@ApiModelProperty("重点行业（字典）")
private String zdhy;
/**
* 行政区划（字典）
*/
@Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 10, width = 18)
@ApiModelProperty("行政区划（字典）")
private String xzqh;
/**
* 简介
*/
@Excel(name = "简介", sort = 11, width = 28)
@ApiModelProperty("简介")
private String jj;
/**
* 安全加固情况（字典）
*/
@Excel(name = "安全加固情况", dictType = "app_aqjgqk", comboReadDict = true, sort = 12, width = 18)
@ApiModelProperty("安全加固情况（字典）")
private String aqjgqk;
/**
* 版本信息
*/
@Excel(name = "版本信息", sort = 13, width = 20)
@ApiModelProperty("版本信息")
private String bbxx;
/**
* 版本号
*/
@Excel(name = "版本信息（版本号）", sort = 14, width = 24)
@ApiModelProperty("版本号")
private String bbh;
/**
* 版本信息（MD5）
*/
@Excel(name = "版本信息（MD5）", sort = 15, width = 28)
@ApiModelProperty("版本信息（MD5）")
private String bbxxMd5;
/**
* 版本信息（上架平台）
*/
@Excel(name = "版本信息（上架平台）", sort = 16, width = 24)
@ApiModelProperty("版本信息（上架平台）")
private String bbxxSjpt;
/**
* 文件大小
*/
@Excel(name = "文件大小", sort = 17, width = 20)
@ApiModelProperty("文件大小")
private String wjdx;
/**
* 删除标志（0代表存在 2代表删除）
*/
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("不通过原因")
private String btgyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
@ApiModelProperty("不通过次数")
private Integer count;
@ApiModelProperty("app状态")
private String appState;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
}

117
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetBasicNetworkZztbPo.java
Unescape View File

@ -0,0 +1,117 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
/**
* 资产基础网络表(asset_basic_network)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("资产基础网络自主填报")
@TableName(value = "asset_basic_network_zztb")
public class AssetBasicNetworkZztbPo extends BaseClass implements Serializable {
/**
* 主键id
*/
@TableId(type = IdType.AUTO, value = "network_id")
private Long networkId;
/**
* 资源id
*/
@ApiModelProperty("资源id")
private Long assetId;
/**
* 1.服务器信息2网络设备3安全设备
*/
@NotNull
@ApiModelProperty("1.服务器信息2网络设备3安全设备")
private Integer type;
/**
* 设备类型
*/
@ApiModelProperty("设备类型")
private String sblx;
/**
* 品牌
*/
@ApiModelProperty("品牌")
private String pp;
/**
* 设备IP
*/
@ApiModelProperty("设备IP")
private String sbIp;
/**
* 设备IP类型
*/
@ApiModelProperty("设备IP类型")
private String ipType;
/**
* 操作系统
*/
@ApiModelProperty("操作系统")
private String czxt;
/**
* 操作系统版本
*/
@ApiModelProperty("操作系统版本")
private String czxtbb;
/**
* 硬件型号
*/
@ApiModelProperty("硬件型号")
private String yjxh;
/**
* 硬件序列号
*/
@ApiModelProperty("硬件序列号")
private String yjxlh;
/**
* 硬件版本信息
*/
@ApiModelProperty("硬件版本信息")
private String yjbbxx;
/**
* 硬件用途
*/
@ApiModelProperty("硬件用途")
private String yjyt;
/**
* 硬件部署位置
*/
@ApiModelProperty("硬件部署位置")
private String yjbsxx;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("任务id")
private Integer taskId;
}

475
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetBusinessFormZztbPo.java
Unescape View File

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

953
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetCurrentZztbPo.java
Unescape View File

@ -0,0 +1,953 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.*;
import com.ruoyi.tc.entity.po.*;
import com.ruoyi.tc.entity.request.Acomma;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
* 现有资产表(asset_current)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("现有资产表自主填报")
@TableName(value = "asset_current_zztb")
public class AssetCurrentZztbPo extends BaseClass implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键id
*/
@TableId(type = IdType.AUTO, value = "current_id")
private Long currentId;
@ApiModelProperty("资产id")
private Long id;
/**
* 任务id
*/
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 系统名称
*/
@ApiModelProperty("系统名称")
private String xtmc;
/**
* 单位名称
*/
@ApiModelProperty("单位名称")
private String dwmc;
/**
* 系统域名
*/
@ApiModelProperty("系统域名")
private String xtym;
@ApiModelProperty("访问网址-协议类型")
private String fwwzXylx;
/**
* 访问网址
*/
@ApiModelProperty("访问网址")
private String fwwz;
/**
* IPport-IP地址
*/
@ApiModelProperty("IPport-IP地址")
private String ipAddress;
/**
* IPport-端口
*/
@ApiModelProperty("IPport-端口")
private String ipPort;
/**
* 域名到期时间
*/
@ApiModelProperty("域名到期时间")
private String ymdqsj;
/**
* 域名提醒人-姓名
*/
@ApiModelProperty("域名提醒人-姓名")
private String ymtxrXm;
/**
* 域名提醒人-联系方式
*/
@ApiModelProperty("域名提醒人-联系方式")
private String ymtxrLxfs;
/**
* 关联域名（多个用,分隔）
*/
@ApiModelProperty("关联域名（多个用,分隔）")
private String glym;
@ApiModelProperty("关联域名list")
@TableField(exist = false)
private List<Acomma> glymList = new ArrayList<>();
@ApiModelProperty("关联iplist）")
@TableField(exist = false)
private List<Acomma> glIpList = new ArrayList<>();
/**
* 关联ip（多个用,分隔）
*/
@ApiModelProperty("关联ip（多个用,分隔）")
private String glIp;
/**
* 系统类型（字典）
*/
@ApiModelProperty("系统类型（字典）")
private String xtlx;
/**
* 系统重要性（字典）
*/
@ApiModelProperty("系统重要性（字典）")
private String xtzyx;
/**
* 是否关基系统（字典）
*/
@ApiModelProperty("是否关基系统（字典）")
private String gjxt;
/**
* 系统标签
*/
@ApiModelProperty("系统标签")
private String xtbq;
/**
* 机房信息
*/
@ApiModelProperty("机房信息")
private String jfxx;
/**
* 使用时间
*/
@ApiModelProperty("使用时间")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date sysj;
/**
* 是否是互联网系统（字典）
*/
@ApiModelProperty("是否是互联网系统（字典）")
private String hlwxt;
/**
* 系统编号
*/
@ApiModelProperty("系统编号")
private String xtbh;
/**
* 系统状态（字典）
*/
@ApiModelProperty("系统状态（字典）")
private String xtzt;
/**
* 在线状态（字典）
*/
@ApiModelProperty("在线状态（字典）")
private String zxzt;
@ApiModelProperty("使用人")
@TableField(exist = false)
private String syr;
/**
* C-机密性（字典）
*/
@ApiModelProperty("C-机密性（字典）")
private String cjmx;
/**
* I-完整性（字典）
*/
@ApiModelProperty("I-完整性（字典）")
private String iwzx;
/**
* A-可用性(字典）
*/
@ApiModelProperty("A-可用性(字典）")
private String akyx;
/**
* 存活率（字典）
*/
@ApiModelProperty("存活率（字典）")
private String chl;
// /**
// * 地理位置
// */
//
// @ApiModelProperty("地理位置")
// private String dlwz;
/**
* 经度
*/
@ApiModelProperty("经度")
private String jd;
/**
* 纬度
*/
@ApiModelProperty("纬度")
private String wd;
/**
* 系统特征（,分隔）
*/
@ApiModelProperty("系统特征（,分隔）")
private String xttz;
/**
* 用户规模
*/
@ApiModelProperty("用户规模")
private String yhgm;
/**
* 互联网接入运营商
*/
@ApiModelProperty("互联网接入运营商")
private String hlwjryys;
@ApiModelProperty("*物理接入地址")
@TableField(exist = false)
private String wljrdz;
/**
* 资产物理接入地址
*/
@ApiModelProperty("资产物理接入地址")
private String zcwljrdz;
/**
* 是否部署云平台（字典）
*/
@ApiModelProperty("是否部署云平台（字典）")
private String bsypt;
/**
* 云服务商名称
*/
@ApiModelProperty("云服务商名称")
private String yfwsmc;
/**
* 网站访问协议/开通协议
*/
@ApiModelProperty("网站访问协议/开通协议")
private String wzfwxy;
/**
* 系统部署方式
*/
@ApiModelProperty("系统部署方式")
private String xtbsfs;
/**
* 托管单位
*/
@ApiModelProperty("托管单位")
private String tgdw;
/**
* 云服务商
*/
@ApiModelProperty("云服务商")
private String yfws;
/**
* 是否对公众开放（字典）
*/
@ApiModelProperty("是否对公众开放（字典）")
private String dgzkf;
/**
* 互联网开放用途（字典）
*/
@ApiModelProperty("互联网开放用途（字典）")
private String hlwkfyt;
/**
* 系统防护情况-防篡改(多选字典）
*/
@ApiModelProperty("系统防护情况-防篡改(多选字典）")
private String xtfhqkFcg;
/**
* 系统防护情况-防泄露(多选字典）
*/
@ApiModelProperty("系统防护情况-防泄露(多选字典）")
private String xtfhqkFxl;
/**
* 系统防护情况-防中断(多选字典）
*/
@ApiModelProperty("系统防护情况-防中断(多选字典）")
private String xtfhqkFzd;
/**
* 系统防护情况-防勒索(多选字典）
*/
@ApiModelProperty("系统防护情况-防勒索(多选字典）")
private String xtfhqkFls;
/**
* 相关业务-覆盖范围
*/
@ApiModelProperty("相关业务-覆盖范围")
private String xgywFgfw;
/**
* 相关业务-网络性质
*/
@ApiModelProperty("相关业务-网络性质")
private String xgywWlxz;
/**
* 相关业务-业务类型
*/
@ApiModelProperty("相关业务-业务类型")
private String xgywYwlx;
/**
* 相关业务-互联情况
*/
@ApiModelProperty("相关业务-互联情况")
private String xgywHlqk;
/**
* 相关业务-服务对象
*/
@ApiModelProperty("相关业务-服务对象")
private String xgywFwdx;
/**
* 相关业务-服务范围
*/
@ApiModelProperty("相关业务-服务范围")
private String xgywFwfw;
/**
* 相关业务-业务描述
*/
@ApiModelProperty("相关业务-业务描述")
private String xgywYwms;
@ApiModelProperty("责任人")
@TableField(exist = false)
private String zrr;
/**
* 分管负责人姓名
*/
@ApiModelProperty("分管负责人姓名")
private String fgfzrxm;
/**
* 分管负责人联系方式
*/
@ApiModelProperty("分管负责人联系方式")
private String fgfzrlxfs;
/**
* 分管负责人邮箱
*/
@ApiModelProperty("分管负责人邮箱")
private String fgfzryx;
/**
* 部门负责人姓名
*/
@ApiModelProperty("部门负责人姓名")
private String bmfzrxm;
/**
* 部门负责人联系方式
*/
@ApiModelProperty("部门负责人联系方式")
private String bmfzrlxfs;
/**
* 部门负责人邮箱
*/
@ApiModelProperty("部门负责人邮箱")
private String bmfzryx;
/**
* 第一联系人姓名
*/
@ApiModelProperty("第一联系人姓名")
private String dylxrxm;
/**
* 第一联系人联系方式
*/
@ApiModelProperty("第一联系人联系方式")
private String dylxrlxfs;
/**
* 第一联系人邮箱
*/
@ApiModelProperty("第一联系人邮箱")
private String dylxryx;
@ApiModelProperty("其他联系人")
@TableField(exist = false)
private List<UnitOtherConcatZztbPo> otherConcat;
@ApiModelProperty("数据资产")
@TableField(exist = false)
private List<AssetSjZztbPo> sjzcList;
/**
* ICP备案信息-是否备案
*/
@ApiModelProperty("ICP备案信息-是否备案")
private String ipcSfba;
/**
* ICP备案信息-备案有效性
*/
@ApiModelProperty("ICP备案信息-备案有效性")
private String ipcBayxx;
/**
* ICP备案信息-备案网站名称
*/
@ApiModelProperty("ICP备案信息-备案网站名称")
private String ipcBawzmc;
/**
* ICP备案信息-备案网站首页
*/
@ApiModelProperty("ICP备案信息-备案网站首页")
private String ipcBawzsy;
/**
* ICP备案信息-ICP备案编号
*/
// @Excel(name = "ICP备案编号",sort = 25,width = 46)
@ApiModelProperty("ICP备案信息-ICP备案编号")
private String ipcIpcbabh;
/**
* ICP备案信息-备案域名
*/
@ApiModelProperty("ICP备案信息-备案域名")
private String ipcBaym;
/**
* ICP备案信息-备案单位名称
*/
@ApiModelProperty("ICP备案信息-备案单位名称")
private String ipcBadwmc;
/**
* ICP备案信息-备案单位性质
*/
@ApiModelProperty("ICP备案信息-备案单位性质")
private String ipcBadwxz;
/**
* ICP备案信息-备案联系人
*/
@ApiModelProperty("ICP备案信息-备案联系人")
private String ipcBalxr;
/**
* ICP备案信息-备案联系人电话
*/
@ApiModelProperty("ICP备案信息-备案联系人电话")
private String ipcBalxrdh;
/**
* 审核时间
*/
@Size(max = 50, message = "审核时间长度不能超过50")
@ApiModelProperty("审核时间")
private String shsj;
/**
* 公安机关备案信息-是否备案
*/
@ApiModelProperty("公安机关备案信息-是否备案")
private String gajgSfba;
/**
* 公安机关备案信息-备案机关
*/
@ApiModelProperty("公安机关备案信息-备案机关")
private String gajgBajg;
/**
* 公安机关备案信息-公安机关备案号
*/
@ApiModelProperty("公安机关备案信息-公安机关备案号")
private String gajgBah;
/**
* 公安机关备案信息-备案日期
*/
@ApiModelProperty("公安机关备案信息-备案日期")
private String gajgBarq;
/**
* 系统架构-开发商
*/
@ApiModelProperty("系统架构-开发商")
private String xtjgKfs;
/**
* 系统架构-系统版本
*/
@ApiModelProperty("系统架构-系统版本")
private String xtjgXtbb;
/**
* 系统架构-技术架构
*/
@ApiModelProperty("系统架构-技术架构")
private String xtjgJsjg;
/**
* 系统架构-服务组件
*/
@ApiModelProperty("系统架构-服务组件")
private String xtjgFwzj;
/**
* 系统架构-web容器名称
*/
@ApiModelProperty("系统架构-web容器名称")
private String xtjgWebMc;
/**
* 系统架构-web容器版本
*/
@ApiModelProperty("系统架构-web容器版本")
private String xtjgWebBb;
/**
* 系统架构-是否国产化系统
*/
@ApiModelProperty("系统架构-是否国产化系统")
private String xtjgGcxt;
/**
* 系统架构-是否有国产设备
*/
@ApiModelProperty("系统架构-是否有国产设备")
private String xtjgGcsb;
/**
* 系统架构-系统设备国产化率
*/
@ApiModelProperty("系统架构-系统设备国产化率")
private String xtjgGchl;
/**
* 等保信息-是否等保系统
*/
@ApiModelProperty("等保信息-是否等保系统")
private String dbxxSfdbxt;
/**
* 等保信息-等保测评备案号
*/
@ApiModelProperty("等保信息-等保测评备案号")
private String dbxxDbcpbah;
/**
* 等保信息-等保等级
*/
@ApiModelProperty("等保信息-等保等级")
private String dbxxDbdj;
/**
* 等保信息-主管部门
*/
@ApiModelProperty("等保信息-主管部门")
private String dbxxZgbm;
/**
* 等保信息-专家评审
*/
@ApiModelProperty("等保信息-专家评审")
private String dbxxZjps;
/**
* 等保信息-主管部门评审
*/
@ApiModelProperty("等保信息-主管部门评审")
private String dbxxZgbmps;
/**
* 等保信息-定级时间
*/
@ApiModelProperty("等保信息-定级时间")
private String dbxxDjsj;
/**
* 等保信息-是否有第三方测评
*/
// @Excel(name = "是否有第三方测评",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
@ApiModelProperty("等保信息-是否有第三方测评")
private String dbxxSfydsfcp;
@ApiModelProperty("地理位置-省")
private String sheng;
@ApiModelProperty("地理位置-市")
private String shi;
@ApiModelProperty("地理位置-区（县）")
private String qu;
/**
* 等保信息-测评得分
*/
@ApiModelProperty("等保信息-测评得分")
private Integer dbxxCpdf;
/**
* 第三方测评-测评机构名称
*/
@ApiModelProperty("第三方测评-测评机构名称")
private String sfCpjgmc;
/**
* 第三方测评-测评机构联系人
*/
@ApiModelProperty("第三方测评-测评机构联系人")
private String sfCpjglxr;
/**
* 第三方测评-测评机构地址
*/
@ApiModelProperty("第三方测评-测评机构地址")
private String sfCpjgdz;
/**
* 第三方测评-测评机构联系人电话
*/
@ApiModelProperty("第三方测评-测评机构联系人电话")
private String sfCpjglxrdh;
/**
* 第三方测评-测评时联系人
*/
@ApiModelProperty("第三方测评-测评时联系人")
private String sfCpslxr;
/**
* 第三方测评-测评师姓名
*/
@ApiModelProperty("第三方测评-测评师姓名")
private String sfCpsxm;
/**
* 第三方测评-测评时联系人电话
*/
@ApiModelProperty("第三方测评-测评时联系人电话")
private String sfCpslxrdh;
/**
* 第三方测评-测评师电话
*/
@ApiModelProperty("第三方测评-测评师电话")
private String sfCpsdh;
/**
* 第三方测评-推荐等保办
*/
@ApiModelProperty("第三方测评-推荐等保办")
private String sfTjdbb;
/**
* 第三方测评-测评师证书等级
*/
@ApiModelProperty("第三方测评-测评师证书等级")
private String sfCpszsdj;
/**
* 第三方测评-测评等级
*/
@ApiModelProperty("第三方测评-测评等级")
private String sfCpdj;
/**
* 第三方测评-推荐日期
*/
@ApiModelProperty("第三方测评-推荐日期")
private String sfTjrq;
/**
* 第三方测评-报告日期
*/
@ApiModelProperty("第三方测评-报告日期")
private String sfBgrq;
/**
* 第三方测评-测评结论
*/
@ApiModelProperty("第三方测评-测评结论")
private String sfCpjl;
/**
* 密评信息-是否密评系统
*/
@ApiModelProperty("密评信息-是否密评系统")
private String mpSfmpxt;
/**
* 密评信息-密评得分
*/
@ApiModelProperty("密评信息-密评得分")
private Integer mpMpdf;
/**
* 供应链信息列表
*/
@ApiModelProperty("供应链信息列表")
@TableField(exist = false)
private List<AssetSupplyChainZztbPo> gylxxList;
/**
* 基础网络列表
*/
@ApiModelProperty("基础网络列表")
@TableField(exist = false)
private List<AssetBasicNetworkZztbPo> jcwlList;
/**
* 新监管业务形态
*/
@ApiModelProperty("新监管业务形态")
@TableField(exist = false)
private AssetBusinessForm xjgywxt;
/**
* Whois信息-有效性
*/
@ApiModelProperty("Whois信息-有效性")
private String whoisYxx;
/**
* Whois信息-注册名
*/
@ApiModelProperty("Whois信息-注册名")
private String whoisZcm;
/**
* Whois信息-服务商
*/
@ApiModelProperty("Whois信息-服务商")
private String whoisFws;
/**
* Whois信息-注册邮箱
*/
@ApiModelProperty("Whois信息-注册邮箱")
private String whoisZcyx;
/**
* Whois信息-注册国家
*/
@ApiModelProperty("Whois信息-注册国家")
private String whoisZcgj;
/**
* Whois信息-注册省
*/
@ApiModelProperty("Whois信息-注册省")
private String whoisZcs;
/**
* Whois信息-注册地址
*/
@ApiModelProperty("Whois信息-注册地址")
private String whoisZcdz;
/**
* Whois信息-注册机构
*/
@ApiModelProperty("Whois信息-注册机构")
private String whoisZcjg;
/**
* Whois信息-注册时间
*/
@ApiModelProperty("Whois信息-注册时间")
private String whoisZcsj;
/**
* Whois信息-最后更新时间
*/
@ApiModelProperty("Whois信息-最后更新时间")
private String whoisZhgxsj;
/**
* Whois信息-到期时间
*/
@ApiModelProperty("Whois信息-到期时间")
private String whoisDqsj;
@ApiModelProperty("*业务描述")
@TableField(exist = false)
private String ywms;
/**
* 业务系统拓扑图
*/
@ApiModelProperty("业务系统拓扑图")
private String ywxttpt;
@ApiModelProperty("业务系统拓扑文件")
private String ywxttpwj;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("是否报废（默认0不报废 2代表报废）")
private String isbf;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
@TableField(updateStrategy = FieldStrategy.IGNORED)
@ApiModelProperty("不通过原因")
private String btgyy;
@ApiModelProperty("不通过次数")
private Integer count;
@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;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
}

192
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetEmailZztbPo.java
Unescape View File

@ -0,0 +1,192 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 电子邮件资产表(asset_email_cp)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("电子邮件资产表自主填报")
@TableName(value = "asset_email_zztb")
public class AssetEmailZztbPo extends BaseClass implements Serializable {
@ApiModelProperty("email_id")
@TableId(value = "email_id", type = IdType.AUTO)
private Long emailId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 所属单位
*/
@Excel(name = "所属单位", sort = 1, width = 24)
@ApiModelProperty("所属单位")
private String ssdw;
/**
* 电子邮箱后缀
*/
@Excel(name = "电子邮箱后缀", sort = 2, width = 20)
@ApiModelProperty("电子邮箱后缀")
private String dzyxhz;
/**
* 建设类型（字典）
*/
@Excel(name = "建设类型", sort = 3, width = 20, dictType = "email_jslx", comboReadDict = true)
@ApiModelProperty("建设类型（字典）")
private String jslx;
/**
* 邮件系统供应商
*/
@Excel(name = "邮件系统供应商", sort = 4, width = 24)
@ApiModelProperty("邮件系统供应商")
private String yjxtgys;
/**
* 密码算法
*/
@Excel(name = "密码算法", sort = 5, width = 22)
@ApiModelProperty("密码算法")
private String mmsf;
/**
* 邮件系统状态（字典)
*/
@Excel(name = "邮件系统状态", sort = 6, width = 20, dictType = "email_state", comboReadDict = true)
@ApiModelProperty("邮件系统状态（字典)")
private String yjxtzc;
/**
* 安全防护系统（字典）
*/
@Excel(name = "安全防护系统", sort = 7, dictType = "email_hasorno", comboReadDict = true)
@ApiModelProperty("安全防护系统（字典）")
private String aqfhxt;
/**
* 安全备份环境(字典）
*/
@Excel(name = "安全备份环境", sort = 8, dictType = "email_hasorno", comboReadDict = true)
@ApiModelProperty("安全备份环境(字典）")
private String aqbfhj;
/**
* 数字证书厂商
*/
@Excel(name = "数字证书厂商", sort = 9)
@ApiModelProperty("数字证书厂商")
private String szzscs;
/**
* 上线时间
*/
@Excel(name = "上线时间", sort = 10)
@ApiModelProperty("上线时间")
private String sxsj;
/**
* 所属行业（字典）
*/
@Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 11, width = 18)
@ApiModelProperty("所属行业（字典）")
private String sshy;
/**
* 重点行业（字典）
*/
@Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 12, width = 18)
@ApiModelProperty("重点行业（字典）")
private String zdhy;
/**
* 行政区划（字典）
*/
@Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 13, width = 18)
@ApiModelProperty("行政区划（字典）")
private String xzqh;
/**
* 简介
*/
@Excel(name = "简介", sort = 14, width = 28)
@ApiModelProperty("简介")
private String jj;
/**
* 系统责任人
*/
@Excel(name = "系统责任人", sort = 15)
@ApiModelProperty("系统责任人")
private String xtzrr;
/**
* 系统责任人电话
*/
@Excel(name = "系统责任人电话", sort = 16)
@ApiModelProperty("系统责任人电话")
private String xtzrrdh;
/**
* 系统责任人邮箱
*/
@Excel(name = "系统责任人邮箱", sort = 17)
@ApiModelProperty("系统责任人邮箱")
private String xtzrryx;
/**
* 系统责任人地址
*/
@Excel(name = "系统责任人地址", sort = 18)
@ApiModelProperty("系统责任人地址")
private String xtzrrdz;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("不通过原因")
private String btgyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
@ApiModelProperty("不通过次数")
private Integer count;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
}

249
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetMiniProgramsZztbPo.java
Unescape View File

@ -0,0 +1,249 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 小程序资产表(asset_mini_programs_cp)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("小程序资产表自主填报")
@TableName(value = "asset_mini_programs_zztb")
public class AssetMiniProgramsZztbPo extends BaseClass implements Serializable {
/**
*
*/
@ApiModelProperty("mini_id")
@TableId(value = "mini_id", type = IdType.AUTO)
private Long miniId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 所属单位
*/
@Excel(name = "所属单位", sort = 1, width = 22)
@ApiModelProperty("所属单位")
private String ssdw;
/**
* 小程序名称
*/
@Excel(name = "小程序名称", sort = 2, width = 22)
@ApiModelProperty("小程序名称")
private String xcxmc;
/**
* appid
*/
@Excel(name = "APPID", sort = 3, width = 22)
@ApiModelProperty("appid")
private String appId;
/**
* 认证主体
*/
@Excel(name = "认证主体", sort = 4, width = 26)
@ApiModelProperty("认证主体")
private String rzzt;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码", sort = 5)
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 小程序状态（字典）
*/
@Excel(name = "小程序状态", sort = 6, dictType = "gzh_state", comboReadDict = true)
@ApiModelProperty("小程序状态（字典）")
private String state;
/**
* 账号原始ID
*/
@Excel(name = "账号原始ID", sort = 7)
@ApiModelProperty("账号原始ID")
private String ysId;
/**
* 小程序包状态(字典)
*/
@Excel(name = "小程序包状态", sort = 8, dictType = "email_state", comboReadDict = true)
@ApiModelProperty("小程序包状态(字典)")
private String packState;
/**
* 认证状态(字典）
*/
@Excel(name = "认证状态", sort = 9, dictType = "gzh_rzzt", comboReadDict = true)
@ApiModelProperty("认证状态(字典）")
private String rzState;
/**
* 认证时间
*/
@Excel(name = "认证时间", sort = 10)
@ApiModelProperty("认证时间")
private String rzsj;
/**
* 认证类型（字典）
*/
@Excel(name = "认证类型", sort = 11, dictType = "gzh_rzlx", comboReadDict = true)
@ApiModelProperty("认证类型（字典）")
private String rzlx;
/**
* icp备案状态
*/
@ApiModelProperty("icp备案状态")
@Excel(name = "icp备案状态", sort = 12)
private String icpState;
/**
* 域命白名单
*/
@Excel(name = "域名白名单", sort = 13)
@ApiModelProperty("域命白名单")
private String ymbmd;
/**
* 服务类目
*/
@Excel(name = "服务类目", sort = 14)
@ApiModelProperty("服务类目")
private String fwlm;
/**
* 行业电子邮箱
*/
@Excel(name = "行业电子邮箱", sort = 15)
@ApiModelProperty("行业电子邮箱")
private String hydzyx;
/**
* 所属行业（字典）
*/
@ApiModelProperty("所属行业（字典）")
@Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 16, width = 18)
private String sshy;
/**
* 重点行业(字典)
*/
@Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 17, width = 18)
@ApiModelProperty("重点行业(字典)")
private String zdhy;
/**
* 行政区划（字典)
*/
@Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 18, width = 18)
@ApiModelProperty("行政区划（字典)")
private String xzqh;
/**
* 系统简介
*/
@Excel(name = "系统简介", sort = 19, width = 24)
@ApiModelProperty("系统简介")
private String xtjj;
/**
* 系统责任人
*/
@Excel(name = "系统责任人", sort = 20)
@ApiModelProperty("系统责任人")
private String xtzrr;
/**
* 系统责任人电话
*/
@Excel(name = "系统责任人电话", sort = 21)
@ApiModelProperty("系统责任人电话")
private String xtzrrdh;
/**
* 系统责任人邮箱
*/
@Excel(name = "系统责任人邮箱", sort = 22)
@ApiModelProperty("系统责任人邮箱")
private String xtzrryx;
/**
* 系统责任人地址
*/
@Excel(name = "系统责任人地址", sort = 23, width = 24)
@ApiModelProperty("系统责任人地址")
private String xtzrrdz;
/**
* 引用插件appid
*/
@Excel(name = "引用插件（APPID）", sort = 24)
@ApiModelProperty("引用插件appid")
private String yycjAppid;
/**
* 引用插件开发者
*/
@Excel(name = "引用插件（开发者）", sort = 25)
@ApiModelProperty("引用插件开发者")
private String yycjKfz;
/**
* 删除标志（0代表存在 2代表删除）
*/
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("不通过次数")
private Integer count;
@ApiModelProperty("不通过原因")
private String btgyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
/**
* 单位自己编辑的审核状态（1未审批 2审批通过 3审批驳回）
*/
@ApiModelProperty("审核状态（1未审批 2审批通过 3审批驳回）")
private String auditState;
@ApiModelProperty("单位自己编辑的 不通过原因")
private String auditYy;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
}

253
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetOfficialAccountZztbPo.java
Unescape View File

@ -0,0 +1,253 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import com.ruoyi.tc.entity.request.AssetOfficialAccountMenu;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 公众号资产表(asset_official_account_cp)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("公众号资产表自主填报")
@TableName(value = "asset_official_account_zztb")
public class AssetOfficialAccountZztbPo extends BaseClass implements Serializable {
@ApiModelProperty("id")
@TableId(value = "account_id", type = IdType.AUTO)
private Long accountId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 所属单位
*/
@Excel(name = "所属单位", sort = 1, width = 24)
@ApiModelProperty("所属单位")
private String ssdw;
/**
* 公众号名称
*/
@Excel(name = "公众号名称", sort = 2, width = 20)
@ApiModelProperty("公众号名称")
private String gzhmc;
/**
* 微信号
*/
@Excel(name = "微信号", sort = 3, width = 22)
@ApiModelProperty("微信号")
private String wxh;
/**
* 认证主体
*/
@Excel(name = "认证主体", sort = 4, width = 24)
@ApiModelProperty("认证主体")
private String rzzt;
/**
* 统一社会信用代码
*/
@Excel(name = "统一社会信用代码", sort = 5, width = 24)
@ApiModelProperty("统一社会信用代码")
private String tyshxydm;
/**
* 公众号状态（字典）
*/
@Excel(name = "公众号状态", sort = 6, dictType = "gzh_state", comboReadDict = true)
@ApiModelProperty("公众号状态（字典）")
private String gzhzt;
/**
* 公众号id
*/
@Excel(name = "公众号ID", sort = 7)
@ApiModelProperty("公众号id")
private String gzhId;
/**
* 公众号类型（字典）
*/
@Excel(name = "公众号类型", sort = 8, dictType = "gzh_lx", comboReadDict = true)
@ApiModelProperty("公众号类型（字典）")
private String gzhlx;
/**
* 认证状态（字典）
*/
@Excel(name = "认证状态", sort = 9, dictType = "gzh_rzzt", comboReadDict = true)
@ApiModelProperty("认证状态（字典）")
private String rzState;
/**
* 认证时间
*/
@Excel(name = "认证时间", sort = 10)
@ApiModelProperty("认证时间")
private String rzsj;
/**
* 认证类型（字典）
*/
@Excel(name = "认证类型", sort = 11, dictType = "gzh_rzlx", comboReadDict = true)
@ApiModelProperty("认证类型（字典）")
private String rzlx;
/**
* 所属行业（字典）
*/
@Excel(name = "所属行业", dictType = "app_sshy", comboReadDict = true, sort = 12, width = 18)
@ApiModelProperty("所属行业（字典）")
private String sshy;
/**
* 重点行业（字典）
*/
@Excel(name = "重点行业", dictType = "app_zdhy", comboReadDict = true, sort = 13, width = 18)
@ApiModelProperty("重点行业（字典）")
private String zdhy;
/**
* 行政区划（字典）
*/
@Excel(name = "行政区划", dictType = "app_xzqh", comboReadDict = true, sort = 14, width = 18)
@ApiModelProperty("行政区划（字典）")
private String xzqh;
/**
* 系统简介
*/
@Excel(name = "系统简介", sort = 15, width = 26)
@ApiModelProperty("系统简介")
private String xtjj;
/**
* 系统责任人
*/
@Excel(name = "系统责任人", sort = 16)
@ApiModelProperty("系统责任人")
private String xtzrr;
/**
* 系统责任人电话
*/
@Excel(name = "系统责任人电话", sort = 17)
@ApiModelProperty("系统责任人电话")
private String xtzrrdh;
/**
* 系统责任人邮箱
*/
@Excel(name = "系统责任人邮箱", sort = 18)
@ApiModelProperty("系统责任人邮箱")
private String xtzrryx;
/**
* 系统责任人地址
*/
@Excel(name = "系统责任人地址", sort = 19)
@ApiModelProperty("系统责任人地址")
private String xtzrrdz;
/**
* 菜单名称
*/
@Excel(name = "菜单信息（菜单名称）", sort = 20)
@ApiModelProperty("菜单名称")
private String cdmc;
/**
* 菜单链接
*/
@Excel(name = "菜单信息（菜单链接）", sort = 21, width = 28)
@ApiModelProperty("菜单链接")
private String cdlj;
/**
* 菜单类型
*/
@Excel(name = "菜单信息（菜单类型）", sort = 22)
@ApiModelProperty("菜单类型")
private String cdlx;
/**
* 菜单数组
*/
@TableField(exist = false)
@ApiModelProperty("菜单类型")
private List<AssetOfficialAccountMenu> cdList;
/**
* 删除标志（0代表存在 2代表删除）
*/
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("报废原因")
private String bfyy;
@ApiModelProperty("是否报废")
private Integer isbf;
@ApiModelProperty("不通过原因")
private String btgyy;
@ApiModelProperty("审核状态（0待核查，1待审批，3审核通过，4审核不通过，5已报废）")
private Integer status;
@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;
/**
* 审核
*/
@ApiModelProperty("类型0:管理端，1：单位端")
private Integer xzType=0;
}

171
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetSjZztbPo.java
Unescape View File

@ -0,0 +1,171 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* @author dong
* @since 2025/3/18 9:50
*/
@Data
@ApiModel("数据资产自主填报")
@TableName(value = "asset_sjzc_cp_zztb")
public class AssetSjZztbPo {
@ApiModelProperty("id")
@TableId(value = "sj_id", type = IdType.AUTO)
private Long sjId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("任务id")
private Integer taskId;
/**
* 数据资产-数据库名称
*/
@Excel(name = "*数据库名称", sort = 105)
@Size(max = 50, message = "编码长度不能超过255")
@ApiModelProperty("数据资产-数据库名称")
private String sjzcSjkmc;
/**
* 数据资产-数据库类型
*/
//@NotBlank
@Excel(name = "*数据库类型", sort = 106, dictType = "database_type", comboReadDict = true)
@Size(max = 50, message = "数据资产-数据库类型长度不能超过50")
@ApiModelProperty("数据资产-数据库类型")
private String sjzcSjklx;
/**
* 数据资产-端口
*/
@Excel(name = "*数据库端口", sort = 107)
//@NotBlank
@Size(max = 50, message = "数据资产-端口长度不能超过50")
@ApiModelProperty("数据资产-端口")
private String sjzcDk;
/**
* 数据资产-数据库版本
*/
@Excel(name = "*数据库版本", sort = 108)
//@NotBlank
@Size(max = 50, message = "数据资产-数据库版本长度不能超过255")
@ApiModelProperty("数据资产-数据库版本")
private String sjzcSjkbb;
/**
* 数据资产-数据库所在IP
*/
@Excel(name = "*数据库所在IP", sort = 109)
@Size(max = 50, message = "数据资产-数据库所在IP长度不能超过50")
@ApiModelProperty("数据资产-数据库所在IP")
private String sjzcSjkIp;
/**
* 数据资产-共享属性
*/
//@NotNull
@Excel(name = "*共享属性", dictType = "sjzc_gxsx", comboReadDict = true, sort = 110)
@ApiModelProperty("数据资产-共享属性")
private String sjzcGxsx;
/**
* 数据资产-开放属性
*/
@Excel(name = "*开放属性", dictType = "sjzc_kfsx", comboReadDict = true, sort = 111)
//@NotNull
@ApiModelProperty("数据资产-开放属性")
private String sjzcKfsx;
/**
* 数据资产-数据领域
*/
//@NotNull
@Excel(name = "*数据领域", dictType = "sjzc_sjly", comboReadDict = true, sort = 112)
@ApiModelProperty("数据资产-数据领域")
private String sjzcSjly;
/**
* 数据资产-更新周期
*/
//@NotNull
@Excel(name = "*更新周期", dictType = "sjzc_gxzq", comboReadDict = true, sort = 113)
@ApiModelProperty("数据资产-更新周期")
private String sjzcGxzq;
/**
* 数据资产-数据类型
*/
//@NotBlank
@Excel(name = "*数据类型", sort = 114)
@Size(max = 255, message = "数据资产-数据类型长度不能超过255")
@ApiModelProperty("数据资产-数据类型")
private String sjzcSjlx;
/**
* 数据资产-数据量
*/
//@NotBlank
@Excel(name = "*数据量", sort = 115)
@ApiModelProperty("数据资产-数据量")
private Integer sjzcSjl;
@Excel(name = "*数据量单位", sort = 116, dictType = "sjzc_sjldw", comboReadDict = true)
@ApiModelProperty("数据资产-数据量单位")
private String sjzcSjldw;
/**
* 数据资产-是否为涉密数据
*/
//@NotNull
@Excel(name = "*是否为涉密数据", dictType = "is_no", comboReadDict = true, sort = 117)
@ApiModelProperty("数据资产-是否为涉密数据")
private String sjzcSmsj;
/**
* 数据资产-数据是否出境
*/
//@NotNull
@Excel(name = "*数据是否出境", dictType = "is_no", comboReadDict = true, sort = 118)
@ApiModelProperty("数据资产-数据是否出境")
private String sjzcCj;
/**
* 数据资产-数据分级分类
*/
//@NotNull
@Excel(name = "*数据分级分类", dictType = "sjzc_sjfjfl", comboReadDict = true, sort = 119)
@ApiModelProperty("数据资产-数据分级分类")
private String sjzcSjfjfl;
/**
* 数据资产-数据重要程度
*/
//@NotNull
@Excel(name = "数据重要程度", dictType = "zc_xtzyx", comboReadDict = true, sort = 120)
@ApiModelProperty("数据资产-数据重要程度")
private String sjzcSjzycd;
/**
* 数据资产-数据描述
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-数据描述")
@Excel(name = "数据描述", sort = 121)
private String sjzcSjms;
/**
* 数据资产-是否涉及个人信息
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-是否涉及个人信息")
@Excel(name = "数据资产-是否涉及个人信息", sort = 121)
private String sfsjgrxx;
/**
* 数据资产-个人信息数据量
*/
@Size(max = 500, message = "数据资产-数据描述长度不能超过500")
@ApiModelProperty("数据资产-个人信息数据量")
@Excel(name = "数据资产-个人信息数据量", sort = 121)
private String grxxsjl;
}

91
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/AssetSupplyChainZztbPo.java
Unescape View File

@ -0,0 +1,91 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import java.io.Serializable;
/**
* 资产供应链信息(asset_supply_chain)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("资产供应链信息自主填报")
@TableName(value = "asset_supply_chain_zztb")
public class AssetSupplyChainZztbPo extends BaseClass implements Serializable {
/**
* 主键id
*/
@TableId(type = IdType.AUTO, value = "supply_id")
private Long supplyId;
/**
* 资产id
*/
@ApiModelProperty("资产id")
private Long assetId;
/**
* 1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位
*/
@NotNull
@ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位")
private Integer type;
/**
* 名称
*/
@Size(max = 50, message = "名称长度不能超过50")
@ApiModelProperty("名称")
private String name;
/**
* 统一信用代码
*/
@Size(max = 50, message = "统一信用代码长度不能超过50")
@ApiModelProperty("统一信用代码")
private String tyshxydm;
/**
* 联系人
*/
@Size(max = 50, message = "联系人长度不能超过50")
@ApiModelProperty("联系人")
private String lxr;
/**
* 联系电话
*/
@Size(max = 50, message = "联系电话长度不能超过50")
@ApiModelProperty("联系电话")
private String lxdh;
/**
* 供应商注册地址
*/
@Size(max = 500, message = "供应商注册地址长度不能超过500")
@ApiModelProperty("供应商注册地址")
private String gyszcdz;
/**
* 注册地是否为太仓
*/
@ApiModelProperty("注册地是否为太仓")
private String sfwtc;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("任务id")
private Integer taskId;
}

54
ruoyi-admin/src/main/java/com/ruoyi/tc/entity/zztb/UnitOtherConcatZztbPo.java
Unescape View File

@ -0,0 +1,54 @@
package com.ruoyi.tc.entity.zztb;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.ruoyi.tc.baseClass.BaseClass;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
/**
* 单位其他联系人(unit_other_contact)实体类
*
* @author du
* @since 2024/11/13 14:44
*/
@Data
@ApiModel("单位其他联系人自主填报")
@TableName(value = "unit_other_contact_zztb")
public class UnitOtherConcatZztbPo extends BaseClass implements Serializable {
/**
* 主表id
*/
@TableId(type = IdType.AUTO, value = "concat_id")
@ApiModelProperty("主表id")
private Long concatId;
@ApiModelProperty("单位id")
private Long unitId;
@ApiModelProperty("资产id")
private Long assetId;
@ApiModelProperty("其他联系人姓名")
private String qtlxrxm;
@ApiModelProperty("其他联系人联系方式")
private String qtlxrlxfs;
@ApiModelProperty("其他联系人邮箱")
private String qtlxryx;
@ApiModelProperty("其他联系人职务职称")
private String qtlxrzwzc;
@ApiModelProperty("删除标志（0代表存在 2代表删除）")
private String delFlag;
@ApiModelProperty("任务id")
private Integer taskId;
}

38
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAssetSjCpMapper.java
Unescape View File

@ -0,0 +1,38 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetSjCpPo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.apache.ibatis.annotations.Update;
/**
* 资产移动应用程序表(asset_app_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetAssetSjCpMapper extends BaseMapper<AssetSjCpPo> {
/**
* 根据assetId删除
*/
void deleteByAssetIds(Long id);
/**
* 根据资产id和任务id删除数据
*
* @param assetId 资产id
* @param taskId 任务id
*/
@Delete("delete from asset_sjzc_cp where asset_id=#{assetId} and task_id =#{taskId} ")
void deletByAssetIdandTaskId(@Param("assetId") Long assetId, @Param("taskId") int taskId);
}

18
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAssetSjJyMapper.java
Unescape View File

@ -0,0 +1,18 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.AssetSjCpPo;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
/**
* 资产移动应用程序表(asset_app_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetAssetSjJyMapper extends BaseMapper<AssetSjJyPo> {
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/AssetAssetSjMapper.java
Unescape View File

@ -0,0 +1,22 @@
package com.ruoyi.tc.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.AssetSj;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
/**
* 资产移动应用程序表(asset_app_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetAssetSjMapper extends BaseMapper<AssetSj> {
/**
* 根据assetId删除
*/
void deleteByAssetIds(Long id);
}

29
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetAppZztbMapper.java
Unescape View File

@ -0,0 +1,29 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import org.apache.ibatis.annotations.Param;
/**
* 资产移动应用程序表(asset_app_cp_zztb)表数据库访问层
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetAppZztbMapper extends BaseMapper<AssetAppZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetAppZztbPo> getAuditList(Page<AssetAppZztbPo> page, @Param("req") AssetAuditPageRequest as);
}

16
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetAssetSjZztbMapper.java
Unescape View File

@ -0,0 +1,16 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.entity.zztb.AssetSjZztbPo;
/**
* 数据资产应用程序表(asset_sjzc_cp_zztb)表数据库访问层
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetAssetSjZztbMapper extends BaseMapper<AssetSjZztbPo> {
}

15
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetBasicNetWorkZztbMapper.java
Unescape View File

@ -0,0 +1,15 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
import com.ruoyi.tc.entity.zztb.AssetBasicNetworkZztbPo;
/**
* 资产基础网络复制表(asset_basic_network_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetBasicNetWorkZztbMapper extends BaseMapper<AssetBasicNetworkZztbPo> {
}

24
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetBusinessFormZztbMapper.java
Unescape View File

@ -0,0 +1,24 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.AssetBusinessFormCpPo;
import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
import com.ruoyi.tc.entity.zztb.AssetBusinessFormZztbPo;
import org.apache.ibatis.annotations.Delete;
import org.apache.ibatis.annotations.Select;
import java.util.List;
/**
* 资产新监管业务形态复制表(asset_business_form_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetBusinessFormZztbMapper extends BaseMapper<AssetBusinessFormZztbPo> {
}

26
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetCurrentZztbMapper.java
Unescape View File

@ -0,0 +1,26 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetCurrentZztbPo;
import org.apache.ibatis.annotations.Param;
/**
* 现有资产复制表(AssetCurrentResponse)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetCurrentZztbMapper extends BaseMapper<AssetCurrentZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetCurrentZztbPo> getAuditList(Page<AssetCurrentZztbPo> page, @Param("req") AssetAuditPageRequest as);
}

26
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetEmailZztbMapper.java
Unescape View File

@ -0,0 +1,26 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetEmailZztbPo;
import org.apache.ibatis.annotations.Param;
/**
* 电子邮件资产表(asset_email_cp)表数据库访问层
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetEmailZztbMapper extends BaseMapper<AssetEmailZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetEmailZztbPo> getAuditList(Page<AssetEmailZztbPo> page,@Param("req") AssetAuditPageRequest as);
}

27
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetMiniProgramsZztbMapper.java
Unescape View File

@ -0,0 +1,27 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo;
import org.apache.ibatis.annotations.Param;
/**
* 小程序资产表(asset_mini_programs_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetMiniProgramsZztbMapper extends BaseMapper<AssetMiniProgramsZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetMiniProgramsZztbPo> getAuditList(Page<AssetMiniProgramsZztbPo> page,@Param("req") AssetAuditPageRequest as);
}

27
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/AssetOfficialAccountZztbMapper.java
Unescape View File

@ -0,0 +1,27 @@
package com.ruoyi.tc.mapper.zztb;
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 com.ruoyi.tc.entity.zztb.AssetOfficialAccountZztbPo;
import org.apache.ibatis.annotations.Param;
/**
* 公众号资产表(asset_official_account_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetOfficialAccountZztbMapper extends BaseMapper<AssetOfficialAccountZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetOfficialAccountZztbPo> getAuditList(Page<AssetOfficialAccountZztbPo> page, @Param("req") AssetAuditPageRequest as);
}

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

@ -0,0 +1,19 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
import com.ruoyi.tc.entity.zztb.AssetSupplyChainZztbPo;
/**
* 资产供应链信息复制(asset_supply_chain_cp)表数据库访问层
*
* @author makejava
* @since 2024-11-15 10:03:56
*/
public interface AssetSupplyChainZztbMapper extends BaseMapper<AssetSupplyChainZztbPo> {
}

15
ruoyi-admin/src/main/java/com/ruoyi/tc/mapper/zztb/UnitOtherConcatZztbMapper.java
Unescape View File

@ -0,0 +1,15 @@
package com.ruoyi.tc.mapper.zztb;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
import com.ruoyi.tc.entity.zztb.UnitOtherConcatZztbPo;
/**
* 单位其他联系人复制(unit_other_contact_cp)数据层
*
* @author ruoyi
*/
public interface UnitOtherConcatZztbMapper extends BaseMapper<UnitOtherConcatZztbPo> {
}

26
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAssetSjCpService.java
Unescape View File

@ -0,0 +1,26 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetAppCpPo;
import com.ruoyi.tc.entity.po.AssetSjCpPo;
/**
* 数据资产程序表(asset_sjzc_cp)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetAssetSjCpService extends IService<AssetSjCpPo> {
/**
* 根据资产id和任务id删除数据
*
* @param assetId 资产id
* @param taskId 任务id
*/
void deletByAssetIdandTaskId(Long assetId, Integer taskId);
}

16
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAssetSjJyService.java
Unescape View File

@ -0,0 +1,16 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetSjCpPo;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
/**
* 数据资产程序表(asset_sjzc_cp)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetAssetSjJyService extends IService<AssetSjJyPo> {
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/service/AssetAssetSjService.java
Unescape View File

@ -0,0 +1,22 @@
package com.ruoyi.tc.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.AssetSj;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
/**
* 数据资产程序表(asset_sjzc_cp)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetAssetSjService extends IService<AssetSj> {
/**
* 根据assetId逻辑删除
*/
void deleteByAssetIds(Long id);
}

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

@ -55,7 +55,7 @@ public interface AssetMiniProgramsService extends IService<AssetMiniPrograms> {
void deleteIdList(List<Long> idList); void deleteIdList(List<Long> idList);
/** /**
* 新增小程序数据 * 管理端新增小程序数据
* *
* @param assetMiniPrograms 实体 * @param assetMiniPrograms 实体
* @return 新增结果 * @return 新增结果

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

@ -10,17 +10,17 @@ import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetAppCpPo; import com.ruoyi.tc.entity.po.AssetAppCpPo;
import com.ruoyi.tc.entity.request.AssetAppPageRequest; import com.ruoyi.tc.entity.request.AssetAppPageRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.mapper.AssetAppMapper; import com.ruoyi.tc.mapper.AssetAppMapper;
import com.ruoyi.tc.service.AssetAppCpService; import com.ruoyi.tc.service.AssetAppCpService;
import com.ruoyi.tc.service.AssetAppService; import com.ruoyi.tc.service.AssetAppService;
import com.ruoyi.tc.service.AssetTaskService; import com.ruoyi.tc.service.AssetTaskService;
import com.ruoyi.tc.service.UnitService; import com.ruoyi.tc.service.UnitService;
import com.ruoyi.tc.zztbService.AssetAppZztbService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List; import java.util.List;
/** /**
@ -40,6 +40,9 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
@Resource @Resource
private AssetTaskService assetTaskService; private AssetTaskService assetTaskService;
@Resource
private AssetAppZztbService assetAppZztbService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
@ -105,15 +108,27 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
if (list1 != null && !list1.isEmpty()) { if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!"); throw new ServiceException("不允许新增重复资产!");
} }
if (assetApp.getXzType() == 1) {
//单位端新增
AssetAppZztbPo assetAppZztbPo = new AssetAppZztbPo();
BeanUtils.copyProperties(assetApp, assetAppZztbPo);
assetAppZztbPo.setAuditState("1");
assetAppZztbPo.setAuditYy(null);
assetAppZztbService.save(assetAppZztbPo);
} else {
//管理端新增
save(assetApp); save(assetApp);
AssetAppCpPo a = new AssetAppCpPo(); AssetAppCpPo a = new AssetAppCpPo();
BeanUtil.copyProperties(assetApp, a); BeanUtil.copyProperties(assetApp, a);
Integer i = unitService.selectTaskId(assetApp.getSsdw(), "4"); Integer i = unitService.selectTaskId(assetApp.getSsdw(), "4");
if (i != null) { if (i != null) {
a.setTaskId(i); a.setTaskId(i);
a.setXzType(1);
a.setAssetId(assetApp.getId()); a.setAssetId(assetApp.getId());
assetAppCpService.save(a); assetAppCpService.save(a);
} }
}
return true; return true;
} }
@ -133,9 +148,9 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
} }
//管理端编辑
updateById(assetApp); updateById(assetApp);
List<AssetAppCpPo> list = assetAppCpService.lambdaQuery() List<AssetAppCpPo> list = assetAppCpService.lambdaQuery()
.eq(AssetAppCpPo::getAssetId, assetApp.getId()).list(); .eq(AssetAppCpPo::getAssetId, assetApp.getId()).list();
list.forEach(x -> { list.forEach(x -> {
@ -169,12 +184,13 @@ public class AssetAppServiceImpl extends ServiceImpl<AssetAppMapper, AssetApp> i
s.setTaskStatus(1); s.setTaskStatus(1);
assetTask.setAppId(assetTask.getAppId()); assetTask.setAppId(assetTask.getAppId());
assetAppCpService.updateById(assetTask); assetAppCpService.updateById(assetTask);
assetTaskService.update(s); assetTaskService.update(s);
} }
} }
return true; return true;
} }

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

@ -0,0 +1,28 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetSjCpPo;
import com.ruoyi.tc.mapper.AssetAssetSjCpMapper;
import com.ruoyi.tc.service.AssetAssetSjCpService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
* 数据资产程序表(asset_sjzc_cp)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetAssetSjCpService")
public class AssetAssetSjCpServiceImpl extends ServiceImpl<AssetAssetSjCpMapper, AssetSjCpPo> implements AssetAssetSjCpService {
@Resource
private AssetAssetSjCpMapper assetAssetSjCpMapper;
@Override
public void deletByAssetIdandTaskId(Long assetId, Integer taskId) {
assetAssetSjCpMapper.deletByAssetIdandTaskId(assetId, taskId);
}
}

19
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAssetSjJyServiceImpl.java
Unescape View File

@ -0,0 +1,19 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
import com.ruoyi.tc.mapper.AssetAssetSjJyMapper;
import com.ruoyi.tc.service.AssetAssetSjJyService;
import org.springframework.stereotype.Service;
/**
* 数据资产程序表(asset_sjzc_cp)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetAssetSjJyService")
public class AssetAssetSjJyServiceImpl extends ServiceImpl<AssetAssetSjJyMapper, AssetSjJyPo> implements AssetAssetSjJyService {
}

31
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetAssetSjServiceImpl.java
Unescape View File

@ -0,0 +1,31 @@
package com.ruoyi.tc.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.AssetSj;
import com.ruoyi.tc.entity.po.AssetSjJyPo;
import com.ruoyi.tc.mapper.AssetAssetSjJyMapper;
import com.ruoyi.tc.mapper.AssetAssetSjMapper;
import com.ruoyi.tc.service.AssetAssetSjJyService;
import com.ruoyi.tc.service.AssetAssetSjService;
import org.springframework.stereotype.Service;
/**
* 数据资产程序表(asset_sjzc_cp)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetAssetSjService")
public class AssetAssetSjServiceImpl extends ServiceImpl<AssetAssetSjMapper, AssetSj> implements AssetAssetSjService {
/**
* 根据assetId逻辑删除
*/
@Override
public void deleteByAssetIds(Long id) {
baseMapper.deleteByAssetIds(id);
}
}

17
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetCurrentServiceImpl.java
Unescape View File

@ -39,6 +39,10 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
@Resource @Resource
private UnitOtherConcatService unitOtherConcatService; private UnitOtherConcatService unitOtherConcatService;
@Resource
private AssetAssetSjService assetAssetSjService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
* *
@ -75,20 +79,22 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
byId.setJcwlList(assetBasicNetworkService.lambdaQuery().eq(AssetBasicNetwork::getAssetId, id).eq(AssetBasicNetwork::getDelFlag, "0").list()); byId.setJcwlList(assetBasicNetworkService.lambdaQuery().eq(AssetBasicNetwork::getAssetId, id).eq(AssetBasicNetwork::getDelFlag, "0").list());
byId.setXjgywxt(assetBusinessFormService.lambdaQuery().eq(AssetBusinessForm::getAssetId, id).eq(AssetBusinessForm::getDelFlag, "0").one()); byId.setXjgywxt(assetBusinessFormService.lambdaQuery().eq(AssetBusinessForm::getAssetId, id).eq(AssetBusinessForm::getDelFlag, "0").one());
byId.setOtherConcat(unitOtherConcatService.lambdaQuery().eq(UnitOtherConcat::getAssetId, id).eq(UnitOtherConcat::getDelFlag, "0").list()); byId.setOtherConcat(unitOtherConcatService.lambdaQuery().eq(UnitOtherConcat::getAssetId, id).eq(UnitOtherConcat::getDelFlag, "0").list());
byId.setSjzcList(assetAssetSjService.lambdaQuery().eq(AssetSj::getAssetId, id).eq(AssetSj::getDelFlag, "0").list());
List<Acomma> a1 = new ArrayList<>(); List<Acomma> a1 = new ArrayList<>();
if(byId.getGlym()!=null){ if (byId.getGlym() != null) {
Arrays.asList(byId.getGlym().split(",")).forEach(x -> { Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
Acomma acomma = new Acomma(); Acomma acomma = new Acomma();
acomma.setKey(x); acomma.setKey(x);
a1.add(acomma); a1.add(acomma);
}); });
byId.setGlymList(a1); byId.setGlymList(a1);
}else { } else {
byId.setGlymList(new ArrayList<>()); byId.setGlymList(new ArrayList<>());
} }
List<Acomma> a2 = new ArrayList<>(); List<Acomma> a2 = new ArrayList<>();
if(byId.getGlIp()!=null&& !byId.getGlIp().isEmpty()){ if (byId.getGlIp() != null && !byId.getGlIp().isEmpty()) {
for (Object o : JSONArray.parseArray(byId.getGlIp())) { for (Object o : JSONArray.parseArray(byId.getGlIp())) {
Acomma acomma = new Acomma(); Acomma acomma = new Acomma();
JSONObject jsonObject = JSONObject.parseObject(o.toString()); JSONObject jsonObject = JSONObject.parseObject(o.toString());
@ -105,13 +111,13 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
Object portValue = jsonObject.get("port"); Object portValue = jsonObject.get("port");
if (portValue != null && !portValue.toString().isEmpty()) { if (portValue != null && !portValue.toString().isEmpty()) {
acomma.setPort(portValue.toString()); acomma.setPort(portValue.toString());
}else{ } else {
acomma.setPort(""); acomma.setPort("");
} }
a2.add(acomma); a2.add(acomma);
} }
byId.setGlIpList(a2); byId.setGlIpList(a2);
}else { } else {
byId.setGlIpList(new ArrayList<>()); byId.setGlIpList(new ArrayList<>());
} }
@ -127,7 +133,6 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
} }
/** /**
* 查询所有数据(带子表) * 查询所有数据(带子表)
*/ */

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

@ -5,18 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.tc.entity.AssetCurrent;
import com.ruoyi.tc.entity.AssetEmail; import com.ruoyi.tc.entity.AssetEmail;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetCurrentCpPo;
import com.ruoyi.tc.entity.po.AssetEmailCpPo; import com.ruoyi.tc.entity.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.request.AssetEmailPageRequest; import com.ruoyi.tc.entity.request.AssetEmailPageRequest;
import com.ruoyi.tc.entity.zztb.AssetEmailZztbPo;
import com.ruoyi.tc.mapper.AssetEmailMapper; import com.ruoyi.tc.mapper.AssetEmailMapper;
import com.ruoyi.tc.service.AssetEmailCpService; import com.ruoyi.tc.service.AssetEmailCpService;
import com.ruoyi.tc.service.AssetEmailService; import com.ruoyi.tc.service.AssetEmailService;
import com.ruoyi.tc.service.AssetTaskService; import com.ruoyi.tc.service.AssetTaskService;
import com.ruoyi.tc.service.UnitService; import com.ruoyi.tc.service.UnitService;
import com.ruoyi.tc.zztbService.AssetEmailZztbService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -39,6 +39,9 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
@Resource @Resource
private AssetTaskService assetTaskService; private AssetTaskService assetTaskService;
@Resource
private AssetEmailZztbService assetEmailZztbService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
@ -103,18 +106,30 @@ public class AssetEmailServiceImpl extends ServiceImpl<AssetEmailMapper, AssetEm
} }
List<AssetEmail> list1 = lambdaQuery().eq(AssetEmail::getSsdw, assetEmail.getSsdw()) List<AssetEmail> list1 = lambdaQuery().eq(AssetEmail::getSsdw, assetEmail.getSsdw())
.eq(AssetEmail::getDzyxhz, assetEmail.getDzyxhz()).list(); .eq(AssetEmail::getDzyxhz, assetEmail.getDzyxhz()).list();
if (list1 != null&& !list1.isEmpty()){ if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!"); throw new ServiceException("不允许新增重复资产!");
} }
if (assetEmail.getXzType() == 1) {
//单位端新增
AssetEmailZztbPo assetEmailZztbPo = new AssetEmailZztbPo();
BeanUtils.copyProperties(assetEmail, assetEmailZztbPo);
assetEmailZztbPo.setAuditState("1");
assetEmailZztbPo.setAuditYy(null);
assetEmailZztbService.save(assetEmailZztbPo);
} else {
//管理端新增
save(assetEmail); save(assetEmail);
AssetEmailCpPo a = new AssetEmailCpPo(); AssetEmailCpPo a = new AssetEmailCpPo();
BeanUtil.copyProperties(assetEmail, a); BeanUtil.copyProperties(assetEmail, a);
Integer i = unitService.selectTaskId(assetEmail.getSsdw(), "3"); Integer i = unitService.selectTaskId(assetEmail.getSsdw(), "3");
if (i != null) { if (i != null) {
a.setTaskId(i); a.setTaskId(i);
a.setXzType(1);
a.setAssetId(assetEmail.getId()); a.setAssetId(assetEmail.getId());
assetEmailCpService.save(a); assetEmailCpService.save(a);
} }
}
return true; return true;
} }

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

@ -6,16 +6,17 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.tc.entity.AssetMiniPrograms; import com.ruoyi.tc.entity.AssetMiniPrograms;
import com.ruoyi.tc.entity.AssetTask;
import com.ruoyi.tc.entity.Unit; import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetEmailCpPo;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest; import com.ruoyi.tc.entity.request.AssetMiniProgramsPageRequest;
import com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo;
import com.ruoyi.tc.mapper.AssetMiniProgramsMapper; import com.ruoyi.tc.mapper.AssetMiniProgramsMapper;
import com.ruoyi.tc.service.AssetMiniProgramsCpService; import com.ruoyi.tc.service.AssetMiniProgramsCpService;
import com.ruoyi.tc.service.AssetMiniProgramsService; import com.ruoyi.tc.service.AssetMiniProgramsService;
import com.ruoyi.tc.service.AssetTaskService; import com.ruoyi.tc.service.AssetTaskService;
import com.ruoyi.tc.service.UnitService; import com.ruoyi.tc.service.UnitService;
import com.ruoyi.tc.zztbService.AssetMiniProgramsZztbService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -37,6 +38,9 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
@Resource @Resource
private UnitService unitService; private UnitService unitService;
@Resource
private AssetMiniProgramsZztbService assetMiniProgramsZztbService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
* *
@ -92,18 +96,30 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
List<AssetMiniPrograms> list1 = lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniPrograms.getSsdw()) List<AssetMiniPrograms> list1 = lambdaQuery().eq(AssetMiniPrograms::getSsdw, assetMiniPrograms.getSsdw())
.eq(AssetMiniPrograms::getXcxmc, assetMiniPrograms.getXcxmc()).list(); .eq(AssetMiniPrograms::getXcxmc, assetMiniPrograms.getXcxmc()).list();
if (list1 != null&& !list1.isEmpty()){ if (list1 != null && !list1.isEmpty()) {
throw new ServiceException("不允许新增重复资产!"); throw new ServiceException("不允许新增重复资产!");
} }
if (assetMiniPrograms.getXzType() == 1) {
//单位端新增
AssetMiniProgramsZztbPo assetMiniProgramsZztbPo = new AssetMiniProgramsZztbPo();
BeanUtils.copyProperties(assetMiniPrograms, assetMiniProgramsZztbPo);
assetMiniProgramsZztbPo.setAuditState("1");
assetMiniProgramsZztbPo.setAuditYy(null);
assetMiniProgramsZztbService.save(assetMiniProgramsZztbPo);
} else {
//管理端新增
save(assetMiniPrograms); save(assetMiniPrograms);
AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo(); AssetMiniProgramsCpPo assetMiniProgramsCpPo = new AssetMiniProgramsCpPo();
BeanUtil.copyProperties(assetMiniPrograms, assetMiniProgramsCpPo); BeanUtil.copyProperties(assetMiniPrograms, assetMiniProgramsCpPo);
Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1"); Integer i = unitService.selectTaskId(assetMiniPrograms.getSsdw(), "1");
if (i != null) { if (i != null) {
assetMiniProgramsCpPo.setTaskId(i); assetMiniProgramsCpPo.setTaskId(i);
assetMiniProgramsCpPo.setXzType(1);
assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId()); assetMiniProgramsCpPo.setAssetId(assetMiniPrograms.getId());
assetMiniProgramsCpService.save(assetMiniProgramsCpPo); assetMiniProgramsCpService.save(assetMiniProgramsCpPo);
} }
}
return true; return true;
} }
@ -122,7 +138,6 @@ public class AssetMiniProgramsServiceImpl extends ServiceImpl<AssetMiniProgramsM
} }
updateById(assetMiniPrograms); updateById(assetMiniPrograms);
List<AssetMiniProgramsCpPo> list = assetMiniProgramsCpService.lambdaQuery() List<AssetMiniProgramsCpPo> list = assetMiniProgramsCpService.lambdaQuery()
.eq(AssetMiniProgramsCpPo::getAssetId, assetMiniPrograms.getId()).list(); .eq(AssetMiniProgramsCpPo::getAssetId, assetMiniPrograms.getId()).list();

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

@ -11,11 +11,15 @@ import com.ruoyi.tc.entity.Unit;
import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo; import com.ruoyi.tc.entity.po.AssetMiniProgramsCpPo;
import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo; import com.ruoyi.tc.entity.po.AssetOfficialAccountCpPo;
import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest; import com.ruoyi.tc.entity.request.AssetOfficialAccountPageRequest;
import com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo;
import com.ruoyi.tc.entity.zztb.AssetOfficialAccountZztbPo;
import com.ruoyi.tc.mapper.AssetOfficialAccountMapper; import com.ruoyi.tc.mapper.AssetOfficialAccountMapper;
import com.ruoyi.tc.service.AssetOfficialAccountCpService; import com.ruoyi.tc.service.AssetOfficialAccountCpService;
import com.ruoyi.tc.service.AssetOfficialAccountService; import com.ruoyi.tc.service.AssetOfficialAccountService;
import com.ruoyi.tc.service.AssetTaskService; import com.ruoyi.tc.service.AssetTaskService;
import com.ruoyi.tc.service.UnitService; import com.ruoyi.tc.service.UnitService;
import com.ruoyi.tc.zztbService.AssetOfficialAccountZztbService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -39,6 +43,10 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
@Resource @Resource
private AssetOfficialAccountCpService assetOfficialAccountCpService; private AssetOfficialAccountCpService assetOfficialAccountCpService;
@Resource
private AssetOfficialAccountZztbService assetOfficialAccountZztbService;
/** /**
* 分页查询所有数据 * 分页查询所有数据
* *
@ -127,6 +135,14 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
if (list == null || list.isEmpty()) { if (list == null || list.isEmpty()) {
throw new ServiceException("请选择已有单位!"); throw new ServiceException("请选择已有单位!");
} }
if (assetOfficialAccount.getXzType() == 1) {
//单位端新增
AssetOfficialAccountZztbPo assetOfficialAccountZztbPo = new AssetOfficialAccountZztbPo();
BeanUtils.copyProperties(assetOfficialAccount, assetOfficialAccountZztbPo);
assetOfficialAccountZztbPo.setAuditState("1");
assetOfficialAccountZztbPo.setAuditYy(null);
assetOfficialAccountZztbService.save(assetOfficialAccountZztbPo);
}else{
save(assetOfficialAccount); save(assetOfficialAccount);
AssetOfficialAccountCpPo a = new AssetOfficialAccountCpPo(); AssetOfficialAccountCpPo a = new AssetOfficialAccountCpPo();
BeanUtil.copyProperties(assetOfficialAccount, a); BeanUtil.copyProperties(assetOfficialAccount, a);
@ -136,6 +152,8 @@ public class AssetOfficialAccountServiceImpl extends ServiceImpl<AssetOfficialAc
a.setAssetId(assetOfficialAccount.getId()); a.setAssetId(assetOfficialAccount.getId());
assetOfficialAccountCpService.save(a); assetOfficialAccountCpService.save(a);
} }
}
return true; return true;
} }

45
ruoyi-admin/src/main/java/com/ruoyi/tc/service/impl/AssetTaskServiceImpl.java
Unescape View File

@ -16,9 +16,11 @@ import com.ruoyi.tc.entity.response.AssestTaskXqresponse;
import com.ruoyi.tc.entity.response.AssetTaskResponse; import com.ruoyi.tc.entity.response.AssetTaskResponse;
import com.ruoyi.tc.entity.response.AssetdwHcBlResponse; import com.ruoyi.tc.entity.response.AssetdwHcBlResponse;
import com.ruoyi.tc.entity.response.AssetdwHcResponse; import com.ruoyi.tc.entity.response.AssetdwHcResponse;
import com.ruoyi.tc.entity.zztb.AssetSjZztbPo;
import com.ruoyi.tc.historyService.*; import com.ruoyi.tc.historyService.*;
import com.ruoyi.tc.mapper.AssetTaskMapper; import com.ruoyi.tc.mapper.AssetTaskMapper;
import com.ruoyi.tc.service.*; import com.ruoyi.tc.service.*;
import com.ruoyi.tc.zztbService.AssetAssetSjZztbService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import javax.annotation.Resource; import javax.annotation.Resource;
@ -141,6 +143,19 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
private UnitOtherConcatHistoryService unitOtherConcatHistoryService; private UnitOtherConcatHistoryService unitOtherConcatHistoryService;
@Resource
private AssetAssetSjCpService assetAssetSjCpService;
@Resource
private AssetAssetSjZztbService assetAssetSjZztbService;
@Resource
private AssetAssetSjService assetAssetSjService;
/** /**
* 通过ID查询单条数据 * 通过ID查询单条数据
* *
@ -236,8 +251,21 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
unitOtherConcatCpPo.setTaskId(id); unitOtherConcatCpPo.setTaskId(id);
}); });
unitOtherConcatCpService.saveBatch(unitOtherConcatList); unitOtherConcatCpService.saveBatch(unitOtherConcatList);
//新增数据资产
List<AssetSj> assetSjZztbPoList = assetAssetSjService.lambdaQuery().eq(AssetSj::getAssetId,assetCurrentResponse.getId()).list();
List<AssetSjCpPo> assetSjCpPoList = assetSjZztbPoList.stream().map(cpPo -> {
AssetSjCpPo assetSjCpPo = new AssetSjCpPo();
BeanUtils.copyProperties(cpPo, assetSjCpPo); // 复制属性
assetSjCpPo.setSjId(null);
assetSjCpPo.setTaskId(id);
return assetSjCpPo; // 返回新对象
}).collect(Collectors.toList());
assetAssetSjCpService.saveBatch(assetSjCpPoList);
}); });
assetCurrentCpService.saveBatch(list); assetCurrentCpService.saveBatch(list);
} }
@ -401,6 +429,10 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, assetId).eq(AssetBasicNetworkCpPo::getDelFlag, "0").eq(AssetBasicNetworkCpPo::getTaskId, taskId).list()); byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, assetId).eq(AssetBasicNetworkCpPo::getDelFlag, "0").eq(AssetBasicNetworkCpPo::getTaskId, taskId).list());
byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, assetId).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, taskId).one()); byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, assetId).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, taskId).one());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, assetId).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, taskId).list()); byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, assetId).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, taskId).list());
byId.setSjzcList(assetAssetSjCpService.lambdaQuery().eq(AssetSjCpPo::getAssetId, assetId).eq(AssetSjCpPo::getDelFlag, "0").eq(AssetSjCpPo::getTaskId, taskId).list());
List<Acomma> a1 = new ArrayList<>(); List<Acomma> a1 = new ArrayList<>();
if (byId.getGlym() != null) { if (byId.getGlym() != null) {
Arrays.asList(byId.getGlym().split(",")).forEach(x -> { Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
@ -452,6 +484,8 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).eq(AssetBasicNetworkCpPo::getDelFlag, "0").eq(AssetBasicNetworkCpPo::getTaskId, byId.getTaskId()).list()); byId.setJcwlList(assetBasicNetworkCpService.lambdaQuery().eq(AssetBasicNetworkCpPo::getAssetId, byId.getId()).eq(AssetBasicNetworkCpPo::getDelFlag, "0").eq(AssetBasicNetworkCpPo::getTaskId, byId.getTaskId()).list());
byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, byId.getTaskId()).one()); byId.setXjgywxt(assetBusinessFormCpService.lambdaQuery().eq(AssetBusinessFormCpPo::getAssetId, byId.getId()).eq(AssetBusinessFormCpPo::getDelFlag, "0").eq(AssetBusinessFormCpPo::getTaskId, byId.getTaskId()).one());
byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, byId.getTaskId()).list()); byId.setOtherConcat(unitOtherConcatCpService.lambdaQuery().eq(UnitOtherConcatCpPo::getAssetId, byId.getId()).eq(UnitOtherConcatCpPo::getDelFlag, "0").eq(UnitOtherConcatCpPo::getTaskId, byId.getTaskId()).list());
byId.setSjzcList(assetAssetSjCpService.lambdaQuery().eq(AssetSjCpPo::getAssetId, byId.getId()).eq(AssetSjCpPo::getDelFlag, "0").eq(AssetSjCpPo::getTaskId, byId.getTaskId()).list());
List<Acomma> a1 = new ArrayList<>(); List<Acomma> a1 = new ArrayList<>();
if (byId.getGlym() != null) { if (byId.getGlym() != null) {
Arrays.asList(byId.getGlym().split(",")).forEach(x -> { Arrays.asList(byId.getGlym().split(",")).forEach(x -> {
@ -800,6 +834,9 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
assetSupplyChainCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId()); assetSupplyChainCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId());
unitOtherConcatCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId()); unitOtherConcatCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId());
assetBasicNetworkCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId()); assetBasicNetworkCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId());
assetAssetSjCpService.deletByAssetIdandTaskId(req.getAssetCurrentCpPo().getId(), req.getAssetCurrentCpPo().getTaskId());
StringBuilder a = new StringBuilder(); StringBuilder a = new StringBuilder();
if (CollectionUtil.isNotEmpty(req.getAssetCurrentCpPo().getGlymList())) { if (CollectionUtil.isNotEmpty(req.getAssetCurrentCpPo().getGlymList())) {
req.getAssetCurrentCpPo().getGlymList().forEach(x -> { req.getAssetCurrentCpPo().getGlymList().forEach(x -> {
@ -855,6 +892,14 @@ public class AssetTaskServiceImpl extends ServiceImpl<AssetTaskMapper, AssetTask
//新增其他联系人 //新增其他联系人
unitOtherConcatCpService.saveBatch(req.getAssetCurrentCpPo().getOtherConcat()); unitOtherConcatCpService.saveBatch(req.getAssetCurrentCpPo().getOtherConcat());
} }
if (CollectionUtil.isNotEmpty(req.getAssetCurrentCpPo().getSjzcList())) {
for (AssetSjCpPo items : req.getAssetCurrentCpPo().getSjzcList()) {
items.setAssetId(req.getAssetCurrentCpPo().getId());
items.setTaskId(req.getAssetCurrentCpPo().getTaskId());
}
//新增数据资产
assetAssetSjCpService.saveBatch(req.getAssetCurrentCpPo().getSjzcList());
}
//新增历史记录 //新增历史记录
// saveHistory(req, a, b, date, assetCurrentHistory); // saveHistory(req, a, b, date, assetCurrentHistory);
} }

27
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetAppZztbService.java
Unescape View File

@ -0,0 +1,27 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
/**
* 资产移动应用程序表(asset_app_cp_zztb)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetAppZztbService extends IService<AssetAppZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetAppZztbPo> getAuditList(Page<AssetAppZztbPo> page, AssetAuditPageRequest as);
}

16
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetAssetSjZztbService.java
Unescape View File

@ -0,0 +1,16 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.entity.zztb.AssetSjZztbPo;
/**
* 资产移动应用程序表(asset_app_cp_zztb)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetAssetSjZztbService extends IService<AssetSjZztbPo> {
}

16
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetBasicNetworkZztbService.java
Unescape View File

@ -0,0 +1,16 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetBasicNetworkJyPo;
import com.ruoyi.tc.entity.zztb.AssetBasicNetworkZztbPo;
/**
* 资产基础网络复制表(asset_basic_network_zztb)表服务接口
*
* @author makejava
* @since 2024-11-15 16:05:26
*/
public interface AssetBasicNetworkZztbService extends IService<AssetBasicNetworkZztbPo> {
}

18
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetBusinessFormZztbService.java
Unescape View File

@ -0,0 +1,18 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
import com.ruoyi.tc.entity.zztb.AssetBusinessFormZztbPo;
/**
* 资产新监管业务形态复制(asset_business_form_zztb)表服务接口
*
* @author makejava
* @since 2024-11-15 16:06:53
*/
public interface AssetBusinessFormZztbService extends IService<AssetBusinessFormZztbPo> {
}

26
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetCurrentZztbService.java
Unescape View File

@ -0,0 +1,26 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetCurrentZztbPo;
/**
* 现有资产表(AssetCurrent)表服务接口
*
* @author makejava
* @since 2024-11-15 10:04:03
*/
public interface AssetCurrentZztbService extends IService<AssetCurrentZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetCurrentZztbPo> getAuditList(Page<AssetCurrentZztbPo> page, AssetAuditPageRequest as);
}

24
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetEmailZztbService.java
Unescape View File

@ -0,0 +1,24 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetEmailZztbPo;
/**
* 电子邮件资产表(asset_email)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetEmailZztbService extends IService<AssetEmailZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetEmailZztbPo> getAuditList(Page<AssetEmailZztbPo> page, AssetAuditPageRequest as);
}

25
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetMiniProgramsZztbService.java
Unescape View File

@ -0,0 +1,25 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo;
/**
* 小程序资产(asset_mini_programs_zztb)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetMiniProgramsZztbService extends IService<AssetMiniProgramsZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetMiniProgramsZztbPo> getAuditList(Page<AssetMiniProgramsZztbPo> page, AssetAuditPageRequest as);
}

24
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetOfficialAccountZztbService.java
Unescape View File

@ -0,0 +1,24 @@
package com.ruoyi.tc.zztbService;
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.entity.zztb.AssetOfficialAccountZztbPo;
/**
* 公众号资产(asset_official_account_cp)表服务接口
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
public interface AssetOfficialAccountZztbService extends IService<AssetOfficialAccountZztbPo> {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
Page<AssetOfficialAccountZztbPo> getAuditList(Page<AssetOfficialAccountZztbPo> page, AssetAuditPageRequest as);
}

15
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/AssetSupplyChainZztbService.java
Unescape View File

@ -0,0 +1,15 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
import com.ruoyi.tc.entity.zztb.AssetSupplyChainZztbPo;
/**
* 资产供应链信息(asset_supply_chain)表服务接口
* @author makejava
* @since 2024-11-15 16:07:30
*/
public interface AssetSupplyChainZztbService extends IService<AssetSupplyChainZztbPo> {
}

15
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/UnitOtherConcatZztbservice.java
Unescape View File

@ -0,0 +1,15 @@
package com.ruoyi.tc.zztbService;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.tc.entity.po.UnitOtherConcatJyPo;
import com.ruoyi.tc.entity.zztb.UnitOtherConcatZztbPo;
/**
* 单位其他联系人复制(unit_other_contact_cp)业务层
* @author du
* @since 2024/11/13 14:55
*/
public interface UnitOtherConcatZztbservice extends IService<UnitOtherConcatZztbPo> {
}

34
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetAppZztbServiceImpl.java
Unescape View File

@ -0,0 +1,34 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetAppJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.mapper.zztb.AssetAppZztbMapper;
import com.ruoyi.tc.zztbService.AssetAppZztbService;
import org.springframework.stereotype.Service;
/**
* 资产移动应用程序表(asset_app_cp_zztb)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetAppZztbService")
public class AssetAppZztbServiceImpl extends ServiceImpl<AssetAppZztbMapper, AssetAppZztbPo> implements AssetAppZztbService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetAppZztbPo> getAuditList(Page<AssetAppZztbPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetAssetSjZztbServiceImpl.java
Unescape View File

@ -0,0 +1,22 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.zztb.AssetAppZztbPo;
import com.ruoyi.tc.entity.zztb.AssetSjZztbPo;
import com.ruoyi.tc.mapper.zztb.AssetAppZztbMapper;
import com.ruoyi.tc.mapper.zztb.AssetAssetSjZztbMapper;
import com.ruoyi.tc.zztbService.AssetAppZztbService;
import com.ruoyi.tc.zztbService.AssetAssetSjZztbService;
import org.springframework.stereotype.Service;
/**
* 资产移动应用程序表(asset_sjzc_cp_zztb)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetAssetSjZztbService")
public class AssetAssetSjZztbServiceImpl extends ServiceImpl<AssetAssetSjZztbMapper, AssetSjZztbPo> implements AssetAssetSjZztbService {
}

19
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetBasicNetworkZztbServiceImpl.java
Unescape View File

@ -0,0 +1,19 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.zztb.AssetBasicNetworkZztbPo;
import com.ruoyi.tc.mapper.zztb.AssetBasicNetWorkZztbMapper;
import com.ruoyi.tc.zztbService.AssetBasicNetworkZztbService;
import org.springframework.stereotype.Service;
/**
* 资产基础网络复制表(AssetBasicNetworkCpResponse)表服务实现类
*
* @author makejava
* @since 2024-11-15 16:05:26
*/
@Service("assetBasicNetworkZztbService")
public class AssetBasicNetworkZztbServiceImpl extends ServiceImpl<AssetBasicNetWorkZztbMapper, AssetBasicNetworkZztbPo> implements AssetBasicNetworkZztbService {
}

23
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetBusinessFormZztbServiceImpl.java
Unescape View File

@ -0,0 +1,23 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetBusinessFormJyPo;
import com.ruoyi.tc.entity.zztb.AssetBusinessFormZztbPo;
import com.ruoyi.tc.mapper.AssetBusinessFormJyMapper;
import com.ruoyi.tc.mapper.zztb.AssetBusinessFormZztbMapper;
import com.ruoyi.tc.service.AssetBusinessFormJyService;
import com.ruoyi.tc.zztbService.AssetBusinessFormZztbService;
import org.springframework.stereotype.Service;
/**
* 资产新监管业务形态复制(AssetBusinessFormCp)表服务实现类
*
* @author makejava
* @since 2024-11-15 16:06:53
*/
@Service("assetBusinessFormZztbService")
public class AssetBusinessFormZztbServiceImpl extends ServiceImpl<AssetBusinessFormZztbMapper, AssetBusinessFormZztbPo> implements AssetBusinessFormZztbService {
}

36
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetCurrentZztbServiceImpl.java
Unescape View File

@ -0,0 +1,36 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetCurrentJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetCurrentZztbPo;
import com.ruoyi.tc.mapper.AssetCurrentJyMapper;
import com.ruoyi.tc.mapper.zztb.AssetCurrentZztbMapper;
import com.ruoyi.tc.service.AssetCurrentJyService;
import com.ruoyi.tc.zztbService.AssetCurrentZztbService;
import org.springframework.stereotype.Service;
/**
* 现有资产复制表(AssetCurrentResponse)表服务实现类
*
* @author makejava
* @since 2024-11-15 10:04:03
*/
@Service("assetCurrentZztbService")
public class AssetCurrentZztbServiceImpl extends ServiceImpl<AssetCurrentZztbMapper, AssetCurrentZztbPo> implements AssetCurrentZztbService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetCurrentZztbPo> getAuditList(Page<AssetCurrentZztbPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

34
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetEmailZztbServiceImpl.java
Unescape View File

@ -0,0 +1,34 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetEmailJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetEmailZztbPo;
import com.ruoyi.tc.mapper.AssetEmailJyMapper;
import com.ruoyi.tc.mapper.zztb.AssetEmailZztbMapper;
import com.ruoyi.tc.service.AssetEmailJyService;
import com.ruoyi.tc.zztbService.AssetEmailZztbService;
import org.springframework.stereotype.Service;
/**
* 电子邮件资产表(asset_email)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetEmailZztbService")
public class AssetEmailZztbServiceImpl extends ServiceImpl<AssetEmailZztbMapper, AssetEmailZztbPo> implements AssetEmailZztbService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetEmailZztbPo> getAuditList(Page<AssetEmailZztbPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

32
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetMiniProgramsZztbServiceImpl.java
Unescape View File

@ -0,0 +1,32 @@
package com.ruoyi.tc.zztbService.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.entity.zztb.AssetMiniProgramsZztbPo;
import com.ruoyi.tc.mapper.zztb.AssetMiniProgramsZztbMapper;
import com.ruoyi.tc.zztbService.AssetMiniProgramsZztbService;
import org.springframework.stereotype.Service;
/**
* 小程序资产(asset_mini_programs_cp)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetMiniProgramsZztbService")
public class AssetMiniProgramsZztbServiceImpl extends ServiceImpl<AssetMiniProgramsZztbMapper, AssetMiniProgramsZztbPo> implements AssetMiniProgramsZztbService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetMiniProgramsZztbPo> getAuditList(Page<AssetMiniProgramsZztbPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page, as);
}
}

33
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetOfficialAccountZztbServiceImpl.java
Unescape View File

@ -0,0 +1,33 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetOfficialAccountJyPo;
import com.ruoyi.tc.entity.request.AssetAuditPageRequest;
import com.ruoyi.tc.entity.zztb.AssetOfficialAccountZztbPo;
import com.ruoyi.tc.mapper.AssetOfficialAccountJyMapper;
import com.ruoyi.tc.mapper.zztb.AssetOfficialAccountZztbMapper;
import com.ruoyi.tc.service.AssetOfficialAccountJyService;
import com.ruoyi.tc.zztbService.AssetOfficialAccountZztbService;
import org.springframework.stereotype.Service;
/**
* 公众号资产(asset_official_account_cp)表服务实现类
*
* @author makejava
* @since 2024-11-28 17:13:07
*/
@Service("assetOfficialAccountZztbService")
public class AssetOfficialAccountZztbServiceImpl extends ServiceImpl<AssetOfficialAccountZztbMapper, AssetOfficialAccountZztbPo> implements AssetOfficialAccountZztbService {
/**
* 分页查询管理端或者单位端审核列表
*
* @param as 查询实体
* @return 所有数据
*/
@Override
public Page<AssetOfficialAccountZztbPo> getAuditList(Page<AssetOfficialAccountZztbPo> page, AssetAuditPageRequest as) {
return baseMapper.getAuditList(page,as);
}
}

22
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/AssetSupplyChainZztbServiceImpl.java
Unescape View File

@ -0,0 +1,22 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.po.AssetSupplyChainJyPo;
import com.ruoyi.tc.entity.zztb.AssetSupplyChainZztbPo;
import com.ruoyi.tc.mapper.AssetSupplyChainJyMapper;
import com.ruoyi.tc.mapper.zztb.AssetSupplyChainZztbMapper;
import com.ruoyi.tc.service.AssetSupplyChainJyService;
import com.ruoyi.tc.zztbService.AssetSupplyChainZztbService;
import org.springframework.stereotype.Service;
/**
* 资产供应链信息表复制(AssetSupplyChainCpResponse)表服务实现类
*
* @author makejava
* @since 2024-11-15 16:07:30
*/
@Service("assetSupplyChainZztbService")
public class AssetSupplyChainZztbServiceImpl extends ServiceImpl<AssetSupplyChainZztbMapper, AssetSupplyChainZztbPo> implements AssetSupplyChainZztbService {
}

19
ruoyi-admin/src/main/java/com/ruoyi/tc/zztbService/impl/UnitOtherConcatZztbServiceImpl.java
Unescape View File

@ -0,0 +1,19 @@
package com.ruoyi.tc.zztbService.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.tc.entity.zztb.UnitOtherConcatZztbPo;
import com.ruoyi.tc.mapper.zztb.UnitOtherConcatZztbMapper;
import com.ruoyi.tc.zztbService.AssetSupplyChainZztbService;
import com.ruoyi.tc.zztbService.UnitOtherConcatZztbservice;
import org.springframework.stereotype.Service;
/**
* 单位其他联系人复制(unit_other_contact_cp)业务处理层
*
* @author du
* @since 2024/11/13 14:58
*/
@Service("unitOtherConcatZztbservice")
public class UnitOtherConcatZztbServiceImpl extends ServiceImpl<UnitOtherConcatZztbMapper, UnitOtherConcatZztbPo> implements UnitOtherConcatZztbservice {
}

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

@ -14,6 +14,7 @@
<if test="req.auditState!=null"> <if test="req.auditState!=null">
and a.audit_state =#{req.auditState} and a.audit_state =#{req.auditState}
</if> </if>
or xz_type=1
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>

21
ruoyi-admin/src/main/resources/mapper/AssetAppZztbMapper.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.zztb.AssetAppZztbMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.zztb.AssetAppZztbPo">
select a.* from asset_app_zztb 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>

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

@ -14,6 +14,7 @@
<if test="req.auditState!=null"> <if test="req.auditState!=null">
and a.audit_state =#{req.auditState} and a.audit_state =#{req.auditState}
</if> </if>
or xz_type=1
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>

20
ruoyi-admin/src/main/resources/mapper/AssetCurrentZztbMapper.xml
Unescape View File

@ -0,0 +1,20 @@
<?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.zztb.AssetCurrentZztbMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.zztb.AssetCurrentZztbPo">
select a.* from asset_current_zztb a
<where>
<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>

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

@ -14,6 +14,7 @@
<if test="req.auditState!=null"> <if test="req.auditState!=null">
and a.audit_state =#{req.auditState} and a.audit_state =#{req.auditState}
</if> </if>
or xz_type=1
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>

21
ruoyi-admin/src/main/resources/mapper/AssetEmailZztbMapper.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.zztb.AssetEmailZztbMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.zztb.AssetEmailZztbPo">
select a.* from asset_email_zztb 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>

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

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-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"> <!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"> <mapper namespace="com.ruoyi.tc.mapper.AssetMiniProgramsJyMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo"> <select id="getAuditList" resultType="com.ruoyi.tc.entity.zztb.AssetMiniProgramsZztbPo">
select a.* from asset_mini_programs_cp a select a.* from asset_mini_programs_cp a
<where> <where>
a.task_id is null a.task_id is null
@ -14,6 +14,7 @@
<if test="req.auditState!=null"> <if test="req.auditState!=null">
and a.audit_state = #{req.auditState} and a.audit_state = #{req.auditState}
</if> </if>
or xz_type=1
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>

21
ruoyi-admin/src/main/resources/mapper/AssetMiniProgramsZztbMapper.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.zztb.AssetMiniProgramsZztbMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.po.AssetMiniProgramsJyPo">
select a.* from asset_mini_programs_zztb 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>

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

@ -14,6 +14,7 @@
<if test="req.auditState!=null"> <if test="req.auditState!=null">
and a.audit_state =#{req.auditState} and a.audit_state =#{req.auditState}
</if> </if>
or xz_type=1
</where> </where>
order by a.create_time desc order by a.create_time desc
</select> </select>

21
ruoyi-admin/src/main/resources/mapper/AssetOfficialAccountZztbMapper.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.zztb.AssetOfficialAccountZztbMapper">
<select id="getAuditList" resultType="com.ruoyi.tc.entity.zztb.AssetOfficialAccountZztbPo">
select a.* from asset_official_account_zztb 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/AssetSjzc.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetAssetSjMapper">
<delete id="deleteByAssetIds">
delete from asset_sjzc where asset_id = #{id}
</delete>
</mapper>
Write Preview
Loading…
Cancel
Save