screen-api 修改获取AQI大小写

kaiyu

2021-11-03 01b5c9adfcc7b94469812edba7c2b1182a3a4c25

 screen-manage/src/main/java/com/moral/api/pojo/form/organization/OrganizationUpdateForm.java

@@ -1,11 +1,13 @@
package com.moral.api.pojo.form.organization;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.moral.api.entity.Organization;
import com.moral.api.pojo.dto.organization.OrganizationDTO;
import com.moral.constant.ResponseCodeEnum;
import com.moral.util.DateUtils;
import com.moral.util.RegexUtils;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.util.ObjectUtils;

import java.util.Date;
@@ -28,15 +30,19 @@

    private Integer provinceCode;

    private String provinceName;

    private Integer cityCode;

    private String cityName;

    private Integer areaCode;

    private Long townCode;
    private String areaName;

    private Long villageCode;
    private Integer locationLevelCode;

    private String locationLevel;
    private String locationLevelName;

    private String address;

@@ -46,7 +52,9 @@

    private String wechat;

    private String expireTime;
    @DateTimeFormat(pattern = "yyyy-MM-dd")
    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
    private Date expireTime;

    public boolean valid() {
        if (ObjectUtils.isEmpty(organizationId))
@@ -57,13 +65,11 @@
                        ObjectUtils.isEmpty(provinceCode) &&
                        ObjectUtils.isEmpty(cityCode) &&
                        ObjectUtils.isEmpty(areaCode) &&
                        ObjectUtils.isEmpty(townCode) &&
                        ObjectUtils.isEmpty(villageCode) &&
                        ObjectUtils.isEmpty(locationLevel) &&
                        ObjectUtils.isEmpty(locationLevelCode) &&
                        ObjectUtils.isEmpty(address) &&
                        ObjectUtils.isEmpty(phone) &&
                        ObjectUtils.isEmpty(email) &&
                        ObjectUtils.isEmpty(wechat) &&
                        phone==null &&
                        email==null &&
                        wechat==null &&
                        ObjectUtils.isEmpty(expireTime)
                )
            return false;
@@ -76,19 +82,19 @@
        organization.setParentId(parentId);
        organization.setName(name);
        organization.setProvinceCode(provinceCode);
        organization.setProvinceName(provinceName);
        organization.setCityCode(cityCode);
        organization.setCityName(cityName);
        organization.setAreaCode(areaCode);
        organization.setTownCode(townCode);
        organization.setVillageCode(villageCode);
        organization.setLocationLevel(locationLevel);
        organization.setAreaName(areaName);
        organization.setLocationLevelCode(locationLevelCode);
        organization.setLocationLevelName(locationLevelName);
        organization.setAddress(address);
        organization.setPhone(phone);
        organization.setEmail(email);
        organization.setWechat(wechat);
        if (!ObjectUtils.isEmpty(expireTime)) {
            Date expireTimeDate = DateUtils.getDate(expireTime + " 00:00:00", "yyyy-MM-dd HH:mm:ss");
            organization.setExpireTime(expireTimeDate);
        }
        organization.setExpireTime(expireTime);

        return organization;
    }

@@ -111,17 +117,10 @@
                return dto;
            }
        }
        //判断过期时间格式
        //判断过期时间是否小于当前时间
        if (!ObjectUtils.isEmpty(expireTime)) {
            if (!RegexUtils.checkDate(expireTime)) {
                dto.setCode(ResponseCodeEnum.TIME_FORMAT_INVALID.getCode());
                dto.setMsg(ResponseCodeEnum.TIME_FORMAT_INVALID.getMsg());
                return dto;
            }
            //判断过期时间是否小于当前时间
            Date expireDate = DateUtils.getDate(expireTime, "yyyy-MM-dd");
            Date currentDate = new Date();
            if (DateUtils.compareDateStr(expireDate, currentDate) >= 0) {
            if (DateUtils.compareDateStr(expireTime, currentDate) >= 0) {
                dto.setCode(ResponseCodeEnum.TIME_INVALID.getCode());
                dto.setMsg(ResponseCodeEnum.TIME_INVALID.getMsg());
                return dto;