Merge branches 'dev' and 'release' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

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

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-auth-server:
     container_name: epmet-auth-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.66
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.67
     ports:
       - "8081:8081"
     network_mode: host # 使用现有网络

epmet-auth/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.66</version>
+    <version>0.3.67</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>

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

@@ -283,13 +283,16 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
     public UserTokenResultDTO register(RegisterFormDTO formDTO) {
         //1.调用epmet-third服务，完成信息注册
         String data = HttpClientManager.getInstance().sendPostByJSON(AuthHttpUrlConstant.REGISTER_URL, JSON.toJSONString(formDTO)).getData();
+        logger.info("data数据为："+data);
         JSONObject toResult = JSON.parseObject(data);
         Result result = ConvertUtils.mapToEntity(toResult, Result.class);
+        logger.info("转换的result结果为："+result);
         if (!result.success()) {
             logger.error(String.format("调用epmet_third服务初始化用户信息失败,数据来源[%s],手机号[%s],userId:[%S]", formDTO.getSource(), formDTO.getPhone(), formDTO.getUserId()));
             throw new RenException(result.getCode());
         }
         Object RegisterResult = result.getData();
+        logger.info("getData()数据为："+RegisterResult);
         JSONObject jsonObject = JSON.parseObject(RegisterResult.toString());
         RegisterResultDTO resultDTO = ConvertUtils.mapToEntity(jsonObject, RegisterResultDTO.class);
 

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.30
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-heart-server:0.0.31
     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.30</version>
+    <version>0.0.31</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-heart</artifactId>

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/ActMessageConstant.java

@@ -26,16 +26,6 @@ public interface ActMessageConstant {
      */
     String ACT_POINTS_EVENT_REMARK="参与%s";
 
-    /**
-     * 居民端-用户认证志愿者，发送消息
-     */
-    String POINTS_EVENT_VOLUNTEER_AUTHENTICATE="用户%s，认证志愿者";
-
-    /**
-     * 居民端-添加实况，发送消息
-     */
-    String ACT_POINTS_EVENT_VOLUNTEER_LIVE="用户%s，添加活动实况,活动:%s";
-
     /**
      * 工作端-重新发布活动，通知待审核+已经审核通过的用户
      */

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

@@ -23,6 +23,7 @@ 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;
@@ -297,13 +298,12 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
         } else if (currentTime.after(actInfoEntity.getSignUpEndTime()) && currentTime.before(actInfoEntity.getActStartTime())) {
             /*报名结束，活动未开始：显示：截止报名*/
             return ActConstant.CURRENT_STATUS_USER_END_SIGN_UP;
-        } else if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            // 活动开始-结束的时间段内： 显示:已开始
+        } else if (currentTime.after(actInfoEntity.getActStartTime())) {
+            // 活动开始以后： 显示:已开始
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
-        } else {
-            // 最后，显示：已结束
-            return ActConstant.CURRENT_STATUS_USER_FINISHED;
         }
+        // 活动的状态是：finished ，显示：已结束
+        return ActConstant.CURRENT_STATUS_USER_FINISHED;
     }
 
     /**
@@ -326,8 +326,8 @@ public class ActInfoServiceImpl extends BaseServiceImpl<ActInfoDao, ActInfoEntit
             return ActConstant.CURRENT_STATUS_USER_POINTS_CONFIRM;
         }
 
-        if (currentTime.after(actInfoEntity.getActStartTime()) && currentTime.before(actInfoEntity.getActEndTime())) {
-            /* 活动开始-结束的时间段内 */
+        if (currentTime.after(actInfoEntity.getActStartTime())) {
+            /* 活动开始后 */
             return ActConstant.CURRENT_STATUS_USER_IN_PROGRESS;
         } else if (currentTime.before(actInfoEntity.getSignUpEndTime())) {
             /* 报名截至时间前 */

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

@@ -39,6 +39,7 @@ import com.epmet.commons.tools.utils.SendMqMsgUtils;
 import com.epmet.constant.ActMessageConstant;
 import com.epmet.dao.ActLivePicDao;
 import com.epmet.dao.ActLiveRecDao;
+import com.epmet.dto.ActInfoDTO;
 import com.epmet.dto.ActLivePicDTO;
 import com.epmet.dto.ActLiveRecDTO;
 import com.epmet.dto.form.resi.ResiActInsertLiveFormDTO;
@@ -48,6 +49,7 @@ import com.epmet.entity.ActLivePicEntity;
 import com.epmet.entity.ActLiveRecEntity;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.ActLiveRecRedis;
+import com.epmet.service.ActInfoService;
 import com.epmet.service.ActLiveRecService;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -77,6 +79,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     @Autowired
     private ActLivePicDao actLivePicDao;
 
+    @Autowired
+    private ActInfoService actInfoService;
+
     @Value("${openapi.scan.server.url}")
     private String scanApiUrl;
     @Value("${openapi.scan.method.textSyncScan}")
@@ -217,8 +222,9 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
     }
 
     private void grantActPoints(ResiActInsertLiveFormDTO formDTO){
-        //备注
-        String remark=String.format(ActMessageConstant.ACT_POINTS_EVENT_VOLUNTEER_LIVE,formDTO.getUserId(),formDTO.getActId());
+        // 查询 活动信息
+        ActInfoDTO actInfoDTO = actInfoService.get(formDTO.getActId());
+
         MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
         //mq的事件类型
         mqBaseMsgDTO.setEventClass(EventEnum.ACTIVE_INSERT_LIVE.getEventClass());
@@ -230,7 +236,7 @@ public class ActLiveRecServiceImpl extends BaseServiceImpl<ActLiveRecDao, ActLiv
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
-        actPointEventMsg.setRemark(remark);
+        actPointEventMsg.setRemark(actInfoDTO.getTitle());
         actPointEventMsg.setSourceId(formDTO.getActId());
         actPointEventMsgList.add(actPointEventMsg);
 

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

@@ -99,8 +99,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
     }
 
     private void grantActPoints(ResiVolunteerAuthenticateFormDTO formDTO){
-        //备注
-        String remark=String.format(ActMessageConstant.POINTS_EVENT_VOLUNTEER_AUTHENTICATE,formDTO.getUserId());
         MqBaseMsgDTO mqBaseMsgDTO=new MqBaseMsgDTO();
         //mq的事件类型
         mqBaseMsgDTO.setEventClass(EventEnum.REGISTER_VOLUNTEER.getEventClass());
@@ -112,7 +110,6 @@ public class VolunteerInfoServiceImpl extends BaseServiceImpl<VolunteerInfoDao,
         actPointEventMsg.setUserId(formDTO.getUserId());
         actPointEventMsg.setActionFlag(MqConstant.PLUS);
         actPointEventMsg.setIsCommon(false);
-        actPointEventMsg.setRemark(remark);
         actPointEventMsgList.add(actPointEventMsg);
 
         mqBaseMsgDTO.setMsg(JSON.toJSONString(actPointEventMsgList));

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

@@ -303,7 +303,6 @@
             and <![CDATA[ DATE_FORMAT(i.SIGN_UP_END_TIME,'%Y-%m-%d %H:%i:%s') < ]]> NOW()
             then 'end_sign_up'
             when <![CDATA[ DATE_FORMAT(i.ACT_START_TIME,'%Y-%m-%d %H:%i:%s') <= ]]> NOW()
-            and <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') >= ]]> NOW()
             then 'in_progress'
             end as actCurrentState
 		FROM act_info i
@@ -311,7 +310,6 @@
         WHERE i.DEL_FLAG = '0'
         AND i.CUSTOMER_ID = #{customerId}
         AND i.ACT_STATUS != 'finished' AND i.ACT_STATUS != 'canceled'
-        AND <![CDATA[ DATE_FORMAT(i.ACT_END_TIME,'%Y-%m-%d %H:%i:%s') > ]]> NOW()
         ORDER BY i.CREATED_TIME DESC
         LIMIT 0, #{num}
     </select>

epmet-module/resi-mine/resi-mine-server/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-mine-server:
     container_name: resi-mine-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.35
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.36
     ports:
       - "8094:8094"
     network_mode: host # 使用现有网络

epmet-module/resi-mine/resi-mine-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.35</version>
+    <version>0.3.36</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-mine</artifactId>

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@@ -55,7 +55,7 @@ public class ResiMineGridController {
 	 * @Description 单客户-获取用户最近访问网格
 	 * @Date 2020/8/3
 	 **/
-	@PostMapping("latestgridinfo")
+	@GetMapping("latestgridinfo")
 	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
 		ValidatorUtils.validateEntity(formDTO);
 		formDTO.setUserId(token.getUserId());

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -257,6 +257,6 @@ public interface EpmetUserOpenFeignClient {
      * @Description 单客户-获取用户最近访问网格
      * @Date 2020/8/3
      **/
-    @PostMapping(value = "epmetuser/gridlatest/latestgridinfo")
+    @GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
     Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO);
 }

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.104
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.105
     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.104</version>
+    <version>0.3.105</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-user</artifactId>

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/GridLatestController.java

@@ -138,7 +138,7 @@ public class GridLatestController {
      * @Description 单客户-根据客户Id和userId查询用户最后一次访问的网格
      * @Date 2020/8/3
      **/
-    @PostMapping("latestgridinfo")
+    @GetMapping("latestgridinfo")
     public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }