diff --git a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java b/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java index 3b64ef82..d25ebf10 100644 --- a/adc-da-jwtLogin/src/main/java/com/adc/da/login/security/WebMvcConfig.java +++ b/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 接口 正式环境 关闭 */ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java similarity index 68% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java index d4abcc6d..261bd317 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java +++ b/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 { +public class StandDataTDMController extends BaseController { - 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 { */ @ApiOperation(value = "|regulationsTDM|标准查询列表接口") @PostMapping("/standData") - public ResponseMessage searchStandData(@RequestBody SearchStandContext searchStandContext){ - String resultJson = ""; + public String searchStandData(@RequestBody SearchStandContext searchStandContext){ if(searchStandContext.getPage() == 0 || StringUtils.isEmpty(searchStandContext.getType())){ - return Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(), - "page/type 为必填项 且page不可为0"); + return StandResult.toJson(Result.error(StandMessageCodeEnum.ERROR_PARAM.getCode(), + "page/type 为必填项 且page不可为0")); } - List rows = iStandDataService.searchStandData(searchStandContext); - return Result.success(getPageInfo(searchStandContext.getPager(), rows)); + List rows = iStandDataTDMService.searchStandData(searchStandContext); + return StandResult.toJson(Result.success(getPageInfo(searchStandContext.getPager(), rows))); } private String verifyObj(String str){ diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java similarity index 90% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java index f15e27b1..aac0e3c7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataDao.java +++ b/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 { +public interface StandDataTDMDao extends BaseMapper { List searchStandData(SearchStandContext searchStandContext); List searchBussData(SearchStandContext searchStandContext); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java index 099b1097..1b03e3f2 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/SearchStandContext.java +++ b/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; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java index 821ca718..0d9b6bbe 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/entity/StandResult.java +++ b/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); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java similarity index 86% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java index 547fe895..897f923e 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataService.java +++ b/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 { +public interface IStandDataTDMService extends IService { List searchStandData(SearchStandContext searchStandContext); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java similarity index 87% rename from adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java rename to adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java index 845f080a..0dc17de3 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataServiceImpl.java +++ b/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.service.IStandDataService; +import com.adc.da.slrs.regulationsTDM.dao.StandDataTDMDao; +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 implements IStandDataService { +public class StandDataTDMServiceImpl extends ServiceImpl 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 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; } diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml index 745fcded..7603b46d 100644 --- a/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml +++ b/adc-da-slrs/src/main/resources/mybatis/mapper/regulationsTDM/RegulationsTDMMapper.xml @@ -1,31 +1,31 @@ - +