diff --git a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java index 64b63253..bbf82554 100644 --- a/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java +++ b/adc-da-activiti/src/main/java/com/adc/da/workFlow/service/ActSarItemsEOService.java @@ -122,7 +122,7 @@ public class ActSarItemsEOService { Object breakVal = null; Object itemList = null; for (Map.Entry 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); // 根据标准号判断数据是否已存在 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java index f950192c..ea2c9408 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/entity/TsResource.java @@ -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) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java index ba1d7fe4..883ed9e9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/ITsResourceService.java @@ -31,4 +31,6 @@ public interface ITsResourceService extends IService { * @return List */ List getResourceByIds(List resourceIds, String sorDivide); + + List getChildMenuList(String menuId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java index e15836fb..d7a9351f 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/service/impl/TsResourceServiceImpl.java @@ -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 getChildMenuList (String menuId) { + List menuIds = new ArrayList<>(); + if (StringUtils.isNotEmpty(menuId)) { + List 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; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java index addbb2e4..df47c5d5 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/controller/SarStandardsInfoController.java @@ -140,7 +140,6 @@ public class SarStandardsInfoController extends BaseController } } page.setUserId(LoginUserUtil.getUserId()); - System.out.println(page); List rows = sarStandardsInfoEOService.getSarStandardsInfoPage(page); return Result.success(getPageInfo(page.getPager(), rows)); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java index 3c308f23..d3a1eacc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java @@ -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 getMenuIdList=tsUserService.getResourceId(new TsResource()); // List 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 ids = sarMenuEOService.getChildMenuList(page.getMenuId()); + List ids = iTsResourceService.getChildMenuList(page.getMenuId()); if (ids != null && !ids.isEmpty()) { page.setMenuAllChildrenIdList(ids); } @@ -355,7 +359,10 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl 0) { // 修改属性表数据 - sarStandAttrInfoEODao.deleteStandAttrByStandId(sarStandardsInfoEO.getId()); + List standAttrInfos = sarStandAttrInfoEODao.selectList(new QueryWrapper().eq("STAND_ID",sarStandardsInfoEO.getId())); + if(!standAttrInfos.isEmpty()){ + sarStandAttrInfoEODao.deleteStandAttrByStandId(standAttrInfos.get(0).getStandId()); + } //编写预警信息 // writeWarnings(sarStandardsInfoEO); updateCiteStand(sarStandardsInfoEO, null, "DTBJH", "BDTBZBH");