Merge remote-tracking branch 'origin/dev_ic_data' into develop

epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/IcResiPointPageFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+@Data
+public class IcResiPointPageFormDTO implements Serializable {
+    public interface AddUserInternalGroup {
+    }
+    //@NotBlank(message = "epmetUserId不能为空" , groups = AddUserInternalGroup.class)
+    private String epmetUserId;
+    @NotNull(message = "pageNo不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageNo;
+    @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class)
+    private Integer pageSize;
+
+}

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

@@ -0,0 +1,21 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ResiPointPageResDTO implements Serializable {
+    private String title;
+    private String id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+    private Date dateTime;
+
+    /**
+     * +100  -25
+     * */
+    private String point;
+}

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java

@@ -1,6 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
@@ -115,6 +116,18 @@ public class ResiPointController {
         return new Result<List<ResiPointLogListResultDTO>>().ok(pointActionLogService.getMyPointRecord(pageUserParam));
     }
 
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("pageuserpoint")
+    public Result<PageData<ResiPointPageResDTO>> pageUserPoint(@RequestBody IcResiPointPageFormDTO formDTO ){
+        ValidatorUtils.validateEntity(formDTO,IcResiPointPageFormDTO.AddUserInternalGroup.class);
+        return new Result<PageData<ResiPointPageResDTO>>().ok(pointActionLogService.pageUserPoint(formDTO));
+    }
+
     /**
      * @Description 查找指定用户的积分兑换记录
      * @param dto

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/UserPointActionLogDao.java

@@ -18,8 +18,10 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -69,4 +71,6 @@ public interface UserPointActionLogDao extends BaseDao<UserPointActionLogEntity>
                                                     @Param("userId")String userId,
                                                     @Param("type")String type,
                                                     @Param("dateId")String dateId);
+
+    List<ResiPointPageResDTO> selectPageResiPoin(IcResiPointPageFormDTO formDTO);
 }

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

@@ -22,9 +22,11 @@ import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.UserPointActionLogDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.form.MyPointTaskFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.UserPointActionLogEntity;
 import dto.form.SendPointFormDTO;
 
@@ -143,4 +145,12 @@ public interface UserPointActionLogService extends BaseService<UserPointActionLo
      * @return Result<MyPointTaskResultDTO>
      */
     List<MyPointTaskResultDTO> queryMyPointTaskList(MyPointTaskFormDTO formDTO);
+
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO);
 }

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

@@ -36,10 +36,12 @@ import com.epmet.dto.BizPointUserTotalDetailDTO;
 import com.epmet.dto.UserPointActionLogDTO;
 import com.epmet.dto.VolunteerInfoDTO;
 import com.epmet.dto.form.CommonPageUserFormDTO;
+import com.epmet.dto.form.IcResiPointPageFormDTO;
 import com.epmet.dto.form.MyPointTaskFormDTO;
 import com.epmet.dto.result.MyPointTaskResultDTO;
 import com.epmet.dto.result.ResiPointLogListResultDTO;
 import com.epmet.dto.result.ResiPointLogPeriodResultDTO;
+import com.epmet.dto.result.ResiPointPageResDTO;
 import com.epmet.entity.PointRuleEntity;
 import com.epmet.entity.UserPointActionLogEntity;
 import com.epmet.entity.UserPointStatisticalDailyEntity;
@@ -50,6 +52,7 @@ import com.epmet.utils.DimIdGenerator;
 import com.epmet.utils.ModuleConstant;
 import com.epmet.utils.RuleCycleEnum;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Maps;
 import dto.form.SendPointFormDTO;
 import lombok.extern.slf4j.Slf4j;
@@ -559,4 +562,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl<UserPointActi
         });
         return list;
     }
+
+    /**
+     * 数字赋能平台数据分析-个人档案-分页查询居民的积分记录
+     *
+     * @param formDTO
+     * @return
+     */
+    @Override
+    public PageData<ResiPointPageResDTO> pageUserPoint(IcResiPointPageFormDTO formDTO) {
+        if(StringUtils.isBlank(formDTO.getEpmetUserId())){
+            return new PageData<ResiPointPageResDTO>(new ArrayList<>(),NumConstant.ZERO);
+        }
+        PageInfo<ResiPointPageResDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(),
+                formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectPageResiPoin(formDTO));
+        return new PageData<>(pageInfo.getList(), pageInfo.getTotal());
+    }
 }

epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml

@@ -42,6 +42,20 @@
             CREATED_TIME DESC
     </select>
 
+    <select id="selectPageResiPoin" parameterType="com.epmet.dto.form.IcResiPointPageFormDTO" resultType="com.epmet.dto.result.ResiPointPageResDTO">
+        SELECT
+            ID,
+            EVENT_NAME AS title,
+            CASE ACTION_FLAG WHEN 'plus' THEN concat('+',POINT)  ELSE POINT END AS point,
+            CREATED_TIME as dateTime
+        FROM
+            USER_POINT_ACTION_LOG
+        WHERE
+            DEL_FLAG = '0'
+        AND USER_ID = #{epmetUserId}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
     <!-- 查询指定用户在某条规则下所得的积分总和 -->
     <select id="selectSumByEvent" resultType="integer">
         SELECT