he2802 3 лет назад
Родитель
Сommit
daaefc778c

+ 22 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/inform/InformSysUserController.java

@@ -61,6 +61,17 @@ public class InformSysUserController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取通知绑定系统用户详细信息
+     */
+    @ApiOperation("获取通知绑定教务用户未读消息数量")
+    @PreAuthorize("@ss.hasPermi('system:user:query')")
+    @GetMapping("/informUnReadSum")
+    public AjaxResult<Integer> informUnReadSum() {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        return AjaxResult.success(iInformSysUserService.informUnReadSum(loginUser.getUser().getUserId()));
+    }
+
 
 
     /**
@@ -96,4 +107,15 @@ public class InformSysUserController extends BaseController {
     }
 
 
+    /**
+     * 修改通知绑定系统用户
+     */
+    @ApiOperation("批量修改通知绑定系统用户状态")
+    @PreAuthorize("@ss.hasPermi('system:user:edit')")
+    @Log(title = "批量修改通知绑定系统用户状态", businessType = BusinessType.UPDATE)
+    @PostMapping("/updateReadStatusBatch")
+    public AjaxResult<Void> updateReadStatusBatch(@RequestBody InformSysUserEditBo bo) {
+        return toAjax(iInformSysUserService.updateReadStatusBatch(bo) ? 1 : 0);
+    }
+
 }

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformSysUserEditBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -82,4 +83,5 @@ public class InformSysUserEditBo {
     @ApiModelProperty("状态 1有效 0无效")
     private Integer status;
 
+    private List<Long> ids;
 }

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/bo/InformUserEditBo.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import java.util.Date;
+import java.util.List;
 
 
 /**

+ 5 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/IInformSysUserService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
+import com.zhongzheng.modules.inform.bo.InformUserEditBo;
 import com.zhongzheng.modules.inform.domain.InformSysUser;
 import com.zhongzheng.modules.inform.vo.InformSysUserVo;
 
@@ -35,6 +36,10 @@ public interface IInformSysUserService extends IService<InformSysUser> {
 	 */
 	Boolean insertByAddBo(InformSysUserAddBo bo);
 
+	Integer informUnReadSum(Long userId);
+
+	Boolean updateReadStatusBatch(InformSysUserEditBo bo);
+
 	/**
 	 * 根据编辑业务对象修改通知绑定系统用户
 	 * @param bo 通知绑定系统用户编辑业务对象

+ 22 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/inform/service/impl/InformSysUserServiceImpl.java

@@ -6,10 +6,13 @@ import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.modules.inform.bo.InformSysUserAddBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserEditBo;
 import com.zhongzheng.modules.inform.bo.InformSysUserQueryBo;
+import com.zhongzheng.modules.inform.bo.InformUserEditBo;
 import com.zhongzheng.modules.inform.domain.InformSysUser;
 import com.zhongzheng.modules.inform.mapper.InformSysUserMapper;
 import com.zhongzheng.modules.inform.service.IInformSysUserService;
 import com.zhongzheng.modules.inform.vo.InformSysUserVo;
+import com.zhongzheng.modules.user.domain.User;
+import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -85,6 +88,25 @@ public class InformSysUserServiceImpl extends ServiceImpl<InformSysUserMapper, I
         return this.save(add);
     }
 
+    @Override
+    public Integer informUnReadSum(Long userId) {
+        return count(new LambdaQueryWrapper<InformSysUser>()
+                .eq(InformSysUser::getUserId,userId).eq(InformSysUser::getReceiptStatus,0).eq(InformSysUser::getSystemStatus,1)
+                .eq(InformSysUser::getStatus,1));
+    }
+
+    @Override
+    public Boolean updateReadStatusBatch(InformSysUserEditBo bo) {
+        boolean result = false;
+        for(Long id : bo.getIds()){
+            InformSysUserEditBo editBo = new InformSysUserEditBo();
+            editBo.setId(id);
+            editBo.setReceiptStatus(bo.getReceiptStatus());
+            result = updateByEditBo(editBo);
+        }
+        return result;
+    }
+
     @Override
     public Boolean updateByEditBo(InformSysUserEditBo bo) {
         InformSysUser update = BeanUtil.toBean(bo, InformSysUser.class);

+ 17 - 2
zhongzheng-system/src/main/java/com/zhongzheng/modules/schedule/service/impl/ScheduleServiceImpl.java

@@ -1598,6 +1598,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(28L);
                     informUserAddBo.setSystemStatus(1);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您新开通的课程已有2天,尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
@@ -1614,6 +1615,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setRemindId(28L);
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setRemind("您新开通的课程已有2天,尽快去学习吧");
                     informUserAddBo.setGoodsId(goodsVo.getGoodsId());
                     informUserAddBo.setText("您开通《"+goods.getGoodsName()+"》课程已有2天,但未开始学习,请尽快去学习吧。");
@@ -1631,6 +1633,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setSendTime(DateUtils.getNowTime());
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setRemindId(28L);
                     informUserAddBo.setSystemStatus(4);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
@@ -1678,6 +1681,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(29L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您新开通的课程已有5天,尽快去学习吧");
@@ -1693,6 +1697,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(29L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您新开通的课程已有5天,尽快去学习吧");
@@ -1713,6 +1718,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(29L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(4);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您新开通的课程已有5天,尽快去学习吧");
@@ -1763,6 +1769,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(30L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("学员学习提醒,请尽快处理");
@@ -1778,6 +1785,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(30L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("学员学习提醒,请尽快处理");
@@ -1823,6 +1831,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(31L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您已超过3天没有学习课程,尽快去学习吧");
@@ -1838,6 +1847,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(31L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您已超过3天没有学习课程,尽快去学习吧");
@@ -1858,6 +1868,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(31L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(4);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您已超过3天没有学习课程,尽快去学习吧");
@@ -1903,6 +1914,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(32L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您已超过5天没有学习课程,尽快去学习吧");
@@ -1918,6 +1930,7 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
                     informUserAddBo.setRemindId(32L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("您已超过5天没有学习课程,尽快去学习吧");
@@ -1987,7 +2000,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setSendTime(DateUtils.getNowTime());
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-                    informUserAddBo.setRemindId(30L);
+                    informUserAddBo.setRemindId(33L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(1);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("学员学习提醒,请尽快处理");
@@ -2002,7 +2016,8 @@ public class ScheduleServiceImpl extends ServiceImpl<PolyvVideoMapper, PolyvVide
                     informUserAddBo.setSendTime(DateUtils.getNowTime());
                     informUserAddBo.setCreateTime(DateUtils.getNowTime());
                     informUserAddBo.setUpdateTime(DateUtils.getNowTime());
-                    informUserAddBo.setRemindId(30L);
+                    informUserAddBo.setRemindId(33L);
+                    informUserAddBo.setGradeId(goodsVo.getGradeId());
                     informUserAddBo.setSystemStatus(3);
                     informUserAddBo.setOrderGoodsId(goodsVo.getOrderGoodsId());
                     informUserAddBo.setRemind("学员学习提醒,请尽快处理");