main
杜函宇 2 months ago
parent a8be580801
commit 1ad9a97ab9

@ -94,7 +94,7 @@ public class AssetCurrentController extends BaseController {
@ApiOperation(value = "新增数据")
@PostMapping
@Transactional(rollbackFor = Exception.class)
public AjaxResult insert(@RequestBody @Valid AssetCurrent assetCurrent) {
public AjaxResult insert(@RequestBody AssetCurrent assetCurrent) {
assetCurrentService.save(assetCurrent);
//新增新监管业务形态
if (assetCurrent.getXjgywxt() != null) {
@ -166,17 +166,17 @@ public class AssetCurrentController extends BaseController {
/**
*
*
* @param idList
* @param id
* @return
*/
@ApiOperation(value = "删除数据")
@DeleteMapping
public AjaxResult delete(@RequestParam("idList") List<Long> idList) {
assetSupplyChainService.deleteByAssetIds(idList);
assetBasicNetworkService.deleteByAssetIds(idList);
assetBusinessFormService.deleteByAssetIds(idList);
unitOtherConcatService.deleteByAssetIds(idList);
assetCurrentService.deleteByUnitIds(idList);
@DeleteMapping("/{id}")
public AjaxResult delete(@PathVariable Long id) {
assetSupplyChainService.deleteByAssetIds(id);
assetBasicNetworkService.deleteByAssetIds(id);
assetBusinessFormService.deleteByAssetIds(id);
unitOtherConcatService.deleteByAssetIds(id);
assetCurrentService.deleteByUnitIds(id);
return success();
}
@ -207,6 +207,14 @@ public class AssetCurrentController extends BaseController {
AssetSupplyChain jsdw = assetSupplyChainService.getJsdw(x.getId());
BeanUtil.copyProperties(jsdw, assetExport);
//查找对应的系统运营单位
AssetSupplyChain yydw = assetSupplyChainService.getYydw(x.getId());
assetExport.setGyszcdz1(yydw.getGyszcdz());
assetExport.setLxr1(yydw.getLxr());
assetExport.setLxdh1(yydw.getLxdh());
assetExport.setSfwtc1(yydw.getSfwtc());
assetExport.setName1(yydw.getName());
assetExport.setTyshxydm1(yydw.getTyshxydm());
List<AssetBasicNetwork> byList = assetBasicNetworkService.getByAssetId(x.getId());
for (AssetBasicNetwork items : byList) {
if (items.getType() == 1) {
@ -257,6 +265,17 @@ public class AssetCurrentController extends BaseController {
s1.setType(5);
s1.setAssetId(as.getId());
assetSupplyChainService.save(s1);
//新增系统运营单位
AssetSupplyChain b6 = new AssetSupplyChain();
b6.setGyszcdz(items.getGyszcdz1());
b6.setLxr(items.getLxr1());
b6.setLxdh(items.getLxdh1());
b6.setSfwtc(items.getSfwtc1());
b6.setName(items.getName1());
b6.setTyshxydm(items.getTyshxydm1());
b6.setType(7);
b6.setAssetId(as.getId());
assetSupplyChainService.save(b6);
//新增服务器信息
AssetBasicNetwork a1 = new AssetBasicNetwork();
BeanUtil.copyProperties(items, a1);

@ -129,7 +129,7 @@ public class UnitController {
@Log(title = "用户管理", businessType = BusinessType.UPDATE)
@PutMapping
@Transactional(rollbackFor = Exception.class)
public AjaxResult edit(@Valid @RequestBody Unit x) {
public AjaxResult edit(@RequestBody Unit x) {
Unit byId = unitService.getById(x.getId());
if (!byId.getUserName().equals(x.getUserName()) || !byId.getNickName().equals(x.getNickName())) {
throw new ServiceException("不允许修改单位名称和统一信用代码!");
@ -155,14 +155,14 @@ public class UnitController {
*/
@ApiOperation(value = "删除单位")
@Log(title = "删除单位", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable List<Long> ids) {
List<String> userNames = unitService.selectByIds(ids);
@DeleteMapping("/{id}")
public AjaxResult remove(@PathVariable Long id) {
List<String> userNames = unitService.selectByIds(id);
//逻辑删除单位和用户
unitService.deleteUsers(userNames);
unitService.deleteUnits(ids);
unitOtherConcatService.deleteByUnitIds(ids);
examineInfoService.deleteByUnitIds(ids);
unitService.deleteUnits(id);
unitOtherConcatService.deleteByUnitIds(id);
examineInfoService.deleteByUnitIds(id);
return AjaxResult.success();
}
}

@ -109,6 +109,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* ip,
*/
// @Excel(name ="关联资产(多个资产用逗号隔开,例如{\"ipv4\"",sort = 7,width = 60)
@Excel(name ="关联资产(多个资产用逗号隔开,例如\n{\"ipv4\":[\"1.1.1.1:8080\",\"2.2.2.2:8080\"],\"ipv6\":\n[\"fe80::ec3e:9cff:fe25:687b\",\"de71::ec3e:9cff:fe25:687b\"]}",sort = 7,width = 60)
@Size(max= 500,message="关联ip长度不能超过500")
@ApiModelProperty("关联ip多个用,分隔)")
@ -130,6 +131,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
*
*/
@NotNull
// @Excel(name = "是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10)
@Excel(name = "*是否关基系统",dictType = "is_no",comboReadDict = true,sort = 10)
@ApiModelProperty("是否关基系统(字典)")
private String gjxt;
@ -173,6 +175,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
*
*/
// @Excel(name = "系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36)
@Excel(name = "*系统状态",dictType = "zc_xtzt",comboReadDict = true,sort = 36)
@NotNull
@ApiModelProperty("系统状态(字典)")
@ -232,6 +235,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* ,
*/
// @Excel(width = 60,name = "系统特征(多选,多个特征用逗号隔开。选项为",sort = 52)
@Excel(width = 60,name = "系统特征多选多个特征用逗号隔开。选项为党政机关门户网站、重点新闻网站大型网络平台系统业务覆盖单个地市级行政区30%以上人口的工作、生活系统业务覆盖10万人以上用水、用电、用气、用油、取暖或交通出行存储超过5万人以上个人敏感信息存储超过100万条以上地理、人口、资源等国家基础数据",sort = 52)
@ApiModelProperty("系统特征(,分隔)")
private String xttz;
@ -274,7 +278,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
*
*/
@Excel(name = "云服务商名称(“是否部署云平台”选择“是”必须填写,选择\n“否”则无需填写)",sort = 57,width = 45)
@Excel(name = "云服务商名称(“是否部署云平台”选择“是”必须填写,选择“否”则无需填写)",sort = 57,width = 45)
@Size(max= 100,message="云服务商名称长度不能超过100")
@ApiModelProperty("云服务商名称")
private String yfwsmc;
@ -483,6 +487,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* ICP-ICP
*/
// @Excel(name = "ICP备案编号",sort = 25,width = 46)
@Excel(name = "ICP备案编号ICP备案状态选择为是则必填",sort = 25,width = 46)
@NotBlank
@Size(max= 50,message="ICP备案信息-ICP备案编号长度不能超过50")
@ -669,6 +674,7 @@ public class AssetCurrent extends BaseClass implements Serializable {
/**
* -
*/
// @Excel(name = "是否有第三方测评",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
@ApiModelProperty("等保信息-是否有第三方测评")
@NotNull
@Excel(name = "是否有第三方测评(是否是等保系统选择是则必填)",width = 45,dictType = "is_no",comboReadDict = true,sort = 45)
@ -793,18 +799,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
@ApiModelProperty("密评信息-密评得分")
private String mpMpdf;
// /**
// * 供应链信息(id集合逗号分隔)
// */
// @Size(max= 255,message="供应链信息长度不能超过255")
// @ApiModelProperty("供应链信息(id集合逗号分隔)")
// private String gylxx;
// /**
// * 基础网络(id集合逗号分隔
// */
// @Size(max= 255,message="基础网络长度不能超过255")
// @ApiModelProperty("基础网络(id集合逗号分隔")
// private String jcwl;
/**
*
*/

@ -43,6 +43,37 @@ public class AssetExport extends AssetCurrent{
@Excel(name = "*系统建设单位注册地址是否为太仓",width=26,sort = 70,dictType = "is_no",comboReadDict = true)
private String sfwtc;
/**
*
*/
@Excel(name = "*系统运营单位名称",width=26,sort = 71)
private String name1;
/**
*
*/
@Excel(name = "*系统运营单位统一信用代码",width=26,sort = 72)
private String tyshxydm1;
/**
*
*/
@Excel(name = "*系统运营单位联系人",width=26,sort = 73)
private String lxr1;
/**
*
*/
@Excel(name = "*系统运营单位联系电话",width=26,sort = 74)
private String lxdh1;
/**
*
*/
@Excel(name = "*系统运营单位供应商注册地址",width=26,sort = 75)
private String gyszcdz1;
/**
*
*/
@Excel(name = "*系统运营单位注册地址是否为太仓",width=26,sort = 76,dictType = "is_no",comboReadDict = true)
private String sfwtc1;
/**
*
*/

@ -32,9 +32,9 @@ public class AssetSupplyChain extends BaseClass implements Serializable {
@ApiModelProperty("资产id")
private Long assetId;
/**
* 1.2.3.4.5.6.
* 1.2.3.4.5.6. 7
*/
@ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位")
@ApiModelProperty("1.测评单位2.硬件供应商单位3.机房运维单位4.系统设计单位5.系统建设单位6.安全服务单位 7系统运营单位")
private Integer type;
/**
*

@ -25,7 +25,7 @@ public class AssetCurrentPageRequest {
*
*/
@ApiModelProperty("系统类型(字典)")
private Integer xtlx;
private String xtlx;
/**
*
@ -37,7 +37,7 @@ public class AssetCurrentPageRequest {
*
*/
@ApiModelProperty("系统状态(字典)")
private Integer xtzt;
private String xtzt;
/**
*

@ -17,8 +17,8 @@ public class UnitRequest {
@ApiModelProperty("单位名称")
private String nickName;
@ApiModelProperty("单位类型,传字典数字")
private Integer dwlx;
@ApiModelProperty("单位类型,传字典")
private String dwlx;
@ApiModelProperty("页码")
private Long current=1L;

@ -20,7 +20,7 @@ public interface AssetBasicNetWorkMapper extends BaseMapper<AssetBasicNetwork> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
}

@ -15,6 +15,6 @@ public interface AssetBusinessFormMapper extends BaseMapper<AssetBusinessForm> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
}

@ -31,6 +31,6 @@ public interface AssetCurrentMapper extends BaseMapper<AssetCurrent> {
/**
*
*/
void deleteByUnitIds(List<Long> idList);
void deleteByUnitIds(Long id);
}

@ -22,6 +22,11 @@ public interface AssetSupplyChainMapper extends BaseMapper<AssetSupplyChain> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
/**
* id
*/
AssetSupplyChain getYydw(Long id);
}

@ -17,7 +17,7 @@ public interface ExamineInfoMapper extends BaseMapper<ExamineInfo> {
/**
*
*/
void deleteByUnitIds(List<Long> idList);
void deleteByUnitIds(Long id);
}

@ -34,12 +34,12 @@ public interface UnitMapper extends BaseMapper<Unit> {
/**
* id
*/
List<String> selectByIds(List<Long> ids);
List<String> selectByIds(Long id);
/**
*
*/
void deleteUnits(List<Long> ids);
void deleteUnits(Long id);
/**
*

@ -14,10 +14,10 @@ public interface UnitOtherConcatMapper extends BaseMapper<UnitOtherConcat>
/**
* unitId
*/
void deleteByUnitIds(List<Long> idList);
void deleteByUnitIds(Long id);
/**
* assetId
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
}

@ -22,5 +22,5 @@ public interface AssetBasicNetworkService extends IService<AssetBasicNetwork> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
}

@ -16,6 +16,6 @@ public interface AssetBusinessFormService extends IService<AssetBusinessForm> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
}

@ -44,6 +44,6 @@ public interface AssetCurrentService extends IService<AssetCurrent> {
/**
*
*/
void deleteByUnitIds(List<Long> idList);
void deleteByUnitIds(Long id);
}

@ -21,5 +21,10 @@ public interface AssetSupplyChainService extends IService<AssetSupplyChain> {
/**
*
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
/**
* id
*/
AssetSupplyChain getYydw(Long id);
}

@ -16,5 +16,5 @@ public interface ExamineInfoService extends IService<ExamineInfo> {
/**
*
*/
void deleteByUnitIds(List<Long> idList);
void deleteByUnitIds(Long id);
}

@ -16,10 +16,10 @@ public interface UnitOtherConcatService extends IService<UnitOtherConcat> {
/**
* assetId
*/
void deleteByAssetIds(List<Long> idList);
void deleteByAssetIds(Long id);
/**
* unitId
*/
void deleteByUnitIds(List<Long> ids);
void deleteByUnitIds(Long id);
}

@ -45,7 +45,7 @@ public interface UnitService extends IService<Unit> {
/**
* id
*/
List<String> selectByIds(List<Long> ids);
List<String> selectByIds(Long id);
/**
*
@ -54,5 +54,5 @@ public interface UnitService extends IService<Unit> {
/**
*
*/
void deleteUnits(List<Long> ids);
void deleteUnits(Long id);
}

@ -29,7 +29,7 @@ public class AssetBasicNetworkServiceImpl extends ServiceImpl<AssetBasicNetWorkM
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
public void deleteByAssetIds(Long id) {
baseMapper.deleteByAssetIds(id);
}
}

@ -21,8 +21,8 @@ public class AssetBusinessFormServiceImpl extends ServiceImpl<AssetBusinessFormM
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
public void deleteByAssetIds(Long id) {
baseMapper.deleteByAssetIds(id);
}
}

@ -75,8 +75,8 @@ public class AssetCurrentServiceImpl extends ServiceImpl<AssetCurrentMapper, Ass
*
*/
@Override
public void deleteByUnitIds(List<Long> idList) {
baseMapper.deleteByUnitIds(idList);
public void deleteByUnitIds(Long id) {
baseMapper.deleteByUnitIds(id);
}
}

@ -30,7 +30,15 @@ public class AssetSupplyChainServiceImpl extends ServiceImpl<AssetSupplyChainMap
*
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
public void deleteByAssetIds(Long id) {
baseMapper.deleteByAssetIds(id);
}
/**
* id
*/
@Override
public AssetSupplyChain getYydw(Long id) {
return baseMapper.getYydw(id);
}
}

@ -24,7 +24,7 @@ public class ExamineInfoServiceImpl extends ServiceImpl<ExamineInfoMapper, Exami
*
*/
@Override
public void deleteByUnitIds(List<Long> idList) {
baseMapper.deleteByUnitIds(idList);
public void deleteByUnitIds(Long id) {
baseMapper.deleteByUnitIds(id);
}
}

@ -20,14 +20,14 @@ public class UnitOtherConcatServiceImpl extends ServiceImpl<UnitOtherConcatMapp
* assetId
*/
@Override
public void deleteByAssetIds(List<Long> idList) {
baseMapper.deleteByAssetIds(idList);
public void deleteByAssetIds(Long id) {
baseMapper.deleteByAssetIds(id);
}
/**
* unitId
*/
@Override
public void deleteByUnitIds(List<Long> ids) {
baseMapper.deleteByUnitIds(ids);
public void deleteByUnitIds(Long id) {
baseMapper.deleteByUnitIds(id);
}
}

@ -81,8 +81,8 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
* id
*/
@Override
public List<String> selectByIds(List<Long> ids) {
return baseMapper.selectByIds(ids);
public List<String> selectByIds(Long id) {
return baseMapper.selectByIds(id);
}
/**
*
@ -96,8 +96,8 @@ public class UnitServiceImpl extends ServiceImpl<UnitMapper, Unit> implements Un
*
*/
@Override
public void deleteUnits(List<Long> ids) {
baseMapper.deleteUnits(ids);
public void deleteUnits(Long id) {
baseMapper.deleteUnits(id);
}
}

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

@ -3,10 +3,7 @@
<mapper namespace="com.ruoyi.tc.mapper.AssetBusinessFormMapper">
<update id="deleteByAssetIds">
update asset_business_form set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
update asset_business_form set del_flag = '2' where asset_id = #{id}
</update>
</mapper>

@ -1,7 +1,7 @@
<?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">
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetCurrentMapper">
@ -15,11 +15,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="req.dwmc!=null and req.dwmc!='' ">
and dwmc like concat('%',#{req.dwmc},'%')
</if>
<if test="req.xtmc!=null">
and xtlx = #{req.xtmc}
<if test="req.xtlx!=null">
and xtlx = #{req.xtlx}
</if>
<if test="req.xtzt!=null">
and xtzt = #{req.xtmc}
and xtzt = #{req.xtzt}
</if>
<if test="req.startTime != null ">
and create_time &gt;= #{req.startTime}
@ -31,9 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<update id="deleteByUnitIds">
update asset_current set del_flag = '2' where id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
update asset_current
set del_flag = '2'
where id = #{id}
</update>
</mapper>

@ -2,10 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.tc.mapper.AssetSupplyChainMapper">
<update id="deleteByAssetIds">
update asset_supply_chain set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
update asset_supply_chain set del_flag = '2' where asset_id = #{id}
</update>
<select id="getJsdw" resultType="com.ruoyi.tc.entity.AssetSupplyChain">
@ -15,5 +12,12 @@
order by create_time asc
limit 1
</select>
<select id="getYydw" resultType="com.ruoyi.tc.entity.AssetSupplyChain">
select *
from asset_supply_chain
where asset_id = #{id} and type = 7
order by create_time asc
limit 1
</select>
</mapper>

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

@ -11,7 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="dwjc" column="dwjc"/>
<result property="ssqyprovince" column="ssqyprovince"/>
<result property="ssqycity" column="ssqycity"/>
<result property="ssqycity" column="ssqycity"/>
<result property="ssqycounty" column="ssqycounty"/>
<result property="dwxxdz" column="dwxxdz"/>
<result property="sshy" column="sshy"/>
<result property="dwlx" column="dwlx"/>
@ -107,16 +107,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectByIds" resultType="java.lang.String">
select user_name from unit_info where id in
<foreach collection="ids" item="id" open="(" separator="," close=")">
#{id}
</foreach>
select user_name from unit_info where id = #{id}
</select>
<update id="deleteUnits">
update unit_info set del_flag = '2' where id in
<foreach collection="array" item="ids" open="(" separator="," close=")">
#{ids}
</foreach>
update unit_info set del_flag = '2' where id = #{id}
</update>
<update id="deleteUsers">
update sys_user set del_flag = '2' where user_name in

@ -5,15 +5,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<mapper namespace="com.ruoyi.tc.mapper.UnitOtherConcatMapper">
<update id="deleteByUnitIds">
update asset_supply_chain set del_flag = '2' where unit_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
update asset_supply_chain set del_flag = '2' where unit_id = #{id}
</update>
<update id="deleteByAssetIds">
update asset_supply_chain set del_flag = '2' where asset_id in
<foreach collection="idList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
update asset_supply_chain set del_flag = '2' where asset_id = #{id}
</update>
</mapper>
Loading…
Cancel
Save