From 62eb499b0c969f246d3245d1429a97da4de1ce28 Mon Sep 17 00:00:00 2001
From: 钟日健 <arsn163@163.com>
Date: Mon, 01 Jun 2026 20:46:13 +0800
Subject: [PATCH] feat: 成绩查询增加年龄查询返回
---
src/main/java/org/springblade/modules/desk/controller/NoticeController.java | 75 +++++++++++++++++++++++++++++++------
1 files changed, 62 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
index 8b42da3..5d89134 100644
--- a/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/NoticeController.java
@@ -29,15 +29,20 @@
import org.springblade.core.tenant.annotation.TenantDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.desk.entity.Notice;
import org.springblade.modules.desk.service.INoticeService;
import org.springblade.modules.desk.vo.NoticeVO;
import org.springblade.modules.desk.wrapper.NoticeWrapper;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.service.IDeptService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
import java.util.Map;
/**
@@ -56,6 +61,7 @@
private final INoticeService noticeService;
private final IDeptService iDeptService;
+ private final MyAsyncService myAsyncService;
/**
* 详情
@@ -94,13 +100,6 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入notice")
public R<IPage<NoticeVO>> page(@ApiIgnore NoticeVO notice, Query query) {
- //通过deptId获取组织机构信息
- Dept dept = iDeptService.getById(notice.getDeptId());
-// if (dept.getDeptCategory() == 1) {
-// notice.setCategory(1);
-// } else {
-// notice.setCategory(2);
-// }
IPage<NoticeVO> pages = noticeService.selectNoticePage(Condition.getPage(query), notice);
return R.data(pages);
}
@@ -131,10 +130,54 @@
@PostMapping("/submit")
@ApiOperationSupport(order = 6)
@ApiOperation(value = "新增或修改", notes = "传入notice")
- public R submit(@RequestBody Notice notice) throws Exception {
- //调用内网
- arg.test01(arg.url+"/blade-desk/notice/submit",notice);
- return R.status(noticeService.saveOrUpdate(notice));
+ public R submit(@RequestBody Notice notice) {
+ boolean status = false;
+ if (null == notice.getId()) {
+ //新增
+ status = noticeService.save(notice);
+ notice.setIsDeleted(0);
+ if (status) {
+ //数据同步
+ String s1 =
+ "insert into blade_notice(id,title,category,release_time,content,create_user,create_dept,create_time,is_deleted,dept_id,cover_url,type) " +
+ "values(" + "'" + notice.getId() + "'" + "," +
+ "'" + notice.getTitle() + "'" + "," +
+ "'" + notice.getCategory() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(notice.getReleaseTime()) + "'" + "," +
+ "'" + notice.getContent() + "'" + "," +
+ "'" + notice.getCreateUser() + "'" + "," +
+ "'" + notice.getCreateDept() + "'" + "," +
+ "'" + new SimpleDateFormat("yyyy-MM-dd").format(notice.getCreateTime()) + "'" + "," +
+ "'" + notice.getIsDeleted() + "'" + "," +
+ "'" + notice.getDeptId() + "'" + "," +
+ "'" + notice.getCoverUrl() + "'" + "," +
+ "'" + notice.getType() + "'" + ")";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ } else {
+ //修改
+ status = noticeService.updateById(notice);
+ if (status) {
+ //内网同步
+ String s1 =
+ "update blade_notice set title = " + "'" + notice.getTitle() + "'" +
+ ",category = " + "'" + notice.getCategory() + "'" +
+ ",release_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(notice.getReleaseTime()) + "'" +
+ ",content = " + "'" + notice.getContent() + "'" +
+ ",create_user = " + "'" + notice.getCreateUser() + "'" +
+ ",create_dept = " + "'" + notice.getCreateDept() + "'" +
+ ",create_time = " + "'" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(notice.getCreateTime()) + "'" +
+ ",is_deleted = " + "'" + notice.getIsDeleted() + "'" +
+ ",dept_id = " + "'" + notice.getDeptId() + "'" +
+ ",cover_url = " + "'" + notice.getCoverUrl() + "'" +
+ ",type = " + "'" + notice.getType() + "'" +
+ " " + "where id = " + "'" + notice.getId() + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ }
+ }
+ return R.status(status);
}
/**
@@ -144,8 +187,14 @@
@ApiOperationSupport(order = 7)
@ApiOperation(value = "逻辑删除", notes = "传入notice")
public R remove(@ApiParam(value = "主键集合") @RequestParam String ids) throws Exception {
- //调用内网
-// arg.test01(arg.url+"/blade-desk/notice/remove",ids);
+ //内网删除
+ List<Long> list = Func.toLongList(ids);
+ list.forEach(id -> {
+ //内网同步
+ String s1 = "delete from blade_notice where id = " + "'" + id + "'";
+ //FtpUtil.sqlFileUpload(s1);
+ myAsyncService.dataSync(s1);
+ });
boolean temp = noticeService.deleteLogic(Func.toLongList(ids));
return R.status(temp);
}
--
Gitblit v1.9.3