update:公告启用/禁用

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/controller/HelpCenterContentController.java

@@ -73,12 +73,6 @@ public class HelpCenterContentController extends BaseController {
 				return failed("未找到相关信息");
 			}
 
-			if (helpCenterContent.getCatalogId() ==2) {
-				if (helpCenterContent.getReleaseStatus() == 1) {
-					return failed("公告已发布不能修改");
-				}
-			}
-
 			if (helpCenterContent.getStatus() == 1) {
 				return failed("启用状态下，不能修改");
 			}
@@ -116,11 +110,6 @@ public class HelpCenterContentController extends BaseController {
 		if (helpCenterContent == null) {
 			return failed("未找到相关信息");
 		}
-		if (helpCenterContent.getCatalogId() ==2) {
-			if (helpCenterContent.getReleaseStatus() == 1) {
-				return failed("公告已发布不能修改");
-			}
-		}
 		if (helpCenterContent.getStatus() == 1) {
 			return failed("启用状态下，不能删除");
 		}
@@ -137,9 +126,6 @@ public class HelpCenterContentController extends BaseController {
 		if (helpCenterContent == null) {
 			return failed("未找到相关信息");
 		}
-		if (helpCenterContent.getCatalogId() == 2) {
-			return failed("公告不可禁用");
-		}
 		return succeed(helpCenterContentService.status(id));
 	}
 

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/HelpCenterContentDao.java

@@ -35,4 +35,12 @@ public interface HelpCenterContentDao extends BaseDAO<Long, HelpCenterContent> {
      * @return
      */
     List<HelpCenterContent> selectNeedReleaseNotice();
+
+    /**
+     * 查看状态为启用的公告
+     *
+     * @param status
+     * @return
+     */
+    Integer selectByNoticeStatus(@Param("status") Integer status);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/dal/dao/SysNewsInformationDao.java

@@ -79,4 +79,6 @@ public interface SysNewsInformationDao extends BaseDAO<Long, SysNewsInformation>
 	 * @return
 	 */
 	String selectAppVersionInfo(@Param("platform") String platform, @Param("version") String version);
+
+	Integer selectByStatus(Integer status);
 }

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/HelpCenterContentServiceImpl.java

@@ -4,6 +4,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.yonge.cooleshow.cms.dal.entity.NewsStatusEnum;
+import com.yonge.cooleshow.cms.dto.SysNewsInformationDto;
+import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.mybatis.service.impl.BaseServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -45,6 +48,20 @@ public class HelpCenterContentServiceImpl extends BaseServiceImpl<Long, HelpCent
     @Override
 	@Transactional
     public boolean status(Long id) {
+		HelpCenterContent helpCenterContent = contentCenterDao.get(id);
+		if (helpCenterContent.getCatalogId() != 2) {
+			contentCenterDao.status(id);
+			return true;
+		}
+		if (helpCenterContent.getStatus().equals(NewsStatusEnum.SHOW.getCode())) {
+			contentCenterDao.status(id);
+			return true;
+		}
+		Integer count = contentCenterDao.selectByNoticeStatus(NewsStatusEnum.SHOW.getCode());
+
+		if (count >0) {
+			throw  new BizException("有正在启用的广告");
+		}
 
 		contentCenterDao.status(id);
 		return true;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/service/impl/SysNewsInformationServiceImpl.java

@@ -188,10 +188,10 @@ public class SysNewsInformationServiceImpl extends BaseServiceImpl<Long, SysNews
 			return true;
 		}
 
-		Integer count = sysNewsInformationDao.selectByVersionAndStatus(sysNewsInformationDto.getAttribute1(),NewsStatusEnum.SHOW.getCode());
+		Integer count = sysNewsInformationDao.selectByVersionAndStatus(null,NewsStatusEnum.SHOW.getCode());
 
 		if (count >0) {
-			throw  new BizException("有正在启用的公告");
+			throw  new BizException("有正在启用的广告");
 		}
 		sysNewsInformationDao.updateStatus(id);
 		return true;

cooleshow-cms/src/main/java/com/yonge/cooleshow/cms/task/NoticeReleaseTask.java

@@ -31,7 +31,7 @@ public class NoticeReleaseTask {
     /**
      * 公告发布轮询
      */
-    @GetMapping("/noticeRelease")
+    // @GetMapping("/noticeRelease")
     public HttpResponseResult noticeRelease(){
         // 查询将要发布的公告 (0 ~ 当前时间 + 5 min 的未发布的公告) 循环发布
         List<HelpCenterContent> helpCenterContents = helpCenterContentService.getNeedReleaseNotice();

cooleshow-cms/src/main/resources/config/mybatis/HelpCenterContentMapper.xml

@@ -31,8 +31,8 @@
 				and content.title_ like '%' #{title} '%'
 			</if>
 			<if test="status!= null">
-				and ((content.status_ = #{status} and content.catalog_id_ = 1)
-					or (content.release_status_ = #{status} and content.catalog_id_ = 2))
+			and ((content.status_ = #{status} and content.catalog_id_ = 1)
+				or (content.status_ = #{status} and content.catalog_id_ = 2 and content.release_time_ &lt;= now()))
 			</if>
 			<if test="catalogType != null and catalogType != ''">
 				and content.catalog_type_ = #{catalogType}
@@ -239,4 +239,15 @@
 		and content.catalog_id_ = 2
 		and content.release_status_ = 0
 	</select>
+
+	<select id="selectByNoticeStatus" resultType="java.lang.Integer">
+		select count(1)
+		from help_center_content hcc
+		<where>
+			hcc.catalog_id_ = 2
+			<if test="status != null">
+				and hcc.status_ = #{status}
+			</if>
+		</where>
+	</select>
 </mapper>

cooleshow-cms/src/main/resources/config/mybatis/SysNewsInformationMapper.xml

@@ -107,62 +107,26 @@
 			<if test="status != null">
 				status_ = #{status, typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},
 			</if>
-			<if test="title != null">
 				title_ = #{title},
-			</if>
-			<if test="updateTime != null">
 				update_time_ = NOW(),
-			</if>
-			<if test="content != null">
 				content_ = #{content},
-			</if>
-			<if test="coverImage != null">
 				cover_image_ = #{coverImage},
-			</if>
-			<if test="videoCoverImage != null">
 				video_cover_image_ = #{videoCoverImage},
-			</if>
-			<if test="type != null">
 				type_ = #{type},
-			</if>
 				online_time_ = #{onlineTime},
 				offline_time_ = #{offlineTime},
-			<if test="subType != null and subType != ''">
 				sub_type_ = #{subType},
-			</if>
-			<if test="linkUrl != null">
 				link_url_ = #{linkUrl},
-			</if>
-			<if test="hrefTarget != null">
 				href_target_ = #{hrefTarget},
-			</if>
-			<if test="order != null">
 				order_ = #{order},
-			</if>
-			<if test="memo != null">
 				memo_ = #{memo},
-			</if>
-			<if test="delFlag != null">
 				del_flag_ = #{delFlag},
-			</if>
-			<if test="attribute1 != null">
 				attribute1_ = #{attribute1},
-			</if>
-			<if test="attribute2 != null">
 				attribute2_ = #{attribute2},
-			</if>
-			<if test="subjectIdList != null">
 				subject_id_list_ = #{subjectIdList},
-			</if>
-			<if test="updateBy != null">
 				update_by_ = #{updateBy},
-			</if>
-			<if test="linkType != null">
 				link_type_ = #{linkType},
-			</if>
-			<if test="showTime != null">
 				show_time_ = #{showTime}
-			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseGroupServiceImpl.java

@@ -915,11 +915,11 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
                             .set(CourseSchedule::getStatus, CourseScheduleEnum.CANCEL.getCode())
                     );
                     // 直播课成课失败通知
-                    SysUser user = sysUserFeignService.queryUserById(courseGroup.getTeacherId());
-                    Map<Long, String> receivers = new HashMap<>();
-                    receivers.put(user.getId(), user.getPhone());
                     // 发短信
                     try {
+                        SysUser user = sysUserFeignService.queryUserById(courseGroup.getTeacherId());
+                        Map<Long, String> receivers = new HashMap<>();
+                        receivers.put(user.getId(), user.getPhone());
                         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_LIVE_COMPLETION_FAIL,
                                                            receivers, null, 0, null, null,
                                                            courseGroup.getName());
@@ -929,6 +929,9 @@ public class CourseGroupServiceImpl extends ServiceImpl<CourseGroupDao, CourseGr
 
                     // 发推送
                     try {
+                        SysUser user = sysUserFeignService.queryUserById(courseGroup.getTeacherId());
+                        Map<Long, String> receivers = new HashMap<>();
+                        receivers.put(user.getId(), user.getPhone());
                         sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.LIVE_COMPLETION_FAIL,
                                                            receivers, null, 0, null, ClientEnum.TEACHER.getCode(),
                                                            courseGroup.getName());