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

新增字典功能

Browse Source
This commit is contained in:
songjinsheng 2022-05-30 10:11:39 +08:00
parent 498a502c02
commit 42e4acf3dd
25 changed files with 494 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AorestCoverageController.java
View File

@ -1,21 +1,27 @@
package com.ruoyi.web.controller.yada;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.domain_yada.AorestCoverageVO;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.system.domain_yada.*;
import com.ruoyi.system.service_yada.IAorestCoverageService;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.ThematicMapService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.xml.crypto.Data;
import java.security.Guard;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.util.List;
@ -25,17 +31,22 @@ import java.util.List;
*/
@RestController
@RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8")
@Api(tags = "森林覆盖率")
public class AorestCoverageController {
@Resource
private IAorestCoverageService service;
@Resource
private ThematicMapService thematicMapService;
/**
* 查询方法
* @param response 响应头
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.POST})
@RequestMapping(value = "/selectAorestCoverage",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectAorestCoverage(HttpServletResponse response, HttpServletRequest request)
{
List<AorestCoverageVO> eastVOSList= service.selectAorestCoverage();
@ -44,10 +55,12 @@ public class AorestCoverageController {
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.POST})
@RequestMapping(value = "/DelAorestCoverage",method = {RequestMethod.DELETE})
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
public AjaxResult DelAorestCoverage(@Param("ID") String ID)
{
int NUM = service.DelAorestCoverage(ID);
@ -65,9 +78,12 @@ public class AorestCoverageController {
* @return 状态码
*/
@RequestMapping(value = "/IntoAorestCoverage",method = {RequestMethod.POST})
@ApiOperation(value = "新增方法",httpMethod = "POST")
public AjaxResult IntoAorestCoverage(@RequestBody AorestCoverageVO eastVOS)
{
try {
eastVOS.setCreateTime(LocalDateTime.now());
int NUM = service.IntoAorestCoverage(eastVOS);
if (NUM>0)
@ -80,6 +96,79 @@ public class AorestCoverageController {
E.getMessage();
return AjaxResult.error();
}
}
/**
* 上传文件
* @return 状态码
*/
@RequestMapping(value = "/IntoUpLoad",method = {RequestMethod.POST})
@ApiOperation(value = "上传文件",httpMethod = "POST")
public AjaxResult IntoUpload(@RequestBody MultipartFile file)
{
UploadFile upload=new UploadFile();
ThematicMapDomain domain=new ThematicMapDomain();
UploadFile value= null;
try {
value = uploadFile(file,upload);
} catch (Exception e) {
e.printStackTrace();
}
int NUM = service.IntoUpload(value);
domain.setPictureCode(value.getFileId());
// domain.setCreatedTime(LocalDateTime.now());
//
//
// thematicMapService.save(domain);
if (NUM>0)
{
return AjaxResult.success();
}
return AjaxResult.error();
}
/**
* 文件查询
* @param response 头
* @param request 客户端请求
* @return
*/
@RequestMapping(value = "/selectUpload",method = {RequestMethod.GET})
@ApiOperation(value = "文件查询",httpMethod = "GET")
public AjaxResult selectUpload(HttpServletResponse response, HttpServletRequest request,@RequestBody UploadFile upload)
{
List<UploadFile> eastVOSList= service.selectUpload(upload);
return AjaxResult.success(eastVOSList);
}
public UploadFile uploadFile(MultipartFile file,UploadFile upload) throws Exception
{
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath();
// 上传并返回新文件名称
String fileName = FileUploadUtils.upload(filePath, file);
upload.setFileId(String.valueOf(System.currentTimeMillis()));
upload.setFileName(file.getOriginalFilename());
upload.setFilePath(fileName);
upload.setFileSize(String.valueOf(file.getSize()));
upload.setCreateTime(LocalDateTime.now());
return upload;
}
@RequestMapping(value = "/Dictionary")
@ApiOperation(value = "字典查询",httpMethod = "POST")
public AjaxResult Dictionary(@RequestBody Dictionary dic)
{
List<Dictionary> diclist=service.selectDic(dic);
return AjaxResult.success(diclist);
}
}
}

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/AustraliaMiddleEastController.java
View File

@ -3,6 +3,9 @@ package com.ruoyi.web.controller.yada;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -21,6 +24,7 @@ import java.util.List;
*/
@RestController
@RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8")
@Api(tags = "澳大利亚中东部地区")
public class AustraliaMiddleEastController
{
@Resource
@ -32,7 +36,8 @@ public class AustraliaMiddleEastController
* @param request 客户端请求
* @return 实体类
*/
@RequestMapping(value = "/SelectAustralia",method = {RequestMethod.POST})
@ApiOperation(value = "查询方法",httpMethod = "GET")
@RequestMapping(value = "/SelectAustralia",method = {RequestMethod.GET})
public AjaxResult SelectAustralia(HttpServletResponse response, HttpServletRequest request)
{
List<AustraliaMiddleEastVO> eastVOSList= australiaMiddleEastService.selectAustralia();
@ -41,10 +46,12 @@ public class AustraliaMiddleEastController
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelAustralia",method = {RequestMethod.POST})
@RequestMapping(value = "/DelAustralia",method = {RequestMethod.DELETE})
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
public AjaxResult DelAustralia(@Param("ID") String ID)
{
int NUM = australiaMiddleEastService.DelAustralia(ID);
@ -62,6 +69,7 @@ public class AustraliaMiddleEastController
* @return 状态码
*/
@RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
@ApiOperation(value = "新增方法",httpMethod = "POST")
public AjaxResult IntoAustralia(@RequestBody AustraliaMiddleEastVO eastVOS)
{
eastVOS.setCreateTime(LocalDateTime.now());

16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/GlobalTypeController.java
View File

@ -5,6 +5,9 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.GlobalTypeVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IGlobalTypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -23,6 +26,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/monitor/clobal")
@Api(tags = "全球各类型占比")
public class GlobalTypeController {
@Resource
private IGlobalTypeService typeService;
@ -34,18 +38,21 @@ public class GlobalTypeController {
* @return 参数类
*/
@RequestMapping(value = "/selectGlobalType",method = {RequestMethod.POST})
public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request)
@ApiOperation(value = "查询方法",httpMethod = "POST")
public AjaxResult selectGlobalType(HttpServletResponse response, HttpServletRequest request,@RequestBody GlobalTypeVO TypeVO)
{
List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType();
List<GlobalTypeVO> eastVOSList= typeService.selectGlobalType(TypeVO.getTypeName(),TypeVO.getParticularYear());
return AjaxResult.success(eastVOSList);
}
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelGlobalType",method = {RequestMethod.POST})
@RequestMapping(value = "/DelGlobalType",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
public AjaxResult DelGlobalType(@Param("ID") String ID)
{
int NUM = typeService.DelGlobalType(ID);
@ -62,6 +69,7 @@ public class GlobalTypeController {
* @param eastVOS 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoGlobalType",method = {RequestMethod.POST})
public AjaxResult IntoGlobalType(@RequestBody GlobalTypeVO eastVOS)
{

15
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/OceanTemperatureController.java
View File

@ -5,6 +5,9 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.OceanTemperatureVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IOceanTemperatureService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -21,6 +24,7 @@ import java.util.List;
/**
* 海洋表面温度监测
*/
@Api(tags = "海洋表面温度监测")
@RestController
@RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8")
public class OceanTemperatureController {
@ -33,7 +37,8 @@ public class OceanTemperatureController {
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/selectOcean",method = {RequestMethod.POST})
@RequestMapping(value = "/selectOcean",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectOcean(HttpServletResponse response, HttpServletRequest request)
{
List<OceanTemperatureVO> eastVOSList= temperatureService.selectOcean();
@ -42,10 +47,13 @@ public class OceanTemperatureController {
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelOcean",method = {RequestMethod.POST})
@RequestMapping(value = "/DelOcean",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
public AjaxResult DelOcean(@Param("ID") String ID)
{
int NUM = temperatureService.DelOcean(ID);
@ -62,6 +70,7 @@ public class OceanTemperatureController {
* @param eastVOS 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoAustralia",method = {RequestMethod.POST})
public AjaxResult IntoOcean(@RequestBody OceanTemperatureVO eastVOS)
{

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionVGIController.java
View File

@ -3,6 +3,9 @@ package com.ruoyi.web.controller.yada;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.service_yada.IRegionVGIService;
import com.ruoyi.system.domain_yada.RegionVGIVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -20,6 +23,7 @@ import java.util.List;
/**
* 各区域VGI
*/
@Api(tags = "各区域VGI")
@RestController
@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8")
public class RegionVGIController
@ -32,7 +36,8 @@ public class RegionVGIController
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/SelectRegion",method = {RequestMethod.POST})
@RequestMapping(value = "/SelectRegion",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult SelectRegion(HttpServletResponse response, HttpServletRequest request)
{
List<RegionVGIVO> vgivost= regionVGIService.selectRegion();
@ -41,10 +46,12 @@ public class RegionVGIController
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelRegion",method = {RequestMethod.POST})
@RequestMapping(value = "/DelRegion",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
public AjaxResult DelRegion(@Param("ID") String ID)
{
int NUM = regionVGIService.DelRegion(ID);
@ -61,6 +68,7 @@ public class RegionVGIController
* @param vgivo 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoRegion",method = {RequestMethod.POST})
public AjaxResult IntoRegion(@RequestBody RegionVGIVO vgivo)
{

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/RegionalSystemController.java
View File

@ -6,6 +6,9 @@ import com.ruoyi.system.domain_yada.RegionVGIVO;
import com.ruoyi.system.domain_yada.RegionalSystemVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IRegionalSystemService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -22,6 +25,7 @@ import java.util.List;
/**
* 区域生态系统
*/
@Api(tags = "区域生态系统")
@RestController
@RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8")
public class RegionalSystemController {
@ -34,7 +38,8 @@ public class RegionalSystemController {
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/selectRegional",method = {RequestMethod.POST})
@RequestMapping(value = "/selectRegional",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectRegional(HttpServletResponse response, HttpServletRequest request)
{
List<RegionalSystemVO> eastVOSList= systemService.selectRegional();
@ -43,10 +48,12 @@ public class RegionalSystemController {
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelRegional",method = {RequestMethod.POST})
@RequestMapping(value = "/DelRegional",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "int", paramType = "path", dataTypeClass = Integer.class)
public AjaxResult DelRegional(@Param("ID") String ID)
{
int NUM = systemService.DelRegional(ID);
@ -63,6 +70,7 @@ public class RegionalSystemController {
* @param eastVOS 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoRegional",method = {RequestMethod.POST})
public AjaxResult IntoRegional(@RequestBody RegionalSystemVO eastVOS)
{

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/ThematicMapController.java
View File

@ -1,6 +1,9 @@
package com.ruoyi.web.controller.yada;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.common.utils.file.FileUtils;
import com.ruoyi.system.domain_yada.ThematicMapDomain;
import com.ruoyi.system.service_yada.ThematicMapService;
import io.swagger.annotations.*;
@ -9,6 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
@ -48,13 +52,14 @@ public class ThematicMapController {
List<ThematicMapDomain> res= thematicMapService.selectAll();
return AjaxResult.success(res);
}
/**
* 删除方法
* @param id 单据id
* @param id id
* @return 状态码
*/
@RequestMapping(value = "/delete",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class)
public AjaxResult deleteThematicMap(@Param("id") Long id)
{
int num = thematicMapService.deleteById(id);
@ -69,9 +74,12 @@ public class ThematicMapController {
* @param thematicMapDomain 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/add",method = {RequestMethod.POST})
public AjaxResult saveThematicMap(@RequestBody ThematicMapDomain thematicMapDomain)
{
thematicMapDomain.setCreatedTime(LocalDateTime.now());
int num = thematicMapService.save(thematicMapDomain);
if (num>0) {
@ -79,4 +87,6 @@ public class ThematicMapController {
}
return AjaxResult.error();
}
}

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/UrbanController.java
View File

@ -5,6 +5,9 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.UrbanVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IUrbanService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -21,6 +24,7 @@ import java.util.List;
/**
* 中国城市监测
*/
@Api(tags = "中国城市监测")
@RestController
@RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8")
public class UrbanController {
@ -33,7 +37,8 @@ public class UrbanController {
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/selectUrban",method = {RequestMethod.POST})
@RequestMapping(value = "/selectUrban",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectUrban(HttpServletResponse response, HttpServletRequest request)
{
List<UrbanVO> eastVOSList= urbanService.selectUrban();
@ -42,10 +47,11 @@ public class UrbanController {
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelUrban",method = {RequestMethod.POST})
@RequestMapping(value = "/DelUrban",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
public AjaxResult DelUrban(@Param("ID") String ID)
{
int NUM = urbanService.DelUrban(ID);
@ -62,7 +68,9 @@ public class UrbanController {
* @param eastVOS 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoUrban",method = {RequestMethod.POST})
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class)
public AjaxResult IntoUrban(@RequestBody UrbanVO eastVOS)
{
eastVOS.setCreateTime(LocalDateTime.now());

14
ruoyi-admin/src/main/java/com/ruoyi/web/controller/yada/VegetationCoverageController.java
View File

@ -5,6 +5,9 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.VegetationCoverageVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IVegetationCoverageService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@ -21,6 +24,7 @@ import java.util.List;
/**
* 平均植被覆盖度和净初级生产力
*/
@Api(tags = "平均植被覆盖度和净初级生产力")
@RestController
@RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8")
public class VegetationCoverageController {
@ -33,7 +37,8 @@ public class VegetationCoverageController {
* @param request 客户端请求
* @return 参数类
*/
@RequestMapping(value = "/selectVegetation",method = {RequestMethod.POST})
@RequestMapping(value = "/selectVegetation",method = {RequestMethod.GET})
@ApiOperation(value = "查询方法",httpMethod = "GET")
public AjaxResult selectVegetation(HttpServletResponse response, HttpServletRequest request)
{
List<VegetationCoverageVO> eastVOSList= coverageService.selectVegetation();
@ -42,10 +47,12 @@ public class VegetationCoverageController {
/**
* 删除方法
* @param ID 单据id
* @param ID id
* @return 状态码
*/
@RequestMapping(value = "/DelVegetation",method = {RequestMethod.POST})
@RequestMapping(value = "/DelVegetation",method = {RequestMethod.DELETE})
@ApiOperation(value = "删除方法",httpMethod = "DELETE")
@ApiImplicitParam(name = "userId", value = "用户ID", required = true, dataType = "long", paramType = "path", dataTypeClass = long.class)
public AjaxResult DelVegetation(@Param("ID") String ID)
{
int NUM = coverageService.DelVegetation(ID);
@ -62,6 +69,7 @@ public class VegetationCoverageController {
* @param eastVOS 新增实体类
* @return 状态码
*/
@ApiOperation(value = "新增方法",httpMethod = "POST")
@RequestMapping(value = "/IntoVegetation",method = {RequestMethod.POST})
public AjaxResult IntoVegetation(@RequestBody VegetationCoverageVO eastVOS)
{

3
ruoyi-admin/src/main/resources/application-druid.yml
View File

@ -6,7 +6,8 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
url: jdbc:mysql://192.168.2.9:3306/nuoyi?AllowPublicKeyRetrieval=True&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: saas
password: XKrs123.
# 从库数据源

2
ruoyi-admin/src/main/resources/application.yml
View File

@ -92,7 +92,7 @@ token:
# 令牌密钥
secret: abcdefghijklmnopqrstuvwxyz
# 令牌有效期（默认30分钟）
expireTime: 30
expireTime: 300
# MyBatis配置
mybatis:

2
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java
View File

@ -144,7 +144,7 @@ public class TokenService
loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
// 根据uuid将loginUser缓存
String userKey = getTokenKey(loginUser.getToken());
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
redisCache.setCacheObject(userKey, loginUser, expireTime, TimeUnit.HOURS);
}
/**

69
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/Dictionary.java Normal file
View File

@ -0,0 +1,69 @@
package com.ruoyi.system.domain_yada;
/**
* @Author: JinSheng Song
* @Date: 2022/5/30 8:50
*/
//字典表
public class Dictionary extends SysBaseEntity
{
private String codingType;
private String codingType1;
private String codingType2;
private String dictionary;
private String name;
private String nameEn;
public String getCodingType1() {
return codingType1;
}
public void setCodingType1(String codingType1) {
this.codingType1 = codingType1;
}
public String getCodingType2() {
return codingType2;
}
public void setCodingType2(String codingType2) {
this.codingType2 = codingType2;
}
public String getCodingType() {
return codingType;
}
public void setCodingType(String codingType) {
this.codingType = codingType;
}
public String getDictionary() {
return dictionary;
}
public void setDictionary(String dictionary) {
this.dictionary = dictionary;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public String getNameEn() {
return nameEn;
}
public void setNameEn(String nameEn) {
this.nameEn = nameEn;
}
}

6
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/GlobalTypeVO.java
View File

@ -15,7 +15,7 @@ public class GlobalTypeVO extends SysBaseEntity {
private Double areaProportion;
private String area;
private Double area;
private int particularYear;
@ -51,11 +51,11 @@ public class GlobalTypeVO extends SysBaseEntity {
this.areaProportion = areaProportion;
}
public String getArea() {
public Double getArea() {
return area;
}
public void setArea(String area) {
public void setArea(Double area) {
this.area = area;
}

31
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
View File

@ -11,6 +11,12 @@ public class ThematicMapDomain extends SysBaseEntity {
private Long id;
private String pictureCode;
private String pictureTypeOne;
private String pictureTypeTwo;
private String pictureZh;
private String pictureEn;
@ -29,6 +35,31 @@ public class ThematicMapDomain extends SysBaseEntity {
private LocalDateTime createdTime;
public String getPictureCode() {
return pictureCode;
}
public void setPictureCode(String pictureCode) {
this.pictureCode = pictureCode;
}
public String getPictureTypeOne() {
return pictureTypeOne;
}
public void setPictureTypeOne(String pictureTypeOne) {
this.pictureTypeOne = pictureTypeOne;
}
public String getPictureTypeTwo() {
return pictureTypeTwo;
}
public void setPictureTypeTwo(String pictureTypeTwo) {
this.pictureTypeTwo = pictureTypeTwo;
}
public Long getId() {
return id;
}

60
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadFile.java Normal file
View File

@ -0,0 +1,60 @@
package com.ruoyi.system.domain_yada;
import java.time.LocalDate;
/**
* @Author: JinSheng Song
* @Date: 2022/5/24 14:24
*/
public class UploadFile extends SysBaseEntity
{
private String id;
private String fileId;
private String fileName;
private String filePath;
private String fileSize;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFileId() {
return fileId;
}
public void setFileId(String fileId) {
this.fileId = fileId;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getFilePath() {
return filePath;
}
public void setFilePath(String filePath) {
this.filePath = filePath;
}
public String getFileSize() {
return fileSize;
}
public void setFileSize(String fileSize) {
this.fileSize = fileSize;
}
}

8
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/AorestCoverageMapper.java
View File

@ -1,6 +1,8 @@
package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.AorestCoverageVO;
import com.ruoyi.system.domain_yada.Dictionary;
import com.ruoyi.system.domain_yada.UploadFile;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -16,4 +18,10 @@ public interface AorestCoverageMapper {
Integer DelAorestCoverage(@Param("id") String id);
Integer IntoAorestCoverage(AorestCoverageVO eastVO);
Integer IntoUpload(UploadFile file);
List<UploadFile> selectUpload(UploadFile file);
List<Dictionary> selectDic(Dictionary dic);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/GlobalTypeMapper.java
View File

@ -11,7 +11,7 @@ import java.util.List;
*/
public interface GlobalTypeMapper {
List<GlobalTypeVO> selectGlobalType();
List<GlobalTypeVO> selectGlobalType(@Param("typeName") String typeName, @Param("particularYear") Integer particularYear);
Integer DelGlobalType(@Param("id") String id);

9
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IAorestCoverageService.java
View File

@ -1,7 +1,10 @@
package com.ruoyi.system.service_yada;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.system.domain_yada.AorestCoverageVO;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.Dictionary;
import com.ruoyi.system.domain_yada.UploadFile;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@ -18,4 +21,10 @@ public interface IAorestCoverageService {
public Integer DelAorestCoverage(@Param("id") String id);
public Integer IntoAorestCoverage(AorestCoverageVO eastVO);
public Integer IntoUpload(UploadFile file);
public List<UploadFile> selectUpload(UploadFile file);
public List<Dictionary> selectDic(Dictionary dic);
}

2
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/IGlobalTypeService.java
View File

@ -13,7 +13,7 @@ import java.util.List;
*/
public interface IGlobalTypeService {
public List<GlobalTypeVO> selectGlobalType();
public List<GlobalTypeVO> selectGlobalType(String typeName, Integer particularYear);
public Integer DelGlobalType(String id);

17
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AorestCoverageServiceimpl.java
View File

@ -2,6 +2,8 @@ package com.ruoyi.system.service_yada.impl;
import com.ruoyi.system.domain_yada.AorestCoverageVO;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.domain_yada.Dictionary;
import com.ruoyi.system.domain_yada.UploadFile;
import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.service_yada.IAorestCoverageService;
@ -36,4 +38,19 @@ public class AorestCoverageServiceimpl implements IAorestCoverageService {
public Integer IntoAorestCoverage(AorestCoverageVO eastVO) {
return coverageMapper.IntoAorestCoverage(eastVO);
}
@Override
public Integer IntoUpload(UploadFile file) {
return coverageMapper.IntoUpload(file);
}
@Override
public List<UploadFile> selectUpload(UploadFile file) {
return coverageMapper.selectUpload(file);
}
@Override
public List<Dictionary> selectDic(Dictionary dic) {
return coverageMapper.selectDic(dic);
}
}

6
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/GlobalTypeServiceimpl.java
View File

@ -5,6 +5,8 @@ import com.ruoyi.system.domain_yada.GlobalTypeVO;
import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.GlobalTypeMapper;
import com.ruoyi.system.service_yada.IGlobalTypeService;
import org.apache.commons.compress.archivers.dump.DumpArchiveEntry;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -24,8 +26,8 @@ public class GlobalTypeServiceimpl implements IGlobalTypeService {
@Override
public List<GlobalTypeVO> selectGlobalType() {
return typeMapper.selectGlobalType();
public List<GlobalTypeVO> selectGlobalType(String typeName, Integer particularYear) {
return typeMapper.selectGlobalType(typeName, particularYear);
}
@Override

79
ruoyi-system/src/main/resources/mapper/system/AorestCoverageMapper.xml
View File

@ -61,4 +61,83 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
]]>
</insert>
<resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadFile">
<result property="id" column="id"/>
<result property="fileId" column="file_id"/>
<result property="fileName" column="file_name"/>
<result property="fileSize" column="file_size"/>
<result property="filePath" column="file_path"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<insert id="IntoUpload">
<![CDATA[
INSERT INTO sys_file_info (
id ,
file_id ,
file_name ,
file_size ,
file_path ,
created_by,
created_time
) VALUES (
#{id,jdbcType=VARCHAR},
#{fileId,jdbcType=VARCHAR},
#{fileName,jdbcType=VARCHAR},
#{fileSize,jdbcType=VARCHAR},
#{filePath,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}
)
]]>
</insert>
<select id="selectUpload" resultMap="RM_Upload">
SELECT file_id,file_name,file_size,file_path,created_by,created_time FROM sys_file_info
WHERE 1=1
<if test="@Ognl@isNotEmpty(paramBean.fileId)">
AND fileId = #{paramBean.fileId}
</if>
<if test="@Ognl@isNotEmpty(paramBean.fileName)">
AND file_name = #{paramBean.fileName}
</if>
</select>
<resultMap id="RM_Dictionary" type="com.ruoyi.system.domain_yada.Dictionary">
<result property="codingType" column="coding_type"/>
<result property="codingType1" column="codingType1"/>
<result property="codingType2" column="codingType2"/>
<result property="dictionary" column="dictionary"/>
<result property="name" column="name"/>
<result property="nameEn" column="name_en"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<sql id="columnsdic">
<![CDATA[
coding_type,dictionary,name,nameEn,created_by,created_time
]]>
</sql>
<select id="selectDic" resultMap="RM_Dictionary">
select <include refid="columns"/> from dictionary
where coding_type in
(SELECT A.coding_type FROM dictionary a
join (select dictionary from dictionary
where 1=1
<if test="@Ognl@isNotEmpty(paramBean.codingType)">
AND coding_type = #{paramBean.codingType}
</if>
<if test="@Ognl@isNotEmpty(paramBean.codingType1)">
AND dictionary = #{paramBean.codingType1}
</if>
) b on a.coding_type=b.dictionary
and
<if test="@Ognl@isNotEmpty(paramBean.codingType2)">
AND a.dictionary = #{paramBean.codingType2}
</if>
)
</select>
</mapper>

10
ruoyi-system/src/main/resources/mapper/system/GlobalTypeMapper.xml
View File

@ -21,9 +21,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
id,particular_year,type_name,type_name_en,area_proportion,area,created_by,created_time
]]>
</sql>
<select id="selectGlobalType" resultMap="RM_GlobalType">
SELECT <include refid="columns"/> FROM proportion_of_global_types;
SELECT <include refid="columns"/> FROM proportion_of_global_types
WHERE 1=1
<if test="particularYear!= null and particularYear !=''">
AND particular_year = #{particularYear}
</if>
<if test="typeName!= null and typeName !=''">
AND type_name = #{typeName}
</if>
</select>
<delete id="DelGlobalType">

11
ruoyi-system/src/main/resources/mapper/system/ThematicMapMapper.xml
View File

@ -6,6 +6,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap id="RM_ThematicMap" type="com.ruoyi.system.domain_yada.ThematicMapDomain">
<result property="id" column="id"/>
<result property="pictureZh" column="picture_zh"/>
<result property="pictureCode" column="picture_code"/>
<result property="pictureTypeOne" column="picture_type_one"/>
<result property="pictureTypeTwo" column="picture_type_two"/>
<result property="pictureEn" column="picture_en"/>
<result property="pictureName" column="picture_name"/>
<result property="pictureType" column="picture_type"/>
@ -19,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="columns">
<![CDATA[
id,picture_zh,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
id,picture_zh,picture_code,picture_type_one,picture_type_two,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
]]>
</sql>
@ -40,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
picture_en ,
picture_name ,
picture_type ,
picture_type_one,
picture_type_two,
picture_code,
picture_time ,
picture_path,
remarks,
@ -51,6 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{pictureEn,jdbcType=VARCHAR}},
#{pictureName,jdbcType=VARCHAR}},
#{pictureType,jdbcType=VARCHAR}},
#{pictureTypeOne,jdbcType=VARCHAR}},
#{pictureTypeTwo,jdbcType=VARCHAR}},
#{pictureCode,jdbcType=VARCHAR}},
#{pictureTime,jdbcType=TIMESTAMP},
#{picturePath,jdbcType=VARCHAR},
#{remarks,jdbcType=VARCHAR},