From 80cff51173ecb83a7c7f74c7d977d35687b69c99 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期四, 05 二月 2026 18:21:37 +0800
Subject: [PATCH] 修改bug
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java | 31 +++++++++++++++++++++++++++++++
ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java | 6 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java | 5 +++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java | 5 +++++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java | 4 ++++
ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml | 6 ++++++
ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java | 3 +++
7 files changed, 60 insertions(+), 0 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
index 5ad5ee3..62dcc01 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java
@@ -77,7 +77,12 @@
screenUserVo.setPermissionProject(param.getPermissionProject());
screenUserVo.setCommentType(param.getCommentType());
screenUserVo.setSafetyId(param.getSafetyId());
+ String name = clientParamService.getTemplateName(param.getSafetyId());
+ screenUserVo.setSafetyName(name);
+
screenUserVo.setDeviceTemplateId(param.getDeviceTemplateId());
+ screenUserVo.setDeviceTemplateName(clientParamService.getTemplateName(param.getDeviceTemplateId()));
+
screenUserVo.setBigHiddenDanger(param.getBigHiddenDanger());
screenUserVo.setGeneralHiddenDanger(param.getGeneralHiddenDanger());
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java
new file mode 100644
index 0000000..43f17e7
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java
@@ -0,0 +1,31 @@
+package com.ruoyi.web.controller.tool;
+
+import cn.hutool.http.HttpUtil;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+
+import java.time.LocalDate;
+
+public class HolidayUtil {
+
+
+ public static boolean isHoliday() {
+ String result = HttpUtil.get("https://publicapi.xiaoai.me/holiday/day?date=" + LocalDate.now());
+ JSONObject jsonObject = JSONObject.parseObject(result);
+ Object data = jsonObject.get("data");
+ JSONArray parse = JSONArray.parse(data.toString());
+ for (int i = 0; i < parse.size(); i++) {
+ JSONObject jsonObject1 = parse.getJSONObject(i);
+ if (jsonObject1.get("daytype").toString().equals("1")) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static void main(String[] args) {
+ boolean holiday = isHoliday();
+ System.out.println(holiday);
+ }
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java
index f4efc7b..7516d72 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java
@@ -2,6 +2,7 @@
import com.ruoyi.system.model.ClientParam;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
/**
* <p>
@@ -13,4 +14,8 @@
*/
public interface ClientParamMapper extends BaseMapper<ClientParam> {
+ String getTemplateName(@Param("id") Integer id);
+
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java
index 1847f9f..0d082ea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java
@@ -13,4 +13,7 @@
*/
public interface ClientParamService extends IService<ClientParam> {
+ String getTemplateName(Integer safetyId);
+
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java
index 5928cd2..3bf5a4b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java
@@ -17,4 +17,8 @@
@Service
public class ClientParamServiceImpl extends ServiceImpl<ClientParamMapper, ClientParam> implements ClientParamService {
+ @Override
+ public String getTemplateName(Integer safetyId) {
+ return this.baseMapper.getTemplateName(safetyId);
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
index fe00ce3..ca2f0f0 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java
@@ -26,9 +26,15 @@
@ApiModelProperty(value = "安全报告模板id")
private Integer safetyId;
+ @ApiModelProperty(value = "安全报告模板名称")
+ private String safetyName;
+
@ApiModelProperty(value = "设备模板id")
private Integer deviceTemplateId;
+ @ApiModelProperty(value = "设备模板名称")
+ private String deviceTemplateName;
+
@ApiModelProperty(value = "1开启 2关闭 重大隐患")
private Integer bigHiddenDanger;
diff --git a/ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml
index e63ae24..87ccd91 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml
@@ -24,5 +24,11 @@
<sql id="Base_Column_List">
id, client_id, name, logo, big_hidden_danger, general_hidden_danger, comment_type, safety_id, device_template_id, project_num, under_construction_project, asset_project, permission_client, permission_project
</sql>
+ <select id="getTemplateName" resultType="java.lang.String" parameterType="java.lang.Integer">
+ select name
+ from report_template
+ where id = #{id}
+
+ </select>
</mapper>
--
Gitblit v1.7.1