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

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java

@@ -0,0 +1,101 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.resi.group.dto.group;
+
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Data
+public class ResiGroupSetupDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户ID,初始默认为default
+     */
+	private String customerId;
+
+    /**
+     * 默认小组头像
+     */
+	private String logo;
+
+    /**
+     * 小组名称
+     */
+	private String name;
+
+    /**
+     * 小组简介
+     */
+	private String describe;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+	private String groupType;
+
+    /**
+     * 专用：dedicated；常用：common_used
+     */
+	private String category;
+
+    /**
+     * 删除标记 0：未删除，1：已删除
+     */
+	private String delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReafdRecordDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java

@@ -29,7 +29,7 @@ import lombok.Data;
  * @since v1.0.0 2021-04-19
  */
 @Data
-public class NoticeReafdRecordDTO implements Serializable {
+public class NoticeReadRecordDTO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupSetupController.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.controller;
+
+import com.epmet.modules.group.service.ResiGroupSetupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@RestController
+@RequestMapping("resigroupsetup")
+public class ResiGroupSetupController {
+    
+    @Autowired
+    private ResiGroupSetupService resiGroupSetupService;
+
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupSetupDao.java

@@ -0,0 +1,33 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.modules.group.entity.ResiGroupSetupEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Mapper
+public interface ResiGroupSetupDao extends BaseDao<ResiGroupSetupEntity> {
+	
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java

@@ -0,0 +1,71 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("resi_group_setup")
+public class ResiGroupSetupEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户ID,初始默认为default
+     */
+	private String customerId;
+
+    /**
+     * 默认小组头像
+     */
+	private String logo;
+
+    /**
+     * 小组名称
+     */
+	private String name;
+
+    /**
+     * 小组简介
+     */
+	private String describe;
+
+    /**
+     * 小组类型(ordinary:楼院小组  branch:支部小组)
+     */
+	private String groupType;
+
+    /**
+     * 专用：dedicated；常用：common_used
+     */
+	private String category;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupSetupRedis.java

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.redis;
+
+import com.epmet.commons.tools.redis.RedisUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Component
+public class ResiGroupSetupRedis {
+    @Autowired
+    private RedisUtils redisUtils;
+
+    public void delete(Object[] ids) {
+
+    }
+
+    public void set(){
+
+    }
+
+    public String get(String id){
+        return null;
+    }
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupSetupService.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.modules.group.entity.ResiGroupSetupEntity;
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+public interface ResiGroupSetupService extends BaseService<ResiGroupSetupEntity> {
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java

@@ -0,0 +1,40 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.modules.group.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.modules.group.dao.ResiGroupSetupDao;
+import com.epmet.modules.group.entity.ResiGroupSetupEntity;
+import com.epmet.modules.group.redis.ResiGroupSetupRedis;
+import com.epmet.modules.group.service.ResiGroupSetupService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 建组设置
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-04-20
+ */
+@Service
+public class ResiGroupSetupServiceImpl extends BaseServiceImpl<ResiGroupSetupDao, ResiGroupSetupEntity> implements ResiGroupSetupService {
+
+    @Autowired
+    private ResiGroupSetupRedis resiGroupSetupRedis;
+
+}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java

@@ -25,7 +25,6 @@ import com.epmet.modules.invitation.dao.InvitationRecordDao;
 import com.epmet.modules.invitation.entity.InvitationRecordEntity;
 import com.epmet.modules.invitation.service.InvitationRecordService;
 import com.epmet.modules.notice.dao.NoticeDao;
-import com.epmet.modules.notice.dao.NoticeReafdRecordDao;
 import com.epmet.modules.notice.entity.NoticeEntity;
 import com.epmet.resi.group.dto.invitation.form.ShareFormDTO;
 import com.epmet.resi.group.dto.invitation.result.ShareResultDTO;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReafdRecordController.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java

@@ -27,9 +27,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
-import com.epmet.modules.notice.excel.NoticeReafdRecordExcel;
+import com.epmet.modules.notice.excel.NoticeReadRecordExcel;
-import com.epmet.modules.notice.service.NoticeReafdRecordService;
+import com.epmet.modules.notice.service.NoticeReadRecordService;
-import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO;
+import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO;
 import com.epmet.resi.group.dto.notice.form.ReadTypeFormDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
@@ -49,25 +49,25 @@ import java.util.Map;
  */
 @RestController
 @RequestMapping("noticereafdrecord")
-public class NoticeReafdRecordController {
+public class NoticeReadRecordController {
     
     @Autowired
-    private NoticeReafdRecordService noticeReafdRecordService;
+    private NoticeReadRecordService noticeReafdRecordService;
 
     @GetMapping("page")
-    public Result<PageData<NoticeReafdRecordDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<NoticeReadRecordDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<NoticeReafdRecordDTO> page = noticeReafdRecordService.page(params);
+        PageData<NoticeReadRecordDTO> page = noticeReafdRecordService.page(params);
-        return new Result<PageData<NoticeReafdRecordDTO>>().ok(page);
+        return new Result<PageData<NoticeReadRecordDTO>>().ok(page);
     }
 
     @GetMapping("{id}")
-    public Result<NoticeReafdRecordDTO> get(@PathVariable("id") String id){
+    public Result<NoticeReadRecordDTO> get(@PathVariable("id") String id){
-        NoticeReafdRecordDTO data = noticeReafdRecordService.get(id);
+        NoticeReadRecordDTO data = noticeReafdRecordService.get(id);
-        return new Result<NoticeReafdRecordDTO>().ok(data);
+        return new Result<NoticeReadRecordDTO>().ok(data);
     }
 
     @PostMapping
-    public Result save(@RequestBody NoticeReafdRecordDTO dto){
+    public Result save(@RequestBody NoticeReadRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         noticeReafdRecordService.save(dto);
@@ -75,7 +75,7 @@ public class NoticeReafdRecordController {
     }
 
     @PutMapping
-    public Result update(@RequestBody NoticeReafdRecordDTO dto){
+    public Result update(@RequestBody NoticeReadRecordDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         noticeReafdRecordService.update(dto);
@@ -92,8 +92,8 @@ public class NoticeReafdRecordController {
 
     @GetMapping("export")
     public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<NoticeReafdRecordDTO> list = noticeReafdRecordService.list(params);
+        List<NoticeReadRecordDTO> list = noticeReafdRecordService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, NoticeReafdRecordExcel.class);
+        ExcelUtils.exportExcelToTarget(response, null, list, NoticeReadRecordExcel.class);
     }
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReafdRecordDao.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReadRecordDao.java

@@ -18,8 +18,8 @@
 package com.epmet.modules.notice.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.modules.notice.entity.NoticeReafdRecordEntity;
+import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
-import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO;
+import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2021-04-19
  */
 @Mapper
-public interface NoticeReafdRecordDao extends BaseDao<NoticeReafdRecordEntity> {
+public interface NoticeReadRecordDao extends BaseDao<NoticeReadRecordEntity> {
 
     /**
      * @Author sun
@@ -44,11 +44,11 @@ public interface NoticeReafdRecordDao extends BaseDao<NoticeReafdRecordEntity> {
      * @Author sun
      * @Description 根据通知Id查询组成员已读未读数据
      **/
-    List<NoticeReafdRecordDTO> getByNoticeId(@Param("noticeId") String noticeId);
+    List<NoticeReadRecordDTO> getByNoticeId(@Param("noticeId") String noticeId);
 
     /**
      * @Author sun
      * @Description 查询当前人员是否存在对通知已读未读数据
      **/
-    NoticeReafdRecordEntity selectByNoticeId(@Param("noticeId") String noticeId, @Param("userId") String userId);
+    NoticeReadRecordEntity selectByNoticeId(@Param("noticeId") String noticeId, @Param("userId") String userId);
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReafdRecordEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Data
 @EqualsAndHashCode(callSuper=false)
 @TableName("notice_reafd_record")
-public class NoticeReafdRecordEntity extends BaseEpmetEntity {
+public class NoticeReadRecordEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReafdRecordExcel.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReadRecordExcel.java

@@ -29,7 +29,7 @@ import java.util.Date;
  * @since v1.0.0 2021-04-19
  */
 @Data
-public class NoticeReafdRecordExcel {
+public class NoticeReadRecordExcel {
 
     @Excel(name = "主键")
     private String id;

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReafdRecordRedis.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReadRecordRedis.java

@@ -28,7 +28,7 @@ import org.springframework.stereotype.Component;
  * @since v1.0.0 2021-04-19
  */
 @Component
-public class NoticeReafdRecordRedis {
+public class NoticeReadRecordRedis {
     @Autowired
     private RedisUtils redisUtils;
 

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReafdRecordService.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java

@@ -20,8 +20,8 @@ package com.epmet.modules.notice.service;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
-import com.epmet.modules.notice.entity.NoticeReafdRecordEntity;
+import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
-import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO;
+import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO;
 import com.epmet.resi.group.dto.notice.form.ReadTypeFormDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
@@ -35,7 +35,7 @@ import java.util.Map;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2021-04-19
  */
-public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordEntity> {
+public interface NoticeReadRecordService extends BaseService<NoticeReadRecordEntity> {
 
     /**
      * 默认分页
@@ -45,7 +45,7 @@ public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordE
      * @author generator
      * @date 2021-04-19
      */
-    PageData<NoticeReafdRecordDTO> page(Map<String, Object> params);
+    PageData<NoticeReadRecordDTO> page(Map<String, Object> params);
 
     /**
      * 默认查询
@@ -55,7 +55,7 @@ public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordE
      * @author generator
      * @date 2021-04-19
      */
-    List<NoticeReafdRecordDTO> list(Map<String, Object> params);
+    List<NoticeReadRecordDTO> list(Map<String, Object> params);
 
     /**
      * 单条查询
@@ -65,7 +65,7 @@ public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordE
      * @author generator
      * @date 2021-04-19
      */
-    NoticeReafdRecordDTO get(String id);
+    NoticeReadRecordDTO get(String id);
 
     /**
      * 默认保存
@@ -75,7 +75,7 @@ public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordE
      * @author generator
      * @date 2021-04-19
      */
-    void save(NoticeReafdRecordDTO dto);
+    void save(NoticeReadRecordDTO dto);
 
     /**
      * 默认更新
@@ -85,7 +85,7 @@ public interface NoticeReafdRecordService extends BaseService<NoticeReafdRecordE
      * @author generator
      * @date 2021-04-19
      */
-    void update(NoticeReafdRecordDTO dto);
+    void update(NoticeReadRecordDTO dto);
 
     /**
      * 批量删除

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReafdRecordServiceImpl.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeReadRecordServiceImpl.java

@@ -30,12 +30,12 @@ import com.epmet.constant.ReadFlagConstant;
 import com.epmet.dto.result.UserBaseInfoResultDTO;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.modules.notice.dao.NoticeDao;
-import com.epmet.modules.notice.dao.NoticeReafdRecordDao;
+import com.epmet.modules.notice.dao.NoticeReadRecordDao;
 import com.epmet.modules.notice.entity.NoticeEntity;
-import com.epmet.modules.notice.entity.NoticeReafdRecordEntity;
+import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
-import com.epmet.modules.notice.redis.NoticeReafdRecordRedis;
+import com.epmet.modules.notice.redis.NoticeReadRecordRedis;
-import com.epmet.modules.notice.service.NoticeReafdRecordService;
+import com.epmet.modules.notice.service.NoticeReadRecordService;
-import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO;
+import com.epmet.resi.group.dto.notice.NoticeReadRecordDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeReadListFormDTO;
 import com.epmet.resi.group.dto.notice.form.ReadTypeFormDTO;
 import com.epmet.resi.group.dto.notice.result.NoticeReadListResultDTO;
@@ -57,57 +57,57 @@ import java.util.stream.Collectors;
  * @since v1.0.0 2021-04-19
  */
 @Service
-public class NoticeReafdRecordServiceImpl extends BaseServiceImpl<NoticeReafdRecordDao, NoticeReafdRecordEntity> implements NoticeReafdRecordService {
+public class NoticeReadRecordServiceImpl extends BaseServiceImpl<NoticeReadRecordDao, NoticeReadRecordEntity> implements NoticeReadRecordService {
 
     @Autowired
-    private NoticeReafdRecordRedis noticeReafdRecordRedis;
+    private NoticeReadRecordRedis noticeReafdRecordRedis;
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private NoticeDao noticeDao;
 
     @Override
-    public PageData<NoticeReafdRecordDTO> page(Map<String, Object> params) {
+    public PageData<NoticeReadRecordDTO> page(Map<String, Object> params) {
-        IPage<NoticeReafdRecordEntity> page = baseDao.selectPage(
+        IPage<NoticeReadRecordEntity> page = baseDao.selectPage(
                 getPage(params, FieldConstant.CREATED_TIME, false),
                 getWrapper(params)
         );
-        return getPageData(page, NoticeReafdRecordDTO.class);
+        return getPageData(page, NoticeReadRecordDTO.class);
     }
 
     @Override
-    public List<NoticeReafdRecordDTO> list(Map<String, Object> params) {
+    public List<NoticeReadRecordDTO> list(Map<String, Object> params) {
-        List<NoticeReafdRecordEntity> entityList = baseDao.selectList(getWrapper(params));
+        List<NoticeReadRecordEntity> entityList = baseDao.selectList(getWrapper(params));
 
-        return ConvertUtils.sourceToTarget(entityList, NoticeReafdRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entityList, NoticeReadRecordDTO.class);
     }
 
-    private QueryWrapper<NoticeReafdRecordEntity> getWrapper(Map<String, Object> params){
+    private QueryWrapper<NoticeReadRecordEntity> getWrapper(Map<String, Object> params){
         String id = (String)params.get(FieldConstant.ID_HUMP);
 
-        QueryWrapper<NoticeReafdRecordEntity> wrapper = new QueryWrapper<>();
+        QueryWrapper<NoticeReadRecordEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
 
         return wrapper;
     }
 
     @Override
-    public NoticeReafdRecordDTO get(String id) {
+    public NoticeReadRecordDTO get(String id) {
-        NoticeReafdRecordEntity entity = baseDao.selectById(id);
+        NoticeReadRecordEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, NoticeReafdRecordDTO.class);
+        return ConvertUtils.sourceToTarget(entity, NoticeReadRecordDTO.class);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void save(NoticeReafdRecordDTO dto) {
+    public void save(NoticeReadRecordDTO dto) {
-        NoticeReafdRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReafdRecordEntity.class);
+        NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class);
         insert(entity);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(NoticeReafdRecordDTO dto) {
+    public void update(NoticeReadRecordDTO dto) {
-        NoticeReafdRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReafdRecordEntity.class);
+        NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class);
         updateById(entity);
     }
 
@@ -133,10 +133,10 @@ public class NoticeReafdRecordServiceImpl extends BaseServiceImpl<NoticeReafdRec
         String leaderId = noticeDao.selectNoticeGroupLeader(formDTO.getNoticeId());
 
         //1.根据通知Id查询组成员已读未读数据
-        List<NoticeReafdRecordDTO> list = baseDao.getByNoticeId(formDTO.getNoticeId());
+        List<NoticeReadRecordDTO> list = baseDao.getByNoticeId(formDTO.getNoticeId());
 
         //2.调用user服务，查询人员基础数据
-        List<String> userIdList = list.stream().map(NoticeReafdRecordDTO::getUserId).collect(Collectors.toList());
+        List<String> userIdList = list.stream().map(NoticeReadRecordDTO::getUserId).collect(Collectors.toList());
         Result<List<UserBaseInfoResultDTO>> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList);
         if (!result.success()){
             throw new RenException("调用user服务，获取用户基础数据失败");
@@ -185,14 +185,14 @@ public class NoticeReafdRecordServiceImpl extends BaseServiceImpl<NoticeReafdRec
     @Transactional(rollbackFor = Exception.class)
     public void readType(TokenDto tokenDto, ReadTypeFormDTO formDTO) {
         //1.根据通知Id和当前用户查询是否存在通知阅读记录
-        NoticeReafdRecordEntity entity = baseDao.selectByNoticeId(formDTO.getNoticeId(), tokenDto.getUserId());
+        NoticeReadRecordEntity entity = baseDao.selectByNoticeId(formDTO.getNoticeId(), tokenDto.getUserId());
 
         //2.不存在记录时新增已读记录
         if (null == entity || StringUtils.isEmpty(entity.getId())) {
             //查询通知详情
             NoticeEntity notice = noticeDao.selectById(formDTO.getNoticeId());
             //新增当前人员已读数据
-            NoticeReafdRecordEntity reafdRecord = new NoticeReafdRecordEntity();
+            NoticeReadRecordEntity reafdRecord = new NoticeReadRecordEntity();
             reafdRecord.setCustomerId(notice.getCustomerId());
             reafdRecord.setGridId(notice.getGridId());
             reafdRecord.setGroupId(notice.getGroupId());

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/NoticeServiceImpl.java

@@ -49,18 +49,17 @@ import com.epmet.modules.group.entity.ResiGroupEntity;
 import com.epmet.modules.member.dao.ResiGroupMemberDao;
 import com.epmet.modules.notice.dao.NoticeAttachmentDao;
 import com.epmet.modules.notice.dao.NoticeDao;
-import com.epmet.modules.notice.dao.NoticeReafdRecordDao;
+import com.epmet.modules.notice.dao.NoticeReadRecordDao;
 import com.epmet.modules.notice.entity.NoticeAttachmentEntity;
 import com.epmet.modules.notice.entity.NoticeEntity;
-import com.epmet.modules.notice.entity.NoticeReafdRecordEntity;
+import com.epmet.modules.notice.entity.NoticeReadRecordEntity;
 import com.epmet.modules.notice.redis.NoticeRedis;
 import com.epmet.modules.notice.service.NoticeAttachmentService;
-import com.epmet.modules.notice.service.NoticeReafdRecordService;
+import com.epmet.modules.notice.service.NoticeReadRecordService;
 import com.epmet.modules.notice.service.NoticeService;
 import com.epmet.resi.group.constant.TopicConstant;
 import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
 import com.epmet.resi.group.dto.notice.NoticeDTO;
-import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO;
 import com.epmet.resi.group.dto.notice.form.AddNoticeFormDTO;
 import com.epmet.resi.group.dto.notice.form.EditNoticeFormDTO;
 import com.epmet.resi.group.dto.notice.form.NoticeDetailFormDTO;
@@ -110,9 +109,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
     @Autowired
     private NoticeAttachmentDao noticeAttachmentDao;
     @Autowired
-    private NoticeReafdRecordService noticeReafdRecordService;
+    private NoticeReadRecordService noticeReafdRecordService;
     @Autowired
-    private NoticeReafdRecordDao noticeReafdRecordDao;
+    private NoticeReadRecordDao noticeReafdRecordDao;
 
 
     @Override
@@ -273,9 +272,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
         }
 
         //6.通知已读未读表初始数据
-        List<NoticeReafdRecordEntity> reafdRecordList = new ArrayList<>();
+        List<NoticeReadRecordEntity> reafdRecordList = new ArrayList<>();
         memberList.forEach(m -> {
-            NoticeReafdRecordEntity reafdRecord = new NoticeReafdRecordEntity();
+            NoticeReadRecordEntity reafdRecord = new NoticeReadRecordEntity();
             reafdRecord.setCustomerId(resultDTO.getCustomerId());
             reafdRecord.setGridId(groupEntity.getGridId());
             reafdRecord.setGroupId(formDTO.getGroupId());
@@ -394,9 +393,9 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeDao, NoticeEntity>
 
         //6.通知已读未读消息表数据先删后增
         noticeReafdRecordDao.delByNoticeId(formDTO.getNoticeId());
-        List<NoticeReafdRecordEntity> reafdRecordList = new ArrayList<>();
+        List<NoticeReadRecordEntity> reafdRecordList = new ArrayList<>();
         memberList.forEach(m -> {
-            NoticeReafdRecordEntity reafdRecord = new NoticeReafdRecordEntity();
+            NoticeReadRecordEntity reafdRecord = new NoticeReadRecordEntity();
             reafdRecord.setCustomerId(entity.getCustomerId());
             reafdRecord.setGridId(entity.getGridId());
             reafdRecord.setGroupId(entity.getGroupId());

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupSetupDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.ResiGroupSetupDao">
+
+
+</mapper>

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReafdRecordDao.xml → epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReadRecordDao.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.epmet.modules.notice.dao.NoticeReafdRecordDao">
+<mapper namespace="com.epmet.modules.notice.dao.NoticeReadRecordDao">
 
-    <select id="getByNoticeId" resultType="com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO">
+    <select id="getByNoticeId" resultType="com.epmet.resi.group.dto.notice.NoticeReadRecordDTO">
         SELECT
             *
         FROM
@@ -13,7 +13,7 @@
         AND notice_id = #{noticeId}
     </select>
 
-    <select id="selectByNoticeId" resultType="com.epmet.modules.notice.entity.NoticeReafdRecordEntity">
+    <select id="selectByNoticeId" resultType="com.epmet.modules.notice.entity.NoticeReadRecordEntity">
         SELECT
             *
         FROM