Merge branch 'pingyin_master' of http://git.elinkit.com.cn:7070/r/epmet-cloud into pingyin_master

epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml

@@ -9,8 +9,13 @@ services:
     volumes:
       - "/opt/epmet-cloud-logs/dev:/logs"
     environment:
-      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
+      RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ../target/epmet-admin-server.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-admin/epmet-admin-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-admin.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-admin/epmet-admin-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-admin.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-auth/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-auth/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-auth/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx300m -jar ./epmet-auth.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-auth/src/main/java/com/epmet/service/impl/LoginServiceImpl.java

@@ -304,7 +304,7 @@ public class LoginServiceImpl implements LoginService {
 		passwordLoginUserInfoFormDTO.setPhone(formDTO.getPhone());
 		Result<PasswordLoginUserInfoResultDTO> userInfoResult = epmetUserFeignClient.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO);
 		if (!userInfoResult.success() || null == userInfoResult.getData()) {
-			logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在");
+			// logger.error("根据手机号查询运营人员信息失败,返回10003账号不存在");
 			throw new RenException(EpmetErrorCode.ERR10003.getCode());
 		}
 		//3、密码是否正确

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -27,7 +27,9 @@ public interface NumConstant {
     int ELEVEN = 11;
     int TWELVE = 12;
     int THIRTEEN = 13;
+    int SIXTEEN = 16;
     int SEVENTEEN = 17;
+    int EIGHTEEN = 18;
     int FIFTEEN = 15;
     int FOURTEEN=14;
     int TWENTY = 20;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -160,6 +160,7 @@ public enum EpmetErrorCode {
 	ERROR_DATE(8533, "不合理日期"),
 
 	CHECK_PHONE_ERROR(8534, "号码不合法"),
+	TITLE_AND_CONTENT_ERROR(8535, "标题和内容不能同时为空"),
 
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),
@@ -257,6 +258,7 @@ public enum EpmetErrorCode {
 	IC_MOVE_IN(8926,"居民信息中房屋信息与当前选择房屋不一致，是否更新？"),
 	NOT_REGEIST_RESI(8927,"未注册居民"),
 	UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"),
+	IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"),
 
 	MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"),
 

epmet-gateway/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-gateway/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-gateway/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-gateway.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-gateway/pom.xml

@@ -275,6 +275,7 @@
                 <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
                 <!--  4、OSS服务 -->
                 <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
+<!--                <gateway.routes.epmet-oss-server.uri>http://localhost:8083</gateway.routes.epmet-oss-server.uri>-->
                 <!--  5、消息服务  -->
                 <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>
                 <!--  6、工作流服务 -->

epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-aggregator.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx760m -jar ./data-aggregator.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-aggregator/data-aggregator-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-aggregator.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -688,6 +688,9 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         //1.分页查询排好序的工作人员Id列表【原本1/2步可以用一个sql，但涉及2需要按1的顺序排序，sql复杂且效率低，所以拆开】
         LinkedList<String> staffIds = customerStaffDao.selectOrderRole(formDTO);
         //2.批量查询工作人员信息，按传入顺序排序
+        if(CollectionUtils.isEmpty(staffIds)){
+            return new ArrayList<>();
+        }
         List<ListStaffResultDTO> resultList = customerStaffDao.selectStaffList(staffIds);
         return resultList;
     }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml

@@ -116,16 +116,18 @@
             customer_staff
         WHERE
             del_flag = '0'
-        AND user_id IN
-        <foreach item="staffId" collection="staffIds" open="(" separator="," close=")">
-            #{staffId}
-        </foreach>
-        ORDER BY field(
-            user_id,
-            <foreach item="staffId" collection="staffIds" separator=",">
+        <if test="staffIds != null and staffIds.size() > 0">
+            AND user_id IN
+            <foreach item="staffId" collection="staffIds" open="(" separator="," close=")">
                 #{staffId}
             </foreach>
-        )
+            ORDER BY field(
+                user_id,
+                <foreach item="staffId" collection="staffIds" separator=",">
+                    #{staffId}
+                </foreach>
+            )
+        </if>
     </select>
 
     <select id="selectByStaffId" resultType="com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO">

epmet-module/data-report/data-report-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-report/data-report-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx1524m -jar ./data-report.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-report/data-report-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx250m -jar ./data-report.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx3000m -jar ./data-stats.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx512m -jar ./data-stats.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/stats/BaseReportDao.java

@@ -94,6 +94,8 @@ public interface BaseReportDao {
      */
     int delAgencyProject(@Param("customerId") String customerId, @Param("dateId") String dateId);
 
+    void delAgencyProjectDaily(@Param("customerId") String customerId,@Param("dateIdList")List<String> dateIdList);
+
     /**
      * @Description  批量新增组织项目数据
      * @Param dataList

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/BaseReportServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -288,10 +289,22 @@ public class BaseReportServiceImpl implements BaseReportService {
     @Override
     public void agencyProject(AgencyProjectFormDTO formDTO) {
         if (formDTO.getIsFirst()) {
-            int deleteNum;
-            do {
-                deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId());
-            } while (deleteNum > NumConstant.ZERO);
+            // 20220711修改逻辑
+//            int deleteNum;
+//            do {
+//                deleteNum = baseReportDao.delAgencyProject(formDTO.getDataList().get(NumConstant.ZERO).getCustomerId(), formDTO.getDataList().get(NumConstant.ZERO).getDateId());
+//            } while (deleteNum > NumConstant.ZERO);
+
+            List<AgencyProjectFormDTO.DataList> dataList = formDTO.getDataList();
+            List<String> dateIdList = new ArrayList<String>();
+            String customerId = dataList.get(NumConstant.ZERO).getCustomerId();
+            for(AgencyProjectFormDTO.DataList d : dataList){
+                if(!dateIdList.contains(d.getDateId())){
+                    dateIdList.add(d.getDateId());
+                }
+            }
+            baseReportDao.delAgencyProjectDaily(customerId,dateIdList);
+
         }
         List<List<AgencyProjectFormDTO.DataList>> partition = ListUtils.partition(formDTO.getDataList(), NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml

@@ -240,28 +240,20 @@
             FROM
                 screen_project_process spp
             WHERE
-                ( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'closed_case' UNION ALL
-            SELECT
-                spp.CUSTOMER_ID,
-                PROJECT_ID,
-                HANDLER_ID,
-                HANDLER_TYPE,
-                ORG_ID_PATH
-            FROM
-                screen_project_process spp
-            WHERE
-                ( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
-                AND OPERATION = 'close'
+                (( spp.CUSTOMER_ID = '2fe0065f70ca0e23ce4c26fca5f1d933' OR spp.CUSTOMER_ID = '44876154d10d7cb7affd92000f84f833' OR spp.CUSTOMER_ID = '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'closed_case')
+                OR
+                (( spp.CUSTOMER_ID != '2fe0065f70ca0e23ce4c26fca5f1d933' AND spp.CUSTOMER_ID != '44876154d10d7cb7affd92000f84f833' AND spp.CUSTOMER_ID != '46c55cb862d6d5e6d05d2ab61a1cc07e' )
+                AND OPERATION = 'close')
+                <if test='null != customerId and "" != customerId'>
+                    AND spp.CUSTOMER_ID = #{customerId}
+                </if>
+                <if test='null != projectIds and projectIds.size()>0'>
+                    <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
+                       spp.PROJECT_ID = #{projectId}
+                    </foreach>
+                </if>
             ) b ON a.PROJECT_ID = b.PROJECT_ID
-            <if test='null != customerId and "" != customerId'>
-                AND b.CUSTOMER_ID = #{customerId}
-            </if>
-            <if test='null != projectIds and projectIds.size()>0'>
-                <foreach collection="projectIds" item="projectId" open="AND (" separator=" OR " close=" )">
-                   b.PROJECT_ID = #{projectId}
-                </foreach>
-            </if>
             LEFT JOIN screen_customer_agency c ON b.HANDLER_ID = c.AGENCY_ID
             WHERE a.DEL_FLAG = '0'
             AND a.CATEGORY_CODE IS NOT NULL

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/BaseReportDao.xml

@@ -364,6 +364,15 @@
           LIMIT 1000
     </delete>
 
+    <delete id="delAgencyProjectDaily">
+        DELETE FROM fact_agency_project_daily
+        WHERE customer_id = #{customerId}
+        AND date_id IN
+        <foreach collection="dateIdList" index="index" item="dateId" open="(" separator="," close=")">
+            #{dateId}
+        </foreach>
+    </delete>
+
     <!-- 批量新增组织项目数据 -->
     <insert id="insertAgencyProject">
         INSERT INTO fact_agency_project_daily

epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-activiti/epmet-activiti-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-activiti.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./common-service.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-common-service/common-service-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./common-service.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-ext/epmet-ext-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-ext.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActContentDTO.java

@@ -50,7 +50,7 @@ public class ActContentDTO implements Serializable {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActInfoDTO.java

@@ -193,6 +193,11 @@ public class ActInfoDTO implements Serializable {
      */
 	private String sponsorId;
 
+    /**
+     * 主办方全路径包含自身id
+     */
+    private String sponsorPath;
+
     /**
      * 活动主办方名称（机关或网格的名称）
      */
@@ -238,6 +243,11 @@ public class ActInfoDTO implements Serializable {
      */
 	private Boolean summaryFlag;
 
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
+
     /**
      * 乐观锁
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/ActSummaryDTO.java

@@ -50,7 +50,7 @@ public class ActSummaryDTO implements Serializable {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActContentDTO.java

@@ -50,7 +50,7 @@ public class LatestActContentDTO implements Serializable {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/LatestActInfoDTO.java

@@ -154,6 +154,11 @@ public class LatestActInfoDTO implements Serializable {
      */
 	private String sponsorId;
 
+    /**
+     * 主办方全路径包含自身id
+     */
+    private String sponsorPath;
+
     /**
      * 活动主办方名称（机关或网格的名称）
      */
@@ -179,6 +184,11 @@ public class LatestActInfoDTO implements Serializable {
      */
 	private Boolean auditSwitch;
 
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
+
     /**
      * 活动类型爱心活动heart 联建活动party
      */

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/ActPageFormDTO.java

@@ -0,0 +1,36 @@
+package com.epmet.dto.form.work;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 爱心互助列表入参DTO
+ */
+@Data
+public class ActPageFormDTO extends PageFormDTO implements Serializable {
+    private static final long serialVersionUID = 6473824879249274683L;
+    /**
+     * 活动标题
+     */
+    private String title;
+    /**
+     * 活动预计开始时间
+     */
+    private String actStartTime;
+    /**
+     * 活动预计结束时间
+     */
+    private String actEndTime;
+    /**
+     * 状态： 已发布/报名中：published； 已取消：canceled; 已结束：finished）
+     */
+    private String status;
+
+    /**
+     * tokenDto获取
+     */
+    private String customerId;
+    private String userId;
+}

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/AuditUserFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form.work;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -12,6 +13,7 @@ import java.io.Serializable;
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 17:28
  */
+@Valid
 @Data
 public class AuditUserFormDTO implements Serializable {
     private static final long serialVersionUID = 243279409415285207L;
@@ -28,4 +30,7 @@ public class AuditUserFormDTO implements Serializable {
     @NotBlank(message = "拒绝理由不能为空", groups = {RefusedUserShowGroup.class})
     private String rejectReason;
 
+    @NotBlank(message = "type不能为空【通过：pass;拒绝：refused】", groups = {AddUserInternalGroup.class})
+    private String type;
+
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/FinishActFormDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dto.form.work;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/6/30 19:22
+ */
+@Data
+public class FinishActFormDTO extends  SaveActualTimeFormDTO implements Serializable {
+    private static final long serialVersionUID = -4352058593501077516L;
+    @NotNull(message = "分值不能为空",groups =AddUserInternalGroup.class )
+    private Integer reward;
+    private List<GrantPointsFormDTO> userList;
+}
+

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/GrantPointsFormDTO.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -27,4 +28,9 @@ public class GrantPointsFormDTO implements Serializable {
 
     @NotBlank(message = "理由不能为空", groups = {DenyUserShowGroup.class})
     private String denyRewardReason;
+    /**
+     * true:给分；false：不给分
+     */
+    @NotNull(message = "请选择是否给分", groups = DenyUserShowGroup.class)
+    private Boolean grantPoint;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActContentFormDTO.java

@@ -29,8 +29,8 @@ public class PublishActContentFormDTO implements Serializable {
     private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
-    @NotBlank(message = "内容类型不能为空,图片：img;文字：text", groups = {UserInternalGroup.class})
+    @NotBlank(message = "内容类型 图片：img；文字：text;富文本：rich_text", groups = {UserInternalGroup.class})
     private String contentType;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/PublishActInfoFormDTO.java

@@ -165,6 +165,11 @@ public class PublishActInfoFormDTO implements Serializable {
     @NotBlank(message = "主办方id不能为空", groups = {AddUserInternalGroup.class})
     private String sponsorId;
 
+    /**
+     * 主办方全路径包含自身id
+     */
+    private String sponsorPath;
+
     /**
      * 主办方类型：以网格名义：grid , 以机关名义： agency
      */
@@ -212,4 +217,9 @@ public class PublishActInfoFormDTO implements Serializable {
     private String serviceMatter;
     @NotEmpty(message = "服务事项不能为空", groups = {AddPartyActivityGroup.class})
     private List<String> serviceMatterList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/work/RePublishFormDTO.java

@@ -173,6 +173,11 @@ public class RePublishFormDTO implements Serializable {
     @NotBlank(message = "主办方id不能为空", groups = {AddUserInternalGroup.class})
     private String sponsorId;
 
+    /**
+     * 主办方全路径包含自身id
+     */
+    private String sponsorPath;
+
     /**
      * 主办方类型：以网格名义：grid , 以机关名义： agency
      */
@@ -221,4 +226,9 @@ public class RePublishFormDTO implements Serializable {
     private String serviceMatter;
     @NotEmpty(message = "服务事项不能为空", groups = {PublishActInfoFormDTO.AddPartyActivityGroup.class})
     private List<String> serviceMatterList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiActDetailResultDTO.java

@@ -203,4 +203,8 @@ public class ResiActDetailResultDTO implements Serializable {
     private String serviceMatterName;
     private List<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActDetailResultDTO.java

@@ -0,0 +1,183 @@
+package com.epmet.dto.result.work;
+
+import com.epmet.dto.result.resi.ResiActSummaryResultDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/6/30 16:47
+ */
+@Data
+public class ActDetailResultDTO implements Serializable {
+    private static final long serialVersionUID = 4235569576711312094L;
+
+    private String actId;
+
+    /**
+     * 活动标题
+     */
+    private String title;
+
+    /**
+     * 封面图
+     */
+    private String coverPic;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
+
+    /**
+     * 活动地点-经度
+     */
+    private BigDecimal actLongitude;
+
+    /**
+     * 活动地点-纬度
+     */
+    private BigDecimal actLatitude;
+
+    /**
+     * 活动预计开始时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actStartTime;
+
+    /**
+     * 活动预计结束时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actEndTime;
+
+    /**
+     * 活动人数
+     */
+    private Integer actQuota;
+
+    /**
+     * 活动积分
+     */
+    private Integer reward;
+
+    /**
+     * 报名审核：true：只有志愿者才可以参加活动，false: 只要是居民就可以参加活动
+     */
+    private Boolean volunteerLimit;
+
+    /**
+     * 报名审核： true: 需人工审核 false: 无需审核
+     */
+    private Boolean auditSwitch;
+
+    /**
+     * 报名截止时间：yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signUpEndTime;
+
+    /**
+     * 报名条件
+     */
+    private String requirement;
+
+    /**
+     * 签到开始时间：yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signInStartTime;
+
+    /**
+     * 签到结束时间: yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signInEndTime;
+
+    /**
+     * 签到地址
+     */
+    private String signInAddress;
+
+    /**
+     * 签到地址-纬度
+     */
+    private BigDecimal signInLatitude;
+
+    /**
+     * 签到地址-经度
+     */
+    private BigDecimal signInLongitude;
+
+    /**
+     * 签到有效范围(米)
+     */
+    private Integer signInRadius;
+
+    /**
+     * 主办方id
+     */
+    private String sponsorId;
+
+    /**
+     * 主办方全路径包含自身id
+     */
+    private String sponsorPath;
+
+    /**
+     * 主办方类型：以网格名义：grid , 以机关名义： agency
+     */
+    private String sponsorType;
+
+    /**
+     * 主办方名称
+     */
+    private String sponsorName;
+
+    /**
+     * 联系人
+     */
+    private String sponsorContacts;
+
+    /**
+     * 联系电话
+     */
+    private String sponsorTel;
+
+    /**
+     * 活动类型爱心活动heart 联建活动party
+     */
+    @JsonIgnore
+    private String actType;
+    @JsonIgnore
+    private String createdBy;
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
+
+    /**
+     * true，我发布的，false,其他人发布的
+     */
+    private Boolean isMyPublish;
+
+    private List<ActPreviewContentResultDTO> actContent;
+
+    /**
+     * 1已经总结0未总结
+     */
+    private Boolean summaryFlag;
+
+    /**
+     * 只有填写了总结的才有内容
+     */
+    List<ResiActSummaryResultDTO> summaryContent;
+}
+

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPageResDTO.java

@@ -0,0 +1,106 @@
+package com.epmet.dto.result.work;
+
+import com.epmet.dto.form.work.PublishActInfoFormDTO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/6/30 14:15
+ */
+@Data
+public class ActPageResDTO implements Serializable {
+    private static final long serialVersionUID = 5330377961022020364L;
+    /**
+     *活动id
+     */
+    private String actId;
+
+    /**
+     *活动标题
+     */
+    private String title;
+
+    /**
+     * 活动地点
+     */
+    private String actAddress;
+
+    /**
+     * 活动预计开始时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actStartTime;
+
+    /**
+     * 活动预计结束时间yyyy-MM-dd HH:mm
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date actEndTime;
+    /**
+     * 报名截止时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signUpEndTime;
+
+    /**
+     * 报名开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date signUpStartTime;
+
+    /**
+     * 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough
+     */
+    private String status="";
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
+
+    /**
+     * true，我发布的，false,其他人发布的
+     */
+    private Boolean isMyPublish;
+
+    /**
+     * true:固定名额  false： 不限制名额
+     */
+    @JsonIgnore
+    private Boolean actQuotaCategory;
+    /**
+     * 活动名额人数
+     */
+    @JsonIgnore
+    private Integer actQuota;
+
+    /**
+     * 已报名人数
+     */
+    @JsonIgnore
+    private Integer signedUp;
+
+    /**
+     * 1已经总结0未总结
+     */
+    private Boolean summaryFlag;
+
+    /**
+     * 活动积分
+     */
+    private Integer reward;
+
+    /**
+     * 报名审核： true: 需人工审核 false: 无需审核
+     */
+    @NotNull(message = "报名审核方式不能为空", groups = {PublishActInfoFormDTO.AddUserInternalGroup.class})
+    private Boolean auditSwitch;
+}
+

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActPreviewContentResultDTO.java

@@ -19,7 +19,7 @@ public class ActPreviewContentResultDTO implements Serializable {
     private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
     private String contentType;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ActUserResDTO.java

@@ -0,0 +1,108 @@
+package com.epmet.dto.result.work;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/6/30 17:58
+ */
+@Data
+public class ActUserResDTO implements Serializable {
+    private static final long serialVersionUID = 7621004224467504031L;
+    /**
+     * 主键
+     */
+    private String actUserRelationId;
+
+    /**
+     * 活动id
+     */
+    private String actId;
+
+    /**
+     * 用户id
+     */
+    private String userId;
+
+    /**
+     * 姓名
+     */
+    private String realName;
+
+    /**
+     * 昵称
+     */
+    private String nickName;
+
+    /**
+     * 联系方式
+     */
+    private String mobile;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 报名时间yyyy-MM-dd HH:mm:ss
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date signUpTime;
+
+    /**
+     * true: 是志愿者 false : 不是志愿者
+     */
+    private Boolean volunteerFlag;
+
+    /**
+     * 实际参加活动个数
+     */
+    private Integer signInActNum;
+    /**
+     * 报名活动个数
+     */
+    private Integer signUpActNum;
+    /**
+     * 获得积分活动个数
+     */
+    private Integer obtainPointsActNum;
+
+    /**
+     * 已处理: handled;  默认"",重新处理时reward_flag置为空字符串
+     */
+    private String processFlag;
+
+    /**
+     * 已签到:signed_in; 默认""
+     */
+    private String signInFlag;
+
+    /**
+     * 已给分：agree, 不给分：deny  默认""
+     */
+    private String rewardFlag;
+
+
+    /**
+     * 当前状态（已报名/待审核auditing，
+     审核通过passed，
+     审核不通过refused
+     取消报名canceled，
+     ）
+     */
+    private String status;
+
+
+    public ActUserResDTO(){
+        this.signInActNum=0;
+        this.signUpActNum=0;
+        this.obtainPointsActNum=0;
+    }
+}
+

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActDetailResultDTO.java

@@ -174,4 +174,9 @@ public class CanceledActDetailResultDTO implements Serializable {
     private String serviceMatterName;
     private List<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/CanceledActResultDTO.java

@@ -61,4 +61,9 @@ public class CanceledActResultDTO implements Serializable {
      * 活动类型 爱心活动heart 联建活动party
      */
     private String actType;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActDetailResultDTO.java

@@ -164,4 +164,9 @@ public class FinishedActDetailResultDTO implements Serializable {
     private String serviceMatterName;
     private List<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/FinishedActResultDTO.java

@@ -63,4 +63,9 @@ public class FinishedActResultDTO implements Serializable {
      * 活动类型 爱心活动heart 联建活动party
      */
     private String actType;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActDetailResultDTO.java

@@ -159,4 +159,9 @@ public class InProgressActDetailResultDTO implements Serializable {
     private String serviceMatterName;
     private List<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/InProgressActResultDTO.java

@@ -87,4 +87,9 @@ public class InProgressActResultDTO implements Serializable {
      * 活动类型 爱心活动heart 联建活动party
      */
     private String actType;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/work/ReEditActInfoResultDTO.java

@@ -176,4 +176,9 @@ public class ReEditActInfoResultDTO implements Serializable {
     private String serviceMatterName;
     private List<String> serviceMatterList;
     private List<String> serviceMatterNameList;
+
+    /**
+     * true:富文本；false: 原来小程序那种发布内容
+     */
+    private Boolean richTextFlag;
 }

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-heart/epmet-heart-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-heart.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/GrantPointsController.java

@@ -54,6 +54,7 @@ public class GrantPointsController {
      **/
     @PostMapping("deny")
     public Result deny(@RequestBody GrantPointsFormDTO formDTO){
+        formDTO.setGrantPoint(false);
         ValidatorUtils.validateEntity(formDTO, GrantPointsFormDTO.DenyUserShowGroup.class);
         grantPointsService.deny(formDTO);
         return new Result();
@@ -68,6 +69,7 @@ public class GrantPointsController {
      **/
     @PostMapping("agree")
     public Result agree(@RequestBody GrantPointsFormDTO formDTO){
+        formDTO.setGrantPoint(true);
         ValidatorUtils.validateEntity(formDTO, GrantPointsFormDTO.AddUserInternalGroup.class);
         grantPointsService.agree(formDTO);
         return new Result();

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActController.java

@@ -1,6 +1,8 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.constant.AppClientConstant;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
@@ -57,11 +59,16 @@ public class WorkActController {
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.PublishActResultDTO>
      * @author yinzuomei
-     * @description 发布活动
+     * @description 发布活动-----废弃现在使用publishV2
      * @Date 2020/7/21 18:32
      **/
     @PostMapping("publish")
-    public Result<PublishActResultDTO> publishAct(@RequestBody PublishActInfoFormDTO formDTO) {
+    public Result<PublishActResultDTO> publishAct(@LoginUser TokenDto tokenDto,@RequestBody PublishActInfoFormDTO formDTO) {
+        if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) {
+            formDTO.setRichTextFlag(true);
+        } else {
+            formDTO.setRichTextFlag(false);
+        }
         ValidatorUtils.validateEntity(formDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class);
         for (PublishActContentFormDTO actContentFormDTO : formDTO.getActContent()) {
             ValidatorUtils.validateEntity(actContentFormDTO,
@@ -73,7 +80,12 @@ public class WorkActController {
     }
 
     @PostMapping("publishV2")
-    public Result<PublishActResultDTO> publishActV2(@RequestBody PublishActInfoFormDTO formDTO) {
+    public Result<PublishActResultDTO> publishActV2(@LoginUser TokenDto tokenDto ,@RequestBody PublishActInfoFormDTO formDTO) {
+        if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) {
+            formDTO.setRichTextFlag(true);
+        } else {
+            formDTO.setRichTextFlag(false);
+        }
         if (ActConstant.HEART.equals(formDTO.getActType())) {
             ValidatorUtils.validateEntity(formDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class);
         } else {
@@ -260,11 +272,16 @@ public class WorkActController {
      * @param rePublishFormDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.work.PublishActResultDTO>
      * @author yinzuomei
-     * @description 重新发布活动
+     * @description 重新发布活动-----废弃现在使用republishV2
      * @Date 2020/7/27 13:55
      **/
     @PostMapping("republish")
-    public Result<PublishActResultDTO> rePublish(@RequestBody RePublishFormDTO rePublishFormDTO) {
+    public Result<PublishActResultDTO> rePublish(@LoginUser TokenDto tokenDto,@RequestBody RePublishFormDTO rePublishFormDTO) {
+        if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) {
+            rePublishFormDTO.setRichTextFlag(true);
+        } else {
+            rePublishFormDTO.setRichTextFlag(false);
+        }
         ValidatorUtils.validateEntity(rePublishFormDTO, RePublishFormDTO.AddUserShowGroup.class, RePublishFormDTO.AddUserInternalGroup.class);
         for (PublishActContentFormDTO actContentFormDTO : rePublishFormDTO.getActContent()) {
             ValidatorUtils.validateEntity(actContentFormDTO,
@@ -276,9 +293,14 @@ public class WorkActController {
     }
 
     @PostMapping("republishV2")
-    public Result<PublishActResultDTO> rePublishV2(@RequestBody RePublishFormDTO rePublishFormDTO) {
+    public Result<PublishActResultDTO> rePublishV2(@LoginUser TokenDto tokenDto,@RequestBody RePublishFormDTO rePublishFormDTO) {
+        if (AppClientConstant.CLIENT_WEB.equals(tokenDto.getClient())) {
+            rePublishFormDTO.setRichTextFlag(true);
+        } else {
+            rePublishFormDTO.setRichTextFlag(false);
+        }
         if (ActConstant.HEART.equals(rePublishFormDTO.getActType())) {
-            ValidatorUtils.validateEntity(rePublishFormDTO, PublishActInfoFormDTO.AddUserShowGroup.class, PublishActInfoFormDTO.AddUserInternalGroup.class);
+            ValidatorUtils.validateEntity(rePublishFormDTO, RePublishFormDTO.AddUserShowGroup.class, RePublishFormDTO.AddUserInternalGroup.class);
         } else {
             ValidatorUtils.validateEntity(rePublishFormDTO, RePublishFormDTO.AddUserShowGroup.class, RePublishFormDTO.AddUserInternalGroup.class);
         }
@@ -291,5 +313,41 @@ public class WorkActController {
         return new Result<PublishActResultDTO>().ok(workActService.rePublishV2(rePublishFormDTO));
     }
 
+    /**
+     * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pagelist")
+    public Result<PageData<ActPageResDTO>> pageList(@LoginUser TokenDto tokenDto, @RequestBody ActPageFormDTO formDTO){
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setUserId(tokenDto.getUserId());
+        PageData<ActPageResDTO> page = workActService.pageList(formDTO);
+        return new Result<PageData<ActPageResDTO>>().ok(page);
+    }
+
+    /**
+     * 数字社区，查看活动详情
+     *
+     * @param tokenDto
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("detail")
+    public Result<ActDetailResultDTO> queryActDetail(@LoginUser TokenDto tokenDto, @RequestBody ActIdFormDTO formDTO) {
+        return new Result<ActDetailResultDTO>().ok(workActService.queryActDetail(formDTO.getActId(), tokenDto.getUserId()));
+    }
 
+    /**
+     * 数字社区：结束活动
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("finish")
+    public Result finish(@RequestBody FinishActFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO,SaveActualTimeFormDTO.AddUserInternalGroup.class,SaveActualTimeFormDTO.UserShowGroup.class);
+        workActService.finish(formDTO);
+        return new Result();
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/WorkActUserController.java

@@ -1,7 +1,9 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
+import com.epmet.constant.ActConstant;
 import com.epmet.dto.form.work.AactUserDetailFormDTO;
 import com.epmet.dto.form.work.ActIdFormDTO;
 import com.epmet.dto.form.work.AuditUserFormDTO;
@@ -130,6 +132,7 @@ public class WorkActUserController {
      **/
     @PostMapping("auditpass")
     public Result  auditPass(@RequestBody AuditUserFormDTO formDTO){
+        formDTO.setType(ActConstant.ACT_USER_STATUS_PASSED);
         ValidatorUtils.validateEntity(formDTO, AuditUserFormDTO.AddUserInternalGroup.class);
         workActUserService.auditPass(formDTO.getActUserRelationId());
         return new Result();
@@ -144,6 +147,7 @@ public class WorkActUserController {
      **/
     @PostMapping("auditrefuse")
     public Result  auditrefuse(@RequestBody AuditUserFormDTO formDTO){
+        formDTO.setType(ActConstant.ACT_USER_STATUS_REFUSED);
         ValidatorUtils.validateEntity(formDTO, AuditUserFormDTO.RefusedUserShowGroup.class);
         workActUserService.auditRefuse(formDTO);
         return new Result();
@@ -174,4 +178,34 @@ public class WorkActUserController {
         ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
         return new Result<List<CanceledUserResultDTO>>().ok(workActUserService.queryCanceledUserList(formDTO));
     }
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("userlist")
+    public Result<PageData<ActUserResDTO>> queryUserList(@RequestBody ActIdFormDTO formDTO){
+        return new Result<PageData<ActUserResDTO>>().ok(workActUserService.queryUserList(formDTO.getActId()));
+    }
+
+    /**
+     * 批量审核通过、拒绝调用原来的接口
+     * @param formDTOList
+     * @return
+     */
+    @PostMapping("audit-user")
+    public Result auditUser(@RequestBody List<AuditUserFormDTO> formDTOList) {
+        ValidatorUtils.validateEntity(formDTOList);
+        for (AuditUserFormDTO formDTO : formDTOList) {
+            if (ActConstant.ACT_USER_STATUS_REFUSED.equals(formDTO.getType())) {
+                workActUserService.auditRefuse(formDTO);
+            } else if (ActConstant.ACT_USER_STATUS_PASSED.equals(formDTO.getType())) {
+                workActUserService.auditPass(formDTO.getActUserRelationId());
+            }
+        }
+        return new Result();
+    }
+
+
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/ActInfoDao.java

@@ -24,6 +24,7 @@ import com.epmet.dto.form.resi.ResiActDetailFormDTO;
 import com.epmet.dto.form.resi.ResiLatestActFormDTO;
 import com.epmet.dto.form.resi.ResiMyActFormDTO;
 import com.epmet.dto.form.work.ActListCommonFormDTO;
+import com.epmet.dto.form.work.ActPageFormDTO;
 import com.epmet.dto.result.resi.*;
 import com.epmet.dto.result.work.*;
 import com.epmet.entity.ActInfoEntity;
@@ -319,4 +320,11 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
      * @return java.util.List<com.epmet.dto.ActInfoDTO>
      */
     List<ActInfoDTO> selectPublishedAct(@Param("staffId") String staffId);
+
+    /**
+     * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动
+     * @param formDTO
+     * @return
+     */
+    List<ActPageResDTO> pageList(ActPageFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordDao.java

@@ -25,5 +25,6 @@ public interface IcServiceRecordDao extends BaseDao<IcServiceRecordEntity> {
             @Param("serviceTimeStart") Date serviceTimeStart,
             @Param("serviceTimeEnd") Date serviceTimeEnd,
             @Param("serviceStatus") String serviceStatus,
-            @Param("satisfaction") String satisfaction);
+            @Param("satisfaction") String satisfaction,
+            @Param("searchOrgIdPath") String searchOrgIdPath);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActContentEntity.java

@@ -48,7 +48,7 @@ public class ActContentEntity extends BaseEpmetEntity {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActInfoEntity.java

@@ -171,6 +171,11 @@ public class ActInfoEntity extends BaseEpmetEntity {
      */
 	private String sponsorId;
 
+	/**
+	 * 主办方全路径包含自身id
+	 */
+	private String sponsorPath;
+
     /**
      * 活动主办方名称（机关或网格的名称）
      */
@@ -216,6 +221,11 @@ public class ActInfoEntity extends BaseEpmetEntity {
      */
 	private Boolean summaryFlag;
 
+	/**
+	 * true:富文本；false: 原来小程序那种发布内容
+	 */
+	private Boolean richTextFlag;
+
 	/**
 	 * 活动类型爱心活动heart 联建活动party
 	 */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ActSummaryEntity.java

@@ -48,7 +48,7 @@ public class ActSummaryEntity extends BaseEpmetEntity {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActContentEntity.java

@@ -48,7 +48,7 @@ public class LatestActContentEntity extends BaseEpmetEntity {
 	private String content;
 
     /**
-     * 内容类型 图片：img；文字：text
+     * 内容类型 图片：img；文字：text;富文本：rich_text
      */
 	private String contentType;
 

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/LatestActInfoEntity.java

@@ -153,6 +153,11 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
      */
 	private String sponsorId;
 
+	/**
+	 * 主办方全路径包含自身id
+	 */
+	private String sponsorPath;
+
     /**
      * 活动主办方名称（机关或网格的名称）
      */
@@ -177,6 +182,12 @@ public class LatestActInfoEntity extends BaseEpmetEntity {
      * 审核开关：1报名人员需要人工审核0不需要
      */
 	private Boolean auditSwitch;
+
+	/**
+	 * true:富文本；false: 原来小程序那种发布内容
+	 */
+	private Boolean richTextFlag;
+
 	/**
 	 * 数据库新增ACT_INFO_ID字段，act_info.id
 	 */

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActService.java

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.work.*;
 import com.epmet.dto.result.work.*;
 
@@ -148,4 +149,25 @@ public interface WorkActService {
     PublishActResultDTO rePublish(RePublishFormDTO rePublishFormDTO);
     PublishActResultDTO rePublishV2(RePublishFormDTO rePublishFormDTO);
     void testGrantPoint(TestGrantFormDTO formDTO);
+
+    /**
+     * 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动
+     * @param formDTO
+     * @return
+     */
+    PageData<ActPageResDTO> pageList(ActPageFormDTO formDTO);
+
+    /**
+     * 数字社区查看活动详情
+     * @param actId
+     * @param userId
+     * @return
+     */
+    ActDetailResultDTO queryActDetail(String actId, String userId);
+
+    /**
+     *
+     * @param formDTO
+     */
+    void finish(FinishActFormDTO formDTO);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/WorkActUserService.java

@@ -1,5 +1,6 @@
 package com.epmet.service;
 
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.form.work.AactUserDetailFormDTO;
 import com.epmet.dto.form.work.ActIdFormDTO;
 import com.epmet.dto.form.work.AuditUserFormDTO;
@@ -141,4 +142,11 @@ public interface WorkActUserService {
      * @Date 2020/7/24 12:52
      **/
     Boolean getVolunteerFlag(String userId);
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     * @param actId
+     * @return
+     */
+    PageData<ActUserResDTO> queryUserList(String actId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/GrantPointsServiceImpl.java

@@ -1,5 +1,6 @@
 package com.epmet.service.impl;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
@@ -108,19 +109,14 @@ public class GrantPointsServiceImpl implements GrantPointsService {
     @Transactional(rollbackFor = Exception.class)
     public void agree(GrantPointsFormDTO formDTO) {
         //是否是待处理
-        ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
-        if(null==actUserRelationDTO){
-            logger.warn("积分发放-给分act_user_relation is null,actUserRelationId="+formDTO.getActUserRelationId());
-            return;
-        }
         //如果是已处理直接返回
-        if(ActConstant.HANDLED.equals(actUserRelationDTO.getProcessFlag())){
-            logger.info("积分发放-给分act_user_relation already handled,actUserRelationId="+formDTO.getActUserRelationId());
+        ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
+        if (null == actUserRelationDTO || ActConstant.HANDLED.equals(actUserRelationDTO.getProcessFlag())) {
             return;
         }
         //查取分值
         ActInfoDTO actInfoDTO=actInfoService.get(actUserRelationDTO.getActId());
-        if (null == actInfoDTO || ActConstant.ACT_STATUS_FINISHED.equals(actInfoDTO.getActStatus())) {
+        if (null == actInfoDTO || ActConstant.ACT_STATUS_FINISHED.equals(actInfoDTO.getActStatus())|| NumConstant.ZERO==actInfoDTO.getReward()) {
             logger.warn("积分发放-给分act_info is null or act_info is finished");
             return;
         }
@@ -152,20 +148,14 @@ public class GrantPointsServiceImpl implements GrantPointsService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void deny(GrantPointsFormDTO formDTO) {
-        //是否是待处理
-        ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
-        if(null==actUserRelationDTO){
-            logger.warn("积分发放-不给分act_user_relation is null,actUserRelationId="+formDTO.getActUserRelationId());
-            return;
-        }
         //如果是已处理直接返回
-        if(ActConstant.HANDLED.equals(actUserRelationDTO.getProcessFlag())){
-            logger.info("积分发放-不给分act_user_relation already handled,actUserRelationId="+formDTO.getActUserRelationId());
+        ActUserRelationDTO actUserRelationDTO=actUserRelationService.get(formDTO.getActUserRelationId());
+        if (null == actUserRelationDTO || ActConstant.HANDLED.equals(actUserRelationDTO.getProcessFlag())) {
             return;
         }
         //查取分值
         ActInfoDTO actInfoDTO=actInfoService.get(actUserRelationDTO.getActId());
-        if (null == actInfoDTO || ActConstant.ACT_STATUS_FINISHED.equals(actInfoDTO.getActStatus())) {
+        if (null == actInfoDTO || ActConstant.ACT_STATUS_FINISHED.equals(actInfoDTO.getActStatus())|| NumConstant.ZERO==actInfoDTO.getReward()) {
             logger.warn("积分发放-不给分act_info is null or act_info is finished");
             return;
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceProjectServiceImpl.java

@@ -150,6 +150,7 @@ public class IcServiceProjectServiceImpl extends BaseServiceImpl<IcServiceProjec
         if (null == staffInfo){
             throw new EpmetException("未查询到此工作人员"+formDTO.getUserId());
         }
+        //查询当前组织及下级 的数据
         formDTO.setAgencyId(staffInfo.getAgencyId());
         PageInfo<ServiceProjectListResultDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.getServiceProjectList(formDTO));
         if (CollectionUtils.isNotEmpty(pageInfo.getList())){

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordServiceImpl.java

@@ -2,15 +2,18 @@ package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.enums.DictTypeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
 import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.*;
 import com.epmet.dto.IcNeighborHoodDTO;
@@ -147,8 +150,22 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
             throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg);
         }
 
+
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),
+                EpmetRequestHolder.getLoginUserId());
+
+//       当前组织的PIDS。只查询当前组织及下级的服务记录
+        String searchOrgIdPath = "";
+
+        if (StringUtils.isBlank(staffInfo.getAgencyPIds()) || "0".equals(staffInfo.getAgencyPIds())) {
+            searchOrgIdPath = staffInfo.getAgencyId();
+        } else {
+            searchOrgIdPath = staffInfo.getAgencyPIds().concat(":").concat(staffInfo.getAgencyId());
+        }
         PageHelper.startPage(pageNo, pageSize);
-        List<ServiceProjectRecordResultDTO> records = baseDao.listServiceRecords(serviceCategoryKey, serviceProjectName, serviceOrgName, serviceTimeStart, serviceTimeEnd, serviceStatus, satisfaction);
+        List<ServiceProjectRecordResultDTO> records = baseDao.listServiceRecords(
+                serviceCategoryKey, serviceProjectName, serviceOrgName, serviceTimeStart, serviceTimeEnd, serviceStatus, satisfaction, searchOrgIdPath);
+
         PageInfo<ServiceProjectRecordResultDTO> pi = new PageInfo<>(records);
 
         // 补充信息
@@ -260,7 +277,7 @@ public class IcServiceRecordServiceImpl extends BaseServiceImpl<IcServiceRecordD
             if ("0".equals(agencyInfo.getPid())) {
                 return new String[]{ agencyInfo.getId(), agencyInfo.getOrganizationName() };
             }
-            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getPid()), agencyInfo.getOrganizationName() };
+            return new String[]{ agencyInfo.getPids().concat(":").concat(agencyInfo.getId()), agencyInfo.getOrganizationName() };
         } else if ("grid".equals(scopeObjectType)) {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(scopeObjectId);
             // 网格的pids是到社区的

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
 import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
@@ -27,6 +28,7 @@ import com.epmet.dto.*;
 import com.epmet.dto.form.SystemMsgFormDTO;
 import com.epmet.dto.form.UserMessageFormDTO;
 import com.epmet.dto.form.WxSubscribeMessageFormDTO;
+import com.epmet.dto.form.resi.ResiActContentFormDTO;
 import com.epmet.dto.form.work.*;
 import com.epmet.dto.result.ActSponsorResultDTO;
 import com.epmet.dto.result.demand.OptionDTO;
@@ -35,6 +37,9 @@ import com.epmet.entity.*;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.service.*;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -108,7 +113,8 @@ public class WorkActServiceImpl implements WorkActService {
     private IcActivityUnitRelationService icActivityUnitRelationService;
     @Resource
     private IcActivityServiceRelationService icActivityServiceRelationService;
-
+    @Autowired
+    private ActPointLogService actPointLogService;
 
     /**
      * @author yinzuomei
@@ -304,6 +310,10 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/21 19:20
      **/
     private void auditAct(PublishActInfoFormDTO formDTO) {
+        if(formDTO.getRichTextFlag()){
+            // true:富文本；false: 原来小程序那种发布内容
+            return;
+        }
         //1、活动标题
         if (StringUtils.isNotBlank(formDTO.getTitle())) {
             this.auditActTitle(formDTO.getTitle());
@@ -341,6 +351,9 @@ public class WorkActServiceImpl implements WorkActService {
      * @Date 2020/7/27 14:01
      **/
     private void auditRePublishAct(RePublishFormDTO formDTO) {
+        if(formDTO.getRichTextFlag()){
+            return;
+        }
         //1、活动标题
         if (StringUtils.isNotBlank(formDTO.getTitle())) {
             this.auditActTitle(formDTO.getTitle());
@@ -1346,7 +1359,11 @@ public class WorkActServiceImpl implements WorkActService {
                 imgList.add(actContent.getContent());
             }
         }
-        this.auditActContent(textList,imgList);
+        //
+        if(!actInfoDTO.getRichTextFlag()){
+            //不是富文本的走审核
+            this.auditActContent(textList,imgList);
+        }
         //插入act_summary记录
         int orderNum=1;
         for(PublishActContentFormDTO actContentFormDTO:formDTO.getActSummary()){
@@ -1621,4 +1638,126 @@ public class WorkActServiceImpl implements WorkActService {
         });
         return content.get();
     }
+
+    /**
+     * @param formDTO
+     * @return 数字社区-爱心互助活动列表：查询当前客户下的所有活动，限制活动类型是爱心活动
+     */
+    @Override
+    public PageData<ActPageResDTO> pageList(ActPageFormDTO formDTO) {
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());
+        List<ActPageResDTO> list = actInfoDao.pageList(formDTO);
+        if (CollectionUtils.isNotEmpty(list)) {
+            Date nowDate = new Date();
+            for (ActPageResDTO actPageResDTO : list) {
+                // 进行中的重新设置状态
+                if (ActConstant.ACT_STATUS_PUBLISHED.equals(actPageResDTO.getStatus())) {
+                    // 活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough
+                    if (!NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getSignUpEndTime()))) {
+                        logger.info(String.format("当前时间%s报名截止时间%s处于报名中",
+                                DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN),
+                                DateUtils.format(actPageResDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN)));
+                        // 截止报名时间之前(包含报名时间截止时间点)
+                        if (!actPageResDTO.getActQuotaCategory()) {
+                            // 如果是不限制名额，则显示报名中
+                            actPageResDTO.setStatus("signing_up");
+                            logger.info("活动不限制名额,界面显示 报名中");
+                            continue;
+                        } else {
+                            // 固定名额，且已报名人数<活动需要人数显示报名中
+                            if (actPageResDTO.getActQuota() > actPageResDTO.getSignedUp()) {
+                                logger.info("活动限制名额,未报满,界面显示报名中");
+                                actPageResDTO.setStatus("signing_up");
+                                continue;
+                            } else if (actPageResDTO.getActQuota().equals(actPageResDTO.getSignedUp())) {
+                                actPageResDTO.setStatus("enough");
+                                logger.info("活动限制名额,且已报满,界面显示已报满");
+                                continue;
+                            }
+                        }
+                    } else if (NumConstant.ONE_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getSignUpEndTime()))
+                            && NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getActStartTime()))) {
+                        logger.info(String.format("当前时间%s报名截止时间%s活动预计开始时间%s界面显示截止报名",
+                                DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN),
+                                DateUtils.format(actPageResDTO.getSignUpEndTime(), DateUtils.DATE_TIME_PATTERN),
+                                DateUtils.format(actPageResDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN)));
+                        // 活动报名截止-活动预计开始之间显示截止报名
+                        actPageResDTO.setStatus("end_sign_up");
+                        continue;
+                    } else if (!NumConstant.ONE_NEG_STR.equals(DateUtils.comparteDate(nowDate, actPageResDTO.getActStartTime()))) {
+                        logger.info(String.format("当前时间%s活动预计开始时间%s界面显示已开始",
+                                DateUtils.format(nowDate, DateUtils.DATE_TIME_PATTERN),
+                                DateUtils.format(actPageResDTO.getActStartTime(), DateUtils.DATE_TIME_PATTERN)));
+                        // 活动预计开始时间点之后，包含活动预计开始时间点，显示  已开始
+                        actPageResDTO.setStatus("in_progress");
+                        continue;
+                    }
+                }
+
+            }
+        }
+        PageInfo<ActPageResDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
+
+
+    /**
+     * 数字社区查看活动详情
+     *
+     * @param actId
+     * @param userId
+     * @return
+     */
+    @Override
+    public ActDetailResultDTO queryActDetail(String actId, String userId) {
+        ActInfoEntity actInfoEntity=actInfoDao.selectById(actId);
+        ActDetailResultDTO resultDTO=ConvertUtils.sourceToTarget(actInfoEntity,ActDetailResultDTO.class);
+        resultDTO.setActId(actId);
+        //查询活动详情
+        List<ActPreviewContentResultDTO> list = actContentDao.selectByActId(actId);
+        resultDTO.setActContent(list);
+        //当前活动是否是我发布的
+        if(resultDTO.getCreatedBy().equals(loginUserUtil.getLoginUserId())){
+            resultDTO.setIsMyPublish(true);
+        }else{
+            resultDTO.setIsMyPublish(false);
+        }
+        if(resultDTO.getSummaryFlag()){
+            ResiActContentFormDTO resiActContentFormDTO=new ResiActContentFormDTO();
+            resiActContentFormDTO.setActId(actId);
+            resultDTO.setSummaryContent(actSummaryDao.selectListSummary(resiActContentFormDTO));
+        }
+        return resultDTO;
+    }
+
+    /**
+     * @param formDTO
+     */
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void finish(FinishActFormDTO formDTO) {
+        // 1、保存活动实际开始、结束时间
+        saveActualTime(formDTO);
+        // 2、积分大于0的->发放积分
+        if (formDTO.getReward() > NumConstant.ZERO) {
+            for (GrantPointsFormDTO grantPointsFormDTO : formDTO.getUserList()) {
+                ActUserRelationDTO actUserRelationDTO = actUserRelationService.get(grantPointsFormDTO.getActUserRelationId());
+                // 更新act_user_relation改为已处理，给分
+                actUserRelationDTO.setProcessFlag(ActConstant.HANDLED);
+                actUserRelationDTO.setRewardFlag(grantPointsFormDTO.getGrantPoint() ? ActConstant.ACT_USER_STATUS_AGREE : ActConstant.ACT_USER_STATUS_DENY);
+                actUserRelationDTO.setDenyRewardReason(StrConstant.EPMETY_STR);
+                actUserRelationService.update(actUserRelationDTO);
+                // 增加一条act_point_log
+                ActPointLogDTO actPointLogDTO = new ActPointLogDTO();
+                actPointLogDTO.setActId(actUserRelationDTO.getActId());
+                actPointLogDTO.setUserId(actUserRelationDTO.getUserId());
+                actPointLogDTO.setPoints(formDTO.getReward());
+                actPointLogDTO.setOperateType(grantPointsFormDTO.getGrantPoint() ? ActConstant.ACT_USER_STATUS_AGREE : ActConstant.ACT_USER_STATUS_DENY);
+                actPointLogDTO.setRemark(grantPointsFormDTO.getGrantPoint() ? StrConstant.EPMETY_STR : grantPointsFormDTO.getDenyRewardReason());
+                actPointLogService.save(actPointLogDTO);
+            }
+        }
+        // 3、结束活动
+        finishAct(formDTO.getActId());
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkActUserServiceImpl.java

@@ -6,7 +6,9 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.ActConstant;
 import com.epmet.constant.ActMessageConstant;
@@ -36,6 +38,7 @@ import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserRelationService;
 import com.epmet.service.HeartUserInfoService;
 import com.epmet.service.WorkActUserService;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -46,6 +49,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 /**
  * 工作端：活动人员相关api
@@ -775,4 +780,48 @@ public class WorkActUserServiceImpl implements WorkActUserService {
         }
         return resultUserList.getData().get(0);
     }
+
+    /**
+     * 数字社区查看人员列表：报名审核、查看人员、活动结束发放积分页面人员列表
+     *
+     * @param actId
+     * @return
+     */
+    @Override
+    public PageData<ActUserResDTO> queryUserList(String actId) {
+        List<ActUserResDTO> list = new ArrayList<>();
+        // 活动相关人员
+        List<ActUserRelationDTO> actUserRelationDTOList = actUserRelationService.getUserList(actId, StrConstant.EPMETY_STR);
+        if (null == actUserRelationDTOList || actUserRelationDTOList.size() == 0) {
+            return new PageData<>(list, NumConstant.ZERO);
+        }
+        // 查询人员id集合
+        Set<String> userIdList = actUserRelationDTOList.stream().map(ActUserRelationDTO::getUserId).collect(Collectors.toSet());
+        // 查询出用户基本信息
+        List<UserBaseInfoResultDTO> userInfoList = this.queryUserBaseInfoList(new ArrayList<>(userIdList));
+        for (ActUserRelationDTO actUserRelationDTO : actUserRelationDTOList) {
+            ActUserResDTO resultDTO = ConvertUtils.sourceToTarget(actUserRelationDTO,ActUserResDTO.class);
+            resultDTO.setActUserRelationId(actUserRelationDTO.getId());
+            resultDTO.setSignUpTime(actUserRelationDTO.getCreatedTime());
+            // true: 是志愿者 false : 不是志愿者
+            resultDTO.setVolunteerFlag(getVolunteerFlag(actUserRelationDTO.getUserId()));
+            // 赋值基本信息
+            for (UserBaseInfoResultDTO userBaseInfoResultDTO : userInfoList) {
+                if (actUserRelationDTO.getUserId().equals(userBaseInfoResultDTO.getUserId())) {
+                    resultDTO.setRealName(StringUtils.isNotBlank(userBaseInfoResultDTO.getRealName()) ? userBaseInfoResultDTO.getRealName() : StrConstant.EPMETY_STR);
+                    resultDTO.setNickName(StringUtils.isNotBlank(userBaseInfoResultDTO.getNickname()) ? userBaseInfoResultDTO.getNickname() : StrConstant.EPMETY_STR);
+                    resultDTO.setMobile(StringUtils.isNotBlank(userBaseInfoResultDTO.getMobile()) ? userBaseInfoResultDTO.getMobile() : StrConstant.EPMETY_STR);
+                    resultDTO.setIdNum(StringUtils.isNotBlank(userBaseInfoResultDTO.getIdNum()) ? userBaseInfoResultDTO.getIdNum() : StrConstant.EPMETY_STR);
+                    break;
+                }
+            }
+            HistoricalActInfo historicalActInfo = this.getHistoricalActInfo(resultDTO.getUserId(), actId);
+            resultDTO.setSignInActNum(historicalActInfo.getSignInActNum());
+            resultDTO.setSignUpActNum(historicalActInfo.getSignUpActNum());
+            resultDTO.setObtainPointsActNum(historicalActInfo.getObtainPointsActNum());
+            list.add(resultDTO);
+        }
+        PageInfo<ActUserResDTO> pageInfo = new PageInfo<>(list);
+        return new PageData<>(list, pageInfo.getTotal());
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.22__act_addcol.sql

@@ -0,0 +1,12 @@
+alter table act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text';
+alter table act_content MODIFY COLUMN CONTENT LONGTEXT not null  COMMENT '内容';
+alter table act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0'  COMMENT '1：富文本；0：不是' AFTER SUMMARY_FLAG;
+alter table latest_act_info add COLUMN RICH_TEXT_FLAG TINYINT(1) not null DEFAULT '0'  COMMENT '1：富文本；0：不是' AFTER AUDIT_SWITCH;
+alter table latest_act_content MODIFY COLUMN CONTENT_TYPE varchar(32) NOT NULL COMMENT '内容类型 图片：img；文字：text;富文本：rich_text';
+alter table latest_act_content MODIFY COLUMN CONTENT LONGTEXT not null  COMMENT '内容';
+
+alter table act_summary MODIFY COLUMN CONTENT LONGTEXT not null COMMENT '总结内容';
+alter table act_summary MODIFY CONTENT_TYPE VARCHAR(32)not null COMMENT '内容类型 图片：img；文字：text;富文本：rich_text';
+
+alter table act_info add COLUMN SPONSOR_PATH VARCHAR(512) comment '主办方全路径包含自身id' AFTER SPONSOR_ID;
+alter table latest_act_info add COLUMN SPONSOR_PATH VARCHAR(512) comment '主办方全路径包含自身id' AFTER SPONSOR_ID;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.23__acttel.sql

@@ -0,0 +1,4 @@
+alter table act_info MODIFY COLUMN
+    `SPONSOR_TEL` varchar(64) NOT NULL COMMENT '联系电话' AFTER SPONSOR_CONTACTS;
+
+alter table latest_act_info MODIFY COLUMN `SPONSOR_TEL` varchar(64)COMMENT '联系电话' AFTER SPONSOR_CONTACTS;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/ActInfoDao.xml

@@ -449,7 +449,8 @@
             i.UNIT_ID AS unitId,
             i.SERVICE_MATTER AS serviceMatter,
             i.TARGET AS target,
-            i.act_type as actType
+            i.act_type as actType,
+            i.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info i
             LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' AND re.`STATUS` != 'refused' AND re.`STATUS` != 'canceled' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
@@ -534,7 +535,8 @@
         ai.SIGN_UP_END_TIME as signUpEndTime,
         ai.SIGN_UP_START_TIME as signUpStartTime,
         ai.ACT_ADDRESS as actAddress,
-        ai.act_type as actType
+        ai.act_type as actType,
+        ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -556,7 +558,8 @@
             ai.CANCEL_TIME AS cancelTime,
             ai.CANCEL_REASON AS cancelReason,
             ai.ACT_ADDRESS as actAddress,
-            ai.act_type as actType
+            ai.act_type as actType,
+            ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -579,7 +582,8 @@
             ai.ACTUAL_START_TIME as actualStartTime,
             ai.ACTUAL_END_TIME as actualEndTime,
             ai.ACT_ADDRESS as actAddress,
-            ai.act_type as actType
+            ai.act_type as actType,
+            ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -669,7 +673,8 @@
             ai.ACT_TYPE,
             ai.UNIT_ID,
             ai.SERVICE_MATTER,
-            ai.TARGET
+            ai.TARGET,
+            ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -706,7 +711,8 @@
             ai.ACT_TYPE,
             ai.UNIT_ID,
             ai.SERVICE_MATTER,
-            ai.TARGET
+            ai.TARGET,
+            ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -749,7 +755,8 @@
             ai.ACT_TYPE,
             ai.UNIT_ID,
             ai.SERVICE_MATTER,
-            ai.TARGET
+            ai.TARGET,
+            ai.RICH_TEXT_FLAG as richTextFlag
         FROM
             act_info ai
         WHERE
@@ -798,4 +805,57 @@
         AND ACT_STATUS = 'published'
         AND CREATED_BY = #{staffId}
     </select>
+
+    <!--    分页查询爱心活动-->
+    <select id="pageList" parameterType="com.epmet.dto.form.work.ActPageFormDTO" resultType="com.epmet.dto.result.work.ActPageResDTO">
+        SELECT
+            ai.id AS actId,
+            ai.TITLE AS title,
+            ai.ACT_ADDRESS as actAddress,
+            ai.ACT_START_TIME AS actStartTime,
+            ai.ACT_END_TIME AS actEndTime,
+            ai.SIGN_UP_END_TIME as signUpEndTime,
+            ai.SIGN_UP_START_TIME as signUpStartTime,
+            ai.ACT_STATUS as status,
+            ai.RICH_TEXT_FLAG as richTextFlag,
+            (
+                case when ai.CREATED_BY =#{userId} then 1
+                else 0
+                end
+            )as isMyPublish,
+            ai.ACT_QUOTA_CATEGORY AS actQuotaCategory,
+            ai.ACT_QUOTA AS actQuota,
+            (
+                SELECT
+                count( aur.id )
+                FROM
+                act_user_relation aur
+                WHERE
+                aur.ACT_ID = ai.ID
+                AND aur.DEL_FLAG = '0'
+                AND ( aur.`STATUS` = 'auditing' OR aur.`STATUS` = 'passed' )
+            ) AS signedUp,
+            ai.SUMMARY_FLAG as summaryFlag,
+            ai.REWARD as reward,
+            ai.AUDIT_SWITCH as auditSwitch
+        FROM
+            act_info ai
+        WHERE
+            ai.DEL_FLAG = '0'
+            <if test='null != status and "" != status'>
+                AND ai.ACT_STATUS = #{status}
+            </if>
+            <if test='null != title and "" != title'>
+                AND ai.TITLE like concat('%',#{title},'%')
+            </if>
+            <if test='null != actStartTime and "" != actStartTime'>
+                AND DATE_FORMAT(ai.ACT_START_TIME,'%Y-%m-%d %H:%i') &gt;= #{actStartTime}
+            </if>
+            <if test='null != actEndTime and "" != actEndTime'>
+                AND DATE_FORMAT(ai.ACT_END_TIME,'%Y-%m-%d %H:%i') &lt;= #{actEndTime}
+            </if>
+            and ai.CUSTOMER_ID= #{customerId}
+            and ai.act_type = 'heart'
+            order by ai.CREATED_TIME desc
+    </select>
 </mapper>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceProjectDao.xml

@@ -43,7 +43,7 @@
               AND ID = #{serviceProjectId}
           </if>
           <if test='null != agencyId and agencyId != "" '>
-              AND AGENCY_ID = #{agencyId}
+              AND AGENCY_ID_PATH like concat( '%',#{agencyId},'%')
           </if>
           <if test='null != serviceCategoryKey and serviceCategoryKey != "" '>
               AND SERVICE_CATEGORY_KEY = #{serviceCategoryKey}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordDao.xml

@@ -36,6 +36,7 @@
                record.SERVICE_STATUS,
                record.SERVICE_PEOPLE_NUMBER
         from ic_service_record record
+                inner join ic_service_scope scope on (scope.DEL_FLAG = '0' and record.ID = scope.SERVICE_RECORD_ID)
                  left join ic_service_feedback feedback on (record.ID = feedback.SERVICE_RECORD_ID)
         <where>
             record.DEL_FLAG = '0'
@@ -61,6 +62,9 @@
             <if test="satisfaction != null and satisfaction != ''">
                 and feedback.SATISFACTION = #{satisfaction}
             </if>
+            <if test="searchOrgIdPath != null and searchOrgIdPath != ''">
+                and scope.OBJECT_ID_PATH like CONCAT(#{searchOrgIdPath}, '%')
+            </if>
         </where>
         order by record.CREATED_TIME desc
     </select>

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-job.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-job/epmet-job-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-job.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.service.StatsProjectService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +26,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     @Override
     public Result agencyProjectStats(String params) {
         StatsFormDTO formDTO = new StatsFormDTO();
-        formDTO.setDate(params);
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, StatsFormDTO.class);
+        }
         return dataStatisticalOpenFeignClient.agencyProjectStats(formDTO);
     }
 
@@ -35,7 +39,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     @Override
     public Result gridProjectStats(String params) {
         StatsFormDTO formDTO = new StatsFormDTO();
-        formDTO.setDate(params);
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, StatsFormDTO.class);
+        }
         return dataStatisticalOpenFeignClient.gridProjectStats(formDTO);
     }
 }

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-message.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-message.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-prod.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms256m -Xmx512m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-oss/epmet-oss-server/deploy/docker-compose-test.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-oss.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits:

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -158,7 +158,7 @@ public class OssController {
 	 */
 	@PostMapping("compressuploadimg")
 	public Result<UploadImgResultDTO> compressUploadImg(@RequestParam("file") MultipartFile file) {
-		return ossService.compressUploadImg(file, null);
+		return ossService.compressUploadImg(file, null,200L);
 	}
 
 	@PostMapping("uploadwximg")
@@ -254,15 +254,19 @@ public class OssController {
 				throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
 						, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 			}
+		}
+		Result<UploadImgResultDTO> result =null;
+		String originFileName = file.getOriginalFilename();
+		String format = "-" + originFileName.substring(originFileName.lastIndexOf(".") + NumConstant.ONE) + "-";
+		format = format.toLowerCase();
+		int compressSize = 2 * 1024 * 1024;
+		// 如果是图片，超过2M的压缩一下
+		if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format) && file.getSize() > compressSize) {
+			// 单个图片10M
+			result= ossService.compressUploadImg(file, null, 2 * 1024);
 		} else {
-			// 校验文件大小,不超过2m
-			long maxSize = 2 * 1024 * 1024;
-			if (size > maxSize) {
-				throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode()
-						, EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
-			}
+			result=ossService.uploadImg(file, null);
 		}
-		Result<UploadImgResultDTO> result = ossService.uploadImg(file, null);
 		if (result != null && result.success() ){
 			UploadImgResultDTO data = result.getData();
 			if ( data!= null && StringUtils.isNotBlank(data.getUrl())){
@@ -350,7 +354,13 @@ public class OssController {
 		if (size > maxSize) {
 			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getCode(), EpmetErrorCode.OPER_UPLOAD_FILE_OVER_SIZE.getMsg());
 		}
-
+		// 如果是图片，超过2M的压缩一下
+		if (ModuleConstant.PROJECT_FILE_IMAGE.contains(format)) {//单个图片10M
+			int compressSize = 2 * 1024 * 1024;
+			if(file.getSize()>compressSize){
+				return ossService.compressUploadImg(file, null,2 * 1024);
+			}
+		}
 		return ossService.uploadVariedFile(file);
 	}
 
@@ -410,7 +420,11 @@ public class OssController {
 			throw new RenException(EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getCode()
 					, EpmetErrorCode.OPER_UPLOAD_FILE_TYPE_ERROR.getMsg());
 		}
-
+		//如果图片大于2M压缩一下
+		int compressSize = 2 * 1024 * 1024;
+		if(file.getSize()>compressSize){
+			return ossService.compressUploadImg(file, null,2 * 1024);
+		}
 		return ossService.uploadImgV2(file, PrivacyType.EXTERNAL, customerId);
 	}
 

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -31,7 +31,7 @@ public interface OssService extends BaseService<OssEntity> {
 
 	Result<UploadImgResultDTO> uploadImg(MultipartFile file, String privacy);
 
-	Result<UploadImgResultDTO> compressUploadImg(MultipartFile file, String privacy);
+	Result<UploadImgResultDTO> compressUploadImg(MultipartFile file, String privacy,long desFileSize);
 
 	Result<UploadImgResultDTO> extUpload(MultipartFile file, String fileName, String privacy);
 

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -101,7 +101,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 	}
 
 	@Override
-	public Result<UploadImgResultDTO> compressUploadImg(MultipartFile file, String privacy) {
+	public Result<UploadImgResultDTO> compressUploadImg(MultipartFile file, String privacy,long desFileSize) {
 		if (file.isEmpty()) {
 			return new Result<UploadImgResultDTO>().error(ModuleErrorCode.UPLOAD_FILE_EMPTY);
 		}
@@ -110,7 +110,7 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		String url = null;
 		String ossDomain = null;
 		try {
-			byte[] fileBytes = compressPicCycle(file.getBytes(),200L,0.3);
+			byte[] fileBytes = compressPicCycle(file.getBytes(),desFileSize,0.3);
 			AbstractCloudStorageService storageService = OssFactory.build();
 			url = storageService.uploadSuffix(fileBytes, extension, privacy);
 			ossDomain = storageService.getOssDomain(privacy);

epmet-module/epmet-point/epmet-point-server/deploy/docker-compose-dev.yml

@@ -11,6 +11,11 @@ services:
     environment:
       RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./epmet-point.jar"
     restart: "unless-stopped"
+    logging:
+      driver: local
+      options:
+        max-size: "10m"
+        max-file: "2"
     deploy:
       resources:
         limits: