Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev_bugfix

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/RequirePermissionEnum.java

@@ -117,8 +117,27 @@ public enum RequirePermissionEnum {
     WORK_GRASSROOTS_PARTY_BRANCH_DELETE("work_grassroots_party_branch_delete","基层治理:支部管理:删除党支部","支部管理-删除党支部"),
     WORK_GRASSROOTS_PARTY_MEMBER_ADD("work_grassroots_party_member_add","基层治理:支部管理:添加党员","支部管理-添加党员"),
     WORK_GRASSROOTS_PARTY_MEMBER_EDIT("work_grassroots_party_member_edit","基层治理:支部管理:编辑党员","支部管理-编辑党员"),
-    WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","基层治理:支部管理:删除党员","支部管理-删除党员");
+    WORK_GRASSROOTS_PARTY_MEMBER_DELETE("work_grassroots_party_member_delete","基层治理:支部管理:删除党员","支部管理-删除党员"),
 
+    /**
+     * 积分-积分规则
+     */
+    MORE_POINT_RULE_LIST("more_point_rule_list","更多:积分:积分规则:查看规则列表","更多-积分-积分规则-查看规则列表"),
+    MORE_POINT_RULE_DETAIL("more_point_rule_detail","更多:积分:积分规则:查看规则详情","更多-积分-积分规则-查看规则详情"),
+    MORE_POINT_RULE_SAVE("more_point_rule_save","更多:积分:积分规则:确认修改规则","更多-积分-积分规则-确认修改积分规则"),
+    MORE_POINT_RULE_FUNCTION_LIST("more_point_rule_function_list","更多:积分:积分规则:功能列表","更多-积分-积分规则-功能列表"),
+    /**
+     * 积分-人员管理
+     */
+    MORE_POINT_USER_MANAGE_LIST("more_point_user_manage_list","更多:积分:人员管理:查看人员列表","更多-积分-人员管理-查看人员列表"),
+    MORE_POINT_USER_MANAGE_DETAIL_VIEW("more_point_user_manage_detail_view","更多:积分:人员管理:查看人员详情","更多-积分-人员管理-人员详情"),
+    MORE_POINT_USER_MANAGE_ADJUST_POINT("more_point_user_manage_adjust_point","更多:积分:人员管理:确认调整积分","更多-积分-人员管理-确认调整积分"),
+    MORE_POINT_USER_MANAGE_ADJUST_REC_VIEW("more_point_user_manage_adjust_rec_view","更多:积分:人员管理:查看调整记录","更多-积分-人员管理-查看调整记录"),
+    /**
+     * 爱心互助-自定义配置
+     */
+    MORE_HEART_CUSTOMIZED_VIEW("more_heart_customized_view","更多:爱心互助:自定义配置:查看","更多-爱心互助-自定义配置-查看"),
+    MORE_HEART_CUSTOMIZED_SAVE("more_heart_customized_save","更多:爱心互助:自定义配置:保存修改","更多-爱心互助-自定义配置-保存修改");
 
     private String key;
     private String name;

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

@@ -60,19 +60,16 @@ public class ResiActInsertLiveFormDTO implements Serializable {
     /**
      * 活动签到位置经度
      */
-    @NotNull(message = "活动签到位置经度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal longitude;
 
     /**
      * 活动签到位置纬度
      */
-    @NotNull(message = "活动签到位置纬度不能为空", groups = { AddUserInternalGroup.class })
     private BigDecimal latitude;
 
     /**
      * 活动签到地址
      */
-    @NotBlank(message = "活动签到地址不能为空", groups = { AddUserInternalGroup.class})
     private String address;
 
     /**

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

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

@@ -17,6 +17,8 @@
 
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.RequirePermission;
+import com.epmet.commons.tools.enums.RequirePermissionEnum;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dto.form.work.ActCustomizedFormDTO;
@@ -51,6 +53,7 @@ public class ActCustomizedController {
      * @description 获取当前客户下，爱心互助模块自定义配置项，如果没有配置，返回系统默认
      * @Date 2020/7/20 15:42
      **/
+    @RequirePermission(requirePermission = RequirePermissionEnum.MORE_HEART_CUSTOMIZED_VIEW)
     @PostMapping("getconfigs")
     public Result<ActCustomizedResultDTO> getConfigs(@RequestBody ActCustomizedFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, ActCustomizedFormDTO.AddUserInternalGroup.class);
@@ -65,6 +68,7 @@ public class ActCustomizedController {
      * @description 保存自定义配置
      * @Date 2020/7/20 17:25
      **/
+    @RequirePermission(requirePermission = RequirePermissionEnum.MORE_HEART_CUSTOMIZED_SAVE)
     @PostMapping("save")
     public Result saveConfigs(@RequestBody SaveActCustomizedFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO, SaveActCustomizedFormDTO.AddUserShowGroup.class,SaveActCustomizedFormDTO.AddUserInternalGroup.class);

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

@@ -333,6 +333,7 @@
         AND r.USER_ID = #{userId}
         AND NOW() BETWEEN DATE_SUB(i.ACT_START_TIME, INTERVAL 1 HOUR) AND i.ACT_END_TIME
         AND i.ACT_STATUS = 'published'
+        AND r.`STATUS` = 'passed'
     </select>
 
     <!--活动回顾列表-->

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