Commit bde34fdf by liuyongshuai

1.提取审批调取结果方法成工具类;

2.在布控之前添加审批结果状态查询,审批未通过,则不能开始审批;
parent a724ae4b
...@@ -67,6 +67,7 @@ public class AbutmentController { ...@@ -67,6 +67,7 @@ public class AbutmentController {
private UserService userService; private UserService userService;
@Autowired @Autowired
BkService bkService; BkService bkService;
private XdhSpUtil xdhSpUtil = new XdhSpUtil();
/** /**
* 调取四川机主信息 * 调取四川机主信息
...@@ -550,28 +551,11 @@ public class AbutmentController { ...@@ -550,28 +551,11 @@ public class AbutmentController {
@RequestMapping(value = "/getSpResult2",method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value = "/getSpResult2",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody @ResponseBody
public JSONObject getSpResult2(String asjbh,String sfzh,String bsh,String sqly){ public JSONObject getSpResult2(String asjbh,String sfzh,String bsh,String sqly){
JSONObject resultObject = null; return xdhSpUtil.getSpResultUtil(asjbh, sfzh, bsh, sqly);
try{
LinkedHashMap<String, Object> params = new LinkedHashMap<>();
params.put("sysname", "HCZZ-SPJG"); //参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("ajbh", asjbh);
jsonObject.put("sfzh", sfzh);
jsonObject.put("sqdx", bsh);
jsonObject.put("sqly",sqly);
params.put("sysparam", jsonObject.toJSONString()); //参数
String url = UnifiedServiceUtil.sendRequest(bizCode,cjServiceId,params);
if(!StringUtil.ckeckEmpty(url)){
String spjgStr = HttpUtil.doGet(url);
resultObject = JSONObject.parseObject(spjgStr);
}
return resultObject;
}catch(Exception e){
e.printStackTrace();
return resultObject;
}
} }
/** /**
* 调用新德汇接口获取审批结果 * 调用新德汇接口获取审批结果
* @param asjbh * @param asjbh
...@@ -582,26 +566,7 @@ public class AbutmentController { ...@@ -582,26 +566,7 @@ public class AbutmentController {
@RequestMapping(value = "/getSpResult",method = {RequestMethod.GET,RequestMethod.POST}) @RequestMapping(value = "/getSpResult",method = {RequestMethod.GET,RequestMethod.POST})
@ResponseBody @ResponseBody
public JSONObject getSpResult(String asjbh,String sfzh,String bsh){ public JSONObject getSpResult(String asjbh,String sfzh,String bsh){
JSONObject resultObject = null; return xdhSpUtil.getSpResultUtil(asjbh, sfzh, bsh, "智慧侦查脑图");
try{
LinkedHashMap<String, Object> params = new LinkedHashMap<>();
params.put("sysname", "HCZZ-SPJG"); //参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("ajbh", asjbh);
jsonObject.put("sfzh", sfzh);
jsonObject.put("sqdx", bsh);
jsonObject.put("sqly","智慧侦查脑图");
params.put("sysparam", jsonObject.toJSONString()); //参数
String url = UnifiedServiceUtil.sendRequest(bizCode,cjServiceId,params);
if(!StringUtil.ckeckEmpty(url)){
String spjgStr = HttpUtil.doGet(url);
resultObject = JSONObject.parseObject(spjgStr);
}
return resultObject;
}catch(Exception e){
e.printStackTrace();
return resultObject;
}
} }
/** /**
......
package com.founder.interservice.bkxx.service.impl; package com.founder.interservice.bkxx.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.founder.interservice.bkxx.model.BkTaskResult; import com.founder.interservice.bkxx.model.BkTaskResult;
import com.founder.interservice.bkxx.model.Bkxx; import com.founder.interservice.bkxx.model.Bkxx;
import com.founder.interservice.bkxx.repository.BkTaskResultRepository; import com.founder.interservice.bkxx.repository.BkTaskResultRepository;
...@@ -8,6 +9,7 @@ import com.founder.interservice.mapper.xzxt.BkxxMapper; ...@@ -8,6 +9,7 @@ import com.founder.interservice.mapper.xzxt.BkxxMapper;
import com.founder.interservice.model.Track; import com.founder.interservice.model.Track;
import com.founder.interservice.util.DateUtil; import com.founder.interservice.util.DateUtil;
import com.founder.interservice.util.KeyUtil; import com.founder.interservice.util.KeyUtil;
import com.founder.interservice.util.XdhSpUtil;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.jpa.domain.Specification; import org.springframework.data.jpa.domain.Specification;
...@@ -113,7 +115,7 @@ public class BkScheduleService { ...@@ -113,7 +115,7 @@ public class BkScheduleService {
* @return * @return
*/ */
private List<Bkxx> getBkTasks(String type,String flag) { private List<Bkxx> getBkTasks(String type,String flag) {
return bkxxRepository.findAll(new Specification<Bkxx>(){ List<Bkxx> bkxxList = bkxxRepository.findAll(new Specification<Bkxx>(){
@Override @Override
public Predicate toPredicate(Root<Bkxx> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) { public Predicate toPredicate(Root<Bkxx> root, CriteriaQuery<?> criteriaQuery, CriteriaBuilder criteriaBuilder) {
//Predicate p1 = criteriaBuilder.equal(root.get("bkdxlx").as(String.class), type); //Predicate p1 = criteriaBuilder.equal(root.get("bkdxlx").as(String.class), type);
...@@ -131,6 +133,20 @@ public class BkScheduleService { ...@@ -131,6 +133,20 @@ public class BkScheduleService {
return criteriaQuery.getRestriction(); return criteriaQuery.getRestriction();
} }
}); });
List<Bkxx> retuList = new ArrayList<>();
for (Bkxx bkxx:bkxxList){
XdhSpUtil xdhSpUtil = new XdhSpUtil();
JSONObject obj = xdhSpUtil.getSpResultUtil(bkxx.getAsjbh(),bkxx.getSqr_sfzh(),bkxx.getBkdxhm(),"智慧侦查脑图");
System.out.println("spJson==========================================================="+obj);
String spzt = (String) obj.get("data");
System.out.println("spzt==========================================================="+spzt);
if("1".equals(spzt)){
System.out.println("进入判断===========================================================");
//审批通过
retuList.add(bkxx);
}
}
return retuList;
} }
/** /**
......
package com.founder.interservice.util;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Value;
import java.util.LinkedHashMap;
/**
* Created by liuys on 2019/5/16.
* 新德汇审批工具类
*/
public class XdhSpUtil {
@Value(value = "${xdhbigdata.xdhserviceParam.bizCode}")
private String bizCode;
@Value(value = "${xdhbigdata.xdhserviceParam.cjServiceId}")
private String cjServiceId;
public JSONObject getSpResultUtil(String asjbh, String sfzh, String bsh, String sqly) {
JSONObject resultObject = null;
try{
LinkedHashMap<String, Object> params = new LinkedHashMap<>();
params.put("sysname", "HCZZ-SPJG"); //参数
JSONObject jsonObject = new JSONObject();
jsonObject.put("ajbh", asjbh);
jsonObject.put("sfzh", sfzh);
jsonObject.put("sqdx", bsh);
jsonObject.put("sqly",sqly);
params.put("sysparam", jsonObject.toJSONString()); //参数
String url = UnifiedServiceUtil.sendRequest(bizCode,cjServiceId,params);
if(!StringUtil.ckeckEmpty(url)){
String spjgStr = HttpUtil.doGet(url);
resultObject = JSONObject.parseObject(spjgStr);
}
return resultObject;
}catch(Exception e){
e.printStackTrace();
return resultObject;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment