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

Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev

Browse Source 
# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/ThematicMapDomain.java
This commit is contained in:
qdxkrs 2022-05-23 14:37:16 +08:00
commit c424d5cd89
20 changed files with 81 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,10 +6,12 @@ import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import com.ruoyi.system.service_yada.IAorestCoverageService;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RestController
@RequestMapping(value = "/business-service/api/Aorest", produces = "application/json;charset=UTF-8")
public class AorestCoverageController {
//@Autowired
@Resource
private IAorestCoverageService service;
/**

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

@ -4,10 +4,12 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -21,7 +23,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/Australia", produces = "application/json;charset=UTF-8")
public class AustraliaMiddleEastController
{
//@Autowired
@Resource
private IAustraliaMiddleEastService australiaMiddleEastService;
/**

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

@ -6,10 +6,12 @@ import com.ruoyi.system.domain_yada.GlobalTypeVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IGlobalTypeService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RestController
@RequestMapping("/monitor/clobal")
public class GlobalTypeController {
//@Autowired
@Resource
private IGlobalTypeService typeService;
/**

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

@ -6,10 +6,12 @@ import com.ruoyi.system.domain_yada.OceanTemperatureVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IOceanTemperatureService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RestController
@RequestMapping(value = "/business-service/api/Ocean", produces = "application/json;charset=UTF-8")
public class OceanTemperatureController {
//@Autowired
@Resource
private IOceanTemperatureService temperatureService;
/**

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

@ -4,11 +4,13 @@ import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.system.service_yada.IRegionVGIService;
import com.ruoyi.system.domain_yada.RegionVGIVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RequestMapping(value = "/business-service/api/orderMng", produces = "application/json;charset=UTF-8")
public class RegionVGIController
{
//@Autowired
@Resource
private IRegionVGIService regionVGIService;
/**
* 查询方法

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

@ -7,10 +7,12 @@ import com.ruoyi.system.domain_yada.RegionalSystemVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IRegionalSystemService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -23,7 +25,7 @@ import java.util.List;
@RestController
@RequestMapping(value = "/business-service/api/Regional", produces = "application/json;charset=UTF-8")
public class RegionalSystemController {
//@Autowired
@Resource
private IRegionalSystemService systemService;
/**

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

@ -6,10 +6,12 @@ import com.ruoyi.system.domain_yada.UrbanVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IUrbanService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RestController
@RequestMapping(value = "/business-service/api/Urban", produces = "application/json;charset=UTF-8")
public class UrbanController {
//@Autowired
@Resource
private IUrbanService urbanService;
/**

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

@ -6,10 +6,12 @@ import com.ruoyi.system.domain_yada.VegetationCoverageVO;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.service_yada.IVegetationCoverageService;
import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
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 javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
@ -22,7 +24,7 @@ import java.util.List;
@RestController
@RequestMapping(value = "/business-service/api/Vegetation", produces = "application/json;charset=UTF-8")
public class VegetationCoverageController {
//@Autowired
@Resource
private IVegetationCoverageService coverageService;
/**

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

@ -6,7 +6,7 @@ spring:
druid:
# 主库数据源
master:
url: jdbc:mysql://192.168.2.9:3306/nuoyi?useUnicode=true&characterEncoding=utf8&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
username: saas
password: XKrs123.
# 从库数据源

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

@ -97,9 +97,9 @@ token:
# MyBatis配置
mybatis:
# 搜索指定包别名
typeAliasesPackage: com.ruoyi.**.domain
typeAliasesPackage: com.ruoyi.**.domain,com.ruoyi.**.domain_yada
# 配置mapper的扫描，找到所有的mapper.xml映射文件
mapperLocations: classpath*:mapper/**/*Mapper.xml
mapperLocations: classpath*:mapper/**/*Mapper.xml,classpath*:mapper_yada/*Mapper.xml
# 加载全局的配置文件
configLocation: classpath:mybatis/mybatis-config.xml
@ -116,6 +116,7 @@ swagger:
# 请求前缀
pathMapping: /dev-api
# 防止XSS攻击
xss:
# 过滤开关

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

@ -89,22 +89,41 @@ public class ThematicMapDomain extends SysBaseEntity {
return remarks;
}
<<<<<<< HEAD
=======
>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
public void setRemarks(String remarks) {
this.remarks = remarks;
}
<<<<<<< HEAD
=======
>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
public String getCreatedBy() {
return createdBy;
}
<<<<<<< HEAD
>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
public void setCreatedBy(String createdBy) {
this.createdBy = createdBy;
}
<<<<<<< HEAD
=======
>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
public LocalDateTime getCreatedTime() {
return createdTime;
}
<<<<<<< HEAD
=======
>>>>>>> 5041f3f92f8e9599661b1a5a5fea0032355755ed
public void setCreatedTime(LocalDateTime createdTime) {
this.createdTime = createdTime;
}

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

@ -2,6 +2,7 @@ package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.OceanTemperatureVO;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -9,6 +10,7 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 15:18
*/
@Repository
public interface OceanTemperatureMapper {
List<OceanTemperatureVO> selectOcean();

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

@ -6,7 +6,9 @@ import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.service_yada.IAorestCoverageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,8 +16,9 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:43
*/
@Service
public class AorestCoverageServiceimpl implements IAorestCoverageService {
@Autowired
@Resource
private AorestCoverageMapper coverageMapper;

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/AustraliaMiddleEastServiceimpl.java
View File

@ -4,7 +4,9 @@ import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.service_yada.IAustraliaMiddleEastService;
import com.ruoyi.system.domain_yada.AustraliaMiddleEastVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -12,9 +14,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:43
*/
@Service
public class AustraliaMiddleEastServiceimpl implements IAustraliaMiddleEastService
{
@Autowired
@Resource
private AustraliaMiddleEastMapper australiaMiddleEastMapper;
@Override

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

@ -6,7 +6,9 @@ import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.GlobalTypeMapper;
import com.ruoyi.system.service_yada.IGlobalTypeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,9 +16,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:47
*/
@Service
public class GlobalTypeServiceimpl implements IGlobalTypeService {
@Autowired
@Resource
private GlobalTypeMapper typeMapper;

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/OceanTemperatureServiceimpl.java
View File

@ -6,7 +6,9 @@ import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.OceanTemperatureMapper;
import com.ruoyi.system.service_yada.IOceanTemperatureService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,9 +16,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:47
*/
@Service
public class OceanTemperatureServiceimpl implements IOceanTemperatureService {
@Autowired
@Resource
private OceanTemperatureMapper oceanMapper;

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionVGIServiceimpl.java
View File

@ -4,7 +4,9 @@ import com.ruoyi.system.mapper_yada.RegionVGIMapper;
import com.ruoyi.system.service_yada.IRegionVGIService;
import com.ruoyi.system.domain_yada.RegionVGIVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -12,9 +14,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:45
*/
@Service
public class RegionVGIServiceimpl implements IRegionVGIService {
@Autowired
@Resource
private RegionVGIMapper vgiMapper;
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/RegionalSystemServiceimpl.java
View File

@ -6,7 +6,9 @@ import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.RegionalSystemMapper;
import com.ruoyi.system.service_yada.IRegionalSystemService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,9 +16,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:46
*/
@Service
public class RegionalSystemServiceimpl implements IRegionalSystemService {
@Autowired
@Resource
private RegionalSystemMapper Regional;

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/UrbanServiceimpl.java
View File

@ -5,7 +5,9 @@ import com.ruoyi.system.mapper_yada.AorestCoverageMapper;
import com.ruoyi.system.mapper_yada.UrbanMapper;
import com.ruoyi.system.service_yada.IUrbanService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -13,9 +15,10 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:49
*/
@Service
public class UrbanServiceimpl implements IUrbanService {
@Autowired
@Resource
private UrbanMapper urbanMapper;
@Override

5
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/VegetationCoverageServiceimpl.java
View File

@ -6,7 +6,9 @@ import com.ruoyi.system.mapper_yada.AustraliaMiddleEastMapper;
import com.ruoyi.system.mapper_yada.VegetationCoverageMapper;
import com.ruoyi.system.service_yada.IVegetationCoverageService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
@ -14,10 +16,11 @@ import java.util.List;
* @Author: JinSheng Song
* @Date: 2022/5/11 11:45
*/
@Service
public class VegetationCoverageServiceimpl implements IVegetationCoverageService {
@Autowired
@Resource
private VegetationCoverageMapper coverageMapper;