市里驳回重办功能

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/PushToCityGridConstant.java

@@ -166,12 +166,24 @@ public interface PushToCityGridConstant {
     String SENDLIST = URL_PREFIX + "/sendList";
 
 
+    /**
+     * 热线重办数据接收接口
+     */
+    String AGAINLIST = URL_PREFIX + "/againList";
+
+
     /**
      * 设置诉求信息已接收接口
      */
     String UPDATEAPPEALSEND = URL_PREFIX + "/updateAppealSend";
 
 
+    /**
+     * 2.35设置诉求重办信息已接收接口–2024-08新增
+     */
+    String UPDATEAGAIN = URL_PREFIX + "/updateAgain";
+
+
 
     /**
      * 2.32热线数据评价接口（备用）

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

@@ -15,4 +15,6 @@ public class UpdateAppealSendDTO {
     private String sqid;
     // 7月31 新增诉求处理截止日期  先默认推后工作日5天
     private String jzrq;
+    // 8月20 新增重办id
+    private String cbid;
 }

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

@@ -59,6 +59,16 @@ public class CenterData implements Serializable {
     private List<FileListEntity> fileList;
     private Date createDate;
 
+    // 重办id
+    private String cbid;
+
+    // 重办类型 （0：办理；2：退办；4：重办）  0办理：原来由别的区市办理，现在由当前区市办理 2：退件不通过，需要继续办理
+    //4：办理结果不符合要求，需要重新办理
+    private String type;
+
+    // 重办原因 1000个字符
+    private String option;
+
     public void setCode(String code) {
         this.code = code;
     }

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

@@ -85,16 +85,15 @@ public class ItemHotlineController {
         return new Result();
     }
 
-//    @GetMapping("export")
-//    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-//        List<ItemHotlineDTO> list = itemHotlineService.list(params);
-//        ExcelUtils.exportExcelToTarget(response, null, list, ItemHotlineExcel.class);
-//    }
 
     @PostMapping("getHotLine")
     public Result getHotLine(){
         itemHotlineService.getHotLine();
 
+        // 拉取驳回重办案件
+
+        itemHotlineService.againList();
+
         return new Result();
     }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/entity/ItemHotlineEntity.java

@@ -74,5 +74,19 @@ public class ItemHotlineEntity extends BaseEpdcEntity {
 
 	private Date backTime;
 
+	private String cbYgzFlag;
+
+	// 重办id
+	private String cbid;
+
+	// 重办类型 （0：办理；2：退办；4：重办）  0办理：原来由别的区市办理，现在由当前区市办理 2：退件不通过，需要继续办理
+	//4：办理结果不符合要求，需要重新办理
+	private String type;
+
+	// 重办原因 1000个字符
+	private String option;
+
+
+	private String cbFlag;
 
 }

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

@@ -104,4 +104,6 @@ public interface ItemHotlineService extends BaseService<ItemHotlineEntity> {
 
 
     void bcckItem(ItemDTO itemDTO);
+
+    void againList();
 }

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

@@ -32,25 +32,22 @@ import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.ImageConstant;
-import com.elink.esua.epdc.constant.PushToCityGridConstant;
 import com.elink.esua.epdc.dto.ItemHotlineDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.form.ItemBackHotlineDTO;
 import com.elink.esua.epdc.dto.item.form.RollBackHotLineFromDTO;
 import com.elink.esua.epdc.dto.item.form.UpdateAppealSendDTO;
 import com.elink.esua.epdc.dto.item.result.CenterData;
-import com.elink.esua.epdc.dto.oss.UploadFormDTO;
 import com.elink.esua.epdc.dto.oss.UploadHotLineFormDTO;
 import com.elink.esua.epdc.modules.events.dao.ItemHotlineDao;
 import com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity;
 import com.elink.esua.epdc.modules.events.service.ImgService;
 import com.elink.esua.epdc.modules.events.service.ItemHotlineService;
 import com.elink.esua.epdc.modules.feign.OssFeignClient;
-import com.elink.esua.epdc.modules.item.entity.ItemEntity;
+import com.elink.esua.epdc.modules.item.entity.ItemLawEntity;
 import com.elink.esua.epdc.modules.item.service.impl.PushToCityGridServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jsoup.helper.DataUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -251,4 +248,59 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         itemHotlineEntity.setBackItemResult(itemDTO.getBackItemResult());
         baseDao.updateById(itemHotlineEntity);
     }
+
+    @Override
+    public void againList() {
+        List<CenterData> centerHotLine = pushToCityGridServiceImpl.againList();
+        // 插入12345 数据
+        UploadHotLineFormDTO dto = new UploadHotLineFormDTO();
+        UpdateAppealSendDTO appealSendDTO = new UpdateAppealSendDTO();
+        for (CenterData item : centerHotLine) {
+            ItemHotlineEntity itemHotlineEntity = ConvertUtils.sourceToTarget(item, ItemHotlineEntity.class);
+            itemHotlineEntity.setDjrxm("12345重办热线：" + itemHotlineEntity.getDjrxm());
+            SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            // 格式化 Date 对象
+            String formattedDate = formatter.format(item.getDjsj());
+            itemHotlineEntity.setSjnr("登记时间："+formattedDate+"内容："+item.getSjnr());
+            // 查询下 sqid去库里查一下，没有就当新件，sqid不变，也不能重复
+//            QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
+//            wrapper.eq("sqid", item.getSqid());
+//            wrapper.eq("del_flag", "0");
+////            wrapper.isNotNull("type").ne("type","");
+//            ItemHotlineEntity oldEntity = baseDao.selectOne(wrapper);
+            //注：0办理：原来由别的区市办理，现在由当前区市办理  插入 2：退件不通过，需要继续办理  这个得更新。不能插入
+            //4：办理结果不符合要求，需要重新办理   就是对处理结果不满意的 。插入一个新件出去处理
+
+            itemHotlineEntity.setCbFlag("1");
+
+            // 存入12345表
+            baseDao.insert(itemHotlineEntity);
+            //  存入之后 告知市里
+            appealSendDTO.setCbid(item.getCbid());
+            appealSendDTO.setJzrq(getData());
+            String result = pushToCityGridServiceImpl.sendUpdateAgain(appealSendDTO);
+            JSONObject res = JSONObject.parseObject(result);
+            if (NumConstant.ZERO_STR.equals(res.get("code").toString())) {
+                // 告知市里然后更改状态
+                itemHotlineEntity.setCbYgzFlag("1");
+                baseDao.updateById(itemHotlineEntity);
+            }
+            // 保存附件
+            List<String> imgUrls = new ArrayList<>();
+            for (CenterData.FileListEntity entity : item.getFileList()) {
+                //  存附件
+                dto.setBase64String(entity.getValue());
+                dto.setName(entity.getName());
+                Result<String> stringResult = ossFeignClient.uploadBaseHotLine(dto);
+                if (null == stringResult || !stringResult.success() || null == stringResult.getData()) {
+                    throw new RenException("图片上传失败");
+                }
+                imgUrls.add(stringResult.getData());
+
+            }
+            // 保存图片
+            imgService.saveImages(imgUrls, itemHotlineEntity.getId(), ImageConstant.TYPE_IMAGE_HOTLINE);
+
+        }
+    }
 }

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

@@ -314,5 +314,26 @@ public interface PushToCityGridService {
     void  backHotLine(RollBackHotLineFromDTO dto);
 
 
+    /**
+     *
+     * @description:  拉取驳回重办案件
+     * @author qushutong
+     * @date 2024/8/20 9:34
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.CenterData>
+     * @Version1.0
+     **/
+    List<CenterData> againList();
 
+    
+    /**
+     *
+     * @description:2.35设置诉求重办信息已接收接口–2024-08新增
+     * @author qushutong
+     * @date 2024/8/20 10:31
+     * @param 
+     * @return java.lang.String
+     * @Version1.0
+     **/
+    String sendUpdateAgain(UpdateAppealSendDTO appealSendDTO);
 }

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

@@ -1651,10 +1651,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         //发送到市平台
         String resultString = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.UPDATEAPPEALSEND, "设置诉求信息已接收接口");
         JSONObject res = JSONObject.parseObject(resultString);
-        String successFlag = YesOrNoEnum.NO.value();
-        if (NumConstant.ZERO_STR.equals(res.get("code").toString())) {
-            successFlag = YesOrNoEnum.YES.value();
-        }
         this.saveLog(dto.getSqid(),"12345","设置诉求信息已接收接口",PushToCityGridConstant.UPDATEAPPEALSEND,JSONObject.toJSONString(dto),resultString);
         return  resultString;
     }
@@ -1697,6 +1693,42 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         this.saveLog(dto.getSqid(),"12345数据","平台回退热线12345数据",PushToCityGridConstant.HOTLINEROLLBACK,JSONObject.toJSONString(dto),resultString);
 
     }
+
+    @Override
+    public List<CenterData> againList() {
+        HotLineFromDTO hotLineFromDTO = new HotLineFromDTO();
+        hotLineFromDTO.setCount(10);
+        // 正式环境
+/*        hotLineFromDTO.setFlag("sbq");
+        hotLineFromDTO.setSsqs("sbq2024");*/
+        hotLineFromDTO.setFlag("sbq2024");
+        hotLineFromDTO.setSsqs("sbq");
+        // 测试环境
+//        hotLineFromDTO.setPwd("sbq2024");
+//        hotLineFromDTO.setUserName("sbq");
+
+        //拉取12345 数据
+        String resultString = cityGridApi.sendItemToCity(hotLineFromDTO, PushToCityGridConstant.AGAINLIST, "拉取驳回重办12345数据");
+        JSONObject res = JSONObject.parseObject(resultString);
+        // 存日志
+        String successFlag = YesOrNoEnum.NO.value();
+        if (NumConstant.ZERO_STR.equals(res.get("code").toString())) {
+            successFlag = YesOrNoEnum.YES.value();
+        }
+
+        String dataStr = res.get("data").toString();
+        List<CenterData> results  = JSON.parseArray(dataStr,CenterData.class);
+        this.saveInterfaceLog("12345","拉取驳回重办12345数据",PushToCityGridConstant.AGAINLIST,successFlag,JSONObject.toJSONString(hotLineFromDTO),results.size()+"");
+        return results;
+    }
+
+    @Override
+    public String sendUpdateAgain(UpdateAppealSendDTO appealSendDTO) {
+        //发送到市平台
+        String resultString = cityGridApi.sendItemToCity(appealSendDTO, PushToCityGridConstant.UPDATEAGAIN, "设置诉求重办信息已接收接口");
+        this.saveLog(appealSendDTO.getSqid(),"12345","设置诉求重办信息已接收接口",PushToCityGridConstant.UPDATEAGAIN,JSONObject.toJSONString(appealSendDTO),resultString);
+        return  resultString;
+    }
 }