添加通知

smart-office-manager-ui/admin/src/router.js

@@ -50,7 +50,7 @@ const router = new Router({
                 ...restBuilder('basic/set', 'basic/set'),//基础设置
 
                 ...restBuilder('notice', 'notice'),//通知公告
-                ...restBuilder('room/notice', 'room/notice'),//房间所属公告
+                // ...restBuilder('room/notice', 'room/notice'),//房间所属公告
 
                 //以下为基础路由配置
                 builder('', 'Home'),

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/NoticeDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 通知公告 DAO接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 
 public interface  NoticeDao extends ICRUDDao<NoticeEntity,Long>{

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/NoticeRoomDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 * 房间公告 DAO接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 
 public interface  NoticeRoomDao extends ICRUDDao<NoticeRoomEntity,Long>{

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/ibatis/NoticeDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 通知公告DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Repository("noticeDao")
 public class NoticeDaoImpl extends BaseCRUDDaoMybatis<NoticeEntity,Long> implements NoticeDao {

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/dao/ibatis/NoticeRoomDaoImpl.java

@@ -11,7 +11,7 @@ import java.util.List;
 * 房间公告DaoImpl DAO接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Repository("noticeRoomDao")
 public class NoticeRoomDaoImpl extends BaseCRUDDaoMybatis<NoticeRoomEntity,Long> implements NoticeRoomDao {

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeEntity.java

 package com.mortals.xhx.module.notice.model;
 import java.util.List;
-import java.util.List;
 import java.util.ArrayList;
 import java.math.BigDecimal;
 import cn.hutool.core.date.DateUtil;
@@ -9,13 +8,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.mortals.framework.annotation.Excel;
 import com.mortals.framework.model.BaseEntityLong;
 import com.mortals.xhx.module.notice.model.vo.NoticeVo;
-import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
 import lombok.Data;
 /**
 * 通知公告实体对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Data
 public class NoticeEntity extends NoticeVo {
@@ -42,17 +40,6 @@ public class NoticeEntity extends NoticeVo {
     * 备注
     */
     private String remark;
-    /**
-    * 房间公告信息
-    */
-    private List<NoticeRoomEntity> noticeRoomList=new ArrayList<>();;
-    public List<NoticeRoomEntity> getNoticeRoomList(){
-      return noticeRoomList;
-    }
-
-    public void setNoticeRoomList(List<NoticeRoomEntity> noticeRoomList){
-        this.noticeRoomList = noticeRoomList;
-    }
     @Override
     public int hashCode() {
          return this.getId().hashCode();

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeQuery.java

 package com.mortals.xhx.module.notice.model;
 
-import java.util.List;
 import java.util.List;
 import com.mortals.xhx.module.notice.model.NoticeEntity;
 /**
 * 通知公告查询对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 public class NoticeQuery extends NoticeEntity {
     /** 开始 主键ID，主键，自增长 */

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeRoomEntity.java

@@ -13,7 +13,7 @@ import lombok.Data;
 * 房间公告实体对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Data
 public class NoticeRoomEntity extends NoticeRoomVo {

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/NoticeRoomQuery.java

@@ -6,7 +6,7 @@ import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
 * 房间公告查询对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 public class NoticeRoomQuery extends NoticeRoomEntity {
     /** 开始 主键ID，主键，自增长 */

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/vo/NoticeRoomVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 房间公告视图对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Data
 public class NoticeRoomVo extends BaseEntityLong {

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/model/vo/NoticeVo.java

@@ -11,7 +11,7 @@ import java.util.Date;
 * 通知公告视图对象
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Data
 public class NoticeVo extends BaseEntityLong {

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/NoticeRoomService.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.notice.dao.NoticeRoomDao;
 * 房间公告 service接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 public interface NoticeRoomService extends ICRUDService<NoticeRoomEntity,Long>{
 

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/NoticeService.java

@@ -8,7 +8,7 @@ import com.mortals.xhx.module.notice.dao.NoticeDao;
 * 通知公告 service接口
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 public interface NoticeService extends ICRUDService<NoticeEntity,Long>{
 

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/impl/NoticeRoomServiceImpl.java

@@ -12,13 +12,10 @@ import lombok.extern.slf4j.Slf4j;
 * 房间公告 service实现
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Service("noticeRoomService")
 @Slf4j
 public class NoticeRoomServiceImpl extends AbstractCRUDServiceImpl<NoticeRoomDao, NoticeRoomEntity, Long> implements NoticeRoomService {
-
-
-
-
+    
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/service/impl/NoticeServiceImpl.java

@@ -6,62 +6,16 @@ import com.mortals.framework.model.Context;
 import com.mortals.xhx.module.notice.dao.NoticeDao;
 import com.mortals.xhx.module.notice.model.NoticeEntity;
 import com.mortals.xhx.module.notice.service.NoticeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import com.mortals.xhx.module.notice.model.NoticeRoomEntity;
-import com.mortals.xhx.module.notice.model.NoticeRoomQuery;
-import com.mortals.xhx.module.notice.service.NoticeRoomService;
-import org.springframework.util.ObjectUtils;
-import java.util.Date;
-import java.util.Arrays;
-import java.util.List;
 import lombok.extern.slf4j.Slf4j;
 /**
 * NoticeService
 * 通知公告 service实现
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @Service("noticeService")
 @Slf4j
 public class NoticeServiceImpl extends AbstractCRUDServiceImpl<NoticeDao, NoticeEntity, Long> implements NoticeService {
-    @Autowired
-    private NoticeRoomService noticeRoomService;
     
-    @Override
-    protected void saveAfter(NoticeEntity entity, Context context) throws AppException {
-        if(!ObjectUtils.isEmpty(entity.getNoticeRoomList())){
-            entity.getNoticeRoomList().stream().peek(item->{
-                item.setNoticeId(entity.getId());
-                item.setCreateUserId(this.getContextUserId(context));
-                item.setCreateTime(new Date());
-            }).count();
-            noticeRoomService.save(entity.getNoticeRoomList());
-        }
-        super.saveAfter(entity, context);
-    }
-
-    @Override
-    protected void updateAfter(NoticeEntity entity, Context context) throws AppException {
-        if(!ObjectUtils.isEmpty(entity.getNoticeRoomList())){
-            Long[] noticeRoomIds = noticeRoomService.find(new NoticeRoomQuery().noticeId(entity.getId())).stream().map(NoticeRoomEntity::getId).toArray(Long[]::new);
-            noticeRoomService.remove(noticeRoomIds,context);
-            entity.getNoticeRoomList().stream().peek(item ->{
-                item.setNoticeId(entity.getId());
-                item.setCreateUserId(this.getContextUserId(context));
-                item.setCreateTime(new Date());
-                item.setUpdateUserId(this.getContextUserId(context));
-                item.setUpdateTime(new Date());
-            }).count();
-            noticeRoomService.save(entity.getNoticeRoomList());
-        }
-        super.updateAfter(entity, context);
-    }
-
-    @Override
-    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
-        List<NoticeRoomEntity> noticeRoomlist = noticeRoomService.find(new NoticeRoomQuery().noticeIdList(Arrays.asList(ids)));
-        noticeRoomService.removeList(noticeRoomlist,context);
-        super.removeAfter(ids, context, result);
-    }
 }
\ No newline at end of file

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeController.java

@@ -27,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 通知公告
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @RestController
 @RequestMapping("notice")

smart-office-manager/src/main/java/com/mortals/xhx/module/notice/web/NoticeRoomController.java

 package com.mortals.xhx.module.notice.web;
-import com.mortals.framework.exception.AppException;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,7 +27,7 @@ import static com.mortals.framework.ap.SysConstains.*;
 * 房间公告
 *
 * @author zxfei
-* @date 2023-09-04
+* @date 2023-09-05
 */
 @RestController
 @RequestMapping("notice/room")
@@ -47,9 +46,4 @@ public class NoticeRoomController extends BaseCRUDJsonBodyMappingController<Noti
     }
 
 
-    @Override
-    protected void saveBefore(NoticeRoomEntity entity, Map<String, Object> model, Context context) throws AppException {
-
-        //公告配置
-    }
 }
\ No newline at end of file

smart-office-manager/src/main/resources/sqlmap/module/notice/NoticeMapper.xml

@@ -15,19 +15,7 @@
             <result property="createTime" column="createTime" />
             <result property="updateUserId" column="updateUserId" />
             <result property="updateTime" column="updateTime" />
-            <collection property="noticeRoomList" column="id" ofType="NoticeRoomEntity" javaType="ArrayList" select="getNoticeRoomByNoticeId"></collection>
-    </resultMap>
-    <resultMap type="NoticeRoomEntity" id="NoticeRoomEntity-Map">
-            <result property="id" column="id" />
-            <result property="noticeId" column="noticeId" />
-            <result property="title" column="title" />
-            <result property="roomId" column="roomId" />
-            <result property="roomName" column="roomName" />
-            <result property="remark" column="remark" />
-            <result property="createUserId" column="createUserId" />
-            <result property="createTime" column="createTime" />
-            <result property="updateUserId" column="updateUserId" />
-            <result property="updateTime" column="updateTime" />
+            
     </resultMap>
 
 
@@ -66,12 +54,6 @@
                 </if>
         </trim>
     </sql>
-    <!-- 子表所有列 -->
-    <sql id="_columns_sub">
-        <trim suffixOverrides="," suffix="">
-            b.id,b.noticeId,b.title,b.roomId,b.roomName,b.remark,b.createUserId,b.createTime,b.updateUserId,b.updateTime,
-        </trim>
-    </sql>
     <!-- 新增 区分主键自增加还是业务插入 -->
     <insert id="insert" parameterType="NoticeEntity"  useGeneratedKeys="true" keyProperty="id">
         insert into mortals_xhx_notice
@@ -274,14 +256,6 @@
         </trim>
         <include refid="_orderCols_"/>
     </select>
-    <!-- 获取子列表 -->
-    <select id="getNoticeRoomByNoticeId" parameterType="java.lang.Long" resultMap="NoticeRoomEntity-Map">
-        select <include refid="_columns_sub"/>
-        from mortals_xhx_notice_room as b
-        <trim suffixOverrides="where" suffix="">
-            where b.noticeId = #{id}
-        </trim>
-    </select>
 
 
 

smart-office-manager/src/test/java/com/mortals/httpclient/notice/NoticeController.http

@@ -29,11 +29,11 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "title":"2fntwc",
-        "noticeContent":"47riae",
-        "filePath":"tcntq2",
-        "fileName":"rd8qfy",
-        "remark":"4b0igp",
+        "title":"1x7w1v",
+        "noticeContent":"4f0ita",
+        "filePath":"ypnak8",
+        "fileName":"f02j81",
+        "remark":"le03v4",
 }
 
 > {%

smart-office-manager/src/test/java/com/mortals/httpclient/notice/NoticeRoomController.http

@@ -29,11 +29,11 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-        "noticeId":882,
-        "title":"lyrqsg",
-        "roomId":961,
-        "roomName":"w4a7jv",
-        "remark":"887xvv",
+        "noticeId":940,
+        "title":"1gosfz",
+        "roomId":567,
+        "roomName":"gam3y7",
+        "remark":"x6sv4n",
 }
 
 > {%