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

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

@@ -2,11 +2,13 @@ package com.epmet.dto.form.work;
 
 import lombok.Data;
 
+import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
- * 描述一下
+ * 工作端 进行中-活动列表、已取消-活动列表、已结束-活动列表 统一入参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 21:21
@@ -20,4 +22,15 @@ public class ActListCommonFormDTO implements Serializable {
      */
     @NotBlank(message = "客户id不能为空", groups = {AddUserInternalGroup.class })
     private String customerId;
+
+    /**
+     * 页码
+     */
+    @Min(1)
+    private Integer pageNo;
+
+    /**
+     * 每页显示条数
+     */
+    private Integer pageSize = 20;
 }

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

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 /**
- * 描述一下
+ * 取消活动入参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/26 17:23

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

@@ -8,7 +8,7 @@ import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
- * 描述一下
+ * 测试发放积分入参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/30 12:15

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 描述一下
+ * 工作端：已取消-活动列表返参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 23:09

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

@@ -7,7 +7,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 描述一下
+ * 工作端：已结束-活动列表 返参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 23:19

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

@@ -25,7 +25,7 @@ import java.io.Serializable;
 /**
  * 添加组织-接口返参
  *
- * @author sun
+ * @author yinzuomei
  */
 @Data
 public class Grid implements Serializable {

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

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- * 描述一下
+ * 工作端：进行中-活动列表返参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 21:23

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

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 /**
- * 描述一下
+ * 发布活动初始化接口返参
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/20 17:49

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 描述一下
+ * 活动主办方 返参DTO
  *
  * @author yinzuomei@elink-cn.com
  * @date 2020/7/23 20:23

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

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

@@ -23,6 +23,7 @@ import com.epmet.dto.form.resi.ResiActBaseFormDTO;
 import com.epmet.dto.form.resi.ResiActDetailFormDTO;
 import com.epmet.dto.form.resi.ResiLatestActFormDTO;
 import com.epmet.dto.form.resi.ResiMyActFormDTO;
+import com.epmet.dto.form.work.ActListCommonFormDTO;
 import com.epmet.dto.result.resi.*;
 import com.epmet.dto.result.work.*;
 import com.epmet.entity.ActInfoEntity;
@@ -228,30 +229,30 @@ public interface ActInfoDao extends BaseDao<ActInfoEntity> {
 
     /**
      * @return java.util.List<com.epmet.dto.result.work.InProgressActResultDTO>
-     * @param customerId
+     * @param actListCommonFormDTO
      * @author yinzuomei
      * @description 查询正在进行中的活动列表
      * @Date 2020/7/23 21:58
      **/
-    List<InProgressActResultDTO> selectInprogress(String customerId);
+    List<InProgressActResultDTO> selectInprogress(ActListCommonFormDTO actListCommonFormDTO);
 
     /**
      * @return java.util.List<com.epmet.dto.result.work.CanceledActResultDTO>
-     * @param customerId
+     * @param actListCommonFormDTO
      * @author yinzuomei
      * @description 已取消-活动列表
      * @Date 2020/7/23 23:13
      **/
-    List<CanceledActResultDTO> selectCanceledList(String customerId);
+    List<CanceledActResultDTO> selectCanceledList(ActListCommonFormDTO actListCommonFormDTO);
 
     /**
      * @return java.util.List<com.epmet.dto.result.work.FinishedActResultDTO>
-     * @param customerId
+     * @param actListCommonFormDTO
      * @author yinzuomei
      * @description 已结束-活动列表
      * @Date 2020/7/23 23:21
      **/
-    List<FinishedActResultDTO> selectFinishedList(String customerId);
+    List<FinishedActResultDTO> selectFinishedList(ActListCommonFormDTO actListCommonFormDTO);
 
     /**
      * @return java.util.List<com.epmet.dto.result.work.JoinedUserResultDTO>

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

@@ -532,7 +532,9 @@ public class WorkActServiceImpl implements WorkActService {
      **/
     @Override
     public List<InProgressActResultDTO> queryInProgressList(ActListCommonFormDTO formDTO) {
-        List<InProgressActResultDTO> list = actInfoDao.selectInprogress(formDTO.getCustomerId());
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        List<InProgressActResultDTO> list = actInfoDao.selectInprogress(formDTO);
         Date nowDate = new Date();
         for (InProgressActResultDTO inProgressActResultDTO : list) {
 //            活动状态：报名中：signing_up；截止报名: end_sign_up; 已开始： in_progress; 已报满： enough
@@ -596,7 +598,9 @@ public class WorkActServiceImpl implements WorkActService {
      **/
     @Override
     public List<CanceledActResultDTO> queryCanceledList(ActListCommonFormDTO formDTO) {
-        return actInfoDao.selectCanceledList(formDTO.getCustomerId());
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        return actInfoDao.selectCanceledList(formDTO);
     }
 
     /**
@@ -608,7 +612,9 @@ public class WorkActServiceImpl implements WorkActService {
      **/
     @Override
     public List<FinishedActResultDTO> queryFinishedList(ActListCommonFormDTO formDTO) {
-        return actInfoDao.selectFinishedList(formDTO.getCustomerId());
+        int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageNo(pageIndex);
+        return actInfoDao.selectFinishedList(formDTO);
     }
 
     /**

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

@@ -473,7 +473,7 @@
     </select>
 
     <!--  查询正在进行中的活动列表  -->
-    <select id="selectInprogress" parameterType="java.lang.String" resultType="com.epmet.dto.result.work.InProgressActResultDTO">
+    <select id="selectInprogress" parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.InProgressActResultDTO">
         SELECT
             ai.id AS actId,
             ai.TITLE AS title,
@@ -502,10 +502,11 @@
             AND ai.ACT_STATUS = 'published'
             and ai.CUSTOMER_ID=#{customerId}
         order by ai.CREATED_TIME desc
+        limit #{pageNo}, #{pageSize}
     </select>
 
     <!--   已取消-活动列表 -->
-    <select id="selectCanceledList"  parameterType="java.lang.String" resultType="com.epmet.dto.result.work.CanceledActResultDTO">
+    <select id="selectCanceledList"  parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.CanceledActResultDTO">
         SELECT
             ai.id AS actId,
             ai.TITLE AS title,
@@ -523,10 +524,11 @@
             AND ai.CUSTOMER_ID = #{customerId}
         ORDER BY
             ai.CREATED_TIME DESC
+        limit #{pageNo}, #{pageSize}
     </select>
 
     <!-- 已结束-活动列表 -->
-    <select id="selectFinishedList"  parameterType="java.lang.String" resultType="com.epmet.dto.result.work.FinishedActResultDTO">
+    <select id="selectFinishedList"  parameterType="com.epmet.dto.form.work.ActListCommonFormDTO" resultType="com.epmet.dto.result.work.FinishedActResultDTO">
         SELECT
             ai.id AS actId,
             ai.TITLE AS title,
@@ -544,6 +546,7 @@
             AND ai.CUSTOMER_ID = #{customerId}
         ORDER BY
             ai.CREATED_TIME DESC
+        limit #{pageNo}, #{pageSize}
     </select>
 
     <!--  已结束-已参加人员列表  -->

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

@@ -18,6 +18,7 @@ public class PointDetailResultDTO implements Serializable {
 	private String ruleDesc;
 	private Integer point;
 	private String pointUnit;
+	private String pointUnitDesc;
 	private Integer upLimit;
 	private Boolean enabledFlag;
 	private String upLimitDesc;

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

@@ -131,6 +131,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.setPointUnitDesc(PointUnitEnum.getEnum(pointRuleEntity.getPointUnit()).getDesc());
 		return resultDTO;
 	}
 

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));
     }