951230d696ce74881e1a61e67dcf151b6cb431bc..b5a5e43e2ea7af773dba1ee99c2194be61515df8
2026-02-05 liujie
Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/smart_sc...
b5a5e4 对比 | 目录
2026-02-05 liujie
修改bug
80cff5 对比 | 目录
1个文件已添加
6个文件已修改
60 ■■■■■ 已修改文件
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DashboardStatisticsController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/mapper/ClientParamMapper.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/ClientParamService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ClientParamServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/java/com/ruoyi/system/vo/ScreenUserVo.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-system/src/main/resources/mapper/system/ClientParamMapper.xml 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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());
                }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/HolidayUtil.java
New file
@@ -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);
    }
}
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);
}
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);
}
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);
    }
}
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;
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>