日期属性采集

common-cloud/ruoyi-gateway/src/main/resources/application-local.yml

@@ -29,14 +29,14 @@ spring:
             - StripPrefix=1
         # 能源管理
         - id: ems-server
-          uri: http://127.0.0.1:9202
+          uri: lb://ems-server
           predicates:
             - Path=/ems/**
           filters:
             - StripPrefix=0
         # 能源-设备适配器
         - id: ems-dev-adapter
-          uri: http://127.0.0.1:9203
+          uri: lb://ems-dev-adapter
           predicates:
             - Path=/ems-dev-adapter/**
           filters:

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/config/DateAttrConfig.java

@@ -0,0 +1,48 @@
+/*
+ * 文 件 名:  Holiday
+ * 版    权:  华设设计集团股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2025/6/9
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 节假日配置
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2025/6/9]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+@Configuration
+public class DateAttrConfig {
+    @Value("${general-data.api-key}")
+    private String apiKey;
+
+    @Value("${general-data.date.api-addr}")
+    private String apiAddr;
+
+    public String getApiKey() {
+        return apiKey;
+    }
+
+    public void setApiKey(String apiKey) {
+        this.apiKey = apiKey;
+    }
+
+    public String getApiAddr() {
+        return apiAddr;
+    }
+
+    public void setApiAddr(String apiAddr) {
+        this.apiAddr = apiAddr;
+    }
+}

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/config/WeatherConfig.java

@@ -24,16 +24,16 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration
 public class WeatherConfig {
-    @Value("${weather.adcode}")
-    private String adcode;
-
-    @Value("${weather.api-key}")
+    @Value("${general-data.api-key}")
     private String apiKey;
 
-    @Value("${weather.rt.api-addr}")
+    @Value("${general-data.weather.adcode}")
+    private String adcode;
+
+    @Value("${general-data.weather.rt.api-addr}")
     private String weatherRtAddr;
 
-    @Value("${weather.forecast.api-addr}")
+    @Value("${general-data.weather.forecast.api-addr}")
     private String weatherForecastAddr;
 
     public String getAdcode() {

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/task/TaskService.java

@@ -13,24 +13,29 @@ package com.ruoyi.ems.task;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
+import com.huashe.common.domain.model.DateAttr;
 import com.huashe.common.domain.model.WeatherForecast;
 import com.huashe.common.domain.model.WeatherRt;
 import com.huashe.common.exception.Assert;
 import com.huashe.common.utils.HttpUtils;
+import com.ruoyi.ems.config.DateAttrConfig;
 import com.ruoyi.ems.config.WeatherConfig;
+import com.ruoyi.ems.service.IDateService;
 import com.ruoyi.ems.service.IWeatherService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.utils.URIBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
 import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.Year;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 
 /**
@@ -47,20 +52,23 @@ import java.util.List;
 public class TaskService {
     private static final Logger log = LoggerFactory.getLogger(TaskService.class);
 
-    @Value("${weather.adcode}")
-    private String weatherAdcode;
-
     @Resource
     private WeatherConfig weatherConfig;
 
     @Resource
+    private DateAttrConfig holidayConfig;
+
+    @Resource
     private IWeatherService weatherService;
 
+    @Resource
+    private IDateService dateService;
+
     /**
      * 天气实况采集
      */
     @Async
-    @Scheduled(cron = "${weather.rt.cron}")
+    @Scheduled(cron = "${general-data.weather.rt.cron}")
     public void collectRt() {
         log.debug("start collect weather rt.");
 
@@ -92,7 +100,7 @@ public class TaskService {
      * 天气预报采集
      */
     @Async
-    @Scheduled(cron = "${weather.forecast.cron}")
+    @Scheduled(cron = "${general-data.weather.forecast.cron}")
     public void collectForecast() {
         log.debug("start collect weather forecast.");
 
@@ -124,4 +132,53 @@ public class TaskService {
             log.error("collectForecast fail!", e);
         }
     }
+
+    /**
+     * 节假日采集
+     */
+    @Async
+    @Scheduled(cron = "${general-data.date.cron}")
+    public void collectDateAttr() {
+        log.debug("start collect date attr.");
+
+        try {
+            // 获取当前年份
+            int currentYear = Year.now().getValue();
+
+            // 本年第一天
+            LocalDate firstDay = LocalDate.of(currentYear, 1, 1);
+
+            // 本年最后一天（12月31日）
+            LocalDate lastDay = LocalDate.of(currentYear, 12, 31);
+
+            // 定义日期格式
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+            URIBuilder uriBuilder = new URIBuilder(holidayConfig.getApiAddr());
+            uriBuilder.addParameter("startDate", formatter.format(firstDay)).addParameter("endDate", formatter.format(lastDay))
+                .addParameter("apiKey", weatherConfig.getApiKey());
+            String res = HttpUtils.doGet(uriBuilder);
+            log.debug("get res:\r\n{}", res);
+
+            JSONObject jsonObject = JSON.parseObject(res);
+
+            String code = jsonObject.getString("code");
+            Assert.isTrue(StringUtils.equals(code, "0"), -1, jsonObject.getString("message"));
+
+            JSONArray data = jsonObject.getJSONArray("data");
+            Assert.notNull(data, -1, "date attr is null.");
+
+            if (!data.isEmpty()) {
+                List<DateAttr> dateAttrs = JSON.parseArray(data.toString(), DateAttr.class);
+
+                if (CollectionUtils.isNotEmpty(dateAttrs)) {
+                    dateService.deleteByYear(String.valueOf(currentYear));
+                    dateService.insertBatch(dateAttrs);
+                }
+            }
+        }
+        catch (Exception e) {
+            log.error("collect date attr fail!", e);
+        }
+    }
 }

ems/ems-cloud/ems-server/src/main/resources/application-local.yml

@@ -43,16 +43,21 @@ spring:
           # url:
           # driver-class-name:
 
-weather:
-  adcode: 321200
+general-data:
   api-key: 4988803c28e1461b999054255a0b311fga37G3RPI1Bc2uR1
   server: 139.224.116.141:9000
-  rt:
-    cron: 0 0 0/1 * * ?
-    api-addr: http://${weather.server}/general-data/weather/getWeather
-  forecast:
-    cron: 0 15 8 * * ?
-    api-addr: http://${weather.server}//general-data/weather/getWeatherForecast
+  weather:
+    adcode: 321200
+    rt:
+      cron: 0 0 0/1 * * ?
+      api-addr: http://${general-data.server}/general-data/weather/getWeather
+    forecast:
+      cron: 0 15 8 * * ?
+      api-addr: http://${general-data.server}/general-data/weather/getWeatherForecast
+  date:
+    #cron: 0 0 12 1 * ?
+    cron: 0 13 19 * * ?
+    api-addr: http://${general-data.server}/general-data/date/getAttrs
 
 # mybatis配置
 mybatis:

ems/ems-cloud/ems-server/src/main/resources/application-prod-ct.yml

@@ -43,16 +43,20 @@ spring:
           username: ems_ct
           password: SBBsnTccaQaJ3ceW
 
-weather:
-  adcode: 321200
+general-data:
   api-key: 4988803c28e1461b999054255a0b311fga37G3RPI1Bc2uR1
   server: 139.224.116.141:9000
-  rt:
-    cron: 0 0 0/1 * * ?
-    api-addr: http://${weather.server}/general-data/weather/getWeather
-  forecast:
-    cron: 0 15 8 * * ?
-    api-addr: http://${weather.server}//general-data/weather/getWeatherForecast
+  weather:
+    adcode: 321200
+    rt:
+      cron: 0 0 0/1 * * ?
+      api-addr: http://${general-data.server}/general-data/weather/getWeather
+    forecast:
+      cron: 0 15 8 * * ?
+      api-addr: http://${general-data.server}/general-data/weather/getWeatherForecast
+  date:
+    cron: 0 0 12 1 * ?
+    api-addr: http://${general-data.server}/general-data/date/getAttrs
 
 # mybatis配置
 mybatis:

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/AdmDateAttrMapper.java

@@ -0,0 +1,57 @@
+/*
+ * 文 件 名:  AdmHolidayMapper
+ * 版    权:  华设设计集团股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2025/5/9
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.mapper;
+
+import com.huashe.common.domain.model.DateAttr;
+import com.huashe.common.domain.model.Holiday;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 节假日
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2025/5/9]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+@Mapper
+public interface AdmDateAttrMapper {
+    /**
+     * 批量插入
+     * @param list 节假日列表
+     */
+    int insertBatch(List<DateAttr> list);
+
+    /**
+     * 根据日期查询节假日
+     * @param date 日期
+     * @return 节假日
+     */
+    DateAttr selectByDate(@Param("date") String date);
+
+    /**
+     * 查询间隔日期内的节假日
+     * @param startDate 开始日期
+     * @param endDate 结束日期
+     * @return 节假日列表
+     */
+    List<DateAttr> selectBetween(@Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    /**
+     * 删除指定年份的节假日数据
+     * @param year 年份
+     */
+    int deleteByYear(String year);
+}

ems/ems-core/src/main/java/com/ruoyi/ems/service/IDateService.java

@@ -0,0 +1,58 @@
+/*
+ * 文 件 名:  DateService
+ * 版    权:  华设设计集团股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2025/5/9
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.service;
+
+import com.huashe.common.domain.model.DateAttr;
+import com.huashe.common.domain.model.Holiday;
+
+import java.util.List;
+
+/**
+ * 日期服务
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2025/5/9]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+public interface IDateService {
+    /**
+     * 删除年份节假日配置
+     * @param year 年份
+     * @return 影响行数
+     */
+    int deleteByYear(String year);
+
+    /**
+     * 批量插入日期属性
+     * @param list 日期属性集合
+     * @return 影响行数
+     */
+    int insertBatch(List<DateAttr> list);
+
+    /**
+     * 获取日期属性
+     *
+     * @param date 日期
+     * @return 日期属性
+     */
+    DateAttr getDateAttr(String date);
+
+    /**
+     * 获取日期属性集合
+     *
+     * @param startDate 开始日期
+     * @param endDate   结束日期
+     * @return 日期属性
+     */
+    List<DateAttr> getDateAttr(String startDate, String endDate);
+}

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/DateServiceImpl.java

@@ -0,0 +1,61 @@
+/*
+ * 文 件 名:  DateServiceImpl
+ * 版    权:  华设设计集团股份有限公司
+ * 描    述:  <描述>
+ * 修 改 人:  lvwenbin
+ * 修改时间:  2025/6/9
+ * 跟踪单号:  <跟踪单号>
+ * 修改单号:  <修改单号>
+ * 修改内容:  <修改内容>
+ */
+package com.ruoyi.ems.service.impl;
+
+import com.huashe.common.domain.model.DateAttr;
+import com.huashe.common.domain.model.Holiday;
+import com.huashe.common.utils.DateUtils;
+import com.ruoyi.ems.mapper.AdmDateAttrMapper;
+import com.ruoyi.ems.service.IDateService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 日期服务
+ * <功能详细描述>
+ *
+ * @author lvwenbin
+ * @version [版本号, 2025/6/9]
+ * @see [相关类/方法]
+ * @since [产品/模块版本]
+ */
+@Service
+public class DateServiceImpl implements IDateService {
+    @Autowired
+    private AdmDateAttrMapper dateAttrMapper;
+
+    @Override
+    public int deleteByYear(String year) {
+        return dateAttrMapper.deleteByYear(year);
+    }
+
+    @Override
+    public int insertBatch(List<DateAttr> list) {
+        return dateAttrMapper.insertBatch(list);
+    }
+
+    @Override
+    public DateAttr getDateAttr(String dateStr) {
+        return dateAttrMapper.selectByDate(dateStr);
+    }
+
+    @Override
+    public List<DateAttr> getDateAttr(String startDateStr, String endDateStr) {
+        return dateAttrMapper.selectBetween(startDateStr, endDateStr);
+    }
+}

ems/ems-core/src/main/resources/mapper/ems/AdmDateAttrMapper.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.ruoyi.ems.mapper.AdmDateAttrMapper">
+    <resultMap id="BaseResultMap" type="com.huashe.common.domain.model.DateAttr">
+        <result column="date" property="date" jdbcType="DATE"/>
+        <result column="week" property="week" jdbcType="INTEGER"/>
+        <result column="week_cn" property="weekCn" jdbcType="VARCHAR"/>
+        <result column="type" property="type" jdbcType="VARCHAR"/>
+        <result column="date_name" property="dateName" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <insert id="insertBatch" parameterType="com.huashe.common.domain.model.DateAttr">
+        INSERT INTO `adm_date_attr`
+        (`date`, `week`, `week_cn`, `type`, `date_name`)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.date}, #{item.week}, #{item.weekCn}, #{item.type}, #{item.dateName})
+        </foreach>
+    </insert>
+
+    <select id="selectByDate" parameterType="java.lang.String" resultMap="BaseResultMap">
+        SELECT `date`, `week`, `week_cn`, `type`, `date_name` from `adm_date_attr` where `date` = #{date}
+    </select>
+
+    <select id="selectBetween" resultMap="BaseResultMap">
+        select
+            `date`, `week`, `week_cn`, `type`, `date_name` from `adm_date_attr` where `date` &gt;= STR_TO_DATE(#{startDate},'%Y-%m-%d') and date &lt;= STR_TO_DATE(#{endDate},'%Y-%m-%d')
+    </select>
+
+    <delete id="deleteByYear" parameterType="java.lang.String">
+        DELETE FROM `adm_date_attr` WHERE DATE_FORMAT(`date`, '%Y') = #{year}
+    </delete>
+
+</mapper>

ems/sql/ems_server.sql

@@ -452,17 +452,17 @@ create table adm_area_attr (
 
 
 -- ----------------------------
--- 节假日
--- ----------------------------
-DROP TABLE IF EXISTS `adm_holiday`;
-CREATE TABLE `adm_holiday` (
-  `date`    date NOT NULL COMMENT '日期',
-  `name`    VARCHAR(128) NOT NULL COMMENT '节假日',
-  `name_cn` VARCHAR(128) NOT NULL COMMENT '节假日中文',
-  `name_en` VARCHAR(128) NOT NULL COMMENT '节假日英文',
-  `type`    VARCHAR(64) NOT NULL COMMENT '节假日类型',
+-- 日期属性表
+-- ----------------------------
+DROP TABLE IF EXISTS `adm_date_attr`;
+CREATE TABLE `adm_date_attr` (
+  `date`        date NOT NULL COMMENT '日期',
+  `week`        INT NOT NULL COMMENT '星期几',
+  `week_cn`     VARCHAR(16) NOT NULL COMMENT '星期几(中文)',
+  `type`        VARCHAR(64) NOT NULL COMMENT '日期类型',
+  `date_name`   VARCHAR(64) NOT NULL COMMENT '日期名称',
   PRIMARY KEY (`date`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='节假日信息表';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='日期属性表';
 
 
 -- ----------------------------