FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_20230829_change' into dev_20230829_change

Browse Source
This commit is contained in:
wxyclub
2023-11-26 12:43:36 +08:00
parent b43b4fe103 94352fdfaa
commit f872bfc89a
17 changed files with 165 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/scheduled/dao/SarStandardInfoDao.java
+1
View File
@@ -15,4 +15,5 @@ public interface SarStandardInfoDao{
public int updateStandardInfo(@Param("id")String id, @Param("textStatus") String textStatus);
int deleteStandSystem(@Param("menuName") String menuName);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/ISarBussStandMenuService.java
+4
View File
@@ -18,4 +18,8 @@ public interface ISarBussStandMenuService extends IService<SarBussStandMenu> {
List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO);
int deleteByMenuId (SarBussStandMenu sarStandMenuEO);
void deleteStandSystemByStandId(String id);
void addStandSystemRelation(String standSystemId, String id);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussStandMenu/service/impl/SarBussStandMenuServiceImpl.java
+28
View File
@@ -1,15 +1,20 @@
package com.adc.da.slrs.sarBussStandMenu.service.impl;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
@@ -30,6 +35,7 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl<SarBussStandMenuDao
@Autowired
private ISarMenuStandardService iSarMenuStandardService;
public int deleteByMenuId (SarBussStandMenu sarStandMenuEO){
String treeType = sarStandMenuEO.getTreeType();
List<String> menuIds = new ArrayList<>();
@@ -42,6 +48,28 @@ public class SarBussStandMenuServiceImpl extends ServiceImpl<SarBussStandMenuDao
return this.baseMapper.deleteByMenuId(sarStandMenuEO);
}
@Override
public void deleteStandSystemByStandId(String id) {
LambdaUpdateWrapper<SarBussStandMenu> sarStandMenuWrapper = new LambdaUpdateWrapper<>();
sarStandMenuWrapper.eq(SarBussStandMenu::getBussStandId, id);
remove(sarStandMenuWrapper);
}
@Override
public void addStandSystemRelation(String standSystem, String id) {
// 校验standSystem是否有效
SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem);
if (standMenu == null) {
throw new AdcDaBaseException("无效的标准体系");
}
SarBussStandMenu sarBussStandMenu = new SarBussStandMenu();
// 生成不带横杠的UUID
sarBussStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", ""));
sarBussStandMenu.setBussStandId(id).setMenuId(standSystem).setValidFlag(0);
save(sarBussStandMenu);
}
@Override
public List<SarBussStandMenu> selectAllMenuByStandId(SarBussStandMenu sarStandMenuEO){
return this.baseMapper.selectAllMenuByStandId(sarStandMenuEO);
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+12
View File
@@ -1,6 +1,7 @@
package com.adc.da.slrs.sarBussionessStand.controller;
import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.ZipUtil;
import com.adc.da.Log.BusinessType;
import com.adc.da.Log.EpcLog;
@@ -11,6 +12,7 @@ import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.slrs.esRevisePlan.entity.EsRevisePlanInfo;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandAttrInfo.entity.SarBussStandAttrInfo;
import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
@@ -52,6 +54,7 @@ import io.swagger.annotations.Api;
import com.adc.da.base.web.BaseController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.*;
@@ -105,6 +108,9 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@Autowired
private AttFileEOServiceImpl attFileEOService;
@Resource
private ISarBussStandMenuService sarBussStandMenuService;
/**
* 根据计划库制定状态查询企标编号
*
@@ -229,6 +235,12 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
//401问题2021-03-31暂时注释掉 liuhuiwen
// @RequiresPermissions("lawss:sarBussionessStand:updateSarBussionessStand")
public ResponseMessage<SarBussionessStand> updateSarBussionessStand(@RequestBody SarBussionessStand sarBussionessStandEO) throws Exception {
// 标准体系
String standSystemId = sarBussionessStandEO.getTxlbId();
sarBussStandMenuService.deleteStandSystemByStandId(sarBussionessStandEO.getId());
if (StrUtil.isNotBlank(standSystemId)) {
sarBussStandMenuService.addStandSystemRelation(standSystemId, sarBussionessStandEO.getId());
}
//校验编号和名称是否存在
QueryWrapper<SarBussionessStand> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(null!=sarBussionessStandEO.getStandCode(),"STAND_CODE",sarBussionessStandEO.getStandCode())
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+2
View File
@@ -141,5 +141,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
String selectMaxStandSn(String standSort);
List<StandSystemDTO> getESSystemData(@Param("param") StandSystemDTO standSystemDTO);
void deleteStandSystem(String menuName);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+1
View File
@@ -49,6 +49,7 @@ import com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandState;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandardNew.java
+2
View File
@@ -7,6 +7,7 @@ import com.adc.da.sys.utils.treetool.annotation.TreeNodeParentId;
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -30,6 +31,7 @@ import java.util.List;
@EqualsAndHashCode(callSuper = true)
@Accessors(chain = true)
@ApiModel(value="SarMenuStandard对象", description="")
@TableName("sar_menu_standard")
public class SarMenuStandardNew extends BaseEntity {
public interface update{
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+13
View File
@@ -30,6 +30,12 @@ public class StandSystemDTO {
@ApiModelProperty(value = "体系结构")
private String standSystem;
@ApiModelProperty(value = "体系结构ID(树状结构选取)")
private String standSystemId;
@ApiModelProperty(value = "体系结构IDList(树状结构选取)")
private List<String> standSystemIdList;
@ApiModelProperty(value = "标准Id")
private String standId;
@@ -156,4 +162,11 @@ public class StandSystemDTO {
this.endReleaseDateString = sdf.format(endReleaseDate);
}
}
public void setStandSystemIdList(String standSystemId) {
this.standSystemId = standSystemId;
if (standSystemId != null) {
this.standSystemIdList = java.util.Arrays.asList(standSystemId.split(","));
}
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+18 -2
View File
@@ -22,8 +22,11 @@ import com.adc.da.slrs.sarRole.dao.TsRoleDao;
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
import com.adc.da.slrs.tsDictionaryType.entity.TsDicType;
import com.adc.da.slrs.tsDictionaryType.service.ITsDicTypeService;
import com.adc.da.slrs.tsRoleMeunData.dao.TsRoleMenuDataDao;
import com.adc.da.slrs.tsRoleMeunData.service.ITsRoleMenuDataService;
import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.entity.StandMenuRelation;
@@ -50,6 +53,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
/**
@@ -87,6 +91,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
@Resource
private SarBussStandMenuDao sarBussStandMenuDao;
@Resource
private TsRoleMenuDataDao roleMenuDataDao;
@Override
public String getTopMenu(SarMenuStandardNew sarMenuStandardNew) {
QueryWrapper qw = new QueryWrapper();
@@ -141,7 +148,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
HashMap<String, Object> map = new HashMap<>();
map.put("resourceId", sarMenuStandard.getId());
map.put("roleId", roleId);
map.put("menuId", sarMenuStandard.getId());
resourceDao.insertTsRoleResource(map);
// 添加权限
roleMenuDataDao.insertResourceMenuData(map);
}
}
@@ -250,7 +260,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
sarMenuStandard.buildPathMap(pathMap, "");
// 为树设置systemSort
SarMenuStandard.setSystemSort(sarMenuStandard, "");
// SarMenuStandard.setSystemSort(sarMenuStandard, "");
AtomicInteger currentNumber = new AtomicInteger(1);
SarMenuStandard.setSystemSortDFS(sarMenuStandard, currentNumber);
// 国标外标标准状态字典
List<TsDicType> gbStateDictList = dicItemService.selectAllDicTypeNameByDicCode("STANDSTATE");
@@ -391,6 +403,8 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
@Transactional(rollbackFor = Exception.class)
@Override
public void deleteMenuStandard(String menuId) {
// 先找到节点的名字
String menuName = getById(menuId).getMenuName();
// 删除主表中的节点
LambdaUpdateWrapper<SarMenuStandard> menuUpdateWrapper = new LambdaUpdateWrapper<>();
menuUpdateWrapper.eq(SarMenuStandard::getId, menuId);
@@ -406,7 +420,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
esWrapper.eq(SarBussStandMenu::getMenuId, menuId);
sarBussStandMenuService.remove(esWrapper);
log.info("删除企标主表中的相应字段成功");
// TODO 理论上这里应该删除国标外标企标主表中的中文字段
// 删除国标外标企标主表中的中文字段
sarStandardInfoDao.deleteStandSystem(menuName);
sarBussionessStandDao.deleteStandSystem(menuName);
}
/**
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java
+11
View File
@@ -1,10 +1,13 @@
package com.adc.da.slrs.sarStandMenu.service.impl;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.slrs.sarMenu.service.ISarMenuService;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.adc.da.slrs.sarStandMenu.dao.SarStandMenuDao;
import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -30,6 +33,9 @@ public class SarStandMenuServiceImpl extends ServiceImpl<SarStandMenuDao, SarSta
@Autowired
private ITsResourceService sarMenuEOService;
@Autowired
private ISarMenuStandardService iSarMenuStandardService;
@Override
public int deleteByMenuId (SarStandMenu sarStandMenuEO){
List<String> menuIds = sarMenuEOService.getChildMenuList(sarStandMenuEO.getOldMenuId());
@@ -51,6 +57,11 @@ public class SarStandMenuServiceImpl extends ServiceImpl<SarStandMenuDao, SarSta
@Override
public void addStandSystemRelation(String standSystem, String id) {
// 校验standSystem是否有效
SarMenuStandard standMenu = iSarMenuStandardService.getById(standSystem);
if (standMenu == null) {
throw new AdcDaBaseException("无效的标准体系");
}
SarStandMenu sarStandMenu = new SarStandMenu();
// 生成不带横杠的UUID
sarStandMenu.setId(java.util.UUID.randomUUID().toString().replaceAll("-", ""));
adc-da-slrs/src/main/java/com/adc/da/slrs/tsRoleMeunData/dao/TsRoleMenuDataDao.java
+4
View File
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Param;
import java.util.HashMap;
/**
* <p>
* Mapper 接口
@@ -17,4 +19,6 @@ public interface TsRoleMenuDataDao extends BaseMapper<TsRoleMenuData> {
@Insert("insert into ts_role_menu_data (role_id,menu_id) values (#{roleId},#{id})")
void save(@Param("roleId") String roleId,@Param("id") String id);
void insertResourceMenuData(HashMap<String, Object> map);
}