合并分支 'dev_xy_20230509' 到 'master'

Dev xy 20230509

查看合并请求 laws-foton-slrs/foton-slrs-system-rest!74

adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java

@@ -168,6 +168,11 @@ public class WebMvcConfig implements WebMvcConfigurer {
     // 操作日志导出
     addInterceptor.excludePathPatterns("/api/sysLog/sys-log/exportSysLogExcelVOExcelData");
 
+    // 对外接口：读取目录树接口
+    addInterceptor.excludePathPatterns("/api/pdmcSarResource/ts-resource/getMenu");
+    // 对外接口：读取海外标准和国家标准文件接口
+    addInterceptor.excludePathPatterns("/api/pdmcSarStandardsInfo/sar-standards-info/getSarStandardsInfo");
+
 
 
     addInterceptor.excludePathPatterns("/api/search/resetSearchCenter/resetALLSearchCenterForExits");

adc-da-main/src/main/java/com/adc/da/main/config/MybatisPlusConfig.java

@@ -17,7 +17,9 @@ public class MybatisPlusConfig {
 
     @Bean
     public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        paginationInterceptor.setLimit(-1);
+        return paginationInterceptor;
     }
 
     /***

adc-da-slrs/src/main/java/com/adc/da/pdmcSarResource/controller/PDMCSarResourceController.java

@@ -0,0 +1,42 @@
+package com.adc.da.pdmcSarResource.controller;
+
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.pdmcSarResource.entity.PDMCSarResource;
+import com.adc.da.pdmcSarResource.service.PDMCSarResourceService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 对外接口：目录树接口
+ * </p>
+ *
+ * @author wxy
+ * @date 2023-05-10
+ */
+@Api("目录树接口")
+@RestController
+@RequestMapping("/api/pdmcSarResource/ts-resource")
+public class PDMCSarResourceController extends BaseController<PDMCSarResource> {
+    @Resource
+    private PDMCSarResourceService pdmcSarResourceService;
+
+    @ApiOperation("获取目录菜单树")
+    @GetMapping("/getMenu")
+    public ResponseMessage<List<PDMCSarResource>> getMenu() {
+        List<PDMCSarResource> menuList = pdmcSarResourceService.getMenuList();
+        if (menuList.isEmpty()){
+            return Result.error("404","目录为空",menuList);
+        }
+        return Result.success(menuList);
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/pdmcSarResource/dao/PDMCSarResourceDao.java

@@ -0,0 +1,10 @@
+package com.adc.da.pdmcSarResource.dao;
+
+import com.adc.da.pdmcSarResource.entity.PDMCSarResource;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface PDMCSarResourceDao extends BaseMapper<PDMCSarResource> {
+
+}

adc-da-slrs/src/main/java/com/adc/da/pdmcSarResource/entity/PDMCSarResource.java

@@ -0,0 +1,48 @@
+package com.adc.da.pdmcSarResource.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+
+/**
+ * <p>
+ * 对外接口，目录实体类
+ * </p>
+ *
+ * @author wxy
+ * @date 2023-05-10
+ */
+@ApiModel(value = "PDMCTsResource对象",description = "")
+@Data
+@TableName("ts_resource")
+@Accessors(chain = true)
+public class PDMCSarResource {
+    @ApiModelProperty("ID")
+    @TableId("ID")
+    private String id;
+
+    @ApiModelProperty("父级ID")
+    @TableField("PARENT_ID")
+    private String parentId;
+
+    @ApiModelProperty("目录名称")
+    @TableField("MENU_NAME")
+    private String menuName;
+
+    @ApiModelProperty("法规类型")
+    @TableField("SOR_DIVIDE")
+    private String sorDivide;
+
+    @ApiModelProperty("预留字段")
+    @TableField("REMARKS")
+    private String remarks;
+
+    @ApiModelProperty("排序字段")
+    @TableField("DISPLAY_SEQ")
+    private Long displaySeq;
+}

adc-da-slrs/src/main/java/com/adc/da/pdmcSarResource/service/PDMCSarResourceService.java

@@ -0,0 +1,10 @@
+package com.adc.da.pdmcSarResource.service;
+
+import com.adc.da.pdmcSarResource.entity.PDMCSarResource;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+public interface PDMCSarResourceService extends IService<PDMCSarResource> {
+    List<PDMCSarResource> getMenuList();
+}

adc-da-slrs/src/main/java/com/adc/da/pdmcSarResource/service/impl/PDMCSarResourceServiceImpl.java

@@ -0,0 +1,48 @@
+package com.adc.da.pdmcSarResource.service.impl;
+
+import com.adc.da.pdmcSarResource.dao.PDMCSarResourceDao;
+import com.adc.da.pdmcSarResource.entity.PDMCSarResource;
+import com.adc.da.pdmcSarResource.service.PDMCSarResourceService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 对外接口ServiceImpl：目录树接口
+ * </p>
+ *
+ * @author wxy
+ * @date 2023-05-10
+ */
+@Service
+public class PDMCSarResourceServiceImpl extends ServiceImpl<PDMCSarResourceDao, PDMCSarResource> implements PDMCSarResourceService {
+    @Resource
+    private PDMCSarResourceDao pdmcSarResourceDao;
+
+    @Override
+    public List<PDMCSarResource> getMenuList() {
+        List<PDMCSarResource> pdmcSarResourceList = new ArrayList<>();
+
+        QueryWrapper<PDMCSarResource> queryWrapper =new QueryWrapper<>();
+        queryWrapper.isNull("PARENT_ID");
+        queryWrapper.eq("VALID_FLAG","0");
+        queryWrapper.eq("SOR_DIVIDE","INLAND_STAND").or().eq("SOR_DIVIDE","FOREIGN_STAND");
+//        queryWrapper.orderByAsc("DISPLAY_SEQ");
+        pdmcSarResourceList=pdmcSarResourceDao.selectList(queryWrapper);
+        List<PDMCSarResource> pdmcSarResourceListTemp = new ArrayList<>(pdmcSarResourceList);
+        for(PDMCSarResource resource:pdmcSarResourceListTemp){
+            QueryWrapper<PDMCSarResource> TsResourceQueryWrapper=new QueryWrapper<>();
+            TsResourceQueryWrapper.eq("VALID_FLAG","0");
+            TsResourceQueryWrapper.like("PARENT_IDS",","+resource.getId()+",");
+//            TsResourceQueryWrapper.orderByAsc("DISPLAY_SEQ");
+            List<PDMCSarResource> children=pdmcSarResourceDao.selectList(TsResourceQueryWrapper);
+            pdmcSarResourceList.addAll(children);
+        }
+        return pdmcSarResourceList;
+    }
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/controller/PDMCSarLawsStandInfoController.java

@@ -0,0 +1,65 @@
+package com.adc.da.slrs.pdmcSarLawsStandInfo.controller;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.adc.da.base.web.BaseController;
+import com.adc.da.http.PageInfo;
+import com.adc.da.http.ResponseMessage;
+import com.adc.da.http.Result;
+import com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo;
+import com.adc.da.slrs.pdmcSarLawsStandInfo.service.PDMCSarLawsStandInfoService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * <p>
+ * 对外接口：福田标准法规--标准法规库--国内标准法规
+ * </p>
+ *
+ * @author wxy
+ * @date 2023-05-09
+ */
+@Api("对外接口：福田标准法规--标准法规库--国内标准法规")
+@RestController
+@RequestMapping("/${restPath}/pdmcSarStandardsInfo/sar-standards-info")
+public class PDMCSarLawsStandInfoController extends BaseController<PDMCSarLawsStandInfo> {
+    public static final Logger logger = LoggerFactory.getLogger(PDMCSarLawsStandInfoController.class);
+
+    @Resource
+    private PDMCSarLawsStandInfoService pdmcSarLawsStandInfoService;
+
+    @ApiOperation("对外提供的SarStandardsInfo信息接口")
+    @GetMapping("getSarStandardsInfo")
+    public ResponseMessage<PageInfo<PDMCSarLawsStandInfo>> getSarStandardsInfoPage(
+            @RequestParam(value = "current", defaultValue = "1") Long current,
+            @RequestParam(value = "limit",required = false) Long limit) throws Exception {
+        if (ObjectUtil.isEmpty(limit)){
+            int count = pdmcSarLawsStandInfoService.getSarStandardsCount();
+            if (count == 0) {
+                return Result.error("文件信息为空");
+            }
+            limit = (long) count;
+        }
+        Page<PDMCSarLawsStandInfo> page = new Page<>(current, limit);
+        Page<PDMCSarLawsStandInfo> sarStandardsInfoPage = pdmcSarLawsStandInfoService.getSarStandardsInfo(page);
+
+        PageInfo<PDMCSarLawsStandInfo> pdmcSarLawsStandInfoPageInfo = new PageInfo<>();
+        pdmcSarLawsStandInfoPageInfo.setList(sarStandardsInfoPage.getRecords());
+        pdmcSarLawsStandInfoPageInfo.setPageNo((int)sarStandardsInfoPage.getCurrent());
+        pdmcSarLawsStandInfoPageInfo.setCount(sarStandardsInfoPage.getTotal());
+        pdmcSarLawsStandInfoPageInfo.setPageSize((int) sarStandardsInfoPage.getSize());
+        if (pdmcSarLawsStandInfoPageInfo.getList().isEmpty()) {
+            return Result.error("404","文件信息为空",pdmcSarLawsStandInfoPageInfo);
+        }
+        return Result.success(pdmcSarLawsStandInfoPageInfo);
+    }
+
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/dao/PDMCSarLawsStandInfoDao.java

@@ -0,0 +1,16 @@
+package com.adc.da.slrs.pdmcSarLawsStandInfo.dao;
+
+import com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface PDMCSarLawsStandInfoDao extends BaseMapper<PDMCSarLawsStandInfo> {
+    Page<PDMCSarLawsStandInfo> getSarStandardsInfo(@Param("page")Page<PDMCSarLawsStandInfo> page);
+
+    int getSarStandardsCount();
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/entity/PDMCSarLawsStandInfo.java

@@ -0,0 +1,73 @@
+package com.adc.da.slrs.pdmcSarLawsStandInfo.entity;
+
+import com.adc.da.base.entity.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+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;
+
+/**
+ * PDMCSarLawsStandInfo对象
+ *
+ * @author wxy
+ * @date 2023-05-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ApiModel(value = "PDMCSarLawsStandInfo对象",description = "")
+@TableName("sar_standards_info")
+public class PDMCSarLawsStandInfo extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+    // 文件ID
+    @ApiModelProperty(value = "主键")
+    @TableId("ID")
+    private String id;
+    // 所属目录ID
+    @ApiModelProperty(value = "所属目录ID")
+    @TableField("MENU_ID")
+    private String menuId;
+
+    @ApiModelProperty(value = "文件编号，政策编号")
+    @TableField("STAND_NUMBER")
+    private String standNumber;
+
+    @ApiModelProperty(value = "中文名称")
+    @TableField("STAND_NAME")
+    private String standName;
+
+    @ApiModelProperty(value = "英文名称")
+    @TableField("STAND_EN_NAME")
+    private String standEnName;
+
+    @ApiModelProperty(value = "文本状态")
+    @TableField("TEXT_STATUS")
+    private String textState;
+
+    @ApiModelProperty(value = "代替标准号")
+    @TableField("REPLACE_STAND_NUM")
+    private String replaceStandNum;
+
+    @ApiModelProperty(value = "发文日期")
+    @TableField("ISSUE_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String issueTime;
+
+    @ApiModelProperty("实施日期")
+    @TableField("PUT_TIME")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private String putTime;
+
+    @ApiModelProperty(value = "顺序编号")
+    @TableField(exist = false)
+    private Long sort;
+
+    @ApiModelProperty(value = "链接")
+    @TableField(exist = false)
+    private String link;
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/PDMCSarLawsStandInfoService.java

@@ -0,0 +1,19 @@
+package com.adc.da.slrs.pdmcSarLawsStandInfo.service;
+
+import com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * 对外接口Service：福田标准法规--标准法规库--国内标准法规
+ *
+ * @author wxy
+ * @date 2023-05-09
+ */
+public interface PDMCSarLawsStandInfoService extends IService<PDMCSarLawsStandInfo> {
+    Page<PDMCSarLawsStandInfo> getSarStandardsInfo(Page<PDMCSarLawsStandInfo> page);
+
+    int getSarStandardsCount();
+}

adc-da-slrs/src/main/java/com/adc/da/slrs/pdmcSarLawsStandInfo/service/impl/PDMCSarLawsStandInfoServiceImpl.java

@@ -0,0 +1,31 @@
+package com.adc.da.slrs.pdmcSarLawsStandInfo.service.impl;
+
+import com.adc.da.slrs.pdmcSarLawsStandInfo.dao.PDMCSarLawsStandInfoDao;
+import com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo;
+import com.adc.da.slrs.pdmcSarLawsStandInfo.service.PDMCSarLawsStandInfoService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 对外接口ServiceImpl：福田标准法规--标准法规库--国内标准法规
+ *
+ * @author wxy
+ * @date 2023-05-09
+ */
+@Service
+public class PDMCSarLawsStandInfoServiceImpl extends ServiceImpl<PDMCSarLawsStandInfoDao, PDMCSarLawsStandInfo> implements PDMCSarLawsStandInfoService {
+
+    @Override
+    public Page<PDMCSarLawsStandInfo> getSarStandardsInfo(Page<PDMCSarLawsStandInfo> page) {
+
+        return baseMapper.getSarStandardsInfo(page);
+    }
+
+    @Override
+    public int getSarStandardsCount() {
+        return baseMapper.getSarStandardsCount();
+    }
+}

adc-da-slrs/src/main/resources/mybatis/mapper/pdmcSarLawsStandInfo/PDMCSarLawsStandInfoMapper.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.adc.da.slrs.pdmcSarLawsStandInfo.dao.PDMCSarLawsStandInfoDao">
+
+    <!-- Result Map-->
+    <resultMap id="BaseResultMap" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
+        <result property="id" column="id" javaType="String"/>
+        <result property="menuId" column="MENU_ID"/>
+        <result property="standNumber" column="STAND_NUMBER"/>
+        <result property="standName" column="STAND_NAME"/>
+        <result property="standEnName" column="STAND_EN_NAME"/>
+        <result property="textState" column="TEXT_STATE"/>
+        <result property="issueTime" column="ISSUE_TIME"/>
+        <result property="putTime" column="PUT_TIME"/>
+        <result property="replaceStandNum" column="REPLACE_STAND_NUM"/>
+    </resultMap>
+
+    <resultMap id="BaseResultMapExcel" type="com.adc.da.slrs.pdmcSarLawsStandInfo.entity.PDMCSarLawsStandInfo" >
+    </resultMap>
+    <sql id="Base_Column_List_Show" >
+        DISTINCT sar_standards_info.ID,
+        sar_stand_menu.MENU_ID as MENU_ID,
+        sar_standards_info.STAND_NUMBER as STAND_NUMBER,
+        sar_standards_info.STAND_NAME as STAND_NAME,
+        sar_standards_info.STAND_EN_NAME as STAND_EN_NAME,
+        sar_standards_info.STAND_STATE as TEXT_STATE,
+        sar_standards_info.ISSUE_TIME as ISSUE_TIME,
+        sar_standards_info.REPLACE_STAND_NUM as REPLACE_STAND_NUM,
+        concat('https://srms.foton.com.cn/#/otherStandardDetails/',sar_standards_info.ID,'/',sar_standards_info.STAND_TYPE,'_STAND') as LINK
+    </sql>
+
+
+    <select id="getSarStandardsInfo" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List_Show"/>
+        from sar_standards_info
+        left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
+    </select>
+    <select id="getSarStandardsCount" resultType="java.lang.Integer">
+        select
+        count(1)
+        from sar_standards_info
+        left join sar_stand_menu on sar_standards_info.id=sar_stand_menu.STAND_ID order by sar_standards_info.ID asc
+    </select>
+</mapper>