民生诉求查询工单状态和审批状态

lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppThirdLoginController.java

@@ -321,13 +321,35 @@ public class AppThirdLoginController {
 
     @PostMapping("/getMssqToken")
     @ResponseBody
-    public ZDResponse getMssqToken(MssqAddOrder mssqAddOrder) throws Exception {
+    public ZDResponse getMssqToken(@RequestBody MssqAddOrder mssqAddOrder) throws Exception {
-        Boolean aBoolean = mssqApiService.addMssqOrder(mssqAddOrder);
+        String jsonStr = mssqApiService.addMssqOrder(mssqAddOrder);
-        if(aBoolean){
+        return ZDResponse.success("工单新增", jsonStr);
-            return ZDResponse.success("工单新增成功");
+    }
-        }else{
+
-            return ZDResponse.error("工单新增失败");
+    /**
-        }
+     * 查询工单状态
+     * @param mssqAddOrder
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/queryCurState")
+    @ResponseBody
+    public ZDResponse queryCurState(@RequestBody MssqAddOrder mssqAddOrder) throws Exception {
+        String jsonStr = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryCurState");
+        return ZDResponse.error("工单状态查询", jsonStr);
+    }
+
+    /**
+     * 查询工单状态
+     * @param mssqAddOrder
+     * @return
+     * @throws Exception
+     */
+    @PostMapping("/queryAppInfo")
+    @ResponseBody
+    public ZDResponse queryAppInfo(@RequestBody MssqAddOrder mssqAddOrder) throws Exception {
+        String jsonStr = mssqApiService.queryMssq(mssqAddOrder, "/api/API_YX/proProcess/queryAppInfo");
+        return ZDResponse.error("工单状态查询", jsonStr);
     }
 
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqAddOrder.java

@@ -29,7 +29,7 @@ public class MssqAddOrder extends MssqBaseDomain {
     /**
      * 证件类型：字典参数类型：zjlx
      */
-    private String certType;
+    private Integer certType;
 
     /**
      * 证件号码
@@ -117,6 +117,54 @@ public class MssqAddOrder extends MssqBaseDomain {
     private List<FileData> fileDatas;
 
 
+    /** 工单编码 */
+    private String proWoCode;
+    /** 工单编码，可以传递多个,最多20个 */
+    private List<String> proWoCodes;
+    /** 开始时间 YYYY-MM-DD HH24:MI:SS */
+    private String startTime;
+    /** 结束时间 YYYY-MM-DD HH24:MI:SS */
+    private String endTime;
+
+    public String getProWoCode() {
+        return proWoCode;
+    }
+
+    public void setProWoCode(String proWoCode) {
+        this.proWoCode = proWoCode;
+    }
+
+    public List<String> getProWoCodes() {
+        return proWoCodes;
+    }
+
+    public void setProWoCodes(List<String> proWoCodes) {
+        this.proWoCodes = proWoCodes;
+    }
+
+    public Integer getRequestFrom() {
+        return requestFrom;
+    }
+
+    public void setRequestFrom(Integer requestFrom) {
+        this.requestFrom = requestFrom;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     private class FileData{
         /**
@@ -178,11 +226,11 @@ public class MssqAddOrder extends MssqBaseDomain {
         this.contactTel = contactTel;
     }
 
-    public String getCertType() {
+    public Integer getCertType() {
         return certType;
     }
 
-    public void setCertType(String certType) {
+    public void setCertType(Integer certType) {
         this.certType = certType;
     }
 
@@ -226,14 +274,6 @@ public class MssqAddOrder extends MssqBaseDomain {
         this.addressY = addressY;
     }
 
-    public Integer getRequestFrom() {
-        return requestFrom;
-    }
-
-    public void setRequestFrom(Integer requestFrom) {
-        this.requestFrom = requestFrom;
-    }
-
     public String getPubIntent() {
         return pubIntent;
     }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/domain/MssqBaseDomain.java

@@ -9,7 +9,7 @@ public class MssqBaseDomain {
     /**
      * 分配的appId
      */
-    private String appId;
+    private String appid;
     /**
      * 请求头携带的appId
      */
@@ -36,12 +36,12 @@ public class MssqBaseDomain {
         this.accessToken = accessToken;
     }
 
-    public String getAppId() {
+    public String getAppid() {
-        return appId;
+        return appid;
     }
 
-    public void setAppId(String appId) {
+    public void setAppid(String appid) {
-        this.appId = appId;
+        this.appid = appid;
     }
 
     public String getGatewayAppId() {

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/MssqApiService.java

@@ -14,7 +14,7 @@ public interface MssqApiService {
      * @param mssqAddOrder
      * @return
      */
-    Boolean addMssqOrder(MssqAddOrder mssqAddOrder) throws Exception;
+    String addMssqOrder(MssqAddOrder mssqAddOrder) throws Exception;
 
     /**
      * 获取token
@@ -22,4 +22,6 @@ public interface MssqApiService {
      * @throws Exception
      */
     MssqBaseDomain getMssqToken() throws Exception;
+
+    String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception;
 }

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/MssqApiServiceImpl.java

@@ -30,11 +30,11 @@ public class MssqApiServiceImpl implements MssqApiService {
     private String appKey;
 
     @Override
-    public Boolean addMssqOrder(MssqAddOrder mssqAddOrder) throws Exception {
+    public String addMssqOrder(MssqAddOrder mssqAddOrder) throws Exception {
         MssqBaseDomain mssqToken = this.getMssqToken();
         mssqAddOrder.setAccessToken(mssqToken.getAccessToken());
         //appId
-        mssqAddOrder.setAppId(appId);
+        mssqAddOrder.setAppid(appId);
         //签名
         mssqAddOrder.setGatewaySig(mssqToken.getGatewaySig());
         //请求时间戳
@@ -46,15 +46,8 @@ public class MssqApiServiceImpl implements MssqApiService {
         log.info("民生诉求工单新增，上传参数：{}",s);
         JSONObject serviceJsonData = ServiceInvocation.httpRequestForInterface(mssqUrl + "/api/API_YX/handlerProcess/channelAddOrder",
                 mssqAddOrder.getInvokingServiceRequestMethod(), s, appId, mssqToken.getGatewayRtime(), mssqToken.getGatewaySig());
-            String codeValue = serviceJsonData.getString("code");
+        String jsonRes = serviceJsonData.getString("result");
-            if (codeValue.equals("200")) {
+        return jsonRes;
-                log.info("请求url：{}，响应成功!",mssqUrl + "/api/API_YX/handlerProcess/channelAddOrder");
-                return Boolean.TRUE;
-            } else {
-                log.error("请求url：{}，响应失败!，响应结果：{}",mssqUrl + "/api/API_YX/handlerProcess/channelAddOrder",serviceJsonData);
-                return Boolean.FALSE;
-            }
-//        return null;
     }
 
     @Override
@@ -88,4 +81,25 @@ public class MssqApiServiceImpl implements MssqApiService {
 
         return mssqBaseDomain;
     }
+
+    @Override
+    public String queryMssq(MssqAddOrder mssqAddOrder, String url) throws Exception {
+        MssqBaseDomain mssqToken = this.getMssqToken();
+        mssqAddOrder.setAccessToken(mssqToken.getAccessToken());
+        //appId
+        mssqAddOrder.setAppid(appId);
+        //签名
+        mssqAddOrder.setGatewaySig(mssqToken.getGatewaySig());
+        //请求时间戳
+        mssqAddOrder.setGatewayRtime(mssqToken.getGatewayRtime());
+        //请求类型
+        mssqAddOrder.setInvokingServiceRequestMethod("POST");
+        String s = JSONObject.toJSONString(mssqAddOrder);
+        log.info("民生诉求token：{}",JSONObject.toJSONString(mssqToken));
+        log.info("民生诉求查询工单状态，上传参数：{}",s);
+        JSONObject serviceJsonData = ServiceInvocation.httpRequestForInterface(mssqUrl + url,
+                mssqAddOrder.getInvokingServiceRequestMethod(), s, appId, mssqToken.getGatewayRtime(), mssqToken.getGatewaySig());
+        String jsonRes = serviceJsonData.getString("result");
+        return jsonRes;
+    }
 }