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

feat: 企业标准库 迁移1

Browse Source
This commit is contained in:
super_liu
2021-07-25 20:41:38 +08:00
parent 7f874329a8
commit 8a263964f6
42 changed files with 1623 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java
+69 -13
View File
@@ -2,9 +2,11 @@ package com.adc.da.slrs.sarBussionessStand.controller;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarAdvanceSearchVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.sys.util.LoginUserUtil;
import com.adc.da.http.PageInfo;
import com.adc.da.http.ResponseMessage;
@@ -12,13 +14,12 @@ import com.adc.da.http.Result;
import com.adc.da.util.utils.StringUtils;
import com.adc.da.utils.util.SarAdvanceSearchUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.*;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RestController;
import com.adc.da.base.web.BaseController;
import java.util.List;
@@ -42,12 +43,30 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
@Autowired
private ITsResourceService iTsResourceService;
@Autowired
private ITsUserService tsUserService;
/**
* 给指定标准配置目录
* @param standardsInfoEO
* @return
*/
@ApiOperation(value = "|SarBussionessStandEO|确认配置标准")
@PostMapping("/saveStandardsMenu")
//@RequiresPermissions("lawss:sarBussionessStand:saveStandardsMenu")
public ResponseMessage saveStandardsMenu(@RequestBody SarBussionessStandEOPage standardsInfoEO) throws Exception {
if ("wdsc".equals(standardsInfoEO.getMenuId()) || "gxhbq".equals(standardsInfoEO.getMenuId())) {
return Result.error("所选节点不支持配置标准");
} else {
SarBussionessStandEOPage standlist = sarBussionessStandEOService.updateStandardsMenu(standardsInfoEO);
return Result.success(standardsInfoEO);
}
}
/**
* 自定义分页查询列表
* @param page 标准信息
* @return
* @author gaoyan
* date 2018-09-04
*/
@ApiOperation(value = "|SarBussionessStandEO|自定义分页查询列表")
@GetMapping("/getSarBussionStandPage")
@@ -67,16 +86,53 @@ public class SarBussionessStandController extends BaseController<SarBussionessSt
String sql = page.getPaixu()+" "+page.getShunxu();
page.setSql(sql);
}else{
page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time is null,SAR_BUSSIONESS_STAND.issue_time desc,SAR_BUSSIONESS_STAND.id");
page.setOrderBy("SAR_BUSSIONESS_STAND.MODIFY_TIME DESC");
}
List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
if(getMenuIdList != null && !getMenuIdList.isEmpty()){
page.setMenuRoleList(getMenuIdList);
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
} else {
return Result.success(getPageInfo(page.getPager(), null));
if(page.getMenuId() != null ){
QueryWrapper<TsResource> qw = new QueryWrapper<>();
qw.eq("ID",page.getMenuId());
qw.isNull("PARENT_ID");
List<TsResource> children = iTsResourceService.list(qw);
if(!children.isEmpty() || page.getMenuId().equals("nomenu")){
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
// if (StringUtils.isNotBlank(page.getAdvanceSearchVOStr())) {
// List<SarAdvanceSearchVO> searchList = JSONObject.parseArray(page.getAdvanceSearchVOStr(),SarAdvanceSearchVO.class);
// String advanceStr = SarAdvanceSearchUtil.createSql(searchList);
// if (StringUtils.isNotBlank(advanceStr)) {
// page.setAdvanceSearchStr(advanceStr);
// } else {
// page.setAdvanceSearchStr(null);
// }
// }
// page.setOrderBy("SAR_BUSSIONESS_STAND.issue_time desc nulls last,SAR_BUSSIONESS_STAND.id");
// List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
//// List<String> getMenuIdList = iTsResourceService.queryRoleMenuIdList("BUSINESS_STAND",page.getMenuId());
// if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
// page.setMenuRoleList(getMenuIdList);
// } else {
// page.setMenuRoleList(null);
// }
// List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
// if (ids != null && !ids.isEmpty()) {
// page.setMenuAllChildrenIdList(ids);
// }
// List<SarBussionessStand> rows = sarBussionessStandEOService.getSarBussionStandPage(page);
// return Result.success(getPageInfo(page.getPager(), rows));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussStandMenuEO.java
+125
View File
@@ -0,0 +1,125 @@
package com.adc.da.slrs.sarBussionessStand.entity;
import com.adc.da.base.entity.BaseEntity;
import java.util.List;
/**
* <b>功能：</b>SAR_BUSS_STAND_MENU SarBussStandMenuEOEntity<br>
* <b>作者：</b>code generator<br>
* <b>日期：</b> 2018-09-03 <br>
* <b>版权所有：<b>版权归北京卡达克数据技术中心所有。<br>
*/
public class SarBussStandMenuEO extends BaseEntity {
private String menuId;
private String bussStandId;
private String id;
private Integer validFlag;
private String oldMenuId;
private String[] idlist;
private List<String> menuIds;
/**
* java字段名转换为原始数据库列名。<b>如果不存在则返回null</b><br>
* <p>字段列表：</p>
* <li>menuId -> menu_id</li>
* <li>bussStandId -> buss_stand_id</li>
* <li>id -> id</li>
* <li>validFlag -> valid_flag</li>
*/
public static String fieldToColumn(String fieldName) {
if (fieldName == null){ return null;}
switch (fieldName) {
case "menuId": return "menu_id";
case "bussStandId": return "buss_stand_id";
case "id": return "id";
case "validFlag": return "valid_flag";
default: return null;
}
}
/**
* 原始数据库列名转换为java字段名。<b>如果不存在则返回null</b><br>
* <p>字段列表：</p>
* <li>menu_id -> menuId</li>
* <li>buss_stand_id -> bussStandId</li>
* <li>id -> id</li>
* <li>valid_flag -> validFlag</li>
*/
public static String columnToField(String columnName) {
if (columnName == null){ return null;}
switch (columnName) {
case "menu_id": return "menuId";
case "buss_stand_id": return "bussStandId";
case "id": return "id";
case "valid_flag": return "validFlag";
default: return null;
}
}
/** **/
public String getMenuId() {
return this.menuId;
}
/** **/
public void setMenuId(String menuId) {
this.menuId = menuId;
}
/** **/
public String getBussStandId() {
return this.bussStandId;
}
/** **/
public void setBussStandId(String bussStandId) {
this.bussStandId = bussStandId;
}
/** **/
public String getId() {
return this.id;
}
/** **/
public void setId(String id) {
this.id = id;
}
/** **/
public Integer getValidFlag() {
return this.validFlag;
}
/** **/
public void setValidFlag(Integer validFlag) {
this.validFlag = validFlag;
}
public String getOldMenuId() {
return oldMenuId;
}
public void setOldMenuId(String oldMenuId) {
this.oldMenuId = oldMenuId;
}
public String[] getIdlist() {
return idlist;
}
public void setIdlist(String[] idlist) {
this.idlist = idlist;
}
public List<String> getMenuIds() {
return menuIds;
}
public void setMenuIds(List<String> menuIds) {
this.menuIds = menuIds;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java
+2
View File
@@ -16,6 +16,8 @@ import java.util.List;
*/
public interface ISarBussionessStandService extends IService<SarBussionessStand> {
SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO);
List<SarBussionessStand> queryByList(SarBussionessStandEOPage sarBussionessStandEOPage);
List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java
+69 -15
View File
@@ -3,6 +3,9 @@ package com.adc.da.slrs.sarBussionessStand.service.impl;
import com.adc.da.common.SelectionTypeEnum;
import com.adc.da.person.service.IPersonCollectEOService;
import com.adc.da.slrs.sarBussStandAttrInfo.dao.SarBussStandAttrInfoDao;
import com.adc.da.slrs.sarBussStandMenu.dao.SarBussStandMenuDao;
import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussStandMenuEO;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService;
@@ -11,6 +14,7 @@ import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.slrs.sysInfo.service.SysInfoEOService;
import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.FieldConvertUtil;
import com.adc.da.utils.util.InitStandAttrUtil;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -41,32 +45,63 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
@Autowired
private ITsResourceService iTsResourceService;
@Autowired
private SysInfoEOService sysInfoEOService;
@Autowired
private SarBussStandMenuDao sarBussStandMenuEODao;
@Autowired
private IPersonCollectEOService personCollectEOService;
@Autowired
private SarBussStandAttrInfoDao sarBussStandAttrInfoEODao;
public SarBussionessStandEOPage updateStandardsMenu(SarBussionessStandEOPage standardsInfoEO) {
SarBussStandMenu sarStandMenuEO = new SarBussStandMenu();
String nowMenuId = standardsInfoEO.getMenuId();
sarStandMenuEO.setMenuId(nowMenuId);
for (int i = 0; i < standardsInfoEO.getIdlist().length; i++) {
sarStandMenuEO.setBussStandId(standardsInfoEO.getIdlist()[i]);
sarStandMenuEO.setId(null);
sarStandMenuEO.setValidFlag(0);
// 根据当前目录查询所在父节点
String secondLevelId = "";
List<String> getMenuPIds = iTsResourceService.getParentMenuId(nowMenuId);
if (getMenuPIds != null && getMenuPIds.size() > 1) {
int idSize = getMenuPIds.size();
secondLevelId = getMenuPIds.get(idSize-1);
} else {
secondLevelId = nowMenuId;
}
//查询标准是否已在 当前父节点中
SarBussStandMenu standMenuEOQuery = new SarBussStandMenu();
standMenuEOQuery.setMenuId(secondLevelId);
standMenuEOQuery.setBussStandId(standardsInfoEO.getIdlist()[i]);
List<String> menuIds = iTsResourceService.getChildMenuList(secondLevelId);
standMenuEOQuery.setMenuIds(menuIds);
List<SarBussStandMenu> getInfo = sarBussStandMenuEODao.selectMenuByMenuParentId(standMenuEOQuery);
//删除节点与根节点的关联
SarBussStandMenu sarStandMenuDel = new SarBussStandMenu();
sarStandMenuDel.setBussStandId(standardsInfoEO.getIdlist()[i]);
sarStandMenuDel.setMenuId(standardsInfoEO.getRootMenuId());
sarBussStandMenuEODao.deleteByStandIdAndMenuId(sarStandMenuDel);
if (getInfo == null || getInfo.isEmpty()) {
sarStandMenuEO.setId(UUIDUtils.randomUUID20());
sarBussStandMenuEODao.insert(sarStandMenuEO);
} else {
sarStandMenuEO.setOldMenuId(secondLevelId);
List<String> menuOldIds = iTsResourceService.getChildMenuList(secondLevelId);
sarStandMenuEO.setMenuIds(menuOldIds);
sarBussStandMenuEODao.updateByStandIdAndMenuId(sarStandMenuEO);
}
// sarBussStandMenuEODao.updateByStandIDSelective(sarStandMenuEO);
}
return standardsInfoEO;
}
@Override
public List<SarBussionessStand> getSarBussionStandPage(SarBussionessStandEOPage page) throws Exception {
if (StringUtils.isNotBlank(page.getMenuId())) {
List<String> getMenuIdList = tsUserService.getResourceId(new TsResource());
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
}
Integer rowCount = this.baseMapper.getBussionessStandInfoCount(page);
page.getPager().setRowCount(rowCount);
List<SarBussionessStand> sarlist = this.baseMapper.getBussionessStandInfoPage(page);
@@ -81,7 +116,26 @@ public class SarBussionessStandServiceImpl extends ServiceImpl<SarBussionessStan
*/
public void attrInfo (List<SarBussionessStand> sarlist) throws Exception {
for(SarBussionessStand row : sarlist){
attrInfoDetails(row);
attrInfo1(row);
}
}
public void attrInfo1 (SarBussionessStand row) throws Exception {
String fieldInfo = InitStandAttrUtil.queryFieldBuss;
String collectId = personCollectEOService.queryCollectByUserAndId(row.getId());
row.setCollectId(collectId);
// 查询属性表数据
if (StringUtils.isNotBlank(fieldInfo)) {
Map<String, Object> getAttrMap = sarBussStandAttrInfoEODao.selectStandFieldAndData(fieldInfo,row.getId());
if (InitStandAttrUtil.clobFieldListBuss != null && !InitStandAttrUtil.clobFieldListBuss.isEmpty()) {
// 遍历修改所有clob类型的值
for (String clobField : InitStandAttrUtil.clobFieldListBuss) {
Clob clobValue = (Clob) getAttrMap.get(clobField);
String fieldValue = FieldConvertUtil.ClobToString(clobValue);
getAttrMap.put(clobField,fieldValue);
}
}
row.setAttrInfoMap(getAttrMap);
}
}