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

Merge branch 'develop_3' into 'develop_master'

Browse Source 
hh Develop 3

See merge request !15
This commit is contained in:
super_liu
2021-07-06 08:12:45 +00:00
parent 643ce6b932 bd73773b19
commit 51bd89fc13
6 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java
+3 -6
View File
@@ -122,7 +122,7 @@ public class ActSarItemsEOService {
Object breakVal = null;
Object itemList = null;
for (Map.Entry<String,Object> entry : standMap.entrySet()) {
String field = entry.getKey();
String field = entry.getKey().toUpperCase();
Object value = entry.getValue();
if (InitStandAttrUtil.queryFieldList.contains(field)) {
if (value != null && value instanceof JSONArray) {
@@ -139,10 +139,7 @@ public class ActSarItemsEOService {
}
attInfoMap.put(field,value);
} else {
createStandBaseField(sarStandardsInfoEO,field,value);
}
if ("taskBreak".equals(field)) {
breakVal = value;
createStandBaseField(sarStandardsInfoEO,entry.getKey(),value);
}
}
String standFoUser = "";
@@ -156,7 +153,7 @@ public class ActSarItemsEOService {
}
//处理文件
//此处需要处理之前的文件信息，防止文件丢失
attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
// attInfoMap = saveFileMsg(attInfoMap,sarStandardsInfoEO.getFileIds(),sarStandardsInfoEO.getTextStatus());
String resData = JSON.toJSONString(attInfoMap, SerializerFeature.WriteMapNullValue);
sarStandardsInfoEO.setSarStandAttrEOStr(resData);
// 根据标准号判断数据是否已存在
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java
+2
View File
@@ -2,6 +2,7 @@ package com.adc.da.slrs.sarResource.entity;
import com.adc.da.base.entity.BaseEntity;
import com.adc.da.slrs.sarMenu.entity.SarMenu;
import com.adc.da.utils.treetool.annotation.TreeNodeId;
import com.adc.da.utils.treetool.annotation.TreeNodeName;
import com.adc.da.utils.treetool.annotation.TreeNodeParentId;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -37,6 +38,7 @@ public class TsResource extends BaseEntity {
@TreeNodeId
@NotNull(message = "id不能为空",groups = {SarMenu.update.class})
@ApiModelProperty(value = "主键")
@TableId(value = "ID",type = IdType.UUID)
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java
+2
View File
@@ -31,4 +31,6 @@ public interface ITsResourceService extends IService<TsResource> {
* @return List<Menu>
*/
List<TsResource> getResourceByIds(List<String> resourceIds, String sorDivide);
List<String> getChildMenuList(String menuId);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java
+19
View File
@@ -6,8 +6,11 @@ import com.adc.da.http.Result;
import com.adc.da.slrs.sarResource.dao.TsResourceDao;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.utils.treetool.Tree;
import com.adc.da.utils.treetool.TreeNode;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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;
@@ -132,4 +135,20 @@ public class TsResourceServiceImpl extends ServiceImpl<TsResourceDao, TsResource
}
return children;
}
public List<String> getChildMenuList (String menuId) {
List<String> menuIds = new ArrayList<>();
if (StringUtils.isNotEmpty(menuId)) {
List<TsResource> SarMenuList = dao.selectList(new QueryWrapper<>());
Tree tree = new Tree(SarMenuList);
TreeNode treeNode = tree.getTreeNode(menuId);
if (treeNode != null) {
menuIds.add(treeNode.getNodeId());
for (TreeNode node : treeNode.getAllChildren()) {
menuIds.add(node.getNodeId());
}
}
}
return menuIds;
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java
-1
View File
@@ -140,7 +140,6 @@ public class SarStandardsInfoController extends BaseController<SarStandardsInfo>
}
}
page.setUserId(LoginUserUtil.getUserId());
System.out.println(page);
List<SarStandardsInfo> rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page);
return Result.success(getPageInfo(page.getPager(), rows));
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+11 -4
View File
@@ -17,11 +17,13 @@ import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService;
import com.adc.da.slrs.sarLawsItems.service.ISarLawsItemsService;
import com.adc.da.slrs.sarProductStand.dao.SarProductStandDao;
import com.adc.da.slrs.sarResource.entity.TsResource;
import com.adc.da.slrs.sarResource.service.ITsResourceService;
import com.adc.da.slrs.sarSarAccess.service.ISarSarAccessService;
import com.adc.da.slrs.sarSarAccessInfo.dao.SarSarAccessInfoDao;
import com.adc.da.slrs.sarStandAttrDetails.dao.SarStandAttrDetailsDao;
import com.adc.da.slrs.sarStandAttrDetails.entity.SarStandAttrDetails;
import com.adc.da.slrs.sarStandAttrInfo.dao.SarStandAttrInfoDao;
import com.adc.da.slrs.sarStandAttrInfo.entity.SarStandAttrInfo;
import com.adc.da.slrs.sarStandFile.dao.SarStandFileDao;
import com.adc.da.slrs.sarStandFile.entity.SarStandFile;
import com.adc.da.slrs.sarStandItems.dao.SarStandItemsDao;
@@ -50,6 +52,7 @@ import com.adc.da.util.UUIDUtils;
import com.adc.da.utils.util.*;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.serializer.SerializerFeature;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import net.sf.json.JSONObject;
import org.apache.commons.lang3.StringUtils;
@@ -156,6 +159,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
@Autowired
private ITsUserService tsUserService;
@Autowired
private ITsResourceService iTsResourceService;
/***
* @Description: 分页查询
@@ -168,14 +174,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
//查询当前登录人角色拥有权限的菜单
List<String> getMenuIdList=tsUserService.getResourceId(new TsResource());
// List<String> getMenuIdList = sarMenuEOService.queryRoleMenuIdList(page.getStandType() + "_STAND", null);
System.out.println("菜单");
System.out.println(getMenuIdList);
if (getMenuIdList != null && !getMenuIdList.isEmpty()) {
page.setMenuRoleList(getMenuIdList);
} else {
page.setMenuRoleList(null);
}
List<String> ids = sarMenuEOService.getChildMenuList(page.getMenuId());
List<String> ids = iTsResourceService.getChildMenuList(page.getMenuId());
if (ids != null && !ids.isEmpty()) {
page.setMenuAllChildrenIdList(ids);
}
@@ -355,7 +359,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
int insertResult = dao.insertSelective(sarStandardsInfoEO);
if (insertResult > 0) {
// 修改属性表数据
sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId());
List<SarStandAttrInfo> standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper<SarStandAttrInfo>().eq("STAND_ID",sarStandardsInfoEO.getId()));
if(!standAttrInfos.isEmpty()){
sarStandAttrInfoEODao.deleteStandAttrByStandId(standAttrInfos.get(0).getStandId());
}
//编写预警信息
// writeWarnings(sarStandardsInfoEO);
updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");