天气台账（调整了模块结构）

blade-common/src/main/java/org/springblade/common/constant/BusinessConstant.java

@@ -0,0 +1,7 @@
+package org.springblade.common.constant;
+
+public interface BusinessConstant {
+
+    String APPLICATION_WEATHER_NAME = "blade-business";
+
+}

blade-common/src/main/java/org/springblade/common/constant/WeatherConstant.java

@@ -1,7 +0,0 @@
-package org.springblade.common.constant;
-
-public interface WeatherConstant {
-
-    String APPLICATION_WEATHER_NAME = "blade-weather";
-
-}

blade-service-api/blade-business-api/src/main/java/org/springblade/weather/entity/WeatherInfo.java → blade-service-api/blade-business-api/src/main/java/org/springblade/business/entity/WeatherInfo.java

@@ -1,4 +1,4 @@
-package org.springblade.weather.entity;
+package org.springblade.business.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;

blade-service-api/blade-business-api/src/main/java/org/springblade/weather/entity/vo/WeatherInfoVo.java → blade-service-api/blade-business-api/src/main/java/org/springblade/business/vo/WeatherInfoVo.java

@@ -1,4 +1,4 @@
-package org.springblade.weather.entity.vo;
+package org.springblade.business.vo;
 
 import lombok.Data;
 

blade-service/blade-business/src/main/java/org/springblade/BusinessApplication.java

@@ -0,0 +1,19 @@
+package org.springblade;
+
+import org.springblade.common.constant.BusinessConstant;
+import org.springblade.core.cloud.feign.EnableBladeFeign;
+import org.springblade.core.launch.BladeApplication;
+import org.springframework.cloud.client.SpringCloudApplication;
+
+/**
+ * 客户端启动类
+ */
+@EnableBladeFeign
+@SpringCloudApplication
+public class BusinessApplication {
+
+    public static void main(String[] args){
+        BladeApplication.run(BusinessConstant.APPLICATION_WEATHER_NAME, BusinessApplication.class, args);
+    }
+
+}

blade-service/blade-business/src/main/java/org/springblade/weather/controller/WeatherController.java → blade-service/blade-business/src/main/java/org/springblade/business/controller/WeatherController.java

@@ -1,4 +1,4 @@
-package org.springblade.weather.controller;
+package org.springblade.business.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
@@ -8,12 +8,14 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.DateUtil;
 import org.springblade.core.tool.utils.Func;
-import org.springblade.weather.entity.WeatherInfo;
-import org.springblade.weather.entity.vo.WeatherInfoVo;
-import org.springblade.weather.service.WeatherInfoService;
+import org.springblade.business.entity.WeatherInfo;
+import org.springblade.business.vo.WeatherInfoVo;
+import org.springblade.business.service.WeatherInfoService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springblade.core.mp.support.Condition;
+
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -60,12 +62,20 @@ public class WeatherController {
 
     /**
      * 天气台账列表分页
-     * @param weatherMap 查询条件
+     * @param vo 查询条件
      * @param query 分页条件
      * @return 查询结果
      */
     @RequestMapping(value = "queryWeatherPage")
-    public R<IPage<WeatherInfo>> queryWeatherPage(@RequestBody Map<String,Object> weatherMap, Query query){
+    public R<IPage<WeatherInfo>> queryWeatherPage(WeatherInfoVo vo,Query query){
+        Map<String,Object> weatherMap = new HashMap<>();
+        if(StringUtils.isNotEmpty(vo.getRecordTime())){
+            weatherMap.put("recordTime", vo.getRecordTime());
+        }
+        if(StringUtils.isNotEmpty(vo.getWeather())){
+            weatherMap.put("weather", vo.getWeather());
+        }
+
         if(weatherMap.containsKey("recordTime") && weatherMap.get("recordTime") != null && StringUtils.isNotEmpty(weatherMap.get("recordTime").toString())){
             String recordTime = weatherMap.get("recordTime").toString();
             if(recordTime.contains("~")){
@@ -73,12 +83,12 @@ public class WeatherController {
                 String[] recordTimes = recordTime.split("~");
                 //因为是区间，所以需要删除原本的条件
                 weatherMap.remove("recordTime");
-                return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class).lambda().between(WeatherInfo::getRecordTime, recordTimes[0].trim(), recordTimes[1].trim())));
+                return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class).lambda().between(WeatherInfo::getRecordTime, recordTimes[0].trim(), recordTimes[1].trim()).orderByDesc(WeatherInfo::getRecordTime)));
             } else {
-                return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class)));
+                return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class).lambda().orderByDesc(WeatherInfo::getRecordTime)));
             }
         } else {
-            return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class)));
+            return R.data(this.weatherInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(weatherMap, WeatherInfo.class).lambda().orderByDesc(WeatherInfo::getRecordTime)));
         }
     }
 
@@ -97,14 +107,6 @@ public class WeatherController {
         return R.data(null);
     }
 
-    /**
-     * 定时执行的新增方法，通常用于自动获取每日所有项目所有合同段的当天天气情况
-     */
-    @RequestMapping(value = "automaticSaveWeatherIfo")
-    public void automaticSaveWeatherIfo(){
-        this.weatherInfoService.syncWeatherInfo();
-    }
-
     /**
      * 普通新增，多用于补天气
      * @param weatherInfoVo 新增的天气信息

blade-service/blade-business/src/main/java/org/springblade/weather/mapper/WeatherInfoMapper.java → blade-service/blade-business/src/main/java/org/springblade/business/mapper/WeatherInfoMapper.java

@@ -1,7 +1,7 @@
-package org.springblade.weather.mapper;
+package org.springblade.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.weather.entity.WeatherInfo;
+import org.springblade.business.entity.WeatherInfo;
 
 public interface WeatherInfoMapper extends BaseMapper<WeatherInfo> {
 

blade-service/blade-business/src/main/java/org/springblade/weather/mapper/WeatherInfoMapper.xml → blade-service/blade-business/src/main/java/org/springblade/business/mapper/WeatherInfoMapper.xml

@@ -1,9 +1,9 @@
 <?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="org.springblade.weather.mapper.WeatherInfoMapper">
+<mapper namespace="org.springblade.business.mapper.WeatherInfoMapper">
 
     <!-- 通用查询映射结果 -->
-    <resultMap id="blogResultMap" type="org.springblade.weather.entity.WeatherInfo">
+    <resultMap id="blogResultMap" type="org.springblade.business.entity.WeatherInfo">
         <result column="id" property="id"/>
         <result column="contract_area_id" property="contractAreaId"/>
         <result column="weather" property="weather"/>

blade-service/blade-business/src/main/java/org/springblade/weather/service/WeatherInfoService.java → blade-service/blade-business/src/main/java/org/springblade/business/service/WeatherInfoService.java

@@ -1,7 +1,7 @@
-package org.springblade.weather.service;
+package org.springblade.business.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.weather.entity.WeatherInfo;
+import org.springblade.business.entity.WeatherInfo;
 
 import java.util.List;
 import java.util.Map;

blade-service/blade-business/src/main/java/org/springblade/weather/service/impl/WeatherInfoServiceImpl.java → blade-service/blade-business/src/main/java/org/springblade/business/service/impl/WeatherInfoServiceImpl.java

@@ -1,12 +1,13 @@
-package org.springblade.weather.service.impl;
+package org.springblade.business.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.utils.BaiduApiUtil;
 import org.springblade.core.tool.utils.DateUtil;
-import org.springblade.weather.entity.WeatherInfo;
-import org.springblade.weather.mapper.WeatherInfoMapper;
-import org.springblade.weather.service.WeatherInfoService;
+import org.springblade.business.entity.WeatherInfo;
+import org.springblade.business.mapper.WeatherInfoMapper;
+import org.springblade.business.service.WeatherInfoService;
+//import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springblade.core.mp.support.Condition;
 
@@ -32,11 +33,11 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
             String[] yearMonthDays = yearMonthDay.split("~");
             //区间
             queryMap.put("contractAreaId", contractAreaId);
-            yearWeatherList = this.list(Condition.getQueryWrapper(queryMap, WeatherInfo.class).lambda().between(WeatherInfo::getRecordTime, yearMonthDays[0], yearMonthDays[1]).orderBy(true, true, WeatherInfo::getRecordTime));
+            yearWeatherList = this.list(Condition.getQueryWrapper(queryMap, WeatherInfo.class).lambda().between(WeatherInfo::getRecordTime, yearMonthDays[0].trim(), yearMonthDays[1].trim()).orderByAsc(WeatherInfo::getRecordTime));
         } else {
             queryMap.put("recordTime", yearMonthDay);
             queryMap.put("contractAreaId", contractAreaId);
-            yearWeatherList = this.list(Condition.getQueryWrapper(queryMap, WeatherInfo.class).lambda().orderBy(true, true, WeatherInfo::getRecordTime));
+            yearWeatherList = this.list(Condition.getQueryWrapper(queryMap, WeatherInfo.class).lambda().orderByAsc(WeatherInfo::getRecordTime));
         }
 
         if(yearWeatherList != null && yearWeatherList.size() != 0){
@@ -82,6 +83,7 @@ public class WeatherInfoServiceImpl extends ServiceImpl<WeatherInfoMapper, Weath
     /**
      * 获取当前系统所有项目下所有合同段的当天天气
      */
+//    @Scheduled(cron = "0 0 7 * * ?")
     public void syncWeatherInfo(){
         //todo 目前缺少合同段所在区域的地图编号及ID，所以暂时写死区域数据ID，之后修改为接口获取
         String cityCode = "450721";

blade-service/blade-business/src/main/java/org/springblade/weather/WeatherApplication.java

@@ -1,22 +0,0 @@
-package org.springblade.weather;
-
-import org.springblade.common.constant.WeatherConstant;
-import org.springblade.core.cloud.feign.EnableBladeFeign;
-import org.springblade.core.launch.BladeApplication;
-import org.springframework.cloud.client.SpringCloudApplication;
-
-/**
- * 天气台账启动类
- */
-@EnableBladeFeign
-@SpringCloudApplication
-public class WeatherApplication {
-
-    /**
-     * 启动
-     */
-    public static void main(String[] args){
-        BladeApplication.run(WeatherConstant.APPLICATION_WEATHER_NAME, WeatherApplication.class, args);
-    }
-
-}

blade-service/blade-business/src/main/java/sql/weather.menu.sql

@@ -0,0 +1,10 @@
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1523913611927027713', 1123598815738675201, 'weather', '天气台账', 'menu', '/business/weather', NULL, 1, 1, 0, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1523913611927027714', '1523913611927027713', 'weather_add', '新增', 'add', '/business/weather/add', 'plus', 1, 2, 1, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1523913611927027715', '1523913611927027713', 'weather_edit', '修改', 'edit', '/business/weather/edit', 'form', 2, 2, 2, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1523913611927027716', '1523913611927027713', 'weather_delete', '删除', 'delete', '/api/blade-business/weather/remove', 'delete', 3, 2, 3, 1, NULL, 0);
+INSERT INTO `blade_menu`(`id`, `parent_id`, `code`, `name`, `alias`, `path`, `source`, `sort`, `category`, `action`, `is_open`, `remark`, `is_deleted`)
+VALUES ('1523913611927027717', '1523913611927027713', 'weather_view', '查看', 'view', '/business/weather/view', 'file-text', 4, 2, 2, 1, NULL, 0);