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

complex-window-manager/src/main/java/com/mortals/xhx/busiz/req/FindHandlingPageReq.java

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseApiReq;
+import lombok.Data;
+
+@Data
+public class FindHandlingPageReq extends BaseApiReq {
+
+    /**当前页*/
+    private Integer current;
+    /**每页条数*/
+    private Integer size;
+
+    private String search;
+}

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

@@ -14,6 +14,7 @@ import com.mortals.framework.exception.AppException;
 import com.mortals.framework.service.ICacheService;
 import com.mortals.xhx.busiz.req.ComplexHandleReq;
 import com.mortals.xhx.busiz.req.ComplexImplementationReq;
+import com.mortals.xhx.busiz.req.FindHandlingPageReq;
 import com.mortals.xhx.busiz.req.accept.ComplexAcceptReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
 import com.mortals.xhx.busiz.rsp.ComplexApiResp;
@@ -25,6 +26,7 @@ import com.mortals.xhx.busiz.rsp.work.ComplexWorkInfo;
 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.MatterListInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.math3.Field;
@@ -312,29 +314,28 @@ public class ComplexApiController {
         }
     }
 
-
     /**
-     * 查询代办列表
+     * 查询已受理事项列表
      *
      * @param req
      * @return
      */
     @PostMapping("handling/findPageWithPermission")
     @UnAuth
-    public String findPageWithPermission(@RequestBody ComplexHandleReq req) {
-        log.info("【查询代办列表】【请求体】-->  " + JSONObject.toJSONString(req));
-        req.setUrlPath("self-device-info/acceptHandling");
+    public String findPageWithPermission(@RequestBody FindHandlingPageReq req) {
+        log.info("【查询已受理事项列表】【请求体】-->  " + JSONObject.toJSONString(req));
+        req.setUrlPath("handling/findPageWithPermission");
         ApiResp<String> rsp = new ApiResp<>();
         rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
         rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
         try {
             req.setNonce(RandomUtil.randomNumbers(6));
             cacheService.lpush(KEY_COMPLEX_REQ, JSONObject.toJSONString(req));
-            String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), 30, String.class);
+            String rest = cacheService.blpop(KEY_EVENT_IMPLEMENTATION_RESP + req.getNonce(), HTTP_TIMEOUT, String.class);
             if (ObjectUtil.isEmpty(rest)) {
                 throw new AppException("请求访问超时");
             }
-            Rest<List<DictInfo>> eventRest = JSON.parseObject(rest, new TypeReference<Rest<List<DictInfo>>>() {
+            Rest<List<HandlingRspInfo>> eventRest = JSON.parseObject(rest, new TypeReference<Rest<List<HandlingRspInfo>>>() {
             });
             return JSON.toJSONString(eventRest);
         } catch (Exception e) {

complex-window-manager/src/main/java/com/mortals/xhx/protocol/complex/matter/model/req/FindHandlingReq.java

+package com.mortals.xhx.protocol.complex.matter.model.req;
+
+import lombok.Data;
+
+@Data
+public class FindHandlingReq {
+    private String nonce;
+    /**当前页*/
+    private Integer current;
+    /**每页条数*/
+    private Integer size;
+
+    private String orderByLimitTime;
+    private String waitHandlingSearch;
+    private String search;
+    private String isTongBan;
+}

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;
+import java.util.Map;
+
+@Data
+public class HandlingRspInfo {
+
+    private String handlingId;
+    private String handlingCode;
+    private String unifyCode;
+    private String eventId;
+    private String acceptObjectType;
+    private String eventImplementation;
+    private String ecId;
+    private Integer handlingVersion;
+    private String ecName;
+    private String eventObjectType;
+    private String applicantId;
+    private Object applicant;
+    private String handlerId;
+    private Object handler;
+    private String legalPersonId;
+    private Object legalPerson;
+    private String phone;
+    private String handlerPhone;
+    private String applicantIdNumber;
+    private String isOneThing;
+    private String isTongBan;
+    private String businessTacheId;
+    private String businessTacheCode;
+    private String btsId;
+    private String btsIds;
+    private String btsName;
+    private Integer btsOrder;
+    private String businessTacheName;
+    private String state;
+    private String handleAddressId;
+    private String handleAddress;
+    private Object states;
+    private String stateName;
+    private String startDate;
+    private String endDate;
+    private String userId;
+    private String handleDept;
+    private String doSource;
+    private String timingStartTime;
+    private String acceptAreaCode;
+    private String windowId;
+    private String windowName;
+    private String applyCode;
+    private String registerAddress;
+    private String commAddress;
+    private String currentArea;
+    private String createBy;
+    private String createTime;
+    private String updateBy;
+    private String updateTime;
+    private String delFlag;
+    private String isDissolve;
+    private Object areaLinkCode;
+    private Object areaOrder;
+    private Object beyondTime;
+    private Object warningTime;
+    private String acceptIsPrint;
+    private String endIsPrint;
+    private String acceptAreaName;
+    private String dealAreaCode;
+    private Object tenantCode;
+    private Object thingHandlingId;
+    private Object thingId;
+    private Object tenantName;
+    private Object systemCode;
+    private Object timingEndTime;
+    private String dealAreaName;
+    private Map<String,Object> infoMap;
+    private Object materials;
+    private List<Object> handlingIds;
+    private Object eventIds;
+    private Object situations;
+    private Object selectSituationItems;
+    private Object situationId;
+    private Object situationIds;
+    private Object situationItemIds;
+    private Object itemId;
+    private Object processName;
+    private String areaCode;
+    private String areaName;
+    private String deptName;
+    private String acceptDeptName;
+    private String acceptDeptId;
+    private String rightsDeptName;
+    private String rightsDeptId;
+    private String userName;
+    private String createUserName;
+    private String implementName;
+    private String implementCoding;
+    private String eventType;
+    private String eventTypeName;
+    private Object search;
+    private Object isStaging;
+    private Object areaCodeList;
+    private Object oneThingExampleId;
+    private String timeLimit;
+    private String timeLimitState;
+    private String handlerName;
+    private String applicantName;
+    private List<Object> functionRole;
+    private Object deptId;
+    private Object deptIds;
+    private String cycleAndStep;
+    private String eventIdAndTacheId;
+    private Object eventIdAndTacheIds;
+    private Object cycleAndSteps;
+    private String submitType;
+    private Object windowUserId;
+    private Object situationItems;
+    private Object packages;
+    private Object orderByLimitTime;
+    private Object limitDay;
+    private Object hotNum;
+    private Object auditState;
+    private Object auditAreaCode;
+    private Object eventHandleKind;
+    private Object handlingUseTime;
+    private Object waitHandlingSearch;
+    private Object stepId;
+    private Integer num;
+    private Object printFinishBook;
+    private Object printCorrectionReceipt;
+    private Object printLicence;
+    private Object replyPrintLicence;
+    private Object printUpload;
+    private Object printDocument;
+    private Object printAccept;
+    private Object printNoAccept;
+    private Object note;
+    private Object isTimeout;
+    private Object bjlx;
+    private String conditionTime;
+    private Object resultsHandlingType;
+    private String sourceType;
+    private Object suspendSecond;
+    private Object beyondTimeAll;
+    private Object warningTimeAll;
+    private Object thingName;
+    private Object extend;
+    private Object stepResult;
+    private Object handleDeptName;
+    private Object tokenUser;
+    private String floorId;
+    private Object isIssue;
+    private Object noEqdoSource;
+    private List<Object> areaLinks;
+    private List<Object> areas;
+
+
+//    public static void main(String[] args){
+//        String resp = "";
+//        HandlingRspInfo handlingRspInfo = JSON.parseObject(resp, new TypeReference<HandlingRspInfo>() {
+//        });
+//        System.out.println(JSONObject.toJSONString(handlingRspInfo));
+//    }
+}

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

@@ -5,11 +5,9 @@ import com.mortals.framework.common.Rest;
 import com.mortals.xhx.protocol.complex.IComplexService;
 import com.mortals.xhx.protocol.complex.matter.model.req.AcceptReq;
 import com.mortals.xhx.protocol.complex.matter.model.req.DeviceLoginReq;
+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.AcceptRspInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.LoginRspInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo;
+import com.mortals.xhx.protocol.complex.matter.model.rsp.*;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.material.MaterialInfo;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.matter.MatterWorkInfo;
@@ -118,4 +116,12 @@ public interface IComplexMatterService extends IComplexService {
      */
     Rest<List<DictInfo>> queryDict(String deviceLogo, String dict);
 
+    /**
+     * 查询已受理事项列表
+     * @param deviceLogo
+     * @param findHandlingReq
+     * @return
+     */
+    Rest<List<HandlingRspInfo>> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq);
+
 }

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

@@ -13,11 +13,9 @@ import com.mortals.xhx.protocol.complex.AbstractComplexService;
 import com.mortals.xhx.protocol.complex.ComplexApiRest;
 import com.mortals.xhx.protocol.complex.matter.model.req.AcceptReq;
 import com.mortals.xhx.protocol.complex.matter.model.req.DeviceLoginReq;
+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.AcceptRspInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.DictInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.LoginRspInfo;
-import com.mortals.xhx.protocol.complex.matter.model.rsp.MatterListInfo;
+import com.mortals.xhx.protocol.complex.matter.model.rsp.*;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.implement.ImplementDetailInfo;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.material.MaterialInfo;
 import com.mortals.xhx.protocol.complex.matter.model.rsp.matter.MatterWorkInfo;
@@ -217,6 +215,46 @@ public class ComplexMatterServiceImpl extends AbstractComplexService implements
         return Rest.fail(complexApiRest.getMessage());
     }
 
+    /**
+     * 查询已受理事项列表
+     * @param deviceLogo
+     * @param findHandlingReq
+     * @return
+     */
+    @Override
+    public Rest<List<HandlingRspInfo>> findHandlingPage(String deviceLogo, FindHandlingReq findHandlingReq) {
+        String mattersApi = host + "handling/findPageWithPermission";
+        if(findHandlingReq.getCurrent()==null){
+            findHandlingReq.setCurrent(1);
+        }
+        if(findHandlingReq.getSize()==null){
+            findHandlingReq.setSize(10);
+        }
+        findHandlingReq.setOrderByLimitTime("true");
+        findHandlingReq.setWaitHandlingSearch("Y");
+        findHandlingReq.setIsTongBan("N");
+        Map<String, String> paramMap = new HashMap<>();
+        // 将Map中的属性值转为字符串
+        for (Map.Entry<String, Object> entry : BeanUtil.beanToMap(findHandlingReq, false, true).entrySet()) {
+            String key = entry.getKey();
+            Object value = entry.getValue();
+            String stringValue = String.valueOf(value);
+            paramMap.put(key, stringValue);
+        }
+        String deviceToken = checkToken(deviceLogo);
+        String rest = HttpUtil.createGet(mattersApi)
+                .header("X-Access-Token", deviceToken)
+                .formStr(paramMap)
+                .execute().body();
+        log.info("findHandlingPage resp:{}", rest);
+        ComplexApiRest<List<HandlingRspInfo>> complexApiRest = JSON.parseObject(rest, new TypeReference<ComplexApiRest<List<HandlingRspInfo>>>() {
+        });
+        if (complexApiRest.getSuccess()) {
+            return Rest.ok(complexApiRest.getMessage(), complexApiRest.getResult());
+        }
+        return Rest.fail(complexApiRest.getMessage());
+    }
+
 
     @Override
     public Rest<List<MaterialInfo>> getMaterialByEventAndSituation(String deviceLogo, ImplementationReq implementationReq) {

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

+package com.mortals.xhx.thread;
+
+import com.alibaba.fastjson.JSONObject;
+import com.mortals.framework.common.Rest;
+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.MatterListInfo;
+import com.mortals.xhx.protocol.complex.matter.service.IComplexMatterService;
+import com.mortals.xhx.utils.SpringUtils;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+import static com.mortals.xhx.common.key.Constant.REDIS_RESP_TIMEOUT;
+import static com.mortals.xhx.common.key.RedisKey.KEY_EVENT_IMPLEMENTATION_RESP;
+
+@Slf4j
+public class FindHandlingSendTask implements Runnable{
+    private FindHandlingReq findHandlingReq;
+
+    private String deviceLogo;
+
+    private IComplexMatterService complexMatterService;
+
+    private ICacheService cacheService;
+
+    public FindHandlingSendTask(String deviceLogo, FindHandlingReq findHandlingReq) {
+        this.findHandlingReq = findHandlingReq;
+        this.deviceLogo = deviceLogo;
+        complexMatterService = SpringUtils.getBean(IComplexMatterService.class);
+        cacheService = SpringUtils.getBean(ICacheService.class);
+    }
+
+    @Override
+    public void run() {
+        try {
+            log.info("FindHandlingSendTask启动发送");
+            Rest<List<HandlingRspInfo>> rest = complexMatterService.findHandlingPage(deviceLogo, findHandlingReq);
+            cacheService.lpushForTime(KEY_EVENT_IMPLEMENTATION_RESP + findHandlingReq.getNonce(), REDIS_RESP_TIMEOUT, JSONObject.toJSONString(rest));
+
+        } catch (Exception e) {
+            log.error("发送异常：" + e);
+        }
+    }
+}

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

@@ -79,6 +79,10 @@ public class SendThread extends AbstractThread {
                 ComplexAcceptReq complexAcceptReq = JSONObject.parseObject(reqStr, ComplexAcceptReq.class);
                 ImplementAcceptSendTask acceptSendTask = new ImplementAcceptSendTask(deviceCode, complexAcceptReq);
                 ThreadPool.getInstance().execute(acceptSendTask);
+            } else if ("handling/findPageWithPermission".equals(urlPath)) {
+                ImplementationReq implementationReq = JSONObject.parseObject(reqStr, ImplementationReq.class);
+                FindHandlingSendTask findHandlingSendTask = new FindHandlingSendTask(deviceCode, implementationReq);
+                ThreadPool.getInstance().execute(findHandlingSendTask);
             }
 
         }