From 166fde2e520ae7760384a6e951bd27337ecd7c2e Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Wed, 10 Dec 2025 18:01:53 +0800 Subject: [PATCH] commit --- .../app/sys/controller/SysHomeController.java | 51 +++++-------------- .../impl/SysClubEvaluateServiceImpl.java | 2 +- .../controller/CondolenceMineController.java | 4 ++ .../resources/views/layouts/v4/home/jcdt.js | 2 +- 4 files changed, 19 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java index ea7d6bd..dd9a77e 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysHomeController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysHomeController.java @@ -271,44 +271,19 @@ public class SysHomeController { JSONObject root = new JSONObject(); - // 1. 新闻快讯（来自 .list1） - List newsArray = new ArrayList<>(); - Elements newsItems = doc.select(".post .post1 .post-15 .mbox"); - for (Element item : newsItems) { - String date = item.select(".date").text().trim(); - Element link = item.select("a.text").first(); - String title = link.select(".title").text().trim(); - String url = link.attr("href").trim(); - - JSONObject node = new JSONObject(); - node.set("title", title); - node.set("date", date); - node.set("url", domain + url); - newsArray.add(node); - } - root.set("news", newsArray); - - // 2. 通知公告（来自 .list2） - List noticesArray = new ArrayList<>(); - Elements noticeItems = doc.select(".group2 .list2 li"); - for (Element item : noticeItems) { - String date = item.select(".date").text().trim(); - Element link = item.select("a.title").first(); - String title = link.text().trim(); - String url = link.attr("href").trim(); - JSONObject node = new JSONObject(); - node.set("title", title); - node.set("date", date); - node.set("url", domain + url); - noticesArray.add(node); - } - root.set("notices", noticesArray); - // 3. 基层风采（来自 .pic-list1） List grassrootsArray = new ArrayList<>(); - Elements grassrootsItems = doc.select(".post-15 .news_list li"); + Elements grassrootsItems = doc.select(".post-18 .news_list li"); for (Element item : grassrootsItems) { - Element link = item.select(".nr").first(); + + Element aTitle = item.select(".news_title a").first(); + String title = aTitle.text().trim(); + String url = aTitle.attr("href").trim(); + + Element meta = item.select(".news_meta").first(); + String date = meta.text().trim(); + + /*Element link = item.select(".nr").first(); String date = link.select(".date").text().trim(); String title = link.select(".news_title a").text().trim(); String url = link.select(".news_title a").attr("href").trim(); @@ -318,14 +293,14 @@ public class SysHomeController { Element img = link.select(".news_imgs").first(); if (img != null) { imageUrl = img.attr("src").trim(); - } + }*/ JSONObject node = new JSONObject(); node.set("title", title); node.set("date", date); node.set("url", domain + url); - node.set("summary", summary); - node.set("image", StrUtil.isNotBlank(imageUrl) ? (domain + imageUrl) : ""); + //node.set("summary", summary); + //node.set("image", StrUtil.isNotBlank(imageUrl) ? (domain + imageUrl) : ""); grassrootsArray.add(node); } root.set("grassroots", grassrootsArray); diff --git a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java index 17a3db5..e0b4f09 100644 --- a/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java +++ b/src/main/java/com/budwk/app/zhgh/club/service/impl/SysClubEvaluateServiceImpl.java @@ -103,7 +103,7 @@ public class SysClubEvaluateServiceImpl extends BaseServiceImpl @Override public Pagination schoolLeaderAuditPageData(ClubUserPageForm pageForm) { Cnd cnd = Cnd.NEW(); - cnd.and("t.taskName", "=", "ec81591d-da91-412a-90c9-df853dcef478"); + cnd.and("t.taskName", "=", "ea4048e2-2664-4dcb-a4f7-1f5e413abbb0"); cnd.and("ta.actorId", "in", List.of(SecurityUtil.getUserId())); Sql sql = generateSql(pageForm, cnd); return listPageVO(pageForm, sql, ClubEvaluatePageVo.class); diff --git a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java index ad5f339..99cebbd 100644 --- a/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java +++ b/src/main/java/com/budwk/app/zhgh/staffbenefit/condolence/controller/CondolenceMineController.java @@ -9,6 +9,7 @@ import com.budwk.app.base.constant.RoleConstant; import com.budwk.app.base.page.Pagination; import com.budwk.app.base.param.PageForm; import com.budwk.app.base.result.Result; +import com.budwk.app.base.sms.SmsService; import com.budwk.app.base.utils.PageUtil; import com.budwk.app.flow.engine.FlowEngine; import com.budwk.app.sys.views.View_user; @@ -136,6 +137,9 @@ public class CondolenceMineController { CondolenceType type = condolenceService.dao().fetch(CondolenceType.class, Cnd.where(CondolenceType::getId, "=", condolence.getType())); NutMap nutMap = Lang.obj2nutmap(condolence); nutMap.put("typeName", type.getName()); + //smsService.send("20182040", "这是一条由智慧工会系统发出的测试消息。"); return Result.success(nutMap); } + @Inject + private SmsService smsService; } diff --git a/src/main/resources/views/layouts/v4/home/jcdt.js b/src/main/resources/views/layouts/v4/home/jcdt.js index bfb0cde..ea0cd28 100644 --- a/src/main/resources/views/layouts/v4/home/jcdt.js +++ b/src/main/resources/views/layouts/v4/home/jcdt.js @@ -3,7 +3,7 @@ const jcdt = {
- 基层动态 + 通知公告