拉取最终结果+告知市里最终结果

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit 236f63d41014efef5007b4490c4eaebb35cac26b
+Subproject commit 84ef05300dc74abd725e245cc2c785bf388790d0

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

@@ -185,10 +185,10 @@ public interface PushToCityGridConstant {
 
 
 
-    /**
+//    /**
-     * 2.32热线数据评价接口（备用）
+//     * 2.32热线数据评价接口（备用）
-     */
+//     */
-    String byEVALUATION = URL_PREFIX + "/evaluation";
+//    String byEVALUATION = URL_PREFIX + "/evaluation";
 
 
 
@@ -199,4 +199,27 @@ public interface PushToCityGridConstant {
 
 
 
+
+    /**
+     * 诉求合并申请
+     */
+    String MERGE = URL_PREFIX + "/merge";
+
+
+
+
+
+    /**
+     * 2.38热线最终办理结果接收接口–2024-10新增
+     */
+    String BACKRESULT = URL_PREFIX + "/backResult";
+
+
+
+    /**
+     * 2.39设置诉求最终办理结果已接收接口–2024-10新增
+     */
+    String UPDATEBACKRESULT = URL_PREFIX + "/updateBackResult";
+
+
 }

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

@@ -0,0 +1,30 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ *
+ * @description: 2.38热线最终办理结果接收接口–2024-10新增
+ * @author qushutong
+ * @date 2024/10/31 14:48
+ * @param
+ * @return
+ * @Version1.0
+ **/
+@Data
+public class HotLineBackResultData implements Serializable {
+    private static final long serialVersionUID = 2077955195500882097L;
+
+    /**
+     * czsj :  2022-09-01 18:23:00
+     * cznr : 处理内容
+     * sqid :  e2d096bd7e62462ebc28bb89bde737c0
+     */
+    private Date czsj;
+    private String cznr;
+    private String sqid;
+
+}

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

@@ -50,19 +50,19 @@ public class ItemHotlineController {
     private ItemHotlineService itemHotlineService;
 
     @GetMapping("page")
-    public Result<PageData<ItemHotlineDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<ItemHotlineDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<ItemHotlineDTO> page = itemHotlineService.page(params);
         return new Result<PageData<ItemHotlineDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<ItemHotlineDTO> get(@PathVariable("id") String id){
+    public Result<ItemHotlineDTO> get(@PathVariable("id") String id) {
         ItemHotlineDTO data = itemHotlineService.get(id);
         return new Result<ItemHotlineDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody ItemHotlineDTO dto){
+    public Result save(@RequestBody ItemHotlineDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         itemHotlineService.save(dto);
@@ -70,7 +70,7 @@ public class ItemHotlineController {
     }
 
     @PutMapping
-    public Result update(@RequestBody ItemHotlineDTO dto){
+    public Result update(@RequestBody ItemHotlineDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         itemHotlineService.update(dto);
@@ -78,7 +78,7 @@ public class ItemHotlineController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         itemHotlineService.delete(ids);
@@ -87,39 +87,40 @@ public class ItemHotlineController {
 
 
     @PostMapping("getHotLine")
-    public Result getHotLine(){
+    public Result getHotLine() {
         itemHotlineService.getHotLine();
 
         // 拉取驳回重办案件
 
         itemHotlineService.againList();
 
+        //热线最终办理结果接收接口
+        itemHotlineService.getBackResult();
+
         return new Result();
     }
 
 
     /**
-     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @description: 街道回退市里
      * @author qushutong
      * @date 2024/8/21 16:44
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Version1.0
      **/
     @PostMapping("goBackCity")
-    public Result goBack(@RequestBody ItemHotlineDTO dto){
+    public Result goBack(@RequestBody ItemHotlineDTO dto) {
         itemHotlineService.goBack(dto);
-        return  new Result();
+        return new Result();
     }
 
     /**
-     *
-     * @description:  热线12345 退件
-     * @author qushutong
-     * @date 2024/8/5 18:04
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @description: 热线12345 退件
+     * @author qushutong
+     * @date 2024/8/5 18:04
      * @Version1.0
      **/
     @PostMapping("backHotLine")
@@ -127,4 +128,6 @@ public class ItemHotlineController {
         return itemHotlineService.backHotLine(dto);
     }
 
+
+
 }

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

@@ -89,4 +89,9 @@ public class ItemHotlineEntity extends BaseEpdcEntity {
 
 	private String cbFlag;
 
+	// 最终办理结果接收接口 时间
+	private  Date czsj;
+	// 最终办理结果接收接口 内容
+	private  String cznr;
+
 }

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

@@ -108,4 +108,6 @@ public interface ItemHotlineService extends BaseService<ItemHotlineEntity> {
     void againList();
 
     void goBack(ItemHotlineDTO dto);
+
+    void getBackResult();
 }

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

@@ -38,6 +38,7 @@ 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.item.result.HotLineBackResultData;
 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;
@@ -146,7 +147,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             // 格式化 Date 对象
             String formattedDate = formatter.format(item.getDjsj());
-            itemHotlineEntity.setSjnr("登记时间："+formattedDate+"内容："+item.getSjnr());
+            itemHotlineEntity.setSjnr("登记时间：" + formattedDate + "内容：" + item.getSjnr());
             // 存入12345表
             baseDao.insert(itemHotlineEntity);
             //  存入之后 告知市里
@@ -179,9 +180,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
     }
 
 
-
+    public String getData() {
-
-    public String getData(){
         // 获取今天的日期
         LocalDate today = LocalDate.now();
         // 初始化一个计数器，用于记录工作日的天数
@@ -216,7 +215,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         itemHotlineEntity.setBackResult(dto.getCznr());
         itemHotlineEntity.setBackTime(new Date());
         baseDao.updateById(itemHotlineEntity);
-        RollBackHotLineFromDTO formdto =new RollBackHotLineFromDTO();
+        RollBackHotLineFromDTO formdto = new RollBackHotLineFromDTO();
         formdto.setSqid(itemHotlineEntity.getSqid());
         LocalDateTime currentDateTime = LocalDateTime.now();
 
@@ -227,10 +226,10 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         formdto.setCznr(dto.getCznr());
         RollBackHotLineFromDTO.CzrEntity czrEntity = new RollBackHotLineFromDTO.CzrEntity();
         UserDetail user = SecurityUser.getUser();
-        czrEntity.setId(user.getId()+"");
+        czrEntity.setId(user.getId() + "");
         czrEntity.setXm(user.getRealName());
         czrEntity.setLxdh(user.getMobile());
-        czrEntity.setSsjgbm(user.getDeptId()+"");
+        czrEntity.setSsjgbm(user.getDeptId() + "");
         czrEntity.setSsjg(user.getDeptName());
         czrEntity.setSsbmbm(user.getDeptId().toString());
         czrEntity.setSsbm(user.getDeptName());
@@ -261,7 +260,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
             SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             // 格式化 Date 对象
             String formattedDate = formatter.format(item.getDjsj());
-            itemHotlineEntity.setSjnr("登记时间："+formattedDate+ "重办原因:"+item.getOpinion()+"内容：" +item.getSjnr());
+            itemHotlineEntity.setSjnr("登记时间：" + formattedDate + "重办原因:" + item.getOpinion() + "内容：" + item.getSjnr());
             // 查询下 sqid去库里查一下，没有就当新件，sqid不变，也不能重复
 //            QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
 //            wrapper.eq("sqid", item.getSqid());
@@ -270,7 +269,6 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
 //            ItemHotlineEntity oldEntity = baseDao.selectOne(wrapper);
 
 
-
             //注：0办理：原来由别的区市办理，现在由当前区市办理  插入 2：退件不通过，需要继续办理  这个得更新。不能插入
             //4：办理结果不符合要求，需要重新办理   就是对处理结果不满意的 。插入一个新件出去处理
             // 改为都插入 等分发的时候在做处理
@@ -315,4 +313,24 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
         entity.setBackItemResult(dto.getBackItemResult());
         updateById(entity);
     }
+
+    @Override
+    public void getBackResult() {
+        //  拉取热线最终办理结果
+        List<HotLineBackResultData> hotLineBackResultData = pushToCityGridServiceImpl.hotLineBackResult();
+        UpdateAppealSendDTO dto = new UpdateAppealSendDTO();
+        for (HotLineBackResultData item : hotLineBackResultData) {
+            QueryWrapper<ItemHotlineEntity> wrapper = new QueryWrapper<>();
+            wrapper.eq(StringUtils.isNotBlank(item.getSqid()), "sqid", item.getSqid());
+            ItemHotlineEntity itemHotlineEntity = baseDao.selectOne(wrapper);
+            itemHotlineEntity.setCzsj(item.getCzsj());
+            itemHotlineEntity.setCznr(item.getCznr());
+            baseDao.updateById(itemHotlineEntity);
+
+            //  设置诉求最终办理结果已接收接口
+            dto.setSqid(item.getSqid());
+            pushToCityGridServiceImpl.updateBackResult(dto);
+        }
+
+    }
 }

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

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.item.result.AppealFormDTO;
 import com.elink.esua.epdc.dto.item.result.CenterData;
+import com.elink.esua.epdc.dto.item.result.HotLineBackResultData;
 import org.bouncycastle.crypto.tls.SRTPProtectionProfile;
 
 import java.util.List;
@@ -336,4 +337,33 @@ public interface PushToCityGridService {
      * @Version1.0
      **/
     String sendUpdateAgain(UpdateAppealSendDTO appealSendDTO);
+
+
+    /**
+     *
+     * @description: 热线最终办理结果接收接口
+     * @author qushutong
+     * @date 2024/10/31 14:52
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.item.result.HotLineBackResultData>
+     * @Version1.0
+     **/
+    List<HotLineBackResultData>  hotLineBackResult();
+
+
+
+
+
+
+    /**
+     *
+     * @description: 2.39设置诉求最终办理结果已接收接口–2024-10新增
+     * @author qushutong
+     * @date 2024/11/1 16:31
+     * @param 
+     * @return java.lang.String
+     * @Version1.0
+     **/
+    String updateBackResult(UpdateAppealSendDTO dto);
+
 }

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

@@ -1732,6 +1732,43 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
         this.saveLog(appealSendDTO.getSqid(),"12345","设置诉求重办信息已接收接口",PushToCityGridConstant.UPDATEAGAIN,JSONObject.toJSONString(appealSendDTO),resultString);
         return  resultString;
     }
+
+    @Override
+    public List<HotLineBackResultData> hotLineBackResult() {
+
+        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");
+
+        //热线最终办理结果接收接口
+        String resultString = cityGridApi.sendItemToCity(hotLineFromDTO, PushToCityGridConstant.BACKRESULT, "热线最终办理结果接收接口");
+        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<HotLineBackResultData> results  = JSON.parseArray(dataStr,HotLineBackResultData.class);
+        this.saveInterfaceLog("12345办理结果","热线最终办理结果接收接口",PushToCityGridConstant.BACKRESULT,successFlag,JSONObject.toJSONString(hotLineFromDTO),results.size()+"");
+        return results;
+    }
+
+    @Override
+    public String updateBackResult(UpdateAppealSendDTO dto) {
+        //发送到市平台
+        String resultString = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.UPDATEBACKRESULT, "设置诉求重办信息已接收接口");
+        this.saveLog(dto.getSqid(),"12345","标记设置诉求最终办理结果信息已接收。。",PushToCityGridConstant.UPDATEBACKRESULT,JSONObject.toJSONString(dto),resultString);
+        return  resultString;
+    }
 }