Merge branch 'master' into test

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AdahTestingMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AdahTestingMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/AtmosphereMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:17
+ */
+public interface AtmosphereMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ENSOMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface ENSOMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ForestMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface ForestMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GlobalEcologyMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface GlobalEcologyMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/UrbanMapper.java

@@ -0,0 +1,8 @@
+package com.ruoyi.system.mapper;
+
+/**
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 15:18
+ */
+public interface UrbanMapper {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAdahTestingService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:32
+ */
+public interface IAdahTestingService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IAtmosphereService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:34
+ */
+public interface IAtmosphereService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IENSOService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * ENSO影响监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:35
+ */
+public interface IENSOService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IForestService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:38
+ */
+public interface IForestService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IGlobalEcologyService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 全球生态环境监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:37
+ */
+public interface IGlobalEcologyService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISpecialReportService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:39
+ */
+public interface ISpecialReportService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -2,12 +2,15 @@ package com.ruoyi.system.service;
 
 import java.util.List;
 import com.ruoyi.system.domain.SysConfig;
+import org.springframework.stereotype.Service;
 
 /**
  * 参数配置 服务层
  * 
  * @author ruoyi
  */
+
+
 public interface ISysConfigService
 {
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/IUrbanService.java

@@ -0,0 +1,9 @@
+package com.ruoyi.system.service;
+
+/**
+ * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:40
+ */
+public interface IUrbanService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AdahTestingServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IAdahTestingService;
+
+/**
+ * 亚大综合监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:43
+ */
+public class AdahTestingServiceimpl implements IAdahTestingService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/AtmosphereServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IAtmosphereService;
+
+/**
+ * 大气质量监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:45
+ */
+public class AtmosphereServiceimpl  implements IAtmosphereService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ENSOServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IENSOService;
+
+/**
+ * ENSO影响监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:46
+ */
+public class ENSOServiceimpl implements IENSOService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ForestServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IForestService;
+
+/**
+ * 森林监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+public class ForestServiceimpl implements IForestService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GlobalEcologyServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IGlobalEcologyService;
+
+/**
+ * 全球生态环境监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:47
+ */
+public class GlobalEcologyServiceimpl implements IGlobalEcologyService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SpecialReportServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.ISpecialReportService;
+
+/**
+ * 专题报告
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:48
+ */
+public class SpecialReportServiceimpl  implements ISpecialReportService {
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -14,6 +14,7 @@ import com.ruoyi.system.service.ISysConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
 import java.util.Collection;
 import java.util.List;
 
@@ -25,10 +26,10 @@ import java.util.List;
 @Service
 public class SysConfigServiceImpl implements ISysConfigService
 {
-    @Autowired
+    @Resource
     private SysConfigMapper configMapper;
 
-    @Autowired
+    @Resource
     private RedisCache redisCache;
 
     /**

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UrbanServiceimpl.java

@@ -0,0 +1,11 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.system.service.IUrbanService;
+
+/**
+ * * 城市监测
+ * @Author: JinSheng Song
+ * @Date: 2022/5/11 11:49
+ */
+public class UrbanServiceimpl implements IUrbanService {
+}

ruoyi-system/src/main/resources/mapper/system/AdahTestingMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.ruoyi.system.mapper.AdahTestingMapper">
+
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/AtmosphereMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.ruoyi.system.mapper.AtmosphereMapper">
+
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/ENSOMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.ruoyi.system.mapper.ENSOMapper">
+
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/ForestMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.ruoyi.system.mapper.ForestMapper">
+
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/GlobalEcologyMapper.xml

@@ -0,0 +1,7 @@
+<?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="com.ruoyi.system.mapper.GlobalEcologyMapper">
+
+</mapper> 

ruoyi-system/src/main/resources/mapper/system/UrbanMapper.xml

@@ -0,0 +1,8 @@
+<?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="com.ruoyi.system.mapper.UrbanMapper">
+
+
+</mapper>