From 5b07a68a6990b8e492f88dd4d46b3c2b4ef9daca Mon Sep 17 00:00:00 2001 From: chuang <994001556@qq.com> Date: Sat, 18 Mar 2023 13:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=A1=A3=E6=A1=88=20?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomerVOServiceImpl.java | 15 +-- .../controller/MessageCenterController.java | 39 +++++++- .../entity/MessageCenterEntity.java | 10 +- .../service/MessageCenterService.java | 4 + .../impl/MessageCenterServiceImpl.java | 98 +++++++++++++++++++ .../service/impl/SupplierServiceImpl.java | 17 +++- .../model/vehicle/VehiclePagination.java | 6 +- .../service/impl/VehicleServiceImpl.java | 16 +-- 8 files changed, 182 insertions(+), 23 deletions(-) diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java index ce9895b7..6f42eb15 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/customer/service/impl/CustomerVOServiceImpl.java @@ -120,12 +120,15 @@ public class CustomerVOServiceImpl extends ServiceImpl listVO = JsonUtil.getJsonToList(list, MessageCenterListVO.class); for (MessageCenterListVO messageCenterVO : listVO) { } + PageListVO vo = new PageListVO(); + vo.setList(listVO); + PaginationVO page = JsonUtil.getJsonToBean(messageCenterPagination, PaginationVO.class); + vo.setPagination(page); + return ActionResult.success(vo); + } - + /** + * 列表 + * + * @param messageCenterPagination + * @return + */ + @PostMapping("/getMobileList") + @ApiOperation("消息列表") + public ActionResult Mobilelist(@RequestBody MessageCenterPagination messageCenterPagination) throws IOException { + List list = messageCenterService.getMobileList(messageCenterPagination); + //处理id字段转名称，若无需转或者为空可删除 + /* for (MessageCenterEntity entity : list) { + entity.setCreatorUserId(generaterSwapUtil.userSelectValue(entity.getCreatorUserId())); + entity.setLastModifyUserId(generaterSwapUtil.userSelectValue(entity.getLastModifyUserId())); + entity.setOrgnizeId(generaterSwapUtil.comSelectValue(entity.getOrgnizeId(), "last")); + entity.setDepartmentId(generaterSwapUtil.posSelectValue(entity.getDepartmentId())); + }*/ + List listVO = JsonUtil.getJsonToList(list, MessageCenterListVO.class); + /* for (MessageCenterListVO messageCenterVO : listVO) { + }*/ PageListVO vo = new PageListVO(); vo.setList(listVO); PaginationVO page = JsonUtil.getJsonToBean(messageCenterPagination, PaginationVO.class); @@ -131,6 +156,18 @@ public class MessageCenterController { return ActionResult.success(vo); } + /** + * 根据id更新信息状态为已读 + * @param id + * @return + */ + @GetMapping("/isRead") + public ActionResult isRead(List id){ + + messageCenterService.idRead(id); + return ActionResult.success("更改状态成功"); + } + /** * 表单信息(详情页) * diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/entity/MessageCenterEntity.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/entity/MessageCenterEntity.java index 492937cc..dfc82d1f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/entity/MessageCenterEntity.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/entity/MessageCenterEntity.java @@ -17,7 +17,7 @@ import java.util.Date; * @日期： 2023-03-10 */ @Data -@TableName("jg_message") +@TableName(value = "jg_message", autoResultMap = true ) public class MessageCenterEntity { @TableId("ID") @@ -30,6 +30,7 @@ public class MessageCenterEntity { private String creatorUserName; @TableField("CREATOR_TIME") + private Date creatorTime; @TableField("LAST_MODIFY_USER_ID") @@ -65,8 +66,11 @@ public class MessageCenterEntity { @TableField("HEAD") private String head; - @TableField("CONTEXT") - private String context; + + + + @TableField("context") + private String context; @TableField("SKIP_URL") private String skipUrl; diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java index fe55ba98..40d5ec1b 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/MessageCenterService.java @@ -28,6 +28,10 @@ public interface MessageCenterService extends IService { boolean update(String id, MessageCenterEntity entity); + List getMobileList(MessageCenterPagination messageCenterPagination); + + void idRead(List id); + // 子表方法 //列表子表数据方法 diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java index 0353af09..623a60a5 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/messageCenter/service/impl/MessageCenterServiceImpl.java @@ -226,6 +226,104 @@ public class MessageCenterServiceImpl extends ServiceImpl getMobileList(MessageCenterPagination messageCenterPagination) { + String userId = userProvider.get().getUserId(); + List AllIdList = new ArrayList(); + int total = 0; + int messageCenterNum = 0; + QueryWrapper messageCenterQueryWrapper = new QueryWrapper<>(); + boolean pcPermission = true; + boolean appPermission = true; + boolean isPc = ServletUtil.getHeader("jnpf-origin").equals("pc"); + if (isPc && pcPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object messageCenterObj = authorizeService.getCondition(new AuthorizeConditionModel(messageCenterQueryWrapper, messageCenterPagination.getMenuId(), "jg_material")); + if (ObjectUtil.isEmpty(messageCenterObj)) { + return new ArrayList<>(); + } else { + messageCenterQueryWrapper = (QueryWrapper) messageCenterObj; + messageCenterNum++; + } + } + } + if (!isPc && appPermission) { + if (!userProvider.get().getIsAdministrator()) { + Object messageCenterObj = authorizeService.getCondition(new AuthorizeConditionModel(messageCenterQueryWrapper, messageCenterPagination.getMenuId(), "jg_material")); + if (ObjectUtil.isEmpty(messageCenterObj)) { + return new ArrayList<>(); + } else { + messageCenterQueryWrapper = (QueryWrapper) messageCenterObj; + messageCenterNum++; + } + + + } + } + if (StringUtil.isNotEmpty(messageCenterPagination.getTitle())) { + messageCenterNum++; + messageCenterQueryWrapper.lambda().like(MessageCenterEntity::getTitle, messageCenterPagination.getTitle()); + } + + if (StringUtil.isNotEmpty(messageCenterPagination.getHead())) { + messageCenterNum++; + messageCenterQueryWrapper.lambda().like(MessageCenterEntity::getHead, messageCenterPagination.getHead()); + } + + if (StringUtil.isNotEmpty(messageCenterPagination.getIsRead())) { + messageCenterNum++; + messageCenterQueryWrapper.lambda().eq(MessageCenterEntity::getIsRead, messageCenterPagination.getIsRead()); + } + + if (StringUtil.isNotEmpty(messageCenterPagination.getContext())) { + messageCenterNum++; + messageCenterQueryWrapper.lambda().like(MessageCenterEntity::getContext, messageCenterPagination.getContext()); + } + + if (AllIdList.size() > 0) { + messageCenterQueryWrapper.lambda().in(MessageCenterEntity::getId, AllIdList); + } + //排序 + if (StringUtil.isEmpty(messageCenterPagination.getSidx())) { + messageCenterQueryWrapper.lambda().orderByDesc(MessageCenterEntity::getId); + } else { + try { + String sidx = messageCenterPagination.getSidx(); + MessageCenterEntity messageCenterEntity = new MessageCenterEntity(); + Field declaredField = messageCenterEntity.getClass().getDeclaredField(sidx); + declaredField.setAccessible(true); + String value = declaredField.getAnnotation(TableField.class).value(); + messageCenterQueryWrapper = "asc".equals(messageCenterPagination.getSort().toLowerCase()) ? messageCenterQueryWrapper.orderByAsc(value) : messageCenterQueryWrapper.orderByDesc(value); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + } + if ((total > 0 && AllIdList.size() > 0) || total == 0) { + Page page = new Page<>(messageCenterPagination.getCurrentPage(), messageCenterPagination.getPageSize()); + messageCenterQueryWrapper.lambda().eq(MessageCenterEntity::getIsRead,"0"); + messageCenterQueryWrapper.orderByDesc("CREATOR_TIME"); + IPage userIPage = this.page(page, messageCenterQueryWrapper); + return messageCenterPagination.setData(userIPage.getRecords(), userIPage.getTotal()); + } else { + List list = new ArrayList(); + return messageCenterPagination.setData(list, list.size()); + } + + } + + @Override + public void idRead(List id) { + QueryWrapper messageCenterQueryWrapper = new QueryWrapper<>(); + messageCenterQueryWrapper.lambda().eq(MessageCenterEntity::getIsRead,"0"); + messageCenterQueryWrapper.lambda().in(MessageCenterEntity::getId,id); + MessageCenterEntity messageCenterEntity = new MessageCenterEntity(); + messageCenterEntity.setIsRead("1"); + boolean update = this.update(messageCenterEntity,messageCenterQueryWrapper); + if (update){ + log.warn("更新成功！"); + } + } + @Override public void delete(MessageCenterEntity entity) { if (entity != null) { diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java index e0217245..2848056f 100644 --- a/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java +++ b/SC-boot/linkage-scm/src/main/java/jnpf/supplier/service/impl/SupplierServiceImpl.java @@ -116,12 +116,19 @@ public class SupplierServiceImpl extends ServiceImpl