消息管理未完待续.

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java

@@ -0,0 +1,100 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+
+/**
+ * 组织发布消息（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+@Data
+public class OrganizationMessageDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 发布渠道：0：专属app
+     */
+	private String publishDitch;
+
+    /**
+     * 消息内容；最多输入500
+     */
+	private String content;
+
+    /**
+     * 发布人staffId
+     */
+	private String publishStaffId;
+
+    /**
+     * 发布人姓名
+     */
+	private String publishStaffName;
+
+    /**
+     * 发布人所属组织id
+     */
+	private String publishOrgId;
+
+    /**
+     * org_id_path
+     */
+	private String publishOrgIdPath;
+
+    /**
+     * 发布人所属组织名称
+     */
+	private String publishOrgName;
+
+    /**
+     * 发布时间
+     */
+	private Date publishTime;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java

@@ -0,0 +1,89 @@
+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 2023-05-04
+ */
+@Data
+public class OrganizationMessagePublishRangeDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+	private String id;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 消息id:organization_message.id
+     */
+	private String messageId;
+
+    /**
+     * 组织或者网格id
+     */
+	private String orgId;
+
+    /**
+     * 组织：agency；网格：grid
+     */
+	private String orgType;
+
+    /**
+     * org_id的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的全路径，包含org_id
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格
+     */
+	private String orgName;
+
+    /**
+     * 删除标识：0.未删除 1.已删除
+     */
+	private Integer delFlag;
+
+    /**
+     * 乐观锁
+     */
+	private Integer revision;
+
+    /**
+     * 创建人
+     */
+	private String createdBy;
+
+    /**
+     * 创建时间
+     */
+	private Date createdTime;
+
+    /**
+     * 更新人
+     */
+	private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+	private Date updatedTime;
+
+}

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java

@@ -0,0 +1,30 @@
+package com.epmet.dto.form;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+/**
+ * @Description 烟台消息管理，列表查询入参
+ * @Author yzm
+ * @Date 2023/5/4 16:05
+ */
+@Data
+public class OrganizationMessagePageFormDTO extends PageFormDTO {
+    /**
+     * 发布渠道：0：专属app
+     */
+    private String publishDitch;
+    /**
+     * 发布范围，组织id或者网格id
+     */
+    private String orgId;
+    /**
+     * yyyy-MM-dd
+     */
+    private String startDate;
+    /**
+     * yyyy-MM-dd
+     */
+    private String endDate;
+}
+

epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java

@@ -0,0 +1,65 @@
+package com.epmet.dto.result;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Description 烟台消息管理，列表查询
+ * @Author yzm
+ * @Date 2023/5/4 16:06
+ */
+@Data
+public class OrganizationMessageResultDTO {
+    /**
+     * 消息id
+     */
+    private String messageId;
+
+    /**
+     * 发布渠道：0：专属app
+     */
+    private String publishDitch;
+
+    /**
+     * 消息内容；最多输入500
+     */
+    private String content;
+    /**
+     * 发布范围
+     */
+    private String publishRangeName;
+
+    /**
+     * 发布时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date publishTime;
+
+    /**
+     * 发布人staffId
+     */
+    private String publishStaffId;
+
+    /**
+     * 发布人姓名
+     */
+    private String publishStaffName;
+
+    /**
+     * 发布人所属组织id
+     */
+    private String publishOrgId;
+
+    /**
+     * org_id_path
+     */
+    private String publishOrgIdPath;
+
+    /**
+     * 发布人所属组织名称
+     */
+    private String publishOrgName;
+}
+

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java

@@ -0,0 +1,49 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.OrganizationMessagePageFormDTO;
+import com.epmet.dto.result.OrganizationMessageResultDTO;
+import com.epmet.service.OrganizationMessageService;
+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;
+
+
+/**
+ * 组织发布消息（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+@RestController
+@RequestMapping("organization/message")
+public class OrganizationMessageController {
+
+    @Autowired
+    private OrganizationMessageService organizationMessageService;
+
+    /**
+     * 列表查询
+     *
+     * @param formDTO
+     * @return
+     */
+    @PostMapping("list")
+    public Result<PageData<OrganizationMessageResultDTO>> pageList(@RequestBody OrganizationMessagePageFormDTO formDTO) {
+        return new Result<PageData<OrganizationMessageResultDTO>>().ok(organizationMessageService.pageList(formDTO.getPageNo(), formDTO.getPageSize(),
+                formDTO.getPublishDitch(),
+                formDTO.getOrgId(),
+                formDTO.getStartDate(),
+                formDTO.getEndDate()));
+    }
+
+
+
+
+
+
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.OrganizationMessageEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 组织发布消息（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+@Mapper
+public interface OrganizationMessageDao extends BaseDao<OrganizationMessageEntity> {
+	
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.OrganizationMessagePublishRangeEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 消息发布范围（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+@Mapper
+public interface OrganizationMessagePublishRangeDao extends BaseDao<OrganizationMessagePublishRangeEntity> {
+	
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java

@@ -0,0 +1,69 @@
+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 2023-05-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("organization_message")
+public class OrganizationMessageEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 发布渠道：0：专属app
+     */
+	private String publishDitch;
+
+    /**
+     * 消息内容；最多输入500
+     */
+	private String content;
+
+    /**
+     * 发布人staffId
+     */
+	private String publishStaffId;
+
+    /**
+     * 发布人姓名
+     */
+	private String publishStaffName;
+
+    /**
+     * 发布人所属组织id
+     */
+	private String publishOrgId;
+
+    /**
+     * org_id_path
+     */
+	private String publishOrgIdPath;
+
+    /**
+     * 发布人所属组织名称
+     */
+	private String publishOrgName;
+
+    /**
+     * 发布时间
+     */
+	private Date publishTime;
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java

@@ -0,0 +1,56 @@
+package com.epmet.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 2023-05-04
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("organization_message_publish_range")
+public class OrganizationMessagePublishRangeEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 消息id:organization_message.id
+     */
+	private String messageId;
+
+    /**
+     * 组织或者网格id
+     */
+	private String orgId;
+
+    /**
+     * 组织：agency；网格：grid
+     */
+	private String orgType;
+
+    /**
+     * org_id的父级
+     */
+	private String pid;
+
+    /**
+     * org_id的全路径，包含org_id
+     */
+	private String orgIdPath;
+
+    /**
+     * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格
+     */
+	private String orgName;
+
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java

@@ -0,0 +1,27 @@
+package com.epmet.service;
+
+import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.result.OrganizationMessageResultDTO;
+import com.epmet.entity.OrganizationMessageEntity;
+
+/**
+ * 组织发布消息（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+public interface OrganizationMessageService extends BaseService<OrganizationMessageEntity> {
+
+    /**
+     * 分页列表
+     * @param pageNo
+     * @param pageSize
+     * @param publishDitch 发布渠道；0：专属app
+     * @param orgId 发布范围，组织id或者网格id
+     * @param startDate yyyy-MM-dd
+     * @param endDate yyyy-MM-dd
+     * @return
+     */
+    PageData<OrganizationMessageResultDTO> pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate);
+}

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java

@@ -0,0 +1,42 @@
+package com.epmet.service.impl;
+
+import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.utils.EpmetRequestHolder;
+import com.epmet.dao.OrganizationMessageDao;
+import com.epmet.dto.result.OrganizationMessageResultDTO;
+import com.epmet.entity.OrganizationMessageEntity;
+import com.epmet.service.OrganizationMessageService;
+import com.github.pagehelper.PageHelper;
+import org.springframework.stereotype.Service;
+
+/**
+ * 组织发布消息（烟台）
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2023-05-04
+ */
+@Service
+public class OrganizationMessageServiceImpl extends BaseServiceImpl<OrganizationMessageDao, OrganizationMessageEntity> implements OrganizationMessageService {
+    /**
+     * 分页列表
+     *
+     * @param pageNo
+     * @param pageSize
+     * @param publishDitch 发布渠道；0：专属app
+     * @param orgId 发布范围，组织id或者网格id
+     * @param startDate yyyy-MM-dd
+     * @param endDate yyyy-MM-dd
+     * @return
+     */
+    @Override
+    public PageData<OrganizationMessageResultDTO> pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) {
+        CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId());
+        PageHelper.startPage(pageNo,pageSize);
+        //todo
+        // List<OrganizationMessageResultDTO> list=baseDao.pageList(staffOrgIdPath,publishDitch,orgId,startDate,endDate);
+        return null;
+    }
+}

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.OrganizationMessageDao">
+
+    <resultMap type="com.epmet.entity.OrganizationMessageEntity" id="organizationMessageMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="publishDitch" column="PUBLISH_DITCH"/>
+        <result property="content" column="CONTENT"/>
+        <result property="publishStaffId" column="PUBLISH_STAFF_ID"/>
+        <result property="publishStaffName" column="PUBLISH_STAFF_NAME"/>
+        <result property="publishOrgId" column="PUBLISH_ORG_ID"/>
+        <result property="publishOrgIdPath" column="PUBLISH_ORG_ID_PATH"/>
+        <result property="publishOrgName" column="PUBLISH_ORG_NAME"/>
+        <result property="publishTime" column="PUBLISH_TIME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.dao.OrganizationMessagePublishRangeDao">
+
+    <resultMap type="com.epmet.entity.OrganizationMessagePublishRangeEntity" id="organizationMessagePublishRangeMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="messageId" column="MESSAGE_ID"/>
+        <result property="orgId" column="ORG_ID"/>
+        <result property="orgType" column="ORG_TYPE"/>
+        <result property="pid" column="PID"/>
+        <result property="orgIdPath" column="ORG_ID_PATH"/>
+        <result property="orgName" column="ORG_NAME"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>