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 bbf82554..a724e332 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 @@ -1068,6 +1068,7 @@ public class ActSarItemsEOService { } break; case "standType": sarStandardsInfoEO.setStandType(valueStr); break; + case "standSystem": sarStandardsInfoEO.setStandSystem(valueStr); break; case "standYear": sarStandardsInfoEO.setStandYear(valueStr); break; case "standNature": sarStandardsInfoEO.setStandNature(valueStr); break; case "standEnName": sarStandardsInfoEO.setStandEnName(valueStr); break; diff --git a/adc-da-main/src/main/resources/application-dev.properties b/adc-da-main/src/main/resources/application-dev.properties index 23fac18c..d10482d6 100644 --- a/adc-da-main/src/main/resources/application-dev.properties +++ b/adc-da-main/src/main/resources/application-dev.properties @@ -18,7 +18,7 @@ application.center=1 #Eruept eureka.client.allow-redirects=true eureka.client.register-with-eureka=true -eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/ +eureka.client.service-url.defaultZone=http://101.36.227.25:8761/eureka/ #============================================== # 邮箱配置1 diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java new file mode 100644 index 00000000..dc247155 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/controller/SarBussionessStandController.java @@ -0,0 +1,23 @@ +package com.adc.da.slrs.sarBussionessStand.controller; + + +import org.springframework.web.bind.annotation.RequestMapping; +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; + +/** +*

+ * 企业标准信息表 前端控制器 + *

+* +* @author super_liu +* @since 2021-07-13 +*/ +@RestController +@Api(tags = "福田标准法规--企业标准信息") +@RequestMapping("/${restPath}/lawss/sarBussionessStand") +public class SarBussionessStandController extends BaseController { + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java new file mode 100644 index 00000000..782a06da --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarBussionessStand.dao; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +import java.util.List; + +/** + *

+ * 企业标准信息表 Mapper 接口 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +public interface SarBussionessStandDao extends BaseMapper { + + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java new file mode 100644 index 00000000..b4601b3a --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/SarBussionessStand.java @@ -0,0 +1,186 @@ +package com.adc.da.slrs.sarBussionessStand.entity; + +import com.adc.da.att.vo.AttFileVo; +import com.adc.da.base.entity.BaseEntity; +import java.math.BigDecimal; +import java.time.LocalDate; + +import com.adc.da.slrs.standardSplit.entity.SarStandAttrDetailsEO; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.util.*; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; + +/** + *

+ * 企业标准信息表 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Accessors(chain = true) +@ApiModel(value="SarBussionessStand对象", description="企业标准信息表") +public class SarBussionessStand extends BaseEntity { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键") + @TableId("ID") + private String id; + + @ApiModelProperty(value = "标准编号") + @TableField("STAND_CODE") + private String standCode; + + @ApiModelProperty(value = "标准名称") + @TableField("STAND_NAME") + private String standName; + + @ApiModelProperty(value = "标准英文名称") + @TableField("STAND_EN_NAME") + private String standEnName; + + @ApiModelProperty(value = "发布日期") + @TableField("ISSUE_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date issueTime; + + @ApiModelProperty(value = "实施日期") + @TableField("PUT_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private Date putTime; + + @ApiModelProperty(value = "代替标准号") + @TableField("REPLACE_STAND_NUM") + private String replaceStandNum; + + @ApiModelProperty(value = "被代替标准号") + @TableField("REPLACED_STAND_NUM") + private String replacedStandNum; + + @ApiModelProperty(value = "标准状态") + @TableField("STAND_STATUS") + private String standStatus; + + @ApiModelProperty(value = "适用国家/地区") + @TableField("APPLY_COUNTRY") + private String applyCountry; + + @ApiModelProperty(value = "标准性质") + @TableField("STAND_NATURE") + private String standNature; + + @ApiModelProperty(value = "标准类别") + @TableField("STAND_SORT") + private String standSort; + + @ApiModelProperty(value = "标准年份") + @TableField("STAND_YEAR") + private String standYear; + + @ApiModelProperty(value = "是否有效") + @TableField("VALID_FLAG") + private Integer validFlag; + + @ApiModelProperty(value = "创建时间") + @TableField("CREATION_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date creationTime; + + @ApiModelProperty(value = "修改时间") + @TableField("MODIFY_TIME") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private Date modifyTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + private String firstPutTime; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String putTimeShow; + + @TableField(exist = false) + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") + private String issueTimeShow; + + @TableField(exist = false) + private String issueTimeStr; + + @TableField(exist = false) + private String putTimeStr; + + //目录ID 非标准信息表中的字段 + @TableField(exist = false) + private String menuId; + + @TableField(exist = false) + private String menuParentId; + + @TableField(exist = false) + private String standStatusShow; // 标准状态下拉框 --单选 + + @TableField(exist = false) + private String standNatrueShow; + + @TableField(exist = false) + private String standSortShow; + + @TableField(exist = false) + private String applyCountryShow; + + @TableField(exist = false) + private List standFileList = new ArrayList(); + + @TableField(exist = false) + private List opinionFilesList = new ArrayList(); + + @TableField(exist = false) + private List relevanceFileList = new ArrayList(); + + @TableField(exist = false) + private String collectId; + + //文件的类型 + @TableField(exist = false) + private String standFileClassify; + + //文件的下载id + @TableField(exist = false) + private String attId; + + //记录是否修改了替代文件号 + @TableField(exist = false) + private int upReplaceNumFlag; + //记录是否修改了文件号 + @TableField(exist = false) + private int upNumFlag; + // 数据库新加的字段 + + @TableField(exist = false) + private String remark;//备注 + + @TableField(exist = false) + private Map attrInfoMap = new LinkedHashMap<>(); //属性表字段与值 + + @TableField(exist = false) + private String sarStandAttrEOStr; //新增修改时属性表信息 + + @TableField(exist = false) + private String fileIds; //全部文件ID + + @TableField(exist = false) + private List attrInfoList = new ArrayList<>(); + + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java new file mode 100644 index 00000000..3277b429 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/ISarBussionessStandService.java @@ -0,0 +1,20 @@ +package com.adc.da.slrs.sarBussionessStand.service; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; + +/** + *

+ * 企业标准信息表 服务类 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +public interface ISarBussionessStandService extends IService { + + List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java new file mode 100644 index 00000000..bc23039e --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -0,0 +1,27 @@ +package com.adc.da.slrs.sarBussionessStand.service.impl; + +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; +import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + *

+ * 企业标准信息表 服务实现类 + *

+ * + * @author super_liu + * @since 2021-07-13 + */ +@Service +public class SarBussionessStandServiceImpl extends ServiceImpl implements ISarBussionessStandService { + + @Override + public List queryByList(SarBussionessStandEOPage sarBussionessStandEOPage){ + return this.baseMapper.queryByList(sarBussionessStandEOPage); + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java index 5bd87742..3079dc44 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/controller/TsResourceController.java @@ -4,7 +4,6 @@ package com.adc.da.slrs.sarResource.controller; import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; import io.swagger.annotations.Api; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java index be0671ec..335a7986 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarResource/dao/TsResourceDao.java @@ -3,6 +3,8 @@ package com.adc.da.slrs.sarResource.dao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import java.util.List; + /** *

* Mapper 接口 @@ -13,4 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface TsResourceDao extends BaseMapper { + List queryMenuByDis(TsResource sarMenuEO); + + List selectMenuByRole(TsResource sarMenuEO); + } 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 c94365c1..39e2f196 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 @@ -91,4 +91,10 @@ public class TsResource extends BaseEntity { @TableField(exist = false) private String parentIdsName; + @TableField(exist=false) + private List roleIds; + + @TableField(exist=false) + private List childMenuIds; + } 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 31d663fa..e66ec54c 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 @@ -1,7 +1,7 @@ package com.adc.da.slrs.sarResource.service; import com.adc.da.http.ResponseMessage; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.baomidou.mybatisplus.extension.service.IService; @@ -17,8 +17,12 @@ import java.util.List; */ public interface ITsResourceService extends IService { + List selectMenuByRole(TsResource sarMenuEO); + List getParentMenuId(String menuId); + List queryRoleMenuIdList(String sordDivide, String menuId) throws Exception; + /** * 通过Ids查询menu * @param menuIds :菜单Ids @@ -26,6 +30,8 @@ public interface ITsResourceService extends IService { */ List getMenuByIds(List menuIds); + List queryMenuByDis(TsResource sarMenuEO); + List getAll(TsResource tsResource); ResponseMessage addResource(TsResource tsResource); 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 909a0dcf..3713fbf3 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 @@ -3,8 +3,7 @@ package com.adc.da.slrs.sarResource.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.sarMenu.entity.SarMenu; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarResource.dao.TsResourceDao; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; @@ -17,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; /** @@ -32,6 +32,79 @@ public class TsResourceServiceImpl extends ServiceImpl selectMenuByRole(TsResource sarMenu) { + List list = dao.selectMenuByRole(sarMenu); + if (list == null) { + list = new ArrayList<>(); + } + TsResource collectMenu = new TsResource(); + collectMenu.setId("wdsc"); + collectMenu.setSorDivide(sarMenu.getSorDivide()); + collectMenu.setMenuName("我的收藏"); + collectMenu.setParentId("1"); + collectMenu.setDisplaySeq(9999); + list.add(collectMenu); + TsResource labeltMenu = new TsResource(); + labeltMenu.setId("gxhbq"); + labeltMenu.setSorDivide(sarMenu.getSorDivide()); + labeltMenu.setMenuName("个性化标签"); + labeltMenu.setParentId("1"); + labeltMenu.setDisplaySeq(10000); + if(!"BUSINESS_STAND".equals(sarMenu.getSorDivide())) { + list.add(labeltMenu); + } + return list; + } + + public List queryRoleMenuIdList(String sordDivide, String menuId) throws Exception{ + // 根据当前登录人id查出对应角色 + TsResource sarMenu = new TsResource(); + sarMenu.setSorDivide(sordDivide); + String roleIds = UserUtils.getRoleIds(); + String[] roleArr = roleIds.split(","); + List roleIdList = Arrays.asList(roleArr); + sarMenu.setRoleIds(roleIdList); + //角色未配置根节点，手动加入根节点权限 + List resultList = queryMenuByDis(sarMenu); + List list = selectMenuByRole(sarMenu); + if(!"BUSINESS_STAND".equals(sarMenu.getSorDivide())){ + resultList.addAll(list); + } else { + // 如果是企标，并且两个根节点都有权限，最先只查已分配下的节点 + if (resultList != null && resultList.size() == 2) { + TsResource menu1 = resultList.get(0); + TsResource menu2 = resultList.get(1); + if (list != null && list.size()>1) { + int menu1Index = -1; + int menu2Index = -1; + for (int i = 0;i < list.size();i++) { + if (list.get(i).getId().equals(menu1.getId())) { + menu1Index = i; + } else if (list.get(i).getId().equals(menu2.getId())) { + menu2Index = i; + } + } + if (menu1Index>0 && menu2Index>0 && StringUtils.isEmpty(menuId)) { + list.remove(menu2Index); + } + } + } + resultList = list; + } + List getMenuIds = new ArrayList<>(); + if(resultList != null && !resultList.isEmpty()){ + for(TsResource menu : resultList){ + getMenuIds.add(menu.getId()); + } + } + return getMenuIds; + } + + public List queryMenuByDis(TsResource sarMenu) { + return dao.queryMenuByDis(sarMenu); + } + + public List getParentMenuId (String menuId) { List parentIds = new ArrayList<>(); if (StringUtils.isNotEmpty(menuId)) { diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java index 30fd670d..be282111 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandItems/controller/SarStandItemsController.java @@ -9,12 +9,9 @@ import com.adc.da.slrs.sarStandItems.service.impl.SarStandItemsServiceImpl; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; 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.sarStandItems.entity.SarStandItems; import io.swagger.annotations.Api; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import java.util.List; @@ -29,7 +26,7 @@ import java.util.List; */ @RestController @Api(description = "|SarStandItems|") -@RequestMapping("/SarStandItems/sar-stand-items") +@RequestMapping("/api/SarStandItems/sar-stand-items") public class SarStandItemsController extends BaseController { @Autowired @@ -37,7 +34,7 @@ public class SarStandItemsController extends BaseController { @ApiOperation(value = "分解单查询") @GetMapping("/findAllItems") - public ResponseMessage findAllItems( String type,String ids){ + public ResponseMessage findAllItems( @RequestParam("type") String type,@RequestParam("ids") String ids){ if (!StringUtils.isEmpty(ids) && ids.contains(",")){ String[] Sids=ids.split(","); List ItemDto = ServiceImpl.findAllItems(type,Sids); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java index 93f94b8e..efa376f0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/controller/SarStandMenuController.java @@ -5,6 +5,8 @@ import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarMenu.service.ISarMenuService; +import com.adc.da.slrs.sarResource.entity.TsResource; +import com.adc.da.slrs.sarResource.service.ITsResourceService; import com.adc.da.slrs.sarStandMenu.service.ISarStandMenuService; import com.adc.da.util.UUIDUtils; import io.swagger.annotations.ApiOperation; @@ -37,7 +39,7 @@ public class SarStandMenuController extends BaseController { private ISarStandMenuService sarStandMenuEOService; @Autowired - private ISarMenuService sarMenuEOService; + private ITsResourceService sarMenuEOService; @ApiOperation(value = "|SarStandMenuEO|修改") @PutMapping("/removeStandInfo") @@ -61,9 +63,9 @@ public class SarStandMenuController extends BaseController { List getList = sarStandMenuEOService.selectAllMenuByStandId(menuEO); if (getList == null || getList.isEmpty()) { // 查询根节点 - SarMenu sarMenuEO = new SarMenu(); + TsResource sarMenuEO = new TsResource(); sarMenuEO.setSorDivide(standardsInfoEO.getStandType() + "_STAND"); - List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); + List getRootMenu = sarMenuEOService.queryMenuByDis(sarMenuEO); menuEO.setMenuId(getRootMenu.get(0).getId()); menuEO.setId(UUIDUtils.randomUUID20()); menuEO.setValidFlag(0); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java index e05feb25..889b796e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/service/impl/SarStandMenuServiceImpl.java @@ -1,6 +1,7 @@ package com.adc.da.slrs.sarStandMenu.service.impl; 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; @@ -25,7 +26,7 @@ public class SarStandMenuServiceImpl extends ServiceImpl list1 = sarStandProjectLibraryService.queryProjectManager(); + public ResponseMessage queryProjectManager(@RequestParam(defaultValue = "1", value = "current")int current, @RequestParam(defaultValue = "10", value = "PageSize") int pageSize){ + IPage list1 = sarStandProjectLibraryService.queryProjectManager(current,pageSize); // 创建一个新的list集合，用于存储去重后的元素 List listTemp = new ArrayList(); - for (SarStandProjectLibrary sarStandProjectLibrary:list1){ + for (SarStandProjectLibrary sarStandProjectLibrary:list1.getRecords()){ productLineDto p = new productLineDto(); p.setProductLine(sarStandProjectLibrary.getProductLine()); - p.setProjectManager(sarStandProjectLibrary.getProjectManager()); + p.setUName(sarStandProjectLibrary.getUName()); List list2 = sarStandProjectLibraryService.queryByProductLine(sarStandProjectLibrary.getProductLine()); p.setSarStandProjectLibraries(list2); listTemp.add(p); } - System.out.println(JSONObject.toJSON(listTemp)); + IPage iPage = new Page<>(); + iPage.setRecords(listTemp); + iPage.setCurrent(list1.getCurrent()); + iPage.setSize(list1.getSize()); + iPage.setTotal(list1.getTotal()); + iPage.setPages(list1.getPages()); - return Result.success("200",listTemp); + return Result.success("200",iPage); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index fae67684..df0262b0 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -2,6 +2,10 @@ package com.adc.da.slrs.sarStandProjectLibrary.dao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** *

@@ -12,5 +16,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; * @since 2021-06-15 */ public interface SarStandProjectLibraryDao extends BaseMapper { + List queryProjectManagerPage(@Param("current") int current, @Param("pageSize") int pageSize); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java index d4e8b803..6f0e9dd2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibrary.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.entity; import com.adc.da.base.entity.BaseEntity; import java.util.Date; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -63,7 +64,12 @@ public class SarStandProjectLibrary extends BaseEntity { @ApiModelProperty(value = "产品线") private String productLine; + @ApiModelProperty(value = "项目经理") private String projectManager; + @ApiModelProperty(value = "项目经理名称") + @TableField(exist = false) + private String uName; + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java index 11a2aed8..ed59c174 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/productLineDto.java @@ -7,7 +7,7 @@ import java.util.List; @Data public class productLineDto { - private String projectManager; + private String uName; private String productLine; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java index 8e9dcb06..e7753bd9 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -11,6 +11,6 @@ public interface SarStandProjectLibraryService { IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); List queryById(String id); - List queryProjectManager(); + IPage queryProjectManager(int current, int pageSize); List queryByProductLine(String productLine); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index 04dfe995..5408a66e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -1,5 +1,6 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; +import com.adc.da.slrs.sarStandIssueControlProduct.entity.SarStandIssueControlProduct; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; @@ -42,7 +43,7 @@ public class SarStandProjectLibraryServiceImpl extends ServiceImpl queryProjectManager() { + public IPage queryProjectManager(int current, int pageSize) { QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.select("product_line","project_manager"); wrapper.groupBy("product_line"); - List list = sarStandProjectLibraryDao.selectList(wrapper); + IPage list = sarStandProjectLibraryDao.selectPage(new Page<>(current,pageSize),wrapper); + List libraryIPage=sarStandProjectLibraryDao.queryProjectManagerPage((current-1)*pageSize,current*pageSize); + list.setRecords(libraryIPage); return list; } 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 d9b83f2d..8c3a3177 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 @@ -11,6 +11,8 @@ import com.adc.da.exception.AdcDaBaseException; import com.adc.da.http.PageInfo; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; +import com.adc.da.slrs.sarBussionessStand.service.ISarBussionessStandService; import com.adc.da.slrs.sarLawsInfo.service.ISarLawsInfoService; import com.adc.da.slrs.sarStandardsInfo.entity.*; import com.adc.da.slrs.sarStandardsInfo.service.ISarStandardsInfoService; @@ -63,6 +65,9 @@ public class SarStandardsInfoController extends BaseController @Autowired private ISarStandardsInfoService sarStandardsInfoEOService; + @Autowired + private ISarBussionessStandService iSarBussionessStandService; + @Value("${file.path}") private String filePath; @@ -556,5 +561,33 @@ public class SarStandardsInfoController extends BaseController } + @ApiOperation(value = "|SarStandardsInfoEO|根据标准号查询") + @GetMapping("/queryInfoByStandNum") + //@RequiresPermissions("lawss:sarStandardsInfo:list") + public ResponseMessage queryInfoByStandNum(SarStandardsInfoEOPage page) throws Exception { + if (org.apache.commons.lang.StringUtils.isNotBlank(page.getStandNumber())){ + String sort = ""; + if (page.getStandNumber().length()>3) { + sort = page.getStandNumber().substring(0, 3); + } + if ("ECE".equals(sort)) { + int length = page.getStandNumber().length(); + String number = page.getStandNumber().substring(3,length); + page.setStandNumber("UN(ECE)" + number); + } + } + List getList = sarStandardsInfoEOService.selectStandardsByStandnumber(page.getStandNumber(),page.getStandType()); + SarBussionessStandEOPage sarBussionessStandEOPage = new SarBussionessStandEOPage(); + sarBussionessStandEOPage.setStandCode(page.getStandNumber()); + List list = iSarBussionessStandService.queryByList(sarBussionessStandEOPage); + if(getList.size()>0){ + return Result.success(getList.get(0)); + } + if (list.size()>0){ + return Result.success(list.get(0)); + } + return Result.success("0","标准/企标已不存在"); + } + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java new file mode 100644 index 00000000..a2263387 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarBussionessStandEOPage.java @@ -0,0 +1,896 @@ +package com.adc.da.slrs.sarStandardsInfo.entity; + +import com.adc.da.sys.common.BasePage; + +import java.util.List; + +/** + * 功能：SAR_BUSSIONESS_STAND SarBussionessStandEOPage
+ * 作者：code generator
+ * 日期： 2018-09-03
+ * 版权所有：版权归北京卡达克数据技术中心所有。
+ */ +public class SarBussionessStandEOPage extends BasePage { + + private String modifyTime; + private String modifyTime1; + private String modifyTime2; + private String modifyTimeOperator = "="; + private String creationTime; + private String creationTime1; + private String creationTime2; + private String creationTimeOperator = "="; + private String validFlag; + private String validFlagOperator = "="; + private String putUser; + private String putUserOperator = "="; + private String citationUser; + private String citationUserOperator = "="; + private String responsibleUnit; + private String responsibleUnitOperator = "="; + private String standFile; + private String standFileOperator = "="; + private String tags; + private String tagsOperator = "="; + private String standStatus; + private String standStatusOperator = "="; + private String replacedStandNum; + private String replacedStandNumOperator = "="; + private String replaceStandNum; + private String replaceStandNumOperator = "="; + private String quoteStand; + private String quoteStandOperator = "="; + private String firstPutTime; + private String firstPutTime1; + private String firstPutTime2; + private String firstPutTimeOperator = "="; + private String putYear; + private String putYear1; + private String putYear2; + private String putYearOperator = "="; + private String putTime; + private String putTime1; + private String putTime2; + private String putTimeOperator = "="; + private String issueTime; + private String issueTime1; + private String issueTime2; + private String issueTimeOperator = "="; + private String energyKind; + private String energyKindOperator = "="; + private String applyArctic; + private String applyArcticOperator = "="; + private String standEnName; + private String standEnNameOperator = "="; + private String standName; + private String standNameOperator = "="; + private String standCode; + private String standCodeOperator = "="; + private String classifyCode; + private String classifyCodeOperator = "="; + private String standSubclass; + private String standSubclassOperator = "="; + private String standGenera; + private String standGeneraOperator = "="; + private String id; + private String idOperator = "="; + // 数据库新增字段 + private String applyCountry; + private String standYear; + private String applyCountryOperator = "="; + private String standNature; + private String standNatureOperator = "="; + private String synopsis; + private String synopsisOperator = "="; + private String standSort; + private String standSortOperator = "="; + private String opinionFile; + private String opinionFileOperator = "="; + private String relevanceFile; + private String relevanceFileOperator = "="; + private String remark; + private String remarkOperator = "="; + + private List roleIds; + private String rootMenuId; + private String orgName; + private List menuRoleList; + private String[] replacedStandNumList; + private String numberName; + // 树结构增加搜索条件 + private String collectMenuId; + private String advanceSearchVOStr; + private String advanceSearchStr; + private List menuAllChildrenIdList; + private String userId; + + private String zqcrId; + + //页面排序 + private String paixu; + private String shunxu; + private String sql; + + public String getZqcrId() { + return zqcrId; + } + + public void setZqcrId(String zqcrId) { + this.zqcrId = zqcrId; + } + + public String getModifyTime() { + return this.modifyTime; + } + + public void setModifyTime(String modifyTime) { + this.modifyTime = modifyTime; + } + + public String getModifyTime1() { + return this.modifyTime1; + } + + public void setModifyTime1(String modifyTime1) { + this.modifyTime1 = modifyTime1; + } + + public String getModifyTime2() { + return this.modifyTime2; + } + + public void setModifyTime2(String modifyTime2) { + this.modifyTime2 = modifyTime2; + } + + public String getModifyTimeOperator() { + return this.modifyTimeOperator; + } + + public void setModifyTimeOperator(String modifyTimeOperator) { + this.modifyTimeOperator = modifyTimeOperator; + } + + public String getCreationTime() { + return this.creationTime; + } + + public void setCreationTime(String creationTime) { + this.creationTime = creationTime; + } + + public String getCreationTime1() { + return this.creationTime1; + } + + public void setCreationTime1(String creationTime1) { + this.creationTime1 = creationTime1; + } + + public String getCreationTime2() { + return this.creationTime2; + } + + public void setCreationTime2(String creationTime2) { + this.creationTime2 = creationTime2; + } + + public String getCreationTimeOperator() { + return this.creationTimeOperator; + } + + public void setCreationTimeOperator(String creationTimeOperator) { + this.creationTimeOperator = creationTimeOperator; + } + + public String getValidFlag() { + return this.validFlag; + } + + public void setValidFlag(String validFlag) { + this.validFlag = validFlag; + } + + public String getValidFlagOperator() { + return this.validFlagOperator; + } + + public void setValidFlagOperator(String validFlagOperator) { + this.validFlagOperator = validFlagOperator; + } + + public String getPutUser() { + return this.putUser; + } + + public void setPutUser(String putUser) { + this.putUser = putUser; + } + + public String getPutUserOperator() { + return this.putUserOperator; + } + + public void setPutUserOperator(String putUserOperator) { + this.putUserOperator = putUserOperator; + } + + public String getCitationUser() { + return this.citationUser; + } + + public void setCitationUser(String citationUser) { + this.citationUser = citationUser; + } + + public String getCitationUserOperator() { + return this.citationUserOperator; + } + + public void setCitationUserOperator(String citationUserOperator) { + this.citationUserOperator = citationUserOperator; + } + + public String getResponsibleUnit() { + return this.responsibleUnit; + } + + public void setResponsibleUnit(String responsibleUnit) { + this.responsibleUnit = responsibleUnit; + } + + public String getResponsibleUnitOperator() { + return this.responsibleUnitOperator; + } + + public void setResponsibleUnitOperator(String responsibleUnitOperator) { + this.responsibleUnitOperator = responsibleUnitOperator; + } + + public String getStandFile() { + return this.standFile; + } + + public void setStandFile(String standFile) { + this.standFile = standFile; + } + + public String getStandFileOperator() { + return this.standFileOperator; + } + + public void setStandFileOperator(String standFileOperator) { + this.standFileOperator = standFileOperator; + } + + public String getTags() { + return this.tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + + public String getTagsOperator() { + return this.tagsOperator; + } + + public void setTagsOperator(String tagsOperator) { + this.tagsOperator = tagsOperator; + } + + public String getStandStatus() { + return this.standStatus; + } + + public void setStandStatus(String standStatus) { + this.standStatus = standStatus; + } + + public String getStandStatusOperator() { + return this.standStatusOperator; + } + + public void setStandStatusOperator(String standStatusOperator) { + this.standStatusOperator = standStatusOperator; + } + + public String getReplacedStandNum() { + return this.replacedStandNum; + } + + public void setReplacedStandNum(String replacedStandNum) { + this.replacedStandNum = replacedStandNum; + } + + public String getReplacedStandNumOperator() { + return this.replacedStandNumOperator; + } + + public void setReplacedStandNumOperator(String replacedStandNumOperator) { + this.replacedStandNumOperator = replacedStandNumOperator; + } + + public String getReplaceStandNum() { + return this.replaceStandNum; + } + + public void setReplaceStandNum(String replaceStandNum) { + this.replaceStandNum = replaceStandNum; + } + + public String getReplaceStandNumOperator() { + return this.replaceStandNumOperator; + } + + public void setReplaceStandNumOperator(String replaceStandNumOperator) { + this.replaceStandNumOperator = replaceStandNumOperator; + } + + public String getQuoteStand() { + return this.quoteStand; + } + + public void setQuoteStand(String quoteStand) { + this.quoteStand = quoteStand; + } + + public String getQuoteStandOperator() { + return this.quoteStandOperator; + } + + public void setQuoteStandOperator(String quoteStandOperator) { + this.quoteStandOperator = quoteStandOperator; + } + + public String getFirstPutTime() { + return this.firstPutTime; + } + + public void setFirstPutTime(String firstPutTime) { + this.firstPutTime = firstPutTime; + } + + public String getFirstPutTime1() { + return this.firstPutTime1; + } + + public void setFirstPutTime1(String firstPutTime1) { + this.firstPutTime1 = firstPutTime1; + } + + public String getFirstPutTime2() { + return this.firstPutTime2; + } + + public void setFirstPutTime2(String firstPutTime2) { + this.firstPutTime2 = firstPutTime2; + } + + public String getFirstPutTimeOperator() { + return this.firstPutTimeOperator; + } + + public void setFirstPutTimeOperator(String firstPutTimeOperator) { + this.firstPutTimeOperator = firstPutTimeOperator; + } + + public String getPutYear() { + return this.putYear; + } + + public void setPutYear(String putYear) { + this.putYear = putYear; + } + + public String getPutYear1() { + return this.putYear1; + } + + public void setPutYear1(String putYear1) { + this.putYear1 = putYear1; + } + + public String getPutYear2() { + return this.putYear2; + } + + public void setPutYear2(String putYear2) { + this.putYear2 = putYear2; + } + + public String getPutYearOperator() { + return this.putYearOperator; + } + + public void setPutYearOperator(String putYearOperator) { + this.putYearOperator = putYearOperator; + } + + public String getPutTime() { + return this.putTime; + } + + public void setPutTime(String putTime) { + this.putTime = putTime; + } + + public String getPutTime1() { + return this.putTime1; + } + + public void setPutTime1(String putTime1) { + this.putTime1 = putTime1; + } + + public String getPutTime2() { + return this.putTime2; + } + + public void setPutTime2(String putTime2) { + this.putTime2 = putTime2; + } + + public String getPutTimeOperator() { + return this.putTimeOperator; + } + + public void setPutTimeOperator(String putTimeOperator) { + this.putTimeOperator = putTimeOperator; + } + + public String getIssueTime() { + return this.issueTime; + } + + public void setIssueTime(String issueTime) { + this.issueTime = issueTime; + } + + public String getIssueTime1() { + return this.issueTime1; + } + + public void setIssueTime1(String issueTime1) { + this.issueTime1 = issueTime1; + } + + public String getIssueTime2() { + return this.issueTime2; + } + + public void setIssueTime2(String issueTime2) { + this.issueTime2 = issueTime2; + } + + public String getIssueTimeOperator() { + return this.issueTimeOperator; + } + + public void setIssueTimeOperator(String issueTimeOperator) { + this.issueTimeOperator = issueTimeOperator; + } + + public String getEnergyKind() { + return this.energyKind; + } + + public void setEnergyKind(String energyKind) { + this.energyKind = energyKind; + } + + public String getEnergyKindOperator() { + return this.energyKindOperator; + } + + public void setEnergyKindOperator(String energyKindOperator) { + this.energyKindOperator = energyKindOperator; + } + + public String getApplyArctic() { + return this.applyArctic; + } + + public void setApplyArctic(String applyArctic) { + this.applyArctic = applyArctic; + } + + public String getApplyArcticOperator() { + return this.applyArcticOperator; + } + + public void setApplyArcticOperator(String applyArcticOperator) { + this.applyArcticOperator = applyArcticOperator; + } + + public String getStandEnName() { + return this.standEnName; + } + + public void setStandEnName(String standEnName) { + this.standEnName = standEnName; + } + + public String getStandEnNameOperator() { + return this.standEnNameOperator; + } + + public void setStandEnNameOperator(String standEnNameOperator) { + this.standEnNameOperator = standEnNameOperator; + } + + public String getStandName() { + return this.standName; + } + + public void setStandName(String standName) { + this.standName = standName; + } + + public String getStandNameOperator() { + return this.standNameOperator; + } + + public void setStandNameOperator(String standNameOperator) { + this.standNameOperator = standNameOperator; + } + + public String getStandCode() { + return this.standCode; + } + + public void setStandCode(String standCode) { + this.standCode = standCode; + } + + public String getStandCodeOperator() { + return this.standCodeOperator; + } + + public void setStandCodeOperator(String standCodeOperator) { + this.standCodeOperator = standCodeOperator; + } + + public String getClassifyCode() { + return this.classifyCode; + } + + public void setClassifyCode(String classifyCode) { + this.classifyCode = classifyCode; + } + + public String getClassifyCodeOperator() { + return this.classifyCodeOperator; + } + + public void setClassifyCodeOperator(String classifyCodeOperator) { + this.classifyCodeOperator = classifyCodeOperator; + } + + public String getStandSubclass() { + return this.standSubclass; + } + + public void setStandSubclass(String standSubclass) { + this.standSubclass = standSubclass; + } + + public String getStandSubclassOperator() { + return this.standSubclassOperator; + } + + public void setStandSubclassOperator(String standSubclassOperator) { + this.standSubclassOperator = standSubclassOperator; + } + + public String getStandGenera() { + return this.standGenera; + } + + public void setStandGenera(String standGenera) { + this.standGenera = standGenera; + } + + public String getStandGeneraOperator() { + return this.standGeneraOperator; + } + + public void setStandGeneraOperator(String standGeneraOperator) { + this.standGeneraOperator = standGeneraOperator; + } + + public String getId() { + return this.id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIdOperator() { + return this.idOperator; + } + + public void setIdOperator(String idOperator) { + this.idOperator = idOperator; + } + + private String menuId; + private String[] idlist; //用于导出数据过程中传递选择的标准id + private String[] replaceStandNumList; + + public String getMenuId() { + return menuId; + } + + public void setMenuId(String menuId) { + this.menuId = menuId; + } + + public String[] getIdlist() { + return idlist; + } + + public void setIdlist(String[] idlist) { + this.idlist = idlist; + } + + public String[] getReplaceStandNumList() { + return replaceStandNumList; + } + + public void setReplaceStandNumList(String[] replaceStandNumList) { + this.replaceStandNumList = replaceStandNumList; + } + + private String[] applyArcticList; + private String[] energyKindList; + + public String[] getApplyArcticList() { + return applyArcticList; + } + + public void setApplyArcticList(String[] applyArcticList) { + this.applyArcticList = applyArcticList; + } + + public String[] getEnergyKindList() { + return energyKindList; + } + + public void setEnergyKindList(String[] energyKindList) { + this.energyKindList = energyKindList; + } + + public String getApplyCountry() { + return applyCountry; + } + + public void setApplyCountry(String applyCountry) { + this.applyCountry = applyCountry; + } + + public String getApplyCountryOperator() { + return applyCountryOperator; + } + + public void setApplyCountryOperator(String applyCountryOperator) { + this.applyCountryOperator = applyCountryOperator; + } + + public String getStandNature() { + return standNature; + } + + public void setStandNature(String standNature) { + this.standNature = standNature; + } + + public String getStandNatureOperator() { + return standNatureOperator; + } + + public void setStandNatureOperator(String standNatureOperator) { + this.standNatureOperator = standNatureOperator; + } + + public String getSynopsis() { + return synopsis; + } + + public void setSynopsis(String synopsis) { + this.synopsis = synopsis; + } + + public String getSynopsisOperator() { + return synopsisOperator; + } + + public void setSynopsisOperator(String synopsisOperator) { + this.synopsisOperator = synopsisOperator; + } + + public String getStandSort() { + return standSort; + } + + public void setStandSort(String standSort) { + this.standSort = standSort; + } + + public String getStandSortOperator() { + return standSortOperator; + } + + public void setStandSortOperator(String standSortOperator) { + this.standSortOperator = standSortOperator; + } + + public String getOpinionFile() { + return opinionFile; + } + + public void setOpinionFile(String opinionFile) { + this.opinionFile = opinionFile; + } + + public String getOpinionFileOperator() { + return opinionFileOperator; + } + + public void setOpinionFileOperator(String opinionFileOperator) { + this.opinionFileOperator = opinionFileOperator; + } + + public String getRelevanceFile() { + return relevanceFile; + } + + public void setRelevanceFile(String relevanceFile) { + this.relevanceFile = relevanceFile; + } + + public String getRelevanceFileOperator() { + return relevanceFileOperator; + } + + public void setRelevanceFileOperator(String relevanceFileOperator) { + this.relevanceFileOperator = relevanceFileOperator; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getRemarkOperator() { + return remarkOperator; + } + + public void setRemarkOperator(String remarkOperator) { + this.remarkOperator = remarkOperator; + } + + public List getRoleIds() { + return roleIds; + } + + public void setRoleIds(List roleIds) { + this.roleIds = roleIds; + } + + public String getStandYear() { + return standYear; + } + + public void setStandYear(String standYear) { + this.standYear = standYear; + } + + public List getMenuRoleList() { + return menuRoleList; + } + + public void setMenuRoleList(List menuRoleList) { + this.menuRoleList = menuRoleList; + } + + public String getNumberName() { + return numberName; + } + + public void setNumberName(String numberName) { + this.numberName = numberName; + } + + public String[] getReplacedStandNumList() { + return replacedStandNumList; + } + + public void setReplacedStandNumList(String[] replacedStandNumList) { + this.replacedStandNumList = replacedStandNumList; + } + + public String getRootMenuId() { + return rootMenuId; + } + + public void setRootMenuId(String rootMenuId) { + this.rootMenuId = rootMenuId; + } + + public String getCollectMenuId() { + return collectMenuId; + } + + public void setCollectMenuId(String collectMenuId) { + this.collectMenuId = collectMenuId; + } + + public String getAdvanceSearchVOStr() { + return advanceSearchVOStr; + } + + public void setAdvanceSearchVOStr(String advanceSearchVOStr) { + this.advanceSearchVOStr = advanceSearchVOStr; + } + + public String getAdvanceSearchStr() { + return advanceSearchStr; + } + + public void setAdvanceSearchStr(String advanceSearchStr) { + this.advanceSearchStr = advanceSearchStr; + } + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } + + public List getMenuAllChildrenIdList() { + return menuAllChildrenIdList; + } + + public void setMenuAllChildrenIdList(List menuAllChildrenIdList) { + this.menuAllChildrenIdList = menuAllChildrenIdList; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getPaixu() { + return paixu; + } + + public void setPaixu(String paixu) { + this.paixu = paixu; + } + + public String getShunxu() { + return shunxu; + } + + public void setShunxu(String shunxu) { + this.shunxu = shunxu; + } + + public String getSql() { + return sql; + } + + public void setSql(String sql) { + this.sql = sql; + } +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java index 7e4f80fd..df2df62e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/entity/SarStandardsInfo.java @@ -187,5 +187,7 @@ public class SarStandardsInfo extends BaseEntity { @TableField(exist = false) private String putTime2; + @TableField(exist = false) + private String standSystemName; } 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 fe4d0e45..33c619a5 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 @@ -32,6 +32,7 @@ import com.adc.da.slrs.sarStandItems.page.SarStandItemsEOPage; import com.adc.da.slrs.sarStandItems.service.ISarStandItemsService; 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.sarStandPutTime.dao.SarStandPutTimeDao; import com.adc.da.slrs.sarStandPutTime.entity.SarStandPutTime; import com.adc.da.slrs.sarStandVal.dao.SarStandValDao; @@ -47,6 +48,8 @@ import com.adc.da.sys.common.SelectionResult; import com.adc.da.sys.constant.ValueStateEnum; import com.adc.da.sys.dao.DicTypeEODao; import com.adc.da.sys.entity.DicTypeEO; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.adc.da.util.LoginUserUtil; import com.adc.da.util.UUIDUtils; import com.adc.da.utils.util.*; @@ -96,6 +99,9 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl fileMap) throws Exception { if (fileMap != null && fileMap.size() > 0) { List standFileList = new ArrayList<>(); + List fileList = new ArrayList<>(); for (Map.Entry entry : fileMap.entrySet()) { String value = entry.getValue(); String field = entry.getKey(); if (StringUtils.isNotBlank(value)) { - List fileList = attFileEOService.getMultiFileInfos(value); + fileList = attFileEOService.getMultiFileInfos(value); if (fileList != null && !fileList.isEmpty()) { createStandFileAppend(standId, field, fileList, standFileList); } @@ -927,12 +937,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl changeMap(SarStandardsInfo sarStandardsInfoEO, Map map) { - map.put("country", sarStandardsInfoEO.getCountry()); - map.put("isRelateAccess", sarStandardsInfoEO.getIsRelateAccess()); - map.put("standSort", sarStandardsInfoEO.getStandSort()); - map.put("standNumber", sarStandardsInfoEO.getStandNumber()); - map.put("standYear", sarStandardsInfoEO.getStandYear()); - map.put("standName", sarStandardsInfoEO.getStandName()); - map.put("standEnName", sarStandardsInfoEO.getStandEnName()); - map.put("standNature", sarStandardsInfoEO.getStandNature()); - map.put("standState", sarStandardsInfoEO.getStandState()); +// map.put("country", sarStandardsInfoEO.getCountry()); + if(map == null){ + map = new TreeMap(); + } + map.put("standSystem", verifyObj(sarStandardsInfoEO.getStandSystem())); + map.put("isRelateAccess", verifyObj(sarStandardsInfoEO.getIsRelateAccess())); + map.put("standSort", verifyObj(sarStandardsInfoEO.getStandSort())); + map.put("standNumber", verifyObj(sarStandardsInfoEO.getStandNumber())); + map.put("standYear", verifyObj(sarStandardsInfoEO.getStandYear())); + map.put("standName", verifyObj(sarStandardsInfoEO.getStandName())); + map.put("standEnName", verifyObj(sarStandardsInfoEO.getStandEnName())); + map.put("standNature", verifyObj(sarStandardsInfoEO.getStandNature())); + map.put("standState", verifyObj(sarStandardsInfoEO.getStandState())); // if (sarStandardsInfoEO.getIssueTime() != null) { // SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd"); // String issueStr = format.format(sarStandardsInfoEO.getIssueTime()); // // } - map.put("issueTime", sarStandardsInfoEO.getIssueTime()); - map.put("synopsis", sarStandardsInfoEO.getSynopsis()); + map.put("issueTime", verifyObj(sarStandardsInfoEO.getIssueTime())); + map.put("synopsis", verifyObj(sarStandardsInfoEO.getSynopsis())); return map; } + private Object verifyObj(Object str){ + return str == null ? "" : str; + } + public int deleteSarStandards(String ids) { String[] idArr = ids.split(","); @@ -1787,6 +1805,12 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl i sarUpdLogEO.setSarId(sarId); sarUpdLogEO.setSarType(sarType); sarUpdLogEO.setCreationTime(new Date()); - sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId()); + sarUpdLogEO.setCreationUser(LoginUserUtil.getUserId() == null ? "" : LoginUserUtil.getUserId()); sarUpdLogEO.setContent(content); dao.insert(sarUpdLogEO); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java new file mode 100644 index 00000000..c0204cdb --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/controller/SarFileSplitItemsValEOController.java @@ -0,0 +1,132 @@ +package com.adc.da.slrs.standardSplit.controller; + +import com.adc.da.base.web.BaseController; +import com.adc.da.http.PageInfo; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; +import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsTableEOService; +import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService; +import com.adc.da.util.http.ResponseMessage; +import com.adc.da.util.http.Result; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE; + +@RestController +@RequestMapping("/${restPath}/lawss/sarFileSplitItemsVal") +@Api(description = "|SarFileSplitItemsValEO|") +public class SarFileSplitItemsValEOController extends BaseController { + + private static final Logger logger = LoggerFactory.getLogger(SarFileSplitItemsValEOController.class); + + @Autowired + private SarFileSplitItemsValEOService sarFileSplitItemsValEOService; + + @Autowired + private SarFileSplitItemsTableEOService sarFileSplitItemsTableEOService; + + @Autowired + private SarFileSplitItemsEOService sarFileSplitItemsEOService; + + @ApiOperation(value = "|SarFileSplitItemsValEO|分页查询") + @GetMapping("/page") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:page") + public ResponseMessage> page(SarFileSplitItemsValEOPage page) throws Exception { + page.setOrderBy("modify_time desc"); + List rows = sarFileSplitItemsValEOService.queryByPage(page); + return Result.success(getPageInfo(page.getPager(), rows)); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|查询") + @GetMapping("/getItemsValList") +// @RequiresPermissions("lawss:sarFileSplitItemsVal:list") + public ResponseMessage> list(SarFileSplitItemsValEOPage page) throws Exception { + page.setOrderBy("DISPLAY_SEQ,ID"); + List getList = sarFileSplitItemsValEOService.queryByList(page); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } + /*else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEOService.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEOService.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + }*/ + } + } + return Result.success(getList); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|详情") + @GetMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:get") + public ResponseMessage find(@PathVariable String id) throws Exception { + return Result.success(sarFileSplitItemsValEOService.selectByPrimaryKey(id)); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|新增") + @PostMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:save") + public ResponseMessage create(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.insertSelective(sarFileSplitItemsValEO); + return Result.success(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|修改") + @PutMapping(consumes = APPLICATION_JSON_UTF8_VALUE) + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:update") + public ResponseMessage update(@RequestBody SarFileSplitItemsValEO sarFileSplitItemsValEO) throws Exception { + sarFileSplitItemsValEOService.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + return Result.success(sarFileSplitItemsValEO); + } + + @ApiOperation(value = "|SarFileSplitItemsValEO|删除") + @DeleteMapping("/{id}") + //401问题2021-03-31暂时注释掉 liuhuiwen +// @RequiresPermissions("lawss:sarFileSplitItemsVal:delete") + public ResponseMessage delete(@PathVariable String id) throws Exception { + sarFileSplitItemsValEOService.deleteByPrimaryKey(id); + logger.info("delete from SAR_FILE_SPLIT_ITEMS_VAL where id = {}", id); + return Result.success(); + } + + @ApiOperation(value = "|SarFileSplitItemsEO|根据目录查询") + @GetMapping("/getSplitItemsByMenu") +// @RequiresPermissions("lawss:sarFileSplitItems:page") + public ResponseMessage> getSplitItemsByMenu(String menuId,String infoId) throws Exception { + List getList = sarFileSplitItemsValEOService.getSplitItemsByMenu(menuId,infoId); + return Result.success(getList); + } + +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java index c71a60f0..96a1514c 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsTableEODao.java @@ -30,4 +30,6 @@ public interface SarFileSplitItemsTableEODao extends BaseMapper queryItemsTableByMenuId(@Param("idList") List idList); + List queryByList(@Param("pager") SarFileSplitItemsTableEOPage pager); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java index e78a0a09..7e762ccc 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/dao/SarFileSplitItemsValEODao.java @@ -36,4 +36,14 @@ public interface SarFileSplitItemsValEODao extends BaseMapper queryByList(SarFileSplitItemsValEOPage valEOPage); + List queryByPage(SarFileSplitItemsValEOPage page); + + SarFileSplitItemsValEO selectByPrimaryKey(String id); + + void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void deleteByPrimaryKey(String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java index 60aa46ac..553aac1b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/SarFileSplitItemsValEOService.java @@ -8,4 +8,16 @@ import java.util.List; public interface SarFileSplitItemsValEOService { List queryByList(SarFileSplitItemsValEOPage valEOPage); + + List queryByPage(SarFileSplitItemsValEOPage page); + + SarFileSplitItemsValEO selectByPrimaryKey(String id); + + void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO); + + void deleteByPrimaryKey(String id); + + List getSplitItemsByMenu(String menuId,String infoId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java index e2011de7..72ab7888 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/standardSplit/service/impl/SarFileSplitItemsValEOServiceImpl.java @@ -1,9 +1,11 @@ package com.adc.da.slrs.standardSplit.service.impl; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsEODao; +import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsTableEODao; import com.adc.da.slrs.standardSplit.dao.SarFileSplitItemsValEODao; -import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEO; -import com.adc.da.slrs.standardSplit.entity.SarFileSplitItemsValEOPage; +import com.adc.da.slrs.standardSplit.entity.*; import com.adc.da.slrs.standardSplit.service.SarFileSplitItemsValEOService; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -11,6 +13,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.List; @Service @@ -20,9 +23,82 @@ public class SarFileSplitItemsValEOServiceImpl implements SarFileSplitItemsValEO @Autowired private SarFileSplitItemsValEODao sarFileSplitItemsValEODao; + @Autowired + private SarFileSplitItemsEODao sarFileSplitItemsEODao; + @Autowired + private SarFileSplitItemsTableEODao sarFileSplitItemsTableEODao; @Override public List queryByList(SarFileSplitItemsValEOPage valEOPage) { return sarFileSplitItemsValEODao.queryByList(valEOPage); } + + @Override + public List queryByPage(SarFileSplitItemsValEOPage page) { + return sarFileSplitItemsValEODao.queryByPage(page); + } + + @Override + public SarFileSplitItemsValEO selectByPrimaryKey(String id) { + return sarFileSplitItemsValEODao.selectByPrimaryKey(id); + } + + @Override + public void insertSelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + sarFileSplitItemsValEODao.insertSelective(sarFileSplitItemsValEO); + } + + @Override + public void updateByPrimaryKeySelective(SarFileSplitItemsValEO sarFileSplitItemsValEO) { + sarFileSplitItemsValEODao.updateByPrimaryKeySelective(sarFileSplitItemsValEO); + } + + @Override + public void deleteByPrimaryKey(String id) { + sarFileSplitItemsValEODao.deleteByPrimaryKey(id); + } + + @Override + public List getSplitItemsByMenu(String menuId, String infoId) { + List rows = sarFileSplitItemsEODao.queryItemsByMenuId(menuId);; + List getList = new ArrayList<>(); + if (rows != null && !rows.isEmpty()) { + for (SarFileSplitItemsEO sarFileSplitItemsEO : rows) { + SarFileSplitItemsValEOPage valpage = new SarFileSplitItemsValEOPage(); + valpage.setItemId(sarFileSplitItemsEO.getId()); + valpage.setOrderBy("DISPLAY_SEQ,ID"); + List getListVal = sarFileSplitItemsValEODao.queryByList(valpage); + if (getList != null && !getList.isEmpty()) { + for (SarFileSplitItemsValEO sarFileSplitItemsValEO : getList) { + String imgPath = sarFileSplitItemsValEO.getItemContent(); + if ("IMG".equals(sarFileSplitItemsValEO.getType()) && StringUtils.isNotEmpty(imgPath)) { + String imgName = imgPath.substring(imgPath.lastIndexOf("/")+1, imgPath.length()); + sarFileSplitItemsValEO.setImgName(imgName); + } else if ("TABLE".equals(sarFileSplitItemsValEO.getType())) { + SarFileSplitItemsTableEOPage tablePage = new SarFileSplitItemsTableEOPage(); + tablePage.setItemsValId(sarFileSplitItemsValEO.getId()); + List tableList = sarFileSplitItemsTableEODao.queryByList(tablePage); + List tableListRow = sarFileSplitItemsTableEODao.queryByRowNum(tablePage); + sarFileSplitItemsValEO.setTableList(tableList); + if (tableListRow != null && !tableListRow.isEmpty()) { + List> getTableList = new ArrayList<>(); + for (int i=1; i <= tableListRow.size();i++) { + List rowList = new ArrayList<>(); + for (int j=0; j < tableList.size();j++) { + if (tableList.get(j).getRowNum() == i) { + rowList.add(tableList.get(j)); + } + } + getTableList.add(rowList); + } + sarFileSplitItemsValEO.setTableListShow(getTableList); + } + } + } + } + getList.addAll(getListVal); + } + } + return getList; + } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java b/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java index 419338c0..5edd3dc4 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java +++ b/adc-da-slrs/src/main/java/com/adc/da/utils/util/InitStandAttrUtil.java @@ -108,6 +108,7 @@ public class InitStandAttrUtil implements ApplicationRunner { StringBuilder fieldInfoNameBuilderLaws = new StringBuilder(); StringBuilder fieldInfoNameBuilderBuss = new StringBuilder(); QueryWrapper qw = new QueryWrapper(); + qw.eq("VALID_FLAG","0"); List getDetailsList = sarStandAttrDetailsEOService.list(qw); if (getDetailsList != null && !getDetailsList.isEmpty()) { logger.info("项目启动时加载--查询标准属性类--查询到" + getDetailsList.size() + "条属性字段数据！"); diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml index 93b7040c..7995e6de 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarUpdLog/SarUpdLogMapper.xml @@ -51,7 +51,7 @@ SELECT SEQ_SAR_UPD_LOG.NEXTVAL FROM DUAL --> insert into SAR_UPD_LOG() - values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP}) + values (#{id, jdbcType=VARCHAR}, #{sarType, jdbcType=VARCHAR}, #{sarId, jdbcType=VARCHAR}, #{content, jdbcType=CLOB}, #{creationTime, jdbcType=TIMESTAMP},#{creationUser, jdbcType=VARCHAR}) diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml new file mode 100644 index 00000000..5170a5ec --- /dev/null +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml @@ -0,0 +1,906 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + modify_time, creation_time, valid_flag, stand_status, replaced_stand_num,replace_stand_num, + put_time, issue_time,stand_en_name,stand_name, stand_code, id,apply_country, stand_nature, stand_sort + + + stand_year,dicapplyCountry.DIC_TYPE_NAME as applyCountryShow,dicstandSort.DIC_TYPE_NAME as standSortShow, + dicstandNature.DIC_TYPE_NAME as standNatrueShow,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, + SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature,SAR_BUSSIONESS_STAND.stand_sort, + stand_status, replaced_stand_num,replace_stand_num,put_time,issue_time,stand_en_name, + stand_name, stand_code,SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME as standStatusShow + + + + stand_year,dicapplyCountry.DIC_TYPE_NAME,dicstandSort.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,SAR_BUSSIONESS_STAND.modify_time, + SAR_BUSSIONESS_STAND.creation_time, SAR_BUSSIONESS_STAND.valid_flag, + SAR_BUSSIONESS_STAND.apply_country, SAR_BUSSIONESS_STAND.stand_nature, + SAR_BUSSIONESS_STAND.stand_sort, + stand_status, replaced_stand_num, replace_stand_num,put_time, + issue_time, stand_en_name, stand_name, stand_code, + SAR_BUSSIONESS_STAND.id,dicstandStatus.DIC_TYPE_NAME + + + + + + where 1=1 + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and stand_status ${standStatusOperator} #{standStatus} + + + and replaced_stand_num ${replacedStandNumOperator} #{replacedStandNum} + + + and replace_stand_num ${replaceStandNumOperator} #{replaceStandNum} + + + and put_time ${putTimeOperator} #{putTime} + + + and put_time >= #{putTime1} + + + and put_time <= #{putTime2} + + + and issue_time ${issueTimeOperator} #{issueTime} + + + and issue_time >= #{issueTime1} + + + and issue_time <= #{issueTime2} + + + and stand_en_name ${standEnNameOperator} #{standEnName} + + + and stand_name ${standNameOperator} #{standName} + + + and stand_code ${standCodeOperator} #{standCode} + + + and id ${idOperator} #{id} + + + + and apply_country ${applyCountryOperator} #{applyCountry} + + + and stand_nature ${standNatureOperator} #{standNature} + + + and stand_sort ${standSortOperator} #{standSort} + + + and opinion_file ${opinionFileOperator} #{opinionFile} + + + and relevance_file ${relevanceFileOperator} #{relevanceFile} + + + and remark ${remarkOperator} #{remark} + + + + + + + insert into SAR_BUSSIONESS_STAND + + modify_time, + creation_time, + valid_flag, + stand_status, + replaced_stand_num, + replace_stand_num, + put_time, + issue_time, + stand_en_name, + stand_name, + stand_code, + id, + + apply_country, + stand_Nature, + stand_sort, + stand_year, + + + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{standStatus, jdbcType=VARCHAR}, + #{replacedStandNum, jdbcType=VARCHAR}, + #{replaceStandNum, jdbcType=VARCHAR}, + #{putTime, jdbcType=TIMESTAMP}, + #{issueTime, jdbcType=TIMESTAMP}, + #{standEnName, jdbcType=VARCHAR}, + #{standName, jdbcType=VARCHAR}, + #{standCode, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + + #{applyCountry, jdbcType=VARCHAR}, + #{standNature, jdbcType=VARCHAR}, + #{standSort, jdbcType=VARCHAR}, + #{standYear, jdbcType=VARCHAR}, + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + stand_status = #{standStatus}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + put_time = null, + + + issue_time = #{issueTime}, + + + issue_time = null, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + stand_code = #{standCode}, + + + + apply_country = #{applyCountry}, + + + stand_nature = #{standNature}, + + + stand_sort = #{standSort}, + + + stand_year = #{standYear}, + + + where id = #{id} + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + stand_status = #{standStatus}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + issue_time = #{issueTime}, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + stand_code = #{standCode}, + + + + apply_country = #{applyCountry}, + + + stand_nature = #{standNature}, + + + stand_sort = #{standSort}, + + + stand_year = #{standYear}, + + + where id = #{id} + + + + + + + + delete from SAR_BUSSIONESS_STAND + where id = #{value} + + + + + + + + + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + left join SAR_BUSS_STAND_ATTR_INFO on (SAR_BUSS_STAND_ATTR_INFO.STAND_ID = SAR_BUSSIONESS_STAND.id and SAR_BUSS_STAND_ATTR_INFO.valid_flag=0) + where 1=1 + + + + and SAR_BUSSIONESS_STAND.STAND_CODE like concat('%', #{standCode}, '%') + + + and ( + + SAR_BUSSIONESS_STAND.STAND_CODE like concat(concat('%',#{numberName}),'%') + or stand_name like concat(concat('%',#{numberName}),'%') + ) + + + and stand_name like concat(concat('%',#{standName}),'%') + + + + and DATE_FORMAT(put_time,'%Y-%m-%D') >= #{putTime1} + + + and DATE_FORMAT(put_time,'%Y-%m-%D') <= #{putTime2} + + + and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} + + + -- and to_char(issue_time,'YYYY-MM-DD') <= #{issueTime2} + and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + + and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( SELECT SAR_MENU.id FROM SAR_MENU START WITH id =( + SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0 ) CONNECT BY PRIOR id = parent_id ) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in + + #{item} + + + + and SAR_BUSSIONESS_STAND.id in ( + select COLLECT_RES_ID from TS_PERSON_COLLECT where TS_PERSON_COLLECT.VALID_FLAG=0 + and collect_type='BUSINESS_STAND' + and TS_PERSON_COLLECT.user_id=#{userId} + ) + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + and SAR_BUSSIONESS_STAND.id in + + #{item} + + + + and SAR_BUSSIONESS_STAND.stand_sort = #{standSort} + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + and SAR_BUSSIONESS_STAND.STAND_STATUS = #{standStatus} + + + and (${advanceSearchStr}) + + + and (SELECT ZYQCR + FROM SAR_BUSS_STAND_ATTR_INFO + WHERE valid_flag = 0 + and stand_id = SAR_BUSSIONESS_STAND.id) = #{zqcrId} + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + where 1=1 + + + + and stand_code like concat(concat('%',#{standCode}),'%') + + + and stand_name like concat(concat('%',#{standName}),'%') + + + + -- and to_char(put_time,'YYYY-MM-DD') >= #{putTime1} + and DATE_FORMAT(put_time,'%Y-%m-%D') >= #{putTime1} + + + -- and to_char(put_time,'YYYY-MM-DD') <= #{putTime2} + and DATE_FORMAT(put_time,'%Y-%m-%D') <= #{putTime2} + + + -- and to_char(issue_time,'YYYY-MM-DD') >= #{issueTime1} + and DATE_FORMAT(issue_time,'%Y-%m-%D') >= #{issueTime1} + + + and DATE_FORMAT(issue_time,'%Y-%m-%D') <= #{issueTime2} + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( + select a.* from ( + select SAR_MENU.id from SAR_MENU,TS_ROLE_SAR_MENU start with id=#{menuId} connect by prior id= parent_id + )a,TS_ROLE_SAR_MENU + where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in + + #{item} + + GROUP BY ID + ) + + + + and SAR_BUSS_STAND_MENU.MENU_ID = (select SAR_MENU.id from SAR_MENU WHERE parent_id is null and sor_divide ='BUSINESS_STAND' and valid_flag=0) + + + + and SAR_BUSS_STAND_MENU.MENU_ID in ( + select a.* from ( + SELECT SAR_MENU.id FROM SAR_MENU START WITH id =( + SELECT SAR_MENU.id FROM SAR_MENU WHERE parent_id IS NULL AND sor_divide = 'BUSINESS_STAND' and valid_flag=0) connect by prior id= parent_id + )a,TS_ROLE_SAR_MENU + where a.id = TS_ROLE_SAR_MENU.SAR_MENU_ID and TS_ROLE_SAR_MENU.ROLE_ID in + + #{item} + + GROUP BY ID + ) + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + and SAR_BUSSIONESS_STAND.id in + + #{item} + + + + and SAR_BUSSIONESS_STAND.stand_sort = #{standSort} + + + and replace_stand_num like concat(concat('%',#{replaceStandNum}),'%') + + + + + + + left join TS_DICTYPE dicstandStatus ON ( dicstandStatus.dic_type_code = SAR_BUSSIONESS_STAND.STAND_STATUS AND dicstandStatus.dic_id IS NOT NULL and dicstandStatus.valid_flag = 0) + left join TS_DICTYPE dicstandNature ON ( dicstandNature.dic_type_code = SAR_BUSSIONESS_STAND.STAND_NATURE AND dicstandNature.dic_id IS NOT NULL and dicstandNature.valid_flag = 0) + left join TS_DICTYPE dicstandSort ON ( dicstandSort.dic_type_code = SAR_BUSSIONESS_STAND.STAND_SORT AND dicstandSort.dic_id IS NOT NULL and dicstandSort.valid_flag = 0) + left join TS_DICTYPE dicapplyCountry ON ( dicapplyCountry.dic_type_code = SAR_BUSSIONESS_STAND.APPLY_COUNTRY AND dicapplyCountry.dic_id IS NOT NULL and dicapplyCountry.valid_flag = 0) + left join SAR_BUSS_STAND_MENU ON SAR_BUSSIONESS_STAND.id = SAR_BUSS_STAND_MENU.buss_stand_id + left join SAR_MENU on SAR_BUSS_STAND_MENU.menu_id = SAR_MENU.id + where 1=1 + + + + and stand_code like concat(concat('%',#{standCode}),'%') + + + and stand_name like concat(concat('%',#{standName}),'%') + + + and SAR_BUSSIONESS_STAND.valid_flag = #{validFlag} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + update SAR_BUSSIONESS_STAND + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + replaced_stand_num = #{replacedStandNum}, + + + replace_stand_num = #{replaceStandNum}, + + + put_time = #{putTime}, + + + issue_time = #{issueTime}, + + + stand_en_name = #{standEnName}, + + + stand_name = #{standName}, + + + where STAND_CODE = #{standCode} + + + + update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where + STAND_CODE in + + #{item} + + + + + update SAR_BUSSIONESS_STAND set REPLACE_STAND_NUM = #{replaceStandNum} where + STAND_CODE in + + #{item} + + + + + + + update SAR_BUSSIONESS_STAND set REPLACED_STAND_NUM = #{replacedStandNum} where id = #{id} + + + + + + + + insert into SAR_BUSSIONESS_PERSON(ID,QBID,USID) VALUE + + (#{Person.id}, #{Person.qbid}, #{Person.usid}) + + + + + DELETE FROM SAR_BUSSIONESS_PERSON + where qbid=#{qbid} + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml index 447de27f..a09cbd84 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarResource/TsResourceMapper.xml @@ -1,4 +1,260 @@ + + + + + + + + + + + + + + + + + parent_id, menu_name, sor_divide, id, modify_time, creation_time, valid_flag, display_seq, parent_ids, remarks + + + + + where 1=1 + + + and parent_id ${parentIdOperator} #{parentId} + + + and menu_name ${menuNameOperator} #{menuName} + + + and sor_divide ${sorDivideOperator} #{sorDivide} + + + and id ${idOperator} #{id} + + + and modify_time ${modifyTimeOperator} #{modifyTime} + + + and modify_time >= #{modifyTime1} + + + and modify_time <= #{modifyTime2} + + + and creation_time ${creationTimeOperator} #{creationTime} + + + and creation_time >= #{creationTime1} + + + and creation_time <= #{creationTime2} + + + and valid_flag ${validFlagOperator} #{validFlag} + + + and display_seq ${displaySeqOperator} #{displaySeq} + + + and parent_ids ${parentIdsOperator} #{parentIds} + + + and remarks = #{remarks} + + + + + + + + insert into TS_RESOURCE() + values (#{parentId, jdbcType=VARCHAR}, #{menuName, jdbcType=VARCHAR}, #{sorDivide, jdbcType=VARCHAR}, #{id, jdbcType=VARCHAR}, #{modifyTime, jdbcType=TIMESTAMP}, #{creationTime, jdbcType=TIMESTAMP}, #{validFlag, jdbcType=INTEGER}, #{displaySeq, jdbcType=INTEGER}, #{parentIds, jdbcType=VARCHAR},#{remarks, jdbcType=VARCHAR}) + + + + + + insert into TS_RESOURCE + + parent_id, + menu_name, + sor_divide, + id, + modify_time, + creation_time, + valid_flag, + display_seq, + parent_ids, + remarks, + + + #{parentId, jdbcType=VARCHAR}, + #{menuName, jdbcType=VARCHAR}, + #{sorDivide, jdbcType=VARCHAR}, + #{id, jdbcType=VARCHAR}, + #{modifyTime, jdbcType=TIMESTAMP}, + #{creationTime, jdbcType=TIMESTAMP}, + #{validFlag, jdbcType=INTEGER}, + #{displaySeq, jdbcType=INTEGER}, + #{parentIds, jdbcType=VARCHAR}, + #{remarks, jdbcType=VARCHAR}, + + + + + + update TS_RESOURCE + set parent_id = #{parentId}, + menu_name = #{menuName}, + sor_divide = #{sorDivide}, + modify_time = #{modifyTime}, + creation_time = #{creationTime}, + valid_flag = #{validFlag}, + display_seq = #{displaySeq}, + parent_ids = #{parentIds} + remarks = #{remarks} + where id = #{id} + + + + + update TS_RESOURCE + + + parent_id = #{parentId}, + + + menu_name = #{menuName}, + + + sor_divide = #{sorDivide}, + + + modify_time = #{modifyTime}, + + + creation_time = #{creationTime}, + + + valid_flag = #{validFlag}, + + + display_seq = #{displaySeq}, + + + parent_ids = #{parentIds}, + + + remarks = #{remarks}, + + + where id = #{id} + + + + + + + + delete from TS_RESOURCE + where id = #{value} + + + + + + + + + + + + + + + + + + + + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml index d5caed43..7102efbc 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandProjectLibrary/SarStandProjectLibraryMapper.xml @@ -2,4 +2,13 @@ + + diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml index 573c327a..253602d1 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarStandardsInfo/SarStandardsInfoMapper.xml @@ -52,7 +52,7 @@ SAR_STANDARDS_INFO.stand_number, SAR_STANDARDS_INFO.stand_year, SAR_STANDARDS_INFO.stand_name, SAR_STANDARDS_INFO.stand_en_name, SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, SAR_STANDARDS_INFO.synopsis, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, - SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand,SAR_STANDARDS_INFO.text_status + SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,SAR_STANDARDS_INFO.is_relate_access,SAR_STANDARDS_INFO.cite_stand,SAR_STANDARDS_INFO.cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM @@ -61,7 +61,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, '') as synopsis, concat(replace_stand_num, '') as replace_stand_num, replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME as countryShow, dicstandSort.DIC_TYPE_NAME as standSortShow, - dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status + dicstandState.DIC_TYPE_NAME as standStateShow,dicstandNature.DIC_TYPE_NAME as standNatureShow,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM @@ -70,7 +70,7 @@ SAR_STANDARDS_INFO.stand_state, SAR_STANDARDS_INFO.stand_nature, SAR_STANDARDS_INFO.issue_time, SAR_STANDARDS_INFO.put_time, concat(SAR_STANDARDS_INFO.synopsis, ''), concat(replace_stand_num, ''), replaced_stand_num, SAR_STANDARDS_INFO.creation_user, SAR_STANDARDS_INFO.valid_flag, SAR_STANDARDS_INFO.creation_time, SAR_STANDARDS_INFO.modify_time,dicountry.DIC_TYPE_NAME, dicstandSort.DIC_TYPE_NAME, - dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status + dicstandState.DIC_TYPE_NAME,dicstandNature.DIC_TYPE_NAME,is_relate_access,cite_stand,cited_stand,SAR_STANDARDS_INFO.text_status,SAR_STANDARDS_INFO.STAND_SYSTEM diff --git a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java index 62595607..456e39c7 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/controller/AttFileEOController.java @@ -136,7 +136,8 @@ public class AttFileEOController { String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); response.setHeader("Content-Disposition", "attachment; filename=\""+ fileOldName +"\""); response.setContentType("application/octet-stream"); - is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); os.flush(); @@ -232,7 +233,8 @@ public class AttFileEOController { String fileOldName = fileNameEncoding(attFileEO.getOldFileName(),request); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - is = iFileStore.loadFile(attFileEO.getFilePath()+attFileEO.getFileName()); + File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); os.flush(); @@ -280,7 +282,8 @@ public class AttFileEOController { // WaterMarkUtil.waterMark(oldFilePath,waterFilePath,waterContent); response.setHeader("Content-Disposition", "attachment;filename=\""+fileOldName+"\""); response.setContentType("application/octet-stream"); - is = iFileStore.loadFile(attFileEO.getFilePath()+"waterPath/"+attFileEO.getOldFileName()); + File file = new File(filePath+attFileEO.getFilePath()+attFileEO.getFileName()); + is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); os.flush(); @@ -356,7 +359,8 @@ public class AttFileEOController { String fileOldName = fileNameEncoding(fileName,request); response.setHeader("Content-Disposition", "attachment; filename=" + fileOldName); response.setContentType("application/octet-stream"); - is = iFileStore.loadFile("/modal/"+fileName); + File file = new File(filePath+"/modal/"+fileName); + is = new FileInputStream(file); os = response.getOutputStream(); IOUtils.copy(is, os); os.flush(); diff --git a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java index f2d24b35..e81fdfff 100644 --- a/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/att/service/impl/AttFileEOServiceImpl.java @@ -281,7 +281,7 @@ public class AttFileEOServiceImpl extends ServiceImpl i if(StringUtils.isNotEmpty(idList[i])){ attFileEO.setId(idList[i]); AttFileEO getFile = this.baseMapper.selectFileInfoById(attFileEO); - if(attFileEO != null){ + if(attFileEO != null && getFile != null){ fileObj.add(getFile); } } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java similarity index 89% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java rename to adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java index 34ebbbb5..6a05ff7e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardController.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/controller/SarMenuStandardController.java @@ -1,19 +1,17 @@ -package com.adc.da.slrs.sarMenuStandard.controller; +package com.adc.da.sys.sarMenuStandard.controller; +import com.adc.da.base.web.BaseController; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.sarMenu.entity.SarMenu; -import com.adc.da.slrs.sarMenu.service.ISarMenuService; -import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardService; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; -import io.swagger.annotations.Api; -import com.adc.da.base.web.BaseController; import java.util.Arrays; import java.util.List; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/dao/SarMenuStandardDao.java similarity index 56% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java rename to adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/dao/SarMenuStandardDao.java index 838bb7f5..a41c0310 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/dao/SarMenuStandardDao.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/dao/SarMenuStandardDao.java @@ -1,8 +1,7 @@ -package com.adc.da.slrs.sarMenuStandard.dao; +package com.adc.da.sys.sarMenuStandard.dao; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.springframework.web.bind.annotation.ResponseBody; /** *

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java similarity index 92% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java rename to adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java index cec9006c..36ee728a 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/SarMenuStandard.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java @@ -1,15 +1,11 @@ -package com.adc.da.slrs.sarMenuStandard.entity; +package com.adc.da.sys.sarMenuStandard.entity; import com.adc.da.base.entity.BaseEntity; -import com.adc.da.utils.treetool.annotation.TreeNodeName; -import com.adc.da.utils.treetool.annotation.TreeNodeParentId; +import com.adc.da.sys.utils.treetool.annotation.TreeNodeName; +import com.adc.da.sys.utils.treetool.annotation.TreeNodeParentId; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.time.LocalDateTime; -import java.util.Date; -import java.util.List; - import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -18,6 +14,8 @@ import lombok.experimental.Accessors; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; +import java.util.Date; +import java.util.List; /** *

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java similarity index 86% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java rename to adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java index add1f398..e87377f6 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardService.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/ISarMenuStandardService.java @@ -1,7 +1,7 @@ -package com.adc.da.slrs.sarMenuStandard.service; +package com.adc.da.sys.sarMenuStandard.service; import com.adc.da.http.ResponseMessage; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; @@ -48,4 +48,7 @@ public interface ISarMenuStandardService extends IService { * @return List

*/ List getMenuByIds(List menuIds); + + SarMenuStandard selectMenuById(String id); + } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java similarity index 92% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java rename to adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java index a544f8db..c5c3fd33 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java +++ b/adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/service/impl/SarMenuStandardServiceImpl.java @@ -1,11 +1,10 @@ -package com.adc.da.slrs.sarMenuStandard.service.impl; +package com.adc.da.sys.sarMenuStandard.service.impl; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; -import com.adc.da.slrs.sarMenu.entity.SarMenu; -import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandard; -import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardDao; -import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardService; +import com.adc.da.sys.sarMenuStandard.dao.SarMenuStandardDao; +import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard; +import com.adc.da.sys.sarMenuStandard.service.ISarMenuStandardService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.lang3.StringUtils; @@ -30,6 +29,11 @@ public class SarMenuStandardServiceImpl extends ServiceImpl im @Autowired private IDicEOService dicEODao; + @Autowired + private ISarMenuStandardService iSarMenuStandardService; + public DicTypeEODao getDao() { @@ -168,8 +172,13 @@ public class DicTypeEOServiceImpl extends ServiceImpl im Map resultMap = new HashMap<>(); List diclist = dicEODao.getDictionaryEO(); for (DictionaryEO dictionaryEO : diclist){ - List> relist = getDicTypeByDicCode(dictionaryEO.getDictionaryCode()); - resultMap.put(dictionaryEO.getDictionaryCode(),relist); + if(dictionaryEO.getDictionType().equals("TREE")){ + List treeList = iSarMenuStandardService.getAll(dictionaryEO.getId()); + resultMap.put(dictionaryEO.getDictionaryCode(),treeList); + }else { + List> relist = getDicTypeByDicCode(dictionaryEO.getDictionaryCode()); + resultMap.put(dictionaryEO.getDictionaryCode(),relist); + } } // 查询细类 List> relist = getDicTypeByDicCode("BUSSFINECLASSSHOW"); diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITree.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITree.java new file mode 100644 index 00000000..36abbc42 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITree.java @@ -0,0 +1,32 @@ +package com.adc.da.sys.utils.tree; + +import java.util.List; + +/** + * 操作树的接口类 + * + */ +public interface ITree { + /** + * 获取构建数的list，因为根节点可能不止一个，所有返回List + * 获取的结构与getRoot基本一致，但是后边增加了另外的数据，不建议调用 + * + * @return + */ + List getTree(); + + /** + * 获取根节点树结构，因为根节点可能不止一个，所有返回List + * + * @return + */ + List getRoot(); + + /** + * 获取指定节点数据 + * + * @param nodeId + * @return + */ + TreeNode getTreeNode(String nodeId); +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITreeNode.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITreeNode.java new file mode 100644 index 00000000..87874fc1 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/ITreeNode.java @@ -0,0 +1,43 @@ +package com.adc.da.sys.utils.tree; + +/** + * 需要实现树的实体类需要实现的接口，获取关键数据 + * + */ +public interface ITreeNode { + /** + * TreeNode获取nodeId + * + * @return + */ + String getNodeId(); + + /** + * TreeNode获取nodeName + * + * @return + */ + String getNodeName(); + + /** + * TreeNode获取nodeParentId（父id） + * + * @return + */ + String getNodeParentId(); + + /** + * TreeNode获取orderNum(排序字段用于排序) + * + * @return + */ + Integer getOrderNum(); + + /** + * TreeNode获取nodeLevel(当前属于第几层级) + * + * @return + */ + Integer getNodeLevel(); + +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/Tree.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/Tree.java new file mode 100644 index 00000000..37d6cbd7 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/Tree.java @@ -0,0 +1,132 @@ +package com.adc.da.sys.utils.tree; + +import org.apache.commons.lang3.StringUtils; + +import java.util.*; + +/** + * 构建树形建构 + */ +public class Tree implements ITree { + /** + * 用于存放treeNode的Map + */ + private LinkedHashMap treeNodesMap = new LinkedHashMap<>(); + /** + * 用于存放treeNode的list + */ + private List treeNodesList = new ArrayList<>(); + + /** + * 构造方法 + * + * @param list + */ + public Tree(List list) { + initTreeNodeMap(list); + initTreeNodeList(); + } + + /** + * 将List对象数据转为TreeNodeMap + * + * @param list + */ + private void initTreeNodeMap(List list) { + TreeNode treeNode; + for (ITreeNode item : list) { + treeNode = new TreeNode(item); + treeNode.setLastNodeNum(1); + treeNodesMap.put(treeNode.getNodeId(), treeNode); + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode parentTreeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (StringUtils.isEmpty(treeNode.getParentNodeId())) { + continue; + } + parentTreeNode = treeNodesMap.get(treeNode.getParentNodeId()); + if (parentTreeNode != null) { + treeNode.setParent(parentTreeNode); + parentTreeNode.addChild(treeNode); + // 按照orderNum排序 + Collections.sort(parentTreeNode.getChildren(), new OrdNamComparator()); + // 判断这个节点是否是最子节点 + if (treeNode.getChildren().size() == 0) { + treeNode.setLastNode(true); + } + // 计算每一个节点的最子节点的数量 + List children = parentTreeNode.getChildren(); + if (children.size() > 0) { + int sum = 0; + for (TreeNode treeNode2 : children) { + sum += treeNode2.getLastNodeNum(); + } + parentTreeNode.setLastNodeNum(sum); + } + } + } + } + + /** + * 根据treeNodesMap转为treeNodesList + */ + private void initTreeNodeList() { + if (treeNodesList.size() > 0) { + return; + } + if (treeNodesMap.size() == 0) { + return; + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode treeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (treeNode.getParent() == null) { + this.treeNodesList.add(treeNode); + this.treeNodesList.addAll(treeNode.getAllChildren()); + } + } + } + + @Override + public List getTree() { + return this.treeNodesList; + } + + @Override + public List getRoot() { + List rootList = new ArrayList<>(); + if (this.treeNodesList.size() > 0) { + for (TreeNode node : treeNodesList) { + if (node.getParent() == null) { + rootList.add(node); + Collections.sort(rootList, new OrdNamComparator()); + } + } + } + return rootList; + } + + @Override + public TreeNode getTreeNode(String nodeId) { + return this.treeNodesMap.get(nodeId); + } +} + +/** + * 自定义排序，按照orderNum排序 + */ +class OrdNamComparator implements Comparator { + @Override + public int compare(TreeNode t1, TreeNode t2) { + if (t1.getOrderNum() > t2.getOrderNum()) { + return 1; + } + if (t1.getOrderNum() < t2.getOrderNum()) { + return -1; + } + return t1.getNodeName().compareTo(t2.getNodeName()); + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/TreeNode.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/TreeNode.java new file mode 100644 index 00000000..38d5e75c --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/tree/TreeNode.java @@ -0,0 +1,187 @@ +package com.adc.da.sys.utils.tree; + +import com.alibaba.fastjson.annotation.JSONField; + +import java.util.ArrayList; +import java.util.List; + +public class TreeNode { + + /** + * 树节点ID + */ + @JSONField(ordinal = 1) + private String nodeId; + /** + * 树节点名称 + */ + @JSONField(ordinal = 2) + private String nodeName; + /** + * 父节点ID + */ + @JSONField(ordinal = 3) + private String parentNodeId; + /** + * 节点在树中的排序号 + */ + @JSONField(ordinal = 4) + private int orderNum; + /** + * 节点所在的层级 + */ + @JSONField(ordinal = 5) + private int level; + /** + * 最子节点的数量 + */ + @JSONField(ordinal = 6) + private int lastNodeNum; + + /** + * 是否是最子节点 + */ + @JSONField(ordinal = 7) + private boolean lastNode; + + /** + * 当前节点的儿子节点 + */ + @JSONField(ordinal = 8) + private List children = new ArrayList<>(); + + /** + * 当前节点的完整路径 + */ + @JSONField(ordinal = 9) + private String completeName; + + /** + * 当前节点的父级节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private TreeNode parent; + + /** + * 当前节点的子孙节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private List allChildren = new ArrayList<>(); + + public TreeNode(ITreeNode obj) { + this.nodeId = obj.getNodeId(); + this.nodeName = obj.getNodeName(); + this.parentNodeId = obj.getNodeParentId(); + this.orderNum = obj.getOrderNum(); + this.level = obj.getNodeLevel(); + } + + public TreeNode(TreeNode obj) { + this.orderNum = obj.getOrderNum(); + this.level = obj.getLevel(); + this.lastNodeNum = obj.getLastNodeNum(); + } + + public TreeNode() { + } + + public void addChild(TreeNode treeNode) { + this.children.add(treeNode); + } + + public void removeChild(TreeNode treeNode) { + this.children.remove(treeNode); + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + public String getParentNodeId() { + return parentNodeId; + } + + public void setParentNodeId(String parentNodeId) { + this.parentNodeId = parentNodeId; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + public TreeNode getParent() { + return parent; + } + + public void setParent(TreeNode parent) { + this.parent = parent; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public int getOrderNum() { + return orderNum; + } + + public void setOrderNum(int orderNum) { + this.orderNum = orderNum; + } + + public int getLastNodeNum() { + return lastNodeNum; + } + + public void setLastNodeNum(int lastNodeNum) { + this.lastNodeNum = lastNodeNum; + } + + public boolean isLastNode() { + return lastNode; + } + + public void setLastNode(boolean lastNode) { + this.lastNode = lastNode; + } + + public List getAllChildren() { + if (this.allChildren.isEmpty()) { + for (TreeNode treeNode : this.children) { + this.allChildren.add(treeNode); + this.allChildren.addAll(treeNode.getAllChildren()); + } + } + return this.allChildren; + } + + public String getCompleteName() { + return completeName; + } + + public void setCompleteName(String completeName) { + this.completeName = completeName; + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/OrdNamComparator.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/OrdNamComparator.java new file mode 100644 index 00000000..f102f4de --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/OrdNamComparator.java @@ -0,0 +1,21 @@ +package com.adc.da.sys.utils.treetool; + +import java.util.Comparator; + +/** + * List 排序 Comparator + * @author david + */ +public class OrdNamComparator implements Comparator { + + @Override + public int compare(TreeNode t1, TreeNode t2) { + if (t1.getOrderNum() > t2.getOrderNum()) { + return 1; + } + if (t1.getOrderNum() < t2.getOrderNum()) { + return -1; + } + return t1.getNodeName().compareTo(t2.getNodeName()); + } +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/Tree.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/Tree.java new file mode 100644 index 00000000..2d63654a --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/Tree.java @@ -0,0 +1,179 @@ +package com.adc.da.sys.utils.treetool; + +import com.adc.da.sys.utils.treetool.annotation.*; +import org.apache.commons.lang3.StringUtils; + +import java.lang.reflect.Field; +import java.util.*; + +//import group.ipp.tree.util.annotation.TreeNodeLevel; +//import group.ipp.tree.util.annotation.TreeNodeName; +//import group.ipp.tree.util.annotation.TreeNodeOrder; +//import group.ipp.tree.util.annotation.TreeNodeParentId; + +/** + * 构建树形建构 + * + * @author David + */ +public class Tree { + /** + * 用于存放treeNode的Map + */ + private LinkedHashMap treeNodesMap = new LinkedHashMap<>(); + /** + * 用于存放treeNode的list + */ + private List treeNodesList = new ArrayList<>(); + + /** + * 构造方法 + * + * @param list + */ + public Tree(List list) { + initTreeNodeMap(list); + initTreeNodeList(); + } + + /** + * 将List对象数据转为TreeNodeMap + * + * @param list + */ + private void initTreeNodeMap(List list) { + TreeNode treeNode; + for (Object item : list) { + treeNode = new TreeNode(); + treeNode.setNodeId(getFieldValue(item, "TreeNodeId")); + treeNode.setNodeName(getFieldValue(item, "TreeNodeName")); + treeNode.setParentNodeId(getFieldValue(item, "TreeNodeParentId")); + if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeLevel"))) { + treeNode.setLevel(0); + } else { + treeNode.setLevel(Integer.parseInt(getFieldValue(item, "TreeNodeLevel"))); + } + if(StringUtils.isEmpty(getFieldValue(item, "TreeNodeOrder"))) { + treeNode.setOrderNum(0); + } else { + treeNode.setOrderNum(Integer.parseInt(getFieldValue(item, "TreeNodeOrder"))); + } + treeNode.setLastNodeNum(1); + treeNode.setData(item); + treeNodesMap.put(treeNode.getNodeId(), treeNode); + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode parentTreeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (StringUtils.isEmpty(treeNode.getParentNodeId())) { + continue; + } + parentTreeNode = treeNodesMap.get(treeNode.getParentNodeId()); + if (parentTreeNode != null) { + treeNode.setParent(parentTreeNode); + parentTreeNode.addChild(treeNode); + // 按照orderNum排序 + Collections.sort(parentTreeNode.getChildren(), new OrdNamComparator()); + // 判断这个节点是否是最子节点 + if (treeNode.getChildren().size() == 0) { + treeNode.setLastNode(true); + } + // 计算每一个节点的最子节点的数量 + List children = parentTreeNode.getChildren(); + if (children.size() > 0) { + int sum = 0; + for (TreeNode treeNode2 : children) { + sum += treeNode2.getLastNodeNum(); + } + parentTreeNode.setLastNodeNum(sum); + } + } + } + } + + private String getFieldValue(Object obj, String type) { + Class clz = obj.getClass(); + Field[] fields = clz.getDeclaredFields(); + String value = null; + try { + for(Field field : fields){ + field.setAccessible(true); + switch (type){ + case "TreeNodeId": + if(field.isAnnotationPresent(TreeNodeId.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeParentId": + if(field.isAnnotationPresent(TreeNodeParentId.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeName": + if(field.isAnnotationPresent(TreeNodeName.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeOrder": + if(field.isAnnotationPresent(TreeNodeOrder.class)) { + value = String.valueOf(field.get(obj)); + } + break; + case "TreeNodeLevel": + if(field.isAnnotationPresent(TreeNodeLevel.class)) { + value = String.valueOf(field.get(obj)); + } + break; + default: + break; + } + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + return value; + } + + /** + * 根据treeNodesMap转为treeNodesList + */ + private void initTreeNodeList() { + if (treeNodesList.size() > 0) { + return; + } + if (treeNodesMap.size() == 0) { + return; + } + Iterator iterator = treeNodesMap.values().iterator(); + TreeNode treeNode; + while (iterator.hasNext()) { + treeNode = iterator.next(); + if (treeNode.getParent() == null) { + this.treeNodesList.add(treeNode); + this.treeNodesList.addAll(treeNode.getAllChildren()); + } + } + } + + public List getTree() { + return this.treeNodesList; + } + + public List getRoot() { + List rootList = new ArrayList<>(); + if (this.treeNodesList.size() > 0) { + for (TreeNode node : treeNodesList) { + if (node.getParent() == null) { + rootList.add(node); + Collections.sort(rootList, new OrdNamComparator()); + } + } + } + return rootList; + } + + public TreeNode getTreeNode(String nodeId) { + return this.treeNodesMap.get(nodeId); + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/TreeNode.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/TreeNode.java new file mode 100644 index 00000000..34070063 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/TreeNode.java @@ -0,0 +1,202 @@ +package com.adc.da.sys.utils.treetool; + +import com.alibaba.fastjson.annotation.JSONField; + +import java.util.ArrayList; +import java.util.List; + +/** + * @author David + */ +public class TreeNode { + + /** + * 树节点ID + */ + @JSONField(ordinal = 1) + private String nodeId; + /** + * 树节点名称 + */ + @JSONField(ordinal = 2) + private String nodeName; + /** + * 父节点ID + */ + @JSONField(ordinal = 3) + private String parentNodeId; + /** + * 节点在树中的排序号 + */ + @JSONField(ordinal = 4) + private int orderNum; + /** + * 节点所在的层级 + */ + @JSONField(ordinal = 5) + private int level; + /** + * 最子节点的数量 + */ + @JSONField(ordinal = 6) + private int lastNodeNum; + + /** + * 是否是最子节点 + */ + @JSONField(ordinal = 7) + private boolean lastNode; + + private Object data; + + /** + * 当前节点的儿子节点 + */ + @JSONField(ordinal = 8) + private List children = new ArrayList<>(); + + /** + * 当前节点的完整路径 + */ + @JSONField(ordinal = 9) + private String completeName; + + /** + * 当前节点的父级节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private TreeNode parent; + + /** + * 当前节点的子孙节点 + * 转json的时候忽略此属性，因为此属性到前端无作用 + */ + @JSONField(serialize = false) + private List allChildren = new ArrayList<>(); + + private int standFlag; + + public TreeNode(TreeNode obj) { + this.orderNum = obj.getOrderNum(); + this.level = obj.getLevel(); + this.lastNodeNum = obj.getLastNodeNum(); + } + + public TreeNode() { + } + + public void addChild(TreeNode treeNode) { + this.children.add(treeNode); + } + + public void removeChild(TreeNode treeNode) { + this.children.remove(treeNode); + } + + public String getNodeId() { + return nodeId; + } + + public void setNodeId(String nodeId) { + this.nodeId = nodeId; + } + + public String getNodeName() { + return nodeName; + } + + public void setNodeName(String nodeName) { + this.nodeName = nodeName; + } + + public String getParentNodeId() { + return parentNodeId; + } + + public void setParentNodeId(String parentNodeId) { + this.parentNodeId = parentNodeId; + } + + public int getLevel() { + return level; + } + + public void setLevel(int level) { + this.level = level; + } + + public TreeNode getParent() { + return parent; + } + + public void setParent(TreeNode parent) { + this.parent = parent; + } + + public List getChildren() { + return children; + } + + public void setChildren(List children) { + this.children = children; + } + + public int getOrderNum() { + return orderNum; + } + + public void setOrderNum(int orderNum) { + this.orderNum = orderNum; + } + + public int getLastNodeNum() { + return lastNodeNum; + } + + public void setLastNodeNum(int lastNodeNum) { + this.lastNodeNum = lastNodeNum; + } + + public boolean isLastNode() { + return lastNode; + } + + public void setLastNode(boolean lastNode) { + this.lastNode = lastNode; + } + + public List getAllChildren() { + if (this.allChildren.isEmpty()) { + for (TreeNode treeNode : this.children) { + this.allChildren.add(treeNode); + this.allChildren.addAll(treeNode.getAllChildren()); + } + } + return this.allChildren; + } + + public String getCompleteName() { + return completeName; + } + + public void setCompleteName(String completeName) { + this.completeName = completeName; + } + + public Object getData() { + return data; + } + + public void setData(Object data) { + this.data = data; + } + + public int getStandFlag() { + return standFlag; + } + + public void setStandFlag(int standFlag) { + this.standFlag = standFlag; + } +} \ No newline at end of file diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeId.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeId.java new file mode 100644 index 00000000..b212109e --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeId.java @@ -0,0 +1,12 @@ +package com.adc.da.sys.utils.treetool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeId { +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeLevel.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeLevel.java new file mode 100644 index 00000000..0dde7e37 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeLevel.java @@ -0,0 +1,12 @@ +package com.adc.da.sys.utils.treetool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeLevel { +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeName.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeName.java new file mode 100644 index 00000000..8d1dbaf4 --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeName.java @@ -0,0 +1,12 @@ +package com.adc.da.sys.utils.treetool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeName { +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeOrder.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeOrder.java new file mode 100644 index 00000000..fa77789f --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeOrder.java @@ -0,0 +1,12 @@ +package com.adc.da.sys.utils.treetool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeOrder { +} diff --git a/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeParentId.java b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeParentId.java new file mode 100644 index 00000000..149cecac --- /dev/null +++ b/adc-da-sys/src/main/java/com/adc/da/sys/utils/treetool/annotation/TreeNodeParentId.java @@ -0,0 +1,12 @@ +package com.adc.da.sys.utils.treetool.annotation; + +import java.lang.annotation.*; + +/** + * @author david + */ +@Retention(RetentionPolicy.RUNTIME) +@Target({ElementType.FIELD}) +@Documented +public @interface TreeNodeParentId { +} diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml b/adc-da-sys/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml similarity index 100% rename from adc-da-slrs/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml rename to adc-da-sys/src/main/resources/mybatis/mapper/sarMenuStandard/SarMenuStandardMapper.xml