From 4b8096b76392d5203913f55411a9719f3dc9c1e9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 20 Apr 2021 17:30:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=BA=E7=BB=84=E8=AE=BE=E7=BD=AE=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/dto/group/ResiGroupSetupDTO.java | 101 ++++++++++++++++++ ...ecordDTO.java => NoticeReadRecordDTO.java} | 2 +- .../controller/ResiGroupSetupController.java | 40 +++++++ .../modules/group/dao/ResiGroupSetupDao.java | 33 ++++++ .../group/entity/ResiGroupSetupEntity.java | 71 ++++++++++++ .../group/redis/ResiGroupSetupRedis.java | 47 ++++++++ .../group/service/ResiGroupSetupService.java | 31 ++++++ .../impl/ResiGroupSetupServiceImpl.java | 40 +++++++ .../impl/InvitationRecordServiceImpl.java | 1 - ...r.java => NoticeReadRecordController.java} | 30 +++--- ...ecordDao.java => NoticeReadRecordDao.java} | 10 +- ...ntity.java => NoticeReadRecordEntity.java} | 2 +- ...dExcel.java => NoticeReadRecordExcel.java} | 2 +- ...dRedis.java => NoticeReadRecordRedis.java} | 2 +- ...vice.java => NoticeReadRecordService.java} | 16 +-- ....java => NoticeReadRecordServiceImpl.java} | 52 ++++----- .../service/impl/NoticeServiceImpl.java | 19 ++-- .../mapper/group/ResiGroupSetupDao.xml | 7 ++ ...dRecordDao.xml => NoticeReadRecordDao.xml} | 6 +- 19 files changed, 440 insertions(+), 72 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java rename epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/{NoticeReafdRecordDTO.java => NoticeReadRecordDTO.java} (96%) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupSetupController.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupSetupDao.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupSetupRedis.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupSetupService.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/{NoticeReafdRecordController.java => NoticeReadRecordController.java} (79%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/{NoticeReafdRecordDao.java => NoticeReadRecordDao.java} (78%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/{NoticeReafdRecordEntity.java => NoticeReadRecordEntity.java} (96%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/{NoticeReafdRecordExcel.java => NoticeReadRecordExcel.java} (97%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/{NoticeReafdRecordRedis.java => NoticeReadRecordRedis.java} (96%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/{NoticeReafdRecordService.java => NoticeReadRecordService.java} (84%) rename epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/impl/{NoticeReafdRecordServiceImpl.java => NoticeReadRecordServiceImpl.java} (77%) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupSetupDao.xml rename epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/{NoticeReafdRecordDao.xml => NoticeReadRecordDao.xml} (83%) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupSetupDTO.java new file mode 100644 index 0000000000..9cad3f3f9a --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReafdRecordDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java similarity index 96% rename from epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReafdRecordDTO.java rename to epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReadRecordDTO.java index 8574f2deb2..a93531c096 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/NoticeReafdRecordDTO.java +++ b/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; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupSetupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupSetupController.java new file mode 100644 index 0000000000..6f21b623e3 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupSetupDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupSetupDao.java new file mode 100644 index 0000000000..1efca98aa2 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 { + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupSetupEntity.java new file mode 100644 index 0000000000..77727f9fa3 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupSetupRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/redis/ResiGroupSetupRedis.java new file mode 100644 index 0000000000..fac89893ba --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + } + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupSetupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupSetupService.java new file mode 100644 index 0000000000..180466d9ea --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 { + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupSetupServiceImpl.java new file mode 100644 index 0000000000..79ca65f419 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 implements ResiGroupSetupService { + + @Autowired + private ResiGroupSetupRedis resiGroupSetupRedis; + +} \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java index f8a24b172d..2a7648e63d 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/InvitationRecordServiceImpl.java +++ b/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; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReafdRecordController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java similarity index 79% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReafdRecordController.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReadRecordController.java index d9881363e3..dd865bfdf8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/controller/NoticeReafdRecordController.java +++ b/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.service.NoticeReafdRecordService; -import com.epmet.resi.group.dto.notice.NoticeReafdRecordDTO; +import com.epmet.modules.notice.excel.NoticeReadRecordExcel; +import com.epmet.modules.notice.service.NoticeReadRecordService; +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> page(@RequestParam Map params){ - PageData page = noticeReafdRecordService.page(params); - return new Result>().ok(page); + public Result> page(@RequestParam Map params){ + PageData page = noticeReafdRecordService.page(params); + return new Result>().ok(page); } @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - NoticeReafdRecordDTO data = noticeReafdRecordService.get(id); - return new Result().ok(data); + public Result get(@PathVariable("id") String id){ + NoticeReadRecordDTO data = noticeReafdRecordService.get(id); + return new Result().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 params, HttpServletResponse response) throws Exception { - List list = noticeReafdRecordService.list(params); - ExcelUtils.exportExcelToTarget(response, null, list, NoticeReafdRecordExcel.class); + List list = noticeReafdRecordService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, NoticeReadRecordExcel.class); } /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReafdRecordDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReadRecordDao.java similarity index 78% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReafdRecordDao.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReadRecordDao.java index 8bf123949f..2375b63db6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/dao/NoticeReafdRecordDao.java +++ b/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.resi.group.dto.notice.NoticeReafdRecordDTO; +import com.epmet.modules.notice.entity.NoticeReadRecordEntity; +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 { +public interface NoticeReadRecordDao extends BaseDao { /** * @Author sun @@ -44,11 +44,11 @@ public interface NoticeReafdRecordDao extends BaseDao { * @Author sun * @Description 根据通知Id查询组成员已读未读数据 **/ - List getByNoticeId(@Param("noticeId") String noticeId); + List 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); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReafdRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java similarity index 96% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReafdRecordEntity.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReadRecordEntity.java index e9a63804a1..0f1498b243 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/entity/NoticeReafdRecordEntity.java +++ b/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; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReafdRecordExcel.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReadRecordExcel.java similarity index 97% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReafdRecordExcel.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReadRecordExcel.java index 8f005770cd..3f58dbdef8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/excel/NoticeReafdRecordExcel.java +++ b/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; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReafdRecordRedis.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReadRecordRedis.java similarity index 96% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReafdRecordRedis.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReadRecordRedis.java index dc20469216..c45eff7e15 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/redis/NoticeReafdRecordRedis.java +++ b/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; diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReafdRecordService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java similarity index 84% rename from epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReafdRecordService.java rename to epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReadRecordService.java index 77e2ca9419..f4d048055f 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/notice/service/NoticeReafdRecordService.java +++ b/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.resi.group.dto.notice.NoticeReafdRecordDTO; +import com.epmet.modules.notice.entity.NoticeReadRecordEntity; +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 { +public interface NoticeReadRecordService extends BaseService { /** * 默认分页 @@ -45,7 +45,7 @@ public interface NoticeReafdRecordService extends BaseService page(Map params); + PageData page(Map params); /** * 默认查询 @@ -55,7 +55,7 @@ public interface NoticeReafdRecordService extends BaseService list(Map params); + List list(Map params); /** * 单条查询 @@ -65,7 +65,7 @@ public interface NoticeReafdRecordService extends BaseService implements NoticeReafdRecordService { +public class NoticeReadRecordServiceImpl extends BaseServiceImpl implements NoticeReadRecordService { @Autowired - private NoticeReafdRecordRedis noticeReafdRecordRedis; + private NoticeReadRecordRedis noticeReafdRecordRedis; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Autowired private NoticeDao noticeDao; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, NoticeReafdRecordDTO.class); + return getPageData(page, NoticeReadRecordDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, NoticeReafdRecordDTO.class); + return ConvertUtils.sourceToTarget(entityList, NoticeReadRecordDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public NoticeReafdRecordDTO get(String id) { - NoticeReafdRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, NoticeReafdRecordDTO.class); + public NoticeReadRecordDTO get(String id) { + NoticeReadRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, NoticeReadRecordDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(NoticeReafdRecordDTO dto) { - NoticeReafdRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReafdRecordEntity.class); + public void save(NoticeReadRecordDTO dto) { + NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(NoticeReafdRecordDTO dto) { - NoticeReafdRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReafdRecordEntity.class); + public void update(NoticeReadRecordDTO dto) { + NoticeReadRecordEntity entity = ConvertUtils.sourceToTarget(dto, NoticeReadRecordEntity.class); updateById(entity); } @@ -133,10 +133,10 @@ public class NoticeReafdRecordServiceImpl extends BaseServiceImpl list = baseDao.getByNoticeId(formDTO.getNoticeId()); + List list = baseDao.getByNoticeId(formDTO.getNoticeId()); //2.调用user服务，查询人员基础数据 - List userIdList = list.stream().map(NoticeReafdRecordDTO::getUserId).collect(Collectors.toList()); + List userIdList = list.stream().map(NoticeReadRecordDTO::getUserId).collect(Collectors.toList()); Result> result = epmetUserOpenFeignClient.queryUserBaseInfo(userIdList); if (!result.success()){ throw new RenException("调用user服务，获取用户基础数据失败"); @@ -185,14 +185,14 @@ public class NoticeReafdRecordServiceImpl extends BaseServiceImpl @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 } //6.通知已读未读表初始数据 - List reafdRecordList = new ArrayList<>(); + List 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 //6.通知已读未读消息表数据先删后增 noticeReafdRecordDao.delByNoticeId(formDTO.getNoticeId()); - List reafdRecordList = new ArrayList<>(); + List 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()); diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupSetupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupSetupDao.xml new file mode 100644 index 0000000000..0c883e6bff --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupSetupDao.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReafdRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReadRecordDao.xml similarity index 83% rename from epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReafdRecordDao.xml rename to epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReadRecordDao.xml index 935db4d0a8..74b99c2e1b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReafdRecordDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/notice/NoticeReadRecordDao.xml @@ -1,9 +1,9 @@ - + - SELECT * FROM @@ -13,7 +13,7 @@ AND notice_id = #{noticeId} - SELECT * FROM