添加查询已受理事项列表接口

complex-window-manager/src/main/java/com/mortals/xhx/busiz/web/ComplexApiController.java

@@ -27,6 +27,7 @@ import com.mortals.xhx.common.code.ApiRespCodeEnum;
 import com.mortals.xhx.protocol.complex.ComplexApiRest;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfo;
+import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfoList;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.math3.Field;
@@ -335,7 +336,7 @@ public class ComplexApiController {
             if (ObjectUtil.isEmpty(rest)) {
                 throw new AppException("请求访问超时");
             }
-            Rest<List<HandlingRspInfo>> eventRest = JSON.parseObject(rest, new TypeReference<Rest<List<HandlingRspInfo>>>() {
+            Rest<HandlingRspInfoList> eventRest = JSON.parseObject(rest, new TypeReference<Rest<HandlingRspInfoList>>() {
             });
             return JSON.toJSONString(eventRest);
         } catch (Exception e) {

complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/rsp/HandlingRspInfo.java

 package com.mortals.xhx.protocol.complex.matter.model.rsp;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
-import com.mortals.xhx.protocol.complex.ComplexApiRest;
 import lombok.Data;
 
 import java.util.List;

complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/rsp/HandlingRspInfoList.java

+package com.mortals.xhx.protocol.complex.matter.model.rsp;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class HandlingRspInfoList {
+    private List<HandlingRspInfo> records;
+    private Integer total;
+    private Integer current;
+    private Boolean hitCount;
+    private Integer pages;
+    private Integer size;
+    private Object maxLimit;
+    private Boolean searchCount;
+    private List<Object> orders;
+    private Object countId;
+}

complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/IComplexMatterService.java

@@ -122,6 +122,6 @@ public interface IComplexMatterService extends IComplexService {
      * @param findHandlingReq
      * @return
      */
-    Rest<List<HandlingRspInfo>> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq);
+    Rest<HandlingRspInfoList> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq);
 
 }

complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/service/impl/ComplexMatterServiceImpl.java

@@ -222,7 +222,7 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
      * @return
      */
     @Override
-    public Rest<List<HandlingRspInfo>> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq) {
+    public Rest<HandlingRspInfoList> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq) {
         String mattersApi = host + "handling/findPageWithPermission";
         if(findHandlingReq.getCurrent()==null){
             findHandlingReq.setCurrent(1);
@@ -247,7 +247,7 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
                 .formStr(paramMap)
                 .execute().body();
         log.info("findHandlingPage resp:{}", rest);
-        ComplexApiRest<List<HandlingRspInfo>> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<List<HandlingRspInfo>>>() {
+        ComplexApiRest<HandlingRspInfoList> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<HandlingRspInfoList>>() {
         });
         if (complexApiRest.getSuccess()) {
             return Rest.ok(complexApiRest.getMessage(), complexApiRest.getResult());

complex-window-manager/src/main/java/com/mortals/xhx/thread/FindHandlingSendTask.java

@@ -6,6 +6,7 @@ import com.mortals.framework.service.ICacheService;
 import com.mortals.xhx.protocol.complex.matter.model.req.FindHandlingReq;
 import com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfo;
+import com.mortals.xhx.protocol.complex.matter.model.rsp.HandlingRspInfoList;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo;
 import com.mortals.xhx.protocol.complex.matter.service.IComplexMatterService;
 import com.mortals.xhx.utils.SpringUtils;
@@ -37,7 +38,7 @@ public class FindHandlingSendTask implements Runnable{
     public void run() {
         try {
             log.info("FindHandlingSendTask启动发送");
-            Rest<List<HandlingRspInfo>> rest = complexMatterService.findHandlingPage(deviceLogo, findHandlingReq);
+            Rest<HandlingRspInfoList> rest = complexMatterService.findHandlingPage(deviceLogo, findHandlingReq);
             cacheService.lpushForTime(KEY_EVENT_IMPLEMENTATION_RESP + findHandlingReq.getNonce(), REDIS_RESP_TIMEOUT, JSONObject.toJSONString(rest));
 
         } catch (Exception e) {