From 8d379f6a0fefb0c69faadd78f745f772f2a13313 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 14:11:50 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyEventMaintainController.java | 81 +++++++++++++++ .../PartyMemberEventController.java | 42 ++------ .../entity/EventContactSuggestion.java | 12 +++ .../entity/EventMaintainInVO.java | 98 +++++++++++++++++++ .../entity/EventMaintainOutVO.java | 98 +++++++++++++++++++ .../entity/EventPartyQueryOutVO.java | 49 ++++++++++ .../entity/EventQueryInVO.java | 9 +- .../service/EventContactService.java | 2 +- .../service/EventMockDataService.java | 3 + .../service/EventPartyBranchService.java | 3 + .../service/impl/EventContactServiceImpl.java | 3 +- .../impl/EventMockDataServiceImpl.java | 12 +++ .../impl/EventPartyBranchServiceImpl.java | 35 ++++++- .../service/impl/EventStyleServiceImpl.java | 1 + .../service/impl/EventSubjectServiceImpl.java | 54 +++++----- 15 files changed, 437 insertions(+), 65 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainOutVO.java create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyQueryOutVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java new file mode 100644 index 0000000..9094a1f --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java @@ -0,0 +1,81 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.controller; + + +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.*; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; +import java.util.Map; + +@RestController +@Api(tags = "活动运维接口") +@RequestMapping("/v1/eventmaintain") +public class PartyEventMaintainController { + + @Resource + private EventMockDataService eventMockDataService; + @Resource + private EventStyleService eventStyleService; + @Resource + private EventPartyBranchService eventPartyBranchService; + @Resource + private EventSubjectService eventSubjectService; + @Resource + private EventContactService eventContactService; + + + + @ApiOperation("保存联系人") + @PostMapping("/save/contact") + public BaseResponse saveContact(@RequestBody EventContact inVO) { + return BaseResponse.success(eventContactService.saveContact(inVO)); + } + + + @ApiOperation("保存攻坚项目") + @PostMapping("/save/subject") + public BaseResponse saveSubject(@RequestBody EventSubject inVO) { + return BaseResponse.success(eventSubjectService.saveSubject(inVO)); + } + + + @ApiOperation("保存活动风采") + @PostMapping("/save/style") + public BaseResponse saveStyle(@RequestBody EventStyle inVO) { + return BaseResponse.success(eventStyleService.saveStyle(inVO)); + } + + @ApiOperation("保存党支部") + @PostMapping("/save/branch") + public BaseResponse saveBranch(@RequestBody EventPartyBranch inVO) { + return BaseResponse.success(eventPartyBranchService.saveBranch(inVO)); + } + + @ApiOperation("保存党员") + @PostMapping("/save/member") + public BaseResponse saveMember(@RequestBody EventPartyBranch inVO) { + return BaseResponse.success(eventPartyBranchService.saveMember(inVO)); + } + + + @ApiOperation("更新右侧栏数据") + @PostMapping("/save/rightData") + public BaseResponse saveRightData(@RequestBody List list) { + return BaseResponse.success(eventMockDataService.saveRightData(list)); + } + + + @ApiOperation("查询右侧栏数据") + @PostMapping("/query/rightData") + public BaseResponse> queryRightData() { + return BaseResponse.success(eventMockDataService.list()); + } + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index 31f9b0b..a46c941 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -53,8 +53,8 @@ public class PartyMemberEventController { @ApiOperation("活动联系人列表-按公司分组") @GetMapping("/eventContact/group") - public BaseResponse>> getEventContactGroup() { - return BaseResponse.success(eventContactService.getEventContactGroup()); + public BaseResponse>> getEventContactGroup(@RequestParam(value = "param") String param) { + return BaseResponse.success(eventContactService.getEventContactGroup(param)); } @ApiOperation("活动联系人列表") @@ -77,22 +77,27 @@ public class PartyMemberEventController { } - @ApiOperation("党支部列表") + @ApiOperation("省分列表") @GetMapping("/partyBranch/list") public BaseResponse> getPartyBranchList() { return BaseResponse.success(eventPartyBranchService.getPartyBranchList()); } - @ApiOperation("党支部下党员列表") + @ApiOperation("省份下党员列表") @GetMapping("/partyMember/list") public BaseResponse> getPartyMemberList(@RequestParam(value = "belongBranch") String belongBranch) { return BaseResponse.success(eventPartyBranchService.getPartyMemberList(belongBranch)); } + @ApiOperation("省份下党支部列表") + @PostMapping("/provinceBranch/list") + public BaseResponse> getProvinceBranchList(@RequestBody(required = false) EventQueryInVO inVO) { + return BaseResponse.success(eventPartyBranchService.getProvinceBranchList(inVO)); + } @ApiOperation("党员列表模糊查询") @PostMapping("/partyMember/paramQuery") - public BaseResponse> getPartyMemberListByParam(@RequestBody(required = false) EventQueryInVO inVO){ + public BaseResponse> getPartyMemberListByParam(@RequestBody(required = false) EventQueryInVO inVO){ return BaseResponse.success(eventPartyBranchService.getPartyMemberListByParam(inVO)); } @@ -116,31 +121,4 @@ public class PartyMemberEventController { return BaseResponse.success(eventContactService.saveContact(inVO)); } - - @ApiOperation("保存攻坚项目") - @PostMapping("/save/subject") - public BaseResponse saveSubject(@RequestBody EventSubject inVO) { - return BaseResponse.success(eventSubjectService.saveSubject(inVO)); - } - - - @ApiOperation("保存活动风采") - @PostMapping("/save/style") - public BaseResponse saveStyle(@RequestBody EventStyle inVO) { - return BaseResponse.success(eventStyleService.saveStyle(inVO)); - } - - @ApiOperation("保存党支部") - @PostMapping("/save/branch") - public BaseResponse saveBranch(@RequestBody EventPartyBranch inVO) { - return BaseResponse.success(eventPartyBranchService.saveBranch(inVO)); - } - - @ApiOperation("保存党员") - @PostMapping("/save/member") - public BaseResponse saveMember(@RequestBody EventPartyBranch inVO) { - return BaseResponse.success(eventPartyBranchService.saveMember(inVO)); - } - - } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java index b4c8e59..e960c74 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java @@ -57,6 +57,18 @@ public class EventContactSuggestion implements Serializable { @ApiModelProperty(value = "意见内容") private String suggestionContent; + /** + * 补充说明 + */ + @ApiModelProperty(value = "补充说明") + private String instructions; + + /** + * 附件id + */ + @ApiModelProperty(value = "附件id") + private String attachmentImage; + /** * 意见提出人 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java new file mode 100644 index 0000000..4bc0079 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainInVO.java @@ -0,0 +1,98 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * 实体类 EventMaintainInVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class EventMaintainInVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + + + /** + * 类别 + */ + @ApiModelProperty(value = "类别 1-首页，2-活动风采，3-攻坚克难") + private String type; + + /** + * 活动内容正文 + */ + @ApiModelProperty(value = "活动内容正文") + private String content; + + /** + * 活动图片 + */ + @ApiModelProperty(value = "活动图片") + private String image; + + /** + * 显示排序 + */ + @ApiModelProperty(value = "显示排序") + private Integer sort; + + /** + * 是否轮播广告：0-否，1-是 + */ + @ApiModelProperty(value = "是否轮播广告：0-否，1-是") + private String banner; + + /** + * 页面显示状态： 0-隐藏 1-显示 + */ + @ApiModelProperty(value = "页面显示状态： 0-隐藏 1-显示") + private String status; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime createTime; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime sendTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime endTime; +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainOutVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainOutVO.java new file mode 100644 index 0000000..4e2134a --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventMaintainOutVO.java @@ -0,0 +1,98 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.chinaunicom.mall.ebtp.common.config.CustomLocalDateTimeTypeHandler; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; + +/** + * 实体类 EventMaintainOutVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class EventMaintainOutVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 标题 + */ + @ApiModelProperty(value = "标题") + private String title; + + + /** + * 类别 + */ + @ApiModelProperty(value = "类别 1-首页，2-活动风采，3-攻坚克难") + private String type; + + /** + * 活动内容正文 + */ + @ApiModelProperty(value = "活动内容正文") + private String content; + + /** + * 活动图片 + */ + @ApiModelProperty(value = "活动图片") + private String image; + + /** + * 显示排序 + */ + @ApiModelProperty(value = "显示排序") + private Integer sort; + + /** + * 是否轮播广告：0-否，1-是 + */ + @ApiModelProperty(value = "是否轮播广告：0-否，1-是") + private String banner; + + /** + * 页面显示状态： 0-隐藏 1-显示 + */ + @ApiModelProperty(value = "页面显示状态： 0-隐藏 1-显示") + private String status; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime createTime; + + /** + * 发布时间 + */ + @ApiModelProperty(value = "发布时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime sendTime; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) + private java.time.LocalDateTime endTime; +} + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyQueryOutVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyQueryOutVO.java new file mode 100644 index 0000000..4ffd4b3 --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyQueryOutVO.java @@ -0,0 +1,49 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 EventPartyQueryOutVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@Builder +public class EventPartyQueryOutVO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 党支部编码 + */ + @ApiModelProperty(value = "党支部编码") + private String branchCode; + + + /** + * 所属党支部 + */ + @ApiModelProperty(value = "所属党支部") + private String belongBranch; + + /** + * 所属党支部名称 + */ + @ApiModelProperty(value = "所属党支部名称") + private String belongBranchName; + + + /** + * 党员数量 + */ + @ApiModelProperty(value = "党员数量") + private Integer count; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java index 23b882c..ec4b504 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java @@ -20,15 +20,20 @@ public class EventQueryInVO implements Serializable { private static final long serialVersionUID = 1L; /** - * 数量 + * 党支部编码 */ @ApiModelProperty(value = "党支部编码") private String belongBranch; /** - * 名称 + * 参数 */ @ApiModelProperty(value = "参数") private String param; + /** + * 所属党支部名称 + */ + @ApiModelProperty(value = "所属党支部名称") + private String branchName; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java index dab913d..cf59738 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java @@ -15,7 +15,7 @@ public interface EventContactService extends IService{ - Map> getEventContactGroup(); + Map> getEventContactGroup(String param); List getEventContactList(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java index d2cbd7e..8b407d8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java @@ -14,4 +14,7 @@ public interface EventMockDataService extends IService{ List getProfessionalDataList(); + + boolean saveRightData(List list); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java index 6a402be..73a3f1f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventPartyBranchService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyQueryOutVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; @@ -29,4 +30,6 @@ public interface EventPartyBranchService extends IService{ boolean saveBranch(EventPartyBranch inVO); boolean saveMember(EventPartyBranch inVO); + + List getProvinceBranchList(EventQueryInVO inVO); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index 5890462..d7ba32f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -25,9 +25,10 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup() { + public Map> getEventContactGroup(String param) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventContact::getStatus, "1"); + query.eq(EventContact::getContactUnit, param); return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList())); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index cef7be9..5d24f76 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -56,4 +56,16 @@ public class EventMockDataServiceImpl extends ServiceImpl list) { + List collect = list.stream().map(EventMockData::getDataPy).collect(Collectors.toList()); + Map map = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, EventMockData::getDataValue, (o1,o2) -> o2)); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + query.in(EventMockData::getDataPy, collect); + List dataList = this.list(query); + dataList.forEach(l -> l.setDataValue(map.get(l.getDataPy()))); + + return this.saveOrUpdateBatch(dataList); + } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 3ce0bce..43ffe82 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventPartyBranchMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyBranch; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventPartyQueryOutVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.enums.PartyEventExceptionEnum; @@ -38,6 +39,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl returnList = new ArrayList<>(); list.forEach(f -> returnList.add(MockDataValue.builder().name(f.getContactName()).text(f.getEventDeclaration()).build())); + Collections.shuffle(returnList); return returnList; } @@ -92,7 +94,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getPartyMemberList(String belongBranch) { LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); - queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").eq(EventPartyBranch::getBelongBranch, belongBranch); + queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1").eq(EventPartyBranch::getBranchCode, belongBranch); return this.list(queryMember); } @@ -101,7 +103,10 @@ public class EventPartyBranchServiceImpl extends ServiceImpl queryMember = Wrappers.lambdaQuery(); if (ObjectUtil.isNotNull(inVO)) { if (StrUtil.isNotBlank(inVO.getBelongBranch())) { - queryMember.eq(EventPartyBranch::getBelongBranch, inVO.getBelongBranch()); + queryMember.eq(EventPartyBranch::getBranchCode, inVO.getBelongBranch()); + } + if (StrUtil.isNotBlank(inVO.getBranchName())) { + queryMember.eq(EventPartyBranch::getBranchName, inVO.getBranchName()); } if (StrUtil.isNotBlank(inVO.getParam())) { queryMember.and(w -> w.like(EventPartyBranch::getContactName, inVO.getParam()) @@ -149,5 +154,31 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getProvinceBranchList(EventQueryInVO inVO) { + List returnList = new ArrayList<>(); + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + if (ObjectUtil.isNull(inVO)) { + return new ArrayList<>(); + } + if (StrUtil.isNotBlank(inVO.getBelongBranch())) { + query.eq(EventPartyBranch::getBranchCode, inVO.getBelongBranch()); + } + if (StrUtil.isNotBlank(inVO.getBranchName())) { + query.eq(EventPartyBranch::getBranchName, inVO.getBranchName()); + } + + query.eq(EventPartyBranch::getType, "2") + .eq(EventPartyBranch::getStatus, "1"); + + List list = this.list(query); + List nameList = list.stream().map(EventPartyBranch::getBelongBranchName).distinct().collect(Collectors.toList()); + Map> collect = list.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranchName)); + Map nameMap = list.stream().collect(Collectors.toMap(EventPartyBranch::getBelongBranchName, EventPartyBranch::getBranchCode, (o1, o2) -> o1)); + nameList.forEach(n -> returnList.add(EventPartyQueryOutVO.builder().belongBranchName(n).count(collect.get(n).size()).branchCode(nameMap.get(n)).build())); + + return returnList; + } + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 659a7fc..37ef2fd 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -32,6 +32,7 @@ public class EventStyleServiceImpl extends ServiceImpl list = this.list(query); - List subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList()); - List teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList()); - List teamMemberIdList = new ArrayList<>(); - list.forEach(f -> teamMemberIdList.addAll(Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()))); + query.orderByDesc(EventSubject::getCreateTime); +// List list = this.list(query); +// List subjectIdList = list.stream().map(EventSubject::getId).collect(Collectors.toList()); +// List teamLeaderIdList = list.stream().map(EventSubject::getTeamLeader).distinct().collect(Collectors.toList()); +// List teamMemberIdList = new ArrayList<>(); +// list.forEach(f -> teamMemberIdList.addAll(Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()))); - LambdaQueryWrapper querySubjectTime = Wrappers.lambdaQuery(); - querySubjectTime.eq(EventSubjectTime::getStatus, "1").in(EventSubjectTime::getSubjectId, subjectIdList); - List subjectTimeList = eventSubjectTimeService.list(querySubjectTime); - Map> timeMap = subjectTimeList.stream().collect(Collectors.groupingBy(EventSubjectTime::getSubjectId)); +// LambdaQueryWrapper querySubjectTime = Wrappers.lambdaQuery(); +// querySubjectTime.eq(EventSubjectTime::getStatus, "1").in(EventSubjectTime::getSubjectId, subjectIdList); +// List subjectTimeList = eventSubjectTimeService.list(querySubjectTime); +// Map> timeMap = subjectTimeList.stream().collect(Collectors.groupingBy(EventSubjectTime::getSubjectId)); +// +// List eventContacts = contactService.listByIds(teamLeaderIdList); +// Map leaderMap = eventContacts.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); +// +// LambdaQueryWrapper contactLambdaQuery = new LambdaQueryWrapper<>(); +// contactLambdaQuery.eq(EventContact::getStatus, "1").in(EventContact::getId, teamMemberIdList.stream().distinct().collect(Collectors.toList())); +// List eventContactList = contactService.list(contactLambdaQuery); +// Map eventContactMap = eventContactList.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); +// list.forEach(f -> { +// List contactList = new ArrayList<>(); +// List collect = Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()); +// collect.forEach(c -> contactList.add(eventContactMap.get(c))); +// f.setTeamMenberInfo(contactList); +// f.setSubjectTimeList(timeMap.get(f.getId())); +// f.setTeamLeaderInfo(leaderMap.get(f.getTeamLeader())); +// }); - List eventContacts = contactService.listByIds(teamLeaderIdList); - Map leaderMap = eventContacts.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); - - LambdaQueryWrapper contactLambdaQuery = new LambdaQueryWrapper<>(); - contactLambdaQuery.eq(EventContact::getStatus, "1").in(EventContact::getId, teamMemberIdList.stream().distinct().collect(Collectors.toList())); - List eventContactList = contactService.list(contactLambdaQuery); - Map eventContactMap = eventContactList.stream().collect(Collectors.toMap(EventContact::getId, Function.identity())); - list.forEach(f -> { - List contactList = new ArrayList<>(); - List collect = Stream.of(f.getTeamMenber().split(",")).collect(Collectors.toList()); - collect.forEach(c -> contactList.add(eventContactMap.get(c))); - f.setTeamMenberInfo(contactList); - f.setSubjectTimeList(timeMap.get(f.getId())); - f.setTeamLeaderInfo(leaderMap.get(f.getTeamLeader())); - }); - - return list; + return this.list(query); } @Override From ce49b21258913e6cafa6f9a4666c43f5ccabffc5 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 14:28:49 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventPartyBranchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 43ffe82..1d7e3ef 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -106,7 +106,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl w.like(EventPartyBranch::getContactName, inVO.getParam()) From 2b9324210caabcb591a27dee448331066dbfda98 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 14:40:06 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E5=85=9A=E6=94=AF=E9=83=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventPartyBranchServiceImpl.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 1d7e3ef..686054b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -168,6 +168,10 @@ public class EventPartyBranchServiceImpl extends ServiceImpl Date: Wed, 6 Jul 2022 15:46:51 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AE=E5=85=9A=E6=94=AF=E9=83=A8=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PartyEventMaintainController.java | 8 +-- .../PartyMemberEventController.java | 2 +- .../entity/EventPartyBranch.java | 4 +- .../entity/EventQueryInVO.java | 6 ++ .../entity/EventRightDataVO.java | 42 ++++++++++++++ .../service/EventMockDataService.java | 4 +- .../service/impl/EventContactServiceImpl.java | 4 +- .../impl/EventMockDataServiceImpl.java | 56 ++++++++++++++++--- .../impl/EventPartyBranchServiceImpl.java | 4 +- 9 files changed, 112 insertions(+), 18 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java index 9094a1f..fa5852e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyEventMaintainController.java @@ -66,15 +66,15 @@ public class PartyEventMaintainController { @ApiOperation("更新右侧栏数据") @PostMapping("/save/rightData") - public BaseResponse saveRightData(@RequestBody List list) { - return BaseResponse.success(eventMockDataService.saveRightData(list)); + public BaseResponse saveRightData(@RequestBody EventRightDataVO inVO) { + return BaseResponse.success(eventMockDataService.saveRightData(inVO)); } @ApiOperation("查询右侧栏数据") @PostMapping("/query/rightData") - public BaseResponse> queryRightData() { - return BaseResponse.success(eventMockDataService.list()); + public BaseResponse queryRightData() { + return BaseResponse.success(eventMockDataService.queryRightData()); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index a46c941..25d1ea3 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -53,7 +53,7 @@ public class PartyMemberEventController { @ApiOperation("活动联系人列表-按公司分组") @GetMapping("/eventContact/group") - public BaseResponse>> getEventContactGroup(@RequestParam(value = "param") String param) { + public BaseResponse>> getEventContactGroup(@RequestParam(value = "param", required = false) String param) { return BaseResponse.success(eventContactService.getEventContactGroup(param)); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java index 6571b3f..6682614 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java @@ -36,13 +36,13 @@ public class EventPartyBranch implements Serializable { /** * 党支部编码 */ - @ApiModelProperty(value = "党支部编码") + @ApiModelProperty(value = "省编码") private String branchCode; /** * 党支部名称 */ - @ApiModelProperty(value = "党支部名称") + @ApiModelProperty(value = "省名称") private String branchName; /** diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java index ec4b504..c834196 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventQueryInVO.java @@ -35,5 +35,11 @@ public class EventQueryInVO implements Serializable { * 所属党支部名称 */ @ApiModelProperty(value = "所属党支部名称") + private String belongBranchName; + + /** + * 所属省名称 + */ + @ApiModelProperty(value = "所属省名称") private String branchName; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java new file mode 100644 index 0000000..e5a444c --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventRightDataVO.java @@ -0,0 +1,42 @@ +package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 EventRightDataOutVO + * + * @auto.generated + */ +@Data +@Accessors(chain = true) +@ApiModel +public class EventRightDataVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "订单交易总额") + private String ddjyze; + @ApiModelProperty(value = "订单总数量") + private String ddzsl; + @ApiModelProperty(value = "商品数量") + private String spsl; + @ApiModelProperty(value = "协议数量") + private String xysl; + @ApiModelProperty(value = "一线调研") + private String yxdy; + @ApiModelProperty(value = "访谈人数") + private String ftrs; + @ApiModelProperty(value = "保障需求") + private String bzxq; + @ApiModelProperty(value = "攻坚克难项目") + private String gjknxm; + +} + + diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java index 8b407d8..e92c5b6 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventMockDataService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO; import java.util.List; @@ -15,6 +16,7 @@ public interface EventMockDataService extends IService{ List getProfessionalDataList(); - boolean saveRightData(List list); + boolean saveRightData(EventRightDataVO inVO); + EventRightDataVO queryRightData(); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index d7ba32f..9a5a103 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -28,7 +28,9 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup(String param) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventContact::getStatus, "1"); - query.eq(EventContact::getContactUnit, param); + if (StrUtil.isNotBlank(param)) { + query.eq(EventContact::getContactUnit, param); + } return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList())); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java index 5d24f76..9c387ff 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventMockDataServiceImpl.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventMockDataMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventMockData; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventRightDataVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.MockDataValue; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventMockDataService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventPartyBranchService; @@ -17,6 +18,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -58,14 +60,54 @@ public class EventMockDataServiceImpl extends ServiceImpl list) { - List collect = list.stream().map(EventMockData::getDataPy).collect(Collectors.toList()); - Map map = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, EventMockData::getDataValue, (o1,o2) -> o2)); + public boolean saveRightData(EventRightDataVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); - query.in(EventMockData::getDataPy, collect); - List dataList = this.list(query); - dataList.forEach(l -> l.setDataValue(map.get(l.getDataPy()))); + List list = this.list(query.eq(EventMockData::getStatus, "1")); + list.forEach(l -> { + String dataPy = l.getDataPy(); + if ("ddjyze".equals(dataPy)) { + l.setDataValue(inVO.getDdjyze()); + } + if ("ddzsl".equals(dataPy)) { + l.setDataValue(inVO.getDdzsl()); + } + if ("spsl".equals(dataPy)) { + l.setDataValue(inVO.getSpsl()); + } + if ("xysl".equals(dataPy)) { + l.setDataValue(inVO.getXysl()); + } + if ("yxdy".equals(dataPy)) { + l.setDataValue(inVO.getYxdy()); + } + if ("ftrs".equals(dataPy)) { + l.setDataValue(inVO.getFtrs()); + } + if ("bzxq".equals(dataPy)) { + l.setDataValue(inVO.getBzxq()); + } + if ("gjknxm".equals(dataPy)) { + l.setDataValue(inVO.getGjknxm()); + } + }); + return this.saveOrUpdateBatch(list); + } - return this.saveOrUpdateBatch(dataList); + @Override + public EventRightDataVO queryRightData() { + LambdaQueryWrapper query = Wrappers.lambdaQuery(); + List list = this.list(query.eq(EventMockData::getStatus, "1")); + Map dataMap = list.stream().collect(Collectors.toMap(EventMockData::getDataPy, Function.identity())); + EventRightDataVO dataVO = new EventRightDataVO(); + dataVO.setDdjyze(dataMap.get("ddjyze").getDataValue()); + dataVO.setDdzsl(dataMap.get("ddzsl").getDataValue()); + dataVO.setSpsl(dataMap.get("spsl").getDataValue()); + dataVO.setXysl(dataMap.get("xysl").getDataValue()); + dataVO.setYxdy(dataMap.get("yxdy").getDataValue()); + dataVO.setFtrs(dataMap.get("ftrs").getDataValue()); + dataVO.setBzxq(dataMap.get("bzxq").getDataValue()); + dataVO.setGjknxm(dataMap.get("gjknxm").getDataValue()); + + return dataVO; } } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 686054b..f9898b5 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -105,8 +105,8 @@ public class EventPartyBranchServiceImpl extends ServiceImpl w.like(EventPartyBranch::getContactName, inVO.getParam()) From 65d77640b5951ff34ecbaa0d5c5a919d509c266d Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 16:21:24 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feign/client/DocumentCenterService.java | 13 +++++++++ .../DocumentCenterServiceFallbackImpl.java | 10 +++++++ .../extend/feign/entity/DocumentDataVO.java | 27 +++++++++++++++++++ .../PartyMemberEventController.java | 6 ++--- .../partyMemberEvent/entity/EventStyle.java | 7 ++++- .../service/EventContactService.java | 3 ++- .../service/impl/EventContactServiceImpl.java | 8 +++--- .../service/impl/EventStyleServiceImpl.java | 18 +++++++++++-- 8 files changed, 82 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java index 104406c..6c0e0ea 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java @@ -1,11 +1,14 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory; +import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; +import java.util.List; + /** * 连接山分的文档中心服务 * @@ -34,4 +37,14 @@ public interface DocumentCenterService { @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/downloadStream") String getFileObjectDetail(@RequestParam("fileId") String fileId); + /** + * 统计查询 sys_storage表中数据 + * + * @param list + * @return + */ + @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") + List queryReturn(@RequestParam("objectIdList") List list); + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java index 4a3ffd2..5594aae 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java @@ -1,10 +1,13 @@ package com.chinaunicom.mall.ebtp.extend.feign.client.fallback; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.util.List; + /** * 熔断 * @@ -27,4 +30,11 @@ public class DocumentCenterServiceFallbackImpl implements DocumentCenterService public String getFileObjectDetail(String fileId) { return null; } + + @Override + public List queryReturn(List list) { + return null; + } + + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java new file mode 100644 index 0000000..9427e0d --- /dev/null +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/entity/DocumentDataVO.java @@ -0,0 +1,27 @@ +package com.chinaunicom.mall.ebtp.extend.feign.entity; + +import lombok.Data; +import lombok.experimental.Accessors; + +import java.io.Serializable; + +/** + * 实体类 DocumentDataVO + * + * @author yss + */ +@Data +@Accessors(chain = true) +public class DocumentDataVO implements Serializable { + + private static final long serialVersionUID = 1L; + + + private String fileId; + private String objectId; + private String originalName; + private String filePath; + private String fileSize; + + +} diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java index 25d1ea3..a310929 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/controller/PartyMemberEventController.java @@ -52,9 +52,9 @@ public class PartyMemberEventController { @ApiOperation("活动联系人列表-按公司分组") - @GetMapping("/eventContact/group") - public BaseResponse>> getEventContactGroup(@RequestParam(value = "param", required = false) String param) { - return BaseResponse.success(eventContactService.getEventContactGroup(param)); + @PostMapping("/eventContact/group") + public BaseResponse>> getEventContactGroup(@RequestBody(required = false) EventQueryInVO inVO) { + return BaseResponse.success(eventContactService.getEventContactGroup(inVO)); } @ApiOperation("活动联系人列表") diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java index 38340c5..3f96ac1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventStyle.java @@ -111,5 +111,10 @@ public class EventStyle implements Serializable { @TableField(typeHandler = CustomLocalDateTimeTypeHandler.class) private java.time.LocalDateTime sendTime; - + /** + * 文件地址 + */ + @ApiModelProperty(value = "文件地址") + @TableField(exist = false) + private String filePath; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java index cf59738..fa7903d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/EventContactService.java @@ -2,6 +2,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service; import com.baomidou.mybatisplus.extension.service.IService; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import java.util.List; import java.util.Map; @@ -15,7 +16,7 @@ public interface EventContactService extends IService{ - Map> getEventContactGroup(String param); + Map> getEventContactGroup(EventQueryInVO inVO); List getEventContactList(); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java index 9a5a103..27a318d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventContactMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventContact; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventContactService; import org.springframework.stereotype.Service; @@ -25,11 +27,11 @@ public class EventContactServiceImpl extends ServiceImpl> getEventContactGroup(String param) { + public Map> getEventContactGroup(EventQueryInVO inVO) { LambdaQueryWrapper query = Wrappers.lambdaQuery(); query.eq(EventContact::getStatus, "1"); - if (StrUtil.isNotBlank(param)) { - query.eq(EventContact::getContactUnit, param); + if (ObjectUtil.isNotNull(inVO) && StrUtil.isNotBlank(inVO.getParam())) { + query.eq(EventContact::getContactUnit, inVO.getParam()); } return this.list(query).stream().sorted(Comparator.comparing(EventContact::getSort)).collect(Collectors.groupingBy(EventContact::getContactUnit,LinkedHashMap::new,Collectors.toList())); } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 37ef2fd..a443f67 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; +import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; +import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventStyleMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; @@ -14,8 +16,12 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleServi import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import javax.annotation.Resource; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** * 对数据表 event_style 操作的 serviceImpl @@ -25,6 +31,8 @@ import java.util.List; @Service public class EventStyleServiceImpl extends ServiceImpl implements EventStyleService { + @Resource + private DocumentCenterService documentCenterService; @Override public List getEventStyle(String type, EventQueryInVO inVO) { @@ -33,13 +41,19 @@ public class EventStyleServiceImpl extends ServiceImpl list; if ("banner".equals(type)) { query.eq(EventStyle::getBanner, "1").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); - return this.list(query); } else { query.eq(EventStyle::getBanner, "0").eq(EventStyle::getStatus, "1").orderByAsc(EventStyle::getSort); - return this.list(query); } + list = this.list(query); + List imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); + List queryReturn = documentCenterService.queryReturn(imageIdList); + Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, DocumentDataVO::getFilePath)); + + list.forEach(l -> l.setFilePath(collect.get(l.getImage()))); + return list; } @Override From 750abad4c8d69006df2ffd7ab186fd9dd3bfd507 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 16:39:35 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventStyleServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index a443f67..81020ab 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -4,8 +4,8 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; @@ -13,14 +13,14 @@ import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventStyleMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import javax.annotation.Resource; import java.time.LocalDateTime; -import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -28,6 +28,7 @@ import java.util.stream.Collectors; * @author Auto create * */ +@Slf4j @Service public class EventStyleServiceImpl extends ServiceImpl implements EventStyleService { @@ -50,9 +51,10 @@ public class EventStyleServiceImpl extends ServiceImpl imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); List queryReturn = documentCenterService.queryReturn(imageIdList); - Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, DocumentDataVO::getFilePath)); + log.info("文档中心返回：{}", queryReturn.toString()); + Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); - list.forEach(l -> l.setFilePath(collect.get(l.getImage()))); + list.forEach(l -> l.setFilePath(collect.get(l.getImage()).getFilePath())); return list; } From 2f58710bce4abff278b14aa53f1a941e79e7a04d Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 16:46:13 +0800 Subject: [PATCH 07/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ebtp/extend/feign/client/DocumentCenterService.java | 4 +++- .../client/fallback/DocumentCenterServiceFallbackImpl.java | 3 ++- .../partyMemberEvent/enums/PartyEventExceptionEnum.java | 1 + .../service/impl/EventStyleServiceImpl.java | 7 +++++-- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java index 6c0e0ea..418f86f 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.feign.client; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import org.springframework.cloud.openfeign.FeignClient; @@ -44,7 +45,8 @@ public interface DocumentCenterService { * @return */ @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") - List queryReturn(@RequestParam("objectIdList") List list); + BaseResponse> queryReturn(@RequestParam("objectIdList") List list); + } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java index 5594aae..626e93e 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/fallback/DocumentCenterServiceFallbackImpl.java @@ -1,5 +1,6 @@ package com.chinaunicom.mall.ebtp.extend.feign.client.fallback; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import lombok.Setter; @@ -32,7 +33,7 @@ public class DocumentCenterServiceFallbackImpl implements DocumentCenterService } @Override - public List queryReturn(List list) { + public BaseResponse> queryReturn(List list) { return null; } diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java index 11364ba..da7d85b 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/enums/PartyEventExceptionEnum.java @@ -11,6 +11,7 @@ public enum PartyEventExceptionEnum implements BusinessExceptionAssert { * 没有党支部信息 */ FRAME_EXCEPTION_NO_BRANCH_INFO_FAIL(2200001, "没有党支部信息！"), + FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL(2200002, "文档中心异常！"), diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 81020ab..f13f984 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -6,12 +6,14 @@ import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; import com.chinaunicom.mall.ebtp.extend.feign.client.DocumentCenterService; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.dao.EventStyleMapper; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventQueryInVO; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.entity.EventStyle; +import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.enums.PartyEventExceptionEnum; import com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.EventStyleService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -50,9 +52,10 @@ public class EventStyleServiceImpl extends ServiceImpl imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); - List queryReturn = documentCenterService.queryReturn(imageIdList); + BaseResponse> queryReturn = documentCenterService.queryReturn(imageIdList); + PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); log.info("文档中心返回：{}", queryReturn.toString()); - Map collect = queryReturn.stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); + Map collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); list.forEach(l -> l.setFilePath(collect.get(l.getImage()).getFilePath())); return list; From cc69c73b7822c3fdff4fa7d4ad3f0fc90e0bbf5a Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Wed, 6 Jul 2022 17:06:34 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/ebtp/extend/feign/client/DocumentCenterService.java | 3 ++- .../partyMemberEvent/service/impl/EventStyleServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java index 418f86f..10ef257 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/feign/client/DocumentCenterService.java @@ -4,6 +4,7 @@ import com.chinaunicom.mall.ebtp.common.base.entity.BaseResponse; import com.chinaunicom.mall.ebtp.extend.feign.client.factory.DocumentCenterServiceFallbackFactory; import com.chinaunicom.mall.ebtp.extend.feign.entity.DocumentDataVO; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -45,7 +46,7 @@ public interface DocumentCenterService { * @return */ @RequestMapping(method = RequestMethod.POST, value = "v1.0/files/queryReturn") - BaseResponse> queryReturn(@RequestParam("objectIdList") List list); + BaseResponse> queryReturn(@RequestBody List list); diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index f13f984..657d14d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -53,8 +53,8 @@ public class EventStyleServiceImpl extends ServiceImpl imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); BaseResponse> queryReturn = documentCenterService.queryReturn(imageIdList); - PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); log.info("文档中心返回：{}", queryReturn.toString()); + PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); Map collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); list.forEach(l -> l.setFilePath(collect.get(l.getImage()).getFilePath())); From f3fe12a8eabf5eb932a33766af90adcb520c45e3 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Thu, 7 Jul 2022 08:44:33 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=96=87=E6=A1=A3=E4=B8=AD=E5=BF=83=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventStyleServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java index 657d14d..00cb293 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventStyleServiceImpl.java @@ -51,13 +51,13 @@ public class EventStyleServiceImpl extends ServiceImpl imageIdList = list.stream().map(EventStyle::getImage).collect(Collectors.toList()); + List imageIdList = list.stream().map(EventStyle::getImage).distinct().collect(Collectors.toList()); BaseResponse> queryReturn = documentCenterService.queryReturn(imageIdList); log.info("文档中心返回：{}", queryReturn.toString()); PartyEventExceptionEnum.FRAME_EXCEPTION_NO_IMAGE_INFO_FAIL.customValid(!queryReturn.isSuccess()); - Map collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity())); + Map collect = queryReturn.getData().stream().collect(Collectors.toMap(DocumentDataVO::getObjectId, Function.identity(),(o1,o2) -> o1)); - list.forEach(l -> l.setFilePath(collect.get(l.getImage()).getFilePath())); + list.forEach(l -> l.setFilePath(collect.get(l.getImage()) == null ? "" : collect.get(l.getImage()).getFilePath())); return list; } From ad82983e67d70e6e066ce27c38845718d965e269 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Thu, 7 Jul 2022 14:30:12 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=20=E6=89=80=E5=B1=9E=E5=85=9A=E6=94=AF=E9=83=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventPartyBranchServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index f9898b5..401751d 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -106,7 +106,7 @@ public class EventPartyBranchServiceImpl extends ServiceImpl w.like(EventPartyBranch::getContactName, inVO.getParam()) From cadd2785ac0085b4d135191a341169db33f2e774 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Fri, 8 Jul 2022 16:12:45 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=8F=90=E6=84=8F=E8=A7=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=85=AC=E5=8F=B8=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyMemberEvent/entity/EventContactSuggestion.java | 6 ++++++ .../service/impl/EventContactSuggestionServiceImpl.java | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java index e960c74..cca10c1 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventContactSuggestion.java @@ -88,6 +88,12 @@ public class EventContactSuggestion implements Serializable { @ApiModelProperty(value = "意见提出人组织机构") private String suggestionSponsorUnit; + /** + * 意见提出人公司 + */ + @ApiModelProperty(value = "意见提出人公司") + private String company; + /** * 备注 */ diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java index d8d923e..7ce1a54 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventContactSuggestionServiceImpl.java @@ -1,6 +1,7 @@ package com.chinaunicom.mall.ebtp.extend.partyMemberEvent.service.impl; +import cn.hutool.core.util.StrUtil; import com.chinaunicom.mall.ebtp.common.base.entity.BaseCacheUser; import com.chinaunicom.mall.ebtp.common.base.service.IBaseCacheUserService; import com.chinaunicom.mall.ebtp.common.util.PropertyUtils; @@ -32,6 +33,9 @@ public class EventContactSuggestionServiceImpl extends ServiceImpl