诉求对接产品

esua-epdc/epdc-cloud-gateway-shibei

@@ -1 +1 @@
-Subproject commit dad604dd293be53704638730cbc1695fbdc68611
+Subproject commit 236f63d41014efef5007b4490c4eaebb35cac26b

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiItemController.java

@@ -11,10 +11,7 @@ import com.elink.esua.epdc.dto.events.XxxdEventDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdEventFormDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
 import com.elink.esua.epdc.service.ItemService;
@@ -22,6 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 移动端接口-项目模块
@@ -202,4 +200,20 @@ public class ApiItemController {
         return itemService.getXxxDQuestion(id);
     }
 
+
+
+    /**
+     *
+     * @description: 产品调用当天
+     * @author qushutong
+     * @date 2023/10/25 10:53
+     * @param  ’startTime endTime deptName
+     * @return  com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemToEpmetDTO>>
+     * @Version1.0
+     **/
+    @GetMapping("getItemList")
+    public Result<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params){
+        return itemService.getItemList(params);
+    }
 }
+

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java

@@ -6,10 +6,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.XxxdEventDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
 import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO;
@@ -17,12 +14,10 @@ import com.elink.esua.epdc.feign.fallback.ItemFeignClientFallback;
 import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目模块调用
@@ -168,5 +163,8 @@ public interface ItemFeignClient {
 
     @PostMapping("events/xxxd/question/detail/{id}")
     Result<XxxdEventDTO> getXxxDQuestion(@PathVariable("id") String id);
+
+    @GetMapping(value = "events/item/getItemList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params);
 }
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/ItemFeignClientFallback.java

@@ -7,10 +7,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.events.XxxdEventDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
 import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO;
@@ -19,6 +16,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.PathVariable;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author LC
@@ -106,4 +104,9 @@ public class ItemFeignClientFallback implements ItemFeignClient {
     public Result<XxxdEventDTO> getXxxDQuestion(String id) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "get", id);
     }
+
+    @Override
+    public Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_EVENTS_SERVER, "getItemList", params);
+    }
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ItemService.java

@@ -7,15 +7,13 @@ import com.elink.esua.epdc.dto.events.XxxdEventDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdEventFormDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
 import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目模块
@@ -161,4 +159,6 @@ public interface ItemService {
      * @return
      */
     Result<XxxdEventDTO> getXxxDQuestion(String id);
+
+    Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ItemServiceImpl.java

@@ -16,10 +16,7 @@ import com.elink.esua.epdc.dto.events.form.XxxdEventFormDTO;
 import com.elink.esua.epdc.dto.events.form.XxxdFeedBackQuestionFormDTO;
 import com.elink.esua.epdc.dto.form.PointLogFormDTO;
 import com.elink.esua.epdc.dto.item.form.*;
-import com.elink.esua.epdc.dto.item.result.ItemCategoryStatisticsResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemDetailResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemHandleProgressResultDTO;
-import com.elink.esua.epdc.dto.item.result.ItemResultDTO;
+import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.share.ShareEnterpriseDTO;
 import com.elink.esua.epdc.dto.share.form.ShareEnterpriseFormDTO;
 import com.elink.esua.epdc.dto.share.result.ShareEnterpriseResultDTO;
@@ -37,6 +34,7 @@ import org.springframework.stereotype.Service;
 import springfox.documentation.spring.web.json.Json;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -277,4 +275,9 @@ public class ItemServiceImpl implements ItemService {
         log.info("新新向党_查看随手拍接口(api/events/item/xxxd/question/detail/{id})入参id:"+id);
         return itemFeignClient.getXxxDQuestion(id);
     }
+
+    @Override
+    public Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params) {
+        return itemFeignClient.getItemList(params);
+    }
 }

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

@@ -0,0 +1,73 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ *
+ * @description:
+ * @author qushutong
+ * @date 2023/10/25 10:20
+ * @param
+ * @return
+ * @Version1.0
+ **/
+@Data
+public class ItemToEpmetDTO implements Serializable {
+    private static final long serialVersionUID = -8585880123979570671L;
+
+    /**
+     * 项目ID
+     */
+    private String id;
+
+    /**
+     * 所属组织
+     */
+    private String allDeptNames;
+
+
+    /**
+     * 上报渠道
+     */
+    private String reportingSource;
+
+
+    /**
+     * 接收时间
+     */
+    private String createdTime;
+
+    /**
+     * 项目内容
+     */
+    private String itemContent;
+
+    /**
+     * 联系人
+     */
+    private String nickname;
+
+    /**
+     * 联系电话
+     */
+    private String mobile;
+
+    /**
+     * 详细地址
+     */
+    private String issueAddress;
+
+    /**
+     * 分类
+     */
+    private String categoryFullName;
+
+
+    /**
+     * 状态
+     */
+    private String itemState;
+}

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

@@ -786,5 +786,18 @@ public class ItemController {
         return itemService.sqAppeal(appealAuditFormDTO);
     }
 
+    /**
+     *
+     * @description: 产品调用当天
+     * @author qushutong
+     * @date 2023/10/25 10:53
+     * @param  ’startTime endTime deptName
+     * @return  com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemToEpmetDTO>>
+     * @Version1.0
+     **/
+    @GetMapping("getItemList")
+    public Result<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params){
+        return itemService.getItemList(params);
+    }
 }
 

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

@@ -574,4 +574,6 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * 获取当日社区的网格员推送item数量
      */
     Integer minshengItemCount(@Param("parentDeptIds") String parentDeptIds);
+
+    List<ItemToEpmetDTO> selectItemList(Map<String, Object> params);
 }

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

@@ -842,4 +842,6 @@ public interface ItemService extends BaseService<ItemEntity> {
      * @Version1.0
      **/
     Result sqAppeal(AppealAuditFormDTO appealAuditFormDTO);
+
+    Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params);
 }

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

@@ -6204,4 +6204,10 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         pushToCityGridServiceImpl.appeal(appealFormDTO);
         return new Result();
     }
+
+    @Override
+    public Result<List<ItemToEpmetDTO>> getItemList(Map<String, Object> params) {
+        List<ItemToEpmetDTO> itemToEpmetList = baseDao.selectItemList(params);
+        return new Result<List<ItemToEpmetDTO>>().ok(itemToEpmetList);
+    }
 }

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

@@ -3518,4 +3518,28 @@
           AND CHAR_LENGTH( ITEM_CONTENT ) > 15
           AND PARENT_DEPT_IDS =  #{parentDeptIds}
     </select>
+
+    <select id="selectItemList" resultType="com.elink.esua.epdc.dto.item.result.ItemToEpmetDTO">
+        SELECT
+            i.ID,
+            i.ALL_DEPT_NAMES,
+            '北尚诉办' reportingSource,
+            i.CREATED_TIME,
+            i.ITEM_CONTENT,
+            i.NICK_NAME,
+            i.MOBILE,
+            i.ISSUE_ADDRESS,
+            i.CATEGORY_FULL_NAME,
+            i.ITEM_STATE
+        FROM
+            epdc_item i
+        WHERE
+        i.DEL_FLAG = '0'
+        <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+            i.UPDATED_TIME BETWEEN #{startTime} AND #{endTime}
+        </if>
+        <if test="deptName != null and deptName != ''">
+            AND find_in_set(#{deptName},item.ALL_DEPT_NAMES)
+        </if>
+    </select>
 </mapper>