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

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

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

@@ -243,11 +243,14 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
             String eventStatement = eventName;
 
             if(EventEnum.ACTIVE_INSERT_LIVE.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
+                eventName = ModuleConstant.EVENT_NAME_ADD_LIVE;
-            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
-                eventName = ModuleConstant.EVENT_NAME_PARTICIPATED_ACT;
                 eventStatement = event.getRemark();
+            }else if(EventEnum.REGISTER_VOLUNTEER.getEventTag().equals(eventCode)){
+                eventName = ModuleConstant.EVENT_NAME_VOLUNTEER;
+                //志愿者认证不需要备注
             }else{
+                //如果不是添加实况和志愿者注册
+                //则统一使用EventEnum中的eventDesc作为eventStatement，eventTag作为eventId
                 eventName = EventEnum.getEnum(eventCode).getEventDesc();
                 eventStatement = event.getRemark();
             }

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/utils/ModuleConstant.java

@@ -118,4 +118,6 @@ public interface ModuleConstant extends Constant {
     String EVENT_NAME_VOLUNTEER = "志愿者认证";
 
     String EVENT_NAME_PARTICIPATED_ACT = "参与活动";
+
+    String EVENT_NAME_ADD_LIVE = "添加活动实况";
 }

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

@@ -182,6 +182,7 @@ public class PaCustomerServiceImpl extends BaseServiceImpl<PaCustomerDao, PaCust
             userEntity.setPhone(formDTO.getPhone());
             userEntity.setRealName(formDTO.getSurName());
             userEntity.setGender(formDTO.getGender().toString());
+            userEntity.setSource(formDTO.getSource());
             if (paUserDao.insert(userEntity) < NumConstant.ONE) {
                 throw new RenException(PaConstant.SAVE_USER_EXCEPTION);
             }

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.36
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-mine-server:0.3.37
     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.36</version>
+    <version>0.3.37</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

@@ -50,14 +50,15 @@ public class ResiMineGridController {
 
 	/**
 	 * @return
-	 * @param formDTO
+	 * @param appId
 	 * @Author sun
 	 * @Description 单客户-获取用户最近访问网格
 	 * @Date 2020/8/3
 	 **/
 	@GetMapping("latestgridinfo")
-	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestBody LatestGridInfoFormDTO formDTO) {
+	public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) {
-		ValidatorUtils.validateEntity(formDTO);
+		LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO();
+		formDTO.setAppId(appId);
 		formDTO.setUserId(token.getUserId());
 		return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
 	}

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
      **/
-    @GetMapping(value = "epmetuser/gridlatest/latestgridinfo")
+    @PostMapping(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.105
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.106
     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.105</version>
+    <version>0.3.106</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
      **/
-    @GetMapping("latestgridinfo")
+    @PostMapping("latestgridinfo")
     public Result<LatestGridInfoResultDTO> latestGridInfo(@RequestBody LatestGridInfoFormDTO formDTO){
         return new Result<LatestGridInfoResultDTO>().ok(gridLatestService.latestGridInfo(formDTO));
     }