feat: There is no way the, TDM 对外分页100查询标准接口

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

@@ -36,6 +36,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
      * AWG 接口
      */
     addInterceptor.excludePathPatterns("/api/regulations/searchStandData");
+    addInterceptor.excludePathPatterns("/api/regulationsTDM/standData");
     /**
      * TODO 测试流程 开放 login 接口 正式环境 关闭
      */

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java

@@ -2,12 +2,12 @@ package com.adc.da.slrs.regulationsTDM.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.regulationsTDM.entity.StandResult;
 import com.adc.da.slrs.regulationsTDM.entity.SearchStandContext;
 import com.adc.da.slrs.regulationsTDM.entity.StandData;
 import com.adc.da.slrs.regulationsTDM.entity.StandMessageCodeEnum;
-import com.adc.da.slrs.regulationsTDM.service.IStandDataService;
+import com.adc.da.slrs.regulationsTDM.service.IStandDataTDMService;
 import com.adc.da.util.utils.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,12 +32,12 @@ import java.util.List;
 @RestController
 @Api(tags = "福田标准法规--TDM查询标准")
 @RequestMapping("/api/regulationsTDM")
-public class StandDataController extends BaseController<StandData> {
+public class StandDataTDMController extends BaseController<StandData> {
 
-    private static final Logger logger = LoggerFactory.getLogger(StandDataController.class);
+    private static final Logger logger = LoggerFactory.getLogger(StandDataTDMController.class);
 
     @Autowired
-    private IStandDataService iStandDataService;
+    private IStandDataTDMService iStandDataTDMService;
     /**
      * 标准查询列表接口
      *
@@ -46,15 +46,14 @@ public class StandDataController extends BaseController<StandData> {
      */
     @ApiOperation(value = "|regulationsTDM|标准查询列表接口")
     @PostMapping("/standData")
-    public ResponseMessage searchStandData(@RequestBody SearchStandContext searchStandContext){
+    public String searchStandData(@RequestBody SearchStandContext searchStandContext){
-        String resultJson = "";
         if(searchStandContext.getPage() == 0
                 || StringUtils.isEmpty(searchStandContext.getType())){
-            return Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(),
+            return StandResult.toJson(Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(),
-                    "page/type 为必填项 且page不可为0");
+                    "page/type 为必填项 且page不可为0"));
         }
-        List<StandData> rows = iStandDataService.searchStandData(searchStandContext);
+        List<StandData> rows = iStandDataTDMService.searchStandData(searchStandContext);
-        return Result.success(getPageInfo(searchStandContext.getPager(), rows));
+        return StandResult.toJson(Result.success(getPageInfo(searchStandContext.getPager(), rows)));
     }
 
     private String verifyObj(String str){

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java

@@ -15,7 +15,7 @@ import java.util.List;
  * @author super_liu
  */
 @Repository
-public interface StandDataDao extends BaseMapper<StandData> {
+public interface StandDataTDMDao extends BaseMapper<StandData> {
 
     List<StandData> searchStandData(SearchStandContext searchStandContext);
     List<StandData> searchBussData(SearchStandContext searchStandContext);

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java

@@ -16,7 +16,7 @@ public class SearchStandContext extends BasePage {
 
     // 标准查询条件
     @ApiModelProperty(value = "页数")
-    private int page;
+    private Integer page;
 
     @ApiModelProperty(value = "区分类别（GB：国内外标准 QB：企业标准）")
     private String type;

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java

@@ -1,9 +1,8 @@
 package com.adc.da.slrs.regulationsTDM.entity;
 
-import com.adc.da.http.ResponseMessageCodeEnum;
+import com.adc.da.http.ResponseMessage;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.apache.poi.ss.formula.functions.T;
 
 import java.util.List;
 
@@ -22,7 +21,7 @@ public class StandResult {
         return new SearchStandResult(code, message, true);
     }
 
-    public static String toJson(SearchStandResult searchStandResult){
+    public static String toJson(ResponseMessage searchStandResult){
         GsonBuilder gsonBuilder = getGsonBuilder();
         Gson json = gsonBuilder.create();
         return json.toJson(searchStandResult);

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java

@@ -14,7 +14,7 @@ import java.util.List;
  *
  * @author super_liu
  */
-public interface IStandDataService extends IService<StandData> {
+public interface IStandDataTDMService extends IService<StandData> {
 
     List<StandData> searchStandData(SearchStandContext searchStandContext);
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java

@@ -1,11 +1,8 @@
 package com.adc.da.slrs.regulationsTDM.service.impl;
 
-import com.adc.da.http.ResponseMessage;
-import com.adc.da.http.Result;
-import com.adc.da.scheduled.dao.SarStandardInfoDao;
 import com.adc.da.slrs.regulationsTDM.entity.*;
-import com.adc.da.slrs.regulationsTDM.dao.StandDataDao;
+import com.adc.da.slrs.regulationsTDM.dao.StandDataTDMDao;
-import com.adc.da.slrs.regulationsTDM.service.IStandDataService;
+import com.adc.da.slrs.regulationsTDM.service.IStandDataTDMService;
 import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao;
 import com.adc.da.slrs.sarStandardsInfo.dao.SarStandardsInfoDao;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -30,9 +27,9 @@ import java.util.stream.Collectors;
  * @date: 2022年04月25日 14:56
  */
 @Service
-public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> implements IStandDataService {
+public class StandDataTDMServiceImpl extends ServiceImpl<StandDataTDMDao, StandData> implements IStandDataTDMService {
 
-    private static final Logger logger = LoggerFactory.getLogger(StandDataServiceImpl.class);
+    private static final Logger logger = LoggerFactory.getLogger(StandDataTDMServiceImpl.class);
 
     private String webUrl = "https://srms.foton.com.cn/#/loginStandDetails";
 
@@ -74,7 +71,7 @@ public class StandDataServiceImpl extends ServiceImpl<StandDataDao, StandData> i
         return res1 + res2 + res3;
     }
     private String encode(String str){
-        String encodeStr = new BASE64Encoder().encodeBuffer(str.getBytes()).replaceAll("[\r\n]", "");;
+        String encodeStr = new BASE64Encoder().encodeBuffer(str.getBytes()).replaceAll("[\r\n]", "");
         return encodeStr;
     }
 

adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml

@@ -1,31 +1,31 @@
 <?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.regulations.dao.StandDataDao">
+<mapper namespace="com.adc.da.slrs.regulationsTDM.dao.StandDataTDMDao">
 
     <resultMap id="BaseResultMap" type="com.adc.da.slrs.regulationsTDM.entity.StandData">
     </resultMap>
 
     <select id="searchStandData" resultMap="BaseResultMap"
-            parameterType="com.adc.da.slrs.regulations.entity.SearchStandContext">
+            parameterType="com.adc.da.slrs.regulationsTDM.entity.SearchStandContext">
         SELECT
             t.id,
             t.standType,
             t.standSort,
             t.standNumber,
-            t.standNumber,
+            t.standYear,
             t.standName,
             t.standEnName,
-            t.dtbjh
+            t.dtbzh
         FROM (
             SELECT
             sar_standards_info.id AS id,
             sar_standards_info.STAND_TYPE AS standType,
             sar_standards_info.STAND_SORT AS standSort,
             sar_standards_info.STAND_NUMBER AS standNumber,
-            sar_standards_info.STAND_YEAR AS standNumber,
+            sar_standards_info.STAND_YEAR AS standYear,
             sar_standards_info.STAND_NAME AS standName,
             sar_standards_info.STAND_EN_NAME AS standEnName,
-            SAR_STAND_ATTR_INFO.DTBJH AS dtbjh
+            SAR_STAND_ATTR_INFO.DTBJH AS dtbzh
             FROM
             sar_standards_info
             LEFT JOIN SAR_STAND_ATTR_INFO ON (
@@ -34,33 +34,32 @@
             )
             WHERE sar_standards_info.valid_flag = 0
         ) t
-        ORDER BY t.stand_sort ASC,CAST(t.STAND_NUMBER AS decimal(9,2)) ASC,t.STAND_YEAR DESC,t.id
+        ORDER BY t.standSort ASC,CAST(t.standNumber AS decimal(9,2)) ASC,t.standYear DESC,t.id
         limit ${pager.startIndex-1},${pageSize}
     </select>
 
     <select id="searchBussData" resultMap="BaseResultMap"
-            parameterType="com.adc.da.slrs.regulations.entity.SearchStandContext">
+            parameterType="com.adc.da.slrs.regulationsTDM.entity.SearchStandContext">
         SELECT
             t.id,
             t.standType,
             t.standSort,
             t.standNumber,
-            t.standNumber,
+            t.standYear,
             t.standName,
             t.standEnName,
-            t.dtbjh
+            t.dtbzh
         FROM (
             SELECT
             DISTINCT
             sar_bussioness_stand.id AS id,
             'BUSINESS_STAND' AS standType,
             sar_bussioness_stand.STAND_SORT AS standSort,
-            sar_bussioness_stand.STAND_SORT AS standSort,
             sar_bussioness_stand.STAND_NUMBER AS standNumber,
-            sar_bussioness_stand.STAND_YEAR AS standNumber,
+            sar_bussioness_stand.STAND_YEAR AS standYear,
             sar_bussioness_stand.STAND_NAME AS standName,
             sar_bussioness_stand.STAND_EN_NAME AS standEnName,
-            sar_bussioness_stand.DTQBBHBUSS AS dtbjh
+            sar_buss_stand_attr_info.DTQBBHBUSS AS dtbzh
             FROM
             sar_bussioness_stand
             LEFT JOIN sar_buss_stand_attr_info ON (
@@ -69,7 +68,7 @@
             )
             WHERE sar_bussioness_stand.valid_flag = 0
         ) t
-        ORDER BY t.stand_sort ASC,CAST(t.STAND_NUMBER AS decimal(9,2)) ASC,t.STAND_YEAR DESC,t.id
+        ORDER BY t.standSort ASC,CAST(t.standNumber AS decimal(9,2)) ASC,t.standYear DESC,t.id
         limit ${pager.startIndex-1},${pageSize}
     </select>
 </mapper>