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

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

Browse Source
This commit is contained in:
super_liu
2022-05-18 11:20:54 +08:00
parent 9c5ace8356
commit fea5aab330
8 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataController.java → adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/controller/StandDataTDMController.java
+10 -11
View File
@@ -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){
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<StandData> rows = iStandDataService.searchStandData(searchStandContext);
return Result.success(getPageInfo(searchStandContext.getPager(), rows));
List<StandData> rows = iStandDataTDMService.searchStandData(searchStandContext);
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/StandDataDao.java → adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/dao/StandDataTDMDao.java
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+2 -3
View File
@@ -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/IStandDataService.java → adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/IStandDataTDMService.java
+1 -1
View File
@@ -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/StandDataServiceImpl.java → adc-da-slrs/src/main/java/com/adc/da/slrs/regulationsTDM/service/impl/StandDataTDMServiceImpl.java
+5 -8
View File
@@ -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<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;
}