From 1b6d2c787e05600ec08b3811e181e55604009ce9 Mon Sep 17 00:00:00 2001 From: JyuHsin <729757837@qq.com> Date: Mon, 13 Oct 2025 17:08:38 +0800 Subject: [PATCH] commit --- .../controller/site/SiteRecordController.java | 106 +++++++++++++++++- .../activity/services/SiteReserveService.java | 2 +- .../services/impl/SiteReserveServiceImpl.java | 2 +- .../java/io/v/nutz/base/utils/MsgApi.java | 2 +- .../controller/TrainEduVideoController.java | 38 ++++--- src/main/resources/templates/site/site.xlsx | Bin 0 -> 10663 bytes .../platform/activity/site/SiteRecord.html | 30 ++++- .../views/platform/trainEdu/video.html | 19 ++-- 8 files changed, 162 insertions(+), 37 deletions(-) create mode 100644 src/main/resources/templates/site/site.xlsx diff --git a/src/main/java/io/v/nutz/activity/controller/site/SiteRecordController.java b/src/main/java/io/v/nutz/activity/controller/site/SiteRecordController.java index 76c441c..e56caff 100644 --- a/src/main/java/io/v/nutz/activity/controller/site/SiteRecordController.java +++ b/src/main/java/io/v/nutz/activity/controller/site/SiteRecordController.java @@ -1,10 +1,15 @@ package io.v.nutz.activity.controller.site; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.util.StrUtil; import io.v.nutz.activity.services.SiteReserveService; import io.v.nutz.annontation.ViReturn; import io.v.nutz.base.utils.PageUtil; import io.v.nutz.sys.models.Sys_user; import io.v.nutz.util.ShiroUtil; +import org.apache.poi.ss.usermodel.Workbook; import org.apache.shiro.authz.annotation.RequiresAuthentication; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.nutz.dao.Cnd; @@ -12,10 +17,18 @@ import org.nutz.dao.Sqls; import org.nutz.dao.sql.Sql; import org.nutz.ioc.loader.annotation.Inject; import org.nutz.ioc.loader.annotation.IocBean; +import org.nutz.json.Json; +import org.nutz.lang.Lang; import org.nutz.lang.Strings; +import org.nutz.lang.util.NutMap; import org.nutz.mvc.annotation.At; import org.nutz.mvc.annotation.Ok; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.List; +import java.util.stream.Collectors; + /** * @FileName io.v.nutz.activity.controller.site.SiteRecordController * @Description: 预约记录查询 @@ -41,7 +54,7 @@ public class SiteRecordController { @At @ViReturn - public Object pageData(String month, String siteType, String searchName, String searchKeyword, int pageNumber, int pageSize, String pageOrderName, String pageOrderBy) { + public Object pageData(String startTime, String endTime, String siteType, String searchName, String searchKeyword, int pageNumber, int pageSize, String pageOrderName, String pageOrderBy) { Cnd cnd = Cnd.NEW(); Sql sql = Sqls.create(""" @@ -64,6 +77,9 @@ public class SiteRecordController { $condition """); + cnd.andEX("reserve_day", ">=", startTime); + cnd.andEX("reserve_day", "<=", endTime); + if (ShiroUtil.hasAnyRoles(new String[]{"gh10"})) { Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); cnd.and("u.unitid", "=", user.getUnitid()); @@ -73,10 +89,6 @@ public class SiteRecordController { cnd.and("asi.typeId", "=", siteType); } - if (Strings.isNotBlank(month)) { - cnd.and("left(reserve_day, 7)", "=", month); - } - if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { cnd.where().andLike(searchName, searchKeyword); } @@ -84,7 +96,7 @@ public class SiteRecordController { if (Strings.isNotBlank(pageOrderName) && Strings.isNotBlank(pageOrderName)) { cnd.orderBy(pageOrderName, PageUtil.getOrder(pageOrderBy)); } else { - cnd.asc("asr.reserve_state").desc("u.unitid"); + cnd.desc("reserve_day").asc("asi.sortNum"); } cnd.groupBy("sqid"); @@ -93,5 +105,87 @@ public class SiteRecordController { return siteReserveService.listPage(pageNumber, pageSize, sql); } + @At + @Ok("void") + public void exportExcel(String startTime, + String endTime, + String siteType, + String searchName, + String searchKeyword, HttpServletResponse response) throws IOException { + Cnd cnd = Cnd.NEW(); + Sql sql = Sqls.create(""" + SELECT + asr.*, + asi.address, + asi.`name` site_name, + ass.`stateName` state_name, + ass.`stateColor` state_color, + ass.stateAuditType, + count(sqid) days, + u.loginname, + GROUP_CONCAT(reserve_day order by reserve_day asc) concat_day + FROM + activity_site_reserve asr + LEFT JOIN + activity_site_info asi ON asi.id = asr.site_id + LEFT JOIN + audit_state ass ON ass.stateId = asr.reserve_state + LEFT JOIN + sys_user u on u.id = asr.reserve_person_id + $condition + """); + cnd.andEX("reserve_day", ">=", startTime); + cnd.andEX("reserve_day", "<=", endTime); + + if (ShiroUtil.hasAnyRoles(new String[]{"gh10"})) { + Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); + cnd.and("u.unitid", "=", user.getUnitid()); + } + + if (Strings.isNotBlank(siteType)) { + cnd.and("asi.typeId", "=", siteType); + } + + if (Strings.isNotBlank(searchName) && Strings.isNotBlank(searchKeyword)) { + cnd.where().andLike(searchName, searchKeyword); + } + cnd.desc("reserve_day").asc("asi.sortNum"); + cnd.groupBy("sqid"); + + sql.setCondition(cnd); + + List listMap = siteReserveService.listMap(sql); + for (int i = 0; i < listMap.size(); i++) { + NutMap nutMap = listMap.get(i); + nutMap.put("index", i + 1); + if(StrUtil.isBlank(nutMap.getString("auditList"))) { + continue; + } + List auditList = Json.fromJsonAsList(NutMap.class, nutMap.getString("auditList")); + if(Lang.isEmpty(auditList)) { + continue; + } + String auditOption = auditList.stream().map(o -> o.getString("auditOption")).collect(Collectors.joining("；")); + nutMap.put("auditOpinion", auditOption); + } + + Sys_user user = (Sys_user) ShiroUtil.getPrincipal(); + NutMap resultMap = new NutMap(); + + resultMap.put("username", user.getUsername()); + resultMap.put("mobile", user.getMobile()); + resultMap.put("date", DateUtil.today()); + if(StrUtil.isNotBlank(startTime) && StrUtil.isNotBlank(endTime)) { + resultMap.put("time", "（统计时间" + startTime + "至" + endTime + "）"); + } + resultMap.put("list", listMap); + + response.setContentType("application/octet-stream"); + response.setHeader("Content-Disposition", "attachment;filename=" + new String(("场地预约名单.xlsx").getBytes("utf-8"), "ISO8859-1")); + + TemplateExportParams params = new TemplateExportParams("templates/site/site.xlsx"); + Workbook workbook = ExcelExportUtil.exportExcel(params, resultMap); + workbook.write(response.getOutputStream()); + } } diff --git a/src/main/java/io/v/nutz/activity/services/SiteReserveService.java b/src/main/java/io/v/nutz/activity/services/SiteReserveService.java index fc99013..0b5847f 100644 --- a/src/main/java/io/v/nutz/activity/services/SiteReserveService.java +++ b/src/main/java/io/v/nutz/activity/services/SiteReserveService.java @@ -1,8 +1,8 @@ package io.v.nutz.activity.services; -import cn.wizzer.framework.base.service.BaseService; import io.v.nutz.activity.models.ActivitySiteReserve; +import io.v.nutz.base.service.BaseService; import java.util.Map; diff --git a/src/main/java/io/v/nutz/activity/services/impl/SiteReserveServiceImpl.java b/src/main/java/io/v/nutz/activity/services/impl/SiteReserveServiceImpl.java index 6404fdc..9690b46 100644 --- a/src/main/java/io/v/nutz/activity/services/impl/SiteReserveServiceImpl.java +++ b/src/main/java/io/v/nutz/activity/services/impl/SiteReserveServiceImpl.java @@ -1,11 +1,11 @@ package io.v.nutz.activity.services.impl; -import cn.wizzer.framework.base.service.BaseServiceImpl; import io.v.nutz.activity.models.ActivitySiteInfo; import io.v.nutz.activity.models.ActivitySiteReserve; import io.v.nutz.activity.models.ActivityType; import io.v.nutz.activity.services.SiteReserveService; +import io.v.nutz.base.service.impl.BaseServiceImpl; import io.v.nutz.constant.AuditTypeEnum; import io.v.nutz.modules.models.AuditState; import org.nutz.dao.Cnd; diff --git a/src/main/java/io/v/nutz/base/utils/MsgApi.java b/src/main/java/io/v/nutz/base/utils/MsgApi.java index 56dad5d..70a32df 100644 --- a/src/main/java/io/v/nutz/base/utils/MsgApi.java +++ b/src/main/java/io/v/nutz/base/utils/MsgApi.java @@ -81,7 +81,7 @@ public class MsgApi { String content = Http.post(url, bodyMap, Sender.Default_Read_Timeout); NutMap contentMap = Json.fromJson(NutMap.class, content); log.info("成功》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》》"); - log.info(Json.toJson(contentMap)); + log.info("消息接口响应："+Json.toJson(contentMap)); if (contentMap.getString("rspCode").equals("000000")) { log.info("消息发送,发送内容" + Json.toJson(bodyMap)); } else { diff --git a/src/main/java/io/v/nutz/trainEducation/controller/TrainEduVideoController.java b/src/main/java/io/v/nutz/trainEducation/controller/TrainEduVideoController.java index 16789f1..d29318e 100644 --- a/src/main/java/io/v/nutz/trainEducation/controller/TrainEduVideoController.java +++ b/src/main/java/io/v/nutz/trainEducation/controller/TrainEduVideoController.java @@ -120,25 +120,27 @@ public class TrainEduVideoController { TrainEduVideo trainEduVideo = Json.fromJson(TrainEduVideo.class, data); //有新上传的文件采取删除旧文件 - if (file != null) { - try { - DeleteMediaResponse response = TencentVideoService.deleteFile(trainEduVideo.getFileId(), TencentVideoService.subAppId); - VodUploadResponse uploadResponse = TencentVideoService.uploadFile(file.getFile(), TencentVideoService.trainEducationClassId); - String fileId = uploadResponse.getFileId(); - String mediaUrl = uploadResponse.getMediaUrl(); +// if (file != null) { +// try { +// DeleteMediaResponse response = TencentVideoService.deleteFile(trainEduVideo.getFileId(), TencentVideoService.subAppId); +// VodUploadResponse uploadResponse = TencentVideoService.uploadFile(file.getFile(), TencentVideoService.trainEducationClassId); +// String fileId = uploadResponse.getFileId(); +// String mediaUrl = uploadResponse.getMediaUrl(); +// +// trainEduVideo.setFileSize(TencentVideoService.getFileLength(file.getFile())); +// trainEduVideo.setFileDuration(TencentVideoService.getFileDuration(file.getFile())); +// +// trainEduVideo.setMediaUrl(mediaUrl); +// trainEduVideo.setFileId(fileId); +// dao.updateIgnoreNull(trainEduVideo); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } else { +// dao.updateIgnoreNull(trainEduVideo); +// } - trainEduVideo.setFileSize(TencentVideoService.getFileLength(file.getFile())); - trainEduVideo.setFileDuration(TencentVideoService.getFileDuration(file.getFile())); - - trainEduVideo.setMediaUrl(mediaUrl); - trainEduVideo.setFileId(fileId); - dao.updateIgnoreNull(trainEduVideo); - } catch (Exception e) { - e.printStackTrace(); - } - } else { - dao.updateIgnoreNull(trainEduVideo); - } + dao.updateIgnoreNull(trainEduVideo); return null; } diff --git a/src/main/resources/templates/site/site.xlsx b/src/main/resources/templates/site/site.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..bb0966489299d2d74f5106e090c3e8adb6cd0c6d GIT binary patch literal 10663 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
+ v-model="pageForm.startTime" clearable value-format="yyyy-MM-dd" + type="date" + placeholder="请选择开始时间"> + +
+
+
@@ -35,6 +42,11 @@ layout("/layouts/platform.html"){ + + + @@ -141,6 +153,9 @@ layout("/layouts/platform.html"){ pageOrderName: "", pageOrderBy: "", isAudit: false, + siteType: '', + startTime: new Date().getFullYear() + '-01-01', + endTime: new Date().getFullYear() + '-12-31', }, } }, @@ -148,6 +163,15 @@ layout("/layouts/platform.html"){ 'reserve-info': httpVueLoader('/components/activity/site/ReserveInfo.vue'), }, methods: { + exportExcel() { + window.location.href = "/platform/activity/site/record/exportExcel" + + "?startTime=" + this.pageForm.startTime + "" + + "&endTime=" + this.pageForm.endTime + "" + + "&searchName=" + this.pageForm.searchName + "" + + "&searchKeyword=" + this.pageForm.searchKeyword + "" + + "&siteType=" + this.pageForm.siteType + ; + }, openView(id) { this.$refs.guava.view() this.$refs.reserve.openView(id) diff --git a/src/main/resources/views/platform/trainEdu/video.html b/src/main/resources/views/platform/trainEdu/video.html index 720cd44..0f39890 100644 --- a/src/main/resources/views/platform/trainEdu/video.html +++ b/src/main/resources/views/platform/trainEdu/video.html @@ -257,7 +257,9 @@ layout("/layouts/platform.html"){ title: null, sortNo: null, disabled: false, - url: null + url: null, + endDate: null, + startDate: null }, tableColumns: [ {prop: 'title', label: '标题'}, @@ -300,12 +302,15 @@ layout("/layouts/platform.html"){ }, openAdd() { this.$refs['guava'].edit() - if (this.$refs.uploadForm) { - this.$refs.uploadForm.clean() - } - this.$refs['ruleForm'].resetFields() - this.formData.id = undefined - this.formData.albumId = this.pageForm.albumId + + + + // if (this.$refs.uploadForm) { + // this.$refs.uploadForm.clean() + // } + // this.$refs['ruleForm'].resetFields() + // this.formData.id = undefined + // this.formData.albumId = this.pageForm.albumId }, selectFile(preUploadFiles) {