添加事项材料与情形查询

complex-window-manager/pom.xml

@@ -36,7 +36,7 @@
                 <profiles.log.level>info</profiles.log.level>
                 <profiles.publish.path>/home/publish</profiles.publish.path>
                 <profiles.complexServerUrl>https://112.19.80.237:11043/zwzc/</profiles.complexServerUrl>
-                <profiles.complexDeviceCode>9c:30:5b:b5:c0:d5</profiles.complexDeviceCode>
+                <profiles.complexDeviceCode>04-2B-58-0D-4B-FC</profiles.complexDeviceCode>
                 <package.environment>serve</package.environment>
                 <skipUi>false</skipUi>
             </properties>
@@ -59,7 +59,7 @@
                 <profiles.log.path>/home/mortals/app/logs</profiles.log.path>
                 <profiles.log.level>INFO</profiles.log.level>
                 <profiles.complexServerUrl>https://112.19.80.237:11043/zwzc/</profiles.complexServerUrl>
-                <profiles.complexDeviceCode>9c:30:5b:b5:c0:d5</profiles.complexDeviceCode>
+                <profiles.complexDeviceCode>04-2B-58-0D-4B-FC</profiles.complexDeviceCode>
                 <package.environment>test</package.environment>
                 <skipUi>true</skipUi>
             </properties>

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

+package com.mortals.xhx.busiz.req;
+
+import com.mortals.xhx.busiz.BaseApiReq;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 代办列表
+ *
+ * @author: zxfei
+ * @date: 2023/10/30 16:50
+ */
+@Data
+public class ComplexHandleReq extends BaseApiReq {
+
+    private String handlingId;
+
+    private String orderByLimitTime;
+
+    private String waitHandlingSearch;
+
+    private String search; //手机号码 身份证 事项编码
+
+    private String businessTacheId;
+
+
+    private String btsIds;
+
+    private String startDate;
+
+    private String endDate;
+
+    private String eventType;
+
+    private String areaCode;
+
+    private String isTimeout;
+
+    private String systemCode;
+
+    private String state;
+
+    private String isTongBan;
+
+
+}

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

@@ -12,6 +12,7 @@ import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
 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.accept.ComplexAcceptReq;
 import com.mortals.xhx.busiz.rsp.ApiResp;
@@ -311,6 +312,39 @@ 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");
+        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);
+            if (ObjectUtil.isEmpty(rest)) {
+                throw new AppException("请求访问超时");
+            }
+            Rest<List<DictInfo>> eventRest = JSON.parseObject(rest, new TypeReference<Rest<List<DictInfo>>>() {
+            });
+            return JSON.toJSONString(eventRest);
+        } catch (Exception e) {
+            log.error("接收数据失败", e);
+            rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
+            rsp.setMsg(e.getMessage());
+            return JSON.toJSONString(rsp);
+        }
+    }
+
     public static void main(String[] args) {
 
         File file = new File("E:\\pic\\1.png");

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

@@ -3,6 +3,7 @@ package com.mortals.xhx.protocol.complex.matter.model.rsp;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class AcceptRspInfo{
@@ -47,9 +48,9 @@ public class AcceptRspInfo{
 	private Object hotNum;
 	private String phone;
 	private String sourceType;
-	private Object handlingIds;
+	private List<Long> handlingIds;
 	private String doSource;
-	private Object infoMap;
+	private Map<String,String> infoMap;
 	private Object applyCode;
 	private Object situationItems;
 	private int btsOrder;

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

@@ -2,15 +2,11 @@ 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.framework.util.ThreadPool;
 import com.mortals.xhx.busiz.req.accept.ComplexAcceptReq;
 import com.mortals.xhx.common.utils.AbstractThread;
 import com.mortals.xhx.protocol.complex.matter.model.req.ImplementationReq;
-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 org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
 import static com.mortals.xhx.common.key.RedisKey.KEY_COMPLEX_REQ;
-import static com.mortals.xhx.common.key.RedisKey.KEY_EVENT_IMPLEMENTATION_RESP;
 
 
 /**