fix:46833

This commit is contained in:
zhangqinlin
2022-04-06 10:45:42 +08:00
parent 777fc8d95e
commit 04a98b547d
3 changed files with 71 additions and 20 deletions
@@ -92,21 +92,49 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
JSONObject pageList = payResearchProjectService.listForThree(pageNo,pageSize,abbreviation,projectName);
return Result.OK(pageList);
}
/**
* 第三方合同
*
* @param
* @param
* @return
*/
@AutoLog(value = "第三方合同-获取token")
@ApiOperation(value="第三方合同-获取token", notes="第三方合同-获取token")
@PostMapping(value = "/getToken")
public Result<?> getToken() {
JSONObject pageList = payResearchProjectService.getToken();
return Result.OK(pageList);
}
/**
* 第三方合同
*
* @param
* @param
* @return
*/
@AutoLog(value = "第三方合同-刷新token")
@ApiOperation(value="第三方合同-刷新token", notes="第三方合同-刷新token")
@PostMapping(value = "/refreshToken")
public Result<?> refreshToken(@RequestParam(value = "refresh_token") String refresh_token) {
JSONObject pageList = payResearchProjectService.refreshToken(refresh_token);
return Result.OK(pageList);
}
/**
* 第三方合同
*
* @param thereContract
* @param
* @return
*/
@AutoLog(value = "第三方合同-分页列表查询")
@ApiOperation(value="第三方合同-分页列表查询", notes="第三方合同-分页列表查询")
@PostMapping(value = "/pageForThreeContractPage")
public Result<?> pageForThreeContractPage(@RequestBody ThereContract thereContract
) {
JSONObject pageList = payResearchProjectService.pageForThreeContract(thereContract);
return Result.OK(pageList);
}
* 第三方合同
*
* @param thereContract
* @param
* @return
*/
@AutoLog(value = "第三方合同-分页列表查询")
@ApiOperation(value="第三方合同-分页列表查询", notes="第三方合同-分页列表查询")
@PostMapping(value = "/pageForThreeContractPage")
public Result<?> pageForThreeContractPage(@RequestBody ThereContract thereContract
) {
JSONObject pageList = payResearchProjectService.pageForThreeContract(thereContract);
return Result.OK(pageList);
}
/**
* 第三方合同
*
@@ -129,7 +157,7 @@ public class PayResearchProjectController extends JeroController<PayResearchProj
* @param
* @return
*/
@AutoLog(value = "第三方合同-分页列表查询")
@AutoLog(value = "第三方合同-详情")
@ApiOperation(value="第三方合同-详情", notes="第三方合同-详情")
@GetMapping(value = "/oneForThreeContract")
public Result<?> oneForThreeContract(@RequestParam(name="id",required = true) String id
@@ -35,4 +35,8 @@ public interface IPayResearchProjectService extends IService<PayResearchProject>
JSONObject oneForThreeContract(String id);
JSONObject getToken();
JSONObject refreshToken(String refresh_token);
}
@@ -56,7 +56,9 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
private final static String PREFIXF ="appId=QC_APP01&fid=";//文件下载参数
//合同
private final static String URL_TOKEN ="https://openapi.catarc.ac.cn/login";
private final static String URL_REFRESH_TOKEN ="https://openapi.catarc.ac.cn/refreshtoken";
private final static String URL_CONTRACT_PAGE ="https://openapi.catarc.ac.cn/data/contract/page";
private final static String URL_CONTRACT_LIST ="https://openapi.catarc.ac.cn/data/contract/list";
private final static String URL_CONTRACT_ID ="https://openapi.catarc.ac.cn/data/contract/";
@@ -171,7 +173,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
@Override
public JSONObject pageForThreeContract(ThereContract thereContract) {
String access_token = getToken();
String access_token = getToken().getJSONObject("data").getString("access_token");
HttpRequest post = HttpUtil.createPost(URL_CONTRACT_PAGE);
HashMap<String, String> map2 = new HashMap<>();
@@ -222,7 +224,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
@Override
public JSONObject listForThreeContract(ThereContract thereContract) {
String access_token = getToken();
String access_token = getToken().getJSONObject("data").getString("access_token");
HttpRequest post = HttpUtil.createPost(URL_CONTRACT_LIST);
HashMap<String, String> map2 = new HashMap<>();
map2.put("Authorization",access_token);
@@ -266,7 +268,7 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
@Override
public JSONObject oneForThreeContract(String id) {
String access_token = getToken();
String access_token = getToken().getJSONObject("data").getString("access_token");
HttpRequest get = HttpUtil.createGet(URL_CONTRACT_ID+id);
HashMap<String, String> map2 = new HashMap<>();
map2.put("Authorization",access_token);
@@ -278,14 +280,31 @@ public class PayResearchProjectServiceImpl extends ServiceImpl<PayResearchProjec
return jsonObject1;
}
private String getToken() {
@Override
public JSONObject getToken() {
HashMap<String, Object> map = new HashMap<>();
map.put("appid", "asri");
map.put("secret", "QyYjBQ5LyJkxktvMoKqdUOUtYgkk2VW4DgaKjgVIjCoVz7R5bgNoS");
String s = JSONObject.toJSONString(map);
String s1 = HttpUtil.post(URL_TOKEN, s);
JSONObject jsonObject = JSONObject.parseObject(s1);
return jsonObject.getJSONObject("data").getString("access_token");
return jsonObject;
}
@Override
public JSONObject refreshToken( String refresh_token) {
// HashMap<String,String> map = new HashMap<>();
// map.put("refresh_token",refresh_token);
// String s = JSONObject.toJSONString(map);
// String s1 = HttpUtil.post(URL_REFRESH_TOKEN, s);
// JSONObject jsonObject = JSONObject.parseObject(s1);
HashMap<String, Object> map2 = new HashMap<>();
map2.put("refresh_token",refresh_token);
String post = HttpUtil.post(URL_REFRESH_TOKEN, map2);
JSONObject jsonObject = JSONObject.parseObject(post);
return jsonObject;
}
}