补log日志里面的数据

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ReBackResultDTO.java

@@ -0,0 +1,53 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.item;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 项目表 项目表
+ *
+ * @author yujintao yujintao@elink-cn.com
+ * @since v1.0.0 2019-09-04
+ */
+@Data
+public class ReBackResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    private String id;
+
+    /**
+     * 事件ID
+     */
+    private String sqid;
+
+    /**
+     * 议题ID
+     */
+    private String cbid;
+
+
+
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -1006,6 +1006,11 @@ public class ItemController {
     }
     
     
-    
+
+    @PostMapping("case/rebackreback")
+    public  Result rebackreback(){
+        itemService.rebackreback();
+        return  new Result();
+    }
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java

@@ -22,10 +22,7 @@ import com.elink.esua.epdc.dto.events.form.GroupFormDTO;
 import com.elink.esua.epdc.dto.events.form.ItemDailyStatisFormDTO;
 import com.elink.esua.epdc.dto.events.result.ItemDailyStatisResultDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
-import com.elink.esua.epdc.dto.item.ItemClosedDTO;
+import com.elink.esua.epdc.dto.item.*;
-import com.elink.esua.epdc.dto.item.ItemDTO;
-import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
-import com.elink.esua.epdc.dto.item.ItemPendingHandleDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
@@ -581,4 +578,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
 
 
     List<ItemDTO> selectDissatisfiedList(Map<String, Object> params);
+
+    List<ReBackResultDTO> rebackreback();
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -877,4 +877,6 @@ public interface ItemService extends BaseService<ItemEntity> {
     Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO);
 
     void backAppeal(Map<String, Object> params);
+
+    void rebackreback();
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -20,6 +20,9 @@ package com.elink.esua.epdc.modules.item.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7393,4 +7396,51 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         itemEntity.setDistrictReject(districtReject);
         baseDao.updateById(itemEntity);
     }
+
+    @Override
+    public void rebackreback() {
+        List<ReBackResultDTO> list = baseDao.rebackreback();
+        list.forEach(e->{
+            LambdaQueryWrapper<ItemReportInterfaceLogEntity> reportqw = new LambdaQueryWrapper<ItemReportInterfaceLogEntity>()
+                    .eq(ItemReportInterfaceLogEntity::getItemId, e.getId());
+            List<ItemReportInterfaceLogEntity> itemReportInterfaceLogEntities = itemReportInterfaceLogDao.selectList(reportqw);
+            itemReportInterfaceLogEntities.forEach(re->{
+                String jsonString = re.getCallMsgBody().replace(e.getCbid(), e.getSqid());
+                log.info(jsonString+"111111111111111111111");
+                // 发请求
+                String resultString = sendItemToCity(jsonString, re.getInterfaceUrl(), re.getInterfaceName() + "驳回重办重新推送");
+                log.info(resultString+"22222222222222");
+                //保存sqid
+                JSONObject shop_user = JSON.parseObject(resultString);
+//                String sqid = JSON.parseObject(shop_user.getString("data")).getString("sqid");
+                //保存日志
+                pushToCityGridServiceImpl.saveLog(e.getId(), null, re.getInterfaceName() + "驳回重办重新推送", re.getInterfaceUrl(), jsonString, resultString);
+            });
+        });
+
+    }
+
+    public String sendItemToCity(String dataInfo, String httpUrl, String interFaceName) {
+        dataInfo = dataInfo.replace(ApiConstants.eventOssUrlBefore, ApiConstants.eventOssUrlAfter);
+//        LOGGER.info("发送参数:" + data);
+//        LOGGER.info("发送地址：" + httpUrl);
+        HttpResponse response = null;
+        try {
+            response = HttpRequest.post(httpUrl).body(dataInfo)
+                    .header("lan", "zh")
+                    .header("Content-type", "application/json").execute();
+//            LOGGER.info(interFaceName + "返回数据:" + response.body());
+
+            JSONObject res = JSONObject.parseObject(response.body());
+            SendEventResultDto result = null;
+            if (0 == Integer.parseInt(res.get("code").toString())) {
+            }
+        } catch (Exception e) {
+            SendEventResultDto dto = new SendEventResultDto();
+            dto.setCode("-1");
+            dto.setMessage(null == response?"调用接口失败":response.body());
+            return JSONObject.toJSONString(dto);
+        }
+        return response.body();
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -4375,5 +4375,11 @@
         ORDER BY
         i.UPDATED_TIME DESC
     </select>
+    <select id="rebackreback" resultType="com.elink.esua.epdc.dto.item.ReBackResultDTO">
+        SELECT i.ID,h.SQID,h.cbid  FROM epdc_item i LEFT JOIN epdc_item_hotline h ON h.cbid = i.SQID
+        WHERE h.ID IS NOT NULL AND h.back_flag IS  NULL
+        AND i.CREATED_TIME &lt;= '2024-12-16 16:40:00'
+
+    </select>
 
 </mapper>