通知公告

src/main/java/org/springblade/bank/cardswallow/controller/CardSwallowController.java

@@ -45,6 +45,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
@@ -77,6 +79,7 @@ public class CardSwallowController extends BladeController {
 	private final IDeptService deptService;
 	private final IUserLogService userLogService;
 	private final IDictService dictService;
+	private final INoticeService noticeService;
 
 	/**
 	 * 详情
@@ -304,6 +307,15 @@ public class CardSwallowController extends BladeController {
 
 			if (isAdd){
 				userLog.setOperationType("upload");
+
+				//發送通知
+				Notice notice = new Notice();
+				notice.setTitle("營運部已發佈新消息，請查閱");
+				notice.setBusinessType("cardswallow");
+				notice.setDeptId(dept.getId()+"");
+				notice.setRoleId(null);
+				noticeService.sendNotice(notice);
+
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -40,6 +40,8 @@ import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
@@ -68,6 +70,7 @@ public class KeyPwdController extends BladeController {
 	private final IUserService userService;
 	private final IDeptService deptService;
 	private final IDictService dictService;
+	private final INoticeService noticeService;
 
 	/**
 	 * 详情
@@ -204,6 +207,20 @@ public class KeyPwdController extends BladeController {
 
 			if (isAdd){
 				userLog.setOperationType("add");
+
+				//發送通知
+//				有關XXX(分類+種類+鎖匙/密碼)的交接登記已於X年X月X日完成；交出人﹕XXX；接收人﹕XXX
+				String categoryName = getCategoryName(keyPwd);
+				String now = DateUtil.formatDate(DateUtil.now());
+				String title = "有關[" + categoryName + "]的交接登記已於" + now + "完成；交出人：" + keyPwd.getHandoverPersonName() + "；接收人：" + keyPwd.getReceiverName();
+				User user1 = userService.getUserByEhr(keyPwd.getHandoverPersonNo());
+				User user2 = userService.getUserByEhr(keyPwd.getReceiverNo());
+
+				Notice notice = new Notice();
+				notice.setTitle(title);
+				notice.setBusinessType("keypwd");
+				notice.setTargetIds(user1.getId() + "," + user2.getId());
+				noticeService.sendNotice(notice);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
@@ -214,6 +231,13 @@ public class KeyPwdController extends BladeController {
 		return R.status(true);
 	}
 
+	private String getCategoryName(KeyPwd keyPwd){
+		String category = keyPwd.getCategory();
+		String value = dictService.getValue("key_type", category);
+		String[] split = category.split("_");
+		String key_type = dictService.getValue("key_type", split[0] + "_" + split[1] + "_" + split[2]);
+		return key_type + "-" + value;
+	}
 
 	/**
 	 * 删除 網點鎖匙/密碼登記表

src/main/java/org/springblade/bank/message/controller/MessageController.java

@@ -36,6 +36,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.StringUtil;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.resource.entity.Attach;
 import org.springblade.modules.resource.service.IAttachService;
 import org.springblade.modules.system.entity.Dept;
@@ -74,6 +76,7 @@ public class MessageController extends BladeController {
 	private final IDeptService deptService;
 	private final IUserService userService;
 	private final IUserLogService userLogService;
+	private final INoticeService noticeService;
 
 	/**
 	 * 详情
@@ -150,7 +153,7 @@ public class MessageController extends BladeController {
 		List<User> userList = userService.getUsersByDeptIdsRoleIds(deptIds, roleIds);
 		List<Long> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
 		String join = StringUtil.join(userIdList);
-		join += "," + AuthUtil.getUserId();
+//		join += "," + AuthUtil.getUserId();
 		message.setTargetIds(join);
 
 		boolean isAdd = message.getId() == null;
@@ -176,6 +179,15 @@ public class MessageController extends BladeController {
 
 			if (isAdd){
 				userLog.setOperationType("add");
+
+				Notice notice = new Notice();
+				notice.setTitle("營運部已發佈新消息，請查閱");
+				notice.setBusinessType("message");
+				notice.setType("0"); //系統
+				notice.setDeptId(message.getDeptId());
+				notice.setRoleId(message.getRoleId());
+				notice.setTargetIds(message.getTargetIds());
+				boolean result = noticeService.sendNotice(notice);
 			}else{
 				userLog.setOperationType("edit");
 				userLog.setOldData(JSONUtil.toJsonStr(old));
@@ -187,6 +199,7 @@ public class MessageController extends BladeController {
 	}
 
 
+
 	/**
 	 * 删除 信息發佈
 	 */

src/main/java/org/springblade/bank/returns/controller/ReturnsController.java

@@ -45,6 +45,8 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.desk.entity.Notice;
+import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.system.entity.Dept;
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.service.IDeptService;
@@ -78,6 +80,7 @@ public class ReturnsController extends BladeController {
 	private final IUserService userService;
 	private final IUserLogService userLogService;
 	private final IDictService dictService;
+	private final INoticeService noticeService;
 
 	/**
 	 * 详情
@@ -323,7 +326,20 @@ public class ReturnsController extends BladeController {
 		Assert.notNull(dept, "找不到該機構號【" + returns.getSubOrgNo() + "】對應的機構！");
 		returns.setCreateDept(dept.getId());
 
-		return R.status(returnsService.saveOrUpdate(returns));
+		if (returnsService.saveOrUpdate(returns)){
+			//日誌
+
+			//發送通知
+			Notice notice = new Notice();
+			notice.setTitle("營運部已發佈新消息，請查閱");
+			notice.setBusinessType("returns");
+			notice.setDeptId(dept.getId()+"");
+			notice.setRoleId(null);
+			boolean result = noticeService.sendNotice(notice);
+
+		}
+
+		return R.status(true);
 	}
 
 

src/main/java/org/springblade/modules/desk/controller/NoticeController.java

@@ -127,6 +127,50 @@ public class NoticeController extends BladeController {
 		return R.data(pages);
 	}
 
+	@GetMapping("/myNoticePage")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入notice")
+	public R<IPage<NoticeVO>> myNoticePage(@ApiIgnore NoticeVO notice, Query query) {
+		notice.setCreateUser(AuthUtil.getUserId());
+		notice.setCurrentUserId(AuthUtil.getUserId());
+		IPage<NoticeVO> pages = noticeService.selectMyNoticePage(Condition.getPage(query), notice);
+
+		List<NoticeVO> list = new ArrayList<>();
+		for (int i = 0; i < pages.getRecords().size(); i++) {
+			Notice item = pages.getRecords().get(i);
+			NoticeVO noticeVO = Objects.requireNonNull(BeanUtil.copy(item, NoticeVO.class));
+
+			List<String> roleName = SysCache.getRoleNames(noticeVO.getRoleId());
+			List<String> deptName = SysCache.getDeptNames(noticeVO.getDeptId());
+			noticeVO.setRoleName(Func.join(roleName));
+			noticeVO.setDeptName(Func.join(deptName));
+			List<User> userList = userService.getUsersByIds(noticeVO.getTargetIds());
+			List<String> targetNames = userList.stream().map(user -> user.getName()).collect(Collectors.toList());
+			String join = StringUtil.join(targetNames, " | ");
+			noticeVO.setTargetNames(join);
+
+			Integer hadRead = 0;
+			if (noticeVO.getReadIds() != null && noticeVO.getReadIds().contains(AuthUtil.getUserId()+"")){
+				hadRead = 1;
+			}
+			noticeVO.setHadRead(hadRead);
+
+			if (noticeVO.getType().equals("0")){
+				noticeVO.setCreateUserName("系統");
+			}else{
+				User user = userService.getById(noticeVO.getCreateUser());
+				noticeVO.setCreateUserName(user.getName());
+			}
+
+			list.add(noticeVO);
+		}
+
+		pages.setRecords(list);
+		return R.data(pages);
+	}
+
+
+
 	/**
 	 * 新增
 	 */
@@ -155,7 +199,6 @@ public class NoticeController extends BladeController {
 	@ApiOperation(value = "新增或修改", notes = "传入notice")
 	public R submit(@RequestBody Notice notice) {
 
-		notice.setReadIds(AuthUtil.getUserId()+"");
 		if (StringUtil.isBlank(notice.getTargetIds())){
 			List<String> deptIds = Func.toStrList(notice.getDeptId());
 			List<String> roleIds = Func.toStrList(notice.getRoleId());
@@ -178,4 +221,46 @@ public class NoticeController extends BladeController {
 		return R.status(temp);
 	}
 
+	/**
+	 * 已讀記錄
+	 */
+	@PostMapping("/setHadRead")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "已讀記錄", notes = "传入notice")
+	public R setHadRead(@ApiParam(value = "主键集合") @RequestParam String ids) {
+		List<Long> longs = Func.toLongList(ids);
+		longs.forEach(id -> {
+			Notice notice = noticeService.getById(id);
+			if (notice.getReadIds() == null){
+				notice.setReadIds(AuthUtil.getUserId()+"");
+			}else{
+				notice.setReadIds(notice.getReadIds() + "," + AuthUtil.getUserId());
+			}
+			noticeService.updateById(notice);
+		});
+		return R.status(true);
+	}
+
+	/**
+	 * 已讀記錄
+	 */
+	@PostMapping("/setAllHadRead")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "已讀記錄", notes = "传入notice")
+	public R setAllHadRead() {
+
+		List<Notice> list = noticeService.selectMyNoticeAll();
+
+		list.forEach(notice -> {
+			if (notice.getReadIds() == null){
+				notice.setReadIds(AuthUtil.getUserId()+"");
+			}else{
+				notice.setReadIds(notice.getReadIds() + "," + AuthUtil.getUserId());
+			}
+		});
+		return R.status(noticeService.updateBatchById(list));
+	}
+
+
+
 }

src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.java

@@ -18,6 +18,7 @@ package org.springblade.modules.desk.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.DataAuth;
 import org.springblade.core.datascope.enums.DataScopeEnum;
 import org.springblade.modules.desk.entity.Notice;
@@ -50,4 +51,7 @@ public interface NoticeMapper extends BaseMapper<Notice> {
 //	@DataAuth(type = DataScopeEnum.OWN_DEPT_CHILD)
 	List<NoticeVO> selectNoticePage(IPage page, NoticeVO notice);
 
+	List<NoticeVO> selectMyNoticePage(IPage page, NoticeVO notice);
+
+	List<Notice> selectMyNoticePage(@Param("notice") NoticeVO notice);
 }

src/main/java/org/springblade/modules/desk/mapper/NoticeMapper.xml

@@ -41,23 +41,48 @@
         select * from blade_notice limit #{number}
     </select>
 
-    <select id="selectNoticePage" resultMap="noticeVOResultMap">
-        (SELECT n.* FROM blade_notice n
+    <select id="selectMyNoticePage" resultMap="noticeVOResultMap">
+        SELECT
+        n.*,
+        d.dict_value AS categoryName
+        FROM
+        blade_notice n
+        LEFT JOIN ( SELECT * FROM blade_dict WHERE CODE = 'notice' ) d ON n.category = d.dict_key
         WHERE
         n.is_deleted = 0 and n.tenant_id = #{notice.tenantId}
+        <if test="notice.currentUserId!=null">
+            AND n.target_ids like '%${notice.currentUserId}%'
+        </if>
+
         <if test="notice.title!=null">
             and n.title like concat(concat('%', #{notice.title}), '%')
         </if>
         <if test="notice.category!=null">
             and n.category = #{notice.category}
         </if>
-        <if test="notice.currentUserId!=null">
-            AND n.target_ids like '%${notice.currentUserId}%'
+        <if test="notice.hadRead!=null">
+            <if test="notice.hadRead==0">
+                and ( n.read_ids not like '%${notice.currentUserId}%' or n.read_ids is null )
+            </if>
+            <if test="notice.hadRead==1">
+                and n.read_ids like '%${notice.currentUserId}%'
+            </if>
         </if>
-        )
+        <if test="notice.id!=null">
+            and n.id = #{notice.id}
+        </if>
+    </select>
 
-        union
+    <select id="selectNoticePage" resultMap="noticeVOResultMap">
         select n.* from blade_notice n where n.is_deleted = 0 and n.create_user = #{notice.createUser}
+        <if test="notice.title!=null">
+            and n.title like concat(concat('%', #{notice.title}), '%')
+        </if>
+        <if test="notice.category!=null">
+            and n.category = #{notice.category}
+        </if>
+
+
 
     </select>
 </mapper>

src/main/java/org/springblade/modules/desk/service/INoticeService.java

@@ -23,6 +23,8 @@ import org.springblade.core.mp.base.BaseService;
 import org.springblade.modules.desk.entity.Notice;
 import org.springblade.modules.desk.vo.NoticeVO;
 
+import java.util.List;
+
 /**
  * 服务类
  *
@@ -38,4 +40,9 @@ public interface INoticeService extends BaseService<Notice> {
 	 */
 	IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice);
 
+	IPage<NoticeVO> selectMyNoticePage(IPage<NoticeVO> page, NoticeVO notice);
+
+    List<Notice> selectMyNoticeAll();
+
+	boolean sendNotice(Notice notice);
 }

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -17,24 +17,35 @@
 package org.springblade.modules.desk.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.AllArgsConstructor;
 import org.springblade.core.datascope.annotation.DataAuth;
 import org.springblade.core.datascope.enums.DataScopeEnum;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.desk.entity.Notice;
 import org.springblade.modules.desk.mapper.NoticeMapper;
 import org.springblade.modules.desk.service.INoticeService;
 import org.springblade.modules.desk.vo.NoticeVO;
+import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IUserService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * 服务实现类
  *
  * @author Chill
  */
 @Service
+@AllArgsConstructor
 public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> implements INoticeService {
 
+	private final IUserService userService;
+
 	@Override
 	public IPage<NoticeVO> selectNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
 		// 若不使用mybatis-plus自带的分页方法，则不会自动带入tenantId，所以我们需要自行注入
@@ -42,4 +53,33 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 		return page.setRecords(baseMapper.selectNoticePage(page, notice));
 	}
 
+	@Override
+	public IPage<NoticeVO> selectMyNoticePage(IPage<NoticeVO> page, NoticeVO notice) {
+		notice.setTenantId(AuthUtil.getTenantId());
+		return page.setRecords(baseMapper.selectMyNoticePage(page, notice));
+	}
+
+	@Override
+	public List<Notice> selectMyNoticeAll() {
+		NoticeVO notice = new NoticeVO();
+		notice.setTenantId(AuthUtil.getTenantId());
+		notice.setCurrentUserId(AuthUtil.getUserId());
+		notice.setHadRead(0);
+		return baseMapper.selectMyNoticePage(notice);
+	}
+
+	@Override
+	public boolean sendNotice(Notice notice) {
+		notice.setType("0"); //系統
+		if (StringUtil.isBlank(notice.getTargetIds())){
+			List<String> deptIds = Func.toStrList(notice.getDeptId());
+			List<String> roleIds = Func.toStrList(notice.getRoleId());
+			List<User> userList = userService.getUsersByDeptIdsRoleIds(deptIds, roleIds);
+			List<Long> userIdList = userList.stream().map(user -> user.getId()).collect(Collectors.toList());
+			String join = StringUtil.join(userIdList);
+			notice.setTargetIds(join);
+		}
+		return save(notice);
+	}
+
 }

src/main/java/org/springblade/modules/desk/vo/NoticeVO.java

@@ -31,4 +31,7 @@ public class NoticeVO extends Notice {
 	 * 部门名
 	 */
 	private String deptName;
+	private String createUserName;
+
+	private Integer hadRead;
 }

src/main/java/org/springblade/modules/system/controller/UserController.java

@@ -368,7 +368,6 @@ public class UserController {
 	@GetMapping("/getUsersByDeptIdsRoleIds")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "列表", notes = "传入account和realName")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
 	public R getUsersByDeptIdsRoleIds(String deptIds, String roleIds) {
 		List<String> deptIdList = null;
 		List<String> roleIdsList= null;

src/main/java/org/springblade/modules/system/service/IUserService.java

@@ -215,4 +215,6 @@ public interface IUserService extends BaseService<User> {
 	List<User> getUsersByDeptIdsRoleIds(List<String> deptIds, List<String> roleIds);
 
 	List<User> getUsersByIds(String targetIds);
+
+    User getUserByEhr(String ehr);
 }

src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -19,6 +19,7 @@ package org.springblade.modules.system.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -598,4 +599,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, User> implement
 		});
 		return list;
 	}
+
+	@Override
+	public User getUserByEhr(String ehr) {
+		return getOne(new QueryWrapper<>(new User()).lambda().eq(User::getEhr, ehr));
+	}
 }