From 79bf1d42db7e9ea3d558f55149c5e2f6861cd70b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 18 Aug 2022 16:20:44 +0800 Subject: [PATCH 001/206] =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/IcPartyActDTO.java | 180 ++++++++++++++++++ .../partymember/dto/IcPartyActOrgDTO.java | 84 ++++++++ .../dto/IcPartyActSignInRecordDTO.java | 94 +++++++++ .../resi/partymember/dto/IcScheduleDTO.java | 99 ++++++++++ .../controller/IcPartyActController.java | 70 +++++++ .../controller/IcPartyActOrgController.java | 70 +++++++ .../IcPartyActSignInRecordController.java | 70 +++++++ .../controller/IcScheduleController.java | 70 +++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 16 ++ .../partyOrg/dao/IcPartyActOrgDao.java | 16 ++ .../dao/IcPartyActSignInRecordDao.java | 16 ++ .../modules/partyOrg/dao/IcScheduleDao.java | 16 ++ .../partyOrg/entity/IcPartyActEntity.java | 149 +++++++++++++++ .../partyOrg/entity/IcPartyActOrgEntity.java | 54 ++++++ .../entity/IcPartyActSignInRecordEntity.java | 64 +++++++ .../partyOrg/entity/IcScheduleEntity.java | 69 +++++++ .../service/IcPartyActOrgService.java | 78 ++++++++ .../partyOrg/service/IcPartyActService.java | 78 ++++++++ .../IcPartyActSignInRecordService.java | 78 ++++++++ .../partyOrg/service/IcScheduleService.java | 78 ++++++++ .../impl/IcPartyActOrgServiceImpl.java | 82 ++++++++ .../service/impl/IcPartyActServiceImpl.java | 82 ++++++++ .../IcPartyActSignInRecordServiceImpl.java | 82 ++++++++ .../service/impl/IcScheduleServiceImpl.java | 82 ++++++++ .../mapper/partyOrg/IcPartyActDao.xml | 6 + .../mapper/partyOrg/IcPartyActOrgDao.xml | 6 + .../partyOrg/IcPartyActSignInRecordDao.xml | 6 + .../mapper/partyOrg/IcScheduleDao.xml | 6 + 28 files changed, 1801 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java new file mode 100644 index 0000000000..bc0c26dda9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java @@ -0,0 +1,180 @@ +package com.epmet.resi.partymember.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 参加活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + + /** + * 自动发布时间，保存时算好时间存在这里 + */ + private Date autoPublicTime; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublic; + + /** + * 活动发布人 + */ + private String publishStaffId; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + + /** + * 0未删除；1：已删除 + */ + private Integer 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-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java new file mode 100644 index 0000000000..0bfc7c123b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActOrgDTO.java @@ -0,0 +1,84 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActOrgDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参加活动党组织ID,groupId + */ + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String joinOrgPath; + + /** + * 0：未删除；1：已删除 + */ + private Integer 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-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java new file mode 100644 index 0000000000..8800ba1170 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActSignInRecordDTO.java @@ -0,0 +1,94 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcPartyActSignInRecordDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 签到用户id + */ + private String epmetUserId; + + /** + * 签到用户姓名 + */ + private String userRealName; + + /** + * 签到地点 + */ + private String address; + + /** + * 签到地点纬度 + */ + private String latitude; + + /** + * 签到地点经度 + */ + private String longitude; + + /** + * 0：未删除；1：已删除 + */ + private Integer 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-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java new file mode 100644 index 0000000000..bf27e821bd --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcScheduleDTO.java @@ -0,0 +1,99 @@ +package com.epmet.resi.partymember.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcScheduleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属行政组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; + + /** + * 0：未删除；1已删除 + */ + private Integer 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-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java new file mode 100644 index 0000000000..edf1438c73 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.IcPartyActDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyAct") +public class IcPartyActController { + + @Autowired + private IcPartyActService icPartyActService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActDTO data = icPartyActService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java new file mode 100644 index 0000000000..19fb1ea357 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.partyOrg.service.IcPartyActOrgService; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyActOrg") +public class IcPartyActOrgController { + + @Autowired + private IcPartyActOrgService icPartyActOrgService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActOrgService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActOrgDTO data = icPartyActOrgService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActOrgService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActOrgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActOrgService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActOrgService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java new file mode 100644 index 0000000000..bb4ad0acf5 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icPartyActSignInRecord") +public class IcPartyActSignInRecordController { + + @Autowired + private IcPartyActSignInRecordService icPartyActSignInRecordService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icPartyActSignInRecordService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcPartyActSignInRecordDTO data = icPartyActSignInRecordService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcPartyActSignInRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icPartyActSignInRecordService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcPartyActSignInRecordDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icPartyActSignInRecordService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icPartyActSignInRecordService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java new file mode 100644 index 0000000000..d3c28d2840 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -0,0 +1,70 @@ +package com.epmet.modules.partyOrg.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@RestController +@RequestMapping("icSchedule") +public class IcScheduleController { + + @Autowired + private IcScheduleService icScheduleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icScheduleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcScheduleDTO data = icScheduleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcScheduleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icScheduleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcScheduleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icScheduleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icScheduleService.delete(ids); + return new Result(); + } + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java new file mode 100644 index 0000000000..a1cfd4224e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java new file mode 100644 index 0000000000..97cd8d2e9e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActOrgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java new file mode 100644 index 0000000000..fe8308ca62 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcPartyActSignInRecordDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java new file mode 100644 index 0000000000..4abde59690 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Mapper +public interface IcScheduleDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java new file mode 100644 index 0000000000..ee8fe199f2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -0,0 +1,149 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act") +public class IcPartyActEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 参加活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + + /** + * 自动发布时间，保存时算好时间存在这里 + */ + private Date autoPublicTime; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublic; + + /** + * 活动发布人 + */ + private String publishStaffId; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java new file mode 100644 index 0000000000..c87e466c3a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -0,0 +1,54 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_org") +public class IcPartyActOrgEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; + + /** + * 参加活动党组织ID,groupId + */ + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String joinOrgPath; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java new file mode 100644 index 0000000000..52b44ffaf6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActSignInRecordEntity.java @@ -0,0 +1,64 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_sign_in_record") +public class IcPartyActSignInRecordEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 活动id + */ + private String icPartyActId; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 签到用户id + */ + private String epmetUserId; + + /** + * 签到用户姓名 + */ + private String userRealName; + + /** + * 签到地点 + */ + private String address; + + /** + * 签到地点纬度 + */ + private String latitude; + + /** + * 签到地点经度 + */ + private String longitude; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java new file mode 100644 index 0000000000..9fe4024d82 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcScheduleEntity.java @@ -0,0 +1,69 @@ +package com.epmet.modules.partyOrg.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 2022-08-18 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_schedule") +public class IcScheduleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 所属行政组织ID：当前工作人员所属组织id + */ + private String orgId; + + /** + * 组织ID的上级；如果org_id是根组织，那此列=0 + */ + private String pid; + + /** + * ORG_ID全路径，包含自身 + */ + private String orgIdPath; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java new file mode 100644 index 0000000000..24dfde82b4 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; + +import java.util.List; +import java.util.Map; + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActOrgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActOrgDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActOrgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActOrgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActOrgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java new file mode 100644 index 0000000000..6623b7f63f --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.IcPartyActDTO; + +import java.util.List; +import java.util.Map; + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java new file mode 100644 index 0000000000..ea54cd04e9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; + +import java.util.List; +import java.util.Map; + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcPartyActSignInRecordService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcPartyActSignInRecordDTO + * @author generator + * @date 2022-08-18 + */ + IcPartyActSignInRecordDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcPartyActSignInRecordDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcPartyActSignInRecordDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java new file mode 100644 index 0000000000..a00d29f11e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -0,0 +1,78 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcScheduleDTO; + +import java.util.List; +import java.util.Map; + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +public interface IcScheduleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-18 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-18 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcScheduleDTO + * @author generator + * @date 2022-08-18 + */ + IcScheduleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void save(IcScheduleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-18 + */ + void update(IcScheduleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-18 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java new file mode 100644 index 0000000000..0339c1dc77 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; +import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 参加活动党组织表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Service +public class IcPartyActOrgServiceImpl extends BaseServiceImpl implements IcPartyActOrgService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActOrgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActOrgDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcPartyActOrgDTO get(String id) { + IcPartyActOrgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActOrgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActOrgDTO dto) { + IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActOrgDTO dto) { + IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java new file mode 100644 index 0000000000..0618ede967 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.IcPartyActDTO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 党建组织活动 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Service +public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcPartyActDTO get(String id) { + IcPartyActEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActDTO dto) { + IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActDTO dto) { + IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java new file mode 100644 index 0000000000..fcedaa63ad --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; +import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 党组织活动签到记录表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Service +public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcPartyActSignInRecordDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcPartyActSignInRecordDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcPartyActSignInRecordDTO get(String id) { + IcPartyActSignInRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcPartyActSignInRecordDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcPartyActSignInRecordDTO dto) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActSignInRecordEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcPartyActSignInRecordDTO dto) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActSignInRecordEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java new file mode 100644 index 0000000000..0702302c40 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Service +public class IcScheduleServiceImpl extends BaseServiceImpl implements IcScheduleService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcScheduleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcScheduleDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcScheduleDTO get(String id) { + IcScheduleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcScheduleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcScheduleDTO dto) { + IcScheduleEntity entity = ConvertUtils.sourceToTarget(dto, IcScheduleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcScheduleDTO dto) { + IcScheduleEntity entity = ConvertUtils.sourceToTarget(dto, IcScheduleEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml new file mode 100644 index 0000000000..bc27e12d31 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml new file mode 100644 index 0000000000..f84e9ae594 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml new file mode 100644 index 0000000000..559157a57e --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml new file mode 100644 index 0000000000..01fb53be92 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 1f545cd332ae2d60e7b3ac592fbe06d578fd2410 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 16 Aug 2022 15:18:47 +0800 Subject: [PATCH 002/206] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/ResiGroupDTO.java | 6 ++ .../group/form/ApplyCreateGroupFormDTO.java | 6 ++ .../dto/group/form/EditGroupFormDTO.java | 1 + .../result/ApplyingGroupDetailResult2DTO.java | 1 + .../result/ApplyingGroupDetailResultDTO.java | 2 + .../result/GroupEditionDetailResultDTO.java | 1 + .../group/feign/ResiGroupOpenFeignClient.java | 13 +++ .../ResiGroupOpenFeignClientFallback.java | 7 ++ .../group/controller/ResiGroupController.java | 17 ++- .../entity/GroupEditSubmitRecordEntity.java | 6 ++ .../modules/group/entity/ResiGroupEntity.java | 6 ++ .../group/service/ResiGroupService.java | 12 ++- .../service/impl/ResiGroupServiceImpl.java | 102 +++++++++++++++++- .../mapper/group/GroupEditSubmitRecordDao.xml | 1 + .../resources/mapper/group/ResiGroupDao.xml | 1 + .../feign/ResiPartyMemberOpenFeignClient.java | 15 ++- ...esiPartyMemberOpenFeignClientFallback.java | 17 ++- .../resi-partymember-server/pom.xml | 6 ++ .../controller/IcPartyOrgController.java | 18 ++++ .../partyOrg/service/IcPartyOrgService.java | 12 ++- .../service/impl/IcPartyOrgServiceImpl.java | 70 +++++++++++- 21 files changed, 303 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java index 7994bf7d8d..d409b089b6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/ResiGroupDTO.java @@ -66,6 +66,12 @@ public class ResiGroupDTO implements Serializable { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 状态：（审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed） Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审核未通过” diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java index bdfd703f91..404fc0d7e6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/ApplyCreateGroupFormDTO.java @@ -17,6 +17,8 @@ public class ApplyCreateGroupFormDTO implements Serializable { private static final long serialVersionUID = 1570620480398949075L; public interface AddUserInternalGroup { } + public interface AddPartyOrgGroup { + } /** * 添加用户操作的用户可见异常分组 * 该分组用于校验需要返回给前端错误信息提示的列，需要继承CustomerClientShowGroup @@ -69,6 +71,10 @@ public class ApplyCreateGroupFormDTO implements Serializable { @NotBlank(message = "app不能为空",groups ={AddUserInternalGroup.class}) private String app; + @NotBlank(message = "所属党组织不能为空",groups ={AddPartyOrgGroup.class}) + private String partyOrgId; + private String partyOrgPids; + /** * 小组是否允许参观:允许：open;不允许：closed */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java index ed56de167a..ccf51fe58c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/EditGroupFormDTO.java @@ -35,5 +35,6 @@ public class EditGroupFormDTO { @NotBlank(message = "组介绍不能为空", groups = { SubmitGroupEditVG.class }) @Length(max = 500, message = "组介绍长度不能超过500个字", groups = { SubmitGroupEditVG.class }) private String groupIntroduction; + private String partyOrgId; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java index bb48e14b91..d3d1e38ddf 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResult2DTO.java @@ -67,5 +67,6 @@ public class ApplyingGroupDetailResult2DTO implements Serializable { * 未读已读标识 unread read * */ private String readFlag; + private String partyOrgName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java index 205d2d433c..c528e049d6 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/ApplyingGroupDetailResultDTO.java @@ -77,4 +77,6 @@ public class ApplyingGroupDetailResultDTO implements Serializable { * */ private String operationId; + private String partyOrgId; + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java index 0cf88d6802..08e2bb91ee 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupEditionDetailResultDTO.java @@ -39,4 +39,5 @@ public class GroupEditionDetailResultDTO implements Serializable { * 群主的昵称 xx路-xx先生/女士 */ private String groupLeaderName; + private String partyOrgName; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index 6f0ae98c44..6a0c43f14c 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -13,12 +13,14 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.feign.fallback.ResiGroupOpenFeignClientFallbackFactory; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -320,4 +322,15 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("/resi/group/group/list-groups-by-member") Result> listGroupsByMember(@RequestBody GroupsByMemberFormDTO formDTO); + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @Param + * @Return {@link Result>>} + * @Author zhaoqifeng + * @Date 2022/8/16 14:04 + */ + @PostMapping("/resi/group/group/getBranchGroupList") + Result>> getBranchGroupList(); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 9e228b2dce..98cddc7d9b 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -13,9 +13,11 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO; import com.epmet.resi.group.dto.topic.result.*; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.HashMap; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -234,4 +236,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result> listGroupsByMember(GroupsByMemberFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "listGroupsByMember", formDTO); } + + @Override + public Result>> getBranchGroupList() { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getBranchGroupList", null); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index e374a32136..5e60d0f535 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -34,12 +34,14 @@ import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.form.ResiIdentityFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; import com.epmet.resi.group.enums.SearchScopeTypeEnum; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import java.util.HashMap; import java.util.List; +import java.util.Map; /** @@ -399,7 +401,7 @@ public class ResiGroupController { @PostMapping("submit-edit") public Result submitGroupEdit(@RequestBody EditGroupFormDTO form, @LoginUser TokenDto tokenDto){ ValidatorUtils.validateEntity(form, EditGroupFormDTO.SubmitGroupEditVG.class); - resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId()); + resiGroupService.submitGroupEdit(form.getGroupId(), form.getGroupName(), form.getGroupHeadPhoto(), form.getGroupIntroduction(), tokenDto.getUserId(), form.getPartyOrgId()); return new Result(); } @@ -649,4 +651,17 @@ public class ResiGroupController { List groups = resiGroupService.listGroupsByMember(userId, gridId); return new Result>().ok(groups); } + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @Param tokenDto + * @Return {@link Result< Map< String, List< IcPartyOrgTreeDTO>>>} + * @Author zhaoqifeng + * @Date 2022/8/16 14:02 + */ + @PostMapping("getBranchGroupList") + public Result>> getBranchGroupList(@LoginUser TokenDto tokenDto) { + return new Result>>().ok(resiGroupService.getBranchGroupList(tokenDto.getCustomerId())); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java index a40c7b2d1f..ba6f29f424 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/GroupEditSubmitRecordEntity.java @@ -52,6 +52,12 @@ public class GroupEditSubmitRecordEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 头像 */ diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java index da522bfcab..cc35c91b5b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java @@ -62,6 +62,12 @@ public class ResiGroupEntity extends BaseEpmetEntity { */ private String gridId; + /** + * 所属党组织 + */ + private String partyOrgId; + private String partyOrgPids; + /** * 状态：（审核通过 - approved 、 审核中 - under_auditting、 审核未通过 - rejected 、 已屏蔽 - hidden、 已关闭 - closed） Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审核未通过” diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index 3aaab6e4d4..d3176758d5 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -30,6 +30,7 @@ import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.HashMap; import java.util.List; @@ -310,7 +311,7 @@ public interface ResiGroupService extends BaseService { GroupDetailResultDTO getGroupDetail(String groupId); - void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId); + void submitGroupEdit(String groupId, String groupName, String groupHeadPhoto, String groupIntroduction, String editUserId, String partyOrgId); /** * @Description 工作端 查询组变更待审核列表 @@ -471,4 +472,13 @@ public interface ResiGroupService extends BaseService { * @date 2021.09.08 13:59:31 */ List listGroupsByMember(String memberUserId, String gridId); + + /** + * 获取客户下支部小组，根据所属党组织分组 + * @Param customerId + * @Return {@link Map< String, List>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:49 + */ + Map> getBranchGroupList(String customerId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 3bb3a435d7..1406f89ddf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.rocketmq.messages.GroupAchievementMQMsg; import com.epmet.commons.tools.constant.*; import com.epmet.commons.tools.enums.AchievementTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; @@ -83,6 +84,9 @@ import com.epmet.resi.group.dto.member.form.EditAuditSwitchFormDTO; import com.epmet.resi.group.dto.member.result.AchievementResultDTO; import com.epmet.resi.group.dto.member.result.GroupAchievementDTO; import com.epmet.resi.group.enums.SearchScopeTypeEnum; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; @@ -97,6 +101,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.support.TransactionSynchronizationAdapter; import org.springframework.transaction.support.TransactionSynchronizationManager; +import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; @@ -120,7 +125,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl page(Map params) { @@ -457,6 +464,19 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(applyCreateGroupFormDTO.getPartyOrgId())) { + applyCreateGroupFormDTO.setPartyOrgPids(partyOrgResult.getData().get(applyCreateGroupFormDTO.getPartyOrgId()).getOrgPids().concat(StrConstant.COLON).concat(applyCreateGroupFormDTO.getPartyOrgId())); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选党组织不存在", "所选党组织不存在"); + } + } + String roleName = ""; if(NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag())){ roleName = ModuleConstant.PARTYMEMBER; @@ -586,6 +606,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl().ok(ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class)); + ApplyingGroupDetailResult2DTO result = ConvertUtils.sourceToTarget(detail, ApplyingGroupDetailResult2DTO.class); + + if (StringUtils.isNotBlank(detail.getPartyOrgId())) { + Result> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(detail.getPartyOrgId())) { + result.setPartyOrgName(partyOrgResult.getData().get(detail.getPartyOrgId()).getPartyOrgName()); + } + } + + + return new Result().ok(result); } @Override @@ -1486,7 +1521,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(partyOrgId)) { + partyOrgPids = partyOrgResult.getData().get(partyOrgId).getOrgPids().concat(StrConstant.COLON).concat(partyOrgId); + } else { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选党组织不存在", "所选党组织不存在"); + } + } // 3.内容检查 scanGroupEditContent(groupName, groupIntroduction, groupHeadPhoto); @@ -1537,6 +1584,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl> partyOrgResult = resiPartyMemberOpenFeignClient.getPartyOrgList(); + if (!partyOrgResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取党组织信息失败", "获取党组织信息失败"); + } + if (partyOrgResult.getData().containsKey(edit.getPartyOrgId())) { + result.setPartyOrgName(partyOrgResult.getData().get(edit.getPartyOrgId()).getPartyOrgName()); + } + } + return result; } @@ -1863,4 +1922,37 @@ public class ResiGroupServiceImpl extends BaseServiceImpl listGroupsByMember(String memberUserId, String gridId) { return baseDao.listGroupsByMember(memberUserId, gridId); } + + /** + * 获取客户下支部小组，根据所属党组织分组 + * + * @param customerId + * @Param customerId + * @Return {@link Map< String, List>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:49 + */ + @Override + public Map> getBranchGroupList(String customerId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ResiGroupEntity::getCustomerId, customerId); + wrapper.eq(ResiGroupEntity::getGroupType, ModuleConstant.GROUP_TYPE_BRANCH); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(entityList)) { + return Collections.emptyMap(); + } + List list = entityList.stream().filter(i -> StringUtils.isNotBlank(i.getPartyOrgId())).map(item -> { + IcPartyOrgTreeDTO dto = new IcPartyOrgTreeDTO(); + dto.setId(item.getId()); + dto.setOrgPids(item.getPartyOrgPids()); + dto.setPid(item.getPartyOrgId()); + dto.setPartyOrgType(ModuleConstant.GROUP_TYPE_BRANCH); + dto.setPartyOrgName(item.getGroupName()); + return dto; + }).collect(Collectors.toList()); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.groupingBy(IcPartyOrgTreeDTO::getPid)); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml index d282690dea..8a212fc7d0 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/GroupEditSubmitRecordDao.xml @@ -95,6 +95,7 @@ GROUP_NAME, GROUP_HEAD_PHOTO, GROUP_INTRODUCTION, + PARTY_ORG_ID, CREATED_BY, GRID_ID FROM diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index a9a11ac36f..b04c4aef48 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -354,6 +354,7 @@ gro.GROUP_NAME AS groupName, gro.GROUP_HEAD_PHOTO AS groupHeadPhoto, gro.GROUP_INTRODUCTION AS groupIntroduction, + gro.PARTY_ORG_ID AS partyOrgId, oper.READ_FLAG AS readFlag, oper.MESSAGE_TEXT AS messageText, oper.CREATED_TIME AS createdTime, diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 0098acd036..430c6acb90 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -1,11 +1,9 @@ package com.epmet.resi.partymember.feign; -import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -20,6 +18,7 @@ import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -135,4 +134,14 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/branchlist") public Result> branchlist(); + + /** + * 获取客户下支部列表 + * @Param tokenDto + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") + Result> getPartyOrgList(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 57ce87c1e4..2a82324fa0 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -2,10 +2,9 @@ package com.epmet.resi.partymember.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; @@ -17,6 +16,7 @@ import com.epmet.resi.partymember.dto.partymember.result.WarnAndPartyAuditResult import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import java.util.List; +import java.util.Map; /** * 本服务对外开放的API,其他服务通过引用此client调用该服务 @@ -101,4 +101,17 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> branchlist() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "branchlist", null); } + + /** + * 获取客户下支部列表 + * + * @Param tokenDto + * @Return {@link Result< Map>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @Override + public Result> getPartyOrgList() { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyOrgList", null); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index d03215171c..194ec74de1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -123,6 +123,12 @@ epmet-commons-rocketmq 2.0.0 + + com.epmet + resi-group-client + 2.0.0 + compile + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 499c2a1d70..e1af2d4515 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -110,6 +110,12 @@ public class IcPartyOrgController { return icPartyOrgService.getSearchTreelist(formDTO); } + @PostMapping("getOrgTreeHaveGroup") + public Result> getOrgTreeHaveGroup(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyOrgService.getOrgTreeHaveGroup(formDTO)); + } + /** * @describe: 当前登录用户所属行政组织，及下级的党组织（只限支部） * @author wangtong @@ -137,4 +143,16 @@ public class IcPartyOrgController { return icPartyOrgService.getParentOrgList(formDTO); } + /** + * 获取客户下支部列表 + * @Param tokenDto + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/8/15 16:00 + */ + @PostMapping("getPartyOrgList") + public Result> getPartyOrgList(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icPartyOrgService.getPartyOrgList(tokenDto)); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 6397916cc6..ea0c5615fd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -108,7 +108,7 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result> */ Result> getSearchTreelist(PartyOrgTreeListDTO formDTO); - + List getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO); /** * @describe: 上级党组织列表 * @author wangtong @@ -117,4 +117,14 @@ public interface IcPartyOrgService extends BaseService { * @return com.epmet.commons.tools.utils.Result> */ Result> getParentOrgList(GetParentOrgFormDTO formDTO); + + /** + * 获取客户下支部列表 + * + * @Param tokenDto + * @Return {@link Map} + * @Author zhaoqifeng + * @Date 2022/8/15 15:52 + */ + Map getPartyOrgList(TokenDto tokenDto); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 70cb443864..b25f89cccf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -1,9 +1,11 @@ package com.epmet.modules.partyOrg.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -23,6 +25,7 @@ import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; @@ -35,10 +38,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import java.util.ArrayList; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; +import javax.annotation.Resource; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 党组织表 @@ -54,6 +57,8 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl> getTreelist(PartyOrgTreeListDTO formDTO) { List list = baseDao.getTreelist(formDTO); + Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } + for (IcPartyOrgTreeDTO org : list) { + getChildren(org, groupResult.getData()); + } return new Result>().ok(build(list)); } + private void getChildren(IcPartyOrgTreeDTO dto, Map> map) { + if (NumConstant.FIVE_STR.equals(dto.getPartyOrgType())) { + if (map.containsKey(dto.getId())) { + dto.setChildren(map.get(dto.getId())); + } + } else { + for (IcPartyOrgTreeDTO org : dto.getChildren()) { + getChildren(org, map); + } + } + } + @Override public Result> branchlist(TokenDto tokenDto) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); @@ -244,6 +268,21 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(build(list)); } + @Override + public List getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO) { + List list = baseDao.getSearchTreelist(formDTO); + + Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } + for (IcPartyOrgTreeDTO org : list) { + getChildren(org, groupResult.getData()); + } + + return list; + } + @Override public Result> getParentOrgList(GetParentOrgFormDTO formDTO) { Result agencyDTOResult = govOrgOpenFeignClient.getAgencyById(formDTO.getAgencyId()); @@ -270,6 +309,29 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>().ok(list); } + /** + * 获取客户下支部列表 + * + * @param tokenDto + * @Param tokenDto + * @Return {@link Map} + * @Author zhaoqifeng + * @Date 2022/8/15 15:52 + */ + @Override + public Map getPartyOrgList(TokenDto tokenDto) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + List result = ConvertUtils.sourceToTarget(list, IcPartyOrgDTO.class); + + return result.stream().collect(Collectors.toMap(IcPartyOrgDTO::getId, Function.identity())); + } + /** * 构建树节点 */ From d4597d483d8109e863a2492e6edd9ed9df4608da Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 16 Aug 2022 17:39:03 +0800 Subject: [PATCH 003/206] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index b25f89cccf..6ff7041421 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -236,6 +236,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl { + item.setAgencyId(dto.getAgencyId()); + item.setAgencyPids(dto.getAgencyPids()); + }); } } else { for (IcPartyOrgTreeDTO org : dto.getChildren()) { From 3b04c371db6676519be4f41eb23040763d714ca6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 17 Aug 2022 09:45:34 +0800 Subject: [PATCH 004/206] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E4=B8=8E=E5=85=9A=E7=BB=84=E7=BB=87=E7=BB=91=E5=AE=9A=20sql?= =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.26__add_party_org_.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql new file mode 100644 index 0000000000..1747c6c553 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.26__add_party_org_.sql @@ -0,0 +1,8 @@ +ALTER TABLE `epmet_resi_group`.`resi_group` + ADD COLUMN `PARTY_ORG_ID` varchar(64) NULL COMMENT '党支部ID' AFTER `CUSTOMER_ID`, + ADD COLUMN `PARTY_ORG_PIDS` varchar(255) NULL COMMENT '党支部的所有上级ID' AFTER `PARTY_ORG_ID`; + + +ALTER TABLE `epmet_resi_group`.`group_edit_submit_record` + ADD COLUMN `PARTY_ORG_ID` varchar(64) NULL COMMENT '党支部ID' AFTER `GRID_ID`, + ADD COLUMN `PARTY_ORG_PIDS` varchar(255) NULL COMMENT '党支部的所有上级ID' AFTER `PARTY_ORG_ID`; \ No newline at end of file From ead78b6619c5af679b0e8f0e3841e0adb8e5bc8c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 18 Aug 2022 16:37:19 +0800 Subject: [PATCH 005/206] =?UTF-8?q?=E6=94=AF=E9=83=A8=E5=B0=8F=E7=BB=84?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/service/impl/ResiGroupServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 1406f89ddf..939eb61d39 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1946,7 +1946,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Thu, 18 Aug 2022 17:20:58 +0800 Subject: [PATCH 006/206] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/AddOrEditScheduleFormDTO.java | 48 ++++++++++++++++++ .../controller/IcPartyActController.java | 3 ++ .../controller/IcScheduleController.java | 32 ++++++++++++ .../modules/partyOrg/dao/IcScheduleDao.java | 5 +- .../partyOrg/service/IcScheduleService.java | 17 +++++++ .../service/impl/IcScheduleServiceImpl.java | 49 +++++++++++++++++++ .../mapper/partyOrg/IcScheduleDao.xml | 11 +++++ 7 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java new file mode 100644 index 0000000000..5daa0a7aca --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/AddOrEditScheduleFormDTO.java @@ -0,0 +1,48 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/8/18 16:23 + * @DESC + */ +@Data +public class AddOrEditScheduleFormDTO implements Serializable { + + private static final long serialVersionUID = 6290505458783549828L; + + public interface AddScheduleForm{} + + private String scheduleId; + private String staffId; + private String customerId; + + /** + * 日程标题（35字） + */ + @NotBlank(message = "title不能为空",groups = AddScheduleForm.class) + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + @NotNull(message = "remindTime不能为空",groups = AddScheduleForm.class) + private Date remindTime; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + @NotBlank(message = "isPublic不能为空",groups = AddScheduleForm.class) + private String isPublic; + + /** + * 备注（500字） + */ + private String remark; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index edf1438c73..6b94eaf18f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -66,5 +66,8 @@ public class IcPartyActController { icPartyActService.delete(ids); return new Result(); } + +// @PostMapping("homeMonthTotal") +// public Result } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index d3c28d2840..edae364122 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,7 +1,9 @@ package com.epmet.modules.partyOrg.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -10,9 +12,11 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -66,5 +70,33 @@ public class IcScheduleController { icScheduleService.delete(ids); return new Result(); } + + /** + * Desc: 新增或编辑日程 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + @PostMapping("addOrEdit") + public Result addOrEditSchedule(@LoginUser TokenDto tokenDto,@RequestBody AddOrEditScheduleFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddOrEditScheduleFormDTO.AddScheduleForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + icScheduleService.addOrEditSchedule(formDTO); + return new Result(); + } + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + @PostMapping("del") + public Result delSchedule(@RequestBody List scheduleIds){ + icScheduleService.delSchedule(scheduleIds); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 4abde59690..b8b407a170 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import org.apache.ibatis.annotations.Mapper; /** @@ -12,5 +13,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcScheduleDao extends BaseDao { - + + void editSchedule(AddOrEditScheduleFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index a00d29f11e..dbfc499d81 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import java.util.List; import java.util.Map; @@ -75,4 +76,20 @@ public interface IcScheduleService extends BaseService { * @date 2022-08-18 */ void delete(String[] ids); + + /** + * Desc: 新增或编辑日程 + * @param formDTO + * @author zxc + * @date 2022/8/18 16:31 + */ + void addOrEditSchedule(AddOrEditScheduleFormDTO formDTO); + + /** + * Desc: 删除日程 + * @param scheduleIds + * @author zxc + * @date 2022/8/18 17:00 + */ + void delSchedule(List scheduleIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 0702302c40..3c7861a02d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -4,12 +4,19 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -79,4 +86,46 @@ public class IcScheduleServiceImpl extends BaseServiceImpl scheduleIds) { + if (CollectionUtils.isNotEmpty(scheduleIds)){ + baseDao.deleteBatchIds(scheduleIds); + } + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 01fb53be92..878c3f9fec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -3,4 +3,15 @@ + + UPDATE ic_schedule + SET UPDATED_TIME = NOW(), + title = #{title}, + remind_time = #{remindTime}, + + REMARK = #{remark}, + + is_public = #{isPublic} + WHERE ID = #{scheduleId} + \ No newline at end of file From 1e1e95ad5f168ee1dbd6812534d5b19cc9e2eb00 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 09:01:30 +0800 Subject: [PATCH 007/206] isPublish --- .../resi/partymember/dto/IcPartyActDTO.java | 2 +- .../dto/icpartyact/IcPartActTypeDTO.java | 17 +++++ .../controller/IcPartyActController.java | 64 +++++------------ .../modules/partyOrg/dao/IcPartyActDao.java | 11 ++- .../partyOrg/entity/IcPartyActEntity.java | 6 +- .../partyOrg/service/IcPartyActService.java | 65 ++--------------- .../service/impl/IcPartyActServiceImpl.java | 71 ++++--------------- .../mapper/partyOrg/IcPartyActDao.xml | 14 ++++ 8 files changed, 82 insertions(+), 168 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java index bc0c26dda9..15094578aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/IcPartyActDTO.java @@ -135,7 +135,7 @@ public class IcPartyActDTO implements Serializable { /** * 是否发布，0未发布；1已发布； */ - private String isPublic; + private String isPublish; /** * 活动发布人 diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java new file mode 100644 index 0000000000..4e864ab3cc --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java @@ -0,0 +1,17 @@ +package com.epmet.resi.partymember.dto.icpartyact; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/8/18 18:45 + */ +@Data +public class IcPartActTypeDTO { + private String label; + private String value; + private Integer yearCount; + private String frequencyDesc; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 6b94eaf18f..2c2c2cacd3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,19 +1,16 @@ package com.epmet.modules.partyOrg.controller; -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -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.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.IcPartyActDTO; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import java.util.Map; +import java.util.List; /** @@ -29,43 +26,16 @@ public class IcPartyActController { @Autowired private IcPartyActService icPartyActService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPartyActDTO data = icPartyActService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPartyActDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPartyActService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPartyActDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPartyActService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPartyActService.delete(ids); - return new Result(); - } + /** + * 活动类型 + * @param tokenDto + * @return + */ + @PostMapping("/acttypelist") + public com.epmet.commons.tools.utils.Result> actTypeList(@LoginUser TokenDto tokenDto){ + List list=icPartyActService.actTypeList(tokenDto.getCustomerId()); + return new Result>().ok(list); + } // @PostMapping("homeMonthTotal") // public Result diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index a1cfd4224e..4d25b88ff4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,8 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 党建组织活动 * @@ -12,5 +15,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActDao extends BaseDao { - + + /** + * 活动类型列表 + * @param customerId + * @return + */ + List actTypeList(String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index ee8fe199f2..4c414a1631 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -62,12 +62,12 @@ public class IcPartyActEntity extends BaseEpmetEntity { private String publishOrgType; /** - * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + * PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; /** - * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + * 活动类型，来源于ic_party_act_type_dict */ private String actType; @@ -134,7 +134,7 @@ public class IcPartyActEntity extends BaseEpmetEntity { /** * 是否发布，0未发布；1已发布； */ - private String isPublic; + private String isPublish; /** * 活动发布人 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 6623b7f63f..86aaf9f015 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,12 +1,10 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.IcPartyActDTO; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; import java.util.List; -import java.util.Map; /** * 党建组织活动 @@ -17,62 +15,9 @@ import java.util.Map; public interface IcPartyActService extends BaseService { /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 + * 活动类型列表 + * @param customerId + * @return */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-08-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IcPartyActDTO - * @author generator - * @date 2022-08-18 - */ - IcPartyActDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void save(IcPartyActDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void update(IcPartyActDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-08-18 - */ - void delete(String[] ids); + List actTypeList(String customerId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0618ede967..2a75432068 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,22 +1,15 @@ package com.epmet.modules.partyOrg.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.Constant; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.IcPartyActDTO; -import org.apache.commons.lang3.StringUtils; +import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 党建组织活动 @@ -27,56 +20,22 @@ import java.util.Map; @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActDTO.class); - } + /** + * 活动类型列表 + * + * @param customerId + * @return + */ @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActDTO.class); + public List actTypeList(String customerId) { + List list= baseDao.actTypeList(customerId); + if(CollectionUtils.isEmpty(list)){ + return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + } + return list; } - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IcPartyActDTO get(String id) { - IcPartyActEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IcPartyActDTO.class); - } - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcPartyActDTO dto) { - IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IcPartyActDTO dto) { - IcPartyActEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index bc27e12d31..83401d36a0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,4 +3,18 @@ + \ No newline at end of file From ddae26a7eeb9419381a45ca9fcf81caa99d2a376 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 09:37:25 +0800 Subject: [PATCH 008/206] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=B0=8F=E5=8A=A9?= =?UTF-8?q?=E6=89=8Bmq=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constants/ConsomerGroupConstants.java | 5 + .../rocketmq/constants/TopicConstants.java | 5 + .../messages/PartyMeetingMessageMQMsg.java | 26 +++++ .../com/epmet/constant/SystemMessageType.java | 5 + .../impl/SystemMessageServiceImpl.java | 3 + .../epmet/mq/RocketMQConsumerRegister.java | 5 + .../listener/PartyMeetingMessageListener.java | 99 +++++++++++++++++++ 7 files changed, 148 insertions(+) create mode 100644 epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java index 2aadd34cb4..babe79da88 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java @@ -98,4 +98,9 @@ public interface ConsomerGroupConstants { * 创建党员居民信息消费者组，将user库的党员信息同步到partymember库的党员表。 */ String CREATE_RESI_PARTYMEMBER_SYNC_GROUP = "create_resi_sync_group"; + + /** + * 党建小助手监听器分组 + */ + String PARTY_MEETING_MESSAGE = "party_meeting_message"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index cea27769bc..30505f546e 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -84,4 +84,9 @@ public interface TopicConstants { * 居民的党员信息 */ String PARTYMEMBER_RESI = "partymember_resi"; + + /** + * 消息-党建小助手 + */ + String IC_MESSAGE = "ic_message"; } diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java new file mode 100644 index 0000000000..4e21d2179d --- /dev/null +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -0,0 +1,26 @@ +package com.epmet.commons.rocketmq.messages; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 党建小助手发布活动、活动到期提醒、活动发布提醒推送MQ + * @author sun + */ +@Data +public class PartyMeetingMessageMQMsg implements Serializable { + + //客户Id + private String customerId; + //活动Id + private String icPartyActId; + //动作类型 发布活动:publish 提前提醒:remind 提前通知:notify + private String type; + //党组织Id + private String publishOrgId; + //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + private String publishOrgType; + + +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index b60b3b8fe1..fd1387fd43 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -170,4 +170,9 @@ public interface SystemMessageType { */ String PARTYMEMBER_RESI_IMPORT = "partymember_resi_import"; + /** + * 党建小助手消息 + */ + String PARTY_MEETING_MESSAGE = "party_meeting_message"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index d43fc223dc..8373666cc4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -237,6 +237,9 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.PARTYMEMBER_RESI_IMPORT: topic=TopicConstants.PARTYMEMBER_RESI; break; + case SystemMessageType.PARTY_MEETING_MESSAGE: + topic=TopicConstants.IC_MESSAGE; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java index 67ceeb7651..6761e5685f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -4,6 +4,8 @@ import com.epmet.commons.rocketmq.constants.ConsomerGroupConstants; import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.rocketmq.register.MQAbstractRegister; import com.epmet.commons.rocketmq.register.MQConsumerProperties; +import com.epmet.constant.SystemMessageType; +import com.epmet.mq.listener.PartyMeetingMessageListener; import com.epmet.mq.listener.ResiPartyMemberSyncListener; import org.apache.rocketmq.common.protocol.heartbeat.MessageModel; import org.springframework.stereotype.Component; @@ -15,5 +17,8 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { public void registerAllListeners(String env, MQConsumerProperties consumerProperties) { register(consumerProperties, ConsomerGroupConstants.CREATE_RESI_PARTYMEMBER_SYNC_GROUP, MessageModel.CLUSTERING, TopicConstants.PARTYMEMBER_RESI, "*", new ResiPartyMemberSyncListener()); + + register(consumerProperties, ConsomerGroupConstants.PARTY_MEETING_MESSAGE, MessageModel.CLUSTERING, + TopicConstants.IC_MESSAGE, SystemMessageType.PARTY_MEETING_MESSAGE, new PartyMeetingMessageListener()); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java new file mode 100644 index 0000000000..8c044e3f5a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java @@ -0,0 +1,99 @@ +package com.epmet.mq.listener; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.rocketmq.constants.MQUserPropertys; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; +import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; +import org.apache.rocketmq.client.consumer.listener.MessageListenerConcurrently; +import org.apache.rocketmq.common.message.MessageExt; +import org.redisson.api.RLock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.concurrent.TimeUnit; + +/** + * @author sun + * @Description 党建小助手发布活动、活动提前提醒、活动发布提醒通知 + */ +public class PartyMeetingMessageListener implements MessageListenerConcurrently { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + private RedisUtils redisUtils; + + @Override + public ConsumeConcurrentlyStatus consumeMessage(List msgs, ConsumeConcurrentlyContext context) { + + if (redisUtils == null) { + redisUtils = SpringContextUtils.getBean(RedisUtils.class); + } + + try { + msgs.forEach(msg -> consumeMessage(msg)); + } catch (Exception e) { + logger.error(ExceptionUtils.getErrorStackTrace(e)); + return ConsumeConcurrentlyStatus.RECONSUME_LATER; + } + return ConsumeConcurrentlyStatus.CONSUME_SUCCESS; + } + + /** + * 逐条消费 + * @param messageExt + */ + private void consumeMessage(MessageExt messageExt) { + // msg即为消息体 + String msg = new String(messageExt.getBody()); + logger.info("msg is {}",msg); + String tags = messageExt.getTags(); + String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL); + + logger.info("【党建小助手消息】-活动消息-收到消息内容:{},操作:{}", msg, tags); + PartyMeetingMessageMQMsg obj = JSON.parseObject(msg, PartyMeetingMessageMQMsg.class); + logger.info("obj is {}",JSON.toJSONString(obj)); + + DistributedLock distributedLock = null; + RLock lock = null; + try { + distributedLock = SpringContextUtils.getBean(DistributedLock.class); + lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), + 30L, 30L, TimeUnit.SECONDS); + //待执行方法 + //SpringContextUtils.getBean(IcVolunteerPolyService.class).volunteerChanged(obj); + + } catch (EpmetException e) { + // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 + logger.error("【党建小助手消息】-活动消息MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + } catch (Exception e) { + // 不是我们自己抛出的异常，可以让MQ重试 + logger.error("【党建小助手消息】-活动消息MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + } finally { + assert distributedLock != null; + distributedLock.unLock(lock); + } + + if (StringUtils.isNotBlank(pendingMsgLabel)) { + try { + removePendingMqMsgCache(pendingMsgLabel); + } catch (Exception e) { + logger.error("【党建小助手消息】-删除mq阻塞消息缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + + private void removePendingMqMsgCache(String pendingMsgLabel) { + String key = RedisKeys.blockedMqMsgKey(pendingMsgLabel); + Boolean rst = redisUtils.delete(key); + } +} From 357ec1da1260e0ef85dcf126fd3615fdb4393274 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 09:40:53 +0800 Subject: [PATCH 009/206] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/HomeMonthTotalFormDTO.java | 41 ++++++++++++++++ .../result/HomeMonthTotalResultDTO.java | 28 +++++++++++ .../controller/IcPartyActController.java | 20 +++++++- .../partyOrg/service/IcPartyActService.java | 10 ++++ .../service/impl/IcPartyActServiceImpl.java | 47 +++++++++++++++++++ 5 files changed, 144 insertions(+), 2 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java new file mode 100644 index 0000000000..74f392a890 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -0,0 +1,41 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:59 + * @DESC + */ +@Data +public class HomeMonthTotalFormDTO implements Serializable { + + private static final long serialVersionUID = 1128815856169903825L; + + public interface HomeMonthTotalForm{} + + /** + * 年份ID + */ + @NotBlank(message = "yearId不能为空",groups = HomeMonthTotalForm.class) + private String yearId; + + /** + * 党支部ID + */ + @NotBlank(message = "orgId不能为空",groups = HomeMonthTotalForm.class) + private String orgId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + @NotBlank(message = "isSelf不能为空",groups = HomeMonthTotalForm.class) + private String isSelf; + + private String staffId; + + private String customerId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java new file mode 100644 index 0000000000..f3ba554fd6 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/HomeMonthTotalResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.commons.tools.constant.NumConstant; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 08:57 + * @DESC + */ +@Data +public class HomeMonthTotalResultDTO implements Serializable { + + private static final long serialVersionUID = -4647982500373510830L; + + private String monthId; + + private Integer count; + + public HomeMonthTotalResultDTO() { + this.monthId = ""; + this.count = NumConstant.ZERO; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2c2c2cacd3..5d58f8396d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -3,10 +3,14 @@ package com.epmet.modules.partyOrg.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -37,7 +41,19 @@ public class IcPartyActController { return new Result>().ok(list); } -// @PostMapping("homeMonthTotal") -// public Result + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + @PostMapping("homeMonthTotal") + public Result> getHomeMonthTotal(@LoginUser TokenDto tokenDto,@RequestBody HomeMonthTotalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, HomeMonthTotalFormDTO.HomeMonthTotalForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 86aaf9f015..0be952a650 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -3,6 +3,8 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; @@ -20,4 +22,12 @@ public interface IcPartyActService extends BaseService { * @return */ List actTypeList(String customerId); + + /** + * Desc: 【党建日历】首页-获取每月总数 + * @param formDTO + * @author zxc + * @date 2022/8/19 09:05 + */ + List getHomeMonthTotal(HomeMonthTotalFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2a75432068..d6c41ded06 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -2,13 +2,20 @@ package com.epmet.modules.partyOrg.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; import java.util.List; /** @@ -38,4 +45,44 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { + List result = constructMonthData(formDTO.getYearId()); + + return result; + } + + /** + * Desc: 构造结果集 + * @param yearId + * @author zxc + * @date 2022/8/19 09:31 + */ + public List constructMonthData(String yearId){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(yearId)){ + String[] array = new String[NumConstant.TWELVE]; + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMM"); + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.YEAR,Integer.parseInt(yearId)); + cal.set(Calendar.MONTH, NumConstant.ZERO); + for(int i=NumConstant.ZERO; i Date: Fri, 19 Aug 2022 10:06:28 +0800 Subject: [PATCH 010/206] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/IcMessageDTO.java | 104 ++++++++++++++++++ .../epmet/controller/IcMessageController.java | 73 ++++++++++++ .../main/java/com/epmet/dao/IcMessageDao.java | 16 +++ .../com/epmet/entity/IcMessageEntity.java | 74 +++++++++++++ .../com/epmet/service/IcMessageService.java | 78 +++++++++++++ .../service/impl/IcMessageServiceImpl.java | 83 ++++++++++++++ .../main/resources/mapper/IcMessageDao.xml | 8 ++ 7 files changed, 436 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java new file mode 100644 index 0000000000..3451d342f3 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java @@ -0,0 +1,104 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Data +public class IcMessageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户id + */ + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 被通知的用户id + */ + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + private String app; + + /** + * 消息分类 党建小助手:party + */ + private String messageType; + + /** + * 消息类型对应的业务Id + */ + private String targetId; + + /** + * 消息标题 + */ + private String title; + + /** + * 消息通知内容 + */ + private String messageContent; + + /** + * read已读、unread未读 + */ + private String readFlag; + + /** + * 删除标记 0：未删除，1：已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人(发布消息的人) + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + + /** + * 调用者 + */ + private String referer; + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java new file mode 100644 index 0000000000..2d12517d89 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -0,0 +1,73 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.dto.IcMessageDTO; +import com.epmet.service.IcMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@RestController +@RequestMapping("icMessage") +public class IcMessageController { + + @Autowired + private IcMessageService icMessageService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = icMessageService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcMessageDTO data = icMessageService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody IcMessageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + icMessageService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody IcMessageDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icMessageService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + icMessageService.delete(ids); + return new Result(); + } + + + + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java new file mode 100644 index 0000000000..f8b474aecf --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.IcMessageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Mapper +public interface IcMessageDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java new file mode 100644 index 0000000000..dc937c6639 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java @@ -0,0 +1,74 @@ +package com.epmet.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 2022-08-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_message") +public class IcMessageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 被通知的用户id + */ + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + private String app; + + /** + * 消息分类 党建小助手:party + */ + private String messageType; + + /** + * 消息类型对应的业务Id + */ + private String targetId; + + /** + * 消息标题 + */ + private String title; + + /** + * 消息通知内容 + */ + private String messageContent; + + /** + * read已读、unread未读 + */ + private String readFlag; + + /** + * 调用者 + */ + private String referer; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java new file mode 100644 index 0000000000..59a374a341 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcMessageDTO; +import com.epmet.entity.IcMessageEntity; + +import java.util.List; +import java.util.Map; + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +public interface IcMessageService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-08-19 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-08-19 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return IcMessageDTO + * @author generator + * @date 2022-08-19 + */ + IcMessageDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-19 + */ + void save(IcMessageDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-08-19 + */ + void update(IcMessageDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-08-19 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java new file mode 100644 index 0000000000..144d7b67ab --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -0,0 +1,83 @@ +package com.epmet.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.IcMessageDao; +import com.epmet.dto.IcMessageDTO; +import com.epmet.entity.IcMessageEntity; +import com.epmet.service.IcMessageService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 用户消息表(党建小助手) + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Service +public class IcMessageServiceImpl extends BaseServiceImpl implements IcMessageService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcMessageDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcMessageDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public IcMessageDTO get(String id) { + IcMessageEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, IcMessageDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(IcMessageDTO dto) { + IcMessageEntity entity = ConvertUtils.sourceToTarget(dto, IcMessageEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(IcMessageDTO dto) { + IcMessageEntity entity = ConvertUtils.sourceToTarget(dto, IcMessageEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml new file mode 100644 index 0000000000..5f186be462 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file From cf001dbdc9ad4f4698d3a51ca4829def80848645 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 10:16:22 +0800 Subject: [PATCH 011/206] =?UTF-8?q?=E6=94=B9=E4=B8=8B=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcPartyActAddOrUpdateFormDTO.java | 18 +++++++ .../form/IcPartyActPageFormDTO.java | 19 +++++++ .../{ => result}/IcPartActTypeDTO.java | 2 +- .../result/IcPartyActDetailResDTO.java | 16 ++++++ .../result/IcPartyActPageResultDTO.java | 16 ++++++ .../controller/IcPartyActController.java | 52 +++++++++++++++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 2 +- .../partyOrg/service/IcPartyActService.java | 31 ++++++++++- .../service/impl/IcPartyActServiceImpl.java | 46 +++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 2 +- 10 files changed, 194 insertions(+), 10 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java rename epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/{ => result}/IcPartActTypeDTO.java (80%) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java new file mode 100644 index 0000000000..1649460dea --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 9:58 + */ +@Data +public class IcPartyActAddOrUpdateFormDTO implements Serializable { + private static final long serialVersionUID = -2554822505755122067L; + private String customerId; + private String publishStaffId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java new file mode 100644 index 0000000000..e722f5fab7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:02 + */ +@Data +public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -8171649039313981541L; + private String customerId; + private String publishStaffId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java similarity index 80% rename from epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java rename to epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java index 4e864ab3cc..5242b94d7b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/IcPartActTypeDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartActTypeDTO.java @@ -1,4 +1,4 @@ -package com.epmet.resi.partymember.dto.icpartyact; +package com.epmet.resi.partymember.dto.icpartyact.result; import lombok.Data; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java new file mode 100644 index 0000000000..7cde53d040 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.partymember.dto.icpartyact.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:08 + */ +@Data +public class IcPartyActDetailResDTO implements Serializable { + private static final long serialVersionUID = -8102085878449811977L; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java new file mode 100644 index 0000000000..46becccdfe --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.resi.partymember.dto.icpartyact.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:06 + */ +@Data +public class IcPartyActPageResultDTO implements Serializable { + private static final long serialVersionUID = 1414832133227703667L; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 5d58f8396d..e06022ac52 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,20 +1,23 @@ package com.epmet.modules.partyOrg.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.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; /** @@ -30,6 +33,45 @@ public class IcPartyActController { @Autowired private IcPartyActService icPartyActService; + /** + * 添加、修改活动 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("addOrUpdate") + public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + Map map=icPartyActService.addOrUpdate(formDTO); + return new Result>().ok(map); + } + + /** + * 活动列表分页 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("page-list") + public Result> pageList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.pageList(formDTO)); + } + + /** + * 活动列表活动详情 + * @param tokenDto + * @param icPartyActId + * @return + */ + @PostMapping("act-detail/{icPartyActId}") + public Result actDetail(@LoginUser TokenDto tokenDto, @PathVariable("icPartyActId")String icPartyActId){ + return new Result().ok(icPartyActService.queryActDetail(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActId)); + } + + /** * 活动类型 * @param tokenDto diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 4d25b88ff4..374dd39b7d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,7 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 0be952a650..5dca25642b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,12 +1,18 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; +import java.util.Map; /** * 党建组织活动 @@ -30,4 +36,27 @@ public interface IcPartyActService extends BaseService { * @date 2022/8/19 09:05 */ List getHomeMonthTotal(HomeMonthTotalFormDTO formDTO); + + /** + * 添加、修改活动 + * @param formDTO + * @return + */ + Map addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO); + + /** + * 活动列表-分页查询 + * @param formDTO + * @return + */ + PageData pageList(IcPartyActPageFormDTO formDTO); + + /** + * 活动列表活动详情 + * @param customerId + * @param userId + * @param icPartyActId + * @return + */ + IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index d6c41ded06..0a20fe8935 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,10 +3,15 @@ package com.epmet.modules.partyOrg.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; -import com.epmet.resi.partymember.dto.icpartyact.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; @@ -17,6 +22,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; import java.util.List; +import java.util.Map; /** * 党建组织活动 @@ -85,4 +91,42 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { + //todo + return null; + } + + /** + * 活动列表-分页查询 + * + * @param formDTO + * @return + */ + @Override + public PageData pageList(IcPartyActPageFormDTO formDTO) { + //todo + return null; + } + + /** + * 活动列表活动详情 + * + * @param customerId + * @param userId + * @param icPartyActId + * @return + */ + @Override + public IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId) { + //todo + return null; + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 83401d36a0..066206184f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,7 +3,7 @@ - SELECT d.TYPE_KEY as value, d.TYPE_NAME as label, From 2aba676712d5ce77814d045c3f97d039ff2548df Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 10:16:58 +0800 Subject: [PATCH 012/206] =?UTF-8?q?mq=E9=85=8D=E7=BD=AE=E9=81=97=E6=BC=8F?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/send/SendMqMsgUtil.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index debd15686f..7b9d1d877b 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -243,4 +243,28 @@ public class SendMqMsgUtil { return false; } + /** + * @Description 党建小助手消息同步Mq + * @author sun + */ + public boolean partyMeetingMQMsg(String msgType, PartyMeetingMessageMQMsg msgContent) { + try { + SystemMsgFormDTO form = new SystemMsgFormDTO(msgType,msgContent); + Result sendMsgResult; + log.info("partyMeetingMQMsg param:{}",msgContent); + int retryTime = 0; + do { + sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); + } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO); + + if (sendMsgResult != null && sendMsgResult.success()) { + return true; + } + log.error("发送党建小助手系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(form)); + } catch (Exception e) { + log.error("partyMeetingMQMsg exception", e); + } + return false; + } + } From e2957b81295a986a4d40381f3a871d6c2fe1e893 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 10:31:13 +0800 Subject: [PATCH 013/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/IcMessageFormDTO.java | 66 +++++++++++++++++++ .../feign/EpmetMessageOpenFeignClient.java | 8 +++ .../EpmetMessageOpenFeignClientFallback.java | 6 ++ .../epmet/controller/IcMessageController.java | 12 +++- .../com/epmet/service/IcMessageService.java | 4 ++ .../service/impl/IcMessageServiceImpl.java | 7 ++ 6 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java new file mode 100644 index 0000000000..679621c430 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageFormDTO.java @@ -0,0 +1,66 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcMessageFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + /** + * 客户id + */ + @NotBlank(message = "客户id不能为空") + private String customerId; + + /** + * app=resi时，此列为gridId,其他情况暂定 * + */ + private String gridId; + + /** + * 对应用户id + */ + @NotBlank(message = "通知用户id为空") + private String userId; + + /** + * 消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper + */ + @NotBlank(message = "消息通知对象不能为空") + private String app; + + /** + * 消息标题 + */ + @NotBlank(message = "消息标题不能为空") + private String title; + + /** + * 消息通知内容 + */ + @NotBlank(message = "通知内容不能为空") + private String messageContent; + + /** + * read已读、unread未读 + */ + @NotBlank(message = "readFlag不能为空") + private String readFlag; + + /** + * 调用者 【分内部调用和外部调用，内部调用值为空，外部默认为：外挂-站内信】 + */ + private String referer; + + /** + * 消息分类:info-上传下达消息 详见UserMessageTypeConstant + */ + private String messageType; + /** + * 消息对应的业务id,比如message_type=info时，此列存储的是消息id,可跳转到消息详情 + */ + private String targetId; +} diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index 8b9f06198f..f1f7b5dfa5 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -127,4 +127,12 @@ public interface EpmetMessageOpenFeignClient { @PostMapping(value = "message/sms/send-msg", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result sendMsg(@RequestBody List formDTO); + + /** + * @Author sun + * @Description 党建小助手-批量插入未读消息 + **/ + @PostMapping(value = "message/icMessage/saveicmessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result saveIcMessageList(List msgList); + } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index 2d5c0d9073..100dc4ff10 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -78,4 +78,10 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig public Result sendMsg(List formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendMsg",formDTO); } + + @Override + public Result saveIcMessageList(List msgList) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveIcMessageList", msgList); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index 2d12517d89..034601b985 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -9,10 +9,12 @@ 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.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; import java.util.Map; @@ -67,7 +69,15 @@ public class IcMessageController { return new Result(); } - + /** + * @Author sun + * @Description 批量插入未读消息 + **/ + @PostMapping("saveicmessagelist") + public Result saveIcMessageList(@RequestBody List msgList) { + icMessageService.saveIcMessageList(msgList); + return new Result(); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index 59a374a341..04524957b4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -2,7 +2,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -75,4 +77,6 @@ public interface IcMessageService extends BaseService { * @date 2022-08-19 */ void delete(String[] ids); + + void saveIcMessageList(List msgList); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 144d7b67ab..305dff1f02 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcMessageDao; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import com.epmet.service.IcMessageService; import org.apache.commons.lang3.StringUtils; @@ -80,4 +81,10 @@ public class IcMessageServiceImpl extends BaseServiceImpl msgList) { + List entityList = ConvertUtils.sourceToTarget(msgList, IcMessageEntity.class); + insertBatch(entityList); + } + } \ No newline at end of file From e36d9368da9055531c580209a6ddecf8944ed0af Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 11:15:40 +0800 Subject: [PATCH 014/206] ... --- .../commons/rocketmq/messages/PartyMeetingMessageMQMsg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 4e21d2179d..9ca6c76c5d 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -15,7 +15,7 @@ public class PartyMeetingMessageMQMsg implements Serializable { private String customerId; //活动Id private String icPartyActId; - //动作类型 发布活动:publish 提前提醒:remind 提前通知:notify + //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; //党组织Id private String publishOrgId; From c6ce21c6ac7783a4113b5f461ee5b7b5816b807f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 11:18:01 +0800 Subject: [PATCH 015/206] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/HomeMonthTotalFormDTO.java | 7 +++++ .../modules/partyOrg/dao/IcScheduleDao.java | 6 ++++ .../service/impl/IcPartyActServiceImpl.java | 26 +++++++++++++++- .../src/main/resources/logback-spring.xml | 3 +- .../mapper/partyOrg/IcScheduleDao.xml | 30 +++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java index 74f392a890..396ba3611a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -38,4 +38,11 @@ public class HomeMonthTotalFormDTO implements Serializable { private String staffId; private String customerId; + + /** + * 工作人员所属组织ID + */ + private String agencyId; + + private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index b8b407a170..48aa6fd599 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -3,8 +3,12 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 日程表 * @@ -16,4 +20,6 @@ public interface IcScheduleDao extends BaseDao { void editSchedule(AddOrEditScheduleFormDTO formDTO); + List getScheduleAndActCount(HomeMonthTotalFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a20fe8935..5e0a463d14 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,19 +3,26 @@ package com.epmet.modules.partyOrg.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.text.SimpleDateFormat; @@ -33,6 +40,10 @@ import java.util.Map; @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { + @Autowired + private IcScheduleDao scheduleDao; + @Autowired + private IcPartyOrgService partyOrgService; /** * 活动类型列表 @@ -61,8 +72,21 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + if (null == icPartyOrgDTO){ + throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + } + formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); List result = constructMonthData(formDTO.getYearId()); - + List countList = scheduleDao.getScheduleAndActCount(formDTO); + if (CollectionUtils.isNotEmpty(countList)){ + countList.forEach(c -> result.stream().filter(r -> c.getMonthId().equals(r.getMonthId())).forEach(r -> r.setCount(c.getCount()))); + } return result; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml index f4fc5a99ea..b8b3161188 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml @@ -160,11 +160,12 @@ - + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 878c3f9fec..c4933d7934 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -14,4 +14,34 @@ is_public = #{isPublic} WHERE ID = #{scheduleId} + + \ No newline at end of file From ea2e8106b54dd3841bab380d91975df33612bbc0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 11:19:41 +0800 Subject: [PATCH 016/206] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index c4933d7934..39bae20e11 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -38,7 +38,7 @@ AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - AND CREATED_BY = '周星驰' + AND CREATED_BY = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') GROUP BY HOLD_MONTH_ID)t From e290cfa4b2ee2da89be8b1f01b0094662221d8e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 13:26:56 +0800 Subject: [PATCH 017/206] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E5=85=B8=E8=A1=A8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.23_party_publish_Time.sql | 7 + .../epmet/commons/tools/utils/DateUtils.java | 6 + .../form/IcPartyActAddOrUpdateFormDTO.java | 146 ++++++++++++++++++ .../dto/icpartyact/form/JoinOrgDTO.java | 53 +++++++ .../controller/IcPartyActController.java | 8 + .../partyOrg/entity/IcPartyActEntity.java | 6 +- .../service/impl/IcPartyActServiceImpl.java | 32 +++- 7 files changed, 253 insertions(+), 5 deletions(-) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql new file mode 100644 index 0000000000..d6f288b2c7 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql @@ -0,0 +1,7 @@ +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458000894500866', 'icpartyact_auto_publish_time', '党组织活动自动发布时间', '党组织活动自动发布时间', 35, 0, 0, '1', '2022-08-19 10:45:54', '1', '2022-08-19 10:46:11'); + + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458233091170305', 1560458000894500866, '活动开始前1天', '1', '0', '活动开始前1天', 1, 0, 0, '1', '2022-08-19 10:46:49', '1', '2022-08-19 10:46:49'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458276439302146', 1560458000894500866, '活动开始前3天', '3', '0', '活动开始前3天', 2, 0, 0, '1', '2022-08-19 10:47:00', '1', '2022-08-19 10:47:00'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458332076744705', 1560458000894500866, '活动开始前5天', '5', '0', '活动开始前5天', 3, 0, 0, '1', '2022-08-19 10:47:13', '1', '2022-08-19 10:47:13'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458388007788545', 1560458000894500866, '活动开始前7天', '7', '0', '活动开始前7天', 4, 0, 0, '1', '2022-08-19 10:47:26', '1', '2022-08-19 10:47:26'); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index d5e6be9ab4..34511b68bc 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -1070,4 +1070,10 @@ public class DateUtils { return cal.getTime(); } + public static Date calDateBaseDay(Date date, int day) { + Calendar calendar = Calendar.getInstance(); + calendar.setTime(date); + calendar.add(Calendar.DAY_OF_MONTH, day); + return calendar.getTime(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 1649460dea..88e791c889 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -1,8 +1,18 @@ package com.epmet.resi.partymember.dto.icpartyact.form; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import org.hibernate.validator.constraints.Length; +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description @@ -12,7 +22,143 @@ import java.io.Serializable; @Data public class IcPartyActAddOrUpdateFormDTO implements Serializable { private static final long serialVersionUID = -2554822505755122067L; + + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateUserInternalGroup { + } + + public interface UpdateUserShowGroup extends CustomerClientShowGroup { + } + + @NotBlank(message = "customerId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String customerId; + + @NotBlank(message = "publishStaffId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String publishStaffId; + + @NotBlank(message = "icPartyActId不能为空", groups = {UpdateUserInternalGroup.class}) + private String icPartyActId; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + @NotBlank(message = "活动类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String actType; + + /** + * 活动举办时间：yyyy + */ + @NotBlank(message = "holdYearId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + @NotBlank(message = "holdMonthId不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String holdMonthId; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @NotNull(message = "活动举办时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private Date holdTime; + + /** + * 活动主题 + */ + @NotBlank(message = "活动主题不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 35, message = "最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String topic; + + /** + * 活动地点 + */ + @NotBlank(message = "活动地点不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 100, message = "活动地点最多输入100字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + @NotBlank(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private Integer autoPublicType; + /** + * 发布活动党组织 + */ + @NotBlank(message = "发布活动党组织不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + @NotBlank(message = "发布活动党组织名称不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishPartyOrgName; + + /** + * 发布活动党组织ID的上级节点 + */ + @NotBlank(message = "参加活动党组织ID的上级节点不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPid; + + /** + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "发布活动党组织类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String publishOrgType; + + /** + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + @NotBlank(message = "", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPath; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + @NotBlank(message = "参加人员类型不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String joinUserType; + + /** + * 是否自动通知参加人员，0否；1是 + */ + @NotBlank(message = "自动通知参加人员不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String isAutoInform; + + /** + * 活动介绍 + */ + @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 1000, message = "活动介绍最多输入1000字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private String introduce; + + /** + * 参加活动党组织 + */ + @Valid + @NotEmpty(message = "参加活动党组织不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + private List joinOrgList; + + + /** + * 附件表 + */ + private List attachmentList; + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java new file mode 100644 index 0000000000..682b4306ec --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -0,0 +1,53 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/19 10:31 + */ +@Data +public class JoinOrgDTO implements Serializable { + private static final long serialVersionUID = 6994576136698569857L; + + //前端传入 + /** + * 参加活动党组织ID,groupId + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String joinOrgId; + + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "参加活动党组织类型不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String orgType; + + /** + * 参加活动党组织ID的上级节点 + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String pid; + + /** + * PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String joinOrgPath; + + //接口内部赋值 + /** + * 活动id + */ + private String icPartyActId; + + /** + * 客户ID + */ + private String customerId; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index e06022ac52..9886fb6b13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -13,6 +13,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,6 +44,13 @@ public class IcPartyActController { public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); + if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + //修改活动 + ValidatorUtils.validateEntity(formDTO,IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class); + }else{ + //添加活动 + ValidatorUtils.validateEntity(formDTO,IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class); + } Map map=icPartyActService.addOrUpdate(formDTO); return new Result>().ok(map); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index 4c414a1631..23065472fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -52,17 +52,17 @@ public class IcPartyActEntity extends BaseEpmetEntity { private String publishPartyOrgName; /** - * 参加活动党组织ID的上级节点 + * 发布活动党组织ID的上级节点 */ private String publishOrgPid; /** - * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ private String publishOrgType; /** - * PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a20fe8935..c5cda02162 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,8 +3,15 @@ package com.epmet.modules.partyOrg.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -16,7 +23,9 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -32,7 +41,8 @@ import java.util.Map; */ @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - + @Autowired + private IcPartyActOrgDao icPartyActOrgDao; /** * 活动类型列表 @@ -99,11 +109,29 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - //todo + IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); + CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + if (null == staffInfo) { + String msg = "查询工作人员信息异常"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } + icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); + icPartyActEntity.setOrgId(staffInfo.getAgencyId()); + icPartyActEntity.setPid(staffInfo.getParentAgency().getId()); + icPartyActEntity.setOrgIdPath(staffInfo.getAgencyPIds()); + if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + //删除附件、删除参加组织 + + } + + return null; } + /** * 活动列表-分页查询 * From fc7ff10327b1932137ee48f7fa89e770ebb9f1a9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 13:37:09 +0800 Subject: [PATCH 018/206] =?UTF-8?q?=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 39bae20e11..d4cd5a8674 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -37,7 +37,7 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - + AND CREATED_BY = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') From 576a1fc54540d2952abbd9fc71ed54b4a7879724 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 14:02:46 +0800 Subject: [PATCH 019/206] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 33 ++++++++++++ .../result/ActAndScheduleListResultDTO.java | 53 +++++++++++++++++++ .../controller/IcPartyActController.java | 30 +++++++++++ .../partyOrg/service/IcPartyActService.java | 18 +++++++ .../service/impl/IcPartyActServiceImpl.java | 29 ++++++++-- 5 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java new file mode 100644 index 0000000000..5789e543e8 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:52 + * @DESC + */ +@Data +public class ActAndScheduleListFormDTO implements Serializable { + + private static final long serialVersionUID = -6776882545589530612L; + + private String startDate; + private String endDate; + private String dateId; + + /** + * 是否本人创建的活动，1：是；0：否 + */ + private String isSelf; + + /** + * 党组织ID + */ + private String orgId; + + private String customerId; + private String staffId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java new file mode 100644 index 0000000000..611d4bf6ed --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -0,0 +1,53 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/19 13:41 + * @DESC + */ +@Data +public class ActAndScheduleListResultDTO implements Serializable { + + private static final long serialVersionUID = 7378300105829566449L; + + private Integer scheduleTotal; + private Integer activityTotal; + private String dateId; + + private List activityList; + + private List scheduleList; + + + @Data + public static class ActivityListDTO implements Serializable{ + + private static final long serialVersionUID = -9050507457068805831L; + + private String activityId; + private String topic; + private String address; + private String holdTime; + private String type; + private String isPublicValue; + private String joinTypeValue; + private Boolean isMe; + + } + + public static class ScheduleListDTO implements Serializable{ + + private static final long serialVersionUID = 5372167729733804267L; + + private String scheduleId; + private String title; + private String remindTime; + private String remark; + private Boolean isMe; + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 9886fb6b13..2de07478c1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -11,7 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -105,5 +107,33 @@ public class IcPartyActController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icPartyActService.getHomeMonthTotal(formDTO)); } + + /** + * Desc:【党建日历】活动、日程列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 13:57 + */ + @PostMapping("actAndScheduleList") + public Result getActAndScheduleList(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icPartyActService.getActAndScheduleList(formDTO)); + } + + /** + * Desc:【党建日历】某月/天数据搜索列表 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/8/19 14:00 + */ + @PostMapping("homeSearch") + public Result> homeSearch(@RequestBody ActAndScheduleListFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.homeSearch(formDTO)); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 5dca25642b..d0f1d68d65 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -8,7 +8,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import java.util.List; @@ -59,4 +61,20 @@ public interface IcPartyActService extends BaseService { * @return */ IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); + + /** + * Desc: 【党建日历】活动、日程列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 13:57 + */ + ActAndScheduleListResultDTO getActAndScheduleList(ActAndScheduleListFormDTO formDTO); + + /** + * Desc: 【党建日历】某月/天数据搜索列表 + * @param formDTO + * @author zxc + * @date 2022/8/19 14:01 + */ + List homeSearch(ActAndScheduleListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 86e6fbe505..4721faea3e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -4,18 +4,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; @@ -25,7 +22,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -181,4 +180,26 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { + return null; + } } \ No newline at end of file From 0094b18942db6518f8ac4a76f3e674d72bbfbc82 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:41:18 +0800 Subject: [PATCH 020/206] =?UTF-8?q?mq=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/PartyMeetingMessageMQMsg.java | 3 ++- .../java/com/epmet/send/SendMqMsgUtil.java | 24 ------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 9ca6c76c5d..c41ae46729 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -1,5 +1,6 @@ package com.epmet.commons.rocketmq.messages; +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import lombok.Data; import java.io.Serializable; @@ -9,7 +10,7 @@ import java.io.Serializable; * @author sun */ @Data -public class PartyMeetingMessageMQMsg implements Serializable { +public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializable { //客户Id private String customerId; diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java index 7b9d1d877b..debd15686f 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/send/SendMqMsgUtil.java @@ -243,28 +243,4 @@ public class SendMqMsgUtil { return false; } - /** - * @Description 党建小助手消息同步Mq - * @author sun - */ - public boolean partyMeetingMQMsg(String msgType, PartyMeetingMessageMQMsg msgContent) { - try { - SystemMsgFormDTO form = new SystemMsgFormDTO(msgType,msgContent); - Result sendMsgResult; - log.info("partyMeetingMQMsg param:{}",msgContent); - int retryTime = 0; - do { - sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); - } while ((sendMsgResult == null || !sendMsgResult.success()) && retryTime++ < NumConstant.TWO); - - if (sendMsgResult != null && sendMsgResult.success()) { - return true; - } - log.error("发送党建小助手系统消息到message服务失败:{},msg:{}", JSON.toJSONString(sendMsgResult), JSON.toJSONString(form)); - } catch (Exception e) { - log.error("partyMeetingMQMsg exception", e); - } - return false; - } - } From c54d288b421258e1a7858b33fd391bc6d5743b5b Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:46:28 +0800 Subject: [PATCH 021/206] =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/messages/PartyMeetingMessageMQMsg.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index c41ae46729..98c617255a 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * 党建小助手发布活动、活动到期提醒、活动发布提醒推送MQ @@ -18,10 +19,10 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; - //党组织Id - private String publishOrgId; - //党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - private String publishOrgType; + //党小组之外的党组织Id集合 + private List partyOrgIdList; + //党小组Id集合 + private List groupIdList; } From a07e869aa5c60490c42e7db15b0866cbea63ce5b Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 14:48:18 +0800 Subject: [PATCH 022/206] =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/rocketmq/messages/PartyMeetingMessageMQMsg.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index 98c617255a..f019090330 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -19,10 +19,5 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; - //党小组之外的党组织Id集合 - private List partyOrgIdList; - //党小组Id集合 - private List groupIdList; - } From 783a0868b80b15728b3caadf37e0ebaa78a7b1b7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 14:50:12 +0800 Subject: [PATCH 023/206] tiyixia --- .../controller/IcPartyActOrgController.java | 39 --------- .../partyOrg/dao/IcPartyActOrgDao.java | 6 +- .../dao/ResiPartymemberAttachmentDao.java | 24 ++++++ .../ResiPartymemberAttachmentEntity.java | 82 +++++++++++++++++++ .../service/IcPartyActOrgService.java | 64 +-------------- .../ResiPartymemberAttachmentService.java | 16 ++++ .../impl/IcPartyActOrgServiceImpl.java | 65 ++------------- .../service/impl/IcPartyActServiceImpl.java | 54 ++++++++---- .../ResiPartymemberAttachmentServiceImpl.java | 29 +++++++ .../mapper/partyOrg/IcPartyActOrgDao.xml | 8 +- .../partyOrg/ResiPartymemberAttachmentDao.xml | 34 ++++++++ 11 files changed, 244 insertions(+), 177 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java index 19fb1ea357..a42a752523 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActOrgController.java @@ -28,43 +28,4 @@ public class IcPartyActOrgController { @Autowired private IcPartyActOrgService icPartyActOrgService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActOrgService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPartyActOrgDTO data = icPartyActOrgService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPartyActOrgDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPartyActOrgService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPartyActOrgDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPartyActOrgService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPartyActOrgService.delete(ids); - return new Result(); - } - } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index 97cd8d2e9e..e38cde539a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -3,6 +3,9 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 参加活动党组织表 @@ -12,5 +15,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActOrgDao extends BaseDao { - + + int deleteByPartyActId(@Param("customerId") String customerId, @Param("icPartyActIds")List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java new file mode 100644 index 0000000000..5b42ff57e4 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java @@ -0,0 +1,24 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Mapper +public interface ResiPartymemberAttachmentDao extends BaseDao { + /** + * + * @param businessIds + * @return + */ + int deleteByBusinessId(@Param("customerId")String customerId,@Param("businessIds") List businessIds); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java new file mode 100644 index 0000000000..aa190b4ea9 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/ResiPartymemberAttachmentEntity.java @@ -0,0 +1,82 @@ +package com.epmet.modules.partyOrg.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("resi_partymember_attachment") +public class ResiPartymemberAttachmentEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 业务id + */ + private String businessId; + + /** + * 党组织活动：ic_party_act + */ + private String attachTo; + + /** + * 附件名 + */ + private String name; + + /** + * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） + */ + private String format; + + /** + * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） + */ + private String type; + + /** + * 附件地址 + */ + private String url; + + /** + * 排序字段 + */ + private Integer sort; + + /** + * 附件状态（审核中：auditing； +auto_passed: 自动通过； +review：结果不确定，需要人工审核； +block: 结果违规； +rejected：人工审核驳回; +approved：人工审核通过） +现在图片是同步审核的，所以图片只有auto_passed一种状态 + */ + private String status; + + /** + * 失败原因 + */ + private String reason; + + /** + * 语音或视频时长,秒 + */ + private Integer duration; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java index 24dfde82b4..9e5a6e2be2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActOrgService.java @@ -1,12 +1,9 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; import java.util.List; -import java.util.Map; /** * 参加活动党组织表 @@ -15,64 +12,5 @@ import java.util.Map; * @since v1.0.0 2022-08-18 */ public interface IcPartyActOrgService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-08-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IcPartyActOrgDTO - * @author generator - * @date 2022-08-18 - */ - IcPartyActOrgDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void save(IcPartyActOrgDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-08-18 - */ - void update(IcPartyActOrgDTO dto); - - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-08-18 - */ - void delete(String[] ids); + int deleteByPartyActId(String customerId, List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java new file mode 100644 index 0000000000..6c70b77d3f --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/ResiPartymemberAttachmentService.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; + +import java.util.List; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +public interface ResiPartymemberAttachmentService extends BaseService { + int deleteByBusinessId(String customerId, List businessIds); +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java index 0339c1dc77..dc767f47e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActOrgServiceImpl.java @@ -1,22 +1,13 @@ package com.epmet.modules.partyOrg.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; -import com.epmet.resi.partymember.dto.IcPartyActOrgDTO; -import org.apache.commons.lang3.StringUtils; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; import java.util.List; -import java.util.Map; /** * 参加活动党组织表 @@ -28,55 +19,13 @@ import java.util.Map; public class IcPartyActOrgServiceImpl extends BaseServiceImpl implements IcPartyActOrgService { @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActOrgDTO.class); + public int deleteByPartyActId(String customerId, List icPartyActIds) { + if (CollectionUtils.isEmpty(icPartyActIds)) { + return 0; + } + return baseDao.deleteByPartyActId(customerId, icPartyActIds); } - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActOrgDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public IcPartyActOrgDTO get(String id) { - IcPartyActOrgEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IcPartyActOrgDTO.class); - } - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcPartyActOrgDTO dto) { - IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IcPartyActOrgDTO dto) { - IcPartyActOrgEntity entity = ConvertUtils.sourceToTarget(dto, IcPartyActOrgEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } +} -} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 86e6fbe505..f8d8067598 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -4,21 +4,24 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -34,10 +37,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; +import java.util.*; /** * 党建组织活动 @@ -54,7 +54,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); - icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); if (null == staffInfo) { String msg = "查询工作人员信息异常"; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); } + IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); icPartyActEntity.setOrgId(staffInfo.getAgencyId()); icPartyActEntity.setPid(staffInfo.getParentAgency().getId()); icPartyActEntity.setOrgIdPath(staffInfo.getAgencyPIds()); if(StringUtils.isNotBlank(formDTO.getIcPartyActId())){ + icPartyActEntity.setId(formDTO.getIcPartyActId()); //删除附件、删除参加组织 - + SpringContextUtils.getBean(ResiPartymemberAttachmentService.class).deleteByBusinessId(formDTO.getCustomerId(), Arrays.asList(formDTO.getIcPartyActId())); + SpringContextUtils.getBean(IcPartyActOrgService.class).deleteByPartyActId(formDTO.getCustomerId(), Arrays.asList(formDTO.getIcPartyActId())); + baseDao.updateById(icPartyActEntity); + }else{ + baseDao.insert(icPartyActEntity); } - - - return null; + //新增参加参加活动党组织 + List orgList=ConvertUtils.sourceToTarget(formDTO.getJoinOrgList(),IcPartyActOrgEntity.class); + orgList.forEach(joinOrg->{ + joinOrg.setCustomerId(formDTO.getCustomerId()); + joinOrg.setIcPartyActId(icPartyActEntity.getId()); + icPartyActOrgDao.insert(joinOrg); + }); + //批量新增附件 + List attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); + int attSort = 1; + for (ResiPartymemberAttachmentEntity att : attachmentEntityList) { + att.setCustomerId(formDTO.getCustomerId()); + att.setBusinessId(icPartyActEntity.getId()); + att.setAttachTo("ic_party_act"); + att.setSort(attSort); + attSort++; + resiPartymemberAttachmentDao.insert(att); + } + Map map=new HashMap<>(); + map.put("icPartyActId",icPartyActEntity.getId()); + return map; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java new file mode 100644 index 0000000000..df42c273c0 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/ResiPartymemberAttachmentServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 本库附件表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-19 + */ +@Service +public class ResiPartymemberAttachmentServiceImpl extends BaseServiceImpl implements ResiPartymemberAttachmentService { + + + @Override + public int deleteByBusinessId(String customerId, List businessIds) { + if(CollectionUtils.isEmpty(businessIds)){ + return 0; + } + return baseDao.deleteByBusinessId(customerId,businessIds); + } +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml index f84e9ae594..ce671cd13c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -2,5 +2,11 @@ - + + delete from ic_party_act_org + where customer_id = #{customerId} + + IC_PARTY_ACT_ID = #{icPartyActId} + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml new file mode 100644 index 0000000000..955f5f4664 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + delete from resi_partymember_attachment + where customer_id=#{customerId} + + BUSINESS_ID = #{businessId} + + + \ No newline at end of file From 4d75e92e7832e6067d235c5bb73b30646f9b71a6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 14:59:45 +0800 Subject: [PATCH 024/206] =?UTF-8?q?=E6=BC=8F=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b96dd74b60..05deb51cad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -10,19 +10,27 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; import com.epmet.modules.partyOrg.dao.IcScheduleDao; +import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; From dc1b929138d9166d2cbc8b1a00136cb7c0dcc1f8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 15:25:55 +0800 Subject: [PATCH 025/206] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 2 + .../result/ActAndScheduleListResultDTO.java | 30 ++++++++++++- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 ++ .../modules/partyOrg/dao/IcScheduleDao.java | 4 ++ .../service/impl/IcPartyActServiceImpl.java | 43 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 43 +++++++++++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 13 ++++++ .../mapper/partyOrg/IcScheduleDao.xml | 16 ++++++- 9 files changed, 150 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 5789e543e8..b6b33564d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -30,4 +30,6 @@ public class ActAndScheduleListFormDTO implements Serializable { private String customerId; private String staffId; + private String agencyId; + private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 611d4bf6ed..20b1e69408 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.resi.partymember.dto.partyOrg.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -30,16 +32,22 @@ public class ActAndScheduleListResultDTO implements Serializable { private static final long serialVersionUID = -9050507457068805831L; private String activityId; + private String staffId; private String topic; private String address; private String holdTime; private String type; private String isPublicValue; + private String isPublish; private String joinTypeValue; - private Boolean isMe; + private String joinUserType; + private List joinOrgList; + private List joinOrgs; + private Boolean isMe = false; } + @Data public static class ScheduleListDTO implements Serializable{ private static final long serialVersionUID = 5372167729733804267L; @@ -48,6 +56,24 @@ public class ActAndScheduleListResultDTO implements Serializable { private String title; private String remindTime; private String remark; - private Boolean isMe; + private Boolean isMe = false; + private String staffId; + } + + @Data + public static class JoinOrgDTO implements Serializable{ + + private static final long serialVersionUID = -981758371558960097L; + + private String partyOrgId; + private String partyOrgName; + } + + public ActAndScheduleListResultDTO() { + this.scheduleTotal = NumConstant.ZERO; + this.activityTotal = NumConstant.ZERO; + this.dateId = ""; + this.activityList = new ArrayList<>(); + this.scheduleList = new ArrayList<>(); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 374dd39b7d..83774e4a62 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -3,6 +3,8 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -22,4 +24,6 @@ public interface IcPartyActDao extends BaseDao { * @return */ List actTypeList(String customerId); + + List getActivityList(ActAndScheduleListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 93fa4d8a64..bf28e8663b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.ibatis.annotations.Mapper; @@ -104,4 +105,6 @@ public interface IcPartyOrgDao extends BaseDao { * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity */ IcPartyOrgEntity selectByCustomerIdAndFirstOrg(@Param("customerId") String customerId); + + List getPartyOrg(@Param("orgIds")List orgIds); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 48aa6fd599..131ef13279 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,8 +2,10 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +24,6 @@ public interface IcScheduleDao extends BaseDao { List getScheduleAndActCount(HomeMonthTotalFormDTO formDTO); + List getScheduleList(ActAndScheduleListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 05deb51cad..fdefb4989a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -11,10 +11,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; -import com.epmet.modules.partyOrg.dao.ResiPartymemberAttachmentDao; +import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; @@ -40,6 +37,7 @@ import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; import java.util.*; +import java.util.stream.Collectors; /** * 党建组织活动 @@ -57,6 +55,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); + if (CollectionUtils.isNotEmpty(activityList)){ + List partyOrgIdsNoDistinct = new ArrayList<>(); + activityList.forEach(a -> { + partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); + }); + List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); + List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); + a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); + }); + } + List scheduleList = scheduleDao.getScheduleList(formDTO); + if (CollectionUtils.isNotEmpty(scheduleList)){ + scheduleList.forEach(s -> { + s.setIsMe(formDTO.getStaffId().equals(s.getStaffId())); + }); + } + ActAndScheduleListResultDTO result = new ActAndScheduleListResultDTO(); + result.setActivityList(activityList); + result.setScheduleList(scheduleList); + return result; } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 066206184f..3f36691815 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -17,4 +17,47 @@ ORDER BY d.SORT ASC + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1af1738da2..43c5697437 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -146,5 +146,18 @@ and ORG_PID = '0' + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index d4cd5a8674..990fa16220 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -38,10 +38,24 @@ AND CUSTOMER_ID = #{customerId} AND HOLD_YEAR_ID = #{yearId} - AND CREATED_BY = #{staffId} + AND PUBLISH_STAFF_ID = #{staffId} AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') GROUP BY HOLD_MONTH_ID)t GROUP BY t.monthId + \ No newline at end of file From eb6bb1d67a51c27e56a979f33082ac76cb77cb60 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 15:58:12 +0800 Subject: [PATCH 026/206] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 9 +++ .../ResiGroupOpenFeignClientFallback.java | 6 ++ .../controller/ResiGroupMemberController.java | 12 ++-- .../member/dao/ResiGroupMemberDao.java | 2 + .../service/ResiGroupMemberService.java | 2 + .../impl/ResiGroupMemberServiceImpl.java | 5 ++ .../mapper/member/ResiGroupMemberDao.xml | 15 +++++ .../partyOrg/service/IcPartyActService.java | 4 ++ .../service/impl/IcPartyActServiceImpl.java | 59 ++++++++++++++++++- .../listener/PartyMeetingMessageListener.java | 3 +- 10 files changed, 111 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index 6a0c43f14c..f3003fc047 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.*; @@ -333,4 +334,12 @@ public interface ResiGroupOpenFeignClient { */ @PostMapping("/resi/group/group/getBranchGroupList") Result>> getBranchGroupList(); + + /** + * @Author sun + * @Description 查询小组成员列表 + **/ + @PostMapping("/resi/group/member/getmemberlist") + Result> getMemberList(@RequestBody List groupIdList); + } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index 98cddc7d9b..f42d54799f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.group.form.*; import com.epmet.resi.group.dto.group.result.*; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.topic.MyCreateTopicsFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.*; @@ -241,4 +242,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien public Result>> getBranchGroupList() { return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getBranchGroupList", null); } + + @Override + public Result> getMemberList(String groupId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupId); + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index c3d7547d07..b931bab11c 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -24,16 +24,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.member.service.GroupMemeberOperationService; import com.epmet.modules.member.service.ResiGroupMemberService; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.dto.member.form.*; import com.epmet.resi.group.dto.member.result.ApplyingMemberResultDTO; import com.epmet.resi.group.dto.member.result.GridVotableCountResultDTO; import com.epmet.resi.group.dto.member.result.GroupMemberListResultDTO; import com.epmet.resi.group.dto.member.result.JoinGroupApplyRealTimeResultDTO; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -206,4 +204,10 @@ public class ResiGroupMemberController { ValidatorUtils.validateEntity(param); return new Result().ok(operationService.applyEnterByLink(param)); } + + @PostMapping("getmemberlist") + public Result> groupMemberList(@RequestBody List groupIdList){ + return new Result>().ok(resiGroupMemberService.groupMemberList(groupIdList)); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java index daf4e23248..c6c5501de7 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java @@ -181,4 +181,6 @@ public interface ResiGroupMemberDao extends BaseDao { int countAllMembers(@Param("customerId") String customerId, @Param("groupId") String groupId); int exitGroupById(@Param("id") String id, @Param("updatedBy") String updatedBy); + + List groupMemberList(@Param("groupIdList") List groupIdList); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java index 8027971cb6..2355fd5a2a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/ResiGroupMemberService.java @@ -262,4 +262,6 @@ public interface ResiGroupMemberService extends BaseService groupMemberList(List groupIdList); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index a933306cb2..773bf9ebf1 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -1036,4 +1036,9 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl groupMemberList(List groupIdList) { + return baseDao.groupMemberList(groupIdList); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml index ff7060f839..af37ca8cc6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml @@ -250,4 +250,19 @@ WHERE id = #{id} + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index d0f1d68d65..100c47fead 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -1,6 +1,8 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -62,6 +64,8 @@ public interface IcPartyActService extends BaseService { */ IcPartyActDetailResDTO queryActDetail(String customerId, String userId, String icPartyActId); + void partyMeetingMessage(PartyMeetingMessageMQMsg dto); + /** * Desc: 【党建日历】活动、日程列表 * @param formDTO diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index fdefb4989a..9021a6a90d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,23 +1,33 @@ package com.epmet.modules.partyOrg.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; +import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; @@ -36,6 +46,11 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import java.util.*; import java.util.stream.Collectors; @@ -47,7 +62,8 @@ import java.util.stream.Collectors; */ @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { - + @Autowired + private ResiGroupOpenFeignClient resiGroupOpenFeignClient; @Autowired private IcScheduleDao scheduleDao; @Autowired @@ -262,4 +278,45 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { return null; } + + /** + * 党建小助手活动触发为用户推送消息 + */ + @Override + public void partyMeetingMessage(PartyMeetingMessageMQMsg formDTO) { + //1.校验活动数据是否存在 + IcPartyActEntity entity = baseDao.selectById(formDTO.getIcPartyActId()); + if(null==entity){ + String msg = "活动信息不存在，活动Id:" + formDTO.getIcPartyActId(); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); + } + //2.根据不同类型消息触发不同处理逻辑 + //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 + if("publish".equals(formDTO.getType())){ + //查询活动对应的发布范围信息 + LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyActOrgEntity::getDelFlag, NumConstant.ZERO_STR); + orgWrapper.eq(IcPartyActOrgEntity::getIcPartyActId, formDTO.getIcPartyActId()); + List list = icPartyActOrgDao.selectList(orgWrapper); + List groupIdList = list.stream().filter(ca -> ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); + List partyOrgIdList = list.stream().filter(ca -> !ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); + //分别查询党组织、党小组下的人 + List userIdList = new ArrayList<>(); + if(!CollectionUtils.isEmpty(groupIdList)){ + Result> result = resiGroupOpenFeignClient.getMemberList(groupIdList); + if (!result.success()) { + throw new RenException("调用common service查询secret失败"); + } + userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList()); + } + if(!CollectionUtils.isEmpty(groupIdList)){ + //TODO + } + + //组装消息 + + } + + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java index 8c044e3f5a..d968dac4a1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/mq/listener/PartyMeetingMessageListener.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.modules.partyOrg.service.IcPartyActService; import org.apache.commons.lang.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus; @@ -69,7 +70,7 @@ public class PartyMeetingMessageListener implements MessageListenerConcurrently lock = distributedLock.getLock(String.format("lock:ic_warn_stats:%s", obj.getCustomerId()), 30L, 30L, TimeUnit.SECONDS); //待执行方法 - //SpringContextUtils.getBean(IcVolunteerPolyService.class).volunteerChanged(obj); + SpringContextUtils.getBean(IcPartyActService.class).partyMeetingMessage(obj); } catch (EpmetException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 From b4ca75470b44d378c3aa8d60778083b5466cd089 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 16:19:38 +0800 Subject: [PATCH 027/206] =?UTF-8?q?=E6=9A=82=E6=8F=90=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ActAndScheduleListResultDTO.java | 2 + .../service/impl/IcPartyActServiceImpl.java | 68 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 12 +++- .../mapper/partyOrg/IcScheduleDao.xml | 15 +++- 4 files changed, 82 insertions(+), 15 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 20b1e69408..9b3248a0f3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -33,6 +33,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String activityId; private String staffId; + private String dateId; private String topic; private String address; private String holdTime; @@ -58,6 +59,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String remark; private Boolean isMe = false; private String staffId; + private String dateId; } @Data diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 9021a6a90d..9ef8a4acbe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -14,21 +14,17 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.modules.partyOrg.dao.IcPartyActDao; -import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; -import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyOrgService; +import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; -import com.epmet.modules.partyOrg.service.ResiPartymemberAttachmentService; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -46,11 +42,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import java.util.*; import java.util.stream.Collectors; @@ -276,9 +267,64 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { - return null; + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + if (null == icPartyOrgDTO){ + throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + } + formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + List result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); + List activityList = baseDao.getActivityList(formDTO); + if (CollectionUtils.isNotEmpty(activityList)){ + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + }); + Map> groupByDateId = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getDateId)); + result.forEach(r -> { + groupByDateId.forEach((dateId,list) -> { + if (r.getDateId().equals(dateId)){ + r.setActivityList(list); + r.setActivityTotal(list.size()); + } + }); + }); + } + List scheduleList = scheduleDao.getScheduleList(formDTO); + if (CollectionUtils.isNotEmpty(scheduleList)){ + scheduleList.forEach(s -> { + s.setIsMe(formDTO.getStaffId().equals(s.getStaffId())); + }); + Map> groupByDateId = scheduleList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ScheduleListDTO::getDateId)); + result.forEach(r -> { + groupByDateId.forEach((dateId,list) -> { + if (r.getDateId().equals(dateId)){ + r.setScheduleList(list); + r.setScheduleTotal(list.size()); + } + }); + }); + } + return result; } + public static List constructHomeSearchData(String startDate,String endDate){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List days = DateUtils.getDaysBetween(startDate, endDate); + days.forEach(d -> { + ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); + dto.setDateId(d); + result.add(dto); + }); + } + return result; + } + + /** * 党建小助手活动触发为用户推送消息 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 3f36691815..ed8d97111b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -21,6 +21,7 @@ + @@ -39,6 +40,7 @@ pa.TOPIC, pa.ADDRESS, DATE_FORMAT(pa.HOLD_TIME,'%Y-%m-%d %H:%i:%s') AS holdTime, + DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' WHEN pa.JOIN_USER_TYPE = '0' THEN '全体党员' @@ -54,10 +56,18 @@ LEFT JOIN ic_party_act_org ao ON (ao.IC_PARTY_ACT_ID = pa.ID AND ao.DEL_FLAG = 0) WHERE pa.DEL_FLAG = 0 AND pa.CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + AND pa.PUBLISH_STAFF_ID = #{staffId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') >= #{startDate} + + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') #{endDate} + AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 990fa16220..a9c155a9e1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -25,10 +25,10 @@ FROM ic_schedule WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(CREATED_TIME,'%Y') = #{yearId} + AND DATE_FORMAT(REMIND_TIME,'%Y') = #{yearId} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') - GROUP BY DATE_FORMAT(CREATED_TIME,'%Y%m') + GROUP BY DATE_FORMAT(REMIND_TIME,'%Y%m') UNION ALL SELECT COUNT(id) as count, @@ -49,12 +49,21 @@ ID AS scheduleId, TITLE, DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, + DATE_FORMAT(REMIND_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID FROM ic_schedule WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} - AND DATE_FORMAT(CREATED_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') = #{dateId} + + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') >= #{startDate} + + + AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') #{endDate} + AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') From cc34cb2ead75ba6b1332219844e08c987e392ea2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 16:31:06 +0800 Subject: [PATCH 028/206] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcScheduleServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 3c7861a02d..2d38215d07 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; @@ -11,11 +12,15 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.constant.SystemMessageType; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.send.SendMqMsgUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -112,6 +117,13 @@ public class IcScheduleServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 16:35:59 +0800 Subject: [PATCH 029/206] tiyixia --- .../form/IcPartyActPageFormDTO.java | 18 +++++++++++ .../controller/IcPartyActController.java | 2 ++ .../service/impl/IcPartyActServiceImpl.java | 30 ++++++++++--------- 3 files changed, 36 insertions(+), 14 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index e722f5fab7..2a52c6cc2a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.resi.partymember.dto.icpartyact.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -13,7 +14,24 @@ import java.io.Serializable; @Data public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -8171649039313981541L; + // tokenDto取值 + @NotBlank(message = "cusotomerId不能为空",groups = AddUserInternalGroup.class) private String customerId; + @NotBlank(message = "publishStaffId不能为空",groups = AddUserInternalGroup.class) private String publishStaffId; + /** + * 接口内部查询 + * 当前登录用户所属的行政组织id + */ + private String staffAgencyId; + // 界面传参数 + private String publishPartyOrgId; + private String startDate; + private String endDate; + private String address; + private String topic; + private String isPublish; + private String actType; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2de07478c1..073e707bd1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; @@ -67,6 +68,7 @@ public class IcPartyActController { public Result> pageList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); return new Result>().ok(icPartyActService.pageList(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index fdefb4989a..643d525bd2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -85,10 +85,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); - } + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(staffInfo.getAgencyId()); IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); if (null == icPartyOrgDTO){ @@ -138,11 +135,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); - if (null == staffInfo) { - String msg = "查询工作人员信息异常"; - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); - } + CustomerStaffInfoCacheResult staffInfo=queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); @@ -181,6 +174,15 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageList(IcPartyActPageFormDTO formDTO) { - //todo + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + formDTO.setStaffAgencyId(staffInfo.getAgencyId()); + // todo + return null; } @@ -216,10 +221,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 16:36:08 +0800 Subject: [PATCH 030/206] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/fallback/ResiGroupOpenFeignClientFallback.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index f42d54799f..db43abe079 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -244,7 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getMemberList(String groupId) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupId); + public Result> getMemberList(List groupIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList); } + } From c1f84de7102932d5b9d0960fd7640c3f027779e1 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:45:14 +0800 Subject: [PATCH 031/206] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../messages/PartyMeetingMessageMQMsg.java | 2 +- .../group/feign/ResiGroupOpenFeignClient.java | 4 +- .../ResiGroupOpenFeignClientFallback.java | 4 +- .../controller/ResiGroupMemberController.java | 2 +- .../service/impl/IcPartyActServiceImpl.java | 59 ++++++++++++++----- 5 files changed, 49 insertions(+), 22 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java index f019090330..af8792ea1c 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/PartyMeetingMessageMQMsg.java @@ -15,7 +15,7 @@ public class PartyMeetingMessageMQMsg extends MqBaseFormDTO implements Serializa //客户Id private String customerId; - //活动Id + //活动/日程Id private String icPartyActId; //动作类型 发布活动:publish 提前提醒:remind 日程通知:notify private String type; diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index f3003fc047..b7a4f54672 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -339,7 +339,7 @@ public interface ResiGroupOpenFeignClient { * @Author sun * @Description 查询小组成员列表 **/ - @PostMapping("/resi/group/member/getmemberlist") - Result> getMemberList(@RequestBody List groupIdList); + @PostMapping("/resi/group/member/groupmemberlist") + Result> groupMemberList(@RequestBody List groupIdList); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index db43abe079..d3bff53996 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -244,8 +244,8 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien } @Override - public Result> getMemberList(List groupIdList) { - return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "getMemberList", groupIdList); + public Result> groupMemberList(List groupIdList) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index b931bab11c..cf99c5a61b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -205,7 +205,7 @@ public class ResiGroupMemberController { return new Result().ok(operationService.applyEnterByLink(param)); } - @PostMapping("getmemberlist") + @PostMapping("groupmemberlist") public Result> groupMemberList(@RequestBody List groupIdList){ return new Result>().ok(resiGroupMemberService.groupMemberList(groupIdList)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ce7530def5..8cd94b00eb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -14,6 +15,12 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.modules.partyOrg.dao.IcPartyActDao; +import com.epmet.modules.partyOrg.dao.IcPartyActOrgDao; +import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; @@ -35,6 +42,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,6 +59,7 @@ import java.util.stream.Collectors; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-18 */ +@Slf4j @Service public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyActService { @Autowired @@ -65,6 +74,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ - List result = new ArrayList<>(); - if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ - List days = DateUtils.getDaysBetween(startDate, endDate); - days.forEach(d -> { - ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); - dto.setDateId(d); - result.add(dto); - }); - } - return result; - } - - /** * 党建小助手活动触发为用户推送消息 */ @@ -338,6 +335,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 if("publish".equals(formDTO.getType())){ @@ -351,7 +349,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl userIdList = new ArrayList<>(); if(!CollectionUtils.isEmpty(groupIdList)){ - Result> result = resiGroupOpenFeignClient.getMemberList(groupIdList); + Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } @@ -362,9 +360,38 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_RESI); + msg.setTitle("您收到一个新的活动通知"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(id); + msgList.add(msg); + }); + //工作人员 + UserMessageFormDTO msg = new UserMessageFormDTO(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setApp(AppClientConstant.APP_GOV); + msg.setTitle("您有一个活动已经发布"); + msg.setReadFlag(ReadFlagConstant.UN_READ); + StringBuffer str = new StringBuffer(); + str.append("主题:").append(entity.getTopic()).append("\n").append("时间:").append(entity.getHoldTime()).append("\n").append("地点:").append(entity.getAddress()); + msg.setMessageContent(str.toString()); + msg.setMessageType("party"); + msg.setTargetId(formDTO.getIcPartyActId()); + msg.setUserId(entity.getPublishStaffId()); + msgList.add(msg); } + + //推送消息 + Result sendMessageRes = messageOpenFeignClient.saveIcMessageList(msgList); } } \ No newline at end of file From cf53b34dcf241edd0d7ba0304cbeb1175a9d8d3f Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 16:47:35 +0800 Subject: [PATCH 032/206] =?UTF-8?q?=E5=85=88=E6=8F=90=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8cd94b00eb..d4fcb3ae92 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -323,6 +323,18 @@ public class IcPartyActServiceImpl extends BaseServiceImpl constructHomeSearchData(String startDate,String endDate){ + List result = new ArrayList<>(); + if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ + List days = DateUtils.getDaysBetween(startDate, endDate); + days.forEach(d -> { + ActAndScheduleListResultDTO dto = new ActAndScheduleListResultDTO(); + dto.setDateId(d); + result.add(dto); + }); + } + return result; + } /** * 党建小助手活动触发为用户推送消息 From cc09e3c628bca2cc1d224a5fd6e893e2084c070f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 17:01:47 +0800 Subject: [PATCH 033/206] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/IcPartyActPageResultDTO.java | 51 +++++++++++++++++++ .../controller/IcPartyActController.java | 6 ++- .../modules/partyOrg/dao/IcPartyActDao.java | 9 ++++ .../partyOrg/service/IcPartyActService.java | 3 +- .../service/impl/IcPartyActServiceImpl.java | 12 +++-- .../mapper/partyOrg/IcPartyActDao.xml | 44 ++++++++++++++++ 6 files changed, 117 insertions(+), 8 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index 46becccdfe..b5c9589d5d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @Description @@ -12,5 +14,54 @@ import java.io.Serializable; @Data public class IcPartyActPageResultDTO implements Serializable { private static final long serialVersionUID = 1414832133227703667L; + + private String icPartyActId; + /** + * 活动主题 + */ + private String topic; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 活动发布人姓名 + */ + private String publishStaffName; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actType; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actTypeName; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") + private Date holdTime; + + /** + * 活动地点 + */ + private String address; + + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublish; + + /** + * 活动发布人 + */ + private String publishStaffId; + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 073e707bd1..a5c2855bb6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -59,7 +59,7 @@ public class IcPartyActController { } /** - * 活动列表分页 + * 【活动列表】分页查询(工作端小程序通用) * @param tokenDto * @param formDTO * @return @@ -74,12 +74,16 @@ public class IcPartyActController { /** * 活动列表活动详情 + * 居民端小程序活动详情、工作端小程序活动详情通用 * @param tokenDto * @param icPartyActId * @return */ @PostMapping("act-detail/{icPartyActId}") public Result actDetail(@LoginUser TokenDto tokenDto, @PathVariable("icPartyActId")String icPartyActId){ + if(StringUtils.isBlank(icPartyActId)){ + return new Result<>(); + } return new Result().ok(icPartyActService.queryActDetail(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActId)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 83774e4a62..87b393293c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -2,7 +2,9 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; +import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +28,11 @@ public interface IcPartyActDao extends BaseDao { List actTypeList(String customerId); List getActivityList(ActAndScheduleListFormDTO formDTO); + + /** + * pc活动列表分页 + * @param formDTO + * @return + */ + List selectPageList(IcPartyActPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 100c47fead..3c4d7a92e0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; -import com.epmet.commons.tools.dto.form.mq.MqBaseFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -49,7 +48,7 @@ public interface IcPartyActService extends BaseService { Map addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO); /** - * 活动列表-分页查询 + * 【活动列表】分页查询(工作端小程序通用) * @param formDTO * @return */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ce7530def5..e94fa39ec6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -35,6 +35,8 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -192,18 +194,18 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageList(IcPartyActPageFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); + CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getPublishStaffId()); formDTO.setStaffAgencyId(staffInfo.getAgencyId()); - // todo - - return null; + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ed8d97111b..f690934076 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -70,4 +70,48 @@ AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + \ No newline at end of file From fc94ca79b5be52fb19acbd7886f0110c6e8b01fa Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 17:05:51 +0800 Subject: [PATCH 034/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 68 +++++++++++++++---- 1 file changed, 56 insertions(+), 12 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index d4fcb3ae92..f8a9127c08 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import com.epmet.modules.partyOrg.service.IcPartyActOrgService; import com.epmet.modules.partyOrg.service.IcPartyActService; @@ -341,16 +342,27 @@ public class IcPartyActServiceImpl extends BaseServiceImpl msgList = new ArrayList<>(); //2.根据不同类型消息触发不同处理逻辑 //2-1.发布活动给居民端涉及党员已经工作端活动发布站推送党建活动消息 - if("publish".equals(formDTO.getType())){ + if ("publish".equals(formDTO.getType())) { //查询活动对应的发布范围信息 LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); orgWrapper.eq(IcPartyActOrgEntity::getDelFlag, NumConstant.ZERO_STR); @@ -360,19 +372,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyOrgIdList = list.stream().filter(ca -> !ca.getOrgType().equals("6")).map(m -> m.getJoinOrgId()).collect(Collectors.toList()); //分别查询党组织、党小组下的人 List userIdList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { Result> result = resiGroupOpenFeignClient.groupMemberList(groupIdList); if (!result.success()) { throw new RenException("调用common service查询secret失败"); } userIdList = result.getData().stream().map(ResiGroupMemberDTO::getCustomerUserId).collect(Collectors.toList()); } - if(!CollectionUtils.isEmpty(groupIdList)){ + if (!CollectionUtils.isEmpty(groupIdList)) { //TODO } //组装消息 - userIdList.forEach(id->{ + for (String id : userIdList){ UserMessageFormDTO msg = new UserMessageFormDTO(); msg.setCustomerId(formDTO.getCustomerId()); msg.setApp(AppClientConstant.APP_RESI); @@ -385,7 +397,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 19 Aug 2022 17:06:34 +0800 Subject: [PATCH 035/206] =?UTF-8?q?=E5=8F=88tm=E4=B8=A2=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 57a777bbac..90f6baabd6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; +import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -15,6 +16,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.constant.ReadFlagConstant; +import com.epmet.dto.form.UserMessageFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; @@ -35,9 +39,10 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import org.apache.commons.collections4.CollectionUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; From a4de7bbb920858a57fd610a273296e2974faee78 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 17:17:41 +0800 Subject: [PATCH 036/206] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 33 +++++++++++-------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 42274e8368..c6d123626f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -248,17 +248,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ - List partyOrgIdsNoDistinct = new ArrayList<>(); - activityList.forEach(a -> { - partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); - }); - List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); - List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); - activityList.forEach(a -> { - a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); - a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); - a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); - }); + disposeActivityList(formDTO,activityList); } List scheduleList = scheduleDao.getScheduleList(formDTO); if (CollectionUtils.isNotEmpty(scheduleList)){ @@ -293,9 +283,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); List activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ - activityList.forEach(a -> { - a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); - }); + disposeActivityList(formDTO,activityList); Map> groupByDateId = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getDateId)); result.forEach(r -> { groupByDateId.forEach((dateId,list) -> { @@ -323,6 +311,23 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList){ + List partyOrgIdsNoDistinct = new ArrayList<>(); + activityList.forEach(a -> { + partyOrgIdsNoDistinct.addAll(a.getJoinOrgList().stream().map(m -> m.getPartyOrgId()).collect(Collectors.toList())); + }); + List partyOrgIds = partyOrgIdsNoDistinct.stream().distinct().collect(Collectors.toList()); + List partyOrg = partyOrgDao.getPartyOrg(partyOrgIds); + if (CollectionUtils.isNotEmpty(activityList)) { + activityList.forEach(a -> { + a.setIsMe(formDTO.getStaffId().equals(a.getStaffId())); + a.getJoinOrgList().forEach(po -> partyOrg.stream().filter(p -> p.getPartyOrgId().equals(po.getPartyOrgId())).forEach(p -> po.setPartyOrgName(p.getPartyOrgName()))); + a.setJoinOrgs(a.getJoinOrgList().stream().map(m -> m.getPartyOrgName()).collect(Collectors.toList())); + }); + } + } + public static List constructHomeSearchData(String startDate,String endDate){ List result = new ArrayList<>(); if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)){ From 2b1cfe0e7e3041e1bf8a9c1b14ec0dddf85f9dae Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 19 Aug 2022 17:31:39 +0800 Subject: [PATCH 037/206] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 46 ++++++++++++------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c6d123626f..0a1c09f318 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -239,13 +239,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ disposeActivityList(formDTO,activityList); @@ -270,16 +264,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl homeSearch(ActAndScheduleListFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); - if (null == staffInfo){ - throw new EpmetException("查询工作人员失败："+formDTO.getStaffId()); - } - formDTO.setAgencyId(staffInfo.getAgencyId()); - IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); - if (null == icPartyOrgDTO){ - throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); - } - formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + disposeActAndScheduleListFormDTO(formDTO); List result = constructHomeSearchData(formDTO.getStartDate(), formDTO.getEndDate()); List activityList = baseDao.getActivityList(formDTO); if (CollectionUtils.isNotEmpty(activityList)){ @@ -312,6 +297,33 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList){ List partyOrgIdsNoDistinct = new ArrayList<>(); activityList.forEach(a -> { From 61499f71f92854a259a9720311ca01c20c529c26 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 19 Aug 2022 17:34:44 +0800 Subject: [PATCH 038/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/IcMessageListFormDTO.java | 19 ++++++++++ .../epmet/controller/IcMessageController.java | 12 ++++-- .../main/java/com/epmet/dao/IcMessageDao.java | 7 +++- .../com/epmet/service/IcMessageService.java | 15 ++------ .../service/impl/IcMessageServiceImpl.java | 38 +++++++++++-------- .../main/resources/mapper/IcMessageDao.xml | 20 +++++++++- 6 files changed, 77 insertions(+), 34 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java new file mode 100644 index 0000000000..b498576824 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcMessageListFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + //token中信息 + private String customerId; + private String userId; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index 034601b985..daae8cb210 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -10,6 +12,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -31,10 +34,11 @@ public class IcMessageController { @Autowired private IcMessageService icMessageService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icMessageService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcMessageListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icMessageService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index f8b474aecf..3e51845040 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 用户消息表(党建小助手) * @@ -12,5 +16,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcMessageDao extends BaseDao { - + + List selectMessageList(IcMessageListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index 04524957b4..bb2c4e7284 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -18,25 +19,15 @@ import java.util.Map; */ public interface IcMessageService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-19 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-19 */ - List list(Map params); + PageData list(IcMessageListFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 305dff1f02..611ab78964 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -4,20 +4,34 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcMessageDao; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; +import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.result.AllGridsByUserIdResultDTO; +import com.epmet.dto.result.HouseInfoDTO; +import com.epmet.dto.result.IcMoveInListResultDTO; import com.epmet.entity.IcMessageEntity; import com.epmet.service.IcMessageService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; -import java.util.Arrays; -import java.util.List; -import java.util.Map; +import java.util.*; +import java.util.function.Function; +import java.util.stream.Collectors; /** * 用户消息表(党建小助手) @@ -30,19 +44,11 @@ public class IcMessageServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcMessageDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcMessageDTO.class); + public PageData list(IcMessageListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectMessageList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 5f186be462..b9adf18986 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -3,6 +3,24 @@ - + \ No newline at end of file From 083ca8fe8586351df6f1c4246804640830902a76 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 17:49:23 +0800 Subject: [PATCH 039/206] xiangqing --- .../dto/icpartyact/form/JoinOrgDTO.java | 12 +- .../result/IcPartyActDetailResDTO.java | 113 ++++++++++++++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 2 + .../dao/ResiPartymemberAttachmentDao.java | 3 + .../IcPartyActSignInRecordService.java | 9 ++ .../service/impl/IcPartyActServiceImpl.java | 20 +++- .../IcPartyActSignInRecordServiceImpl.java | 19 +++ .../mapper/partyOrg/IcPartyActDao.xml | 9 ++ .../partyOrg/ResiPartymemberAttachmentDao.xml | 17 +++ 9 files changed, 197 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 682b4306ec..383cd43417 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -20,7 +20,11 @@ public class JoinOrgDTO implements Serializable { */ @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) private String joinOrgId; - + /** + * 参加党组织名称 + */ + @NotBlank(message = "参加党组织名称不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class}) + private String joinOrgName; /** * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ @@ -49,5 +53,11 @@ public class JoinOrgDTO implements Serializable { * 客户ID */ private String customerId; + + /** + * ic_party_act_org.id + * 详情接口返回 + */ + private String icPartyActOrgRecId; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 7cde53d040..04bfc3ddcc 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -1,8 +1,14 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.Valid; import java.io.Serializable; +import java.util.Date; +import java.util.List; /** * @Description @@ -12,5 +18,112 @@ import java.io.Serializable; @Data public class IcPartyActDetailResDTO implements Serializable { private static final long serialVersionUID = -8102085878449811977L; + private String customerId; + + private String publishStaffId; + + private String icPartyActId; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + private String actType; + private String actTypeName; + + /** + * 活动举办时间：yyyy + */ + private String holdYearId; + + /** + * 活动举办时间:yyyyMM + */ + private String holdMonthId; + + /** + * 举办活动时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date holdTime; + + /** + * 活动主题 + */ + private String topic; + + /** + * 活动地点 + */ + private String address; + + /** + * 活动地点纬度 + */ + private String latitude; + + /** + * 活动地点经度 + */ + private String longitude; + + /** + * 活动开始前几天 + */ + private Integer autoPublicType; + /** + * 发布活动党组织 + */ + private String publishPartyOrgId; + + /** + * 发布活动党组织名称 + */ + private String publishPartyOrgName; + + /** + * 发布活动党组织ID的上级节点 + */ + private String publishOrgPid; + + /** + * 发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + private String publishOrgType; + + /** + * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 + */ + private String publishOrgPath; + + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + private String joinUserTypeName; + + + /** + * 是否自动通知参加人员，0否；1是 + */ + private String isAutoInform; + + /** + * 活动介绍 + */ + private String introduce; + + /** + * 参加活动党组织 + */ + @Valid + private List joinOrgList; + + /** + * 附件表 + */ + private List attachmentList; + + private Boolean isSignIn; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 87b393293c..5212f9bb34 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -35,4 +35,6 @@ public interface IcPartyActDao extends BaseDao { * @return */ List selectPageList(IcPartyActPageFormDTO formDTO); + + String selectActTypeName(String actType); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java index 5b42ff57e4..f068318861 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/ResiPartymemberAttachmentDao.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -21,4 +22,6 @@ public interface ResiPartymemberAttachmentDao extends BaseDao businessIds); + + List selectListByBusinessId(String businessId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index ea54cd04e9..6cb940b2cc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -75,4 +75,13 @@ public interface IcPartyActSignInRecordService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId).eq(IcPartyActSignInRecordEntity::getEpmetUserId,userId); + if(baseDao.selectCount(wrapper)>0){ + return true; + } + return false; + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index f690934076..7587cc4ef6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -114,4 +114,13 @@ order by a.HOLD_TIME desc + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml index 955f5f4664..adbfeeaa0d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/ResiPartymemberAttachmentDao.xml @@ -31,4 +31,21 @@ BUSINESS_ID = #{businessId} + + \ No newline at end of file From 9e64429aea8b5fae6fd2678994f3f5f371b6ce44 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 19 Aug 2022 18:03:32 +0800 Subject: [PATCH 040/206] =?UTF-8?q?=E5=B7=B2=E7=BB=8F=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E8=BE=91=E9=9C=80=E8=A6=81=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index dc3a22fe5f..3a7254f146 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -17,6 +17,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.SystemMessageType; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; @@ -37,6 +38,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -157,13 +159,23 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); map.put("icPartyActId",icPartyActEntity.getId()); + //已经发布的，编辑需要发消息 + if(sendMsg){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(formDTO.getCustomerId()); + msg.setIcPartyActId(icPartyActEntity.getId()); + msg.setType("publish"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } return map; } From 4455a67f53d8cecbca3be1cd0054463c1d662b50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 09:23:05 +0800 Subject: [PATCH 041/206] =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyActOrgDao.java | 14 ++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 1 + .../mapper/partyOrg/IcPartyActOrgDao.xml | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index e38cde539a..09304e8ecb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,5 +17,18 @@ import java.util.List; @Mapper public interface IcPartyActOrgDao extends BaseDao { + /** + * 删除活动时，同时删除，参与活动党组织表 + * @param customerId + * @param icPartyActIds + * @return + */ int deleteByPartyActId(@Param("customerId") String customerId, @Param("icPartyActIds")List icPartyActIds); + + /** + * 查询活动的参与活动党组织列表 + * @param icPartyActId + * @return + */ + List selectJoinOrgList(String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 3a7254f146..bab46cb4ff 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -258,6 +258,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl + + \ No newline at end of file From c02382f0a401cced2b8a4f0dfbb2e00f7b2b0897 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 09:56:32 +0800 Subject: [PATCH 042/206] =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=81=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActController.java | 35 ++++++++++++- .../modules/partyOrg/dao/IcPartyActDao.java | 3 ++ .../partyOrg/dao/IcPartyActOrgDao.java | 2 + .../partyOrg/service/IcPartyActService.java | 16 ++++++ .../service/impl/IcPartyActServiceImpl.java | 51 +++++++++++++++++++ .../mapper/partyOrg/IcPartyActDao.xml | 9 ++++ .../mapper/partyOrg/IcPartyActOrgDao.xml | 8 +++ 7 files changed, 122 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index a5c2855bb6..73784ef2ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -16,6 +16,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,7 +39,7 @@ public class IcPartyActController { private IcPartyActService icPartyActService; /** - * 添加、修改活动 + * 添加、修改活动各端通用 * @param tokenDto * @param formDTO * @return @@ -141,5 +142,35 @@ public class IcPartyActController { formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icPartyActService.homeSearch(formDTO)); } - + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param tokenDto + * @param icPartyActId + * @return + */ + @PostMapping("publish/{icPartyActId}") + public Result publicshIcPartyAct(@LoginUser TokenDto tokenDto,@PathVariable("icPartyActId")String icPartyActId){ + icPartyActService.publicshIcPartyAct(tokenDto.getUserId(),icPartyActId); + return new Result(); + } + + /** + * pc活动列表-发布活动 + * pc党建日历左下角列表，点击删除 + * pc生成年度记录，删除活动 + * 工作端小程序-详情页面，删除 + * @param tokenDto + * @param icPartyActIds + * @return + */ + @PostMapping("del") + public Result deleteIcPartyAct(@LoginUser TokenDto tokenDto,@RequestBody List icPartyActIds){ + if(CollectionUtils.isNotEmpty(icPartyActIds)){ + icPartyActService.deleteIcPartyAct(tokenDto.getCustomerId(),tokenDto.getUserId(),icPartyActIds); + } + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5212f9bb34..febc8ec2ba 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -8,6 +8,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -37,4 +38,6 @@ public interface IcPartyActDao extends BaseDao { List selectPageList(IcPartyActPageFormDTO formDTO); String selectActTypeName(String actType); + + int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java index 09304e8ecb..9351804f7c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActOrgDao.java @@ -31,4 +31,6 @@ public interface IcPartyActOrgDao extends BaseDao { * @return */ List selectJoinOrgList(String icPartyActId); + + int updateToDel(@Param("userId") String userId, @Param("icPartyActId") String icPartyActId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 3c4d7a92e0..512c38a99d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -80,4 +80,20 @@ public interface IcPartyActService extends BaseService { * @date 2022/8/19 14:01 */ List homeSearch(ActAndScheduleListFormDTO formDTO); + + /** + * * pc活动列表-发布活动 + * pc党建日历左下角列表，点击发布 + * 工作端小程序点击发布 + * @param userId + * @param icPartyActId + */ + void publicshIcPartyAct(String userId, String icPartyActId); + + /** + * 删除活动 + * @param userId + * @param icPartyActIds + */ + void deleteIcPartyAct(String customerId,String userId, List icPartyActIds); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index bab46cb4ff..de4d785935 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -497,4 +497,55 @@ public class IcPartyActServiceImpl extends BaseServiceImpl icPartyActIds) { + if(CollectionUtils.isEmpty(icPartyActIds)){ + return; + } + icPartyActIds.forEach(icPartyActId->{ + //删除活动主表和参与活动党组织关系表记录 + baseDao.deleteIcPartyAct(customerId,userId,icPartyActId); + icPartyActOrgDao.updateToDel(userId,icPartyActId); + }); + + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7587cc4ef6..7ef1aca4d1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -123,4 +123,13 @@ WHERE d.type_key = #{actType} + + + update ic_party_act + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where customerId=#{customerId} + and id=#{icPartyActId} + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml index ad074e65ef..a639a41a8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActOrgDao.xml @@ -26,4 +26,12 @@ o.DEL_FLAG = '0' AND o.IC_PARTY_ACT_ID = #{icPartyActId} + + + update ic_party_act_org + set del_flag='1', + UPDATED_BY=#{userId}, + UPDATED_TIME=now() + where IC_PARTY_ACT_ID=#{icPartyActId} + \ No newline at end of file From 161ca5145535268612d442d5312f9e6d39828081 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 10:27:37 +0800 Subject: [PATCH 043/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/ReadIcMessageFormDTO.java | 18 ++++++++++++++++++ .../epmet/controller/IcMessageController.java | 13 +++++++++++++ .../main/java/com/epmet/dao/IcMessageDao.java | 3 +++ .../com/epmet/service/IcMessageService.java | 3 +++ .../service/impl/IcMessageServiceImpl.java | 14 ++++++++++++++ .../src/main/resources/mapper/IcMessageDao.xml | 11 +++++++++++ 6 files changed, 62 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java new file mode 100644 index 0000000000..d5c875bd87 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/ReadIcMessageFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class ReadIcMessageFormDTO implements Serializable { + private static final long serialVersionUID = 2697079163476964749L; + + /** + * 消息Id + */ + private String id; + //token中信息 + private String customerId; + private String userId; +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index daae8cb210..b93bd93fbc 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.service.IcMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -83,5 +84,17 @@ public class IcMessageController { return new Result(); } + /** + * @Author sun + * @Description 单条或批量修改已读 + **/ + @PostMapping("read") + public Result read(@LoginUser TokenDto tokenDto, @RequestBody ReadIcMessageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icMessageService.read(formDTO); + return new Result(); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index 3e51845040..998f48b62a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -3,6 +3,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; @@ -18,4 +19,6 @@ import java.util.List; public interface IcMessageDao extends BaseDao { List selectMessageList(IcMessageListFormDTO formDTO); + + void upByUserId(ReadIcMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index bb2c4e7284..c13639c418 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import java.util.List; @@ -70,4 +71,6 @@ public interface IcMessageService extends BaseService { void delete(String[] ids); void saveIcMessageList(List msgList); + + void read(ReadIcMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 611ab78964..5d2678c49d 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -16,6 +16,7 @@ import com.epmet.dto.IcMessageDTO; import com.epmet.dto.form.IcMessageFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IcMoveInListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.dto.result.AllGridsByUserIdResultDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.IcMoveInListResultDTO; @@ -93,4 +94,17 @@ public class IcMessageServiceImpl extends BaseServiceImpl + + UPDATE ic_message + SET read_flag = 'read', + updated_by = #{userId}, + updated_time = NOW() + WHERE + del_flag = '0' + AND customer_id = #{customerId} + AND user_id = #{userId} + + \ No newline at end of file From 55fc092534909ddd82fc89b85bb5aebf31d42d76 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 10:28:38 +0800 Subject: [PATCH 044/206] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 6 +++ .../dto/partyOrg/form/YearSearchFormDTO.java | 25 ++++++++++ .../result/ActAndScheduleListResultDTO.java | 4 ++ .../partyOrg/result/YearSearchResultDTO.java | 46 +++++++++++++++++++ .../controller/IcPartyActController.java | 17 +++++++ .../partyOrg/service/IcPartyActService.java | 10 ++++ .../service/impl/IcPartyActServiceImpl.java | 38 +++++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 17 ++++++- 8 files changed, 158 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index b6b33564d2..19998a2448 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -17,6 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable { private String startDate; private String endDate; private String dateId; + private String yearId; /** * 是否本人创建的活动，1：是；0：否 @@ -32,4 +33,9 @@ public class ActAndScheduleListFormDTO implements Serializable { private String staffId; private String agencyId; private String path; + + /** + * 当seachType = 'yearSearch'时，不需要查询党组织 + */ + private String searchType = ""; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java new file mode 100644 index 0000000000..983f48548d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:26 + * @DESC + */ +@Data +public class YearSearchFormDTO implements Serializable { + + private static final long serialVersionUID = 4557112229519696741L; + + public interface YearSearchForm{} + + @NotBlank(message = "yaerId不能为空",groups = YearSearchForm.class) + private String yearId; + + private String staffId; + private String customerId; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 9b3248a0f3..fe782a2083 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -37,6 +37,10 @@ public class ActAndScheduleListResultDTO implements Serializable { private String topic; private String address; private String holdTime; + private String autoPublicTime; + private String isAutoInformValue; + private String isAutoInform; + private String autoInformDay; private String type; private String isPublicValue; private String isPublish; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java new file mode 100644 index 0000000000..e03e53c13b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:27 + * @DESC + */ +@Data +public class YearSearchResultDTO implements Serializable { + + private static final long serialVersionUID = 8961924457475202790L; + + private String type; + private String frequency; + private List activityList; + + @Data + public static class YearSearchActivityListDTO implements Serializable{ + + private static final long serialVersionUID = -9050507457068805831L; + + private String activityId; + private String staffId; + private String dateId; + private String topic; + private String address; + private String holdTime; + private String type; + private String isPublicValue; + private String isPublish; + private String joinTypeValue; + private String joinUserType; + private String isAutoInformValue; + private String autoInformDay; + private String autoPublicTime; + private List joinOrgList; + private List joinOrgs; + private Boolean isMe = false; + + } +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 73784ef2ad..1f1ccfe249 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -14,8 +14,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -173,4 +175,19 @@ public class IcPartyActController { } return new Result(); } + + /** + * Desc:【党建日历】生成年度活动计划查询 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/22 09:33 + */ + @PostMapping("yearSearch") + public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.yearSearch(formDTO)); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 512c38a99d..eeba74188a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -11,8 +11,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import java.util.List; import java.util.Map; @@ -96,4 +98,12 @@ public interface IcPartyActService extends BaseService { * @param icPartyActIds */ void deleteIcPartyAct(String customerId,String userId, List icPartyActIds); + + /** + * Desc: 【党建日历】生成年度活动计划查询 + * @param formDTO + * @author zxc + * @date 2022/8/22 09:33 + */ + List yearSearch(YearSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index de4d785935..f8d7f8ec98 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -36,8 +36,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -328,6 +330,32 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); + secondForm.setSearchType("yearSearch"); + disposeActAndScheduleListFormDTO(secondForm); + List activityList = baseDao.getActivityList(secondForm); + List result = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(activityList)) { + disposeActivityList(secondForm, activityList); + Map> groupByType = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getType)); + groupByType.forEach((type,list) -> { + YearSearchResultDTO dto = new YearSearchResultDTO(); + dto.setType(type); + dto.setActivityList(ConvertUtils.sourceToTarget(list, YearSearchResultDTO.YearSearchActivityListDTO.class)); + result.add(dto); + }); + } + return result; + } + /** * Desc: * @param formDTO @@ -340,11 +368,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl + + + + @@ -40,6 +44,12 @@ pa.TOPIC, pa.ADDRESS, DATE_FORMAT(pa.HOLD_TIME,'%Y-%m-%d %H:%i:%s') AS holdTime, + (CASE WHEN pa.IS_AUTO_INFORM = '1' THEN '是' + WHEN pa.IS_AUTO_INFORM = '0' THEN '否' + ELSE '否' END) AS isAutoInformValue, + pa.IS_AUTO_INFORM as isAutoInform, + if(IS_AUTO_INFORM = '1',DATE_FORMAT(pa.AUTO_PUBLIC_TIME,'%Y-%m-%d %H:%i:%s'),'') AS autoPublicTime, + if(IS_AUTO_INFORM = '1',concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'') as autoInformDay, DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' @@ -59,6 +69,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') + AND pa.PUBLISH_STAFF_ID = #{staffId} @@ -68,7 +81,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') #{endDate} - AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + + From 822744f373b33488b8af6f98e010e03775ccd011 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 11:07:50 +0800 Subject: [PATCH 046/206] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/DefaultPartyOrgResDTO.java | 37 +++++++++++++++++++ .../controller/IcPartyOrgController.java | 11 ++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 2 + .../partyOrg/service/IcPartyOrgService.java | 9 +++++ .../service/impl/IcPartyOrgServiceImpl.java | 27 ++++++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 27 +++++++++++++- 6 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java new file mode 100644 index 0000000000..827aad2257 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 10:25 + */ +@Data +public class DefaultPartyOrgResDTO implements Serializable { + private static final long serialVersionUID = -7563161453372080189L; + /** + * 当前登录用户所属的组织 + */ + private String staffAgencyId; + /** + * 当前登录用户所属的组织名称 + */ + private String staffAgencyName; + /** + * 当前登录用户所属的行政组织下，默认的党组织名称 + */ + private String defaultPartyOrgId; + private String defaultPartyOrgPid; + /** + * 党组织名称 + */ + private String defaultPartyOrgName; + /** + * 党组织路径 + */ + private String defaultPartyOrgPath; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index e1af2d4515..73b7b83e0f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -17,6 +17,7 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -155,4 +156,14 @@ public class IcPartyOrgController { return new Result>().ok(icPartyOrgService.getPartyOrgList(tokenDto)); } + /** + * 党组织活动发布时， + * 查询当前登录用户所属行政组织下，默认的党组织，取第一个 + * @param tokenDto + * @return + */ + @PostMapping("defaultpartyorg") + public Result defaultPartyOrg(@LoginUser TokenDto tokenDto){ + return new Result().ok(icPartyOrgService.defaultPartyOrg(tokenDto.getCustomerId(), tokenDto.getUserId())); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index bf28e8663b..5bd233d672 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -107,4 +107,6 @@ public interface IcPartyOrgDao extends BaseDao { IcPartyOrgEntity selectByCustomerIdAndFirstOrg(@Param("customerId") String customerId); List getPartyOrg(@Param("orgIds")List orgIds); + + IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index ea0c5615fd..defd146e01 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.List; @@ -127,4 +128,12 @@ public interface IcPartyOrgService extends BaseService { * @Date 2022/8/15 15:52 */ Map getPartyOrgList(TokenDto tokenDto); + + /** + * 党组织活动发布时， + * 查询当前登录用户所属行政组织下，默认的党组织，取第一个 + * @param tokenDto + * @return + */ + DefaultPartyOrgResDTO defaultPartyOrg(String customerId, String userId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 6ff7041421..47918419cd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.PartyOrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; @@ -31,6 +32,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -361,4 +363,29 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl - + From 3ef027ba0dce72caef931d3a7f4a8e00e0180f1f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 12:37:18 +0800 Subject: [PATCH 047/206] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=EF=BC=8C=E6=89=B9=E9=87=8F=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/BatchAddPartyActFormDTO.java | 21 ++++++++++++++++ .../controller/IcPartyActController.java | 25 +++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java new file mode 100644 index 0000000000..128eaaae3a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/BatchAddPartyActFormDTO.java @@ -0,0 +1,21 @@ +package com.epmet.resi.partymember.dto.icpartyact.form; + +import lombok.Data; + +import javax.validation.Valid; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 12:25 + */ +@Data +public class BatchAddPartyActFormDTO implements Serializable { + private static final long serialVersionUID = 2616937693642413548L; + private List delActIds; + @Valid + private List actList; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 1f1ccfe249..d1dddac4a5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.modules.partyOrg.service.IcPartyActService; +import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; @@ -61,6 +62,30 @@ public class IcPartyActController { return new Result>().ok(map); } + /** + * 生成年度计划 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("batch-add") + public Result batchAdd(@LoginUser TokenDto tokenDto,@RequestBody BatchAddPartyActFormDTO formDTO){ + formDTO.getActList().forEach(dto->{ + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setPublishStaffId(tokenDto.getUserId()); + if(StringUtils.isNotBlank(dto.getIcPartyActId())){ + //修改活动 + ValidatorUtils.validateEntity(dto,IcPartyActAddOrUpdateFormDTO.UpdateUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class); + }else{ + //添加活动 + ValidatorUtils.validateEntity(dto,IcPartyActAddOrUpdateFormDTO.AddUserShowGroup.class,IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class); + } + icPartyActService.addOrUpdate(dto); + }); + icPartyActService.deleteIcPartyAct(tokenDto.getCustomerId(),tokenDto.getUserId(),formDTO.getDelActIds()); + return new Result(); + } + /** * 【活动列表】分页查询(工作端小程序通用) * @param tokenDto From d4c17337eb54fd4efe996eb5d34709437b3103e5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:09:59 +0800 Subject: [PATCH 048/206] daochu --- .../result/IcPartyActDetailResDTO.java | 2 - .../result/IcPartyActPageResultDTO.java | 14 ++++ .../controller/IcPartyActController.java | 65 +++++++++++++++ .../excel/IcPartyActExpoprtExcel.java | 79 +++++++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 5 ++ .../mapper/partyOrg/IcPartyActDao.xml | 13 ++- 6 files changed, 175 insertions(+), 3 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 04bfc3ddcc..a9356e0bbb 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -5,7 +5,6 @@ import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; -import javax.validation.Valid; import java.io.Serializable; import java.util.Date; import java.util.List; @@ -115,7 +114,6 @@ public class IcPartyActDetailResDTO implements Serializable { /** * 参加活动党组织 */ - @Valid private List joinOrgList; /** diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index b5c9589d5d..1fe0c4254a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -1,10 +1,12 @@ package com.epmet.resi.partymember.dto.icpartyact.result; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** * @Description @@ -62,6 +64,18 @@ public class IcPartyActPageResultDTO implements Serializable { */ private String publishStaffId; + //以下返参，用于导出 + /** + * 是否发布，0未发布；1已发布； + * 返回名称 + */ + private String isPublishName; + /** + * 参加人员类型，0：全体党员；1：支部委员 + */ + private String joinUserType; + private String joinUserTypeName; + private List joinOrgList; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index d1dddac4a5..89582f8b47 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -1,11 +1,24 @@ package com.epmet.modules.partyOrg.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.modules.partyOrg.excel.IcPartyActExpoprtExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -19,13 +32,19 @@ import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** @@ -34,6 +53,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-08-18 */ +@Slf4j @RestController @RequestMapping("icPartyAct") public class IcPartyActController { @@ -47,6 +67,7 @@ public class IcPartyActController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("addOrUpdate") public Result> addOrUpdate(@LoginUser TokenDto tokenDto,@RequestBody IcPartyActAddOrUpdateFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -68,6 +89,7 @@ public class IcPartyActController { * @param formDTO * @return */ + @NoRepeatSubmit @PostMapping("batch-add") public Result batchAdd(@LoginUser TokenDto tokenDto,@RequestBody BatchAddPartyActFormDTO formDTO){ formDTO.getActList().forEach(dto->{ @@ -178,6 +200,7 @@ public class IcPartyActController { * @param icPartyActId * @return */ + @NoRepeatSubmit @PostMapping("publish/{icPartyActId}") public Result publicshIcPartyAct(@LoginUser TokenDto tokenDto,@PathVariable("icPartyActId")String icPartyActId){ icPartyActService.publicshIcPartyAct(tokenDto.getUserId(),icPartyActId); @@ -193,6 +216,7 @@ public class IcPartyActController { * @param icPartyActIds * @return */ + @NoRepeatSubmit @PostMapping("del") public Result deleteIcPartyAct(@LoginUser TokenDto tokenDto,@RequestBody List icPartyActIds){ if(CollectionUtils.isNotEmpty(icPartyActIds)){ @@ -215,4 +239,45 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.yearSearch(formDTO)); } + @NoRepeatSubmit + @PostMapping("/export-act") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActPageFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "党组织活动" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPartyActExpoprtExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyActService.pageList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); + list.forEach(l->{ + List orgNameList = l.getJoinOrgList().stream().map(m -> m.getJoinOrgName()).distinct().collect(Collectors.toList()); + l.setJoinOrgNameStr(orgNameList.stream().map(String::valueOf).collect(Collectors.joining(","))); + }); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java new file mode 100644 index 0000000000..06dc61ed31 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java @@ -0,0 +1,79 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 12:48 + */ +@Data +public class IcPartyActExpoprtExcel { + /** + * 活动主题 + */ + @ExcelProperty(value = "活动主题") + @ColumnWidth(20) + private String topic; + + /** + * 发布活动党组织名称 + */ + @ExcelProperty(value = "所属组织") + @ColumnWidth(20) + private String publishPartyOrgName; + + /** + * 活动发布人姓名 + */ + @ExcelProperty(value = "发布人") + @ColumnWidth(10) + private String publishStaffName; + + /** + * 活动类型，来源于ic_party_act_type_dict + */ + @ExcelProperty(value = "活动类型") + @ColumnWidth(15) + private String actTypeName; + + /** + * 举办活动时间 + */ + @ExcelProperty(value = "活动开始时间") + @ColumnWidth(20) + @DateTimeFormat("yyyy-MM-dd HH:mm:ss") + private Date holdTime; + + /** + * 活动地点 + */ + @ExcelProperty(value = "活动地点") + @ColumnWidth(25) + private String address; + + /** + * 是否发布，0未发布；1已发布； + */ + @ExcelProperty(value = "发布状态") + @ColumnWidth(8) + private String isPublishName; + + @ExcelProperty(value = "参加人员") + @ColumnWidth(8) + private String joinUserTypeName; + + @ExcelProperty(value = "参加活动党组织") + @ColumnWidth(40) + private String joinOrgNameStr; + + private List joinOrgList; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index ec14369f19..8b63ca081f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -235,6 +235,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> baseDao.selectPageList(formDTO)); + if(!formDTO.getIsPage()){ + pageInfo.getList().forEach(l->{ + l.setJoinOrgList(icPartyActOrgDao.selectJoinOrgList(l.getIcPartyActId())); + }); + } return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 8c485147af..040a6ee89e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -96,7 +96,18 @@ a.HOLD_TIME, a.ADDRESS, a.IS_PUBLISH, - a.PUBLISH_STAFF_ID + a.PUBLISH_STAFF_ID, + (case when a.IS_PUBLISH='0' then '未发布' + when a.IS_PUBLISH='1' then '已发布' + else '' + end + )as isPublishName, + a.JOIN_USER_TYPE as joinUserType, + (case when a.JOIN_USER_TYPE='0' then '全体党员' + when a.JOIN_USER_TYPE='1' then '支部委员' + else '' + end + )as joinUserTypeName FROM ic_party_act a LEFT JOIN ic_party_act_type_dict d ON ( a.ACT_TYPE = d.TYPE_KEY and a.customer_id=d.customer_id) From 6f9c4312e25bed1bb9e870d640e66223521a3387 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:27:27 +0800 Subject: [PATCH 049/206] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F?= =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E6=B4=BB=E5=8A=A8=E5=88=97=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActPageFormDTO.java | 8 ++++++++ .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 6 ++++++ 2 files changed, 14 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index 2a52c6cc2a..818a59061c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -33,5 +33,13 @@ public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private String isPublish; private String actType; + /** + * 工作端小程序用yyyy + */ + private String holdYearId; + /** + * 工作端小程序用yyyyMM + */ + private String holdMonthId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 040a6ee89e..21776df47f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -138,6 +138,12 @@ AND DATE_FORMAT(a.HOLD_TIME,'%Y%m%d') #{endDate} + + AND a.HOLD_YEAR_ID = #{holdYearId} + + + AND a.HOLD_MONTH_ID = #{holdMonthId} + order by a.HOLD_TIME desc From f31aa9ffdca005c79f7cd1db657476dd40a53a1b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 13:28:41 +0800 Subject: [PATCH 050/206] =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/IcPartyActTypeDictDTO.java | 77 +++++++++++++++++++ .../modules/partyOrg/dao/IcPartyActDao.java | 4 +- .../partyOrg/dao/IcPartyActTypeDictDao.java | 16 ++++ .../entity/IcPartyActTypeDictEntity.java | 64 +++++++++++++++ .../service/IcPartyActTypeDictService.java | 14 ++++ .../service/impl/IcPartyActServiceImpl.java | 31 ++++++-- .../impl/IcPartyActTypeDictServiceImpl.java | 18 +++++ .../mapper/partyOrg/IcPartyActDao.xml | 5 +- .../mapper/partyOrg/IcPartyActTypeDictDao.xml | 6 ++ 9 files changed, 222 insertions(+), 13 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java new file mode 100644 index 0000000000..bfcc4d97a2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyActTypeDictDTO.java @@ -0,0 +1,77 @@ +package com.epmet.resi.partymember.dto.partyOrg; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Data +public class IcPartyActTypeDictDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 活动类型key + */ + private String typeKey; + + /** + * 活动名称 + */ + private String typeName; + + /** + * 每年几次 + */ + private Integer yearCount; + + /** + * 频次单位 + */ + private String frequencyUnit; + + /** + * 频次数量 + */ + private Integer frequencyCount; + + /** + * 频率描述 + */ + private String frequencyDesc; + + /** + * 排序 + */ + private Integer sort; + + /** + * 0未删除；1：已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + private String label; + private String value; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 9e6f471e6d..7308aeb25a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -3,8 +3,8 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; -import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,7 +26,7 @@ public interface IcPartyActDao extends BaseDao { * @param customerId * @return */ - List actTypeList(String customerId); + List actTypeList(String customerId); List getActivityList(ActAndScheduleListFormDTO formDTO); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java new file mode 100644 index 0000000000..58eda1e4b2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActTypeDictDao.java @@ -0,0 +1,16 @@ +package com.epmet.modules.partyOrg.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Mapper +public interface IcPartyActTypeDictDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java new file mode 100644 index 0000000000..715a79cd39 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActTypeDictEntity.java @@ -0,0 +1,64 @@ +package com.epmet.modules.partyOrg.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 2022-08-22 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_party_act_type_dict") +public class IcPartyActTypeDictEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 活动类型key + */ + private String typeKey; + + /** + * 活动名称 + */ + private String typeName; + + /** + * 每年几次 + */ + private Integer yearCount; + + /** + * 频次单位 + */ + private String frequencyUnit; + + /** + * 频次数量 + */ + private Integer frequencyCount; + + /** + * 频率描述 + */ + private String frequencyDesc; + + /** + * 排序 + */ + private Integer sort; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java new file mode 100644 index 0000000000..a74118179c --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActTypeDictService.java @@ -0,0 +1,14 @@ +package com.epmet.modules.partyOrg.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +public interface IcPartyActTypeDictService extends BaseService { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 8b63ca081f..1d6ff26174 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; @@ -21,10 +22,7 @@ import com.epmet.constant.SystemMessageType; import com.epmet.dto.form.UserMessageFormDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; -import com.epmet.modules.partyOrg.entity.IcPartyActEntity; -import com.epmet.modules.partyOrg.entity.IcPartyActOrgEntity; -import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.modules.partyOrg.entity.ResiPartymemberAttachmentEntity; +import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; @@ -33,6 +31,7 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; @@ -77,6 +76,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl actTypeList(String customerId) { - List list= baseDao.actTypeList(customerId); + List list= baseDao.actTypeList(customerId); if(CollectionUtils.isEmpty(list)){ - return baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + List icPartActTypeDTOS = baseDao.actTypeList(Constant.DEFAULT_CUSTOMER); + List entities = ConvertUtils.sourceToTarget(icPartActTypeDTOS, IcPartyActTypeDictEntity.class); + entities.forEach(e -> { + e.setId(IdWorker.getIdStr()); + e.setCustomerId(customerId); + }); + partyActTypeDictService.insertBatch(entities); + list = icPartActTypeDTOS; } - return list; + return ConvertUtils.sourceToTarget(list,IcPartActTypeDTO.class); } @@ -347,13 +356,19 @@ public class IcPartyActServiceImpl extends BaseServiceImpl activityList = baseDao.getActivityList(secondForm); + List activityTypeList = actTypeList(formDTO.getCustomerId()); List result = new ArrayList<>(); if (CollectionUtils.isNotEmpty(activityList)) { disposeActivityList(secondForm, activityList); Map> groupByType = activityList.stream().collect(Collectors.groupingBy(ActAndScheduleListResultDTO.ActivityListDTO::getType)); groupByType.forEach((type,list) -> { YearSearchResultDTO dto = new YearSearchResultDTO(); - dto.setType(type); + activityTypeList.forEach(at -> { + if (at.getValue().equals(type)){ + dto.setType(at.getLabel()); + dto.setFrequency(at.getFrequencyDesc()); + } + }); dto.setActivityList(ConvertUtils.sourceToTarget(list, YearSearchResultDTO.YearSearchActivityListDTO.class)); result.add(dto); }); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java new file mode 100644 index 0000000000..220b5c7e1d --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActTypeDictServiceImpl.java @@ -0,0 +1,18 @@ +package com.epmet.modules.partyOrg.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao; +import com.epmet.modules.partyOrg.entity.IcPartyActTypeDictEntity; +import com.epmet.modules.partyOrg.service.IcPartyActTypeDictService; +import org.springframework.stereotype.Service; + +/** + * 党组织活动类型字典表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-22 + */ +@Service +public class IcPartyActTypeDictServiceImpl extends BaseServiceImpl implements IcPartyActTypeDictService { + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 040a6ee89e..6b0f35513a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -3,12 +3,11 @@ - SELECT d.TYPE_KEY as value, d.TYPE_NAME as label, - d.FREQUENCY_DESC as frequencyDesc, - d.YEAR_COUNT as yearCount + d.* FROM ic_party_act_type_dict d WHERE diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml new file mode 100644 index 0000000000..3c57ca3243 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActTypeDictDao.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 8f74aab460a6966908c78e5cc418b52d55624f66 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 13:29:20 +0800 Subject: [PATCH 051/206] =?UTF-8?q?=E6=8B=BC=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java index 818a59061c..7e35c92f39 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActPageFormDTO.java @@ -15,7 +15,7 @@ import java.io.Serializable; public class IcPartyActPageFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -8171649039313981541L; // tokenDto取值 - @NotBlank(message = "cusotomerId不能为空",groups = AddUserInternalGroup.class) + @NotBlank(message = "customerId不能为空",groups = AddUserInternalGroup.class) private String customerId; @NotBlank(message = "publishStaffId不能为空",groups = AddUserInternalGroup.class) private String publishStaffId; From f5c511735edc5b6737b423d51b019b9ed64c25f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 13:38:46 +0800 Subject: [PATCH 052/206] =?UTF-8?q?=E6=94=AF=E9=83=A8=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=8F=8A=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/EpmetMessageOpenFeignClient.java | 4 +++ .../EpmetMessageOpenFeignClientFallback.java | 5 ++++ .../epmet/controller/IcMessageController.java | 5 ++++ .../main/java/com/epmet/dao/IcMessageDao.java | 3 ++ .../com/epmet/service/IcMessageService.java | 2 ++ .../service/impl/IcMessageServiceImpl.java | 5 ++++ .../main/resources/mapper/IcMessageDao.xml | 10 +++++++ .../result/IcPartyInfoResultDTO.java | 27 +++++++++++++++++ .../partymember/dao/IcPartyMemberDao.java | 3 ++ .../service/IcPartyMemberService.java | 3 ++ .../impl/IcPartyMemberServiceImpl.java | 30 ++++++++++++++++--- .../mapper/partymember/IcPartyMemberDao.xml | 11 +++++++ 12 files changed, 104 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index f1f7b5dfa5..1083526f67 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -1,6 +1,7 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; import com.epmet.dto.form.*; @@ -135,4 +136,7 @@ public interface EpmetMessageOpenFeignClient { @PostMapping(value = "message/icMessage/saveicmessagelist", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) Result saveIcMessageList(List msgList); + @PostMapping(value = "message/icMessage/unreadcount/{userId}", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result unReadCount(@PathVariable("userId") String userId); + } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index 100dc4ff10..9538233fe2 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -84,4 +84,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "saveIcMessageList", msgList); } + @Override + public Result unReadCount(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "unReadCount", userId); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java index b93bd93fbc..3824123ace 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/IcMessageController.java @@ -96,5 +96,10 @@ public class IcMessageController { return new Result(); } + @PostMapping("unreadcount/{userId}") + public Result unReadCount(@PathVariable ("userId") String userId) { + return new Result().ok(icMessageService.unReadCount(userId)); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java index 998f48b62a..9c1ca666b8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/IcMessageDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.entity.IcMessageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -21,4 +22,6 @@ public interface IcMessageDao extends BaseDao { List selectMessageList(IcMessageListFormDTO formDTO); void upByUserId(ReadIcMessageFormDTO formDTO); + + Integer selectUnReadCount(@Param("userId") String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java index c13639c418..d0547f4bbd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/IcMessageService.java @@ -73,4 +73,6 @@ public interface IcMessageService extends BaseService { void saveIcMessageList(List msgList); void read(ReadIcMessageFormDTO formDTO); + + Integer unReadCount(String userId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 5d2678c49d..660ea7f7fd 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -107,4 +107,9 @@ public class IcMessageServiceImpl extends BaseServiceImpl + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java new file mode 100644 index 0000000000..78207b0293 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/IcPartyInfoResultDTO.java @@ -0,0 +1,27 @@ +package com.epmet.resi.partymember.dto.partymember.result; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class IcPartyInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -1L; + + /** + * 所属支部Id + */ + private String id = ""; + + /** + * 所属支部名称 + */ + private String partOrgName = ""; + + /** + * 未读消息数 + */ + private Integer count; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java index 00ea198d81..0f18a60ac5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,4 +75,6 @@ public interface IcPartyMemberDao extends BaseDao { * @return java.util.List */ List getPartyMemberAgeStatistics(@Param("agencyId") String agencyId,@Param("orgId") String orgId); + + IcPartyInfoResultDTO selectByUserId(@Param("userId") String userId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 20373c3ca5..c88113ae6a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -11,6 +11,7 @@ import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import java.nio.file.Path; @@ -147,4 +148,6 @@ public interface IcPartyMemberService extends BaseService { * @param filePath */ void execAsyncExcelImport(Path filePath, String importTaskId); + + IcPartyInfoResultDTO partyInfo(TokenDto tokenDto); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index e6e8fd9c44..bd28a7ef30 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -13,12 +13,14 @@ import com.epmet.commons.tools.dto.form.DictListFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.DictListResultDTO; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; +import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.IcFormCodeEnum; import com.epmet.commons.tools.enums.PartyPostEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -31,10 +33,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.OperCustomizeOpenFeignClient; -import com.epmet.feign.OssFeignClient; +import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; @@ -49,6 +48,7 @@ import com.epmet.modules.partymember.excel.handler.IcPartyMemberImportListener; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; @@ -60,6 +60,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.util.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -101,6 +102,8 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl page(TokenDto tokenDto, IcPartyMemberFromDTO formDTO) { @@ -706,4 +709,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId()); + if (!result.success()) { + throw new RenException("获取用户未读消息数据失败"); + } + resultDTO.setCount(result.getData()); + return resultDTO; + } + + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index 21ea480cca..3a39b8e54f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -267,5 +267,16 @@ GROUP BY ageGroup + From 9e6e7f68b6b899e78735eeca9886ca424397f3d7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 13:52:42 +0800 Subject: [PATCH 053/206] =?UTF-8?q?=E6=8E=92=E4=BA=86=E4=B8=AA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 1 + .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 8ec8db4b55..ad7db30b76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -83,6 +83,7 @@ AND pa.PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + order by pa.HOLD_TIME desc,ao.JOIN_ORG_ID \ No newline at end of file From 40e5ba03653671deb8b7e5557e32219034f07b53 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 14:15:48 +0800 Subject: [PATCH 054/206] =?UTF-8?q?=E8=A1=A5=E5=85=A8TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyOrgDao.java | 2 ++ .../service/impl/IcPartyActServiceImpl.java | 6 ++++-- .../controller/IcPartyMemberController.java | 13 +++++++++++++ .../resources/mapper/partyOrg/IcPartyOrgDao.xml | 16 ++++++++++++++++ 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 5bd233d672..af7a6340aa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -109,4 +109,6 @@ public interface IcPartyOrgDao extends BaseDao { List getPartyOrg(@Param("orgIds")List orgIds); IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level); + + List getUserIdByPartyOrgIds(@Param("partyOrgIdList") List partyOrgIdList); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 1d6ff26174..3b6869a53e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -476,9 +476,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyIdList = partyOrgDao.getUserIdByPartyOrgIds(partyOrgIdList); + userIdList.addAll(partyIdList); } + userIdList = userIdList.stream().distinct().collect(Collectors.toList()); //组装消息 for (String id : userIdList){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 2059c84f4b..fbddc60fb1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; +import com.epmet.dto.form.ReadIcMessageFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; @@ -39,6 +40,7 @@ import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; @@ -341,4 +343,15 @@ public class IcPartyMemberController implements ResultDataResolver { } } + + /** + * @Author sun + * @Description 消息】未读消息数[居民/工作端共用] + **/ + @PostMapping("partyinfo") + public Result partyInfo(@LoginUser TokenDto tokenDto) { + return new Result().ok(icPartyMemberService.partyInfo(tokenDto)); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 8413774180..0a234b163e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -185,4 +185,20 @@ order by CREATED_TIME asc limit 1 + + + From 580c0c990ad8bc20a1f4239021dbd9eff5a05eef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 14:28:25 +0800 Subject: [PATCH 055/206] orgType --- .../partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java | 2 ++ .../modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java index 827aad2257..5474c78ba3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/DefaultPartyOrgResDTO.java @@ -33,5 +33,7 @@ public class DefaultPartyOrgResDTO implements Serializable { * 党组织路径 */ private String defaultPartyOrgPath; + + private String orgType; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 47918419cd..00355dedd4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -386,6 +386,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 14:33:43 +0800 Subject: [PATCH 056/206] =?UTF-8?q?=E7=AD=BE=E5=88=B0=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyActSignFormDTO.java | 23 +++++++++++++++++++ .../IcPartyActSignInRecordController.java | 13 +++++++---- .../dao/IcPartyActSignInRecordDao.java | 8 ++++++- .../IcPartyActSignInRecordService.java | 18 +++------------ .../IcPartyActSignInRecordServiceImpl.java | 22 ++++++++---------- .../partyOrg/IcPartyActSignInRecordDao.xml | 18 +++++++++++++++ 6 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java new file mode 100644 index 0000000000..4677442fef --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -0,0 +1,23 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class PartyActSignFormDTO implements Serializable { + /** + * 活动Id + */ + @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + private String icPartyActId; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index bb4ad0acf5..de93f1d2c3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -1,15 +1,20 @@ package com.epmet.modules.partyOrg.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; 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.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -29,10 +34,10 @@ public class IcPartyActSignInRecordController { @Autowired private IcPartyActSignInRecordService icPartyActSignInRecordService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPartyActSignInRecordService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java index fe8308ca62..72e00ccdc1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActSignInRecordDao.java @@ -2,7 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 党组织活动签到记录表 @@ -12,5 +16,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPartyActSignInRecordDao extends BaseDao { - + + List selectSignList(@Param("icPartyActId") String icPartyActId); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 6cb940b2cc..413be5fd54 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -4,9 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; - -import java.util.List; -import java.util.Map; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; /** * 党组织活动签到记录表 @@ -16,25 +14,15 @@ import java.util.Map; */ public interface IcPartyActSignInRecordService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-18 */ - List list(Map params); + PageData list(PartyActSignFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 841550fb35..12adb63035 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -7,10 +7,15 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -28,20 +33,13 @@ import java.util.Map; @Service public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPartyActSignInRecordDTO.class); - } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPartyActSignInRecordDTO.class); + public PageData list(PartyActSignFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.selectSignList(formDTO.getIcPartyActId()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml index 559157a57e..b5fc4d414b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -3,4 +3,22 @@ + + \ No newline at end of file From 591fe43687cab6881f0842c8ad6bdc6368a96d35 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 14:42:37 +0800 Subject: [PATCH 057/206] =?UTF-8?q?=E9=87=8D=E5=86=99=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ActAndScheduleListFormDTO.java | 2 ++ .../dto/partyOrg/form/YearSearchFormDTO.java | 5 ++- .../result/YearSearchDetailResultDTO.java | 22 ++++++++++++ .../controller/IcPartyActController.java | 12 +++++-- .../partyOrg/service/IcPartyActService.java | 5 ++- .../service/impl/IcPartyActServiceImpl.java | 34 ++++++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 3 ++ 7 files changed, 78 insertions(+), 5 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 19998a2448..03e24570ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -38,4 +38,6 @@ public class ActAndScheduleListFormDTO implements Serializable { * 当seachType = 'yearSearch'时，不需要查询党组织 */ private String searchType = ""; + + private String type = ""; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index 983f48548d..db2d4d8de5 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -17,9 +17,12 @@ public class YearSearchFormDTO implements Serializable { public interface YearSearchForm{} - @NotBlank(message = "yaerId不能为空",groups = YearSearchForm.class) + @NotBlank(message = "yearId不能为空",groups = YearSearchForm.class) private String yearId; + @NotBlank(message = "type不能为空",groups = YearSearchForm.class) + private String type; + private String staffId; private String customerId; } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java new file mode 100644 index 0000000000..24ff5a1061 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/8/22 09:27 + * @DESC + */ +@Data +public class YearSearchDetailResultDTO implements Serializable { + + private static final long serialVersionUID = 8961924457475202790L; + + private String type; + private String frequency; + private List activityList; +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 89582f8b47..0e52bdad31 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -31,6 +31,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -232,11 +233,18 @@ public class IcPartyActController { * @author zxc * @date 2022/8/22 09:33 */ + @PostMapping("yearSearch01") + public Result> yearSearch01(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(icPartyActService.yearSearch01(formDTO)); + } + @PostMapping("yearSearch") - public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); - return new Result>().ok(icPartyActService.yearSearch(formDTO)); + return new Result>().ok(icPartyActService.yearSearch(formDTO)); } @NoRepeatSubmit diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index eeba74188a..434a0bf657 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -14,6 +14,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import java.util.List; @@ -105,5 +106,7 @@ public interface IcPartyActService extends BaseService { * @author zxc * @date 2022/8/22 09:33 */ - List yearSearch(YearSearchFormDTO formDTO); + List yearSearch01(YearSearchFormDTO formDTO); + + List yearSearch(YearSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 3b6869a53e..c48ab658dd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -38,6 +38,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; @@ -351,7 +352,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + public List yearSearch01(YearSearchFormDTO formDTO) { ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); secondForm.setSearchType("yearSearch"); disposeActAndScheduleListFormDTO(secondForm); @@ -376,6 +377,37 @@ public class IcPartyActServiceImpl extends BaseServiceImpl yearSearch(YearSearchFormDTO formDTO) { + ActAndScheduleListFormDTO secondForm = ConvertUtils.sourceToTarget(formDTO, ActAndScheduleListFormDTO.class); + secondForm.setSearchType("yearSearch"); + disposeActAndScheduleListFormDTO(secondForm); + List activityList = baseDao.getActivityList(secondForm); + List activityDetailList = new ArrayList<>(); + if (CollectionUtils.isEmpty(activityList)){ + return new ArrayList<>(); + } + activityList.forEach(al -> { + IcPartyActDetailResDTO icPartyActDetailResDTO = queryActDetail(formDTO.getCustomerId(), formDTO.getStaffId(), al.getActivityId()); + activityDetailList.add(icPartyActDetailResDTO); + }); + List result = new ArrayList<>(); + List activityTypeList = actTypeList(formDTO.getCustomerId()); + Map> groupByType = activityDetailList.stream().collect(Collectors.groupingBy(IcPartyActDetailResDTO::getActType)); + groupByType.forEach((type,list) -> { + YearSearchDetailResultDTO dto = new YearSearchDetailResultDTO(); + activityTypeList.forEach(at -> { + if (at.getValue().equals(type)){ + dto.setType(at.getLabel()); + dto.setFrequency(at.getFrequencyDesc()); + } + }); + dto.setActivityList(list); + result.add(dto); + }); + return result; + } + /** * Desc: * @param formDTO diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ad7db30b76..00602f0c03 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -68,6 +68,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND act_type = #{type} + AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') From fe34eb801c633c062f288654e0d77909e5cb36b1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 14:49:39 +0800 Subject: [PATCH 058/206] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partymember/IcPartyMemberDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index 3a39b8e54f..17ba9f8a12 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -267,7 +267,7 @@ GROUP BY ageGroup - SELECT ipo.id id, ipo.PARTY_ORG_NAME partOrgName From bbc7cbfcecd2748f42b9532d5f1a777c0b33a5c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:13:03 +0800 Subject: [PATCH 059/206] like --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 00602f0c03..cd2b68d772 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -118,7 +118,7 @@ a.DEL_FLAG = '0' AND a.CUSTOMER_ID = #{customerId} - and a.ORG_ID_PATH CONCAT('%',#{staffAgencyId},'%') + and a.ORG_ID_PATH like CONCAT('%',#{staffAgencyId},'%') AND a.ADDRESS LIKE CONCAT('%',#{address},'%') From 2b5e6733abc41b59aa8e58f2c6da26f09735ef2c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:15:31 +0800 Subject: [PATCH 060/206] todo --- .../epmet/task/AutoPublishIcPartyActTask.java | 24 ++++++++++++++++++ .../task/NoticePartyActAutoPublishTask.java | 25 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java new file mode 100644 index 0000000000..531f41ebeb --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java @@ -0,0 +1,24 @@ +package com.epmet.task; + +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 15:13 + */ +@Component("autoPublishIcPartyActTask") +public class AutoPublishIcPartyActTask implements ITask { + /** + * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 + * 本任务是自动发布活动 + * //2022-8-9号 8:00 收到一个：您有一个活动3天后即将自动发布 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + + } +} + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java new file mode 100644 index 0000000000..8f872218e4 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java @@ -0,0 +1,25 @@ +package com.epmet.task; + +import org.springframework.stereotype.Component; + +/** + * @Description + * @Author yzm + * @Date 2022/8/22 15:07 + */ +@Component("noticePartyActAutoPublishTask") +public class NoticePartyActAutoPublishTask implements ITask { + + /** + * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 + * //2022-8-12 10:30自动发布，收到消息：您有一个活动已经发布 + * 本任务是通知：2022-8-9号 8:00 收到一个：您有一个活动3天后即将自动发布 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + // todo + } +} + From 32b2ca015fe5e5311bec496e4e3b3943a7d2159b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:40:29 +0800 Subject: [PATCH 061/206] todo --- .../epmet/task/NoticePartyActAutoPublishTask.java | 14 +++++++++++++- .../feign/ResiPartyMemberOpenFeignClient.java | 2 ++ .../ResiPartyMemberOpenFeignClientFallback.java | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java index 8f872218e4..c0bbf5fcb8 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/NoticePartyActAutoPublishTask.java @@ -1,5 +1,9 @@ package com.epmet.task; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -7,8 +11,11 @@ import org.springframework.stereotype.Component; * @Author yzm * @Date 2022/8/22 15:07 */ +@Slf4j @Component("noticePartyActAutoPublishTask") public class NoticePartyActAutoPublishTask implements ITask { + @Autowired + private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; /** * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 @@ -19,7 +26,12 @@ public class NoticePartyActAutoPublishTask implements ITask { */ @Override public void run(String params) { - // todo + Result result=resiPartyMemberOpenFeignClient.noticePartyActAutoPublishTask(); + if(result.success()){ + log.info("noticePartyActAutoPublishTask执行成功"); + }else{ + log.info("noticePartyActAutoPublishTask执行失败"); + } } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 430c6acb90..6ad7273758 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -144,4 +144,6 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); + + Result noticePartyActAutoPublishTask(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 2a82324fa0..ebf4f9dda1 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -114,4 +114,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result> getPartyOrgList() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getPartyOrgList", null); } + + @Override + public Result noticePartyActAutoPublishTask() { + return null; + } } From 5e5568022cc4a6a3f69996ee5955016ff0ccedfc Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 15:42:15 +0800 Subject: [PATCH 062/206] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/IcPartyActListFormDTO.java | 29 +++++++++++++ .../result/IcPartyActListResultDTO.java | 43 +++++++++++++++++++ .../controller/IcPartyActController.java | 15 +++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../partyOrg/service/IcPartyActService.java | 9 ++-- .../service/impl/IcPartyActServiceImpl.java | 29 +++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 38 ++++++++++++++++ 7 files changed, 155 insertions(+), 12 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java new file mode 100644 index 0000000000..c78a205625 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class IcPartyActListFormDTO implements Serializable { + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + /** + * 签到状态[已签到：signIn 未签到：unSignIn] + */ + private String signIn; + + //参加活动党组织ID,groupId + private String joinOrgId; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + + //token中信息 + private String customerId; + private String userId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java new file mode 100644 index 0000000000..29c968ba90 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java @@ -0,0 +1,43 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import com.epmet.resi.partymember.dto.partymember.result.AdditionalInfoDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class IcPartyActListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 活动Id + */ + private String icPartyActId; + /** + * 活动主题 + */ + private String topic; + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actType; + /** + * 活动时间 + */ + private String holdTime; + /** + * 活动地点 + */ + private String address; + /** + * 签到状态[已签到：signIn 未签到：unSignIn] + */ + private String signIn; + /** + * 签到状态名 + */ + private String signInName; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 0e52bdad31..004e86c2d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -28,11 +28,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -288,4 +286,13 @@ public class IcPartyActController { } } } + + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcPartyActListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icPartyActService.list(formDTO)); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 7308aeb25a..5426dfc9e4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -6,7 +6,9 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -40,4 +42,6 @@ public interface IcPartyActDao extends BaseDao { String selectActTypeName(@Param("customerId") String customerId,@Param("actType")String actType); int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); + + List selectresiPartyActList(IcPartyActListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 434a0bf657..6bb134d35f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -11,11 +11,9 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import java.util.List; import java.util.Map; @@ -109,4 +107,7 @@ public interface IcPartyActService extends BaseService { List yearSearch01(YearSearchFormDTO formDTO); List yearSearch(YearSearchFormDTO formDTO); + + PageData list(IcPartyActListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c48ab658dd..a18b2161d4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -35,11 +36,10 @@ import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchDetailResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.YearSearchResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; +import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -79,6 +79,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list(IcPartyActListFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //1.查询当前用户所属党支部信息 + IcPartyInfoResultDTO dto = icPartyMemberDao.selectByUserId(formDTO.getUserId()); + if(null == dto){ + return new PageData<>(new ArrayList<>(), 0); + } + formDTO.setJoinOrgId(dto.getId()); + + //2.根据所属支部及查询条件筛选数据 + List list = baseDao.selectresiPartyActList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index cd2b68d772..05cf3aab8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -159,6 +159,44 @@ and d.type_key = #{actType} + + update ic_party_act set del_flag='1', From f1cd61fbd9c9f9e65fae52b8ed69430651f203ab Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:46:10 +0800 Subject: [PATCH 063/206] bugfix --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 88e791c889..9fa96d1dc9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -96,7 +96,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 活动开始前几天 */ - @NotBlank(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @NotNull(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private Integer autoPublicType; /** * 发布活动党组织 @@ -125,7 +125,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) private String publishOrgPath; /** From 925a2f2e5ae92e2578dfd24a15d68bbdb58583fc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 15:53:08 +0800 Subject: [PATCH 064/206] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BB=8B=E7=BB=8D?= =?UTF-8?q?=E4=B8=8D=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 9fa96d1dc9..f6b234276b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -143,7 +143,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 活动介绍 */ - @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + // @NotBlank(message = "活动介绍不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) @Length(max = 1000, message = "活动介绍最多输入1000字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private String introduce; From a24696f745a82c5b7177034c932e0e55d4282181 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 22 Aug 2022 16:01:55 +0800 Subject: [PATCH 065/206] =?UTF-8?q?=E7=AD=BE=E5=88=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyActSignFormDTO.java | 21 ++++++++++++++- .../IcPartyActSignInRecordController.java | 11 +++++++- .../IcPartyActSignInRecordService.java | 2 ++ .../IcPartyActSignInRecordServiceImpl.java | 27 +++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 4677442fef..1e647cad6d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -13,11 +13,30 @@ public class PartyActSignFormDTO implements Serializable { /** * 活动Id */ - @NotBlank(message = "活动Id不能为空",groups = {AddGroup.class}) + @NotBlank(message = "活动Id不能为空",groups = {UpdateGroup.class}) private String icPartyActId; + /** + * 签到地点 + */ + @NotBlank(message = "签到地点不能为空",groups = {AddGroup.class}) + private String address; + /** + * 签到地点纬度 + */ + @NotBlank(message = "签到地点纬度不能为空",groups = {AddGroup.class}) + private String latitude; + /** + * 签到地点经度 + */ + @NotBlank(message = "签到地点经度不能为空",groups = {AddGroup.class}) + private String longitude; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = false; + //token中信息 + private String customerId; + private String userId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java index de93f1d2c3..9a4b16fda7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActSignInRecordController.java @@ -36,7 +36,7 @@ public class IcPartyActSignInRecordController { @RequestMapping("list") public Result> list(@RequestBody PartyActSignFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO, AddGroup.class); + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); return new Result>().ok(icPartyActSignInRecordService.list(formDTO)); } @@ -71,5 +71,14 @@ public class IcPartyActSignInRecordController { icPartyActSignInRecordService.delete(ids); return new Result(); } + + @PostMapping("sign") + public Result sign(@LoginUser TokenDto tokenDto, @RequestBody PartyActSignFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icPartyActSignInRecordService.sign(formDTO); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java index 413be5fd54..bb1f91a727 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActSignInRecordService.java @@ -72,4 +72,6 @@ public interface IcPartyActSignInRecordService extends BaseService implements IcPartyActSignInRecordService { + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override @@ -96,4 +105,22 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl result = epmetUserOpenFeignClient.customerUserDetail(user); + if (!result.success() && null == result.getData()) { + throw new RenException("获取当前登录人居民信息失败"); + } + //保存签到记录数据 + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPartyActSignInRecordEntity.class); + entity.setEpmetUserId(formDTO.getUserId()); + entity.setIdCard(result.getData().getIdNum()); + entity.setUserRealName(result.getData().getName()); + insert(entity); + } + } \ No newline at end of file From 2acd7578b3312b6d3cf520c3b55529f313c5cae1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:16:45 +0800 Subject: [PATCH 066/206] luyou --- .../feign/ResiPartyMemberOpenFeignClient.java | 1 + .../ResiPartyMemberOpenFeignClientFallback.java | 2 +- .../partyOrg/controller/IcPartyActController.java | 10 +++++++++- .../modules/partyOrg/service/IcPartyActService.java | 1 + .../partyOrg/service/impl/IcPartyActServiceImpl.java | 6 ++++++ 5 files changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index 6ad7273758..cae69c38a0 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -145,5 +145,6 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); + @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask") Result noticePartyActAutoPublishTask(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index ebf4f9dda1..585e531797 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -117,6 +117,6 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp @Override public Result noticePartyActAutoPublishTask() { - return null; + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublishTask"); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 004e86c2d2..58dddab459 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -294,5 +294,13 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.list(formDTO)); } - + /** + * 通知：您有一个活动3天后即将自动发布 + * @return + */ + @PostMapping("noticePartyActAutoPublishTask") + public Result noticePartyActAutoPublishTask(){ + icPartyActService.noticePartyActAutoPublishTask(); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index 6bb134d35f..a8e150b79a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -110,4 +110,5 @@ public interface IcPartyActService extends BaseService { PageData list(IcPartyActListFormDTO formDTO); + void noticePartyActAutoPublishTask(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a18b2161d4..14bc6f198d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -653,4 +653,10 @@ public class IcPartyActServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Override + public void noticePartyActAutoPublishTask() { + //todo + return; + } + } \ No newline at end of file From d547281aa590a77d0fdb0a931a4c63b90aec1a9b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:24:50 +0800 Subject: [PATCH 067/206] =?UTF-8?q?=E7=8E=B0=E5=9C=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.23_party_publish_Time.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql index d6f288b2c7..a2ad1f1ef8 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql @@ -5,3 +5,4 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458276439302146', 1560458000894500866, '活动开始前3天', '3', '0', '活动开始前3天', 2, 0, 0, '1', '2022-08-19 10:47:00', '1', '2022-08-19 10:47:00'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458332076744705', 1560458000894500866, '活动开始前5天', '5', '0', '活动开始前5天', 3, 0, 0, '1', '2022-08-19 10:47:13', '1', '2022-08-19 10:47:13'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1560458388007788545', 1560458000894500866, '活动开始前7天', '7', '0', '活动开始前7天', 4, 0, 0, '1', '2022-08-19 10:47:26', '1', '2022-08-19 10:47:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1561627442626142210', 1560458000894500866, '现在发布', '0', '0', '', 5, 0, 0, '1', '2022-08-22 16:12:51', '1', '2022-08-22 16:12:51'); From 9726594ef6b949f2500d8c54c8754c1ff5d272a2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:30:56 +0800 Subject: [PATCH 068/206] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 14bc6f198d..52fe2d99e4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -191,7 +191,12 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:36:50 +0800 Subject: [PATCH 069/206] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 +++++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 1 + .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 4 ++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index a9356e0bbb..c413bb2d5a 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -45,6 +45,9 @@ public class IcPartyActDetailResDTO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date holdTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date autoPublicTime; + /** * 活动主题 */ @@ -69,6 +72,8 @@ public class IcPartyActDetailResDTO implements Serializable { * 活动开始前几天 */ private Integer autoPublicType; + + private String autoPublicTypeDesc; /** * 发布活动党组织 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52fe2d99e4..e50c23836a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -278,6 +278,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:40:38 +0800 Subject: [PATCH 070/206] =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E9=80=9A=E7=9F=A5=E5=8F=82=E5=8A=A0=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=9A=84=E6=89=8D=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52fe2d99e4..7a3595e618 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -186,7 +186,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Mon, 22 Aug 2022 16:43:29 +0800 Subject: [PATCH 071/206] louti --- .../epmet/modules/partyOrg/controller/IcPartyActController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 58dddab459..1ed8b5f813 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -240,6 +240,7 @@ public class IcPartyActController { @PostMapping("yearSearch") public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, YearSearchFormDTO.YearSearchForm.class); formDTO.setStaffId(tokenDto.getUserId()); formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result>().ok(icPartyActService.yearSearch(formDTO)); From 2358ea83e9ea0fb32ab02778f772f6e4aad23f35 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 16:52:38 +0800 Subject: [PATCH 072/206] defaultorg --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 0a234b163e..1a7bbfadb6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -166,7 +166,7 @@ ic_party_org o WHERE o.DEL_FLAG = '0' - AND o.AGENCY_ID = #{agencyId} + AND o.AGENCY_ID like concat('%', #{agencyId}) AND o.PARTY_ORG_TYPE = '0' From f6b167799a230f3e29f10c76fbd498d3d705d4c7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 22 Aug 2022 17:08:55 +0800 Subject: [PATCH 073/206] =?UTF-8?q?=E5=8E=BB=E6=8E=89type=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index db2d4d8de5..c821fd007f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -20,7 +20,6 @@ public class YearSearchFormDTO implements Serializable { @NotBlank(message = "yearId不能为空",groups = YearSearchForm.class) private String yearId; - @NotBlank(message = "type不能为空",groups = YearSearchForm.class) private String type; private String staffId; From a97c1206b36cc796bb6e1a8163d3ce9f0efda121 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 17:15:34 +0800 Subject: [PATCH 074/206] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E7=9A=84=E5=89=8D3=E5=A4=A9=E6=8F=90?= =?UTF-8?q?=E9=86=92=EF=BC=9A=E6=82=A8=E6=9C=89=E4=B8=80=E4=B8=AA=E6=B4=BB?= =?UTF-8?q?=E5=8A=A83=E5=A4=A9=E5=90=8E=E5=8D=B3=E5=B0=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcPartyActDao.java | 2 ++ .../service/impl/IcPartyActServiceImpl.java | 19 ++++++++++++++++--- .../mapper/partyOrg/IcPartyActDao.xml | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5426dfc9e4..e8b0f11dfc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -44,4 +44,6 @@ public interface IcPartyActDao extends BaseDao { int deleteIcPartyAct(@Param("customerId") String customerId, @Param("userId")String userId, @Param("icPartyActId")String icPartyActId); List selectresiPartyActList(IcPartyActListFormDTO formDTO); + + List selectNeedRemindAutoPublishAct(String afterThreeDayDate); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 347f62a79d..a10b817418 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -663,9 +663,22 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNeedRemindAutoPublishAct(dateId); + for(IcPartyActEntity act:list){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(act.getCustomerId()); + msg.setIcPartyActId(act.getId()); + msg.setType("remind"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 414f5ca590..7ed122e31a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -205,4 +205,19 @@ where customerId=#{customerId} and id=#{icPartyActId} + + \ No newline at end of file From 8a278fc79ec5e7417c2c6abd5f781c3ca104b23c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 17:55:01 +0800 Subject: [PATCH 075/206] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/task/AutoPublishIcPartyActTask.java | 14 +++++++++- .../feign/ResiPartyMemberOpenFeignClient.java | 13 +++++++++- ...esiPartyMemberOpenFeignClientFallback.java | 7 ++++- .../controller/IcPartyActController.java | 16 +++++++++--- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++- .../partyOrg/service/IcPartyActService.java | 10 ++++++- .../service/impl/IcPartyActServiceImpl.java | 26 ++++++++++++++++++- .../mapper/partyOrg/IcPartyActDao.xml | 17 ++++++++---- 8 files changed, 93 insertions(+), 14 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java index 531f41ebeb..d1a9c7a250 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/AutoPublishIcPartyActTask.java @@ -1,5 +1,9 @@ package com.epmet.task; +import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -7,8 +11,11 @@ import org.springframework.stereotype.Component; * @Author yzm * @Date 2022/8/22 15:13 */ +@Slf4j @Component("autoPublishIcPartyActTask") public class AutoPublishIcPartyActTask implements ITask { + @Autowired + private ResiPartyMemberOpenFeignClient resiPartyMemberOpenFeignClient; /** * 活动时间2022-08-15 10:30 选择的是提前3天自动发布 * 本任务是自动发布活动 @@ -18,7 +25,12 @@ public class AutoPublishIcPartyActTask implements ITask { */ @Override public void run(String params) { - + Result result=resiPartyMemberOpenFeignClient.autoPublishIcPartyAct(); + if(result.success()){ + log.info("autoPublishIcPartyActTask执行成功"); + }else{ + log.info("autoPublishIcPartyActTask执行失败"); + } } } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index cae69c38a0..a1b68eaff8 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -145,6 +145,17 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyOrg/getPartyOrgList") Result> getPartyOrgList(); - @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublishTask") + /** + * 您有一个活动3天后即将自动发布 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/noticePartyActAutoPublish") Result noticePartyActAutoPublishTask(); + + /** + * 自动发布党组织活动 + * @return + */ + @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") + Result autoPublishIcPartyAct(); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 585e531797..a8d8240645 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -117,6 +117,11 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp @Override public Result noticePartyActAutoPublishTask() { - return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublishTask"); + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "noticePartyActAutoPublish"); + } + + @Override + public Result autoPublishIcPartyAct() { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 1ed8b5f813..2daee1b686 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -299,9 +299,19 @@ public class IcPartyActController { * 通知：您有一个活动3天后即将自动发布 * @return */ - @PostMapping("noticePartyActAutoPublishTask") - public Result noticePartyActAutoPublishTask(){ - icPartyActService.noticePartyActAutoPublishTask(); + @PostMapping("noticePartyActAutoPublish") + public Result noticePartyActAutoPublish(){ + icPartyActService.noticePartyActAutoPublish(); + return new Result(); + } + + /** + * 自动发布活动 + * @return + */ + @PostMapping("autoPublishIcPartyAct") + public Result autoPublishIcPartyAct(){ + icPartyActService.autoPublishIcPartyAct(); return new Result(); } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index e8b0f11dfc..5ab4ed61e3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -45,5 +45,7 @@ public interface IcPartyActDao extends BaseDao { List selectresiPartyActList(IcPartyActListFormDTO formDTO); - List selectNeedRemindAutoPublishAct(String afterThreeDayDate); + List selectNeedRemindAutoPublishAct(String dateId); + + List selectNoPublishList(String dateId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index a8e150b79a..e1aeee4a8a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -110,5 +110,13 @@ public interface IcPartyActService extends BaseService { PageData list(IcPartyActListFormDTO formDTO); - void noticePartyActAutoPublishTask(); + /** + * 通知：您有一个活动3天后即将自动发布 + */ + void noticePartyActAutoPublish(); + + /** + * 自动发布活动 + */ + void autoPublishIcPartyAct(); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a10b817418..7b29fc8cc5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -661,8 +661,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + /** + * 通知：您有一个活动3天后即将自动发布 + */ @Override - public void noticePartyActAutoPublishTask() { + public void noticePartyActAutoPublish() { Date nowDate=new Date(); Date afterThreeDayDate=DateUtils.calDateBaseDay(nowDate,3); // log.info("现在时间:"+DateUtils.format(nowDate,"yyyy-MM-dd HH:mm:ss")+";3天后="+DateUtils.format(afterThreeDayDate,"yyyy-MM-dd HH:mm:ss")); @@ -681,4 +684,25 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); + for(IcPartyActEntity act:list){ + //置为已发布 + act.setIsPublish(NumConstant.ONE_STR); + baseDao.updateById(act); + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(act.getCustomerId()); + msg.setIcPartyActId(act.getId()); + msg.setType("publish"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 7ed122e31a..f7d256aa49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -209,15 +209,22 @@ + \ No newline at end of file From 634ed4de8c5f15e7f7103fdc147b19fd0cc056d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 22 Aug 2022 18:06:29 +0800 Subject: [PATCH 076/206] pids --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7b29fc8cc5..2ac398d27a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -12,7 +12,9 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; @@ -173,8 +175,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 09:00:47 +0800 Subject: [PATCH 077/206] joinOrgName --- .../epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java index c87e466c3a..d628ccc457 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -1,13 +1,10 @@ package com.epmet.modules.partyOrg.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 参加活动党组织表 * @@ -36,6 +33,8 @@ public class IcPartyActOrgEntity extends BaseEpmetEntity { */ private String joinOrgId; + private String joinOrgName; + /** * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 */ From a907f2ef57bf7575903bc48a3b02bddc4caaa1df Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 09:17:45 +0800 Subject: [PATCH 078/206] orgIdPath --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2ac398d27a..4f50089f27 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -177,7 +178,12 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 09:29:42 +0800 Subject: [PATCH 079/206] customer_id --- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index f7d256aa49..e37644645a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -202,7 +202,7 @@ set del_flag='1', UPDATED_BY=#{userId}, UPDATED_TIME=now() - where customerId=#{customerId} + where customer_id=#{customerId} and id=#{icPartyActId} From 1a425efc2c3205955b9cfb54d720bd5781922daf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 09:45:50 +0800 Subject: [PATCH 080/206] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/YearSearchDetailResultDTO.java | 1 + .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java index 24ff5a1061..ef6c80ed65 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/YearSearchDetailResultDTO.java @@ -17,6 +17,7 @@ public class YearSearchDetailResultDTO implements Serializable { private static final long serialVersionUID = 8961924457475202790L; private String type; + private String typeValue; private String frequency; private List activityList; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 4f50089f27..07c6942eec 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -417,7 +417,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl { if (at.getValue().equals(type)){ - dto.setType(at.getLabel()); + dto.setType(type); + dto.setTypeValue(at.getLabel()); dto.setFrequency(at.getFrequencyDesc()); } }); From d3b2108359325adfc471b290b0939b5ab087b1e1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 09:59:43 +0800 Subject: [PATCH 081/206] =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActPageResultDTO.java | 2 ++ .../partyOrg/controller/IcPartyActController.java | 4 ++-- .../modules/partyOrg/excel/IcPartyActExpoprtExcel.java | 10 +++------- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java index 1fe0c4254a..f28f8a0083 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActPageResultDTO.java @@ -77,5 +77,7 @@ public class IcPartyActPageResultDTO implements Serializable { private String joinUserTypeName; private List joinOrgList; + //导出用 + private String joinOrgNameStr; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index 2daee1b686..eec51412b1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -263,11 +263,11 @@ public class IcPartyActController { List list = null; do { data = icPartyActService.pageList(formDTO); - list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); - list.forEach(l->{ + data.getList().forEach(l->{ List orgNameList = l.getJoinOrgList().stream().map(m -> m.getJoinOrgName()).distinct().collect(Collectors.toList()); l.setJoinOrgNameStr(orgNameList.stream().map(String::valueOf).collect(Collectors.joining(","))); }); + list = ConvertUtils.sourceToTarget(data.getList(), IcPartyActExpoprtExcel.class); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); excelWriter.write(list, writeSheet); } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java index 06dc61ed31..995682ec4e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcPartyActExpoprtExcel.java @@ -3,11 +3,9 @@ package com.epmet.modules.partyOrg.excel; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.epmet.resi.partymember.dto.icpartyact.form.JoinOrgDTO; import lombok.Data; import java.util.Date; -import java.util.List; /** * @Description @@ -19,7 +17,7 @@ public class IcPartyActExpoprtExcel { /** * 活动主题 */ - @ExcelProperty(value = "活动主题") + @ExcelProperty(value = "活动主题11") @ColumnWidth(20) private String topic; @@ -67,13 +65,11 @@ public class IcPartyActExpoprtExcel { private String isPublishName; @ExcelProperty(value = "参加人员") - @ColumnWidth(8) + @ColumnWidth(12) private String joinUserTypeName; @ExcelProperty(value = "参加活动党组织") - @ColumnWidth(40) + @ColumnWidth(80) private String joinOrgNameStr; - - private List joinOrgList; } From 4b3d076a23c6158dfde5e4d1f909bea3134a99f4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 10:06:44 +0800 Subject: [PATCH 082/206] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 1 + .../main/resources/mapper/partyOrg/IcPartyActOrgDao.xml | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 07c6942eec..7c728bd892 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -84,7 +84,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ //删除活动主表和参与活动党组织关系表记录 + //只有本人发布的活动才可以删除 baseDao.deleteIcPartyAct(customerId,userId,icPartyActId); icPartyActOrgDao.updateToDel(userId,icPartyActId); + //删除签到记录 + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId,icPartyActId); + icPartyActSignInRecordDao.delete(queryWrapper); }); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index e37644645a..ea2a3ccb8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -204,6 +204,7 @@ UPDATED_TIME=now() where customer_id=#{customerId} and id=#{icPartyActId} + and PUBLISH_STAFF_ID=#{userId} + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index c6136f2202..d340a5bb16 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -157,5 +157,23 @@ ORDER BY temp.sort ASC + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java index 862d5e6c58..cdf2d7a80d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgTreeListDTO.java @@ -23,7 +23,7 @@ public class PartyOrgTreeListDTO implements Serializable { * 客户Id (customer.id) */ private String customerId; - + private String staffId; /** * 党组织pid */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 73b7b83e0f..0d43188623 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -114,6 +114,7 @@ public class IcPartyOrgController { @PostMapping("getOrgTreeHaveGroup") public Result> getOrgTreeHaveGroup(@LoginUser TokenDto tokenDto,PartyOrgTreeListDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icPartyOrgService.getOrgTreeHaveGroup(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 00355dedd4..37bbbb48d0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -204,8 +204,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); + if (!groupResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询支部小组错误", "查询支部小组错误"); + } for (String id : ids) { //判断该组织是否有下级党组织 List orgList = baseDao.selectAllByOrgId(id); @@ -217,6 +219,10 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl getOrgTreeHaveGroup(PartyOrgTreeListDTO formDTO) { + if (StringUtils.isBlank(formDTO.getAgencyId())) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } List list = baseDao.getSearchTreelist(formDTO); Result>> groupResult = resiGroupOpenFeignClient.getBranchGroupList(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1a7bbfadb6..c5c56bfef8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -110,7 +110,7 @@ where DEL_FLAG=0 and CUSTOMER_ID=#{customerId} - AND( AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ) + AND( AGENCY_ID=#{agencyId} OR AGENCY_PIDS LIKE concat('%',#{agencyId}, '%' ) or (PARTY_ORG_TYPE = '5' and AGENCY_ID=#{agencyId})) From b9580f98137a793c333c4bd609a032b3ef8f5bde Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 23 Aug 2022 14:00:54 +0800 Subject: [PATCH 085/206] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcMessageListFormDTO.java | 2 +- .../dto/partyOrg/form/IcPartyActListFormDTO.java | 2 +- .../partymember/dto/partyOrg/form/PartyActSignFormDTO.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 6 +++++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java index b498576824..685fd340ad 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -11,7 +11,7 @@ public class IcMessageListFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; private String userId; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java index c78a205625..8897dcf2ec 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -20,7 +20,7 @@ public class IcPartyActListFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 1e647cad6d..45726dab7f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -33,7 +33,7 @@ public class PartyActSignFormDTO implements Serializable { private Integer pageNo = 1; private Integer pageSize = 20; - private Boolean isPage = false; + private Boolean isPage = true; //token中信息 private String customerId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7c728bd892..3088fba618 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -580,7 +580,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl result = epmetMessageOpenFeignClient.unReadCount(tokenDto.getUserId()); From 0b262f29fda1057336837451586f2acb778fcef4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 14:12:37 +0800 Subject: [PATCH 086/206] =?UTF-8?q?publishOrgPath=E3=80=81joinOrgPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcPartyActAddOrUpdateFormDTO.java | 3 +- .../dto/partyOrg/result/IcPartyOrgInfo.java | 33 ++++++++++ .../controller/IcPartyActController.java | 6 ++ .../partyOrg/service/IcPartyOrgService.java | 8 +++ .../service/impl/IcPartyActServiceImpl.java | 46 +++++++++----- .../service/impl/IcPartyOrgServiceImpl.java | 62 +++++++++++++++++-- 6 files changed, 139 insertions(+), 19 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index f6b234276b..e9d0c8bedb 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -94,7 +94,8 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { private String longitude; /** - * 活动开始前几天 + * 活动开始前几天,字典接口返回的 + * 0,1,3,5,7天 */ @NotNull(message = "自动发布时间不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private Integer autoPublicType; diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java new file mode 100644 index 0000000000..5aba21de9a --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgInfo.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/8/23 13:10 + */ +@Data +public class IcPartyOrgInfo implements Serializable { + /** + * 党组织ID + */ + private String id; + /** + * 党组织的上级ID,没有上级时为0 + */ + private String orgPid; + /** + * 党组织名称 + */ + private String partyOrgName; + + /** + * 党组织的id全路径（包含自身） + */ + private String partyOrgIdPath; + private String partyOrgNamePath; +} + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index eec51412b1..dc9da8f9a3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -238,6 +238,12 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.yearSearch01(formDTO)); } + /** + * 【党建日历】生成年度活动计划查询 + * @param tokenDto + * @param formDTO + * @return + */ @PostMapping("yearSearch") public Result> yearSearch(@LoginUser TokenDto tokenDto, @RequestBody YearSearchFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, YearSearchFormDTO.YearSearchForm.class); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index defd146e01..3bd50cf946 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -10,6 +10,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgInfo; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; import java.util.List; @@ -136,4 +137,11 @@ public interface IcPartyOrgService extends BaseService { * @return */ DefaultPartyOrgResDTO defaultPartyOrg(String customerId, String userId); + + /** + * 查询党组织partyOrgIdPath + * @param icPartyOrgId + * @return + */ + IcPartyOrgInfo queryIcPartyOrgInfo(String icPartyOrgId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 7c728bd892..dc1733f430 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -174,9 +174,15 @@ public class IcPartyActServiceImpl extends BaseServiceImpl addOrUpdate(IcPartyActAddOrUpdateFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo=queryStaffInfo(formDTO.getCustomerId(),formDTO.getPublishStaffId()); IcPartyActEntity icPartyActEntity= ConvertUtils.sourceToTarget(formDTO,IcPartyActEntity.class); + //计算好自动发布的时间 icPartyActEntity.setAutoPublicTime(DateUtils.calDateBaseDay(formDTO.getHoldTime(),formDTO.getAutoPublicType())); icPartyActEntity.setPublishStaffName(staffInfo.getRealName()); icPartyActEntity.setOrgId(staffInfo.getAgencyId()); + + //!!!!!!!不用前端传的了。 我自己查询吧 + IcPartyOrgInfo icPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(formDTO.getPublishPartyOrgId()); + icPartyActEntity.setPublishOrgPath(icPartyOrgInfo.getPartyOrgIdPath()); + AgencyInfoCache agencyInfoCache= CustomerOrgRedis.getAgencyInfo(staffInfo.getAgencyId()); icPartyActEntity.setPid(agencyInfoCache.getPid()); if(StringUtils.isBlank(agencyInfoCache.getPid())||NumConstant.ZERO_STR.equals(agencyInfoCache.getPid())){ @@ -194,7 +200,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl{ joinOrg.setCustomerId(formDTO.getCustomerId()); joinOrg.setIcPartyActId(icPartyActEntity.getId()); + //!!!!!!!不用前端传的了。 我自己查询吧 + IcPartyOrgInfo joinPartyOrgInfo=SpringContextUtils.getBean(IcPartyOrgService.class).queryIcPartyOrgInfo(joinOrg.getId()); + joinOrg.setJoinOrgPath(joinPartyOrgInfo.getPartyOrgIdPath()); icPartyActOrgDao.insert(joinOrg); }); + //批量新增附件 List attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); int attSort = 1; @@ -227,10 +240,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); - map.put("icPartyActId",icPartyActEntity.getId()); - //已经发布的，编辑需要发消息 - if(sendMsg){ + + //已经发布的活动+且活动未开始的，编辑后需要发消息 + if (sendMsg && icPartyActEntity.getHoldTime().compareTo(new Date()) < 1) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(formDTO.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); @@ -239,6 +251,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl map=new HashMap<>(); + map.put("icPartyActId",icPartyActEntity.getId()); return map; } @@ -446,7 +461,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl implements IcPartyOrgService { @@ -402,4 +401,59 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl pids=new ArrayList<>(); + pids.add(icPartyOrgId); + + List names=new ArrayList<>(); + names.add(orgEntity.getPartyOrgName()); + + Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + orgInfo.setPartyOrgIdPath(partyOrgIdPath); + orgInfo.setPartyOrgNamePath(partyOrgNamePath); + } + return orgInfo; + } + + private Map getPartyOrgIdPath(List pids,List names,String pid) { + Map map=new HashMap<>(); + IcPartyOrgEntity orgEntity=baseDao.selectById(pid); + if(null==orgEntity){ + return map; + } + pids.add(pid); + names.add(orgEntity.getPartyOrgName()); + if(StringUtils.isNotBlank(orgEntity.getOrgPid())&&!NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){ + return getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + } + //倒序排列 + Collections.reverse(pids); + Collections.reverse(names); + + map.put("idPath", StringUtils.join(pids.toArray(),StrConstant.COLON)); + map.put("namePath", StringUtils.join(names.toArray(),StrConstant.HYPHEN)); + return map; + } } From 9be98f2392d000d25ed752b4246056bd714f1910 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 14:14:31 +0800 Subject: [PATCH 087/206] =?UTF-8?q?publishOrgPath=E3=80=81joinOrgPath2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 3 ++- .../epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index e9d0c8bedb..12beafec58 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -126,7 +126,8 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + // @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + // 后端接口内部去赋值，无需前端传入了 private String publishOrgPath; /** diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 383cd43417..02e746aca3 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -40,7 +40,8 @@ public class JoinOrgDTO implements Serializable { /** * PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + // @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + // 后端接口内部去赋值，无需前端传入了 private String joinOrgPath; //接口内部赋值 From db37d24c60a59549a5e7640aca3bd618587fc112 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 14:28:59 +0800 Subject: [PATCH 088/206] jiaoben --- .../db/migration/V0.0.6__party_helper.sql | 136 ++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql new file mode 100644 index 0000000000..ad5055ae51 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql @@ -0,0 +1,136 @@ +CREATE TABLE `ic_party_act_org` +( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `JOIN_ORG_ID` varchar(64) NOT NULL COMMENT '参加活动党组织ID,groupId', + `JOIN_ORG_NAME` varchar(128) NOT NULL COMMENT '参加党组织名称', + `ORG_TYPE` varchar(10) NOT NULL COMMENT '党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PID` varchar(64) NOT NULL COMMENT '参加活动党组织ID的上级节点', + `JOIN_ORG_PATH` varchar(255) NOT NULL COMMENT 'PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + ROW_FORMAT = DYNAMIC COMMENT ='参加活动党组织表'; + + +CREATE TABLE `ic_party_act` +( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `PUBLISH_PARTY_ORG_ID` varchar(64) NOT NULL COMMENT '发布活动党组织', + `PUBLISH_PARTY_ORG_NAME` varchar(20) NOT NULL COMMENT '发布活动党组织名称', + `PUBLISH_ORG_PID` varchar(64) DEFAULT NULL COMMENT '发布活动党组织ID的上级节点', + `PUBLISH_ORG_TYPE` varchar(10) NOT NULL COMMENT '发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PUBLISH_ORG_PATH` varchar(255) NOT NULL COMMENT '发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `ACT_TYPE` varchar(10) NOT NULL COMMENT '活动类型，来源于ic_party_act_type_dict', + `HOLD_YEAR_ID` varchar(10) NOT NULL COMMENT '活动举办时间：yyyy', + `HOLD_MONTH_ID` varchar(10) NOT NULL COMMENT '活动举办时间:yyyyMM', + `HOLD_TIME` datetime NOT NULL COMMENT '举办活动时间', + `TOPIC` varchar(255) NOT NULL COMMENT '活动主题', + `ADDRESS` varchar(255) NOT NULL COMMENT '活动地点', + `LATITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点纬度', + `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点经度', + `AUTO_PUBLIC_TYPE` int(11) NOT NULL COMMENT '活动开始前几天', + `AUTO_PUBLIC_TIME` datetime DEFAULT NULL COMMENT '自动发布时间，保存时算好时间存在这里', + `JOIN_USER_TYPE` varchar(10) DEFAULT NULL COMMENT '参加人员类型，0：全体党员；1：支部委员', + `IS_AUTO_INFORM` varchar(1) DEFAULT NULL COMMENT '是否自动通知参加人员，0否；1是', + `INTRODUCE` varchar(1024) DEFAULT NULL COMMENT '活动介绍', + `IS_PUBLISH` varchar(10) NOT NULL COMMENT '是否发布，0未发布；1已发布；', + `PUBLISH_STAFF_ID` varchar(64) NOT NULL COMMENT '活动发布人', + `PUBLISH_STAFF_NAME` varchar(64) NOT NULL COMMENT '活动发布人姓名', + `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + ROW_FORMAT = DYNAMIC COMMENT ='党建组织活动'; + + +CREATE TABLE `ic_party_act_type_dict` +( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `TYPE_KEY` varchar(32) NOT NULL COMMENT '活动类型key', + `TYPE_NAME` varchar(32) NOT NULL COMMENT '活动名称', + `YEAR_COUNT` int(11) NOT NULL COMMENT '每年几次', + `FREQUENCY_UNIT` varchar(32) NOT NULL COMMENT '频次单位', + `FREQUENCY_COUNT` int(11) NOT NULL COMMENT '频次数量', + `FREQUENCY_DESC` varchar(63) NOT NULL COMMENT '频率描述', + `SORT` int(11) NOT NULL COMMENT '排序', + `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 COMMENT ='党组织活动类型字典表'; + + +CREATE TABLE `ic_party_act_sign_in_record` +( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号', + `EPMET_USER_ID` varchar(64) NOT NULL COMMENT '签到用户id', + `USER_REAL_NAME` varchar(64) NOT NULL COMMENT '签到用户姓名', + `ADDRESS` varchar(255) NOT NULL COMMENT '签到地点', + `LATITUDE` varchar(32) NOT NULL COMMENT '签到地点纬度', + `LONGITUDE` varchar(32) NOT NULL COMMENT '签到地点经度', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + ROW_FORMAT = DYNAMIC COMMENT ='党组织活动签到记录表'; + +CREATE TABLE `ic_schedule` +( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '所属行政组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `STAFF_ID` varchar(64) NOT NULL COMMENT '当前登录用户userId', + `TITLE` varchar(35) NOT NULL COMMENT '日程标题（35字）', + `REMIND_TIME` datetime NOT NULL COMMENT '提醒时间；其实就是日程所属日期', + `IS_PUBLIC` varchar(10) NOT NULL COMMENT '是否公开，0：仅自己可见；1：组织内其他人可见', + `REMARK` varchar(500) DEFAULT NULL COMMENT '备注（500字）', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE = InnoDB + DEFAULT CHARSET = utf8mb4 + ROW_FORMAT = DYNAMIC COMMENT ='日程表'; + + +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', 'zbdydh', '支部党员大会', 4, 'quarter', 1, '每季度1次', 1, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', 'zbwyh', '支部委员会', 12, 'month', 1, '每月1次', 2, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', 'dxzh', '党小组会', 12, 'month', 1, '每月一次', 3, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', 'dangke', '党课', 4, 'quarter', 1, '每季度1次', 4, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', 'ztdr', '主题党日', 12, 'month', 1, '每月1次', 5, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); +INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', 'wmfwhd', '为民服务活动', 12, 'month', 1, '每月1次', 6, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); From 18845ef0c4a1d033ecc4129c994387e9eb0d9db8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 14:30:44 +0800 Subject: [PATCH 089/206] jiaoben --- .../db/migration/V0.0.6__party_helper.sql | 136 ------------------ 1 file changed, 136 deletions(-) delete mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql deleted file mode 100644 index ad5055ae51..0000000000 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql +++ /dev/null @@ -1,136 +0,0 @@ -CREATE TABLE `ic_party_act_org` -( - `ID` varchar(64) NOT NULL COMMENT 'ID', - `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `JOIN_ORG_ID` varchar(64) NOT NULL COMMENT '参加活动党组织ID,groupId', - `JOIN_ORG_NAME` varchar(128) NOT NULL COMMENT '参加党组织名称', - `ORG_TYPE` varchar(10) NOT NULL COMMENT '党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', - `PID` varchar(64) NOT NULL COMMENT '参加活动党组织ID的上级节点', - `JOIN_ORG_PATH` varchar(255) NOT NULL COMMENT 'PARTY_ORG_ID的全路径，包含自身。方便前端回显', - `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - ROW_FORMAT = DYNAMIC COMMENT ='参加活动党组织表'; - - -CREATE TABLE `ic_party_act` -( - `ID` varchar(64) NOT NULL COMMENT 'ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID：当前工作人员所属组织id', - `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', - `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', - `PUBLISH_PARTY_ORG_ID` varchar(64) NOT NULL COMMENT '发布活动党组织', - `PUBLISH_PARTY_ORG_NAME` varchar(20) NOT NULL COMMENT '发布活动党组织名称', - `PUBLISH_ORG_PID` varchar(64) DEFAULT NULL COMMENT '发布活动党组织ID的上级节点', - `PUBLISH_ORG_TYPE` varchar(10) NOT NULL COMMENT '发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', - `PUBLISH_ORG_PATH` varchar(255) NOT NULL COMMENT '发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显', - `ACT_TYPE` varchar(10) NOT NULL COMMENT '活动类型，来源于ic_party_act_type_dict', - `HOLD_YEAR_ID` varchar(10) NOT NULL COMMENT '活动举办时间：yyyy', - `HOLD_MONTH_ID` varchar(10) NOT NULL COMMENT '活动举办时间:yyyyMM', - `HOLD_TIME` datetime NOT NULL COMMENT '举办活动时间', - `TOPIC` varchar(255) NOT NULL COMMENT '活动主题', - `ADDRESS` varchar(255) NOT NULL COMMENT '活动地点', - `LATITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点纬度', - `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点经度', - `AUTO_PUBLIC_TYPE` int(11) NOT NULL COMMENT '活动开始前几天', - `AUTO_PUBLIC_TIME` datetime DEFAULT NULL COMMENT '自动发布时间，保存时算好时间存在这里', - `JOIN_USER_TYPE` varchar(10) DEFAULT NULL COMMENT '参加人员类型，0：全体党员；1：支部委员', - `IS_AUTO_INFORM` varchar(1) DEFAULT NULL COMMENT '是否自动通知参加人员，0否；1是', - `INTRODUCE` varchar(1024) DEFAULT NULL COMMENT '活动介绍', - `IS_PUBLISH` varchar(10) NOT NULL COMMENT '是否发布，0未发布；1已发布；', - `PUBLISH_STAFF_ID` varchar(64) NOT NULL COMMENT '活动发布人', - `PUBLISH_STAFF_NAME` varchar(64) NOT NULL COMMENT '活动发布人姓名', - `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - ROW_FORMAT = DYNAMIC COMMENT ='党建组织活动'; - - -CREATE TABLE `ic_party_act_type_dict` -( - `ID` varchar(64) NOT NULL, - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `TYPE_KEY` varchar(32) NOT NULL COMMENT '活动类型key', - `TYPE_NAME` varchar(32) NOT NULL COMMENT '活动名称', - `YEAR_COUNT` int(11) NOT NULL COMMENT '每年几次', - `FREQUENCY_UNIT` varchar(32) NOT NULL COMMENT '频次单位', - `FREQUENCY_COUNT` int(11) NOT NULL COMMENT '频次数量', - `FREQUENCY_DESC` varchar(63) NOT NULL COMMENT '频率描述', - `SORT` int(11) NOT NULL COMMENT '排序', - `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 COMMENT ='党组织活动类型字典表'; - - -CREATE TABLE `ic_party_act_sign_in_record` -( - `ID` varchar(64) NOT NULL COMMENT '主键', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', - `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', - `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号', - `EPMET_USER_ID` varchar(64) NOT NULL COMMENT '签到用户id', - `USER_REAL_NAME` varchar(64) NOT NULL COMMENT '签到用户姓名', - `ADDRESS` varchar(255) NOT NULL COMMENT '签到地点', - `LATITUDE` varchar(32) NOT NULL COMMENT '签到地点纬度', - `LONGITUDE` varchar(32) NOT NULL COMMENT '签到地点经度', - `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - ROW_FORMAT = DYNAMIC COMMENT ='党组织活动签到记录表'; - -CREATE TABLE `ic_schedule` -( - `ID` varchar(64) NOT NULL COMMENT 'ID', - `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', - `ORG_ID` varchar(64) NOT NULL COMMENT '所属行政组织ID：当前工作人员所属组织id', - `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', - `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', - `STAFF_ID` varchar(64) NOT NULL COMMENT '当前登录用户userId', - `TITLE` varchar(35) NOT NULL COMMENT '日程标题（35字）', - `REMIND_TIME` datetime NOT NULL COMMENT '提醒时间；其实就是日程所属日期', - `IS_PUBLIC` varchar(10) NOT NULL COMMENT '是否公开，0：仅自己可见；1：组织内其他人可见', - `REMARK` varchar(500) DEFAULT NULL COMMENT '备注（500字）', - `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1已删除', - `REVISION` int(11) NOT NULL COMMENT '乐观锁', - `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', - `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', - `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', - `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', - PRIMARY KEY (`ID`) USING BTREE -) ENGINE = InnoDB - DEFAULT CHARSET = utf8mb4 - ROW_FORMAT = DYNAMIC COMMENT ='日程表'; - - -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', 'zbdydh', '支部党员大会', 4, 'quarter', 1, '每季度1次', 1, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', 'zbwyh', '支部委员会', 12, 'month', 1, '每月1次', 2, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', 'dxzh', '党小组会', 12, 'month', 1, '每月一次', 3, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', 'dangke', '党课', 4, 'quarter', 1, '每季度1次', 4, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', 'ztdr', '主题党日', 12, 'month', 1, '每月1次', 5, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); -INSERT INTO `ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', 'wmfwhd', '为民服务活动', 12, 'month', 1, '每月1次', 6, 0, 0, 'APP_USER', NOW(), 'APP_USER', NOW()); From 26823e5a2902031c110a560050f051062a381034 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Aug 2022 14:42:51 +0800 Subject: [PATCH 090/206] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/constants/TopicConstants.java | 2 ++ .../com/epmet/constant/SystemMessageType.java | 7 +++++++ .../impl/SystemMessageServiceImpl.java | 8 +++++++ .../com/epmet/dto/form/PartyPointFormDTO.java | 3 ++- .../epmet/dto/result/PartyPointResultDTO.java | 3 ++- .../epmet/controller/ResiPointController.java | 15 +++++++++++++ .../com/epmet/mq/listener/PointListener.java | 17 +++++++++++++++ .../impl/UserPointActionLogServiceImpl.java | 21 +++++++++++++++++-- .../mapper/UserPointActionLogDao.xml | 15 +++++++++++++ .../feign/ResiPartyMemberOpenFeignClient.java | 4 ++++ ...esiPartyMemberOpenFeignClientFallback.java | 6 ++++++ 11 files changed, 97 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java index 30505f546e..23bfd628a4 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java @@ -89,4 +89,6 @@ public interface TopicConstants { * 消息-党建小助手 */ String IC_MESSAGE = "ic_message"; + + String PARTY_BUILDING = "party_building"; } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java index fd1387fd43..4048ae5902 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SystemMessageType.java @@ -175,4 +175,11 @@ public interface SystemMessageType { */ String PARTY_MEETING_MESSAGE = "party_meeting_message"; + String ZBWYH = "支部委员会"; + String ZBDYDH = "支部党员大会"; + String DXZH = "党小组会"; + String DANGKE = "党课"; + String ZTDR = "主题党日"; + String WMFWHD = "为民服务活动"; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java index 8373666cc4..3eea1f03d8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SystemMessageServiceImpl.java @@ -240,6 +240,14 @@ public class SystemMessageServiceImpl implements SystemMessageService { case SystemMessageType.PARTY_MEETING_MESSAGE: topic=TopicConstants.IC_MESSAGE; break; + case SystemMessageType.ZBWYH: + case SystemMessageType.ZBDYDH: + case SystemMessageType.DXZH: + case SystemMessageType.DANGKE: + case SystemMessageType.ZTDR: + case SystemMessageType.WMFWHD: + topic=TopicConstants.PARTY_BUILDING; + break; default: logger.error("getTopicByMsgType msgType:{} is not support for any topic", msgType); } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java index bf8e7a9c0f..8082e71192 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PartyPointFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import java.io.Serializable; @@ -10,7 +11,7 @@ import java.io.Serializable; * @Date 2022/8/22 15:57 */ @Data -public class PartyPointFormDTO implements Serializable { +public class PartyPointFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -4811220825653023328L; private String customerId; private String userId; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 7574f0b3e5..3a171175e3 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -20,6 +20,7 @@ public class PartyPointResultDTO implements Serializable { private String point; private String actId; private String actType; - private String actDate; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date actDate; private String actAddress; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 885910a843..60712e7780 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -255,4 +255,19 @@ public class ResiPointController { ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); return new Result>().ok(pointAdditiveRecordService.getRecords(pageUserParam)); } + + /** + * 党建积分 + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< PageData< PartyPointResultDTO>>} + * @Author zhaoqifeng + * @Date 2022/8/23 14:12 + */ + @PostMapping("pagePartyPoint") + public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java index 63b4c44e2b..2204d7c7e2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/listener/PointListener.java @@ -113,6 +113,15 @@ public class PointListener implements MessageListenerConcurrently { //给需求服务方（志愿者）发放积分 grantServerPoint(msg); break; + case SystemMessageType.ZBWYH: + case SystemMessageType.ZBDYDH: + case SystemMessageType.DXZH: + case SystemMessageType.DANGKE: + case SystemMessageType.ZTDR: + case SystemMessageType.WMFWHD: + partyAct(msg); + default: + break; } } catch (RenException e) { @@ -218,6 +227,14 @@ public class PointListener implements MessageListenerConcurrently { }); } + private void partyAct(String msg) { + List formList = JSON.parseArray(msg, BasePointEventMsg.class); + + formList.forEach(obj -> { + userPointActionLogService.grantPointByEvent(obj.getEventTag(),obj); + }); + } + /** * 需求完成，给志愿者发放积分 * @param msg diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 427b691584..7a339c69e5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -46,6 +46,8 @@ import com.epmet.entity.UserPointActionLogEntity; import com.epmet.entity.UserPointStatisticalDailyEntity; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetHeartOpenFeignClient; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.epmet.utils.DimIdGenerator; import com.epmet.utils.ModuleConstant; @@ -55,13 +57,13 @@ import com.github.pagehelper.PageInfo; import com.google.common.collect.Maps; import dto.form.SendPointFormDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import java.util.*; @@ -91,6 +93,8 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl page(Map params) { @@ -652,7 +656,20 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl list =baseDao.getPagePartyPoint(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + Result actInfo = resiPartyMemberOpenFeignClient.actDetail(item.getActId()); + if (actInfo.success() && null != actInfo.getData()) { + item.setActType(actInfo.getData().getActTypeName()); + item.setActAddress(actInfo.getData().getAddress()); + item.setActDate(actInfo.getData().getHoldTime()); + } + }); + } + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index d340a5bb16..ec1de753c4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -172,6 +172,21 @@ WHERE DEL_FLAG = '0' AND BIZ_TYPE = 'party_building' + AND USER_ID = #{userId} + AND CUSTOMER_ID = #{customerId} + + AND SOURCE_TYPE = #{type} + + + AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} + AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + ORDER BY CREATED_TIME DESC diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index a1b68eaff8..de72c34234 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.resi.partymember.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -158,4 +159,7 @@ public interface ResiPartyMemberOpenFeignClient { */ @PostMapping("/resi/partymember/icPartyAct/autoPublishIcPartyAct") Result autoPublishIcPartyAct(); + + @PostMapping("/resi/partymember/icPartyAct/act-detail/{icPartyActId}") + Result actDetail(@PathVariable("icPartyActId")String icPartyActId); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index a8d8240645..2a167d2af9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.dto.result.OptionResultDTO; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; @@ -124,4 +125,9 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result autoPublishIcPartyAct() { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "autoPublishIcPartyAct"); } + + @Override + public Result actDetail(String icPartyActId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "actDetail"); + } } From f70b6a96274205c20674c5c6d826144af4cd0f41 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 15:15:06 +0800 Subject: [PATCH 091/206] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActServiceImpl.java | 6 +++ .../service/impl/IcPartyOrgServiceImpl.java | 41 ++++++++++--------- 2 files changed, 27 insertions(+), 20 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 625c1ec995..2429bc8334 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -181,6 +181,9 @@ public class IcPartyActServiceImpl extends BaseServiceImpl pids=new ArrayList<>(); - pids.add(icPartyOrgId); + orgInfo.setOrgPid(orgEntity.getOrgPid()); + orgInfo.setPartyOrgName(orgEntity.getPartyOrgName()); + if(StringUtils.isBlank(orgEntity.getOrgPid())||NumConstant.ZERO_STR.equals(orgEntity.getOrgPid())){ + //一级党组织直接返回 + orgInfo.setPartyOrgIdPath(orgEntity.getId()); + orgInfo.setPartyOrgNamePath(orgEntity.getPartyOrgName()); + return orgInfo; + } + List pids=new ArrayList<>(); + pids.add(icPartyOrgId); - List names=new ArrayList<>(); - names.add(orgEntity.getPartyOrgName()); + List names=new ArrayList<>(); + names.add(orgEntity.getPartyOrgName()); - Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); - String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; - String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; - orgInfo.setPartyOrgIdPath(partyOrgIdPath); - orgInfo.setPartyOrgNamePath(partyOrgNamePath); - } + Map map=getPartyOrgIdPath(pids,names,orgEntity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + orgInfo.setPartyOrgIdPath(partyOrgIdPath); + orgInfo.setPartyOrgNamePath(partyOrgNamePath); return orgInfo; } From 5d4d408f82c4e57f7409e05421b77a33abaad34a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 15:22:06 +0800 Subject: [PATCH 092/206] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 2429bc8334..0a2f051ff4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -182,7 +182,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 23 Aug 2022 16:14:02 +0800 Subject: [PATCH 093/206] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=BF=97=E6=84=BF=E8=80=85=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcUserDemandRecServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 951b7b2e79..564d7b7a10 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -1375,8 +1375,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl> icUserInfoRes = epmetUserOpenFeignClient.getListIcResiUserDTO(new ArrayList<>(icUserIdList)); if (!icUserInfoRes.success() || CollectionUtils.isEmpty(icUserInfoRes.getData())) { - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); + // throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "查询居民信息志愿者信息异常"); + log.warn("查询居民信息志愿者信息异常:icUserIdList:"+JSON.toJSONString(icUserIdList)); + return icUserInfoMap; } icUserInfoMap = icUserInfoRes.getData().stream().collect(Collectors.toMap(IcResiUserDTO::getId, o -> o, (o1, o2) -> o1)); } @@ -1503,8 +1505,8 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl icUserInfoMap = getIcVolunteerMap(new HashSet<>(Arrays.asList(resDto.getServerId()))); resDto.setServiceUnitName(StrConstant.EPMETY_STR); - resDto.setServiceUserName(icUserInfoMap.get(resDto.getServerId()).getName()); - resDto.setServiceUserMobile(icUserInfoMap.get(resDto.getServerId()).getMobile()); + resDto.setServiceUserName(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getName() : StrConstant.EPMETY_STR); + resDto.setServiceUserMobile(MapUtils.isNotEmpty(icUserInfoMap) && icUserInfoMap.containsKey(resDto.getServerId()) ? icUserInfoMap.get(resDto.getServerId()).getMobile() : StrConstant.EPMETY_STR); break; default: log.warn("serviceType 错误"); From ef33d631ccf7e71624cad06293640e96577b58f9 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 23 Aug 2022 17:01:23 +0800 Subject: [PATCH 094/206] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E6=8E=A8=E9=80=81mq=E5=8F=91=E6=94=BE=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/IcMessageDao.xml | 1 + .../partyOrg/form/PartyActSignFormDTO.java | 5 ++ .../IcPartyActSignInRecordServiceImpl.java | 57 +++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 63ed7b1564..aa20ac5071 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -41,6 +41,7 @@ ic_message WHERE del_flag = '0' + AND read_flag = 'unread' AND user_id = #{userId} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 45726dab7f..9d6de8fef7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -15,6 +15,11 @@ public class PartyActSignFormDTO implements Serializable { */ @NotBlank(message = "活动Id不能为空",groups = {UpdateGroup.class}) private String icPartyActId; + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空",groups = {UpdateGroup.class}) + private String gridId; /** * 签到地点 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 1ae62b0476..9e940c6f8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -4,29 +4,46 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.MqConstant; +import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.SystemMessageType; import com.epmet.dto.IcMessageDTO; +import com.epmet.dto.form.CommonGridIdFormDTO; import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; +import com.epmet.dto.form.SystemMsgFormDTO; +import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcPartyActSignInRecordDao; +import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; +import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; +import com.epmet.resi.group.constant.TopicConstant; +import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.RequestBody; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -38,9 +55,14 @@ import java.util.Map; * @since v1.0.0 2022-08-18 */ @Service +@Slf4j public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl implements IcPartyActSignInRecordService { @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private IcPartyActService icPartyActService; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @Override @@ -121,6 +143,41 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl pointEventMsgList = new ArrayList<>(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setOpAgencyId(gridInfo.getPid()); + pointEventMsg.setOperatorId(formDTO.getUserId()); + pointEventMsg.setAgencyId(gridInfo.getPid()); + pointEventMsg.setCustomerId(formDTO.getCustomerId()); + pointEventMsg.setGridId(gridInfo.getId()); + pointEventMsg.setUserId(formDTO.getUserId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setSourceType(actType); + pointEventMsg.setSourceId(formDTO.getIcPartyActId()); + pointEventMsgList.add(pointEventMsg); + + SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); + msgFormDTO.setMessageType(eventTag); + msgFormDTO.setContent(pointEventMsgList); + Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); + if (!sendMsgResult.success()) { + log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + } } } \ No newline at end of file From 1395c9a377a91bc32e55ec79de1a2b45f93d89c5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 23 Aug 2022 17:06:34 +0800 Subject: [PATCH 095/206] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/rocketmq/constants/ConsomerGroupConstants.java | 5 +++++ .../src/main/java/com/epmet/mq/RocketMQConsumerRegister.java | 1 + 2 files changed, 6 insertions(+) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java index babe79da88..6bc618a01b 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java @@ -103,4 +103,9 @@ public interface ConsomerGroupConstants { * 党建小助手监听器分组 */ String PARTY_MEETING_MESSAGE = "party_meeting_message"; + + /** + * 党建积分操作消费组 + */ + String PARTY_BUILDING_GROUP = "party_building_group"; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java index 500f4bb632..bab9146143 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java @@ -22,6 +22,7 @@ public class RocketMQConsumerRegister extends MQAbstractRegister { register(consumerProperties, ConsomerGroupConstants.RESI_GROUP_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.RESI_GROUP, "*", new PointListener(userPointActionLogService)); register(consumerProperties, ConsomerGroupConstants.EPMET_HEART_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.EPMET_HEART, "*", new PointListener(userPointActionLogService)); register(consumerProperties, ConsomerGroupConstants.COMMUNITY_SERVICE_POINT_OPERATION_GROUP, MessageModel.CLUSTERING, TopicConstants.COMMUNITY_SERVICE, "*", new PointListener(userPointActionLogService)); + register(consumerProperties, ConsomerGroupConstants.PARTY_BUILDING_GROUP, MessageModel.CLUSTERING, TopicConstants.PARTY_BUILDING, "*", new PointListener(userPointActionLogService)); // ...其他监听器类似 } From a1aa7d169a3b02ea2cda02299d157ee9a3760492 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 17:15:29 +0800 Subject: [PATCH 096/206] null --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 0a2f051ff4..5bd4ea3bc8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -236,7 +236,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl attachmentEntityList=ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class); + List attachmentEntityList=CollectionUtils.isNotEmpty(formDTO.getAttachmentList())?ConvertUtils.sourceToTarget(formDTO.getAttachmentList(),ResiPartymemberAttachmentEntity.class):new ArrayList<>(); int attSort = 1; for (ResiPartymemberAttachmentEntity att : attachmentEntityList) { att.setCustomerId(formDTO.getCustomerId()); From c36395eb962c818973b2ac3c47239b7de41a8caf Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 23 Aug 2022 17:24:12 +0800 Subject: [PATCH 097/206] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/form/ActAndScheduleListFormDTO.java | 2 +- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java index 03e24570ad..46ee2bdaed 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/ActAndScheduleListFormDTO.java @@ -17,7 +17,7 @@ public class ActAndScheduleListFormDTO implements Serializable { private String startDate; private String endDate; private String dateId; - private String yearId; + private String yearId = ""; /** * 是否本人创建的活动，1：是；0：否 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ea2a3ccb8b..2c1b07c313 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -68,6 +68,9 @@ AND DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') = #{dateId} + + AND DATE_FORMAT(pa.HOLD_TIME,'%Y') = #{yearId} + AND act_type = #{type} From afe36ffe1d928ef03857445443de2d3f9dc9fd90 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Aug 2022 17:43:14 +0800 Subject: [PATCH 098/206] /icPartyOrg/adjustOrgPath --- .../controller/IcPartyOrgController.java | 10 +++++++++ .../partyOrg/service/IcPartyOrgService.java | 5 +++++ .../service/impl/IcPartyOrgServiceImpl.java | 22 +++++++++++++++++++ 3 files changed, 37 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 0d43188623..80b8007b9a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -167,4 +167,14 @@ public class IcPartyOrgController { public Result defaultPartyOrg(@LoginUser TokenDto tokenDto){ return new Result().ok(icPartyOrgService.defaultPartyOrg(tokenDto.getCustomerId(), tokenDto.getUserId())); } + + /** + * 调整历史数据 ORG_PIDS + * @return + */ + @PostMapping("adjustOrgPath") + public Result adjustOrgPath(@RequestBody List customerIds){ + icPartyOrgService.adjustOrgPath(customerIds); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 3bd50cf946..4f52b137cb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -144,4 +144,9 @@ public interface IcPartyOrgService extends BaseService { * @return */ IcPartyOrgInfo queryIcPartyOrgInfo(String icPartyOrgId); + + /** + * 调整历史数据 ORG_PIDS + */ + void adjustOrgPath(List customerIds); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 8ead407a81..39941fc013 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -457,4 +457,26 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl customerIds) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.in(org.apache.commons.collections4.CollectionUtils.isNotEmpty(customerIds),IcPartyOrgEntity::getCustomerId,customerIds); + List list=baseDao.selectList(queryWrapper); + int num=1; + for(IcPartyOrgEntity entity:list){ + List pids=new ArrayList<>(); + List names=new ArrayList<>(); + Map map=getPartyOrgIdPath(pids,names,entity.getOrgPid()); + String partyOrgIdPath = map.containsKey("idPath") ? map.get("idPath") : StrConstant.EPMETY_STR; + String partyOrgNamePath = map.containsKey("namePath") ? map.get("namePath") : StrConstant.EPMETY_STR; + log.info(num+":::"+entity.getId()+entity.getPartyOrgName()+";path="+partyOrgIdPath+";"+partyOrgNamePath); + entity.setOrgPids(partyOrgIdPath); + baseDao.updateById(entity); + num++; + } + } } From 4a96b8e7a859ca64f8bd9aa93a0e75102d0c8e72 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 09:30:26 +0800 Subject: [PATCH 099/206] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/IcPartyActListResultDTO.java | 4 ++++ .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java index 29c968ba90..8644aa81c2 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyActListResultDTO.java @@ -22,6 +22,10 @@ public class IcPartyActListResultDTO implements Serializable { * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； */ private String actType; + /** + * 活动类型，0：支部党员大会；1：支部委员会；2：党小组会；3：党课；4：主题党日；5：为民服务活动； + */ + private String actTypeName; /** * 活动时间 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 5bd4ea3bc8..702ed4ff31 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -694,6 +694,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list = baseDao.selectresiPartyActList(formDTO); + + //3.封装数据 + List dict = actTypeList(formDTO.getCustomerId()); + list.forEach(u -> dict.stream().filter(r -> u.getActType().equals(r.getValue())).forEach(d -> u.setActTypeName(d.getLabel()))); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } From 4c59f444c05099fe04bccaf79d580db7e12383ed Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 10:08:37 +0800 Subject: [PATCH 100/206] .. --- .../resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java index 9d6de8fef7..96c28eda43 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActSignFormDTO.java @@ -18,7 +18,7 @@ public class PartyActSignFormDTO implements Serializable { /** * 网格Id */ - @NotBlank(message = "网格Id不能为空",groups = {UpdateGroup.class}) + @NotBlank(message = "网格Id不能为空",groups = {AddGroup.class}) private String gridId; /** * 签到地点 From 8eee8ed3d7c065f2cb36a4d0546246cf9c4866d1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 24 Aug 2022 10:50:00 +0800 Subject: [PATCH 101/206] =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml index b5fc4d414b..0a56fd2369 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActSignInRecordDao.xml @@ -13,7 +13,8 @@ user_real_name, address, latitude, - longitude + longitude, + created_time FROM ic_party_act_sign_in_record WHERE From 9d12fb20fb7efd29ff9cdcb83860d6f912edd790 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 24 Aug 2022 14:35:06 +0800 Subject: [PATCH 102/206] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=96=B0partymember=5Finfo.ID=5FCARD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/ResiPartyMemberOpenFeignClient.java | 9 +++++++++ .../ResiPartyMemberOpenFeignClientFallback.java | 12 ++++++++++++ .../controller/PartymemberInfoController.java | 11 +++++++++++ .../service/PartymemberInfoService.java | 7 +++++++ .../service/impl/PartymemberInfoServiceImpl.java | 15 +++++++++++++++ .../service/impl/UserResiInfoServiceImpl.java | 9 +++++++++ 6 files changed, 63 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java index de72c34234..03cac6e6f7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/ResiPartyMemberOpenFeignClient.java @@ -162,4 +162,13 @@ public interface ResiPartyMemberOpenFeignClient { @PostMapping("/resi/partymember/icPartyAct/act-detail/{icPartyActId}") Result actDetail(@PathVariable("icPartyActId")String icPartyActId); + + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + * @return + */ + @PostMapping("/resi/partymember/partymemberinfo/updatePartyMemberIdCard") + Result updatePartyMemberIdCard(@RequestParam("userId") String userId, @RequestParam("idNum")String idNum); } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java index 2a167d2af9..f6d5c20813 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/feign/fallback/ResiPartyMemberOpenFeignClientFallback.java @@ -130,4 +130,16 @@ public class ResiPartyMemberOpenFeignClientFallback implements ResiPartyMemberOp public Result actDetail(String icPartyActId) { return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "actDetail"); } + + /** + * 更新partymember_info.ID_CARD + * + * @param userId + * @param idNum + * @return + */ + @Override + public Result updatePartyMemberIdCard(String userId, String idNum) { + return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "updatePartyMemberIdCard",userId,idNum); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java index 98b56b8475..d5c257c114 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartymemberInfoController.java @@ -168,4 +168,15 @@ public class PartymemberInfoController { public Result> getPartyMemberInfoByCustomerId(@RequestParam("customerId")String customerId){ return new Result>().ok(partymemberInfoService.getPartyMemberInfoByCustomerId(customerId)); } + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + * @return + */ + @PostMapping("updatePartyMemberIdCard") + public Result updatePartyMemberIdCard(@RequestParam("userId") String userId, @RequestParam("idNum")String idNum){ + partymemberInfoService.updatePartyMemberIdCard(userId,idNum); + return new Result(); + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java index eed9482da3..8e8d5f295d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberInfoService.java @@ -178,4 +178,11 @@ public interface PartymemberInfoService extends BaseService getPartyMemberInfoByCustomerId(String customerId); + + /** + * 更新partymember_info.ID_CARD + * @param userId + * @param idNum + */ + void updatePartyMemberIdCard(String userId, String idNum); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index dc592a254d..b85d5a87fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.modules.partymember.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -258,4 +259,18 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl getPartyMemberInfoByCustomerId(String customerId) { return baseDao.selectListPartyMemberInfoByCustomerId(customerId); } + + /** + * 更新partymember_info.ID_CARD + * + * @param userId + * @param idNum + */ + @Override + public void updatePartyMemberIdCard(String userId, String idNum) { + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.eq(PartymemberInfoEntity::getUserId,userId); + updateWrapper.set(PartymemberInfoEntity::getIdCard,idNum); + baseDao.update(null,updateWrapper); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 44cd7c12a3..a0294a4158 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -53,6 +53,7 @@ import com.epmet.redis.UserBaseInfoRedis; import com.epmet.redis.UserResiInfoRedis; import com.epmet.resi.group.dto.topic.form.SharableTopicAndInviteeFormDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; +import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.service.*; import com.epmet.util.ModuleConstant; import org.apache.commons.collections4.CollectionUtils; @@ -99,6 +100,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -423,6 +428,10 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl Date: Wed, 24 Aug 2022 17:19:03 +0800 Subject: [PATCH 103/206] -1 --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../service/impl/PartymemberInfoServiceImpl.java | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 702ed4ff31..e9d4cbedca 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -175,7 +175,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl implements PartymemberInfoService { - @Autowired - private PartymemberInfoRedis partymemberInfoRedis; @Autowired private PartymemberInfoDao partyMemberInfoDao; @@ -71,8 +67,6 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( From 565e10fa3bd2c3251a796307891fe2fdd05ba98e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 25 Aug 2022 09:34:47 +0800 Subject: [PATCH 104/206] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=A7=AF=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/PartyPointRecordResultDTO.java | 21 ++++++++++++++++++ .../epmet/dto/result/PartyPointResultDTO.java | 10 +++++++-- .../epmet/controller/ResiPointController.java | 4 ++-- .../service/UserPointActionLogService.java | 7 ++---- .../impl/UserPointActionLogServiceImpl.java | 22 +++++++++++++++---- .../mapper/UserPointActionLogDao.xml | 3 ++- 6 files changed, 53 insertions(+), 14 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java new file mode 100644 index 0000000000..df87b12e14 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointRecordResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/8/25 9:20 + */ +@Data +public class PartyPointRecordResultDTO implements Serializable { + private static final long serialVersionUID = -1480768520576719171L; + /** + * 日期 yyyy-MM-dd 字符串 + * */ + private String date; + private List dailyList; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 3a171175e3..13877d86bf 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -15,8 +15,14 @@ import java.util.Date; public class PartyPointResultDTO implements Serializable { private static final long serialVersionUID = -3208641116926725011L; private String title; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") - private Date dateTime; + /** + * 日期yyyy-MM-dd + */ + private String date; + /** + * 时间hh:mm + */ + private String time; private String point; private String actId; private String actType; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 60712e7780..e37fb2055e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -265,9 +265,9 @@ public class ResiPointController { * @Date 2022/8/23 14:12 */ @PostMapping("pagePartyPoint") - public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ + public Result> pagePartyPoint(@LoginUser TokenDto tokenDto, @RequestBody PartyPointFormDTO formDTO ){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); + return new Result>().ok(pointActionLogService.pagePartyPoint(formDTO)); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java index a229ae583f..9e6ec53a68 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointActionLogService.java @@ -25,10 +25,7 @@ import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.IcResiPointPageFormDTO; import com.epmet.dto.form.MyPointTaskFormDTO; import com.epmet.dto.form.PartyPointFormDTO; -import com.epmet.dto.result.MyPointTaskResultDTO; -import com.epmet.dto.result.PartyPointResultDTO; -import com.epmet.dto.result.ResiPointLogListResultDTO; -import com.epmet.dto.result.ResiPointPageResDTO; +import com.epmet.dto.result.*; import com.epmet.entity.UserPointActionLogEntity; import dto.form.SendPointFormDTO; @@ -170,5 +167,5 @@ public interface UserPointActionLogService extends BaseService pagePartyPoint(PartyPointFormDTO formDTO); + List pagePartyPoint(PartyPointFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index 7a339c69e5..ae22f32df9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -616,12 +616,13 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl} + * @Return {@link List< PartyPointRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/8/22 16:04 */ @Override - public PageData pagePartyPoint(PartyPointFormDTO formDTO) { + public List pagePartyPoint(PartyPointFormDTO formDTO) { + List result = new LinkedList<>(); if (StringUtils.isNotBlank(formDTO.getQuarter())) { if (StringUtils.isNotBlank(formDTO.getMonth())) { formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); @@ -667,9 +668,22 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl> map = + list.stream().collect(Collectors.groupingBy(PartyPointResultDTO::getDate)); + + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); + sortedMap.entrySet().forEach(e -> { + PartyPointRecordResultDTO o = new PartyPointRecordResultDTO(); + o.setDate(e.getKey()); + o.setDailyList(e.getValue()); + result.add(o); + }); + } - PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return result; } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index ec1de753c4..51740cf037 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -166,7 +166,8 @@ WHEN 'plus' THEN concat( '+', POINT ) ELSE POINT END AS point, - CREATED_TIME AS dateTime + DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date, + DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time FROM USER_POINT_ACTION_LOG WHERE From ca80c502a4c7a16ca672d5d7be61b5a29be96983 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 25 Aug 2022 10:18:33 +0800 Subject: [PATCH 105/206] =?UTF-8?q?=E5=85=9A=E7=BB=84=E7=BB=87ID=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index e9d4cbedca..e5ecaf20a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -463,11 +463,13 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 11:55:49 +0800 Subject: [PATCH 106/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BD=93=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index e5ecaf20a4..b7a14504a5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -566,7 +566,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 12:01:26 +0800 Subject: [PATCH 107/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=A5=E5=8F=82=EF=BC=8C=E6=8C=89=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E6=A8=A1=E7=B3=8A=E6=A3=80=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java | 2 ++ .../src/main/resources/mapper/IcMessageDao.xml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java index 685fd340ad..db5b351010 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/IcMessageListFormDTO.java @@ -9,6 +9,8 @@ import java.io.Serializable; public class IcMessageListFormDTO implements Serializable { private static final long serialVersionUID = 2697079163476964749L; + //检索内容 + private String content; private Integer pageNo = 1; private Integer pageSize = 20; private Boolean isPage = true; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index aa20ac5071..ec347f4998 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -21,6 +21,9 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} + + AND message_content like concat('%', #{content}, '%') + From a26a6ff78eb7b77b0d88bf72c170d234f586d0f5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 25 Aug 2022 13:35:36 +0800 Subject: [PATCH 108/206] sql --- .../db/migration/V0.0.6__party_helper.sql | 122 ++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql new file mode 100644 index 0000000000..984eda6608 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.6__party_helper.sql @@ -0,0 +1,122 @@ +CREATE TABLE `ic_schedule` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '所属行政组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `STAFF_ID` varchar(64) NOT NULL COMMENT '当前登录用户userId', + `TITLE` varchar(35) NOT NULL COMMENT '日程标题（35字）', + `REMIND_TIME` datetime NOT NULL COMMENT '提醒时间；其实就是日程所属日期', + `IS_PUBLIC` varchar(10) NOT NULL COMMENT '是否公开，0：仅自己可见；1：组织内其他人可见', + `REMARK` varchar(500) DEFAULT NULL COMMENT '备注（500字）', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='日程表'; + + +CREATE TABLE `ic_party_act` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID：当前工作人员所属组织id', + `PID` varchar(64) NOT NULL COMMENT '组织ID的上级；如果org_id是根组织，那此列=0', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'ORG_ID全路径，包含自身', + `PUBLISH_PARTY_ORG_ID` varchar(64) NOT NULL COMMENT '发布活动党组织', + `PUBLISH_PARTY_ORG_NAME` varchar(20) NOT NULL COMMENT '发布活动党组织名称', + `PUBLISH_ORG_PID` varchar(64) DEFAULT NULL COMMENT '发布活动党组织ID的上级节点', + `PUBLISH_ORG_TYPE` varchar(10) NOT NULL COMMENT '发布活动党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PUBLISH_ORG_PATH` varchar(255) NOT NULL COMMENT '发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `ACT_TYPE` varchar(10) NOT NULL COMMENT '活动类型，来源于ic_party_act_type_dict', + `HOLD_YEAR_ID` varchar(10) NOT NULL COMMENT '活动举办时间：yyyy', + `HOLD_MONTH_ID` varchar(10) NOT NULL COMMENT '活动举办时间:yyyyMM', + `HOLD_TIME` datetime NOT NULL COMMENT '举办活动时间', + `TOPIC` varchar(255) NOT NULL COMMENT '活动主题', + `ADDRESS` varchar(255) NOT NULL COMMENT '活动地点', + `LATITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点纬度', + `LONGITUDE` varchar(32) DEFAULT NULL COMMENT '活动地点经度', + `AUTO_PUBLIC_TYPE` int(11) NOT NULL COMMENT '活动开始前几天', + `AUTO_PUBLIC_TIME` datetime DEFAULT NULL COMMENT '自动发布时间，保存时算好时间存在这里', + `JOIN_USER_TYPE` varchar(10) DEFAULT NULL COMMENT '参加人员类型，0：全体党员；1：支部委员', + `IS_AUTO_INFORM` varchar(1) DEFAULT NULL COMMENT '是否自动通知参加人员，0否；1是', + `INTRODUCE` varchar(1024) DEFAULT NULL COMMENT '活动介绍', + `IS_PUBLISH` varchar(10) NOT NULL COMMENT '是否发布，0未发布；1已发布；', + `PUBLISH_STAFF_ID` varchar(64) NOT NULL COMMENT '活动发布人', + `PUBLISH_STAFF_NAME` varchar(64) NOT NULL COMMENT '活动发布人姓名', + `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='党建组织活动'; + + +CREATE TABLE `ic_party_act_org` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `JOIN_ORG_ID` varchar(64) NOT NULL COMMENT '参加活动党组织ID,groupId', + `JOIN_ORG_NAME` varchar(128) NOT NULL COMMENT '参加党组织名称', + `ORG_TYPE` varchar(10) NOT NULL COMMENT '党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组', + `PID` varchar(64) NOT NULL COMMENT '参加活动党组织ID的上级节点', + `JOIN_ORG_PATH` varchar(255) NOT NULL COMMENT 'PARTY_ORG_ID的全路径，包含自身。方便前端回显', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='参加活动党组织表'; + +CREATE TABLE `ic_party_act_sign_in_record` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `IC_PARTY_ACT_ID` varchar(64) NOT NULL COMMENT '活动id', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号', + `EPMET_USER_ID` varchar(64) NOT NULL COMMENT '签到用户id', + `USER_REAL_NAME` varchar(64) NOT NULL COMMENT '签到用户姓名', + `ADDRESS` varchar(255) NOT NULL COMMENT '签到地点', + `LATITUDE` varchar(32) NOT NULL COMMENT '签到地点纬度', + `LONGITUDE` varchar(32) NOT NULL COMMENT '签到地点经度', + `DEL_FLAG` int(11) NOT NULL COMMENT '0：未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC COMMENT='党组织活动签到记录表'; + + +CREATE TABLE `ic_party_act_type_dict` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `TYPE_KEY` varchar(32) NOT NULL COMMENT '活动类型key', + `TYPE_NAME` varchar(32) NOT NULL COMMENT '活动名称', + `YEAR_COUNT` int(11) NOT NULL COMMENT '每年几次', + `FREQUENCY_UNIT` varchar(32) NOT NULL COMMENT '频次单位', + `FREQUENCY_COUNT` int(11) NOT NULL COMMENT '频次数量', + `FREQUENCY_DESC` varchar(63) NOT NULL COMMENT '频率描述', + `SORT` int(11) NOT NULL COMMENT '排序', + `DEL_FLAG` int(11) NOT NULL COMMENT '0未删除；1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='党组织活动类型字典表'; + + +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', 'zbdydh', '支部党员大会', 4, 'quarter', 1, '每季度1次', 1, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', 'zbwyh', '支部委员会', 12, 'month', 1, '每月1次', 2, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', 'dxzh', '党小组会', 12, 'month', 1, '每月一次', 3, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', 'dangke', '党课', 4, 'quarter', 1, '每季度1次', 4, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', 'ztdr', '主题党日', 12, 'month', 1, '每月1次', 5, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); +INSERT INTO `epmet_resi_partymember`.`ic_party_act_type_dict` (`ID`, `CUSTOMER_ID`, `TYPE_KEY`, `TYPE_NAME`, `YEAR_COUNT`, `FREQUENCY_UNIT`, `FREQUENCY_COUNT`, `FREQUENCY_DESC`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', 'wmfwhd', '为民服务活动', 12, 'month', 1, '每月1次', 6, 0, 0, 'APP_USER', '2022-08-18 17:43:46', 'APP_USER', '2022-08-18 17:43:54'); From 16a7c51a6e9ecdb628ecf3dd761d376ae2e16664 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 14:12:16 +0800 Subject: [PATCH 109/206] =?UTF-8?q?=E5=85=81=E8=AE=B8=E4=BA=8C=E6=AC=A1?= =?UTF-8?q?=E7=AD=BE=E5=88=B0=20=E6=9B=B4=E6=96=B0=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=20=E4=B8=8D=E6=8E=A8=E9=80=81=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E5=8A=A0=E7=A7=AF=E5=88=86=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcPartyActSignInRecordServiceImpl.java | 103 ++++++++++-------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 9e940c6f8c..c6c9bac37d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -2,9 +2,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; @@ -16,12 +14,8 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.SystemMessageType; -import com.epmet.dto.IcMessageDTO; -import com.epmet.dto.form.CommonGridIdFormDTO; -import com.epmet.dto.form.IcMessageListFormDTO; import com.epmet.dto.form.IssueInitiatorFormDTO; import com.epmet.dto.form.SystemMsgFormDTO; -import com.epmet.dto.result.CommonDataFilterResultDTO; import com.epmet.dto.result.CustomerUserDetailResultDTO; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -30,8 +24,6 @@ import com.epmet.modules.partyOrg.entity.IcPartyActEntity; import com.epmet.modules.partyOrg.entity.IcPartyActSignInRecordEntity; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.modules.partyOrg.service.IcPartyActSignInRecordService; -import com.epmet.resi.group.constant.TopicConstant; -import com.epmet.resi.group.dto.group.ResiGroupInfoRedisDTO; import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.github.pagehelper.PageHelper; @@ -41,7 +33,6 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.Arrays; @@ -137,46 +128,62 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyActSignInRecordEntity::getIcPartyActId, formDTO.getIcPartyActId()); + wrapper.eq(IcPartyActSignInRecordEntity::getEpmetUserId, formDTO.getUserId()); + IcPartyActSignInRecordEntity entityOne = baseDao.selectOne(wrapper); + if (null == entityOne) { + IcPartyActSignInRecordEntity entity = ConvertUtils.sourceToTarget(formDTO, IcPartyActSignInRecordEntity.class); + entity.setEpmetUserId(formDTO.getUserId()); + entity.setIdCard(result.getData().getIdNum()); + entity.setUserRealName(result.getData().getName()); + insert(entity); + } else { + entityOne.setAddress(formDTO.getAddress()); + entityOne.setLatitude(formDTO.getLatitude()); + entityOne.setLongitude(formDTO.getLongitude()); + baseDao.updateById(entityOne); + bl = false; } - List pointEventMsgList = new ArrayList<>(); - BasePointEventMsg pointEventMsg = new BasePointEventMsg(); - pointEventMsg.setOpAgencyId(gridInfo.getPid()); - pointEventMsg.setOperatorId(formDTO.getUserId()); - pointEventMsg.setAgencyId(gridInfo.getPid()); - pointEventMsg.setCustomerId(formDTO.getCustomerId()); - pointEventMsg.setGridId(gridInfo.getId()); - pointEventMsg.setUserId(formDTO.getUserId()); - pointEventMsg.setActionFlag(MqConstant.PLUS); - pointEventMsg.setIsCommon(false); - pointEventMsg.setSourceType(actType); - pointEventMsg.setSourceId(formDTO.getIcPartyActId()); - pointEventMsgList.add(pointEventMsg); - - SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); - msgFormDTO.setMessageType(eventTag); - msgFormDTO.setContent(pointEventMsgList); - Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); - if (!sendMsgResult.success()) { - log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + + //3.推送mq加积分 + if (bl) { + IcPartyActEntity actEntity = icPartyActService.selectById(formDTO.getIcPartyActId()); + String actType = actEntity.getActType(); + String eventTag = ("dangke".equals(actType) ? SystemMessageType.DANGKE : ("dxzh".equals(actType) ? SystemMessageType.DXZH : ( + "wmfwhd".equals(actType) ? SystemMessageType.WMFWHD : ("zbdydh".equals(actType) ? SystemMessageType.ZBDYDH : ( + "zbwyh".equals(actType) ? SystemMessageType.ZBWYH : ("ztdr".equals(actType) ? SystemMessageType.ZTDR : "") + )) + ))); + //网格缓存信息 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (null == gridInfo) { + throw new EpmetException(String.format("未查询到网格{%s}信息", formDTO.getGridId())); + } + List pointEventMsgList = new ArrayList<>(); + BasePointEventMsg pointEventMsg = new BasePointEventMsg(); + pointEventMsg.setOpAgencyId(gridInfo.getPid()); + pointEventMsg.setOperatorId(formDTO.getUserId()); + pointEventMsg.setAgencyId(gridInfo.getPid()); + pointEventMsg.setCustomerId(formDTO.getCustomerId()); + pointEventMsg.setGridId(gridInfo.getId()); + pointEventMsg.setUserId(formDTO.getUserId()); + pointEventMsg.setActionFlag(MqConstant.PLUS); + pointEventMsg.setIsCommon(false); + pointEventMsg.setSourceType(actType); + pointEventMsg.setSourceId(formDTO.getIcPartyActId()); + pointEventMsgList.add(pointEventMsg); + + SystemMsgFormDTO msgFormDTO = new SystemMsgFormDTO(); + msgFormDTO.setMessageType(eventTag); + msgFormDTO.setContent(pointEventMsgList); + Result sendMsgResult = epmetMessageOpenFeignClient.sendSystemMsgByMQ(msgFormDTO); + if (!sendMsgResult.success()) { + log.error("党建活动签到发送积分失败,活动Id->" + formDTO.getIcPartyActId() + " 用户->" + formDTO.getUserId()); + } } } From 104e4b97b9cdf104e27f83ecff0fc93dcfde2ee5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 14:19:05 +0800 Subject: [PATCH 110/206] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../group/feign/ResiGroupOpenFeignClient.java | 6 +++ .../ResiGroupOpenFeignClientFallback.java | 5 ++ .../group/controller/ResiGroupController.java | 11 +++++ .../group/service/ResiGroupService.java | 2 + .../service/impl/ResiGroupServiceImpl.java | 13 +++++ .../partyOrg/form/PartyActStatisFormDTO.java | 37 +++++++++++++++ .../result/PartyActStatisResultDTO.java | 45 ++++++++++++++++++ .../controller/IcPartyActController.java | 18 +++++-- .../modules/partyOrg/dao/IcPartyActDao.java | 4 ++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 ++ .../partyOrg/service/IcPartyActService.java | 8 ++-- .../service/impl/IcPartyActServiceImpl.java | 47 +++++++++++++++++-- .../mapper/partyOrg/IcPartyActDao.xml | 28 +++++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 15 ++++++ 14 files changed, 230 insertions(+), 12 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java index b7a4f54672..2adf4c9ddc 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java @@ -342,4 +342,10 @@ public interface ResiGroupOpenFeignClient { @PostMapping("/resi/group/member/groupmemberlist") Result> groupMemberList(@RequestBody List groupIdList); + /** + * @Author sun + * @Description 查询支部下党小组列表 + **/ + @PostMapping("/resi/group/group/partygrouplist/{partyOrgId}") + Result> partyGroupList(@PathVariable String partyOrgId); } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java index d3bff53996..e3c6b08c47 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/fallback/ResiGroupOpenFeignClientFallback.java @@ -248,4 +248,9 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupMemberList", groupIdList); } + @Override + public Result> partyGroupList(String partyOrgId) { + return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "partyGroupList", partyOrgId); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java index 5e60d0f535..94da912a7b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java @@ -664,4 +664,15 @@ public class ResiGroupController { public Result>> getBranchGroupList(@LoginUser TokenDto tokenDto) { return new Result>>().ok(resiGroupService.getBranchGroupList(tokenDto.getCustomerId())); } + + /** + * @Author sun + * @Description 查询支部下党小组列表 + **/ + @PostMapping("partygrouplist/{partyOrgId}") + Result> partyGroupList(@PathVariable String partyOrgId){ + return new Result>().ok(resiGroupService.partyGroupList(partyOrgId)); + } + + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java index d3176758d5..e03178d06b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java @@ -481,4 +481,6 @@ public interface ResiGroupService extends BaseService { * @Date 2022/8/15 16:49 */ Map> getBranchGroupList(String customerId); + + List partyGroupList(String partyOrgId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 939eb61d39..e21ce83878 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1955,4 +1955,17 @@ public class ResiGroupServiceImpl extends BaseServiceImpl partyGroupList(String partyOrgId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(ResiGroupEntity::getPartyOrgId, partyOrgId); + wrapper.eq(ResiGroupEntity::getDelFlag, NumConstant.ZERO_STR); + List entityList = baseDao.selectList(wrapper); + if (CollectionUtils.isEmpty(entityList)) { + return new ArrayList<>(); + } + return ConvertUtils.sourceToTarget(entityList, ResiGroupDTO.class); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java new file mode 100644 index 0000000000..f0e8cedeed --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +@Data +public class PartyActStatisFormDTO implements Serializable { + + /** + * 参加活动党组织ID,groupId + */ + @NotBlank(message = "党组织Id不能为空", groups = AddGroup.class) + private String joinOrgId; + /** + * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 + */ + @NotBlank(message = "党组织类型不能为空", groups = AddGroup.class) + private String joinOrgType; + + /** + * 活动开始时间 【yyyy-MM-dd】 + */ + private String startTime; + + /** + * 活动结束时间 【yyyy-MM-dd】 + */ + private String endTime; + + //党组织Id集合 + private List partyOrgIdList; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java new file mode 100644 index 0000000000..5f87fa3fb7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyActStatisResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class PartyActStatisResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党组织Id + */ + private String joinOrgId = ""; + /** + * 党组织名称 + */ + private String joinOrgName = ""; + /** + * 支部党员大会次数 + */ + private Integer dydhNum = 0; + /** + * 支部委员会次数 + */ + private Integer wyhNum = 0; + /** + * 党小组会次数 + */ + private Integer dxzhNum = 0; + /** + * 党课次数 + */ + private Integer dkNum = 0; + /** + * 主题党日次数 + */ + private Integer ztdrNum = 0; + /** + * 为民服务活动次数 + */ + private Integer wmfwNum = 0; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index dc9da8f9a3..bbf56110d6 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -18,6 +18,7 @@ import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.modules.partyOrg.excel.IcPartyActExpoprtExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; @@ -26,10 +27,7 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -41,6 +39,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintWriter; import java.util.Date; +import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -320,4 +319,15 @@ public class IcPartyActController { icPartyActService.autoPublishIcPartyAct(); return new Result(); } + + /** + * Desc: 统计各党组织参与各种党活动的次数 + */ + @RequestMapping("patryactstatis") + public Result> patryActStatis(@RequestBody PartyActStatisFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyActService.patryActStatis(formDTO)); + } + + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java index 5ab4ed61e3..d3bdd9d957 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyActDao.java @@ -7,8 +7,10 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActStatisFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyActListResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyActStatisResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -48,4 +50,6 @@ public interface IcPartyActDao extends BaseDao { List selectNeedRemindAutoPublishAct(String dateId); List selectNoPublishList(String dateId); + + List getPartActStatis(PartyActStatisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index af7a6340aa..7391328894 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -2,6 +2,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -111,4 +112,6 @@ public interface IcPartyOrgDao extends BaseDao { IcPartyOrgEntity selectDefaultPartyOrg(@Param("agencyId") String agencyId, @Param("level") String level); List getUserIdByPartyOrgIds(@Param("partyOrgIdList") List partyOrgIdList); + + List getSelfAndSub(@Param("joinOrgId") String joinOrgId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java index e1aeee4a8a..dbfde1274e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyActService.java @@ -9,12 +9,10 @@ import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActPageFormDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartActTypeDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -119,4 +117,6 @@ public interface IcPartyActService extends BaseService { * 自动发布活动 */ void autoPublishIcPartyAct(); + + LinkedList patryActStatis(PartyActStatisFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b7a14504a5..fe57e096da 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.modules.partyOrg.dao.*; import com.epmet.modules.partyOrg.entity.*; import com.epmet.modules.partyOrg.service.*; import com.epmet.modules.partymember.dao.IcPartyMemberDao; +import com.epmet.resi.group.dto.group.ResiGroupDTO; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -37,10 +38,7 @@ import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActDetailResDTO; import com.epmet.resi.partymember.dto.icpartyact.result.IcPartyActPageResultDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyActTypeDictDTO; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.IcPartyActListFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.YearSearchFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.*; import com.epmet.resi.partymember.dto.partyOrg.result.*; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.send.SendMqMsgUtil; @@ -752,4 +750,45 @@ public class IcPartyActServiceImpl extends BaseServiceImpl patryActStatis(PartyActStatisFormDTO formDTO) { + LinkedList resultList = new LinkedList<>(); + //1.查询当前党组织及直属下级基础数据 + List orgDTOList = partyOrgDao.getSelfAndSub(formDTO.getJoinOrgId()); + if (CollectionUtils.isEmpty(orgDTOList)) { + return resultList; + } + List partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList()); + //如果党组织是支部类型，则直属下级是党小组 + if ("6".equals(formDTO.getJoinOrgType())) { + Result> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId()); + if (!result.success()) { + throw new RenException("获取党支部下党小组列表失败：" + result.getInternalMsg()); + } + List groupIdList = result.getData().stream().map(ResiGroupDTO::getId).collect(Collectors.toList()); + partyOrgIdList.addAll(groupIdList); + } + formDTO.setPartyOrgIdList(partyOrgIdList); + + //2.按党组织统计查询各类型活动参与次数 + List partActStatis = baseDao.getPartActStatis(formDTO); + Map map = partActStatis.stream().collect(Collectors.toMap(PartyActStatisResultDTO::getJoinOrgId, m -> m, (k1, k2) -> k1)); + + //3.封装数据并返回 + orgDTOList.forEach(org -> { + PartyActStatisResultDTO dto = new PartyActStatisResultDTO(); + if (map.containsKey(org.getId())) { + dto = ConvertUtils.sourceToTarget(map.get(org.getId()), PartyActStatisResultDTO.class); + } + dto.setJoinOrgName(org.getPartyOrgName()); + resultList.add(dto); + }); + return resultList; + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 2c1b07c313..df43a30473 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -231,4 +231,32 @@ AND a.IS_PUBLISH = '0' AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId} + + + \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index c5c56bfef8..1553753bd4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -201,4 +201,19 @@ ORDER BY ipo.id + + From 919324c0da141da4f6f82b3ce9728a2dd2c7292f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 25 Aug 2022 14:24:31 +0800 Subject: [PATCH 111/206] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=80=BC=E9=A2=A0?= =?UTF-8?q?=E5=80=92=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PointAdditiveRuleServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 5bfa8467ef..9606b63ba6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -212,9 +212,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl { if (item.getId().equals(rule.getId()) || item.getPid().equals(rule.getId())) { - item.setEditFlag(NumConstant.ONE_STR); - } else { item.setEditFlag(NumConstant.ZERO_STR); + } else { + item.setEditFlag(NumConstant.ONE_STR); } }); } From 2ac83445ca4e40ef45232d61817a50a37cac87fe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 25 Aug 2022 14:30:22 +0800 Subject: [PATCH 112/206] =?UTF-8?q?=E7=BB=99=E5=B1=85=E6=B0=91=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index b7a14504a5..ce83d012f2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -215,6 +215,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl0; + if (sendMsg && flag) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(formDTO.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); @@ -650,7 +653,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl0) { PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(icPartyActEntity.getCustomerId()); msg.setIcPartyActId(icPartyActEntity.getId()); From a9b6bfdf16203beed47c7c45819f937b39aa2ed1 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 15:27:26 +0800 Subject: [PATCH 113/206] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcPartyActController.java | 27 ++++++++++++ .../partyOrg/excel/PartyActStatisExcel.java | 43 +++++++++++++++++++ .../service/impl/IcPartyActServiceImpl.java | 8 ++-- 3 files changed, 74 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java index bbf56110d6..6b0d27503e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyActController.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.modules.partyOrg.excel.IcPartyActExpoprtExcel; +import com.epmet.modules.partyOrg.excel.PartyActStatisExcel; import com.epmet.modules.partyOrg.service.IcPartyActService; import com.epmet.resi.partymember.dto.icpartyact.form.BatchAddPartyActFormDTO; import com.epmet.resi.partymember.dto.icpartyact.form.IcPartyActAddOrUpdateFormDTO; @@ -329,5 +330,31 @@ public class IcPartyActController { return new Result>().ok(icPartyActService.patryActStatis(formDTO)); } + @PostMapping("export") + public void export(@RequestBody PartyActStatisFormDTO formDTO, HttpServletResponse response) throws IOException { + ExcelWriter excelWriter = null; + try { + String fileName = "党建数据统计" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartyActStatisExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List data = icPartyActService.patryActStatis(formDTO); + List list = ConvertUtils.sourceToTarget(data, PartyActStatisExcel.class); + excelWriter.write(list, writeSheet); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java new file mode 100644 index 0000000000..1614a61c51 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/PartyActStatisExcel.java @@ -0,0 +1,43 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +import java.io.Serializable; + +/** + * 党建数据统计 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class PartyActStatisExcel implements Serializable { + + private static final long serialVersionUID = -12110233388005838L; + + @ExcelProperty(value = "党组织名称") + @ColumnWidth(20) + private String joinOrgName; + @ExcelProperty(value = "支部党员大会(次)") + @ColumnWidth(30) + private Integer dydhNum = 0; + @ExcelProperty(value = "支部委员会(次)") + @ColumnWidth(20) + private Integer wyhNum = 0; + @ExcelProperty(value = "党小组会(次)") + @ColumnWidth(20) + private Integer dxzhNum = 0; + @ExcelProperty(value = "党课(次)") + @ColumnWidth(20) + private Integer dkNum = 0; + @ExcelProperty(value = "主题党日(次)") + @ColumnWidth(20) + private Integer ztdrNum = 0; + @ExcelProperty(value = "为民服务活动(次)") + @ColumnWidth(30) + private Integer wmfwNum = 0; + + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a71096d656..94d52d1418 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -567,7 +567,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 15:37:41 +0800 Subject: [PATCH 114/206] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/commons/tools/enums/EventEnum.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java index 3cccd74d7a..1f1cb4c4c9 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/EventEnum.java @@ -19,6 +19,12 @@ public enum EventEnum { TOPIC_SHIFTED_TO_PROJECT("topic_to_project","resi_group","话题被转为项目"), LEADER_RESOLVE_TOPIC("leader_resolve_topic","resi_group","组长解决组内话题"), FINISH_USER_DEMAND("finish_user_demand","community_service","服务完成"), + ZBWYH("支部委员会","part_member", "支部委员会活动签到"), + ZBDYDH("支部党员大会","part_member", "支部党员大会活动签到"), + DXZH("党小组会","part_member", "党小组会活动签到"), + DANGKE ("党课","part_member", "党课活动签到"), + ZTDR("主题党日","part_member", "主题党日活动签到"), + WMFWHD("为民服务活动","part_member", "为民服务活动活动签到"), ; private String eventClass; From a3f78c4a83212b2a6aa7d4945ee910b5fdf71aba Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 15:43:14 +0800 Subject: [PATCH 115/206] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcMessageDao.xml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index ec347f4998..5a6cc50fb5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -5,16 +5,7 @@ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java index 8897dcf2ec..e9095b546f 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcPartyActListFormDTO.java @@ -14,6 +14,10 @@ public class IcPartyActListFormDTO implements Serializable { * 签到状态[已签到：signIn 未签到：unSignIn] */ private String signIn; + /** + * 标题内容 模糊检索 + */ + private String topic; //参加活动党组织ID,groupId private String joinOrgId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index df43a30473..9cc9db71b0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -197,6 +197,9 @@ AND ipa.act_type = #{actType} + + AND ipa.topic like concat('%', #{topic}, '%') + ORDER BY ipa.hold_time DESC From f056e9d7d22444a669793a0e69b44e45bd73ddae Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 25 Aug 2022 16:50:56 +0800 Subject: [PATCH 117/206] =?UTF-8?q?=E7=A7=AF=E5=88=86mq=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index c6c9bac37d..08934c0960 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -175,6 +175,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Thu, 25 Aug 2022 16:53:30 +0800 Subject: [PATCH 118/206] =?UTF-8?q?=E7=A7=AF=E5=88=86mq=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActSignInRecordServiceImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 08934c0960..14e22242e7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.rocketmq.constants.TopicConstants; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.MqConstant; import com.epmet.commons.tools.dto.form.mq.eventmsg.BasePointEventMsg; @@ -176,6 +177,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Fri, 26 Aug 2022 10:30:50 +0800 Subject: [PATCH 119/206] =?UTF-8?q?=E6=B6=88=E6=81=AFsql=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.3.19__create_ic_message.sql | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql new file mode 100644 index 0000000000..7c9804fa70 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.19__create_ic_message.sql @@ -0,0 +1,20 @@ +CREATE TABLE `ic_message` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `customer_id` varchar(64) NOT NULL COMMENT '客户id', + `grid_id` varchar(64) NOT NULL DEFAULT '*' COMMENT '暂定 *', + `user_id` varchar(64) NOT NULL COMMENT '被通知的用户id', + `app` varchar(32) NOT NULL COMMENT '消息通知对象：居民端用户resi、政府端工作人员gov、运营端工作人员oper', + `message_type` varchar(32) DEFAULT NULL COMMENT '消息分类 党建小助手:party', + `target_id` varchar(64) DEFAULT NULL COMMENT '消息类型对应的业务Id', + `title` varchar(255) NOT NULL COMMENT '消息标题', + `message_content` varchar(3096) NOT NULL COMMENT '消息通知内容', + `read_flag` varchar(32) NOT NULL DEFAULT 'unread' COMMENT 'read已读、unread未读', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人(发布消息的人)', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + `REFERER` varchar(20) DEFAULT NULL COMMENT '调用者', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='用户消息表(党建小助手)'; \ No newline at end of file From ea749992d714758c4be8e166c34bc1e937748521 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 26 Aug 2022 13:38:19 +0800 Subject: [PATCH 120/206] __ --- ....23_party_publish_Time.sql => V0.0.23__party_publish_Time.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-admin/epmet-admin-server/src/main/resources/db/migration/{V0.0.23_party_publish_Time.sql => V0.0.23__party_publish_Time.sql} (100%) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23__party_publish_Time.sql similarity index 100% rename from epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23_party_publish_Time.sql rename to epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.23__party_publish_Time.sql From cde9a8b04390928b50f8487048a5267b88065d30 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 26 Aug 2022 14:18:13 +0800 Subject: [PATCH 121/206] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=A7=84=E5=88=99=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PointModifyFormDTO.java | 3 + .../PointAdditiveRuleController.java | 6 + .../service/PointAdditiveRuleService.java | 9 + .../impl/PointAdditiveRuleServiceImpl.java | 158 ++++++++++++++++++ 4 files changed, 176 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java index 71cff835cd..72dc80773c 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java @@ -4,6 +4,7 @@ import lombok.Data; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.List; /** * @program: epmet-cloud @@ -59,5 +60,7 @@ public class PointModifyFormDTO implements Serializable { */ private Integer pointValue; + List customerIdList; + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java index 3f780d3ff9..0a461d1486 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -185,4 +185,10 @@ public class PointAdditiveRuleController { dto.setCustomerId(tokenDto.getCustomerId()); return pointAdditiveRuleService.modify(dto); } + + @PostMapping("initPartyRole") + public Result initPartyBuilidingRole(@RequestBody PointModifyFormDTO dto) { + pointAdditiveRuleService.initPartyBuilidingRole(dto.getCustomerIdList()); + return new Result(); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java index 4f9995158e..f067064af5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -151,4 +151,13 @@ public interface PointAdditiveRuleService extends BaseService customerIdList); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 9606b63ba6..6b76e2aff6 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.common.enu.PointAddRuleEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -284,4 +285,161 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl customerIdList) { + customerIdList.forEach(customerId -> { + //党建积分 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党建积分"); + PointAdditiveRuleEntity djjf = baseDao.selectOne(wrapper); + if (null == djjf) { + djjf = new PointAdditiveRuleEntity(); + djjf.setCustomerId(customerId); + djjf.setType("category"); + djjf.setApplyFlag(NumConstant.ONE_STR); + djjf.setCategoryCode("party_building"); + djjf.setCategoryName("党建积分"); + djjf.setPid(NumConstant.ZERO_STR); + djjf.setPids(""); + baseDao.insert(djjf); + } + //党建活动 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党建活动"); + PointAdditiveRuleEntity djhd = baseDao.selectOne(wrapper); + if (null == djhd) { + djhd = new PointAdditiveRuleEntity(); + djhd.setCustomerId(customerId); + djhd.setType("category"); + djhd.setApplyFlag(NumConstant.ONE_STR); + djhd.setCategoryCode("party_building"); + djhd.setCategoryName("党建活动"); + djhd.setPid(djjf.getId()); + djhd.setPids(djjf.getId()); + baseDao.insert(djhd); + } + //支部委员会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "支部委员会"); + PointAdditiveRuleEntity zbdyh = baseDao.selectOne(wrapper); + if (null == zbdyh) { + zbdyh = new PointAdditiveRuleEntity(); + zbdyh.setCustomerId(customerId); + zbdyh.setType("rule"); + zbdyh.setApplyFlag(NumConstant.ONE_STR); + zbdyh.setCategoryCode("party_building"); + zbdyh.setRuleName("支部委员会"); + zbdyh.setPid(djhd.getId()); + zbdyh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + zbdyh.setPointValue(10); + baseDao.insert(zbdyh); + } + //支部党员大会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "支部党员大会"); + PointAdditiveRuleEntity zbdydh = baseDao.selectOne(wrapper); + if (null == zbdydh) { + zbdydh = new PointAdditiveRuleEntity(); + zbdydh.setCustomerId(customerId); + zbdydh.setType("rule"); + zbdydh.setApplyFlag(NumConstant.ONE_STR); + zbdydh.setCategoryCode("party_building"); + zbdydh.setRuleName("支部党员大会"); + zbdydh.setPid(djhd.getId()); + zbdydh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + zbdydh.setPointValue(20); + baseDao.insert(zbdydh); + } + //党小组会 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党小组会"); + PointAdditiveRuleEntity dxzh = baseDao.selectOne(wrapper); + if (null == dxzh) { + dxzh = new PointAdditiveRuleEntity(); + dxzh.setCustomerId(customerId); + dxzh.setType("rule"); + dxzh.setApplyFlag(NumConstant.ONE_STR); + dxzh.setCategoryCode("party_building"); + dxzh.setRuleName("党小组会"); + dxzh.setPid(djhd.getId()); + dxzh.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + dxzh.setPointValue(10); + baseDao.insert(dxzh); + } + //党课 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "党课"); + PointAdditiveRuleEntity dk = baseDao.selectOne(wrapper); + if (null == dk) { + dk = new PointAdditiveRuleEntity(); + dk.setCustomerId(customerId); + dk.setType("rule"); + dk.setApplyFlag(NumConstant.ONE_STR); + dk.setCategoryCode("party_building"); + dk.setRuleName("党课"); + dk.setPid(djhd.getId()); + dk.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + dk.setPointValue(15); + baseDao.insert(dk); + } + //主题党日 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "主题党日"); + PointAdditiveRuleEntity ztdr = baseDao.selectOne(wrapper); + if (null == ztdr) { + ztdr = new PointAdditiveRuleEntity(); + ztdr.setCustomerId(customerId); + ztdr.setType("rule"); + ztdr.setApplyFlag(NumConstant.ONE_STR); + ztdr.setCategoryCode("party_building"); + ztdr.setRuleName("主题党日"); + ztdr.setPid(djhd.getId()); + ztdr.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + ztdr.setPointValue(15); + baseDao.insert(ztdr); + } + //为民服务活动 + wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveRuleEntity::getCustomerId, customerId); + wrapper.eq(PointAdditiveRuleEntity::getCategoryCode, "party_building"); + wrapper.eq(PointAdditiveRuleEntity::getCategoryName, "为民服务活动"); + PointAdditiveRuleEntity wmfwhd = baseDao.selectOne(wrapper); + if (null == wmfwhd) { + wmfwhd = new PointAdditiveRuleEntity(); + wmfwhd.setCustomerId(customerId); + wmfwhd.setType("rule"); + wmfwhd.setApplyFlag(NumConstant.ONE_STR); + wmfwhd.setCategoryCode("party_building"); + wmfwhd.setRuleName("为民服务活动"); + wmfwhd.setPid(djhd.getId()); + wmfwhd.setPids(djhd.getPids().concat(StrConstant.COLON).concat(djhd.getId())); + wmfwhd.setPointValue(15); + baseDao.insert(wmfwhd); + } + }); + } + } From 5dc6c27747234fdea10b6eef4dd3fd1f4a54569e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 26 Aug 2022 14:26:31 +0800 Subject: [PATCH 122/206] =?UTF-8?q?=E5=85=9A=E5=B0=8F=E7=BB=84=E4=BB=8B?= =?UTF-8?q?=E7=BB=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.27__update_partygroupdesc.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql new file mode 100644 index 0000000000..a8660c417c --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.27__update_partygroupdesc.sql @@ -0,0 +1,6 @@ +update resi_group_setup s +set s.`NAME`='党小组', + s.`DESCRIBE`='党小组是党支部的组成部分，党小组长可以申请创建线上党小组，从而便于组织线上思想学习、工作交流、党小组生活会等各类事项活动。' , + s.UPDATED_TIME=NOW() +where s.DEL_FLAG='0' + and s.`NAME`='支部小组'; \ No newline at end of file From 0b12c589ed852fd31aa941c7e3d2805122606252 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 26 Aug 2022 15:50:05 +0800 Subject: [PATCH 123/206] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=94=AF=E9=83=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/form/PartyOrgListFormDTO.java | 17 +++++++++++++ .../result/PartyOrgListResultDTO.java | 25 +++++++++++++++++++ .../controller/IcPartyOrgController.java | 12 +++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 3 +++ .../partyOrg/service/IcPartyOrgService.java | 7 +++--- .../service/impl/IcPartyOrgServiceImpl.java | 11 ++++++++ .../mapper/partyOrg/IcPartyOrgDao.xml | 14 +++++++++++ 7 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java new file mode 100644 index 0000000000..4314e566c2 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyOrgListFormDTO.java @@ -0,0 +1,17 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class PartyOrgListFormDTO implements Serializable { + /** + * 网格Id + */ + @NotNull(message = "网格Id不能为空", groups = AddGroup.class) + private String gridId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java new file mode 100644 index 0000000000..b126ff3cc3 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java @@ -0,0 +1,25 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +@NoArgsConstructor +@Data +public class PartyOrgListResultDTO implements Serializable { + private static final long serialVersionUID = 1L; + /** + * 党组织Id + */ + private String partyOrgId = ""; + /** + * 党支部IdPath + */ + private String partyOrgPath = ""; + /** + * 党组织名称 + */ + private Integer partyOrgName = 0; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 80b8007b9a..60c3327978 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -15,10 +15,12 @@ import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyOrgListResultDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -177,4 +179,14 @@ public class IcPartyOrgController { icPartyOrgService.adjustOrgPath(customerIds); return new Result(); } + + /** + * 查询当前组织及下级党支部列表，供新增编辑党小组使用 + */ + @PostMapping("partorglist") + public Result> partOrgList(@RequestBody PartyOrgListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + return new Result>().ok(icPartyOrgService.partOrgList(formDTO.getGridId())); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index 7391328894..fe4d17c517 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -7,6 +7,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.PartyOrgListResultDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -114,4 +115,6 @@ public interface IcPartyOrgDao extends BaseDao { List getUserIdByPartyOrgIds(@Param("partyOrgIdList") List partyOrgIdList); List getSelfAndSub(@Param("joinOrgId") String joinOrgId); + + List partOrgList(@Param("agencyId") String agencyId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 4f52b137cb..22485b8171 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -8,10 +8,7 @@ import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.DefaultPartyOrgResDTO; -import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgInfo; -import com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.*; import java.util.List; import java.util.Map; @@ -149,4 +146,6 @@ public interface IcPartyOrgService extends BaseService { * 调整历史数据 ORG_PIDS */ void adjustOrgPath(List customerIds); + + List partOrgList(String gridId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 39941fc013..3405183f47 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -479,4 +480,14 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl partOrgList(String gridId) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(gridId); + if (null == gridInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存信息失败，网格Id->"+gridId, "获取网格缓存信息失败，网格Id->"+gridId); + } + return baseDao.partOrgList(gridInfo.getPid()); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 1553753bd4..e43e4493d0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -216,4 +216,18 @@ party_org_type ASC + + From 7de024c335d27f4eb539c2c7bf076a211b53aa7d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 26 Aug 2022 16:47:19 +0800 Subject: [PATCH 124/206] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/partyOrg/IcPartyActDao.xml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 9cc9db71b0..5ca5f6c2b5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -184,16 +184,19 @@ AND (join_org_id = #{joinOrgId} or #{joinOrgId} LIKE join_org_path) GROUP BY ic_party_act_id ) a ON ipa.id = a.IC_PARTY_ACT_ID + LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + WHERE + ipa.del_flag = '0' - - INNER JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + + AND sign.ic_party_act_id is NOT NULL + + + AND sign.ic_party_act_id is NULL - - LEFT JOIN ic_party_act_sign_in_record sign ON sign.del_flag = '0' AND ipa.id = sign.ic_party_act_id AND sign.epmet_user_id = #{userId} + - WHERE - ipa.del_flag = '0' AND ipa.act_type = #{actType} From c01ad02cbaea18d73aba3af33e910e3fb0d06d0b Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 26 Aug 2022 16:57:57 +0800 Subject: [PATCH 125/206] emm --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 93228af389..8503ac39bb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -65,7 +65,7 @@ AND DATE_FORMAT(REMIND_TIME,'%Y%m%d') #{endDate} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') - AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') + AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) order by REMIND_TIME desc \ No newline at end of file From 81c5c87a6f3700b79039cacc010e2746141ab9e1 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 26 Aug 2022 17:07:04 +0800 Subject: [PATCH 126/206] emm --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 8503ac39bb..496e62d960 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -27,7 +27,7 @@ AND CUSTOMER_ID = #{customerId} AND DATE_FORMAT(REMIND_TIME,'%Y') = #{yearId} AND ORG_ID_PATH LIKE CONCAT('%',#{agencyId},'%') - AND IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0') + AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) GROUP BY DATE_FORMAT(REMIND_TIME,'%Y%m') UNION ALL SELECT From 0d1097dbb6a1103c52364e3d0ffdb1ac0e22aa00 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Aug 2022 09:04:18 +0800 Subject: [PATCH 127/206] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/result/PartyOrgListResultDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java index b126ff3cc3..cca225416d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/PartyOrgListResultDTO.java @@ -20,6 +20,6 @@ public class PartyOrgListResultDTO implements Serializable { /** * 党组织名称 */ - private Integer partyOrgName = 0; + private String partyOrgName = ""; } From afb3679b70cc8ad871fb489b2020c047b3082ee6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 29 Aug 2022 10:51:41 +0800 Subject: [PATCH 128/206] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.7__party_att.sql | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql new file mode 100644 index 0000000000..d31f3050db --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.7__party_att.sql @@ -0,0 +1,21 @@ +CREATE TABLE `resi_partymember_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) NOT NULL COMMENT '业务id', + `ATTACH_TO` varchar(32) DEFAULT NULL COMMENT '党组织活动：ic_party_act', + `NAME` varchar(64) DEFAULT NULL COMMENT '附件名', + `FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `STATUS` varchar(32) NOT NULL DEFAULT 'auto_passed' COMMENT '附件状态（审核中：auditing； \r\nauto_passed: 自动通过；\r\nreview：结果不确定，需要人工审核；\r\nblock: 结果违规；\r\nrejected：人工审核驳回;\r\napproved：人工审核通过）\r\n现在图片是同步审核的，所以图片只有auto_passed一种状态', + `REASON` varchar(255) DEFAULT NULL COMMENT '失败原因', + `DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长,秒', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='本库附件表'; \ No newline at end of file From 2b8916dc3050dd5c7a74a7c15a62ee6ec2453abe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 29 Aug 2022 11:20:48 +0800 Subject: [PATCH 129/206] =?UTF-8?q?=E6=97=A5=E5=8E=86=E4=B8=8A=E7=9A=84?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/ActAndScheduleListResultDTO.java | 1 + .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index fe782a2083..218c29a284 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -42,6 +42,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String isAutoInform; private String autoInformDay; private String type; + private String actTypeName; private String isPublicValue; private String isPublish; private String joinTypeValue; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 5ca5f6c2b5..437085a29d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -29,6 +29,7 @@ + @@ -51,6 +52,7 @@ if(AUTO_PUBLIC_TYPE != 0,concat('活动开始前',pa.AUTO_PUBLIC_TYPE,'天'),'立即发布') as autoInformDay, DATE_FORMAT(pa.HOLD_TIME,'%Y%m%d') AS dateId, pa.ACT_TYPE AS type, + d.TYPE_NAME as actTypeName, (CASE WHEN pa.JOIN_USER_TYPE = '1' THEN '支部委员' WHEN pa.JOIN_USER_TYPE = '0' THEN '全体党员' ELSE '全体党员' END) AS joinTypeValue, @@ -63,6 +65,7 @@ ao.JOIN_ORG_ID AS partyOrgId FROM ic_party_act pa LEFT JOIN ic_party_act_org ao ON (ao.IC_PARTY_ACT_ID = pa.ID AND ao.DEL_FLAG = 0) + left join ic_party_act_type_dict d on(pa.act_type=d.TYPE_KEY and pa.CUSTOMER_ID=d.CUSTOMER_ID) WHERE pa.DEL_FLAG = 0 AND pa.CUSTOMER_ID = #{customerId} From 26aab2c2b800575744ad71dcd3a82e7432d12300 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Aug 2022 15:58:41 +0800 Subject: [PATCH 130/206] =?UTF-8?q?=E5=85=A5=E5=8F=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/form/PartyActStatisFormDTO.java | 5 ----- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java index f0e8cedeed..b2206cf169 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/PartyActStatisFormDTO.java @@ -15,11 +15,6 @@ public class PartyActStatisFormDTO implements Serializable { */ @NotBlank(message = "党组织Id不能为空", groups = AddGroup.class) private String joinOrgId; - /** - * 党组织类型 0省委,1市委,2区委,3党工委,4党委,5支部；6党小组 - */ - @NotBlank(message = "党组织类型不能为空", groups = AddGroup.class) - private String joinOrgType; /** * 活动开始时间 【yyyy-MM-dd】 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 94d52d1418..6db82bb81a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -768,7 +768,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl partyOrgIdList = orgDTOList.stream().map(IcPartyOrgDTO::getId).collect(Collectors.toList()); //如果党组织是支部类型，则直属下级是党小组 - if ("6".equals(formDTO.getJoinOrgType())) { + if ("5".equals(orgDTOList.get(0).getPartyOrgType())) { Result> result = resiGroupOpenFeignClient.partyGroupList(formDTO.getJoinOrgId()); if (!result.success()) { throw new RenException("获取党支部下党小组列表失败：" + result.getInternalMsg()); From eb82950ba4eeaaef1c6971144f9ceb2998abca50 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 29 Aug 2022 16:02:15 +0800 Subject: [PATCH 131/206] =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=91=E5=B8=83?= =?UTF-8?q?=EF=BC=8C0=E6=9C=AA=E5=8F=91=E5=B8=83=EF=BC=9B1=E5=B7=B2?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index f5d88e8b52..37f16e3274 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -129,6 +129,9 @@ public class IcPartyActDetailResDTO implements Serializable { private Boolean isSignIn; private String publishStaffName; - + /** + * 是否发布，0未发布；1已发布； + */ + private String isPublish; } From 51983d4ca2d85d5d52e7c4545304d6f08db26784 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 15:39:21 +0800 Subject: [PATCH 132/206] =?UTF-8?q?/icPartyMember/partyinfo=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partymember/IcPartyMemberDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index 17ba9f8a12..3cbb077a50 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -277,6 +277,7 @@ INNER JOIN ic_party_org ipo ON ipo.del_flag = '0' AND ipm.sszb = ipo.id WHERE pi.del_flag = '0' AND pi.user_id = #{userId} + and pi.CONFIRM_RESULT in('approved','auto_confirm_success') From f61830aec138acae89174e9dcf93e0611c9b8d3b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 16:50:25 +0800 Subject: [PATCH 133/206] =?UTF-8?q?=E5=88=B0=E5=88=86=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/commons/tools/utils/DateUtils.java | 1 + .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 34511b68bc..2c0fc380e6 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -55,6 +55,7 @@ public class DateUtils { public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm"; public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd"; + public static final String DATE_PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm"; public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日"; public static final String MONTH_NAME_PATTERN = "yyyy年MM月"; public static final String DATE_PATTERN_YYYY = "yyyy"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 6db82bb81a..1383eeea2f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -735,7 +735,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); for(IcPartyActEntity act:list){ //置为已发布 From aaa4faefbb36469ed99ac85369024505c45eb503 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 30 Aug 2022 16:51:48 +0800 Subject: [PATCH 134/206] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcMessageServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java index 660ea7f7fd..b50ad37940 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/IcMessageServiceImpl.java @@ -100,6 +100,7 @@ public class IcMessageServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 16:54:15 +0800 Subject: [PATCH 135/206] =?UTF-8?q?=E3=80=90=E5=B7=A5=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E3=80=91=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=97=B4=E4=BD=BF?= =?UTF-8?q?=E7=94=A8easyexcel=E8=BD=AC=E5=8C=96=E5=99=A8=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?java=E5=92=8Cexcel=E6=95=B0=E6=8D=AE=E7=9A=84=E8=BD=AC=E6=8D=A2?= =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/WorkdiaryServiceRecordExcel.java | 9 ++- ...orkDiaryServiceEasyExcelDateConverter.java | 59 +++++++++++++++++++ .../WorkdiaryServiceRecordServiceImpl.java | 42 ++++++------- 3 files changed, 84 insertions(+), 26 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java index 13a9afdfdd..7aa4089643 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/WorkdiaryServiceRecordExcel.java @@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.poi.excel.converter.EasyExcelDateConverter; import com.epmet.dto.result.WorkdiaryServiceRecordDTO; +import com.epmet.excel.converter.WorkDiaryServiceEasyExcelDateConverter; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -63,10 +64,8 @@ public class WorkdiaryServiceRecordExcel { @NotNull(message = "服务时间必填") @ColumnWidth(20) - @ExcelProperty(value = "服务时间") - //@DateTimeFormat("yyyy-MM-dd") - //@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - private String serviceTime; + @ExcelProperty(value = "服务时间", converter = WorkDiaryServiceEasyExcelDateConverter.class) + private Date serviceTime; @ColumnWidth(20) @ExcelProperty(value = "备注") @@ -74,6 +73,6 @@ public class WorkdiaryServiceRecordExcel { public WorkdiaryServiceRecordExcel(WorkdiaryServiceRecordDTO dto) { BeanUtil.copyProperties(dto, this); - this.serviceTime = DateUtils.format(dto.getServiceTime()); + //this.serviceTime = DateUtils.format(dto.getServiceTime()); } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java new file mode 100644 index 0000000000..3c5e99b00c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/excel/converter/WorkDiaryServiceEasyExcelDateConverter.java @@ -0,0 +1,59 @@ +package com.epmet.excel.converter; + +import com.alibaba.excel.converters.Converter; +import com.alibaba.excel.enums.CellDataTypeEnum; +import com.alibaba.excel.metadata.GlobalConfiguration; +import com.alibaba.excel.metadata.data.ReadCellData; +import com.alibaba.excel.metadata.data.WriteCellData; +import com.alibaba.excel.metadata.property.ExcelContentProperty; + +import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.temporal.ChronoUnit; +import java.util.Date; + +/** + * 框架：easyexcel + * 目的：工作日志(服务)，对服务时间日期类型的转换 + */ +public class WorkDiaryServiceEasyExcelDateConverter implements Converter { + + private static final String PATTERN_YYYY_MM_DD = "yyyy-MM-dd"; + + /** + * excel内容转化为java时间 + * @param cellData + * @param contentProperty + * @param globalConfiguration + * @return + * @throws Exception + */ + public Date convertToJavaData(ReadCellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + if (cellData.getType() == CellDataTypeEnum.NUMBER) { + // 数字类型，是1900-01-03到excel中数据日期的天数差值 + LocalDateTime localDate = LocalDateTime.of(1900, 1, 1, 0, 0, 0) + // 不知为何，这个日期差值，多了2天，需要减去 + .minus(2L, ChronoUnit.DAYS) + .plus(cellData.getNumberValue().longValue(), ChronoUnit.DAYS); + return Date.from(localDate.atZone(ZoneId.systemDefault()).toInstant()); + } else { + // 字符串，正常格式化 + Date dateData = new SimpleDateFormat(PATTERN_YYYY_MM_DD).parse(cellData.getStringValue()); + return dateData; + } + } + + /** + * java日期转为excel内容 + * @param value + * @param contentProperty + * @param globalConfiguration + * @return + * @throws Exception + */ + public WriteCellData convertToExcelData(Date value, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) throws Exception { + String dataStr = new SimpleDateFormat(PATTERN_YYYY_MM_DD).format(value); + return new WriteCellData(dataStr); + } +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java index 7534b9a918..6128631c8a 100755 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/WorkdiaryServiceRecordServiceImpl.java @@ -480,26 +480,26 @@ public class WorkdiaryServiceRecordServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 17:00:59 +0800 Subject: [PATCH 136/206] =?UTF-8?q?=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcPartyActSignInRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java index 14e22242e7..86c1869436 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActSignInRecordServiceImpl.java @@ -154,7 +154,7 @@ public class IcPartyActSignInRecordServiceImpl extends BaseServiceImpl Date: Tue, 30 Aug 2022 17:09:23 +0800 Subject: [PATCH 137/206] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/UserPointActionLogDao.xml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml index 51740cf037..9797bd676f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/UserPointActionLogDao.xml @@ -179,14 +179,22 @@ AND SOURCE_TYPE = #{type} - AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y') = #{startDate} + - AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') = #{startDate} + - AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} - AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') >= #{startDate} + + + AND DATE_FORMAT(CREATED_TIME,'%Y%m') <= #{endDate} + ORDER BY CREATED_TIME DESC From b33758b65dd42a6254d7e5294075218ff14bc7dd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 17:40:26 +0800 Subject: [PATCH 138/206] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E5=88=97pat?= =?UTF-8?q?h=E7=94=A8=E4=BA=8E=E5=89=8D=E7=AB=AF=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 7 ++++++- .../resi/partymember/dto/icpartyact/form/JoinOrgDTO.java | 8 +++++++- .../dto/icpartyact/result/IcPartyActDetailResDTO.java | 5 +++++ .../epmet/modules/partyOrg/entity/IcPartyActEntity.java | 5 ++++- .../modules/partyOrg/entity/IcPartyActOrgEntity.java | 4 ++++ .../resources/db/migration/V0.0.8__party_act_path.sql | 6 ++++++ 6 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index 12beafec58..35c0f65d2c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -126,10 +126,15 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { /** * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - // @NotBlank(message = "publishOrgPath不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) // 后端接口内部去赋值，无需前端传入了 private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + @NotBlank(message = "publishOrgPathShow不能为空", groups = {AddUserInternalGroup.class, UpdateUserInternalGroup.class}) + private String publishOrgPathShow; + /** * 参加人员类型，0：全体党员；1：支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java index 02e746aca3..486e98be14 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/JoinOrgDTO.java @@ -40,10 +40,15 @@ public class JoinOrgDTO implements Serializable { /** * PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ - // @NotBlank(message = "参加活动党组织不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) // 后端接口内部去赋值，无需前端传入了 private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + @NotBlank(message = "joinOrgPathShow不能为空", groups = {IcPartyActAddOrUpdateFormDTO.AddUserInternalGroup.class, IcPartyActAddOrUpdateFormDTO.UpdateUserInternalGroup.class}) + private String joinOrgPathShow; + //接口内部赋值 /** * 活动id @@ -60,5 +65,6 @@ public class JoinOrgDTO implements Serializable { * 详情接口返回 */ private String icPartyActOrgRecId; + } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java index 37f16e3274..564f101fb9 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/result/IcPartyActDetailResDTO.java @@ -99,6 +99,11 @@ public class IcPartyActDetailResDTO implements Serializable { */ private String publishOrgPath; + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; + /** * 参加人员类型，0：全体党员；1：支部委员 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java index 23065472fb..3764f8d223 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActEntity.java @@ -65,7 +65,10 @@ public class IcPartyActEntity extends BaseEpmetEntity { * 发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身。方便前端回显 */ private String publishOrgPath; - + /** + *发布活动党组织路径,前端用此列 + */ + private String publishOrgPathShow; /** * 活动类型，来源于ic_party_act_type_dict */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java index d628ccc457..23c131028a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyActOrgEntity.java @@ -50,4 +50,8 @@ public class IcPartyActOrgEntity extends BaseEpmetEntity { */ private String joinOrgPath; + /** + * PARTY_ORG_ID的全路径,前端用 + */ + private String joinOrgPathShow; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql new file mode 100644 index 0000000000..072be997c1 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.8__party_act_path.sql @@ -0,0 +1,6 @@ +ALTER TABLE ic_party_act ADD COLUMN PUBLISH_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT '发布活动党组织路径,前端用此列' AFTER PUBLISH_ORG_PATH; +ALTER TABLE ic_party_act_org ADD COLUMN JOIN_ORG_PATH_SHOW VARCHAR ( 255 ) COMMENT 'PARTY_ORG_ID的全路径,前端用' AFTER JOIN_ORG_PATH; + +alter table ic_party_act MODIFY COLUMN PUBLISH_ORG_PATH VARCHAR(255) not null COMMENT'发布活动党组织PUBLISH_PARTY_ORG_ID的全路径，包含自身'; + +alter table ic_party_act_org MODIFY COLUMN JOIN_ORG_PATH VARCHAR(255) not null COMMENT 'PARTY_ORG_ID的全路径，包含自身'; \ No newline at end of file From 6508faaabf44cd20f44316a1c86ae78a50718ef3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 30 Aug 2022 17:50:04 +0800 Subject: [PATCH 139/206] like --- .../src/main/java/com/epmet/commons/tools/utils/DateUtils.java | 2 +- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 2c0fc380e6..ebf9e4dbbb 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -55,7 +55,7 @@ public class DateUtils { public final static String DATE_TIME_PATTERN_END_WITH_MINUTE = "yyyy-MM-dd HH:mm"; public static final String DATE_PATTERN_YYYYMMDD = "yyyyMMdd"; - public static final String DATE_PATTERN_YYYYMMDDHHMM = "yyyyMMddHHmm"; + public static final String DATE_PATTERN_YYYYMMDDHHM = "yyyyMMddHHm"; public static final String DATE_NAME_PATTERN = "yyyy年MM月dd日"; public static final String MONTH_NAME_PATTERN = "yyyy年MM月"; public static final String DATE_PATTERN_YYYY = "yyyy"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 1383eeea2f..e92a1040d2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -735,7 +735,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl list=baseDao.selectNoPublishList(dateId); for(IcPartyActEntity act:list){ //置为已发布 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index 437085a29d..ad19154b21 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -238,7 +238,7 @@ WHERE a.DEL_FLAG = '0' AND a.IS_PUBLISH = '0' - AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i') = #{dateId} + AND DATE_FORMAT(a.AUTO_PUBLIC_TIME,'%Y%m%d%H%i%s') like concat('%', #{dateId},'%') \ No newline at end of file From 51b6a93e996da86077bcfb81eb03489eed1d35af Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 31 Aug 2022 16:18:36 +0800 Subject: [PATCH 149/206] emm --- .../partymember/dto/partyOrg/form/YearSearchFormDTO.java | 6 ++++++ .../src/main/resources/mapper/partyOrg/IcPartyActDao.xml | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java index c821fd007f..5f92c375de 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/YearSearchFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.resi.partymember.dto.partyOrg.form; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -22,6 +23,11 @@ public class YearSearchFormDTO implements Serializable { private String type; + /** + * 是否本人创建的活动，1：是；0：否 + */ + private String isSelf = NumConstant.ONE_STR; + private String staffId; private String customerId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml index ad19154b21..a1517327d7 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyActDao.xml @@ -80,7 +80,7 @@ AND pa.ORG_ID_PATH like concat('%',#{agencyId},'%') - + AND pa.PUBLISH_STAFF_ID = #{staffId} From 3191ab7a0eba3029ceea30fa489577d11d9cdbec Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 09:43:38 +0800 Subject: [PATCH 150/206] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index a6eb03c9de..581faffa5f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -306,7 +306,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 1 Sep 2022 10:21:27 +0800 Subject: [PATCH 151/206] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=80=92=E5=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcMessageDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 93a598b5fc..1ce15ca796 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -12,6 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} + ORDER BY create_time desc From d2cebe01880ae0317005e1d5197b254234fb3933 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 1 Sep 2022 10:22:22 +0800 Subject: [PATCH 152/206] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/PartyPointResultDTO.java | 1 + .../impl/UserPointActionLogServiceImpl.java | 67 ++++++++++--------- 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java index 13877d86bf..7449b9cc9d 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PartyPointResultDTO.java @@ -25,6 +25,7 @@ public class PartyPointResultDTO implements Serializable { private String time; private String point; private String actId; + private String actTopic; private String actType; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date actDate; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java index ae22f32df9..d8717a5313 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointActionLogServiceImpl.java @@ -623,39 +623,43 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl pagePartyPoint(PartyPointFormDTO formDTO) { List result = new LinkedList<>(); - if (StringUtils.isNotBlank(formDTO.getQuarter())) { - if (StringUtils.isNotBlank(formDTO.getMonth())) { + if (StringUtils.isNotBlank(formDTO.getYear())) { + if (StringUtils.isNotBlank(formDTO.getQuarter())) { + if (StringUtils.isNotBlank(formDTO.getMonth())) { + formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); + formDTO.setDateType(NumConstant.TWO_STR); + } else { + switch (formDTO.getQuarter()) { + case NumConstant.ONE_STR: + formDTO.setStartDate(formDTO.getYear().concat("01")); + formDTO.setEndDate(formDTO.getYear().concat("03")); + break; + case NumConstant.TWO_STR: + formDTO.setStartDate(formDTO.getYear().concat("04")); + formDTO.setEndDate(formDTO.getYear().concat("06")); + break; + case NumConstant.THREE_STR: + formDTO.setStartDate(formDTO.getYear().concat("07")); + formDTO.setEndDate(formDTO.getYear().concat("09")); + break; + case NumConstant.FOUR_STR: + formDTO.setStartDate(formDTO.getYear().concat("10")); + formDTO.setEndDate(formDTO.getYear().concat("12")); + break; + default: + break; + } + formDTO.setDateType(NumConstant.THREE_STR); + } + } else if (StringUtils.isNotBlank(formDTO.getMonth())) { formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); formDTO.setDateType(NumConstant.TWO_STR); } else { - switch (formDTO.getQuarter()) { - case NumConstant.ONE_STR: - formDTO.setStartDate(formDTO.getYear().concat("01")); - formDTO.setEndDate(formDTO.getYear().concat("03")); - break; - case NumConstant.TWO_STR: - formDTO.setStartDate(formDTO.getYear().concat("04")); - formDTO.setEndDate(formDTO.getYear().concat("06")); - break; - case NumConstant.THREE_STR: - formDTO.setStartDate(formDTO.getYear().concat("07")); - formDTO.setEndDate(formDTO.getYear().concat("09")); - break; - case NumConstant.FOUR_STR: - formDTO.setStartDate(formDTO.getYear().concat("10")); - formDTO.setEndDate(formDTO.getYear().concat("12")); - break; - default: - break; - } - formDTO.setDateType(NumConstant.THREE_STR); + formDTO.setStartDate(formDTO.getYear()); + formDTO.setDateType(NumConstant.ONE_STR); } - } else if (StringUtils.isNotBlank(formDTO.getMonth())){ - formDTO.setStartDate(formDTO.getYear().concat(formDTO.getMonth())); - formDTO.setDateType(NumConstant.TWO_STR); } else { - formDTO.setStartDate(formDTO.getYear()); - formDTO.setDateType(NumConstant.ONE_STR); + formDTO.setDateType(NumConstant.FOUR_STR); } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); List list =baseDao.getPagePartyPoint(formDTO); @@ -666,6 +670,7 @@ public class UserPointActionLogServiceImpl extends BaseServiceImpl> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); - sortedMap.entrySet().forEach(e -> { + sortedMap.forEach((key, value) -> { PartyPointRecordResultDTO o = new PartyPointRecordResultDTO(); - o.setDate(e.getKey()); - o.setDailyList(e.getValue()); + o.setDate(key); + o.setDailyList(value); result.add(o); }); From 0d655142c69965f79d6505d15f78598d922f20b1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 10:30:36 +0800 Subject: [PATCH 153/206] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=88=96=E8=80=85=E6=97=A5=E7=A8=8B=E5=88=A0=E9=99=A4=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E7=94=A8=E5=86=8D=E5=8F=91=E6=B6=88=E6=81=AF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 581faffa5f..13998520e9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -522,14 +522,16 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Thu, 1 Sep 2022 11:11:32 +0800 Subject: [PATCH 154/206] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/form/IcScheduleFormDTO.java | 38 ++++++++++++++++++ .../controller/IcScheduleController.java | 11 +++-- .../modules/partyOrg/dao/IcScheduleDao.java | 3 ++ .../partyOrg/service/IcScheduleService.java | 17 +++----- .../service/impl/IcScheduleServiceImpl.java | 27 ++++++++----- .../mapper/partyOrg/IcScheduleDao.xml | 40 +++++++++++++++++++ 6 files changed, 109 insertions(+), 27 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java new file mode 100644 index 0000000000..859a8634fd --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/IcScheduleFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +@Data +public class IcScheduleFormDTO implements Serializable { + /** + * 日程标题 + */ + private String title; + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + /** + * 提醒开始时间 + */ + private String startTime; + /** + * 提醒结束时间 + */ + private String endTime; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; + private String agencyId; + + //token中信息 + private String customerId; + private String staffId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index edae364122..6ce63ba706 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -13,6 +13,8 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,10 +35,11 @@ public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icScheduleService.page(params); - return new Result>().ok(page); + @RequestMapping("list") + public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icScheduleService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index 131ef13279..f91dd25d78 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,9 +2,11 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; import org.apache.ibatis.annotations.Mapper; @@ -26,4 +28,5 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); + List selectScheduleList(IcScheduleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index dbfc499d81..c38bb4fece 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -3,8 +3,11 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import java.util.List; import java.util.Map; @@ -17,25 +20,15 @@ import java.util.Map; */ public interface IcScheduleService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-08-18 - */ - PageData page(Map params); - /** * 默认查询 * - * @param params + * @param formDTO * @return java.util.List * @author generator * @date 2022-08-18 */ - List list(Map params); + PageData list(IcScheduleFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 2d38215d07..55ed864c00 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -18,9 +18,14 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.epmet.send.SendMqMsgUtil; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -39,20 +44,20 @@ import java.util.Map; @Service public class IcScheduleServiceImpl extends BaseServiceImpl implements IcScheduleService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcScheduleDTO.class); - } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public PageData list(IcScheduleFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //获取工作人员所属组织信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId())); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); - return ConvertUtils.sourceToTarget(entityList, IcScheduleDTO.class); + List list = baseDao.selectScheduleList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); } private QueryWrapper getWrapper(Map params){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 496e62d960..5a470bd672 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -68,4 +68,44 @@ AND (IS_PUBLIC = '1' OR (STAFF_ID = #{staffId} AND IS_PUBLIC = '0')) order by REMIND_TIME desc + + + \ No newline at end of file From 3a3e10bd609bcbe5abb6a71d96ea9a4601c8cde7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 13:48:30 +0800 Subject: [PATCH 155/206] /icSchedule/list --- .../modules/partyOrg/controller/IcScheduleController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 6ce63ba706..58ed109f1f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -14,12 +14,10 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** @@ -36,7 +34,7 @@ public class IcScheduleController { private IcScheduleService icScheduleService; @RequestMapping("list") - public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icScheduleService.list(formDTO)); From de1f04cb89f68598a9c661f56b8dc4c13394c58f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:48:44 +0800 Subject: [PATCH 156/206] method --- .../modules/partyOrg/controller/IcScheduleController.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 6ce63ba706..224743080d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -14,12 +14,10 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import org.apache.poi.ss.formula.functions.T; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; /** @@ -35,7 +33,7 @@ public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; - @RequestMapping("list") + @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); From 0e300994b661e09f0fa02630c206763b6e3fd590 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:52:22 +0800 Subject: [PATCH 157/206] method --- .../controller/IcScheduleController.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 8107ef54dd..224743080d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,6 +1,23 @@ package com.epmet.modules.partyOrg.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.partyOrg.service.IcScheduleService; +import com.epmet.resi.partymember.dto.IcScheduleDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** From 478688d77605a9214d7bfe2da3f487125cef26dc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 1 Sep 2022 13:53:12 +0800 Subject: [PATCH 158/206] method --- .../epmet/modules/partyOrg/controller/IcScheduleController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 224743080d..582c331c50 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -34,7 +34,7 @@ public class IcScheduleController { private IcScheduleService icScheduleService; @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) - public Result> list(@LoginUser TokenDto tokenDto, @RequestParam IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icScheduleService.list(formDTO)); From 77c87d567a9f7993911ccf5a991177ef842eafda Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 1 Sep 2022 15:21:31 +0800 Subject: [PATCH 159/206] CREATED_TIME --- .../src/main/resources/mapper/IcMessageDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml index 1ce15ca796..f8b8e8b286 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/IcMessageDao.xml @@ -12,7 +12,7 @@ del_flag = '0' AND customer_id = #{customerId} AND user_id = #{userId} - ORDER BY create_time desc + ORDER BY CREATED_TIME desc From 336a54e3c98833d9268a441d52f77403f1a2a63d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 09:22:46 +0800 Subject: [PATCH 160/206] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcScheduleServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 55ed864c00..0893676ed4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; @@ -18,11 +17,9 @@ import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; -import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -120,7 +117,7 @@ public class IcScheduleServiceImpl extends BaseServiceImpl Date: Fri, 2 Sep 2022 10:17:44 +0800 Subject: [PATCH 161/206] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/result/IcScheduleListDTO.java | 70 +++++++++++++++++++ .../controller/IcScheduleController.java | 61 +++++++++++++++- .../modules/partyOrg/dao/IcScheduleDao.java | 3 +- .../partyOrg/excel/IcScheduleListExcel.java | 26 +++++++ .../partyOrg/service/IcScheduleService.java | 6 +- .../service/impl/IcScheduleServiceImpl.java | 7 +- .../mapper/partyOrg/IcScheduleDao.xml | 5 +- 7 files changed, 167 insertions(+), 11 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java new file mode 100644 index 0000000000..b048b49357 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java @@ -0,0 +1,70 @@ +package com.epmet.resi.partymember.dto.partyOrg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 日程表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-08-18 + */ +@Data +public class IcScheduleListDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * ID + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 当前登录用户userId + */ + private String staffId; + + /** + * 日程标题（35字） + */ + private String title; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private Date remindTime; + + /** + * 提醒时间；其实就是日程所属日期 + */ + private String remindTimeName; + + /** + * 是否公开，0：仅自己可见；1：组织内其他人可见 + */ + private String isPublic; + + /** + * 是否公开，0：是 1：否 + */ + private String isPublicName; + + /** + * 备注（500字） + */ + private String remark; + + /** + * 创建时间 + */ + private Date createdTime; + +} \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java index 582c331c50..cc45d2e7bf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcScheduleController.java @@ -1,22 +1,41 @@ package com.epmet.modules.partyOrg.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.AssertUtils; 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.partyOrg.excel.IcScheduleListExcel; import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; @@ -28,16 +47,17 @@ import java.util.List; */ @RestController @RequestMapping("icSchedule") +@Slf4j public class IcScheduleController { @Autowired private IcScheduleService icScheduleService; @RequestMapping(value = "list",method = {RequestMethod.POST,RequestMethod.GET}) - public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ + public Result> list(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO){ formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(icScheduleService.list(formDTO)); + return new Result>().ok(icScheduleService.list(formDTO)); } @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) @@ -99,5 +119,42 @@ public class IcScheduleController { icScheduleService.delSchedule(scheduleIds); return new Result(); } + + @PostMapping("export") + public void export(@LoginUser TokenDto tokenDto, @RequestBody IcScheduleFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setIsPage(false); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "日程列表" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcScheduleListExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icScheduleService.list(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), IcScheduleListExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index f91dd25d78..a433a07392 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -9,6 +9,7 @@ import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.HomeMonthTotalResultDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -28,5 +29,5 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); - List selectScheduleList(IcScheduleFormDTO formDTO); + List selectScheduleList(IcScheduleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java new file mode 100644 index 0000000000..72e0a4002b --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/excel/IcScheduleListExcel.java @@ -0,0 +1,26 @@ +package com.epmet.modules.partyOrg.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +@Data +public class IcScheduleListExcel { + + @ExcelProperty(value = "日程标题") + @ColumnWidth(20) + private String title; + + @ExcelProperty(value = "提醒时间") + @ColumnWidth(20) + private String remindTimeName; + + @ExcelProperty(value = "是否公开") + @ColumnWidth(20) + private String isPublicName; + + @ExcelProperty(value = "备注") + @ColumnWidth(25) + private String remark; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java index c38bb4fece..ebd7f6f6dd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcScheduleService.java @@ -3,14 +3,12 @@ package com.epmet.modules.partyOrg.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.resi.partymember.dto.IcPartyActSignInRecordDTO; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; -import com.epmet.resi.partymember.dto.partyOrg.form.PartyActSignFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import java.util.List; -import java.util.Map; /** * 日程表 @@ -28,7 +26,7 @@ public interface IcScheduleService extends BaseService { * @author generator * @date 2022-08-18 */ - PageData list(IcScheduleFormDTO formDTO); + PageData list(IcScheduleFormDTO formDTO); /** * 单条查询 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 0893676ed4..96a952c5cd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -20,6 +20,7 @@ import com.epmet.modules.partyOrg.service.IcScheduleService; import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; +import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -43,7 +44,7 @@ public class IcScheduleServiceImpl extends BaseServiceImpl list(IcScheduleFormDTO formDTO) { + public PageData list(IcScheduleFormDTO formDTO) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); //获取工作人员所属组织信息 CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); @@ -52,8 +53,8 @@ public class IcScheduleServiceImpl extends BaseServiceImpl list = baseDao.selectScheduleList(formDTO); - PageInfo pageInfo = new PageInfo<>(list); + List list = baseDao.selectScheduleList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 5a470bd672..8d6c2295a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -69,14 +69,16 @@ order by REMIND_TIME desc - SELECT id, customer_id, staff_id, title, remind_time, + DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, is_public, + IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, created_time FROM @@ -108,4 +110,5 @@ order by remind_time desc + \ No newline at end of file From 663f146cddb30aa2796f82c570638f060b4b416e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Sep 2022 14:50:13 +0800 Subject: [PATCH 162/206] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E5=85=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF=E8=AE=A4=E8=AF=81=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=97=B6=20=E8=87=AA=E5=8A=A8=E6=A0=A1=E9=AA=8C=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=8E=BB=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=E5=85=9A?= =?UTF-8?q?=E5=91=98=E5=BA=93=E6=9F=A5=E8=AF=A2=E4=B8=94=E5=8F=AA=E6=8C=89?= =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E6=A0=A1=E9=AA=8C=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=9A=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PartyMemberConfirmServiceImpl.java | 32 +++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 961197076d..a980778c64 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.modules.partymember.service.impl; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -21,6 +22,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.feign.GovOrgFeignClient; import com.epmet.modules.feign.ResiGroupFeignClient; +import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.*; import com.epmet.modules.partymember.redis.PartymemberInfoRedis; import com.epmet.modules.partymember.service.*; @@ -86,6 +88,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService private PartymemberAuthRecordService partymemberAuthRecordService; @Autowired private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private IcPartyMemberDao icPartyMemberDao; @Override @Transactional(rollbackFor = Exception.class) @@ -191,8 +195,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService } //获取党员基本信息(匹配) - PartymemberConfirmAutoDTO confirmAutoDTO = - partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + //PartymemberConfirmAutoDTO confirmAutoDTO = partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO); + PartymemberConfirmAutoDTO confirmAutoDTO = partyAuth(partyMemberInfoDTO); //判断是否已注册居民，如果没有则注册居民 isResiRegister(partyMemberInfoDTO); @@ -294,6 +298,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService return result; } + /** + * 居民点党员提交认证校验逻辑调整改查数字平台党员信息库， + * 切只按身份证号查询 + */ + public PartymemberConfirmAutoDTO partyAuth(PartymemberInfoDTO dto) { + PartymemberConfirmAutoDTO resultDTO = new PartymemberConfirmAutoDTO(); + if (StringUtils.isBlank(dto.getIdCard())) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcPartyMemberEntity::getCustomerId, dto.getCustomerId()); + tWrapper.eq(IcPartyMemberEntity::getIdCard, dto.getIdCard()); + tWrapper.last("limit 1"); + IcPartyMemberEntity entity = icPartyMemberDao.selectOne(tWrapper); + if (null == entity) { + resultDTO.setComparisonResults(false); + return resultDTO; + } + resultDTO.setComparisonResults(true); + resultDTO.setPatryMemberBaseInfoId(entity.getId()); + return resultDTO; + } + @Override @Transactional(rollbackFor = Exception.class) public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { From a70340792b9058ec91efa2a44574568a2e3d5d48 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 2 Sep 2022 14:52:03 +0800 Subject: [PATCH 163/206] getScheduleAndActCount --- .../dto/partyOrg/form/HomeMonthTotalFormDTO.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 10 +++++----- .../main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java index 396ba3611a..cc9f2cdd8d 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/HomeMonthTotalFormDTO.java @@ -44,5 +44,5 @@ public class HomeMonthTotalFormDTO implements Serializable { */ private String agencyId; - private String path; + // private String path; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 13998520e9..639d058bf4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -122,11 +122,11 @@ public class IcPartyActServiceImpl extends BaseServiceImpl getHomeMonthTotal(HomeMonthTotalFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo = queryStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); formDTO.setAgencyId(staffInfo.getAgencyId()); - IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); - if (null == icPartyOrgDTO){ - throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); - } - formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); + // IcPartyOrgDTO icPartyOrgDTO = partyOrgService.get(formDTO.getOrgId()); + // if (null == icPartyOrgDTO){ + // throw new EpmetException("未查询到党组织信息："+formDTO.getOrgId()); + // } + // formDTO.setPath(icPartyOrgDTO.getOrgPids().equals("") || icPartyOrgDTO.getOrgPids().equals(NumConstant.ZERO_STR) ? icPartyOrgDTO.getId() : icPartyOrgDTO.getOrgPids().concat(":").concat(icPartyOrgDTO.getId())); List result = constructMonthData(formDTO.getYearId()); List countList = scheduleDao.getScheduleAndActCount(formDTO); if (CollectionUtils.isNotEmpty(countList)){ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index 8d6c2295a4..cb56d450fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -40,7 +40,7 @@ AND PUBLISH_STAFF_ID = #{staffId} - AND PUBLISH_ORG_PATH LIKE CONCAT(#{path},'%') + AND (PUBLISH_PARTY_ORG_ID = #{orgId} or PUBLISH_ORG_PATH LIKE CONCAT('%',#{orgId},'%')) GROUP BY HOLD_MONTH_ID)t GROUP BY t.monthId From 3e140df253f864f9b302ff102b088f0997bc3f60 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 2 Sep 2022 15:08:06 +0800 Subject: [PATCH 164/206] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../constant/ImportErrorMsgConstants.java | 1 + .../java/com/epmet/dao/IcBuildingDao.java | 9 +++++ .../model/ImportBuildingInfoListener.java | 6 ++++ .../epmet/model/ImportHouseInfoListener.java | 8 ++++- .../service/impl/BuildingServiceImpl.java | 11 ++++++ .../main/resources/mapper/IcBuildingDao.xml | 35 +++++++++++++++++++ 7 files changed, 70 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 163dee5e2f..405d84d4ae 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -85,6 +85,7 @@ public enum EpmetErrorCode { BUILDING_NAME_EXITED(8215,"楼栋名称已存在"), DOOR_NAME_EXITED(8216,"门牌号已存在"), NEIGHBOOR_NAME_EXITED(8217,"小区名称已存在"), + BUILDING_NAME_EXITED_IN_GRID(8218,"小区下该楼栋已存在于其他网格"), REQUIRE_PERMISSION(8301, "您没有足够的操作权限"), THIRD_PLAT_REQUEST_ERROR(8302, "请求第三方平台错误"), diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java index 85f0d846f7..50d0b7931c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/constant/ImportErrorMsgConstants.java @@ -25,5 +25,6 @@ public interface ImportErrorMsgConstants { String HOUSE_ERROR_NAME = "导入失败的列表-房屋"; String BUILDING_ERROR_NAME = "导入失败的列表-楼栋"; String NEIGHBORHOOD_ERROR_NAME = "导入失败的列表-小区"; + String BUILDING_NAME_EXITED_IN_GRID = "小区下该楼栋已存在于其他网格"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 4e963af722..46f0041e8d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -67,6 +67,15 @@ public interface IcBuildingDao extends BaseDao { List baseInfoFamilyBuilding(@Param("neighborHoodId")String neighborHoodId); Integer checkBuildName(@Param("neighborHoodId") String neighborHoodId,@Param("buildingName")String buildingName, @Param("buildingId")String buildingId); + Integer checkBuildNameV2(@Param("agencyId") String agencyId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); + Integer checkBuildNameV3(@Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("neighborHoodName") String neighborHoodName, + @Param("buildingName")String buildingName, + @Param("buildingId")String buildingId); List buildingListByIds(@Param("buildingIdList") List buildingIdList); IPage buildingListByIds(IPage page,@Param("buildingIdList") List buildingIdList); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index e567bf017d..79009b1039 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -210,6 +210,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info,ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 812792b964..194f39eb54 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -3,12 +3,12 @@ package com.epmet.model; import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.constant.CustomerGridConstant; +import com.epmet.constant.ImportErrorMsgConstants; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.IcHouseDTO; @@ -489,6 +489,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener 0){ + // 说明数据库已存在此楼栋，不需添加 + nums.add(num); + disposeErrorMsg(info, ImportErrorMsgConstants.BUILDING_NAME_EXITED_IN_GRID); + } if (orgType.equals(CustomerGridConstant.GRID) || orgType.equals(CustomerGridConstant.AGENCY)){ List gridIds = new ArrayList<>(); if (orgType.equals(CustomerGridConstant.GRID)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 86e54b4356..36dde00dfe 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -102,9 +102,15 @@ public class BuildingServiceImpl implements BuildingService { public void addBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(), formDTO.getBuildingName(), null); + if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } //楼栋编码不可重复 if(org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getCoding())){ IcBuildingEntity isHaveCoding = icBuildingDao.selectByCoding(formDTO.getCoding(),null); @@ -475,6 +481,11 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); + if (null != count && count > 0) { + throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); + } IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId()); if (!icBuilding.getNeighborHoodId().equals(formDTO.getNeighborHoodId())) { //更新对应房屋小区id diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 8e6b5dd039..1512e7b23e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -247,6 +247,41 @@ + + + + From af06a1c8e6be8670b3566a37db56bb6cc63278d0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:45:36 +0800 Subject: [PATCH 166/206] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java index b048b49357..8f6b83bd33 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcScheduleListDTO.java @@ -41,6 +41,7 @@ public class IcScheduleListDTO implements Serializable { * 提醒时间；其实就是日程所属日期 */ private Date remindTime; + private Date happenedTime; /** * 提醒时间；其实就是日程所属日期 From cb1fc0712571ca56d92d25ee9485833a6bb09f9c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 15:52:39 +0800 Subject: [PATCH 167/206] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index eb00869c58..33c4494fb8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -77,8 +77,8 @@ staff_id, title, remind_time, - happened_time, DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From 074f292b0711bf77c2a96b5fc11ff31679a07280 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 2 Sep 2022 15:59:30 +0800 Subject: [PATCH 168/206] =?UTF-8?q?=E6=96=B0=E5=A2=9E/=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E7=A8=8B=EF=BC=8C=E4=B8=8D=E9=9C=80=E8=A6=81=E5=8F=91?= =?UTF-8?q?=E6=B6=88=E6=81=AF=EF=BC=9B=E6=94=B9=E4=B8=BA=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=8E=BB=E6=A3=80=E7=B4=A2=EF=BC=8C=E6=8F=90?= =?UTF-8?q?=E9=86=92=E6=97=A5=E6=9C=9F=3D=E5=BD=93=E5=89=8D=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E7=9A=84=E6=97=A5=E7=A8=8B=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/dao/IcScheduleDao.java | 3 ++- .../service/impl/IcPartyActServiceImpl.java | 14 ++++++++++++- .../service/impl/IcScheduleServiceImpl.java | 20 ++++++++----------- .../mapper/partyOrg/IcScheduleDao.xml | 10 +++++++++- 4 files changed, 32 insertions(+), 15 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java index a433a07392..996d46c361 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcScheduleDao.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; -import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.ActAndScheduleListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.HomeMonthTotalFormDTO; @@ -30,4 +29,6 @@ public interface IcScheduleDao extends BaseDao { List getScheduleList(ActAndScheduleListFormDTO formDTO); List selectScheduleList(IcScheduleFormDTO formDTO); + + List selectNeedNotice(String dateId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 639d058bf4..20740c71f1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -84,7 +84,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl scheduleEntityList=icScheduleDao.selectNeedNotice(dateId); + for(IcScheduleEntity icScheduleEntity:scheduleEntityList){ + PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); + msg.setCustomerId(icScheduleEntity.getCustomerId()); + msg.setIcPartyActId(icScheduleEntity.getId()); + msg.setType("notify"); + SendMqMsgUtil.build() + .openFeignClient(SpringContextUtils.getBean(EpmetMessageOpenFeignClient.class)) + .sendRocketMqMsg(SystemMessageType.PARTY_MEETING_MESSAGE, msg); + } } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java index 96a952c5cd..87fe5d0dfa 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcScheduleServiceImpl.java @@ -2,7 +2,6 @@ package com.epmet.modules.partyOrg.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.rocketmq.messages.PartyMeetingMessageMQMsg; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; @@ -11,9 +10,6 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.constant.SystemMessageType; -import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcScheduleDao; import com.epmet.modules.partyOrg.entity.IcScheduleEntity; import com.epmet.modules.partyOrg.service.IcScheduleService; @@ -21,7 +17,6 @@ import com.epmet.resi.partymember.dto.IcScheduleDTO; import com.epmet.resi.partymember.dto.partyOrg.form.AddOrEditScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.IcScheduleFormDTO; import com.epmet.resi.partymember.dto.partyOrg.result.IcScheduleListDTO; -import com.epmet.send.SendMqMsgUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; @@ -120,13 +115,14 @@ public class IcScheduleServiceImpl extends BaseServiceImpl - + \ No newline at end of file From 12407567ca8a5008e18125bd0adb84b5af836de6 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 16:17:21 +0800 Subject: [PATCH 169/206] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E5=8F=8D=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/result/ActAndScheduleListResultDTO.java | 1 + .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java index 218c29a284..bc320d7a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/ActAndScheduleListResultDTO.java @@ -61,6 +61,7 @@ public class ActAndScheduleListResultDTO implements Serializable { private String scheduleId; private String title; private String remindTime; + private String happenedTime; private String remark; private Boolean isMe = false; private String staffId; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index b51ff2acb1..c33134f176 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -49,7 +49,7 @@ ID AS scheduleId, TITLE, DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d') AS happenedTime, DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID @@ -78,7 +78,7 @@ title, remind_time, DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, - DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, + DATE_FORMAT(happened_time,'%Y-%m-%d')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From 8872c4c047078d2080c99b1d3a430d6e78276068 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 2 Sep 2022 16:24:25 +0800 Subject: [PATCH 170/206] time --- .../src/main/resources/mapper/partyOrg/IcScheduleDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml index c33134f176..5367439c04 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcScheduleDao.xml @@ -48,8 +48,8 @@ SELECT ID AS scheduleId, TITLE, - DATE_FORMAT(REMIND_TIME,'%Y-%m-%d %H:%i:%s') AS remindTime, - DATE_FORMAT(happened_time,'%Y-%m-%d') AS happenedTime, + DATE_FORMAT(REMIND_TIME,'%Y-%m-%d') AS remindTime, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s') AS happenedTime, DATE_FORMAT(HAPPENED_TIME,'%Y%m%d') AS dateId, REMARK, STAFF_ID @@ -77,8 +77,8 @@ staff_id, title, remind_time, - DATE_FORMAT(remind_time,'%Y-%m-%d %H:%i:%s')remindTimeName, - DATE_FORMAT(happened_time,'%Y-%m-%d')happenedTime, + DATE_FORMAT(remind_time,'%Y-%m-%d')remindTimeName, + DATE_FORMAT(happened_time,'%Y-%m-%d %H:%i:%s')happenedTime, is_public, IF (is_public = '0', '仅自己可见', '组织内其他人可见') "isPublicName", remark, From f87e18a900676f6e326d708342cc02529ecbb23c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 2 Sep 2022 16:41:19 +0800 Subject: [PATCH 171/206] =?UTF-8?q?=E6=97=A5=E7=A8=8B=E6=8E=A8=E6=B6=88?= =?UTF-8?q?=E6=81=AF=20=E6=B6=88=E6=81=AF=E5=86=85=E5=AE=B9=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 20740c71f1..c4ebf7e8b4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -614,7 +614,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Fri, 2 Sep 2022 17:12:39 +0800 Subject: [PATCH 172/206] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=B8=BB=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java index eed66dd07b..bb1b090fe7 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/icpartyact/form/IcPartyActAddOrUpdateFormDTO.java @@ -73,7 +73,7 @@ public class IcPartyActAddOrUpdateFormDTO implements Serializable { * 活动主题 */ @NotBlank(message = "活动主题不能为空", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) - @Length(max = 35, message = "最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) + @Length(max = 35, message = "活动主题最多输入35个字", groups = {AddUserShowGroup.class, UpdateUserShowGroup.class}) private String topic; /** From 8fa9cc51ebd7137900732359195f8a70c5cdf9ea Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 5 Sep 2022 09:18:17 +0800 Subject: [PATCH 173/206] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=94=99=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/partyOrg/service/impl/IcPartyActServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index c4ebf7e8b4..52d1c14c2a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -731,7 +731,8 @@ public class IcPartyActServiceImpl extends BaseServiceImpl scheduleEntityList=icScheduleDao.selectNeedNotice(dateId); + String nowDateId=DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD); + List scheduleEntityList=icScheduleDao.selectNeedNotice(nowDateId); for(IcScheduleEntity icScheduleEntity:scheduleEntityList){ PartyMeetingMessageMQMsg msg = new PartyMeetingMessageMQMsg(); msg.setCustomerId(icScheduleEntity.getCustomerId()); From ac1f033ce4d4d87a8cfc394e886b857541a18a97 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 5 Sep 2022 10:25:49 +0800 Subject: [PATCH 174/206] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index e43e4493d0..69016d493e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -226,7 +226,7 @@ WHERE del_flag = '0' AND party_org_type = '5' - AND agency_pids LIKE CONCAT('%', #{agencyId}, '%') + AND (AGENCY_ID = #{agencyId} OR agency_pids LIKE CONCAT('%', #{agencyId}, '%')) ORDER BY org_pids ASC From 494de9abed22974ff7b284da2a131484ab435a97 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 5 Sep 2022 11:04:36 +0800 Subject: [PATCH 175/206] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/service/impl/PartymemberInfoServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java index 9f2678f246..354236fe49 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberInfoServiceImpl.java @@ -265,6 +265,7 @@ public class PartymemberInfoServiceImpl extends BaseServiceImpl updateWrapper=new LambdaUpdateWrapper<>(); updateWrapper.eq(PartymemberInfoEntity::getUserId,userId); updateWrapper.set(PartymemberInfoEntity::getIdCard,idNum); + updateWrapper.set(PartymemberInfoEntity::getUpdatedTime,new Date()); baseDao.update(null,updateWrapper); } } From c32f7e303b895dfff34b2fe9e5fa47c405f79339 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 5 Sep 2022 13:56:26 +0800 Subject: [PATCH 176/206] =?UTF-8?q?=E5=90=8C=E4=B8=80=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E4=B8=8B=E6=A5=BC=E6=A0=8B=E4=B8=8D=E9=87=8D=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/model/ImportBuildingInfoListener.java | 1 + .../src/main/java/com/epmet/model/ImportHouseInfoListener.java | 1 + 2 files changed, 2 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java index 79009b1039..38f8e3b494 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java @@ -215,6 +215,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java index 194f39eb54..b8f1c41ce2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java @@ -494,6 +494,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener gridIds = new ArrayList<>(); From a1203949c40b8eb98f22a78d07c61c6ee8e54240 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 6 Sep 2022 11:02:11 +0800 Subject: [PATCH 177/206] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/group/dto/group/result/GroupDetailResultDTO.java | 4 ++++ .../modules/group/service/impl/ResiGroupServiceImpl.java | 5 +++++ .../main/resources/mapper/group/GroupEditSubmitRecordDao.xml | 1 + 3 files changed, 10 insertions(+) diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java index 7d08176f31..f7444bdc17 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/GroupDetailResultDTO.java @@ -26,4 +26,8 @@ public class GroupDetailResultDTO { private String leaderId; /** 当前用户是否是群主 */ private String groupLeaderFlag; + /** + * 所属党组织 + */ + private String partyOrgId; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index e21ce83878..54d83ed951 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1473,10 +1473,15 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 14:14:24 +0800 Subject: [PATCH 178/206] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/group/service/impl/ResiGroupServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 54d83ed951..bbfff94490 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -1481,7 +1481,6 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:02:03 +0800 Subject: [PATCH 179/206] =?UTF-8?q?=E4=BD=A0=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcMessageDTO.java | 2 +- .../src/main/java/com/epmet/entity/IcMessageEntity.java | 2 +- .../partyOrg/service/impl/IcPartyActServiceImpl.java | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java index 3451d342f3..1c7e9e9785 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/IcMessageDTO.java @@ -42,7 +42,7 @@ public class IcMessageDTO implements Serializable { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java index dc937c6639..e13ee49b0a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/IcMessageEntity.java @@ -42,7 +42,7 @@ public class IcMessageEntity extends BaseEpmetEntity { private String app; /** - * 消息分类 党建小助手:party + * 消息分类 党建活动：party_act 党建日程：party_schedule */ private String messageType; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java index 52d1c14c2a..c5d1d7244b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyActServiceImpl.java @@ -572,7 +572,7 @@ public class IcPartyActServiceImpl extends BaseServiceImpl Date: Tue, 6 Sep 2022 15:39:16 +0800 Subject: [PATCH 180/206] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.3.20__alter_ic_message.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql new file mode 100644 index 0000000000..d962d2763e --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/db/migration/V0.3.20__alter_ic_message.sql @@ -0,0 +1,2 @@ +ALTER TABLE epmet_message.`ic_message` +MODIFY COLUMN `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '消息分类 \r\n党建活动：party_act \r\n党建日程：party_schedule \r\n' AFTER `app`; From 8972a3249db7909310e6934b4be2c276777f3786 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 6 Sep 2022 17:08:00 +0800 Subject: [PATCH 181/206] emm --- .../dto/IcPointNucleicMonitoringDTO.java | 5 ++ .../epmet/dto/result/MapInfoResultDTO.java | 5 ++ .../controller/IcPointAppController.java | 12 +++- .../dao/IcPointNucleicMonitoringDao.java | 8 +++ .../IcPointNucleicMonitoringEntity.java | 8 ++- .../com/epmet/service/IcPointAppService.java | 16 +++--- .../IcPointNucleicMonitoringService.java | 8 +++ .../service/impl/IcPointAppServiceImpl.java | 56 +++++-------------- .../IcPointNucleicMonitoringServiceImpl.java | 17 ++++-- ...ter_ic_point_nucleic_monitoring_enable.sql | 1 + .../mapper/IcPointNucleicMonitoringDao.xml | 10 ++++ 11 files changed, 86 insertions(+), 60 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.68__alter_ic_point_nucleic_monitoring_enable.sql diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java index 3a29fb0afc..08f51a1e5e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcPointNucleicMonitoringDTO.java @@ -66,6 +66,11 @@ public class IcPointNucleicMonitoringDTO implements Serializable { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java index 896d1195fc..12d9cf0db4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/MapInfoResultDTO.java @@ -77,6 +77,11 @@ public class MapInfoResultDTO implements Serializable { */ private String latitude; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java index b6f3edb0a7..c5c6ca64c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcPointAppController.java @@ -43,7 +43,17 @@ public class IcPointAppController { return icPointAppService.getMapInfoByPointType(formDTO); } - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @PostMapping("enableOrDisabled/{id}") + public Result enableOrDisabled(@PathVariable("id") String id){ + icPointAppService.enableOrDisabled(id); + return new Result(); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java index eae4085362..908cf46e44 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcPointNucleicMonitoringDao.java @@ -49,4 +49,12 @@ public interface IcPointNucleicMonitoringDao extends BaseDao getMapInfoList(MapInfoFormDTO formDTO); + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(@Param("id") String id); + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java index 4a05b5d850..e9e54456cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcPointNucleicMonitoringEntity.java @@ -1,13 +1,10 @@ package com.epmet.entity; import com.baomidou.mybatisplus.annotation.TableName; - import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; import lombok.EqualsAndHashCode; -import java.util.Date; - /** * 核酸监测点 * @@ -66,6 +63,11 @@ public class IcPointNucleicMonitoringEntity extends BaseEpmetEntity { */ private String address; + /** + * 未禁用enable,已禁用disabled + */ + private String enableFlag; + /** * 经度 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java index 6d6f7626d9..f626bc4e01 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointAppService.java @@ -1,18 +1,10 @@ package com.epmet.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.commons.tools.utils.Result; -import com.epmet.dto.IcPointNucleicMonitoringDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.entity.IcPointNucleicMonitoringEntity; -import org.springframework.web.bind.annotation.RequestBody; -import java.io.InputStream; import java.util.List; -import java.util.Map; /** * 地图信息 @@ -29,5 +21,11 @@ public interface IcPointAppService { */ Result> getMapInfoByPointType(MapInfoFormDTO formDTO); - + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java index 70d92655a5..3d862dd627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcPointNucleicMonitoringService.java @@ -105,4 +105,12 @@ public interface IcPointNucleicMonitoringService extends BaseService getMapInfoList(MapInfoFormDTO formDTO); + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + void enableOrDisabled(String id); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java index 7927aea977..16d73ed457 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointAppServiceImpl.java @@ -1,58 +1,17 @@ package com.epmet.service.impl; -import cn.afterturn.easypoi.excel.ExcelExportUtil; -import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ExceptionUtils; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerOrgRedis; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; -import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.constants.ImportTaskConstants; -import com.epmet.dao.IcPointVaccinesInoculationDao; -import com.epmet.dto.IcPointVaccinesInoculationDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.MapInfoFormDTO; import com.epmet.dto.result.MapInfoResultDTO; -import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcPointVaccinesInoculationEntity; -import com.epmet.excel.IcPointVaccinesInoculationImportExcel; -import com.epmet.excel.error.PointVaccinesInoculationErrorModel; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.GovOrgFeignClient; -import com.epmet.feign.OssFeignClient; -import com.epmet.redis.IcPointVaccinesInoculationRedis; import com.epmet.service.IcPointAppService; import com.epmet.service.IcPointNucleicMonitoringService; import com.epmet.service.IcPointVaccinesInoculationService; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.entity.ContentType; -import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.commons.CommonsMultipartFile; -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.util.*; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.List; /** * 地图信息 @@ -85,4 +44,15 @@ public class IcPointAppServiceImpl implements IcPointAppService { } return new Result>().ok(mapInfoResultDTO); } + + /** + * Desc: 核酸监测点启用禁用 + * @param id + * @author zxc + * @date 2022/9/6 16:39 + */ + @Override + public void enableOrDisabled(String id) { + icPointNucleicMonitoringService.enableOrDisabled(id); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java index cb2b516b13..df2214249c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcPointNucleicMonitoringServiceImpl.java @@ -5,7 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -16,7 +16,6 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.ExcelPoiUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constants.ImportTaskConstants; @@ -28,10 +27,8 @@ import com.epmet.dto.form.OrgInfoPointFormDTO; import com.epmet.dto.result.CommunityInfoResultDTO; import com.epmet.dto.result.MapInfoResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.entity.IcEpidemicSpecialAttentionEntity; import com.epmet.entity.IcPointNucleicMonitoringEntity; import com.epmet.excel.IcPointNucleicMonitoringImportExcel; -import com.epmet.excel.error.EpidemicSpecialAttentionErrorModel; import com.epmet.excel.error.PointNucleicMonitoringErrorModel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; @@ -373,5 +370,17 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl + + + update ic_point_nucleic_monitoring + set UPDATED_TIME = now(), + ENABLE_FLAG = case when ENABLE_FLAG = 'enable' then 'disabled' else 'enable' end + where id = #{id} + + + + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java index ff71263f95..7d357089f6 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/UserChartFormDTO.java @@ -22,6 +22,14 @@ public class UserChartFormDTO implements Serializable { * 组织、网格、小区类型 agency grid village */ private String orgType; + /** + * 数据类型【居民总数: all 常住: cz 流动: ld】 + */ + private String type; + + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; //id集合 private List idList; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a62980703a..c25d1ff604 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1411,4 +1411,15 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * @Author sun + * @Description 【人房概览】居民统计数点击查询列表 + **/ + @PostMapping("icuserstatislist") + public Result> icUserStatisList(@LoginUser TokenDto tokenDto, @RequestBody UserChartFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result>().ok(icResiUserService.icUserStatisList(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 1fedc84df4..dd9e97bbae 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -428,4 +428,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/6/29 17:37 */ List getIcUserCount(IcUserCountFormDTO formDTO); + + List icUserStatisList(UserChartFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 8975e06443..a301d44010 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -507,4 +507,6 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + PageData icUserStatisList(UserChartFormDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2f44c543d5..e565f93b35 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3351,4 +3351,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + @Override + public PageData icUserStatisList(UserChartFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + //1.判断入参是否有值，没有值则赋值当前工作人员缓存中所属组织信息 + if (StringUtils.isEmpty(formDTO.getOrgId())) { + //2.获取工作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } + //获取无效组织网格Id列表 + if("agency".equals(formDTO.getOrgType())){ + //查询组织数据时排除掉当前组织及下级无效组织列表 + Result result = govOrgOpenFeignClient.getDelAgencyGridIdList(formDTO.getOrgId()); + if (!result.success()) { + throw new EpmetException(String.format("获取当前组织及下级已删除组织、网格列表失败，组织Id->%s", formDTO.getUserId())); + } + formDTO.setAgencyIdList(result.getData().getAgencyIdList()); + formDTO.setGridIdList(result.getData().getGridIdList()); + } + + //2.按条件查询业务数据 + List list = baseDao.icUserStatisList(formDTO); + if (CollectionUtils.isEmpty(list)) { + return new PageData(new ArrayList<>(), NumConstant.ZERO); + } + + //3.封装数据 + //查询小区，楼号，网格 + Result> gridResult = govOrgOpenFeignClient.getGridListByGridIds(list.stream().map(SearchByNameResultDTO::getGridId).collect(Collectors.toList())); + if (!gridResult.success()) { + throw new RenException(gridResult.getCode(), gridResult.getMsg()); + } + Map gridMap = gridResult.getData().stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, AllGridsByUserIdResultDTO::getGridName)); + Result> neighborHoodResult = govOrgOpenFeignClient.getListByIds(list.stream().map(SearchByNameResultDTO::getNeighborHoodId).collect(Collectors.toList())); + if (!neighborHoodResult.success()) { + throw new RenException(neighborHoodResult.getCode(), neighborHoodResult.getMsg()); + } + Map neighborHoodMap = neighborHoodResult.getData().stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName)); + Result> buildResult = govOrgOpenFeignClient.buildingListByIds(list.stream().map(SearchByNameResultDTO::getBuildId).collect(Collectors.toList())); + if (!buildResult.success()) { + throw new RenException(buildResult.getCode(), buildResult.getMsg()); + } + Map buildMap = buildResult.getData().stream().collect(Collectors.toMap(BuildingResultDTO::getBuildingId, BuildingResultDTO::getBuildingName)); + AtomicInteger i = new AtomicInteger(NumConstant.ONE); + list.forEach(item -> { + item.setGridName(gridMap.get(item.getGridId())); + item.setNeighborHoodName(neighborHoodMap.get(item.getNeighborHoodId())); + item.setBuildNum(buildMap.get(item.getBuildId())); + item.setSort(i.getAndIncrement()); + }); + + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 9373743976..a32b2741a6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1289,4 +1289,52 @@ + + + From faa1a9ed502974eafb6d06112eefa8b77b8feb2c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 7 Sep 2022 15:09:24 +0800 Subject: [PATCH 187/206] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partyOrg/IcPartyOrgDTO.java | 10 ++++++ .../partyOrg/form/EditPrincipalFormDTO.java | 33 +++++++++++++++++++ .../partyOrg/result/IcPartyOrgTreeDTO.java | 10 ++++++ .../controller/IcPartyOrgController.java | 14 ++++++++ .../modules/partyOrg/dao/IcPartyOrgDao.java | 9 +++++ .../partyOrg/entity/IcPartyOrgEntity.java | 10 ++++++ .../partyOrg/service/IcPartyOrgService.java | 10 ++++++ .../service/impl/IcPartyOrgServiceImpl.java | 13 ++++++++ .../db/migration/V0.0.10__add_principal.sql | 2 ++ .../mapper/partyOrg/IcPartyOrgDao.xml | 26 ++++++++++++--- 10 files changed, 133 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index b5d26e1ee6..3273372fed 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -84,6 +84,16 @@ public class IcPartyOrgDTO implements Serializable { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java new file mode 100644 index 0000000000..e7cab3e965 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.resi.partymember.dto.partyOrg.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/9/7 15:02 + * @DESC + */ +@Data +public class EditPrincipalFormDTO implements Serializable { + + private static final long serialVersionUID = -1006713792388125512L; + + /** + * 负责人 + */ + @NotBlank(message = "principal不能为空",groups = AddGroup.class) + private String principal; + + @NotBlank(message = "partyOrgId不能为空",groups = AddGroup.class) + private String partyOrgId; + + /** + * 联系电话 + */ + @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) + private String principalMobile; +} diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java index cb5bf1b927..7888f71899 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java @@ -53,6 +53,16 @@ public class IcPartyOrgTreeDTO implements Serializable { */ private String partyOrgName; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + private List children = new ArrayList<>(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java index 60c3327978..2279fd3ca2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/controller/IcPartyOrgController.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.modules.partyOrg.excel.IcPartyOrgExcel; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgListFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; @@ -189,4 +190,17 @@ public class IcPartyOrgController { return new Result>().ok(icPartyOrgService.partOrgList(formDTO.getGridId())); } + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + @PostMapping("editPrincipal") + public Result editPrincipal(@RequestBody EditPrincipalFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, AddGroup.class); + icPartyOrgService.editPrincipal(formDTO); + return new Result(); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java index fe4d17c517..88fe00f0ad 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/dao/IcPartyOrgDao.java @@ -3,6 +3,7 @@ package com.epmet.modules.partyOrg.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.ActAndScheduleListResultDTO; import com.epmet.resi.partymember.dto.partyOrg.result.BranchlistTreeSubDTO; @@ -117,4 +118,12 @@ public interface IcPartyOrgDao extends BaseDao { List getSelfAndSub(@Param("joinOrgId") String joinOrgId); List partOrgList(@Param("agencyId") String agencyId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index e9ea2f210c..b6404fb481 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -73,6 +73,16 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String address; + /** + * 负责人 + */ + private String principal; + + /** + * 联系电话 + */ + private String principalMobile; + /** * 党组织介绍 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index 22485b8171..aa13fbfec8 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -148,4 +149,13 @@ public interface IcPartyOrgService extends BaseService { void adjustOrgPath(List customerIds); List partOrgList(String gridId); + + /** + * Desc: 党组织修改负责人 + * @param formDTO + * @author zxc + * @date 2022/9/7 15:04 + */ + void editPrincipal(EditPrincipalFormDTO formDTO); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 3405183f47..8862404285 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.modules.partymember.dao.IcPartyMemberDao; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.group.feign.ResiGroupOpenFeignClient; import com.epmet.resi.partymember.dto.partyOrg.IcPartyOrgDTO; +import com.epmet.resi.partymember.dto.partyOrg.form.EditPrincipalFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.GetParentOrgFormDTO; import com.epmet.resi.partymember.dto.partyOrg.form.PartyOrgTreeListDTO; import com.epmet.resi.partymember.dto.partyOrg.result.*; @@ -490,4 +491,16 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl + + + + update ic_party_org + set PRINCIPAL_MOBILE = #{principalMobile}, + PRINCIPAL = #{principal}, + UPDATED_TIME = NOW() + where id = #{partyOrgId} + + + From 304fd62c86037e75ab9202dac8810dc30c3e1079 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 8 Sep 2022 10:46:38 +0800 Subject: [PATCH 189/206] =?UTF-8?q?=E4=BA=BA=E9=98=B2=E6=A6=82=E8=A7=88?= =?UTF-8?q?=E4=B8=8B=E9=92=BB=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcHouseDao.xml | 2 +- .../src/main/resources/mapper/IcResiUserDao.xml | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index 8b443733ea..5cfdd0fd4d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -629,7 +629,7 @@ ) - GROUP BY + ORDER BY a.sort, CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index a32b2741a6..3732fbfd5d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1313,6 +1313,12 @@ del_flag = '0' AND status = '0' AND customer_id = #{customerId} + + AND is_floating = '0' + + + AND (is_floating != '0' or is_floating is null) + AND (agency_id = #{orgId} OR pids LIKE CONCAT('%', #{orgId}, '%')) @@ -1334,7 +1340,7 @@ AND village_id = #{orgId} - GROUP BY `name` ASC + ORDER BY `name` ASC From 2e260ff834ac819beccd99963c50ee164a72e910 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 11:05:47 +0800 Subject: [PATCH 190/206] gov_party_helper --- .../epmet/dto/result/CustomerParaResDTO.java | 21 ++++++++++++++++ .../CustomerParameterController.java | 13 ++++++++++ .../service/CustomerParameterService.java | 9 +++++++ .../impl/CustomerParameterServiceImpl.java | 24 +++++++++++++++++++ .../migration/V0.0.9__party_helper_param.sql | 3 +++ 5 files changed, 70 insertions(+) create mode 100644 epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java create mode 100644 epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql diff --git a/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java new file mode 100644 index 0000000000..7c7954d9a4 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-client/src/main/java/com/epmet/dto/result/CustomerParaResDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/9/8 10:44 + */ +@Data +public class CustomerParaResDTO implements Serializable { + /** + * 开启：open + * 关闭：closed + * 没有数据默认开启 + */ + private String govPartyHelper; +} + diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java index 006080bd6b..f31cd52346 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/controller/CustomerParameterController.java @@ -1,9 +1,12 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.CrmParameterFormDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.service.CustomerParameterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -50,4 +53,14 @@ public class CustomerParameterController { return new Result(); } + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * @param tokenDto + * @return + */ + @PostMapping("customize") + public Result queryCustomerCustomize(@LoginUser TokenDto tokenDto){ + return new Result().ok(parameterService.queryCustomerCustomize(tokenDto.getCustomerId())); + } } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java index 4ff8119c79..ba8055f90e 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/CustomerParameterService.java @@ -4,6 +4,7 @@ import com.epmet.dto.form.CrmParameterFormDTO; import com.epmet.dto.form.FootBarPatternFormDTO; import com.epmet.dto.form.FootBarPatternQueryFormDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.dto.result.FootBarPatternQueryResultDTO; import java.util.List; @@ -49,4 +50,12 @@ public interface CustomerParameterService { * @date 2021/7/27 17:24 */ void saveFootBarPattern(FootBarPatternFormDTO formDTO); + + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * @param customerId + * @return + */ + CustomerParaResDTO queryCustomerCustomize(String customerId); } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java index fc7cd29f80..e00e1b54ac 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java +++ b/epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/service/impl/CustomerParameterServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.Result; @@ -10,6 +11,7 @@ import com.epmet.dto.form.FootBarPatternFormDTO; import com.epmet.dto.form.FootBarPatternQueryFormDTO; import com.epmet.dto.result.CheckFloatFootBarResultDTO; import com.epmet.dto.result.CrmParameterResultDTO; +import com.epmet.dto.result.CustomerParaResDTO; import com.epmet.dto.result.FootBarPatternQueryResultDTO; import com.epmet.entity.CustomerParameterEntity; import com.epmet.feign.OperCustomizeOpenFeignClient; @@ -146,5 +148,27 @@ public class CustomerParameterServiceImpl implements CustomerParameterService { } } + /** + * 查询客户定制化参数 + * 比如党建小助手是否开启 + * + * @param customerId + * @return + */ + @Override + public CustomerParaResDTO queryCustomerCustomize(String customerId) { + CustomerParaResDTO resDTO = new CustomerParaResDTO(); + resDTO.setGovPartyHelper("open"); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(CustomerParameterEntity::getCustomerId, customerId) + .eq(CustomerParameterEntity::getParameterKey, "gov_party_helper") + .last("limit 1"); + CustomerParameterEntity customerParameterEntity = parameterDao.selectOne(queryWrapper); + if (null != customerParameterEntity) { + resDTO.setGovPartyHelper(customerParameterEntity.getParameterValue()); + } + return resDTO; + } + } diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql new file mode 100644 index 0000000000..5cc11e5f73 --- /dev/null +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/db/migration/V0.0.9__party_helper_param.sql @@ -0,0 +1,3 @@ +INSERT INTO `epmet_oper_crm`.`customer_parameter` ( `ID`, `CUSTOMER_ID`, `PARAMETER_KEY`, `PARAMETER_NAME`, `PARAMETER_SWITCH`, `PARAMETER_VALUE`, `DESCRIPTION`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME` ) +VALUES + ( '5ce6f22c-2f22-11ed-bb6b-0050568f8cf7', 'default', 'gov_party_helper', '工作端党建小助手是否开启？', 'on', 'open', '开启：open；关闭：closed;不配置，默认是开启', 0, 0, 'APP_USER', '2022-09-08 11:03:35', 'APP_USER', '2022-09-08 11:03:45' ); \ No newline at end of file From eadc1c9bff0a09be64e0b96857656c1d5c1df159 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 8 Sep 2022 13:32:12 +0800 Subject: [PATCH 191/206] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/group/ResiGroupDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml index 957b687fa5..c235a5826a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml @@ -1076,7 +1076,7 @@ SELECT CUSTOMER_USER_ID,RESI_GROUP_ID FROM resi_group_member WHERE DEL_FLAG = '0' AND GROUP_LEADER_FLAG = 'leader' - AND `STATUS` = 'approved' + AND RESI_GROUP_ID IN ( #{id} From 6ab99298d737d827bd0c3e080d7b2f6bfdb1d5c5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:38:13 +0800 Subject: [PATCH 192/206] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/IcResiCategoryStatsConfigFormDTO.java | 9 ++++++++- .../result/IcResiCategoryStatsConfigResultDTO.java | 14 +++++++++++++- .../entity/IcResiCategoryStatsConfigEntity.java | 8 ++++++++ .../mapper/IcResiCategoryStatsConfigDao.xml | 5 ++++- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java index 7d10474443..c5af9dc2c1 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcResiCategoryStatsConfigFormDTO.java @@ -74,5 +74,12 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable { private Integer level2; private Integer level3; - + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java index e161b60f6d..45ee8f8ce3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcResiCategoryStatsConfigResultDTO.java @@ -44,7 +44,10 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { */ private String label; - + /** + * 列名 + */ + private String columnName; /** * 管理平台分类图标 @@ -84,4 +87,13 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable { * 等级3阈值 */ private Integer level3; + + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java index d0201db93d..4a292260b9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcResiCategoryStatsConfigEntity.java @@ -80,4 +80,12 @@ public class IcResiCategoryStatsConfigEntity extends BaseEpmetEntity { */ private Integer sort; + /** + * 自动匹配：开启1；不匹配：0 + */ + private String autoMatching; + /** + * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49 + */ + private String ylfnValue; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index f138b59d0d..366690ed03 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -26,6 +26,7 @@ select a.ID as id, a.LABEL as label, + a.COLUMN_NAME as columnName, a.MANAGEMENT_ICON as managementIcon, a.DATA_ICON as dataIcon, a.HOUSE_SHOW_ICON as houseShowIcon, @@ -34,7 +35,9 @@ b.LEVEL_1 as level1, b.LEVEL_2 as level2, b.LEVEL_3 as level3, - b.WARN + b.WARN, + a.AUTO_MATCHING as , + a.YLFN_VALUE as from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From bd5706aa6ca7c8b24b37b5d637a7cb04366f3389 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:45:27 +0800 Subject: [PATCH 193/206] =?UTF-8?q?ic=5Fresi=5Fcategory=5Fstats=5Fconfig?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.38__ylfnv.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql new file mode 100644 index 0000000000..4ff1496be2 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql @@ -0,0 +1,4 @@ +alter table ic_resi_category_stats_config + add COLUMN `AUTO_MATCHING` varchar(1) NOT NULL DEFAULT '0' COMMENT '自动匹配：开启1；不匹配：0' after SORT; + +alter table ic_resi_category_stats_config add COLUMN `YLFN_VALUE` varchar(32) DEFAULT NULL COMMENT '育龄妇女年龄范围，英文逗号隔开的数字例如：18,49' after AUTO_MATCHING; \ No newline at end of file From ecc2d44161973ff85d88c8e7bd3ec907907ebc8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 8 Sep 2022 15:46:36 +0800 Subject: [PATCH 194/206] buig --- .../main/resources/mapper/IcResiCategoryStatsConfigDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml index 366690ed03..49ec2d3bbd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcResiCategoryStatsConfigDao.xml @@ -36,8 +36,8 @@ b.LEVEL_2 as level2, b.LEVEL_3 as level3, b.WARN, - a.AUTO_MATCHING as , - a.YLFN_VALUE as + a.AUTO_MATCHING as autoMatching, + a.YLFN_VALUE as ylfnValue from ic_resi_category_stats_config a left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId} From 5bd15bb4bb89fb3cb99d1a61483bd2d61b2f9675 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 8 Sep 2022 16:04:26 +0800 Subject: [PATCH 195/206] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=8F=B7=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E7=B1=BB=E5=A2=9E=E5=8A=A0=E5=B9=B4=E9=BE=84=E8=AE=A1?= =?UTF-8?q?=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/utils/IdCardRegexUtils.java | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index 96d7d02a62..ff1f0b0549 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -1,10 +1,15 @@ package com.epmet.commons.tools.utils; import com.epmet.commons.tools.enums.IdCardTypeEnum; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.time.DateTimeException; +import java.time.LocalDate; +import java.time.Period; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -50,6 +55,7 @@ public class IdCardRegexUtils { private String birthdayMonth; private String birthdayDay; private String sex; + private Integer age; } /** @@ -116,7 +122,17 @@ public class IdCardRegexUtils { String month = matcher.group("month"); String day = matcher.group("day"); String sex = matcher.group("sex"); - return new ParsedContent(year, month, day, sex); + + // ------- 年龄Start---------- + Integer age; + try { + LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + age = Period.between(birthday, LocalDate.now()).getYears(); + } catch (DateTimeException e) { + throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e)); + } + // ------- 年龄End---------- + return new ParsedContent(year, month, day, sex, age); } // 其他类型暂时不可解析 @@ -130,4 +146,10 @@ public class IdCardRegexUtils { public IdCardTypeEnum getTypeEnum() { return idCardType; } + + public static void main(String[] args) { + IdCardRegexUtils parse = IdCardRegexUtils.parse("370282198801303017"); + ParsedContent parsedResult = parse.getParsedResult(); + System.out.println(parsedResult); + } } From c14fd6416194b04ca3d1344015b1c38cc7c10203 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 8 Sep 2022 17:29:27 +0800 Subject: [PATCH 196/206] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/task/ic/IcUpdateYlfnTask.java | 35 +++++ .../epmet/dto/result/YlfnValueResultDTO.java | 18 +++ .../feign/OperCustomizeOpenFeignClient.java | 3 +- .../OperCustomizeOpenFeignClientFallback.java | 5 + .../IcResiCategoryStatsConfigController.java | 6 + .../IcResiCategoryStatsConfigService.java | 11 ++ .../IcResiCategoryStatsConfigServiceImpl.java | 32 +++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 3 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 13 ++ .../com/epmet/service/IcResiUserService.java | 9 ++ .../service/impl/IcResiUserServiceImpl.java | 122 +++++++++++++++++- 12 files changed, 257 insertions(+), 5 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java new file mode 100644 index 0000000000..b7a1ffb6ea --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcUpdateYlfnTask.java @@ -0,0 +1,35 @@ +package com.epmet.task.ic; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.task.ITask; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; + +/** + * desc:定时弥补数据 保证数据的一致性 + */ +@Slf4j +@Component("icUpdateYlfnTask") +public class IcUpdateYlfnTask implements ITask { + + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + /** + * 执行定时任务接口 + * + * @param params 参数，多参数使用JSON数据 + */ + @Override + public void run(String params) { + Result result = epmetUserOpenFeignClient.updateYlfn(); + if (result.success()) { + log.info("icUpdateYlfnTask定时任务正在执行定时任务执行成功"); + } else { + log.warn("icUpdateYlfnTask定时任务正在执行定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java new file mode 100644 index 0000000000..9056944c83 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/YlfnValueResultDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/9/8 15:43 + */ +@Data +public class YlfnValueResultDTO implements Serializable { + private static final long serialVersionUID = -1416102274320519092L; + private String customerId; + private Integer min; + private Integer max; +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index e93d9badaa..ce2063c361 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -178,5 +178,6 @@ public interface OperCustomizeOpenFeignClient { */ @PostMapping("/oper/customize/icformitemoptions/getItemConditions") Result> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input); - + @PostMapping("/oper/customize/icresicategorystatsconfig/getYlfnValue") + Result> getYlfnValue(); } diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java index e59af2b818..70debfecf3 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java @@ -142,4 +142,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getOptionsMap", input); } + @Override + public Result> getYlfnValue() { + return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getYlfnValue", null); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java index 775001770f..e8dbf8b1af 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcResiCategoryStatsConfigController.java @@ -26,6 +26,7 @@ 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.dto.IcResiCategoryStatsConfigDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.excel.IcResiCategoryStatsConfigExcel; import com.epmet.service.IcResiCategoryStatsConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -96,4 +97,9 @@ public class IcResiCategoryStatsConfigController { return new Result>().ok(icResiCategoryStatsConfigService.getCategoryList(dto)); } + @PostMapping("getYlfnValue") + public Result> getYlfnValue() { + return new Result>().ok(icResiCategoryStatsConfigService.getYlfnValue()); + } + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java index f9092491aa..6f151130dd 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcResiCategoryStatsConfigService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import java.util.List; @@ -111,4 +112,14 @@ public interface IcResiCategoryStatsConfigService extends BaseService getCustomerCategoryShowAndWarnList(String customerId); + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO>} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + List getYlfnValue(); + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index d5bfdbd521..bc6758ec21 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -22,11 +22,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcResiCategoryStatsConfigDao; import com.epmet.dto.IcResiCategoryStatsConfigDTO; import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO; +import com.epmet.dto.result.YlfnValueResultDTO; import com.epmet.entity.IcResiCategoryStatsConfigEntity; import com.epmet.redis.IcResiCategoryStatsConfigRedis; import com.epmet.service.IcResiCategoryStatsConfigService; @@ -37,6 +40,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * 居民类别配置表 @@ -137,4 +141,32 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl(); } + /** + * 获取育龄妇女配置 + * + * @Param + * @Return {@link List< YlfnValueResultDTO >} + * @Author zhaoqifeng + * @Date 2022/9/8 15:50 + */ + @Override + public List getYlfnValue() { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiCategoryStatsConfigEntity::getAutoMatching, NumConstant.ONE_STR); + wrapper.eq(IcResiCategoryStatsConfigEntity::getColumnName, "IS_YLFN"); + wrapper.isNotNull(IcResiCategoryStatsConfigEntity::getYlfnValue); + List list = baseDao.selectList(wrapper); + if(CollectionUtils.isEmpty(list)) { + return Collections.emptyList(); + } + return list.stream().map(item -> { + YlfnValueResultDTO dto = new YlfnValueResultDTO(); + dto.setCustomerId(item.getCustomerId()); + String[] ages = item.getYlfnValue().split(StrConstant.COMMA); + dto.setMin(Integer.valueOf(ages[0])); + dto.setMax(Integer.valueOf(ages[1])); + return dto; + }).collect(Collectors.toList()); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index 47a67e5fbd..73d770a411 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -882,4 +882,7 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi") Result> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input); + + @PostMapping("/epmetuser/icresiuser/updateYlfn") + Result updateYlfn(); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 7c9cc3b2a4..2de7371623 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -678,4 +678,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input); } + + @Override + public Result updateYlfn() { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateYlfn", null); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index a62980703a..0d5652074c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1411,4 +1411,17 @@ public class IcResiUserController implements ResultDataResolver { return new Result>().ok(page); } + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return {@link Result} + * @Author zhaoqifeng + * @Date 2022/9/8 17:19 + */ + @PostMapping("updateYlfn") + public Result updateYlfn() { + icResiUserService.updateYlfn(); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 8975e06443..145ea7fc9e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -507,4 +507,13 @@ public interface IcResiUserService extends BaseService { IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); PageData listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize); + + /** + * 更新育龄妇女状态定时任务 + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + void updateYlfn(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2f44c543d5..3c146c3f31 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -53,10 +53,7 @@ import com.epmet.commons.tools.utils.*; import com.epmet.constant.IcPlatformConstant; import com.epmet.constant.IcResiUserConstant; import com.epmet.constant.UserConstant; -import com.epmet.dao.IcPartyMemberDao; -import com.epmet.dao.IcResiUserDao; -import com.epmet.dao.IcVolunteerDao; -import com.epmet.dao.UserBaseInfoDao; +import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; @@ -160,6 +157,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(query).stream().map((e) -> ConvertUtils.sourceToTarget(e, IcResiNonDynamicResultDTO.class)).collect(Collectors.toList()); return new PageData(list, new PageInfo<>(list).getTotal(), pageSize); } + + /** + * 更新育龄妇女状态定时任务 + * + * @Param + * @Return + * @Author zhaoqifeng + * @Date 2022/9/8 15:45 + */ + @Override + public void updateYlfn() { + //获取育龄妇女配置 + Result> value = operCustomizeOpenFeignClient.getYlfnValue(); + if(!value.success()) { + throw new EpmetException(value.getCode(), value.getMsg()); + } + value.getData().forEach(item -> { + //查询客户下的非育龄妇女的女性居民 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getCustomerId, item.getCustomerId()); + wrapper.eq(IcResiUserEntity::getGender, NumConstant.TWO_STR); + wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR); + wrapper.eq(IcResiUserEntity::getIdCardType, NumConstant.ONE_STR); + List list = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(user -> { + IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); + if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { + //将不是育龄妇女的变为育龄妇女 + if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ONE_STR); + baseDao.updateById(icResiUserEntity); + + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("否"); + record.setAfterChangeName("是"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE); + icUserChangeDetailedDao.insert(detail); + } + } else { + //将是育龄妇女的变为非育龄妇女 + if (pares.getParsedResult().getAge() < item.getMin() || pares.getParsedResult().getAge() > item.getMax()) { + //更新育龄妇女状态 + IcResiUserEntity icResiUserEntity = new IcResiUserEntity(); + icResiUserEntity.setId(user.getId()); + icResiUserEntity.setIsYlfn(NumConstant.ZERO_STR); + baseDao.updateById(icResiUserEntity); + //添加居民变更记录 + IcUserChangeRecordEntity record = new IcUserChangeRecordEntity(); + record.setCustomerId(user.getCustomerId()); + record.setOperatorId("APP_USER"); + record.setOperatorName("系统"); + record.setIcUserId(user.getId()); + record.setIcUserName(user.getName()); + record.setType("category"); + record.setTypeName("类别"); + record.setBeforeChangeName("是"); + record.setAfterChangeName("否"); + record.setChangeTime(new Date()); + icUserChangeRecordDao.insert(record); + //添加变更明细 + IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity(); + detail.setCustomerId(user.getCustomerId()); + detail.setIcUserChangeRecordId(record.getId()); + detail.setPids(user.getPids()); + detail.setAgencyId(user.getAgencyId()); + detail.setGridId(user.getGridId()); + detail.setNeighborHoodId(user.getVillageId()); + detail.setBuildingId(user.getBuildId()); + detail.setBuildingUnitId(user.getUnitId()); + detail.setHouseId(user.getHomeId()); + detail.setIcUserId(user.getId()); + detail.setType("category"); + detail.setTypeName("类别"); + detail.setFieldName("IS_YLFN"); + detail.setValue(NumConstant.ONE_NEG); + icUserChangeDetailedDao.insert(detail); + } + } + } + }); + } + }); + } } From 038b8c47ca8f4fc143d83c7b76c6436697cae0e6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 9 Sep 2022 09:18:57 +0800 Subject: [PATCH 197/206] =?UTF-8?q?=E4=B8=8D=E7=AD=89=E4=BA=8E=E7=A9=BA?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java index bc6758ec21..a00f800733 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcResiCategoryStatsConfigServiceImpl.java @@ -155,6 +155,7 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if(CollectionUtils.isEmpty(list)) { return Collections.emptyList(); From 06cc5e8ac40c6a17b62903bd36f502908cacd003 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 09:35:13 +0800 Subject: [PATCH 198/206] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 3c146c3f31..648d315953 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3362,6 +3362,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> value = operCustomizeOpenFeignClient.getYlfnValue(); @@ -3374,12 +3375,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(list)) { list.forEach(user -> { IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard()); - if (NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { + if (null != pares && NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) { if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) { //将不是育龄妇女的变为育龄妇女 if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) { From 4b06c587f7d0ceec965ff627628d4c34a4bc42b1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 9 Sep 2022 11:18:35 +0800 Subject: [PATCH 199/206] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E8=82=B2=E9=BE=84=E5=A6=87=E5=A5=B3=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 648d315953..ab854a3fd3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -3393,13 +3393,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 9 Sep 2022 13:44:28 +0800 Subject: [PATCH 200/206] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java | 5 +++++ .../partymember/dto/partyOrg/form/EditPrincipalFormDTO.java | 3 +++ .../com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java | 5 +++++ .../db/migration/V0.0.10__add_principal_staff_id.sql | 3 +++ .../src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml | 1 + 5 files changed, 17 insertions(+) create mode 100644 epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java index 3273372fed..a6ee2e449e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/IcPartyOrgDTO.java @@ -89,6 +89,11 @@ public class IcPartyOrgDTO implements Serializable { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java index e7cab3e965..c518b0ef7e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -30,4 +30,7 @@ public class EditPrincipalFormDTO implements Serializable { */ @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) private String principalMobile; + + @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) + private String principalStaffId; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java index b6404fb481..bc8be3d038 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/entity/IcPartyOrgEntity.java @@ -78,6 +78,11 @@ public class IcPartyOrgEntity extends BaseEpmetEntity { */ private String principal; + /** + * 负责人staffId + */ + private String principalStaffId; + /** * 联系电话 */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql new file mode 100644 index 0000000000..6530fb1923 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql @@ -0,0 +1,3 @@ +ALTER TABLE ic_party_org ADD COLUMN PRINCIPAL_STAFF_ID VARCHAR(32) DEFAULT '' COMMENT '负责人staffId' AFTER PRINCIPAL_MOBILE; +alter table ic_party_org modify PRINCIPAL_MOBILE VARCHAR(30) DEFAULT '' COMMENT '联系方式'; +alter table ic_party_org modify PRINCIPAL VARCHAR(30) DEFAULT '' COMMENT '负责人'; \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml index 5c042f9487..410a074121 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml @@ -30,6 +30,7 @@ update ic_party_org set PRINCIPAL_MOBILE = #{principalMobile}, PRINCIPAL = #{principal}, + PRINCIPAL_STAFF_ID = #{principalStaffId}, UPDATED_TIME = NOW() where id = #{partyOrgId} From aef7cfe939032fba8aebc66fe4025ea9bac48c3a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:06:44 +0800 Subject: [PATCH 201/206] =?UTF-8?q?=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/{V0.0.10__add_principal_staff_id.sql => V0.0.11__add_principal_staff_id.sql} (100%) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql similarity index 100% rename from epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.10__add_principal_staff_id.sql rename to epmet-module/resi-partymember/resi-partymember-server/src/main/resources/db/migration/V0.0.11__add_principal_staff_id.sql From 9924db162a31e3f051cce0e3fb09d7c98e7641dc Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:31:38 +0800 Subject: [PATCH 202/206] emm --- .../src/main/java/com/epmet/dto/result/PersonDataResultDTO.java | 2 ++ .../src/main/resources/mapper/IcResiUserDao.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java index 68ad326637..5e739016b3 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PersonDataResultDTO.java @@ -47,6 +47,8 @@ public class PersonDataResultDTO implements Serializable { * 姓名 */ private String name; + private String mobile; + private String isTenant; /** * 经济状况:包括 月收入：monthlyIncome 和 退休金额：retirementAmount diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index 9373743976..b7a36c0456 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -310,6 +310,8 @@ YSR, TXJE, ID_CARD, + MOBILE, + IS_TENANT, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID From 11a362654f02ca9773a941d6197cfdfe60ba6f27 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 9 Sep 2022 14:45:51 +0800 Subject: [PATCH 203/206] emm --- .../src/main/resources/mapper/IcResiUserDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index b7a36c0456..7cb24ea51e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -296,6 +296,8 @@ + + @@ -311,7 +313,7 @@ TXJE, ID_CARD, MOBILE, - IS_TENANT, + IS_TENANT as isTenant, IFNULL(IS_VOLUNTEER,'0') AS isVolunteer, CUSTOMER_ID, GRID_ID From b21ff5592601751510b3c78a88073bd80965a8d9 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 14 Sep 2022 14:11:54 +0800 Subject: [PATCH 204/206] =?UTF-8?q?=E9=A1=BA=E5=BE=B7=E5=B1=85=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiCollectServiceImpl.java | 25 +++++++++++-------- .../impl/IcResiCollectVisitorServiceImpl.java | 7 +++++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index 0461ce2cba..97c39e04b7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -189,16 +189,21 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl { - if (StringUtils.isNotBlank(item.getFaceImg())) { - VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); - visitor.setIdCard(item.getIdNum()); - visitor.setMobile(item.getMobile()); - visitor.setName(item.getName()); - visitor.setFaceImg(item.getFaceImg()); - dhDeviceUtil.sendAuth(visitor); - } - }); + try { + formDTO.getMemberList().forEach(item -> { + if (StringUtils.isNotBlank(item.getFaceImg())) { + VisitVisitorFormDTO visitor = new VisitVisitorFormDTO(); + visitor.setIdCard(item.getIdNum()); + visitor.setMobile(item.getMobile()); + visitor.setName(item.getName()); + visitor.setFaceImg(item.getFaceImg()); + dhDeviceUtil.sendAuth(visitor); + } + }); + return new Result().ok("今日您可通过人脸设备便捷出入小区，明天及后续进入请再次登记，谢谢！"); + } catch (Exception e) { + return new Result().ok("访客信息登记成功"); + } } return new Result().ok("提交成功"); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java index a73d022548..34c56f8928 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java @@ -165,7 +165,12 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl Date: Wed, 14 Sep 2022 14:22:10 +0800 Subject: [PATCH 205/206] =?UTF-8?q?=E4=B8=8D=E5=86=8D=E6=9C=89=E9=80=80?= =?UTF-8?q?=E5=8D=A1=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/PliPowerService.java | 17 -------- .../service/impl/PliPowerServiceImpl.java | 31 -------------- .../com/epmet/task/PliVisitorLogoutTask.java | 41 ------------------- 3 files changed, 89 deletions(-) delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java deleted file mode 100644 index 4fb990d033..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; - -public interface PliPowerService { - - /** - * 访客登出 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @author zhy - * @date 2022/5/30 10:25 - */ - Result visitorLogout(VisitorLogoutFormDTO formDTO); -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java deleted file mode 100644 index ed54b7e6d9..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.PliPowerFeignClient; -import com.epmet.service.PliPowerService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -/** - * @Description - * @ClassName StatsUserServiceImpl - * @Auth wangc - * @Date 2020-06-29 09:41 - */ -@Service -public class PliPowerServiceImpl implements PliPowerService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerFeignClient pliPowerFeignClient; - - @Override - public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - return pliPowerFeignClient.visitorLogout(formDTO); - } -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java deleted file mode 100644 index 41ffa19ecc..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.service.PliPowerService; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 访客登出 - * - * @author zhy - * @date 2022/5/30 10:23 - */ -@Component("pliVisitorLogoutTask") -public class PliVisitorLogoutTask implements ITask { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerService pliPowerService; - - @Override - public void run(String params) { - logger.info("VisitorLogoutTask定时任务正在执行，参数为：{}", params); - VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); - } - Result result = pliPowerService.visitorLogout(formDTO); - if (result.success()) { - logger.info("VisitorLogoutTask定时任务执行成功"); - } else { - logger.error("VisitorLogoutTask定时任务执行失败:" + result.getMsg()); - } - } -} From 3b0922ef4d53e141f45c3e3a653628115d2e8104 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Wed, 14 Sep 2022 14:27:16 +0800 Subject: [PATCH 206/206] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/epmet-job/epmet-job-server/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 0aaf92db4a..1e0d00c9ba 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -43,11 +43,6 @@ epmet-message-client 2.0.0 - - com.epmet - pli-power-base-client - 2.0.0 - org.springframework.boot spring-boot-starter-web