Merge remote-tracking branch 'origin/dev_heart' into dev_heart

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

@@ -84,7 +84,7 @@ public enum EpmetErrorCode {
 	// 爱心互助 居民端
     NOT_IN_THE_SIGN_IN_RANGE(8510, "您还未进入指定的签到范围～"),
 	NON_CERTIFIED_VOLUNTEER(8511, "活动报名失败，请先认证志愿者"),
-    ACT_TIME_CONFLICT(8512, "活动时间冲突"),
+    ACT_TIME_CONFLICT(8512, "报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。"),
 
     // 该错误不会提示给前端，只是后端传输错误信息用。
     ACCESS_SQL_FILTER_MISSION_ARGS(8701, "缺少生成权限过滤SQL所需参数"),

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActCaculateDistanceFormDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.form.resi;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -28,13 +29,13 @@ public class ResiActCaculateDistanceFormDTO implements Serializable {
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "经度不能为空", groups = { AddUserInternalGroup.class })
     private Double longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "纬度不能为空", groups = { AddUserInternalGroup.class })
     private Double latitude;
 
     /**

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActInsertLiveFormDTO.java

@@ -21,6 +21,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;
 import java.math.BigDecimal;
 import java.util.List;
@@ -43,13 +44,6 @@ public class ResiActInsertLiveFormDTO implements Serializable {
      */
     public interface AddUserInternalGroup {}
 
-    /**
-     * 添加用户操作的用户可见异常分组
-     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
-     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
-     */
-    public interface AddUserShowGroup extends CustomerClientShowGroup {}
-
     // <<<<<<<<<<<<<<<<<<<校验分组结束<<<<<<<<<<<<<<<<<<<<<<<<
 
     /**
@@ -66,19 +60,19 @@ public class ResiActInsertLiveFormDTO implements Serializable {
     /**
      * 活动签到位置经度
      */
-    @NotBlank(message = "活动签到位置经度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "活动签到位置经度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal longitude;
 
     /**
      * 活动签到位置纬度
      */
-    @NotBlank(message = "活动签到位置纬度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "活动签到位置纬度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal latitude;
 
     /**
      * 活动签到地址
      */
-    @NotBlank(message = "活动签到地址不能为空", groups = { AddUserInternalGroup.class, AddUserShowGroup.class})
+    @NotBlank(message = "活动签到地址不能为空", groups = { AddUserInternalGroup.class})
     private String address;
 
     /**
@@ -99,6 +93,6 @@ public class ResiActInsertLiveFormDTO implements Serializable {
     /**
      * 客户id
      */
-    @NotBlank(message = "客户id不能为空", groups = {AddUserShowGroup.class })
+    @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class })
     private String customerId;
 }

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResiActSignInFormDTO.java

@@ -20,7 +20,9 @@ package com.epmet.dto.form.resi;
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.List;
@@ -43,13 +45,6 @@ public class ResiActSignInFormDTO implements Serializable {
      */
     public interface AddUserInternalGroup {}
 
-    /**
-     * 添加用户操作的用户可见异常分组
-     * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup
-     * 返回错误码为8999，提示信息为DTO中具体的列的校验注解message的内容
-     */
-    public interface AddUserShowGroup extends CustomerClientShowGroup {}
-
     // <<<<<<<<<<<<<<<<<<<校验分组结束<<<<<<<<<<<<<<<<<<<<<<<<
 
     /**
@@ -66,19 +61,19 @@ public class ResiActSignInFormDTO implements Serializable {
     /**
      * 活动签到位置经度
      */
-    @NotBlank(message = "活动签到位置经度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "活动签到位置经度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal longitude;
 
     /**
      * 活动签到位置纬度
      */
-    @NotBlank(message = "活动签到位置纬度不能为空", groups = { AddUserInternalGroup.class })
+    @NotNull(message = "活动签到位置纬度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal latitude;
 
     /**
      * 活动签到地址
      */
-    @NotBlank(message = "活动签到地址不能为空", groups = { AddUserInternalGroup.class, AddUserShowGroup.class})
+    @NotBlank(message = "活动签到地址不能为空", groups = { AddUserInternalGroup.class})
     private String address;
 
     /**
@@ -89,7 +84,7 @@ public class ResiActSignInFormDTO implements Serializable {
     /**
      * 0不同步实况1同步到实况记录
      */
-    @NotBlank(message = "是否同步到实况记录不能为空", groups = { AddUserInternalGroup.class, AddUserShowGroup.class})
+    @Min(0)
     private Integer syncLive;
 
     /**
@@ -100,6 +95,6 @@ public class ResiActSignInFormDTO implements Serializable {
     /**
      * 客户id
      */
-    @NotBlank(message = "客户id不能为空", groups = {AddUserShowGroup.class })
+    @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class })
     private String customerId;
 }

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

@@ -0,0 +1,46 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.dto.result.resi;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 是否到达活动打卡地址
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-07-19
+ */
+@Data
+public class ResiActAddressResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private Boolean isAddress;
+
+    /**
+     * 未报到活动范围的提示信息
+     */
+	private String errorTip;
+
+}

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-heart-server:
     container_name: epmet-heart-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.3
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.4
     ports:
       - "8111:8111"
     network_mode: host # 使用现有网络

epmet-module/epmet-heart/epmet-heart-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

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

@@ -235,16 +235,15 @@ public class ResiActListController {
     }
 
     /**
-     * 重新定位
      * 根据活动id、前端传的实时经纬度，与活动设置的经纬度相比较，判断用户是否已到达打卡地点
      *
      * @param formDTO
-     * @return javax.xml.transform.Result
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActAddressResultDTO>
      * @Author zhangyong
-     * @Date 16:48 2020-07-20
+     * @Date 11:21 2020-07-28
      **/
     @PostMapping("checksigninaddress")
-    public Result cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
+    public Result<ResiActAddressResultDTO> cancelSignUp(@RequestBody ResiActCaculateDistanceFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ResiActCaculateDistanceFormDTO.AddUserInternalGroup.class);
         return actInfoService.checkSignInAddress(formDTO);
     }
@@ -275,7 +274,7 @@ public class ResiActListController {
      **/
     @PostMapping("insertlive")
     public Result insertLive(@LoginUser TokenDto tokenDto, @RequestBody ResiActInsertLiveFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, ResiActInsertLiveFormDTO.AddUserInternalGroup.class, ResiActInsertLiveFormDTO.AddUserShowGroup.class);
+        ValidatorUtils.validateEntity(formDTO, ResiActInsertLiveFormDTO.AddUserInternalGroup.class);
         Result<String> result =  actLiveRecService.insertLive(tokenDto, formDTO);
         return new Result();
     }
@@ -290,7 +289,7 @@ public class ResiActListController {
      **/
     @PostMapping("signin")
     public Result actSignIn(@LoginUser TokenDto tokenDto, @RequestBody ResiActSignInFormDTO formDTO) {
-        ValidatorUtils.validateEntity(formDTO, ResiActSignInFormDTO.AddUserInternalGroup.class, ResiActSignInFormDTO.AddUserShowGroup.class);
+        ValidatorUtils.validateEntity(formDTO, ResiActSignInFormDTO.AddUserInternalGroup.class);
         return actSignInRecService.actSignIn(tokenDto, formDTO);
     }
 

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

@@ -157,7 +157,7 @@ public class WorkActController {
      * @description 已结束-活动详情
      * @Date 2020/7/26 21:01
      **/
-    @PostMapping("finisheddeatil")
+    @PostMapping("finisheddetail")
     public Result<FinishedActDetailResultDTO> finishedDeatil(@RequestBody ActIdFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ActIdFormDTO.AddUserInternalGroup.class);
         return new Result<FinishedActDetailResultDTO>().ok(workActService.finishedDeatil(formDTO));

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

@@ -101,12 +101,13 @@ public interface ActInfoService extends BaseService<ActInfoEntity> {
 
     /**
      * 根据活动id、前端传的实时经纬度，与活动设置的经纬度相比较，判断用户是否已到达打卡地点
-     * @param fromDTO
-     * @return javax.xml.transform.Result
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.resi.ResiActAddressResultDTO>
      * @Author zhangyong
-     * @Date 16:48 2020-07-20
+     * @Date 11:21 2020-07-28
      **/
-    Result checkSignInAddress(ResiActCaculateDistanceFormDTO fromDTO);
+    Result<ResiActAddressResultDTO> checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO);
 
     /**
      * 活动列表(包含状态：报名中：signing_up；已报满：enough；截止报名: end_sign_up; 已开始： in_progress; 已结束：finished；)

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

@@ -23,7 +23,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 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.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -42,6 +41,8 @@ import com.epmet.service.ActInfoService;
 import com.epmet.service.ActUserRelationService;
 import com.epmet.utils.CaculateDistance;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +58,8 @@ import java.util.*;
 @Service
 public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntity> implements ActInfoService {
 
+    private Logger logger = LogManager.getLogger(ActInfoServiceImpl.class);
+
     @Autowired
     private ActInfoRedis actInfoRedis;
 
@@ -355,14 +358,20 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
     }
 
     @Override
-    public Result checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO) {
+    public Result<ResiActAddressResultDTO> checkSignInAddress(ResiActCaculateDistanceFormDTO formDTO) {
         // 根据活动id，查询活动基本信息
         ActInfoEntity entity = baseDao.selectById(formDTO.getActId());
         Double distance = CaculateDistance.getDistance(formDTO.getLongitude(),formDTO.getLatitude(),entity.getActLongitude().doubleValue(),entity.getActLatitude().doubleValue());
+        ResiActAddressResultDTO dto = new ResiActAddressResultDTO();
         if (distance <= entity.getSignInRadius()){
-            return new Result();
+            dto.setIsAddress(true);
+            dto.setErrorTip("");
+            return new Result<ResiActAddressResultDTO>().ok(dto);
         } else {
-            throw new RenException(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getCode());
+            logger.info("您还未进入指定的签到范围～");
+            dto.setIsAddress(false);
+            dto.setErrorTip(EpmetErrorCode.NOT_IN_THE_SIGN_IN_RANGE.getMsg());
+            return new Result<ResiActAddressResultDTO>().ok(dto);
         }
     }
 

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

@@ -18,16 +18,23 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.nacos.client.utils.StringUtils;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.MqConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.mq.MqBaseMsgDTO;
 import com.epmet.commons.tools.dto.form.mq.eventmsg.ActPointEventMsg;
 import com.epmet.commons.tools.enums.EventEnum;
-import com.epmet.commons.tools.exception.ErrorCode;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.ActLivePicDao;
@@ -42,15 +49,14 @@ import com.epmet.entity.ActLiveRecEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.ActLiveRecRedis;
 import com.epmet.service.ActLiveRecService;
-import com.epmet.utils.ValidityVerification;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * 活动实况记录
@@ -60,7 +66,7 @@ import java.util.stream.Collectors;
  */
 @Service
 public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiveRecEntity> implements ActLiveRecService {
-    private Logger logger = LogManager.getLogger(VolunteerInfoServiceImpl.class);
+    private Logger logger = LogManager.getLogger(ActLiveRecServiceImpl.class);
 
     @Autowired
     private ActLiveRecRedis actLiveRecRedis;
@@ -71,6 +77,13 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     @Autowired
     private ActLivePicDao actLivePicDao;
 
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
+
     @Override
     public Result<ResiActLiveRecResultDTO> liveRecList(Map<String, String> map) {
         if (map.get("actId") == null){
@@ -125,11 +138,8 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     @Transactional(rollbackFor = Exception.class)
     public Result<String> insertLive(TokenDto tokenDto, ResiActInsertLiveFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
-        // 文本校验
-        ValidityVerification verification = new ValidityVerification();
-        verification.textScanVerification(formDTO.getDesc(),"添加实况-文本内容审核失败");
-        // 图片校验
-        verification.imgScanVerification(formDTO.getImages(),"添加实况-图片审核失败");
+        // 文本校验/图片校验
+        this.auditActContent(formDTO.getDesc(),formDTO.getImages());
 
         // 存储活动实况记录表
         String uuid = UUID.randomUUID().toString().replaceAll("-","");
@@ -153,6 +163,56 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         return new Result<String>().ok(uuid);
     }
 
+    /**
+     * 内容校验
+     *
+     * @param context 文本
+     * @param imgList 图片
+     * @return void
+     * @Author zhangyong
+     * @Date 10:15 2020-07-28
+     **/
+    private void auditActContent(String context, List<String> imgList) {
+        //审核活动详情中的内容
+        if(StringUtils.isNotBlank(context)){
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(context);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> contentSyncScanRes = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!contentSyncScanRes.success()) {
+                logger.error("添加实况接口失败,返参:", JSON.toJSONString(contentSyncScanRes));
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!contentSyncScanRes.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
+            }
+            logger.info("添加实况成功");
+        }
+        if(null!=imgList&&imgList.size()>0){
+            //审核活动详情中的图片
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            imgList.forEach(url -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(url);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+            if (!imgScanResult.success()){
+                logger.error("添加实况图片审核接口失败,返参:", JSON.toJSONString(imgScanResult));
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!imgScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
+                }
+            }
+            logger.info("添加实况审核成功");
+        }
+    }
+
     private void grantActPoints(ResiActInsertLiveFormDTO formDTO){
         //备注
         String remark=String.format(ActMessageConstant.ACT_POINTS_EVENT_VOLUNTEER_LIVE,formDTO.getUserId(),formDTO.getActId());

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

@@ -17,11 +17,21 @@
 
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.nacos.client.utils.StringUtils;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.RenException;
+import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
+import com.epmet.commons.tools.scan.param.ImgTaskDTO;
+import com.epmet.commons.tools.scan.param.TextScanParamDTO;
+import com.epmet.commons.tools.scan.param.TextTaskDTO;
+import com.epmet.commons.tools.scan.result.SyncScanResult;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.commons.tools.utils.ScanContentUtils;
 import com.epmet.constant.ActConstant;
 import com.epmet.dao.ActSignInPicDao;
 import com.epmet.dao.ActSignInRecDao;
@@ -35,8 +45,10 @@ import com.epmet.entity.ActSignInRecEntity;
 import com.epmet.redis.ActSignInRecRedis;
 import com.epmet.service.ActLiveRecService;
 import com.epmet.service.ActSignInRecService;
-import com.epmet.utils.ValidityVerification;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -64,15 +76,20 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
     @Autowired
     private ActLiveRecService actLiveRecService;
 
+    private Logger logger = LogManager.getLogger(ActSignInRecServiceImpl.class);
+    @Value("${openapi.scan.server.url}")
+    private String scanApiUrl;
+    @Value("${openapi.scan.method.textSyncScan}")
+    private String textSyncScanMethod;
+    @Value("${openapi.scan.method.imgSyncScan}")
+    private String imgSyncScanMethod;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result actSignIn(TokenDto tokenDto, ResiActSignInFormDTO formDTO) {
         formDTO.setUserId(tokenDto.getUserId());
-        // 文本校验
-        ValidityVerification verification = new ValidityVerification();
-        verification.textScanVerification(formDTO.getDesc(),"添加签到-文本内容审核失败");
-        // 图片校验
-        verification.imgScanVerification(formDTO.getImages(),"添加签到-图片审核失败");
+        // 文本校验/图片校验
+        this.auditActContent(formDTO.getDesc(),formDTO.getImages());
 
         // 更新用户活动关系表  SIGN_IN_FLAG字段更新为已签到
         ActUserRelationDTO actUserRelationDTO = new ActUserRelationDTO();
@@ -109,4 +126,54 @@ public class ActSignInRecServiceImpl extends BaseServiceImpl<ActSignInRecDao, Ac
         }
         return new Result();
     }
+
+    /**
+     * 内容校验
+     *
+     * @param context 文本
+     * @param imgList 图片
+     * @return void
+     * @Author zhangyong
+     * @Date 10:15 2020-07-28
+     **/
+    private void auditActContent(String context, List<String> imgList) {
+        //审核活动详情中的内容
+        if(StringUtils.isNotBlank(context)){
+            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
+            TextTaskDTO taskDTO = new TextTaskDTO();
+            taskDTO.setContent(context);
+            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
+            textScanParamDTO.getTasks().add(taskDTO);
+            Result<SyncScanResult> contentSyncScanRes = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
+            if (!contentSyncScanRes.success()) {
+                logger.error("活动签到接口失败,返参:", JSON.toJSONString(contentSyncScanRes));
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!contentSyncScanRes.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
+                }
+            }
+            logger.info("活动签到成功");
+        }
+        if(null!=imgList&&imgList.size()>0){
+            //审核活动详情中的图片
+            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
+            imgList.forEach(url -> {
+                ImgTaskDTO task = new ImgTaskDTO();
+                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
+                task.setUrl(url);
+                imgScanParamDTO.getTasks().add(task);
+            });
+            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
+            if (!imgScanResult.success()){
+                logger.error("活动签到图片审核接口失败,返参:", JSON.toJSONString(imgScanResult));
+                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
+            } else {
+                if (!imgScanResult.getData().isAllPass()) {
+                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
+                }
+            }
+            logger.info("活动签到图片审核成功");
+        }
+    }
 }

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

@@ -81,7 +81,7 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
     @Autowired
     private HeartUserInfoDao heartUserInfoDao;
 
-    private Logger logger = LogManager.getLogger(WorkActDraftServiceImpl.class);
+    private Logger logger = LogManager.getLogger(ActUserRelationServiceImpl.class);
 
     @Override
     public PageData<ActUserRelationDTO> page(Map<String, Object> params) {
@@ -237,45 +237,19 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             Integer actTimeFlag = actInfoService.checkActTime(actInfoDTO);
             if (actTimeFlag > NumConstant.ZERO){
                 signUp = false;
-                logger.info("活动报名失败，活动时间冲突");
+                logger.info("报名失败。您本次报名活动时间与已报名活动时间间隔较短，为了不影响您已报名的活动，请选择其他时间的活动，谢谢。");
                 throw new RenException(EpmetErrorCode.ACT_TIME_CONFLICT.getCode());
             }
         } else {
             // 3.第一次报名
-            HeartUserInfoEntity entity = new HeartUserInfoEntity();
-            entity.setCustomerId(formDTO.getCustomerId());
-            entity.setUserId(formDTO.getUserId());
-            entity.setVolunteerFlag(volunteerFlag > NumConstant.ZERO);
-            entity.setKindnessTime(NumConstant.ZERO);
-            entity.setParticipationNum(NumConstant.ZERO);
-            entity.setObtainPointNum(NumConstant.ZERO);
-            heartUserInfoDao.insert(entity);
+            this.insertHeartUserInfo(formDTO, volunteerFlag);
         }
         if (signUp){
             // 4.插入活动日志表
-            ActUserLogEntity userLogEntity = new ActUserLogEntity();
-            userLogEntity.setActId(formDTO.getActId());
-            userLogEntity.setUserId(formDTO.getUserId());
-            userLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_AUDITING);
-            actUserLogService.insert(userLogEntity);
+            this.insertActUserLog(formDTO);
         }
-        ActUserRelationEntity entity = new ActUserRelationEntity();
-        entity.setActId(formDTO.getActId());
-        entity.setUserId(formDTO.getUserId());
-        entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
-        // 审核开关：1报名人员需要人工审核(true)   0不需要(false)
-        if (actInfoDTO.getAuditSwitch()){
-            entity.setPassedType(ActConstant.PASSEDTYPE_MANUAL);
-        } else {
-            entity.setPassedType(ActConstant.PASSEDTYPE_AUTO);
-            entity.setAuditTime(new Date());
-        }
-        Integer operationCount = baseDao.selectCountByActIdAndUserId(formDTO.getActId(), formDTO.getUserId());
-        if (operationCount > NumConstant.ZERO){
-            // 用户如果不是第一次参加 这次的活动，先删除关系表中的数据，在插入
-            baseDao.delSignUpRecord(entity);
-        }
-        baseDao.insert(entity);
+        // 5.插入 用户活动关系表
+       this.insertActUserRelation(formDTO, actInfoDTO);
     }
 
     /**
@@ -322,4 +296,67 @@ public class ActUserRelationServiceImpl extends BaseServiceImpl<ActUserRelationD
             return satisfy;
         }
     }
+
+    /**
+     * 第一次报名活动，需插入用户信息表
+     * @param formDTO
+     * @param volunteerFlag
+     * @return void
+     * @Author zhangyong
+     * @Date 09:35 2020-07-28
+     **/
+    private void insertHeartUserInfo(ResiActRegistrationFormDTO formDTO, Integer volunteerFlag){
+        HeartUserInfoEntity entity = new HeartUserInfoEntity();
+        entity.setCustomerId(formDTO.getCustomerId());
+        entity.setUserId(formDTO.getUserId());
+        entity.setVolunteerFlag(volunteerFlag > NumConstant.ZERO);
+        entity.setKindnessTime(NumConstant.ZERO);
+        entity.setParticipationNum(NumConstant.ZERO);
+        entity.setObtainPointNum(NumConstant.ZERO);
+        heartUserInfoDao.insert(entity);
+    }
+
+    /**
+     * 每次成功报名活动，都需要插入【用户活动关系日志表】
+     * @param formDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 09:37 2020-07-28
+     **/
+    private void insertActUserLog(ResiActRegistrationFormDTO formDTO){
+        ActUserLogEntity userLogEntity = new ActUserLogEntity();
+        userLogEntity.setActId(formDTO.getActId());
+        userLogEntity.setUserId(formDTO.getUserId());
+        userLogEntity.setOperationType(ActConstant.ACT_USER_LOG_OPER_AUDITING);
+        actUserLogService.insert(userLogEntity);
+    }
+
+    /**
+     * 活动报名成功，插入【用户活动关系表】，重复报名，先删除后插入
+     *
+     * @param formDTO
+     * @param actInfoDTO
+     * @return void
+     * @Author zhangyong
+     * @Date 09:41 2020-07-28
+     **/
+    private void insertActUserRelation(ResiActRegistrationFormDTO formDTO, ActInfoDTO actInfoDTO){
+        ActUserRelationEntity entity = new ActUserRelationEntity();
+        entity.setActId(formDTO.getActId());
+        entity.setUserId(formDTO.getUserId());
+        entity.setStatus(ActConstant.ACT_USER_STATUS_AUDITING);
+        // 审核开关：1报名人员需要人工审核(true)   0不需要(false)
+        if (actInfoDTO.getAuditSwitch()){
+            entity.setPassedType(ActConstant.PASSEDTYPE_MANUAL);
+        } else {
+            entity.setPassedType(ActConstant.PASSEDTYPE_AUTO);
+            entity.setAuditTime(new Date());
+        }
+        Integer operationCount = baseDao.selectCountByActIdAndUserId(formDTO.getActId(), formDTO.getUserId());
+        if (operationCount > NumConstant.ZERO){
+            // 用户如果不是第一次参加 这次的活动，先删除关系表中的数据，在插入
+            baseDao.delSignUpRecord(entity);
+        }
+        baseDao.insert(entity);
+    }
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/utils/ValidityVerification.java

@@ -1,94 +0,0 @@
-package com.epmet.utils;
-
-import com.alibaba.nacos.client.utils.StringUtils;
-import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.EpmetErrorCode;
-import com.epmet.commons.tools.exception.RenException;
-import com.epmet.commons.tools.scan.param.ImgScanParamDTO;
-import com.epmet.commons.tools.scan.param.ImgTaskDTO;
-import com.epmet.commons.tools.scan.param.TextScanParamDTO;
-import com.epmet.commons.tools.scan.param.TextTaskDTO;
-import com.epmet.commons.tools.scan.result.SyncScanResult;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.utils.ScanContentUtils;
-import org.springframework.beans.factory.annotation.Value;
-import lombok.extern.slf4j.Slf4j;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * 文字、图片合法性校验
- *
- * @author zhangyong
- * @date 2020-07-15 14:26
- */
-@Slf4j
-public class ValidityVerification {
-
-    @Value("${openapi.scan.server.url}")
-    private String scanApiUrl;
-    @Value("${openapi.scan.method.textSyncScan}")
-    private String textSyncScanMethod;
-    @Value("${openapi.scan.method.imgSyncScan}")
-    private String imgSyncScanMethod;
-
-    /**
-     * 文本校验
-     * @param context  被校验的文本，，不能超过10000
-     * @param businessEnum 业务枚举，定义校验失败后，输出的日志信息
-     * @return void
-     * @auther zhangyong
-     * @Date 14:42 2020-07-15
-     **/
-    public void textScanVerification(String context, String businessEnum){
-        if (StringUtils.isNotBlank(context)) {
-            TextScanParamDTO textScanParamDTO = new TextScanParamDTO();
-            TextTaskDTO taskDTO = new TextTaskDTO();
-            taskDTO.setContent(context);
-            taskDTO.setDataId(UUID.randomUUID().toString().replace("-", ""));
-            textScanParamDTO.getTasks().add(taskDTO);
-            Result<SyncScanResult> textSyncScanResult = ScanContentUtils.textSyncScan(scanApiUrl.concat(textSyncScanMethod), textScanParamDTO);
-            if (!textSyncScanResult.success()) {
-                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-            } else {
-                if (!textSyncScanResult.getData().isAllPass()) {
-                    // 业务枚举：例如：评论话题失败，评论内容为：%s"
-                    log.error(String.format(businessEnum, context));
-                    throw new RenException(EpmetErrorCode.TEXT_SCAN_FAILED.getCode());
-                }
-            }
-        }
-    }
-
-    /**
-     * 图片列表校验
-     * @param imgList  被校验的图片列表
-     * @param businessEnum 业务枚举，定义校验失败后，输出的日志信息
-     *
-     * @return void
-     * @auther zhangyong
-     * @Date 14:42 2020-07-15
-     **/
-    public void imgScanVerification(List<String> imgList, String businessEnum){
-        if (null != imgList && NumConstant.ZERO != imgList.size()){
-            ImgScanParamDTO imgScanParamDTO = new ImgScanParamDTO();
-            imgList.forEach(url -> {
-                ImgTaskDTO task = new ImgTaskDTO();
-                task.setDataId(UUID.randomUUID().toString().replace("-", ""));
-                task.setUrl(url);
-                imgScanParamDTO.getTasks().add(task);
-            });
-            Result<SyncScanResult> imgScanResult = ScanContentUtils.imgSyncScan(scanApiUrl.concat(imgSyncScanMethod), imgScanParamDTO);
-            if (!imgScanResult.success()){
-                throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
-            } else {
-                if (!imgScanResult.getData().isAllPass()) {
-                    // 业务枚举：例如：评论话题失败，评论内容为：%s"
-                    log.error(String.format(businessEnum));
-                    throw new RenException(EpmetErrorCode.IMG_SCAN_FAILED.getCode());
-                }
-            }
-        }
-    }
-}

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/epmet_heart.sql

@@ -0,0 +1,424 @@
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : 外网192.168.1.130
+ Source Server Type    : MySQL
+ Source Server Version : 50728
+ Source Host           : 118.190.150.119:47306
+ Source Schema         : epmet_heart
+
+ Target Server Type    : MySQL
+ Target Server Version : 50728
+ File Encoding         : 65001
+
+ Date: 28/07/2020 13:38:27
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for act_content
+-- ----------------------------
+DROP TABLE IF EXISTS `act_content`;
+CREATE TABLE `act_content`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id:act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动内容' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_customized
+-- ----------------------------
+DROP TABLE IF EXISTS `act_customized`;
+CREATE TABLE `act_customized`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（客户如果没配置，默认的值写在代码里）',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '标题：eg: 志愿者去哪儿',
+  `HOTLINE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '咨询热线',
+  `ACT_LIST_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动列表',
+  `HEART_RANK_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '爱心榜',
+  `ACT_REVIEW_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动回顾',
+  `MY_ACT_NAME` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '我的活动',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '爱心互助首页自定义配置' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_info
+-- ----------------------------
+DROP TABLE IF EXISTS `act_info`;
+CREATE TABLE `act_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动标题',
+  `COVER_PIC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动封面',
+  `SIGN_UP_START_TIME` datetime(0) NOT NULL COMMENT '报名开始时间',
+  `SIGN_UP_END_TIME` datetime(0) NOT NULL COMMENT '报名截止时间',
+  `REQUIREMENT` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '招募要求',
+  `ACT_START_TIME` datetime(0) NOT NULL COMMENT '活动开始时间',
+  `ACT_END_TIME` datetime(0) NOT NULL COMMENT '活动结束时间',
+  `ACT_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动地点',
+  `ACT_LONGITUDE` decimal(32, 10) NOT NULL COMMENT '活动位置经度',
+  `ACT_LATITUDE` decimal(32, 10) NOT NULL COMMENT '活动位置纬度',
+  `SIGN_IN_START_TIME` datetime(0) NOT NULL COMMENT '打卡开始时间',
+  `SIGN_IN_END_TIME` datetime(0) NOT NULL COMMENT '打卡截止时间',
+  `SIGN_IN_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动签到打卡地点',
+  `SIGN_IN_LONGITUDE` decimal(32, 10) NOT NULL COMMENT '活动签到打卡位置经度',
+  `SIGN_IN_LATITUDE` decimal(32, 10) NOT NULL COMMENT '活动签到打卡位置纬度',
+  `SIGN_IN_RADIUS` int(11) NOT NULL COMMENT '活动签到打卡半径(单位：米)',
+  `ACT_QUOTA_CATEGORY` tinyint(1) NOT NULL DEFAULT 0 COMMENT '活动名额类型(0-不限名额，1-固定名额)',
+  `ACT_QUOTA` int(11) NULL DEFAULT 0 COMMENT '活动名额',
+  `ACT_STATUS` varchar(25) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '1' COMMENT '活动状态（\r\n已发布/报名中：published；\r\n已取消：canceled;\r\n已结束：finished）',
+  `CANCEL_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '活动取消的原因',
+  `CANCEL_TIME` datetime(0) NULL DEFAULT NULL COMMENT '取消活动的时间',
+  `SPONSOR_CONTACTS` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '联系人',
+  `SPONSOR_TEL` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '联系电话',
+  `SPONSOR_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布名义：网格主办：grid；组织主办：agency',
+  `SPONSOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主办方id（机关或网格的id）',
+  `SPONSOR_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动主办方名称（机关或网格的名称）',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '发布单位的上一级组织id，如果是以网格发布，此列存储的是网格所属机关的上一级机关',
+  `REWARD` int(11) NOT NULL DEFAULT 0 COMMENT '活动奖励积分',
+  `VOLUNTEER_LIMIT` tinyint(1) NOT NULL COMMENT '身份限制:1只有志愿者才可以参加活动0不限制志愿者身份',
+  `AUDIT_SWITCH` tinyint(1) NOT NULL COMMENT '审核开关：1报名人员需要人工审核0不需要',
+  `ACTUAL_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动实际开始时间',
+  `ACTUAL_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动实际结束时间',
+  `SERVICE_MIN` int(11) NULL DEFAULT NULL COMMENT '活动共计时长（服务时间）单位：分钟',
+  `SUMMARY_FLAG` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1已经总结0未总结',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（活动发布时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动信息' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_live_pic
+-- ----------------------------
+DROP TABLE IF EXISTS `act_live_pic`;
+CREATE TABLE `act_live_pic`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `LIVE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '实况ID：act_live.id',
+  `PIC_URL` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
+  `SORT` int(11) NOT NULL COMMENT '排序从1开始',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动实况图片表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_live_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_live_rec`;
+CREATE TABLE `act_live_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id: act_info.id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '实况打卡位置经度',
+  `LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '实况打卡位置纬度',
+  `ADDRESS` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况打卡地址',
+  `DESC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况打卡描述',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epmet_act_user_clock_log_ACT_USER_ID_IDX`(`ACT_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动实况记录' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_operation_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_operation_rec`;
+CREATE TABLE `act_operation_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `TYPE` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '发布：publish；\r\n取消活动：cancel;\r\n结束活动：finish\r\n重新编辑：update',
+  `NOTICE_USER` tinyint(1) NOT NULL DEFAULT 0 COMMENT '1通知用户0不通知，取消活动时默认true',
+  `REMARK` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '备注，取消活动时此列有值',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动操作日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_point_log
+-- ----------------------------
+DROP TABLE IF EXISTS `act_point_log`;
+CREATE TABLE `act_point_log`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键(给分或者不给分，以及重新处理插入本表)',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `POINT_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '加积分：add ; 减积分：subtract',
+  `POINTS` int(11) NOT NULL COMMENT '积分值',
+  `OPERATE_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型：\r\n同意给分agree； 不给分：deny；重新处理: reset',
+  `REMARK` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '备注:拒绝给分和重新处理时录入的理由',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识 0-否，1-是',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人（工作人员id）',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动发放积分日志表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_sign_in_pic
+-- ----------------------------
+DROP TABLE IF EXISTS `act_sign_in_pic`;
+CREATE TABLE `act_sign_in_pic`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `SIGN_IN_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '签到记录ID：act_sign_in_record.id',
+  `PIC_URL` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '图片地址',
+  `SORT` int(11) NOT NULL COMMENT '排序从1开始',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标志',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动签到图片表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_sign_in_rec
+-- ----------------------------
+DROP TABLE IF EXISTS `act_sign_in_rec`;
+CREATE TABLE `act_sign_in_rec`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id：act_info.id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `LONGITUDE` decimal(32, 10) NOT NULL COMMENT '签到位置经度',
+  `LATITUDE` decimal(32, 10) NOT NULL COMMENT '签到位置纬度',
+  `ADDRESS` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '签到地址',
+  `DESC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '签到描述',
+  `SYNC_LIVE` tinyint(1) NOT NULL DEFAULT 0 COMMENT '0不同步实况1同步到实况记录',
+  `LIVE_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '实况id,党sync_live=1时此列有值',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动签到记录' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_statistical
+-- ----------------------------
+DROP TABLE IF EXISTS `act_statistical`;
+CREATE TABLE `act_statistical`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（活动结束后插入本表）',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id',
+  `SIGNUP_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '已报名总人数（已报名/待审核auditing，审核通过passed，审核不通过refused取消报名canceld总人数）',
+  `AUDITING_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '待审核',
+  `PASSED_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '审核通过',
+  `REFUSED_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '审核不通过总人数',
+  `CANCELD_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '取消报名的人数',
+  `SIGNED_IN_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '活动已签到人数',
+  `REWARD_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '发放积分总人数',
+  `DENY_REWARD_USER_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '拒绝发放积分总人数',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动统计信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_summary
+-- ----------------------------
+DROP TABLE IF EXISTS `act_summary`;
+CREATE TABLE `act_summary`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键ID',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID：act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '活动回顾表' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for act_user_log
+-- ----------------------------
+DROP TABLE IF EXISTS `act_user_log`;
+CREATE TABLE `act_user_log`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
+  `OPERATION_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '操作类型（已报名/待审核auditing，\r\n审核通过passed，\r\n审核不通过refused\r\n取消报名canceled，\r\n）',
+  `REASON` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '操作备注：（1）审核不通过的原因\r\n（2）取消报名的原因|\r\n（3）拒绝发放积分的理由\r\n(4)重新处理的理由',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（操作的时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户活动关系日志表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for act_user_relation
+-- ----------------------------
+DROP TABLE IF EXISTS `act_user_relation`;
+CREATE TABLE `act_user_relation`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（用户-活动一对一，报名取消再报名也只有一条记录）',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动ID',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户ID',
+  `STATUS` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '当前状态（已报名/待审核auditing，\r\n审核通过passed，\r\n审核不通过refused\r\n取消报名canceled，\r\n）',
+  `PASSED_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '审核通过类型：auto, manual',
+  `AUDIT_TIME` datetime(0) NULL DEFAULT NULL COMMENT '审核时间（同意、拒绝的时间）',
+  `FAILURE_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '未通过原因',
+  `CANCEL_TIME` datetime(0) NULL DEFAULT NULL COMMENT '取消报名的时间',
+  `CANCEL_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '用户取消报名的原因',
+  `PROCESS_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已处理: handled;  默认\"\",重新处理时reward_flag置为空字符串',
+  `SIGN_IN_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已签到:signed_in; 默认\"\"',
+  `REWARD_FLAG` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '已给分：agree, 不给分：deny  默认\"\"',
+  `DENY_REWARD_REASON` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '拒绝发放积分备注',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（报名时间）',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE,
+  INDEX `epmet_act_user_relation_ACT_ID_IDX`(`ACT_ID`, `USER_ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户活动关系表' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for heart_user_info
+-- ----------------------------
+DROP TABLE IF EXISTS `heart_user_info`;
+CREATE TABLE `heart_user_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（用户提交报名成功后，插入本表）',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `VOLUNTEER_FLAG` tinyint(1) NOT NULL COMMENT '1是志愿者，0不是志愿者（志愿者注册成功后需要来更新值）',
+  `KINDNESS_TIME` int(11) NOT NULL DEFAULT 0 COMMENT '爱心时长(单位：分钟)（参与并签到了的活动，实际结束-实际开始）签到的。未签到但是有积分的\r\n',
+  `PARTICIPATION_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '实际参与活动个数（签到+1）',
+  `OBTAIN_POINT_NUM` int(11) NOT NULL DEFAULT 0 COMMENT '参与活动并获得积分的次数（结束活动时，如果给用户发放积分则该数值+1）',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '用户信息' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for latest_act_content
+-- ----------------------------
+DROP TABLE IF EXISTS `latest_act_content`;
+CREATE TABLE `latest_act_content`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `ACT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '活动id:latest_act_info.id',
+  `CONTENT` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容',
+  `CONTENT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '内容类型 图片：img；文字：text',
+  `ORDER_NUM` int(11) NOT NULL COMMENT '内容顺序 从1开始',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT 0 COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近一次编辑的活动内容' ROW_FORMAT = Dynamic;
+
+-- ----------------------------
+-- Table structure for latest_act_info
+-- ----------------------------
+DROP TABLE IF EXISTS `latest_act_info`;
+CREATE TABLE `latest_act_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `TITLE` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动标题',
+  `COVER_PIC` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动封面',
+  `SIGN_UP_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '报名开始时间',
+  `SIGN_UP_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '报名截止时间',
+  `REQUIREMENT` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '招募要求',
+  `ACT_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动开始时间',
+  `ACT_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '活动结束时间',
+  `ACT_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动地点',
+  `ACT_LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动位置经度',
+  `ACT_LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动位置纬度',
+  `SIGN_IN_START_TIME` datetime(0) NULL DEFAULT NULL COMMENT '打卡开始时间',
+  `SIGN_IN_END_TIME` datetime(0) NULL DEFAULT NULL COMMENT '打卡截止时间',
+  `SIGN_IN_ADDRESS` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动签到打卡地点',
+  `SIGN_IN_LONGITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动签到打卡位置经度',
+  `SIGN_IN_LATITUDE` decimal(32, 10) NULL DEFAULT NULL COMMENT '活动签到打卡位置纬度',
+  `SIGN_IN_RADIUS` int(11) NULL DEFAULT NULL COMMENT '活动签到打卡半径(单位：米)',
+  `ACT_QUOTA_CATEGORY` tinyint(1) NULL DEFAULT NULL COMMENT '活动名额类型(0-不限名额，1-固定名额)',
+  `ACT_QUOTA` int(11) NULL DEFAULT 0 COMMENT '活动名额',
+  `SPONSOR_CONTACTS` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系人',
+  `SPONSOR_TEL` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '联系电话',
+  `SPONSOR_TYPE` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主办方类型：网格主办：grid；组织主办：agency',
+  `SPONSOR_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '主办方id（机关或网格的id）',
+  `SPONSOR_NAME` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '活动主办方名称（机关或网格的名称）',
+  `PID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '如果以网格名义发布，存储空字符串\"\"',
+  `REWARD` int(11) NULL DEFAULT 0 COMMENT '活动奖励积分',
+  `VOLUNTEER_LIMIT` tinyint(1) NULL DEFAULT NULL COMMENT '身份限制:1只有志愿者才可以参加活动0不限制志愿者身份',
+  `AUDIT_SWITCH` tinyint(1) NULL DEFAULT NULL COMMENT '审核开关：1报名人员需要人工审核0不需要',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '0' COMMENT '删除标识',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '最近一次编辑的活动信息' ROW_FORMAT = Compact;
+
+-- ----------------------------
+-- Table structure for volunteer_info
+-- ----------------------------
+DROP TABLE IF EXISTS `volunteer_info`;
+CREATE TABLE `volunteer_info`  (
+  `ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '主键（志愿者注册后插入本表）',
+  `USER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '用户id',
+  `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户id',
+  `VOLUNTEER_INTRODUCE` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '志愿者自我介绍',
+  `VOLUNTEER_SIGNATURE` varchar(512) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '' COMMENT '志愿者签名',
+  `DEL_FLAG` varchar(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '删除标记',
+  `REVISION` int(11) NOT NULL DEFAULT 0 COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间(认证志愿者时间)',
+  `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '志愿者信息' ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;

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

@@ -300,7 +300,7 @@
             then 'in_progress'
             end as actCurrentState
 		FROM act_info i
-        LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+        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
         WHERE i.DEL_FLAG = '0'
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
@@ -403,7 +403,7 @@
             IF(aur.SIGN_IN_FLAG = 'signed_in', true , false ) as isSignUp-- 是否已签到(true已签到，false未签到)
         FROM
             act_info i
-            LEFT JOIN (SELECT count(1) signupNum, re.ACT_ID from act_user_relation re WHERE re.DEL_FLAG = '0' GROUP BY re.ACT_ID) c ON c.ACT_ID = i.ID
+            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
             LEFT JOIN act_user_relation aur ON aur.ACT_ID = i.ID AND aur.DEL_FLAG = '0' AND aur.USER_ID =  #{userId}
         WHERE
             i.DEL_FLAG = '0'

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

@@ -3,7 +3,7 @@ services:
   epmet-oss-server:
     container_name: epmet-oss-server-dev
 #    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-oss-server:0.3.2
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.23
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-oss-server:0.3.24
     ports:
       - "8083:8083"
     network_mode: host # 使用现有网络

epmet-module/epmet-oss/epmet-oss-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.23</version>
+    <version>0.3.24</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-oss</artifactId>

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointDetailResultDTO.java

@@ -19,6 +19,6 @@ public class PointDetailResultDTO implements Serializable {
 	private Integer point;
 	private String pointUnit;
 	private String upLimit;
-	private String enabledFlag;
+	private Boolean enabledFlag;
 	private String upLimitDesc;
 }

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointRuleResultDTO.java

@@ -16,6 +16,7 @@ public class PointRuleResultDTO implements Serializable {
 	private String ruleId;
 	private String ruleName;
 	private String ruleDesc;
+	private Boolean enabledFlag;
 	/**
 	 * 拼接好的 积分值/单位
 	 */

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-point-server:
     container_name: epmet-point-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.3
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-point-server:0.0.4
     ports:
       - "8112:8112"
     network_mode: host # 使用现有网络

epmet-module/epmet-point/epmet-point-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.3</version>
+    <version>0.0.4</version>
     <parent>
         <artifactId>epmet-point</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRuleServiceImpl.java

@@ -115,6 +115,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 				log.error("list ruleId:{} have not pointUnit or pointNum,pointRule:{}", JSON.toJSONString(pointRuleEntity));
 				return null;
 			}
+			resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 			resultDTO.setPointValue(pointRuleEntity.getPoint().toString().concat("分").concat(StrConstant.SEPARATOR).concat(pointUnitEnum.getDesc()));
 			return resultDTO;
 		}).filter(fun -> fun != null).collect(Collectors.toList());
@@ -129,7 +130,7 @@ public class PointRuleServiceImpl extends BaseServiceImpl<PointRuleDao, PointRul
 		}
 		PointDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(pointRuleEntity, PointDetailResultDTO.class);
 		resultDTO.setRuleId(pointRuleEntity.getId());
-		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? "true" : "false");
+		resultDTO.setEnabledFlag(NumConstant.ONE_STR.equals(pointRuleEntity.getEnabledFlag()) ? true : false);
 		return resultDTO;
 	}
 

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.65
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-third-server:0.0.67
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-third-server:
     container_name: epmet-third-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.64
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-third-server:0.0.65
     ports:
       - "8110:8110"
     network_mode: host # 使用现有网络

epmet-module/epmet-third/epmet-third-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.0.65</version>
+    <version>0.0.67</version>
 
     <parent>
         <groupId>com.epmet</groupId>

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/ComponentVerifyTicketServiceImpl.java

@@ -1,9 +1,7 @@
 package com.epmet.service.impl;
 
-import cn.hutool.core.convert.Convert;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.TypeReference;
 import com.alibaba.nacos.client.config.utils.IOUtils;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.exception.RenException;
@@ -13,6 +11,7 @@ import com.epmet.constant.ModuleConstant;
 import com.epmet.constant.ThirdRedisKeyConstant;
 import com.epmet.constant.ThirdRunTimeInfoConstant;
 import com.epmet.dao.*;
+import com.epmet.dto.PaCustomerUserAgencyDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -81,6 +80,8 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private AuthResultRecordDao authResultRecordDao;
+    @Autowired
+    private PaCustomerUserAgencyDao paCustomerUserAgencyDao;
 
     @Value("${third.platform.appId}")
     private String componentAppId;
@@ -652,10 +653,12 @@ public class ComponentVerifyTicketServiceImpl implements ComponentVerifyTicketSe
      * @author zxc
      */
     public String getLoginUserCustomerId(TokenDto tokenDto){
-        LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
+        /*LoginUserDetailsFormDTO dto = new LoginUserDetailsFormDTO();
         BeanUtils.copyProperties(tokenDto,dto);
-        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();
-        return data.getCustomerId();
+        LoginUserDetailsResultDTO data = epmetUserOpenFeignClient.getLoginUserDetails(dto).getData();*/
+        PaCustomerUserAgencyDTO result = paCustomerUserAgencyDao.selectByUserId(tokenDto.getUserId());
+//        return data.getCustomerId();
+        return result.getCustomerId();
     }
 
     /**

epmet-module/gov-voice/gov-voice-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   gov-voice-server:
     container_name: gov-voice-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.60
+    image: 192.168.1.130:10080/epmet-cloud-dev/gov-voice-server:0.3.62
     ports:
       - "8105:8105"
     network_mode: host # 使用现有网络

epmet-module/gov-voice/gov-voice-server/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.60</version>
+    <version>0.3.62</version>
     <parent>
         <artifactId>gov-voice</artifactId>
         <groupId>com.epmet</groupId>

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml

@@ -143,8 +143,7 @@
             TITLE AS "title",
             IFNULL(PREVIEW_CONTENT, "") AS "content",
             UNIX_TIMESTAMP(CREATED_TIME) AS "createdTime",
-            AUDIT_STATUS,
-            AUDIT_REASON
+            STATUS_FLAG AS auditStatus
         FROM draft
         WHERE DEL_FLAG = '0'
           AND (STATUS_FLAG = 'unpublish' OR STATUS_FLAG = 'auditfail')

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-user-server:
     container_name: epmet-user-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.81
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.82
     ports:
       - "8087:8087"
     network_mode: host # 不会创建新的网络

epmet-user/epmet-user-server/pom.xml

@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.81</version>
+    <version>0.3.82</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java

@@ -33,7 +33,6 @@ import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.UserWechatDTO;
 import com.epmet.dto.result.CustomerUserDetailResultDTO;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
-import com.epmet.dto.result.UserWechatResultDTO;
 import com.epmet.entity.UserBaseInfoEntity;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -133,14 +132,14 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             return new ArrayList<>();
         }
         List<UserBaseInfoResultDTO> userBaseInfoList=new ArrayList<>();
-        for(String userId:userIdList){
+       /* for(String userId:userIdList){
             UserBaseInfoResultDTO userBaseInfoResultDTO=baseDao.selectListByUserIdList(userId);
             if(null!=userBaseInfoResultDTO){
                 UserWechatResultDTO userWechatResultDTO=baseDao.selectUserWechatByUserId(userId);
                 userBaseInfoResultDTO.setUserWechatResultDTO(userWechatResultDTO);
                 userBaseInfoList.add(userBaseInfoResultDTO);
             }
-        }
+        }*/
         userIdList.forEach(id -> {
             UserBaseInfoResultDTO baseInfo = userBaseInfoRedis.getUserInfo(id);
             //为了保证传过来的user数量与返回的一致，就算查出的用户信息为空也要添加进集合里

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.5__create_userbaseinfo.sql

@@ -0,0 +1,22 @@
+CREATE TABLE `user_base_info` (
+  `ID` varchar(64) NOT NULL COMMENT '主键',
+  `USER_ID` varchar(64) NOT NULL COMMENT '用户id',
+  `MOBILE` varchar(20) DEFAULT NULL COMMENT '手机号(注册手机号)',
+  `SURNAME` varchar(32) DEFAULT NULL COMMENT '姓氏',
+  `NAME` varchar(32) DEFAULT NULL COMMENT '名',
+  `REAL_NAME` varchar(50) DEFAULT NULL COMMENT '姓+名',
+  `ID_NUM` varchar(50) DEFAULT '' COMMENT '身份证号',
+  `GENDER` varchar(1) DEFAULT NULL COMMENT '性别（1男2女0未知）',
+  `STREET` varchar(128) DEFAULT '' COMMENT '街道',
+  `DISTRICT` varchar(128) DEFAULT '' COMMENT '小区名称',
+  `BUILDING_ADDRESS` varchar(128) DEFAULT '' COMMENT '楼栋单元',
+  `NICKNAME` varchar(64) DEFAULT '' COMMENT '昵称(目前来源于微信昵称，后续系统可支持用户有昵称)',
+  `HEAD_IMG_URL` varchar(1024) DEFAULT '' COMMENT '头像（目前来源于微信，后续系统顾客支持上传头像）',
+  `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='用户基础信息';