修改数据上报接口地址

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/dao/EpdcWorkLogDao.java

@@ -1,8 +1,10 @@
 package com.elink.esua.epdc.modules.screen.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcWorkLogOrgActRecordsResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -23,21 +25,21 @@ public interface EpdcWorkLogDao extends BaseDao<EpdcWorkLogOrgActRecordsResultDT
     void removeOrgActInfo();
 
     /**
-     * 保存组织活动统计信息
+     * 获取社区
      *
-     * @param orgActList
-     * @return void
+     * @return java.util.List<com.elink.esua.epdc.dto.SysDeptDTO>
      * @author lc
-     * @since 2021/8/28 19:02
+     * @since 2021/8/31 20:42
      */
-    void insertOrgActInfo(List<EpdcWorkLogOrgActRecordsResultDTO> orgActList);
+    List<EpdcWorkLogOrgActRecordsResultDTO> getCommunityList();
 
     /**
-     * 删除历史数据
+     * 保存组织活动统计信息
      *
+     * @param orgActList
      * @return void
      * @author lc
-     * @since 2021/8/28 18:59
+     * @since 2021/8/28 19:02
      */
-    void removeOtherOrgActInfo();
+    void insertOrgActInfo(@Param("orgActList") List<EpdcWorkLogOrgActRecordsResultDTO> orgActList);
 }

epdc-cloud-analysis-pc/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/EpdcWorkLogServiceImpl.java

@@ -4,7 +4,9 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.dto.SysDeptDTO;
 import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcWorkLogOrgActRecordsResultDTO;
 import com.elink.esua.epdc.modules.screen.dao.EpdcWorkLogDao;
 import com.elink.esua.epdc.modules.screen.service.EpdcWorkLogService;
@@ -13,6 +15,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -36,10 +39,23 @@ public class EpdcWorkLogServiceImpl extends BaseServiceImpl<EpdcWorkLogDao, Epdc
                 if (null != orgActList && orgActList.size() > 0) {
                     // 删除历史数据
                     baseDao.removeOrgActInfo();
+                    // 获取社区
+                    List<EpdcWorkLogOrgActRecordsResultDTO> communities = baseDao.getCommunityList();
+                    List<EpdcWorkLogOrgActRecordsResultDTO> dataList = new ArrayList<>();
+                    for (EpdcWorkLogOrgActRecordsResultDTO dto:
+                            communities) {
+                        EpdcWorkLogOrgActRecordsResultDTO data = ConvertUtils.sourceToTarget(dto, EpdcWorkLogOrgActRecordsResultDTO.class);
+                        for (EpdcWorkLogOrgActRecordsResultDTO act:
+                                orgActList) {
+                            if (dto.getDeptId().equals(act.getDeptId())) {
+                                data = ConvertUtils.sourceToTarget(act, EpdcWorkLogOrgActRecordsResultDTO.class);
+                                break;
+                            }
+                        }
+                        dataList.add(data);
+                    }
                     // 插入新数据
-                    baseDao.insertOrgActInfo(orgActList);
-                    // 删除其他组织数据，只保留社区数据
-                    baseDao.removeOtherOrgActInfo();
+                    baseDao.insertOrgActInfo(dataList);
                 }
             }
         }

epdc-cloud-analysis-pc/src/main/resources/mapper/screen/EpdcWorkLogDao.xml

@@ -4,11 +4,15 @@
 <mapper namespace="com.elink.esua.epdc.modules.screen.dao.EpdcWorkLogDao">
 
     <delete id="removeOrgActInfo">
-        DELETE FROM epdc_screen_community_act_statistics
+        DELETE FROM yushan_esua_epdc_analysis.epdc_screen_community_act_statistics
     </delete>
 
+    <select id="getCommunityList" resultType="com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcWorkLogOrgActRecordsResultDTO">
+        SELECT ID as deptId, `name` as deptName FROM yushan_esua_epdc_admin.sys_dept WHERE DEL_FLAG = '0' AND type_key = 'community_party'
+    </select>
+
     <insert id="insertOrgActInfo">
-        INSERT INTO epdc_screen_community_act_statistics (ID,
+        INSERT INTO yushan_esua_epdc_analysis.epdc_screen_community_act_statistics (ID,
         DEPT_ID,
         DEPT_NAME,
         DEL_FLAG,
@@ -43,12 +47,4 @@
         </foreach>
     </insert>
 
-    <delete id="removeOtherOrgActInfo">
-        DELETE
-        FROM
-            epdc_screen_community_act_statistics
-        WHERE
-                DEPT_ID NOT IN ( SELECT d.id FROM esua_epdc_admin.sys_dept d WHERE d.DEL_FLAG = 0 AND d.TYPE_KEY = 'community_party' )
-    </delete>
-
 </mapper>

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 037ee6574bf347ae34d5251735a99c5511d81794
+Subproject commit 543266aa658a12a3a2854e4bba5321d5618fd1f1