Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修改格式，修改森林数据

Browse Source
This commit is contained in:
宋金生
2022-11-01 15:28:49 +08:00
parent 854afa033d
commit 382d9018e8
371 changed files with 193133 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/CityExpandControllerr.java
View File

@@ -9,6 +9,7 @@ import com.ruoyi.system.service_yada.ICityExpandService;
import org.apache.ibatis.annotations.Param;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
@@ -34,7 +35,8 @@ public class CityExpandControllerr
* @return
*/
@RequestMapping(value = "/selectCityExpand",method = {RequestMethod.GET})
public AjaxResult selectCityExpand(String city,String country, String year)
public AjaxResult selectCityExpand(@RequestParam(value = "city",required = false) String city,
@RequestParam(value = "country",required = false) String country, String year)
{
List<CityFocusVO> value=service.selectExpand(city,country,year);
return AjaxResult.success(value);
@@ -60,13 +62,13 @@ public class CityExpandControllerr
* @return
*/
@RequestMapping(value = "/selectInformation",method = {RequestMethod.GET})
public AjaxResult selectInformation(String city,String country,String year){
public AjaxResult selectInformation(String city,String country,String year,String basin){
// if (city.equals("")&&country.equals(""))
// {
// List<CityInformation> value= service.selectMain(year);
// return AjaxResult.success(value);
// }
List<CityInformation> value= service.selectInfrom(city,country,year);
List<CityInformation> value= service.selectInfrom(city,country,year,basin);
return AjaxResult.success(value);
}

52
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ForestDetectionControer.java Normal file
View File

@@ -0,0 +1,52 @@
package com.ruoyi.web.controller.yada;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_yada.ChangeTable;
import com.ruoyi.system.domain_yada.CloumnarTable;
import com.ruoyi.system.domain_yada.ForestDetectionVO;
import com.ruoyi.system.domain_yada.TypeTable;
import com.ruoyi.system.service_yada.IForestDetectionService;
import com.ruoyi.system.service_yada.impl.ForestDetectionServiceImpl;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/9/9 13:50
*/
@RestController
@RequestMapping(value = "/business-service/api/forest", produces = "application/json;charset=UTF-8")
@Api(tags = "森林检测")
public class ForestDetectionControer
{
@Resource
private IForestDetectionService service;
@RequestMapping(value = "/select",method = {RequestMethod.GET})
public AjaxResult select()
{
ForestDetectionVO forest=new ForestDetectionVO();
List<ChangeTable> changes=service.selectChange();
List<CloumnarTable> cloumnars=service.selectCloumnar();
List<TypeTable> types=service.selectType();
forest.setChanges(changes);
forest.setCloumnars(cloumnars);
forest.setTypes(types);
return AjaxResult.success("成功",forest);
}
}