Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/sql记录

@@ -2035,4 +2035,51 @@ alter table base_daily_report_detail add column doubt_state TINYINT(2) default n
alter table base_daily_report_detail add column doubt_remark varchar(255) default null COMMENT '疑惑核实备注';
alter table base_daily_report_detail add column `actual_completion_hour` varchar(50) DEFAULT NULL COMMENT '实际完成时长';
alter table base_doctor_daily_report_upload add column `leave_state` tinyint(4) DEFAULT NULL COMMENT '请假状态0未请假1请假';
alter table base_doctor_daily_report_upload add column `leave_hour` varchar(50) DEFAULT NULL COMMENT '请假时长';
alter table base_doctor_daily_report_upload add column `leave_hour` varchar(50) DEFAULT NULL COMMENT '请假时长';
CREATE TABLE `base_weather_day` (
  `id` varchar(50) NOT NULL,
  `nums` varchar(10) DEFAULT NULL COMMENT '今日实时请求次数',
  `cityid` varchar(20) DEFAULT NULL COMMENT '城市ID',
  `city` varchar(20) DEFAULT NULL,
  `date` varchar(10) DEFAULT NULL,
  `week` varchar(10) DEFAULT NULL,
  `update_time` varchar(10) DEFAULT NULL COMMENT '更新时间',
  `wea` varchar(20) DEFAULT NULL COMMENT '天气情况',
  `wea_img` varchar(10) DEFAULT NULL COMMENT '天气标识(xue、lei、shachen、wu、bingbao、yun、yu、yin、qing)',
  `tem` varchar(10) DEFAULT NULL COMMENT '实况温度',
  `tem_day` varchar(10) DEFAULT NULL COMMENT '白天温度(高温)',
  `tem_night` varchar(10) DEFAULT NULL COMMENT '夜间温度(低温)',
  `win` varchar(20) DEFAULT NULL COMMENT '风向',
  `win_speed` varchar(20) DEFAULT NULL COMMENT '风力',
  `win_meter` varchar(10) DEFAULT NULL COMMENT '风速',
  `air` varchar(10) DEFAULT NULL COMMENT '空气质量',
  `pressure` varchar(10) DEFAULT NULL COMMENT '气压',
  `humidity` varchar(10) DEFAULT NULL COMMENT '湿度',
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `index_1` (`date`,`cityid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='实况天气记录表';
CREATE TABLE `base_weather_week` (
  `id` varchar(50) NOT NULL,
  `nums` varchar(10) DEFAULT NULL,
  `update_date` varchar(10) DEFAULT NULL COMMENT '更新日期',
  `cityid` varchar(20) DEFAULT NULL COMMENT '城市ID',
  `city` varchar(10) DEFAULT NULL COMMENT '城市名称',
  `update_time` varchar(30) DEFAULT NULL COMMENT '更新时间',
  `date` varchar(10) DEFAULT NULL COMMENT '预报日期',
  `week` varchar(10) DEFAULT NULL COMMENT '星期',
  `wea` varchar(10) DEFAULT NULL COMMENT '天气情况',
  `wea_img` varchar(10) DEFAULT NULL COMMENT '天气情况xue、lei、shachen、wu、bingbao、yun、yu、yin、qing',
  `tem_day` varchar(10) DEFAULT NULL COMMENT '白天温度(高温)',
  `tem_night` varchar(10) DEFAULT NULL COMMENT '白天温度(低温)',
  `win` varchar(10) DEFAULT NULL COMMENT '风向',
  `win_speed` varchar(10) DEFAULT NULL COMMENT '风力等级',
  `create_time` datetime DEFAULT NULL,
  PRIMARY KEY (`id`),
  UNIQUE KEY `index_1` (`update_date`,`date`,`cityid`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='7天天气记录表';

common/common-entity/src/main/java/com/yihu/jw/entity/care/weather/BaseWeatherWeekDO.java

@@ -19,6 +19,7 @@ public class BaseWeatherWeekDO extends UuidIdentityEntityWithCreateTime {
    private String updateDate;//更新日期
    private String updateTime;//更新时间
    private String date;//预报日期
    private String week;//星期
    private String wea;//天气情况
    private String weaImg;//天气标识(xue、lei、shachen、wu、bingbao、yun、yu、yin、qing)
    private String temDay;//白天温度(高温)
@@ -134,4 +135,12 @@ public class BaseWeatherWeekDO extends UuidIdentityEntityWithCreateTime {
        this.winSpeed = winSpeed;
    }
    @Column(name = "week")
    public String getWeek() {
        return week;
    }
    public void setWeek(String week) {
        this.week = week;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/date/DateUtil.java

@@ -1586,4 +1586,24 @@ public class DateUtil {
        Date currentDate = DateUtil.getNowDate();
        return (startDate.getTime() - currentDate.getTime()) / 1000;
    }
    public static int getWeekByString(String date){
        Calendar cal = Calendar.getInstance(); // 获得一个日历
        Date datet = null;
        try {
            datet = simpleDateParse(date);
            cal.setTime(datet);
        } catch (ParseException e) {
            e.printStackTrace();
        }
        int w = cal.get(Calendar.DAY_OF_WEEK) - 1; // 指示一个星期中的某天。
        if (w < 0)
            w = 0;
        return w;
    }
    public static String dateToWeek(String date) {
        String[] weekDays = { "周日", "周一", "周二", "周三", "周四", "周五", "周六" };
        return weekDays[getWeekByString(date)];
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/WeatherUtil.java

@@ -132,7 +132,7 @@ public class WeatherUtil {
                weekDO.setUpdateDate(date);
                weekDO.setUpdateTime(updateTime);
                weekDO.setNums(nums);
                weekDO.setWeek(dateToWeek(json.getString("date"),i));
                weekDO.setDate(json.getString("date"));
                weekDO.setWea(json.getString("wea"));
                weekDO.setWeaImg(json.getString("wea_img"));
@@ -152,4 +152,17 @@ public class WeatherUtil {
        }
    }
    /**
     * 日期转星期
     */
    private String dateToWeek(String date,int i){
        if(i==0){
            return "今天";
        }else if(i==1){
            return "明天";
        }else {
            return DateUtil.dateToWeek(date);
        }
    }
}

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/util/WeatherUtil.java

@@ -132,7 +132,7 @@ public class WeatherUtil {
                weekDO.setUpdateDate(date);
                weekDO.setUpdateTime(updateTime);
                weekDO.setNums(nums);
                weekDO.setWeek(dateToWeek(json.getString("date"),i));
                weekDO.setDate(json.getString("date"));
                weekDO.setWea(json.getString("wea"));
                weekDO.setWeaImg(json.getString("wea_img"));
@@ -152,4 +152,17 @@ public class WeatherUtil {
        }
    }
    /**
     * 日期转星期
     */
    private String dateToWeek(String date,int i){
        if(i==0){
            return "今天";
        }else if(i==1){
            return "明天";
        }else {
            return DateUtil.dateToWeek(date);
        }
    }
}