信息发布对外接口

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/domain/DmInformation.java

@@ -30,6 +30,7 @@ import me.zhengjie.modules.dm.user.domain.DmUser;
 import org.hibernate.annotations.*;
 import java.sql.Timestamp;
 import java.io.Serializable;
+import java.util.List;
 
 /**
 * @website https://el-admin.vip
@@ -100,6 +101,9 @@ public class DmInformation extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "是否有效")
     private String isValid;
 
+    @Transient
+    private List<DmUser> approvalUserList;
+
     public void copy(DmInformation source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/repository/DmInformationRepository.java

@@ -1,28 +1,57 @@
 /*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.dm.information.repository;
 
 import me.zhengjie.modules.dm.information.domain.DmInformation;
+import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
+import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
-* @website https://el-admin.vip
-* @author xwx
-* @date 2022-06-06
-**/
+ * @website https://el-admin.vip
+ * @author xwx
+ * @date 2021-04-22
+ **/
 public interface DmInformationRepository extends JpaRepository<DmInformation, Long>, JpaSpecificationExecutor<DmInformation> {
+
+    @Modifying
+    @Query(value = "update dm_information set task_id =:#{#resources.taskId} ,proc_inst_id =:#{#resources.procInstId} where id =:#{#resources.id} ",nativeQuery = true )
+    void updateTask(@Param(value = "resources") DmInformation resources);
+
+    @Query(value = "select GROUP_CONCAT(DISTINCT(approval_user)) as userIds from dm_information_approval where is_new = '1' and info_id = ?1 ",nativeQuery = true )
+    Map<String,Object> selectInfoApproveUserNames(Long id);
+
+    @Modifying
+    @Query(value = "update dm_information set status = '00' ,approval_user = null,approval_remark=null where id = ?1 ",nativeQuery = true )
+    void reset(Long id);
+
+    @Query(value = "select status from dm_information where id = ?1",nativeQuery = true)
+    String findSubmitBeforeStatus(Long id);
+
+    @Query(value = "select a.*  from  dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id",
+            countQuery = "select count(*) from (select a.* from dm_information a left join dm_information_approval b on a.id= b.info_id where b.is_new = 1 and  b.approval_user = ?1 and a.status = '00' group by a.id)",
+            nativeQuery = true)
+    Page<DmInformation> findAllDSP(String approval_user, Pageable pageable);
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/DmInformationService.java

@@ -1,18 +1,18 @@
 /*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.dm.information.service;
 
 import me.zhengjie.modules.dm.information.domain.DmInformation;
@@ -25,26 +25,26 @@ import java.io.IOException;
 import javax.servlet.http.HttpServletResponse;
 
 /**
-* @website https://el-admin.vip
-* @description 服务接口
-* @author xwx
-* @date 2022-06-06
-**/
+ * @website https://el-admin.vip
+ * @description 服务接口
+ * @author xwx
+ * @date 2021-04-22
+ **/
 public interface DmInformationService {
 
     /**
-    * 查询数据分页
-    * @param criteria 条件
-    * @param pageable 分页参数
-    * @return Map<String,Object>
-    */
+     * 查询数据分页
+     * @param criteria 条件
+     * @param pageable 分页参数
+     * @return Map<String,Object>
+     */
     Map<String,Object> queryAll(DmInformationQueryCriteria criteria, Pageable pageable);
 
     /**
-    * 查询所有数据不分页
-    * @param criteria 条件参数
-    * @return List<DmInformationDto>
-    */
+     * 查询所有数据不分页
+     * @param criteria 条件参数
+     * @return List<DmInformationDto>
+     */
     List<DmInformationDto> queryAll(DmInformationQueryCriteria criteria);
 
     /**
@@ -55,29 +55,60 @@ public interface DmInformationService {
     DmInformationDto findById(Long id);
 
     /**
-    * 创建
-    * @param resources /
-    * @return DmInformationDto
-    */
+     * 创建
+     * @param resources /
+     * @return DmInformationDto
+     */
     DmInformationDto create(DmInformation resources);
 
     /**
-    * 编辑
-    * @param resources /
-    */
-    void update(DmInformation resources);
+     * 编辑
+     * @param resources /
+     */
+    void update(DmInformation resources,String ... statusList);
 
     /**
-    * 多选删除
-    * @param ids /
-    */
+     * 多选删除
+     * @param ids /
+     */
     void deleteAll(Long[] ids);
 
     /**
-    * 导出数据
-    * @param all 待导出的数据
-    * @param response /
-    * @throws IOException /
-    */
+     * 导出数据
+     * @param all 待导出的数据
+     * @param response /
+     * @throws IOException /
+     */
     void download(List<DmInformationDto> all, HttpServletResponse response) throws IOException;
+
+    DmInformation toEntity(DmInformationDto dto);
+
+    void updateTask(DmInformation resources);
+
+    /**
+     * todo 添加审批人
+     * @param resources
+     */
+    void addApprovalUser(DmInformation resources);
+
+    /**
+     * todo 审批
+     * @param resources
+     */
+    void approval(DmInformation resources);
+
+    /**
+     * todo 撤回
+     * @param id
+     */
+    void ch(Long id);
+
+    /**
+     * 查询数据分页
+     * @param pageable 分页参数
+     * @return Map<String,Object>
+     */
+    Map<String,Object> findAllDSP(Pageable pageable);
+
+
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/dto/DmInformationDto.java

@@ -84,4 +84,7 @@ public class DmInformationDto extends BaseDTO implements Serializable {
 
     /** 是否有效 */
     private String isValid;
+
+    /** 是否已读 */
+    private Integer isRead;
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/information/service/impl/DmInformationServiceImpl.java

@@ -1,56 +1,77 @@
 /*
-*  Copyright 2019-2020 Zheng Jie
-*
-*  Licensed under the Apache License, Version 2.0 (the "License");
-*  you may not use this file except in compliance with the License.
-*  You may obtain a copy of the License at
-*
-*  http://www.apache.org/licenses/LICENSE-2.0
-*
-*  Unless required by applicable law or agreed to in writing, software
-*  distributed under the License is distributed on an "AS IS" BASIS,
-*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*  See the License for the specific language governing permissions and
-*  limitations under the License.
-*/
+ *  Copyright 2019-2020 Zheng Jie
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
 package me.zhengjie.modules.dm.information.service.impl;
 
+import me.zhengjie.exception.BadRequestException;
+import me.zhengjie.modules.dm.activiti.event.ActivitiEvent;
+import me.zhengjie.modules.dm.activiti.status.OperationStatus;
 import me.zhengjie.modules.dm.information.domain.DmInformation;
-import me.zhengjie.utils.ValidationUtil;
-import me.zhengjie.utils.FileUtil;
+import me.zhengjie.modules.dm.informationApproval.domain.DmInformationApproval;
+import me.zhengjie.modules.dm.informationApproval.service.DmInformationApprovalService;
+import me.zhengjie.modules.dm.user.domain.DmUser;
+import me.zhengjie.modules.dm.user.service.mapstruct.DmUserMapper;
+import me.zhengjie.modules.dm.user.util.DmUserUtils;
+import me.zhengjie.modules.system.service.UserService;
+import me.zhengjie.modules.system.service.dto.UserDto;
+import me.zhengjie.utils.*;
 import lombok.RequiredArgsConstructor;
 import me.zhengjie.modules.dm.information.repository.DmInformationRepository;
 import me.zhengjie.modules.dm.information.service.DmInformationService;
 import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
 import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
 import me.zhengjie.modules.dm.information.service.mapstruct.DmInformationMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.IdUtil;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import me.zhengjie.utils.PageUtil;
-import me.zhengjie.utils.QueryHelp;
-import java.util.List;
-import java.util.Map;
+
+import java.awt.*;
+import java.sql.Timestamp;
+import java.util.*;
 import java.io.IOException;
+import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
 
 /**
-* @website https://el-admin.vip
-* @description 服务实现
-* @author xwx
-* @date 2022-06-06
-**/
+ * @website https://el-admin.vip
+ * @description 服务实现
+ * @author xwx
+ * @date 2021-04-22
+ **/
 @Service
 @RequiredArgsConstructor
 public class DmInformationServiceImpl implements DmInformationService {
 
     private final DmInformationRepository dmInformationRepository;
     private final DmInformationMapper dmInformationMapper;
+    @Autowired
+    private DmInformationApprovalService approvalService;
+    @Resource
+    private ApplicationContext applicationContext;
+
+    /** 用户信息 */
+    @Autowired
+    private UserService userService;
+    @Autowired
+    private final DmUserMapper dmUserMapper;
 
     @Override
     public Map<String,Object> queryAll(DmInformationQueryCriteria criteria, Pageable pageable){
@@ -75,19 +96,113 @@ public class DmInformationServiceImpl implements DmInformationService {
     @Transactional(rollbackFor = Exception.class)
     public DmInformationDto create(DmInformation resources) {
         Snowflake snowflake = IdUtil.createSnowflake(1, 1);
-        resources.setId(snowflake.nextId()); 
-        return dmInformationMapper.toDto(dmInformationRepository.save(resources));
+        resources.setId(snowflake.nextId());
+        resources.setRequestUser(dmUserMapper.toEntity(DmUserUtils.getCurrDmUser()));
+        resources.setStatus("00");
+        resources.setIsHasApproval("0");
+        DmInformationDto dto = dmInformationMapper.toDto(dmInformationRepository.save(resources));
+        dto.setRequestUser(dmUserMapper.toEntity(DmUserUtils.getCurrDmUser()));
+        ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT);
+        applicationContext.publishEvent(event);
+        return dto;
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void update(DmInformation resources) {
+    public void update(DmInformation resources,String ... statusList) {
         DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
         ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
         dmInformation.copy(resources);
+        String status = statusList.length>0?statusList[0]:dmInformation.getStatus();
+        //判断是否驳回后修改
+        Boolean isApprovalUpdate = "02".equals(status);
+        //触发审批流程
+        if(isApprovalUpdate){
+            //初始化所有信息
+            reset(dmInformation.getId());
+            ActivitiEvent event = new ActivitiEvent(this,resources,OperationStatus.SUBMIT_APPROVAL_USER);
+            applicationContext.publishEvent(event);
+        }
+        if("02".equals(status) || "03".equals(status)){
+            dmInformation.setStatus("00");//将状态改为待审批
+            dmInformationRepository.save(dmInformation);
+        }
+
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void addApprovalUser(DmInformation resources){
+        DmInformation dmInformation = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
+        ValidationUtil.isNull( dmInformation.getId(),"DmInformation","id",resources.getId());
+
+        dmInformation.setIsHasApproval("1");
+        List<DmUser> appUsers = resources.getApprovalUserList();
+
+        if(appUsers !=null && appUsers.size()>0){
+            for(DmUser dmUser : appUsers){
+                DmInformationApproval approval = new DmInformationApproval();
+                approval.setInformation(resources);
+                approval.setApprovalUser(dmUser);
+                approval.setStatus("00");
+                approval.setIsNew(true);
+                approvalService.create(approval);
+            }
+        }
         dmInformationRepository.save(dmInformation);
+
+        //触发审批流程
+        ActivitiEvent event = new ActivitiEvent(this,dmInformation,OperationStatus.SUBMIT_APPROVAL_USER);
+        applicationContext.publishEvent(event);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void approval(DmInformation resources) {
+        DmInformation information = dmInformationRepository.findById(resources.getId()).orElseGet(DmInformation::new);
+        ValidationUtil.isNull( information.getId(),"DmInformation","id",resources.getId());
+        information.copy(resources);
+
+        //判断用户是否具备审批权限
+        //1、判断是否具有审批用户
+        UserDto user= userService.findById(SecurityUtils.getCurrentUserId());
+        Boolean isApproval =true;
+        List<DmInformationApproval> approvalList = approvalService.findInfoByReqAndUser(information.getId(),user.getDmUser().getId()+"");
+        DmInformationApproval approval = approvalList==null || approvalList.size()<=0 || approvalList.get(0).getId() == null?null:approvalList.get(0);
+        isApproval=!(approval==null);
+        if(!isApproval){
+            throw new BadRequestException("无审批权限");
+        }
+        String status = information.getStatus();
+        if(!"01".equals(status) && !"02".equals(status)){
+            throw new BadRequestException("审批状态错误");
+        }
+
+        DmInformation information1 = approval.getInformation();
+        System.out.println("information1.getStatus() ==> "+information1.getStatus());
+        if(information1 == null || information1.getId() == null ||  !"00".equals(approval.getStatus())){
+            throw new BadRequestException("当前状态不可审批");
+        }
+        DmUser dmUser = dmUserMapper.toEntity(user.getDmUser());
+        String inistatus = approval.getStatus();
+
+        //修改信息
+        information.setApprovalUser(dmUser);
+        information.setApprovalTime(new Timestamp(System.currentTimeMillis()));
+        this.update(information,inistatus);
+        //保存审批信息
+        approval.setApprovalUser(dmUser);
+        approval.setStatus(information.getStatus());
+        approval.setApprovalRemark(information.getApprovalRemark());
+        approvalService.update(approval);
+
+        //触发审批流程
+        information.setTaskId(approval.getTaskId());
+        ActivitiEvent event = new ActivitiEvent(this,information,OperationStatus.APPROVE);
+        applicationContext.publishEvent(event);
     }
 
+
     @Override
     public void deleteAll(Long[] ids) {
         for (Long id : ids) {
@@ -112,12 +227,61 @@ public class DmInformationServiceImpl implements DmInformationService {
             map.put("更新时间", dmInformation.getUpdateTime());
             map.put("发布时间", dmInformation.getReleaseTime());
             map.put("审批时间", dmInformation.getApprovalTime());
-            map.put("发布标题", dmInformation.getTitle());
-            map.put("审批备注", dmInformation.getApprovalRemark());
-            map.put("是否设置审批人 1-true 0-false", dmInformation.getIsHasApproval());
-            map.put("是否有效", dmInformation.getIsValid());
             list.add(map);
         }
         FileUtil.downloadExcel(list, response);
     }
+
+    @Override
+    public void ch(Long id){
+        DmInformation information = dmInformationRepository.findById(id).orElseGet(DmInformation::new);
+        ValidationUtil.isNull( information.getId(),"DmInformation","id",id);
+        if("00".equals(information.getStatus())){
+            information.setStatus("03");
+            this.update(information,"00");
+        }else {
+            throw new BadRequestException("当前状态不可撤回");
+        }
+    }
+
+    @Override
+    public Map<String, Object> findAllDSP(Pageable pageable) {
+        Page<DmInformation> page = dmInformationRepository.findAllDSP(DmUserUtils.getCurrDmUser().getId()+"",pageable);
+        return PageUtil.toPage(page.map(dmInformationMapper::toDto));
+    }
+
+    @Override
+    public DmInformation toEntity(DmInformationDto dto) {
+        if ( dto == null ) {
+            return null;
+        }
+
+        DmInformation dmInformation = new DmInformation();
+
+        dmInformation.setCreateBy( dto.getCreateBy() );
+        dmInformation.setCreateTime( dto.getCreateTime() );
+        dmInformation.setUpdateTime( dto.getUpdateTime() );
+        dmInformation.setId( dto.getId() );
+        dmInformation.setContent( dto.getContent() );
+        dmInformation.setStatus( dto.getStatus() );
+        dmInformation.setTaskId( dto.getTaskId() );
+        dmInformation.setProcInstId( dto.getProcInstId() );
+        dmInformation.setReleaseTime( dto.getReleaseTime() );
+        dmInformation.setApprovalTime( dto.getApprovalTime() );
+
+        return dmInformation;
+    }
+
+    @Override
+    public void updateTask(DmInformation resources) {
+        dmInformationRepository.updateTask(resources);
+    }
+
+
+    public void reset (Long id){
+        //修改审批状态为待审批
+        approvalService.reset(id);
+        //修改申请为待审批状态
+        dmInformationRepository.reset(id);
+    }
 }

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/domain/DmUserInformation.java

@@ -0,0 +1,63 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.domain;
+
+import lombok.Data;
+import cn.hutool.core.bean.BeanUtil;
+import io.swagger.annotations.ApiModelProperty;
+import cn.hutool.core.bean.copier.CopyOptions;
+import javax.persistence.*;
+import javax.validation.constraints.*;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import org.hibernate.annotations.*;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author lr
+* @date 2022-06-06
+**/
+@Entity
+@Data
+@Table(name="dm_user_information")
+public class DmUserInformation implements Serializable {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id")
+    @ApiModelProperty(value = "主键")
+    private Long id;
+
+    @Column(name = "user_id")
+    @ApiModelProperty(value = "用户id")
+    private String userId;
+
+    @Column(name = "information_id")
+    @ApiModelProperty(value = "发布id")
+    private Long informationId;
+
+    @Column(name = "create_time")
+    @CreationTimestamp
+    @ApiModelProperty(value = "创建时间")
+    private Timestamp createTime;
+
+    public void copy(DmUserInformation source){
+        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/repository/DmUserInformationRepository.java

@@ -0,0 +1,28 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.repository;
+
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-06-06
+**/
+public interface DmUserInformationRepository extends JpaRepository<DmUserInformation, Long>, JpaSpecificationExecutor<DmUserInformation> {
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/rest/DmUserInformationController.java

@@ -0,0 +1,87 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.rest;
+
+import me.zhengjie.annotation.Log;
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import me.zhengjie.modules.dm.userInformation.service.DmUserInformationService;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.*;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-06-06
+**/
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "发布信息记录管理")
+@RequestMapping("/api/dmUserInformation")
+public class DmUserInformationController {
+
+    private final DmUserInformationService dmUserInformationService;
+
+    @Log("导出数据")
+    @ApiOperation("导出数据")
+    @GetMapping(value = "/download")
+    @PreAuthorize("@el.check('dmUserInformation:list')")
+    public void download(HttpServletResponse response, DmUserInformationQueryCriteria criteria) throws IOException {
+        dmUserInformationService.download(dmUserInformationService.queryAll(criteria), response);
+    }
+
+    @GetMapping
+    @Log("查询发布信息记录")
+    @ApiOperation("查询发布信息记录")
+    @PreAuthorize("@el.check('dmUserInformation:list')")
+    public ResponseEntity<Object> query(DmUserInformationQueryCriteria criteria, Pageable pageable){
+        return new ResponseEntity<>(dmUserInformationService.queryAll(criteria,pageable),HttpStatus.OK);
+    }
+
+    @PostMapping
+    @Log("新增发布信息记录")
+    @ApiOperation("新增发布信息记录")
+    @PreAuthorize("@el.check('dmUserInformation:add')")
+    public ResponseEntity<Object> create(@Validated @RequestBody DmUserInformation resources){
+        return new ResponseEntity<>(dmUserInformationService.create(resources),HttpStatus.CREATED);
+    }
+
+    @PutMapping
+    @Log("修改发布信息记录")
+    @ApiOperation("修改发布信息记录")
+    @PreAuthorize("@el.check('dmUserInformation:edit')")
+    public ResponseEntity<Object> update(@Validated @RequestBody DmUserInformation resources){
+        dmUserInformationService.update(resources);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+
+    @Log("删除发布信息记录")
+    @ApiOperation("删除发布信息记录")
+    @PreAuthorize("@el.check('dmUserInformation:del')")
+    @DeleteMapping
+    public ResponseEntity<Object> delete(@RequestBody Long[] ids) {
+        dmUserInformationService.deleteAll(ids);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/service/DmUserInformationService.java

@@ -0,0 +1,83 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.service;
+
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationDto;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationQueryCriteria;
+import org.springframework.data.domain.Pageable;
+import java.util.Map;
+import java.util.List;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+* @website https://el-admin.vip
+* @description 服务接口
+* @author lr
+* @date 2022-06-06
+**/
+public interface DmUserInformationService {
+
+    /**
+    * 查询数据分页
+    * @param criteria 条件
+    * @param pageable 分页参数
+    * @return Map<String,Object>
+    */
+    Map<String,Object> queryAll(DmUserInformationQueryCriteria criteria, Pageable pageable);
+
+    /**
+    * 查询所有数据不分页
+    * @param criteria 条件参数
+    * @return List<DmUserInformationDto>
+    */
+    List<DmUserInformationDto> queryAll(DmUserInformationQueryCriteria criteria);
+
+    /**
+     * 根据ID查询
+     * @param id ID
+     * @return DmUserInformationDto
+     */
+    DmUserInformationDto findById(Long id);
+
+    /**
+    * 创建
+    * @param resources /
+    * @return DmUserInformationDto
+    */
+    DmUserInformationDto create(DmUserInformation resources);
+
+    /**
+    * 编辑
+    * @param resources /
+    */
+    void update(DmUserInformation resources);
+
+    /**
+    * 多选删除
+    * @param ids /
+    */
+    void deleteAll(Long[] ids);
+
+    /**
+    * 导出数据
+    * @param all 待导出的数据
+    * @param response /
+    * @throws IOException /
+    */
+    void download(List<DmUserInformationDto> all, HttpServletResponse response) throws IOException;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/service/dto/DmUserInformationDto.java

@@ -0,0 +1,42 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.service.dto;
+
+import lombok.Data;
+import java.sql.Timestamp;
+import java.io.Serializable;
+
+/**
+* @website https://el-admin.vip
+* @description /
+* @author lr
+* @date 2022-06-06
+**/
+@Data
+public class DmUserInformationDto implements Serializable {
+
+    /** 主键 */
+    private Long id;
+
+    /** 用户id */
+    private String userId;
+
+    /** 发布id */
+    private Long informationId;
+
+    /** 创建时间 */
+    private Timestamp createTime;
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/service/dto/DmUserInformationQueryCriteria.java

@@ -0,0 +1,36 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.service.dto;
+
+import lombok.Data;
+import java.util.List;
+import me.zhengjie.annotation.Query;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-06-06
+**/
+@Data
+public class DmUserInformationQueryCriteria{
+
+    @Query
+    private String userId;
+
+    @Query
+    private Long informationId;
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/service/impl/DmUserInformationServiceImpl.java

@@ -0,0 +1,106 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.service.impl;
+
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import me.zhengjie.utils.ValidationUtil;
+import me.zhengjie.utils.FileUtil;
+import lombok.RequiredArgsConstructor;
+import me.zhengjie.modules.dm.userInformation.repository.DmUserInformationRepository;
+import me.zhengjie.modules.dm.userInformation.service.DmUserInformationService;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationDto;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationQueryCriteria;
+import me.zhengjie.modules.dm.userInformation.service.mapstruct.DmUserInformationMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import me.zhengjie.utils.PageUtil;
+import me.zhengjie.utils.QueryHelp;
+import java.util.List;
+import java.util.Map;
+import java.io.IOException;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+
+/**
+* @website https://el-admin.vip
+* @description 服务实现
+* @author lr
+* @date 2022-06-06
+**/
+@Service
+@RequiredArgsConstructor
+public class DmUserInformationServiceImpl implements DmUserInformationService {
+
+    private final DmUserInformationRepository dmUserInformationRepository;
+    private final DmUserInformationMapper dmUserInformationMapper;
+
+    @Override
+    public Map<String,Object> queryAll(DmUserInformationQueryCriteria criteria, Pageable pageable){
+        Page<DmUserInformation> page = dmUserInformationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable);
+        return PageUtil.toPage(page.map(dmUserInformationMapper::toDto));
+    }
+
+    @Override
+    public List<DmUserInformationDto> queryAll(DmUserInformationQueryCriteria criteria){
+        return dmUserInformationMapper.toDto(dmUserInformationRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder)));
+    }
+
+    @Override
+    @Transactional
+    public DmUserInformationDto findById(Long id) {
+        DmUserInformation dmUserInformation = dmUserInformationRepository.findById(id).orElseGet(DmUserInformation::new);
+        ValidationUtil.isNull(dmUserInformation.getId(),"DmUserInformation","id",id);
+        return dmUserInformationMapper.toDto(dmUserInformation);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public DmUserInformationDto create(DmUserInformation resources) {
+        return dmUserInformationMapper.toDto(dmUserInformationRepository.save(resources));
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void update(DmUserInformation resources) {
+        DmUserInformation dmUserInformation = dmUserInformationRepository.findById(resources.getId()).orElseGet(DmUserInformation::new);
+        ValidationUtil.isNull( dmUserInformation.getId(),"DmUserInformation","id",resources.getId());
+        dmUserInformation.copy(resources);
+        dmUserInformationRepository.save(dmUserInformation);
+    }
+
+    @Override
+    public void deleteAll(Long[] ids) {
+        for (Long id : ids) {
+            dmUserInformationRepository.deleteById(id);
+        }
+    }
+
+    @Override
+    public void download(List<DmUserInformationDto> all, HttpServletResponse response) throws IOException {
+        List<Map<String, Object>> list = new ArrayList<>();
+        for (DmUserInformationDto dmUserInformation : all) {
+            Map<String,Object> map = new LinkedHashMap<>();
+            map.put("用户id", dmUserInformation.getUserId());
+            map.put("发布id", dmUserInformation.getInformationId());
+            map.put("创建时间", dmUserInformation.getCreateTime());
+            list.add(map);
+        }
+        FileUtil.downloadExcel(list, response);
+    }
+}

eladmin-system/src/main/java/me/zhengjie/modules/dm/userInformation/service/mapstruct/DmUserInformationMapper.java

@@ -0,0 +1,32 @@
+/*
+*  Copyright 2019-2020 Zheng Jie
+*
+*  Licensed under the Apache License, Version 2.0 (the "License");
+*  you may not use this file except in compliance with the License.
+*  You may obtain a copy of the License at
+*
+*  http://www.apache.org/licenses/LICENSE-2.0
+*
+*  Unless required by applicable law or agreed to in writing, software
+*  distributed under the License is distributed on an "AS IS" BASIS,
+*  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*  See the License for the specific language governing permissions and
+*  limitations under the License.
+*/
+package me.zhengjie.modules.dm.userInformation.service.mapstruct;
+
+import me.zhengjie.base.BaseMapper;
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationDto;
+import org.mapstruct.Mapper;
+import org.mapstruct.ReportingPolicy;
+
+/**
+* @website https://el-admin.vip
+* @author lr
+* @date 2022-06-06
+**/
+@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE)
+public interface DmUserInformationMapper extends BaseMapper<DmUserInformationDto, DmUserInformation> {
+
+}

eladmin-system/src/main/java/me/zhengjie/modules/thirdparty/v1/OpenApiController.java

@@ -1,5 +1,6 @@
 package me.zhengjie.modules.thirdparty.v1;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -21,6 +22,9 @@ import me.zhengjie.modules.dm.foodCate.domain.DmFoodCate;
 import me.zhengjie.modules.dm.foodCate.repository.DmFoodCateRepository;
 import me.zhengjie.modules.dm.foodPj.domain.DmFoodPj;
 import me.zhengjie.modules.dm.foodPj.service.DmFoodPjService;
+import me.zhengjie.modules.dm.information.service.DmInformationService;
+import me.zhengjie.modules.dm.information.service.dto.DmInformationDto;
+import me.zhengjie.modules.dm.information.service.dto.DmInformationQueryCriteria;
 import me.zhengjie.modules.dm.order.domain.DmOrderItem;
 import me.zhengjie.modules.dm.order.domain.DmOrderRecord;
 import me.zhengjie.modules.dm.order.repository.DmOrderItemRepository;
@@ -30,6 +34,10 @@ import me.zhengjie.modules.dm.order.service.dto.DmOrderRecordQueryCriteria;
 import me.zhengjie.modules.dm.service.domain.DmServicePj;
 import me.zhengjie.modules.dm.service.repository.DmServicePjRepository;
 import me.zhengjie.modules.dm.service.service.DmServicePjService;
+import me.zhengjie.modules.dm.userInformation.domain.DmUserInformation;
+import me.zhengjie.modules.dm.userInformation.service.DmUserInformationService;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationDto;
+import me.zhengjie.modules.dm.userInformation.service.dto.DmUserInformationQueryCriteria;
 import me.zhengjie.modules.dmApp.domain.AppFoodPj;
 import me.zhengjie.modules.dmApp.service.AppFoodPjService;
 import me.zhengjie.modules.dmApp.service.dto.AppFoodPjDto;
@@ -40,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -62,6 +71,8 @@ public class OpenApiController {
     private final DmFoodCateRepository dmFoodCateRepository;
     private final DmServicePjRepository dmServicePjRepository;
     private final DmOrderRecordService dmOrderRecordService;
+    private final DmInformationService dmInformationService;
+    private final DmUserInformationService dmUserInformationService;
 
     @Log("获取今日菜品-App")
     @ApiOperation("获取今日菜品-App")
@@ -280,4 +291,36 @@ public class OpenApiController {
         return new BaseResponse<>(dmOrderRecordService.queryAll(criteria.getQuery(),pageable));
     }
 
+    @AnonymousPostMapping(value = "/informationData")
+    @Log("信息发布列表")
+    @ApiOperation("信息发布列表")
+    public BaseResponse<Object> informationData(@RequestBody QueryPageParams<String> criteria,Pageable pageable){
+        SecurityUtils.CheckApiAuth(criteria);
+        Map<String,Object> map = dmInformationService.queryAll(new DmInformationQueryCriteria(),pageable);
+        List<DmInformationDto> array = JSONArray.parseArray(JSONArray.toJSONString(map.get("content")),DmInformationDto.class);
+        List<DmInformationDto> newArray = new ArrayList<>();
+        for(DmInformationDto dmInformationDto : array){
+            DmUserInformationQueryCriteria dmUserInformationQueryCriteria = new DmUserInformationQueryCriteria();
+            dmUserInformationQueryCriteria.setUserId(criteria.getQuery());
+            dmUserInformationQueryCriteria.setInformationId(dmInformationDto.getId());
+            List<DmUserInformationDto> dmUserInformationDtos = dmUserInformationService.queryAll(dmUserInformationQueryCriteria);
+            if(!ObjectUtils.isEmpty(dmUserInformationDtos)){
+                dmInformationDto.setIsRead(1);
+            } else {
+                dmInformationDto.setIsRead(0);
+            }
+            newArray.add(dmInformationDto);
+        }
+        map.put("content",newArray);
+        return new BaseResponse<>(map);
+    }
+
+    @AnonymousPostMapping(value = "/informationRead")
+    @Log("信息发布已读")
+    @ApiOperation("信息发布已读")
+    public BaseResponse<Object> informationData(@RequestBody QueryPageParams<DmUserInformation> criteria){
+        SecurityUtils.CheckApiAuth(criteria);
+        dmUserInformationService.create(criteria.getQuery());
+        return new BaseResponse<>(true);
+    }
 }