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

feat: 体系数据列表 preview version

Browse Source
This commit is contained in:
mzaxd
2023-11-15 14:31:18 +08:00
parent a3f6748a36
commit 43eb0769e1
9 changed files with 234 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/dao/SarBussionessStandDao.java
+3
View File
@@ -3,6 +3,7 @@ package com.adc.da.slrs.sarBussionessStand.dao;
import com.adc.da.slrs.sarBussionessStand.entity.OldSystem;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand;
import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport;
import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO;
import com.adc.da.slrs.sarStandardsInfo.entity.RecommendVO;
import com.adc.da.slrs.sarStandardsInfo.entity.SarBussionessStandEOPage;
import com.adc.da.slrs.sarStandardsInfo.entity.SarStandardsInfo;
@@ -138,5 +139,7 @@ public interface SarBussionessStandDao extends BaseMapper<SarBussionessStand> {
List<SarBussionessStand> selectAllStandStatus();
String selectMaxStandSn(String standSort);
List<StandSystemDTO> getESSystemData(@Param("param") StandSystemDTO standSystemDTO);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/controller/SarMenuStandardNewController.java
+19 -1
View File
@@ -5,10 +5,12 @@ 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.SarMenuStandardNew;
import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO;
import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
import com.adc.da.slrs.sarUser.service.ITsUserService;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.adc.da.util.LoginUserUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.ObjectUtils;
@@ -16,6 +18,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -29,7 +32,7 @@ import java.util.List;
@RestController
@Api(tags = "福田标准法规--标准法规库-菜单标准体系")
@RequestMapping("/${restPath}/lawss/sarMenuStandardLimit")
public class SarMenuStandardNewController extends BaseController<SarMenuStandardNew> {
public class SarMenuStandardNewController extends BaseController<StandSystemDTO> {
@Autowired
private ISarMenuStandardNewService iSarMenuStandardNewService;
@@ -95,4 +98,19 @@ public class SarMenuStandardNewController extends BaseController<SarMenuStandard
public ResponseMessage<?> standardSystemTree() {
return Result.success(iSarMenuStandardNewService.standardSystemTree());
}
@ApiOperation("法规弹窗列表")
@PostMapping("/standardSystemList")
public ResponseMessage<?> standardSystemList(@RequestBody StandSystemDTO standSystemDTO) {
List<StandSystemDTO> standSystemDTOS = iSarMenuStandardNewService.standardSystemList(standSystemDTO);
return Result.success(getPageInfo(standSystemDTO.getPager(), standSystemDTOS));
}
@ApiOperation("法规列表弹窗Excel导出")
@GetMapping("/standardSystemListExport")
public ResponseMessage<?> standardSystemListExport(@RequestBody StandSystemDTO standSystemDTO,
HttpServletResponse response) {
iSarMenuStandardNewService.standardSystemListExport(standSystemDTO, response);
return Result.success();
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+98
View File
@@ -0,0 +1,98 @@
package com.adc.da.slrs.sarMenuStandard.entity;
import com.adc.da.base.page.BasePage;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
* @author: Mzaxd
* @Date: 2023/11/14 17:20
*/
@EqualsAndHashCode(callSuper = true)
@Data
@NoArgsConstructor
@AllArgsConstructor
@Accessors(chain = true)
public class StandSystemDTO extends BasePage {
@ApiModelProperty(value = "节点Id")
private String menuId;
@ApiModelProperty(value = "体系结构")
private String standSystem;
@ApiModelProperty(value = "标准Id")
private String standId;
@ApiModelProperty(value = "标准编号")
private String standNo;
@ApiModelProperty(value = "标准名称")
private String standName;
@ApiModelProperty(value = "标准状态")
private String standState;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始发布日期")
private Date startReleaseDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "结束发布日期")
private Date endReleaseDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "开始实施日期")
private Date startImplementDate;
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern="yyyy-MM-dd")
@ApiModelProperty(value = "结束实施日期")
private Date endImplementDate;
@ApiModelProperty(value = "代替标准")
private String replaceStandardNo;
@ApiModelProperty(value = "编制单位Id")
private String deptId;
@ApiModelProperty(value = "编制单位")
private String dept;
@ApiModelProperty(value = "起草人Id")
private String draftUserId;
@ApiModelProperty(value = "起草人")
private String draftUserName;
@ApiModelProperty(value = "数据来源")
private String dataSource;
@ApiModelProperty(value = "发布日期排序规则")
private String orderReleaseDate;
@ApiModelProperty(value = "实施日期排序规则")
private String orderImplementDate;
private String selectIds;
private List<String> selectIdList;
public void setSelectIds(String selectIds) {
this.selectIds = selectIds;
this.selectIdList = java.util.Arrays.asList(selectIds.split(","));
}
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/ISarMenuStandardNewService.java
+7
View File
@@ -1,9 +1,12 @@
package com.adc.da.slrs.sarMenuStandard.service;
import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO;
import com.adc.da.sys.sarMenuStandard.entity.SarMenuStandard;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -31,4 +34,8 @@ public interface ISarMenuStandardNewService extends IService<SarMenuStandardNew>
SarMenuStandard getMenuStandardById(String menuId);
List<SarMenuStandard> standardSystemTree();
List<StandSystemDTO> standardSystemList(StandSystemDTO standSystemDTO);
void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response);
}
adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+44
View File
@@ -1,9 +1,13 @@
package com.adc.da.slrs.sarMenuStandard.service.impl;
import com.adc.da.exception.AdcDaBaseException;
import com.adc.da.scheduled.dao.SarStandardInfoDao;
import com.adc.da.slrs.sarBussStandMenu.entity.SarBussStandMenu;
import com.adc.da.slrs.sarBussStandMenu.service.ISarBussStandMenuService;
import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
import com.adc.da.slrs.sarMenuStandard.dao.SarMenuStandardNewDao;
import com.adc.da.slrs.sarMenuStandard.entity.SarMenuStandardNew;
import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO;
import com.adc.da.slrs.sarMenuStandard.service.ISarMenuStandardNewService;
import com.adc.da.slrs.sarResource.dao.TsResourceDao;
import com.adc.da.slrs.sarRole.dao.TsRoleDao;
@@ -18,6 +22,7 @@ import com.adc.da.util.LoginUserUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
@@ -27,6 +32,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;
@@ -54,6 +60,10 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
private ISarBussStandMenuService sarBussStandMenuService;
@Resource
private SarStandMenuDao sarStandMenuDao;
@Resource
private SarStandardInfoDao sarStandardInfoDao;
@Resource
private SarBussionessStandDao sarBussionessStandDao;
@Override
public String getTopMenu(SarMenuStandardNew sarMenuStandardNew){
@@ -166,6 +176,40 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
return TsResources;
}
@Override
public List<StandSystemDTO> standardSystemList(StandSystemDTO standSystemDTO) {
String menuId = standSystemDTO.getMenuId();
// 校验menuId不能为空
if (StringUtils.isBlank(menuId)) {
throw new AdcDaBaseException("menuId不能为空");
}
// 查国标
List<StandSystemDTO> gbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "INLAND");
// 查外标
List<StandSystemDTO> fbList = sarStandMenuDao.getStandInfoSystemData(standSystemDTO, "FOREIGN");
// 查企标
// List<StandSystemDTO> esList = sarBussionessStandDao.getESSystemData(standSystemDTO);
// 数据转换后整合
List<StandSystemDTO> resultList = new ArrayList<>();
resultList.addAll(gbList);
resultList.addAll(fbList);
// resultList.addAll(esList);
// 构造体系路径
// TODO 排序
// 按照标准体系排序
// 体系内部按照国内/海外/企业排序
// 每个类别的标准内部按照搜索中心设定的类别排序
standSystemDTO.getPager().setRowCount(resultList.size());
return resultList;
}
@Override
public void standardSystemListExport(StandSystemDTO standSystemDTO, HttpServletResponse response) {
// List<StandSystemDTO> exportList = this.standardSystemList(standSystemDTO);
// // TODO 导出
}
@Override
public Integer updateMenuStandard(SarMenuStandardNew sarMenuStandardNew) {
SarMenuStandard menuStandarddb = dao.selectById(sarMenuStandardNew.getId());
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandMenu/dao/SarStandMenuDao.java
+3
View File
@@ -1,7 +1,9 @@
package com.adc.da.slrs.sarStandMenu.dao;
import com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO;
import com.adc.da.slrs.sarStandMenu.entity.SarStandMenu;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import javax.annotation.Resource;
import java.util.List;
@@ -35,4 +37,5 @@ public interface SarStandMenuDao extends BaseMapper<SarStandMenu> {
List<SarStandMenu> getFBStandMenu();
List<StandSystemDTO> getStandInfoSystemData(@Param("param") StandSystemDTO standSystemDTO, @Param("dataSource") String dataSource);
}
adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+53
View File
@@ -156,5 +156,58 @@
where stand.STAND_TYPE = 'FOREIGN'
</select>
<select id="getStandInfoSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
SELECT
gb.ID AS standId,
gb.STAND_NUMBER AS standNo,
gb.STAND_NAME AS standName,
gb.STAND_STATE AS standState,
gb.ISSUE_TIME AS releaseDate,
gb.PUT_TIME AS implementDate,
gb.REPLACE_STAND_NUM AS replaceStandardNo,
gba.QCDW AS deptId,
o.ORG_NAME AS dept,
gba.WSSMR AS draftUserId,
u.UNAME AS draftUserName,
gb.STAND_TYPE AS dataSource
FROM
`sar_standards_info` AS gb
LEFT JOIN `sar_stand_attr_info` AS gba ON gb.ID = gba.STAND_ID
LEFT JOIN `ts_user` AS u ON gba.WSSMR = u.USID
LEFT JOIN `ts_org` AS o ON gba.QCDW = o.ID
WHERE gb.STAND_TYPE = 'INLAND'
<!--标准编号-->
<if test="param.standNo != null and param.standNo != ''">
AND gb.STAND_NUMBER LIKE CONCAT('%',#{param.standNo},'%')
</if>
<!--标准名称-->
<if test="param.standName != null and param.standName != ''">
AND gb.STAND_NAME LIKE CONCAT('%',#{param.standName},'%')
</if>
<!--发布时间-->
<if test="param.startReleaseDate != null and param.endReleaseDate != null">
AND gb.ISSUE_TIME BETWEEN #{param.startReleaseDate} AND #{param.endReleaseDate}
</if>
<!--实施日期-->
<if test="param.startImplementDate != null and param.endImplementDate != null">
AND gb.PUT_TIME BETWEEN #{param.startImplementDate} AND #{param.endImplementDate}
</if>
<!--代替标准-->
<if test="param.replaceStandardNo != null and param.replaceStandardNo != null">
AND gb.REPLACE_STAND_NUM LIKE CONCAT('%',#{param.replaceStandardNo},'%')
</if>
<!--编制单位-->
<if test="param.dept != null and param.dept != null">
AND o.ORG_NAME LIKE CONCAT('%',#{param.dept},'%')
</if>
<!--起草人-->
<if test="param.draftUserName != null and param.draftUserName != null">
AND u.UNAME LIKE CONCAT('%',#{param.draftUserName},'%')
</if>
<!--数据来源-->
<if test="param.dataSource != null and param.dataSource != null">
AND gb.STAND_TYPE = #{dataSource}
</if>
</select>
</mapper>
adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+6
View File
@@ -1267,4 +1267,10 @@
where id = #{attfId}
</update>
<select id="getESSystemData" resultType="com.adc.da.slrs.sarMenuStandard.entity.StandSystemDTO">
</select>
</mapper>
adc-da-sys/src/main/java/com/adc/da/sys/sarMenuStandard/entity/SarMenuStandard.java
+1 -1
View File
@@ -110,8 +110,8 @@ public class SarMenuStandard extends BaseEntity {
@ApiModelProperty(value = "树层级")
@TableField(exist = false)
private Integer level;
@TableField(exist = false)
private Integer gbStandCount;
@TableField(exist = false)