3.5增加登录验证、修改密码、人员列表调整

mitao

2025-03-14 08f1b1f1804a8bd833d42f257908d80e88387b55

 flower_city/src/main/java/com/dg/core/util/TestDate.java

@@ -3,6 +3,7 @@

import cn.hutool.core.date.DateTime;
import com.alibaba.fastjson.JSONObject;
import com.iceyyy.workday.WorkUtils;
import com.squareup.okhttp.OkHttpClient;
import com.squareup.okhttp.Request;
import com.squareup.okhttp.Response;
@@ -86,6 +87,31 @@
    }

    /**
     * 获取节假日不含周末
     *
     * @return
     */
    public    Map getWeather(String code) {
        String url = "https://restapi.amap.com/v3/weather/weatherInfo?key=9e0d819935da8a01de0e476ba8a9019e&city="+code;
        OkHttpClient client = new OkHttpClient();
        Response response;
        //解密数据
        String rsa = null;
        Request request = new Request.Builder()
                .url(url)
                .get()
                .addHeader("Content-Type", "application/x-www-form-urlencoded")
                .build();
        try {
            response = client.newCall(request).execute();
            rsa = response.body().string();
        } catch (IOException e) {
            e.printStackTrace();
        }
        return JSONObject.parseObject(rsa, Map.class);
    }

    /**
     * 获取周末  月从0开始
     *
     * @param year
@@ -137,12 +163,13 @@
     * @return
     */
    public  DateTime nextWeekDay(DateTime dateTime){
        TestDate td=new TestDate();
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(dateTime);
        while (true){
          calendar.add(calendar.DATE,1);
          if (td.isWeekday(new DateTime(calendar))){
          SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
          String dateTimeToday = sdf.format(calendar.getTime());
          if (!WorkUtils.isWorkendDay(dateTimeToday)){
              return new DateTime(calendar);//返回日期
          }
        }