Merge remote-tracking branch 'origin/feature/item_appeal' into feature/item_appeal

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

@@ -17,7 +17,10 @@
 
 package com.elink.esua.epdc.modules.interfacelog.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
@@ -26,12 +29,18 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
 import com.elink.esua.epdc.dto.interfacelog.InterfaceLogDTO;
+import com.elink.esua.epdc.gird.shibei.api.ShiBeiCityGridApi;
+import com.elink.esua.epdc.gird.shibei.dto.form.SendEventFormDto;
+import com.elink.esua.epdc.gird.shibei.dto.result.SendEventResultDto;
 import com.elink.esua.epdc.modules.interfacelog.excel.InterfaceLogExcel;
 import com.elink.esua.epdc.modules.interfacelog.service.InterfaceLogService;
+import com.elink.esua.epdc.modules.item.entity.ItemGridPlatformEntity;
+import com.elink.esua.epdc.modules.item.service.ItemGridPlatformService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -49,20 +58,26 @@ public class InterfaceLogController {
     @Autowired
     private InterfaceLogService interfaceLogService;
 
+    @Autowired
+    private ShiBeiCityGridApi shiBeiCityGridApi;
+
+    @Autowired
+    private ItemGridPlatformService itemGridPlatformService;
+
     @GetMapping("page")
-    public Result<PageData<InterfaceLogDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<InterfaceLogDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<InterfaceLogDTO> page = interfaceLogService.listInterfaceLog(params);
         return new Result<PageData<InterfaceLogDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<InterfaceLogDTO> get(@PathVariable("id") String id){
+    public Result<InterfaceLogDTO> get(@PathVariable("id") String id) {
         InterfaceLogDTO data = interfaceLogService.get(id);
         return new Result<InterfaceLogDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody InterfaceLogDTO dto){
+    public Result save(@RequestBody InterfaceLogDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         interfaceLogService.save(dto);
@@ -70,7 +85,7 @@ public class InterfaceLogController {
     }
 
     @PutMapping
-    public Result update(@RequestBody InterfaceLogDTO dto){
+    public Result update(@RequestBody InterfaceLogDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         interfaceLogService.update(dto);
@@ -78,7 +93,7 @@ public class InterfaceLogController {
     }
 
     @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         interfaceLogService.delete(ids);
@@ -91,4 +106,27 @@ public class InterfaceLogController {
         ExcelUtils.exportExcelToTarget(response, null, list, InterfaceLogExcel.class);
     }
 
+    @GetMapping("push")
+    public void push() {
+
+        List<String> urls = new ArrayList<>();
+        urls.add("{\"SENDTYPE\":\"SJSB\",\"SENDACTDEFID\":\"2\",\"SJZT\":\"0\",\"UID\":\"d1c29bf6ab3f4a3287811d8907c210f8\",\"SJLYU\":\"01\",\"SJDL\":\"0104\",\"SJLY\":\"12\",\"SSQS\":\"370203\",\"SSJD\":\"3702030280000000000\",\"SSSQ\":\"3702030280002100000\",\"SQLXR\":\"徐先生15689980992\",\"SJDZ\":\"瑞昌路98号小区4号楼下\",\"SJMS\":\"楼下单门门外墙面有非法小广告\",\"XZB\":\"120.358455618569494\",\"YZB\":\"36.112062711857426\",\"BZXX\":\"已由网格志愿者处理了非法小广告，可以结案。\",\"IMAGES\":{\"string\":\"https://epdc-shibei.elinkservice.cn/files-pro/20220929/eedb906914b045baafcbd37253a91fd5/网格办理照片.jpg\"},\"handleList\":[{\"createdTime\":\"2022-09-29 10:44:47\",\"advice\":\"已由网格志愿者处理了非法小广告，可以结案。\",\"handlerDept\":\"瑞昌路社区\",\"state\":\"结案申请\"},{\"createdTime\":\"2022-09-29 10:41:34\",\"advice\":\"居民您好，您提报的非法小广告问题已于9月29日10点35分由网格志愿者到瑞昌路98号4号楼楼下单元门处进行查看处理，希望能够让您满意，下一步社区会继续关注市容环境非法小广告相关问题，感谢您对社区工作的大力支持。   办理人：王贵玉  办理电话： 0532-83779102\",\"handlerDept\":\"瑞昌路社区第五网格\",\"state\":\"结案申请\",\"itemDeptDTOS\":{\"string\":\"瑞昌路社区\"}},{\"createdTime\":\"2022-09-29 10:20:22\",\"advice\":\"诉求已查收，正在办理。\",\"handlerDept\":\"瑞昌路社区第五网格\",\"state\":\"响应拟办\"}]}");
+        urls.forEach(data -> {
+
+            JSONObject toResult = JSON.parseObject(data);
+            SendEventFormDto result = ConvertUtils.mapToEntity(toResult, SendEventFormDto.class);
+
+            SendEventResultDto sendResult = shiBeiCityGridApi.sendEventManual(JSONObject.toJSONString(result));
+
+            ItemGridPlatformEntity itemGridPlatformEntity = new ItemGridPlatformEntity();
+//            itemGridPlatformEntity.setReferenceId("3e282ca3c3d3c5857a6b8d3e31fee0e3");
+//            itemGridPlatformEntity.setTaskid(sendResult.getP_recId());
+//            itemGridPlatformEntity.setReportPersonDeptId(1202862674230468610L);
+//            itemGridPlatformEntity.setStatus(15);
+            itemGridPlatformService.insert(itemGridPlatformEntity);
+        });
+
+    }
+
+
 }