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

更新

Browse Source
This commit is contained in:
songjinsheng
2022-08-16 08:36:53 +08:00
parent 52095ccd04
commit 854afa033d
19 changed files with 506 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/SpecialVO.java Normal file
View File

@@ -0,0 +1,78 @@
package com.ruoyi.system.domain_yada;
/**
* @Author: JinSheng Song
* @Date: 2022/7/20 11:48
*/
public class SpecialVO extends SysBaseEntity
{
private String id;
private String fileName;
private String dateTime;
private String spaceDistinguish;
private String timeDistinguish;
private String zone;
private String filePath;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getDateTime() {
return dateTime;
}
public void setDateTime(String dateTime) {
this.dateTime = dateTime;
}
public String getSpaceDistinguish() {
return spaceDistinguish;
}
public void setSpaceDistinguish(String spaceDistinguish) {
this.spaceDistinguish = spaceDistinguish;
}
public String getTimeDistinguish() {
return timeDistinguish;
}
public void setTimeDistinguish(String timeDistinguish) {
this.timeDistinguish = timeDistinguish;
}
public String getZone() {
return zone;
}
public void setZone(String zone) {
this.zone = zone;
}
public String getFilePath() {
return filePath;
}
public void setFilePath(String filePath) {
this.filePath = filePath;
}
}

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

@@ -33,6 +33,8 @@ public class ThematicMapDomain extends SysBaseEntity {
private String createdBy;
private String year;
private LocalDateTime createdTime;
public String getPictureCode() {
@@ -155,4 +157,12 @@ public class ThematicMapDomain extends SysBaseEntity {
", createdTime=" + createdTime +
'}';
}
public String getYear() {
return year;
}
public void setYear(String year) {
this.year = year;
}
}

92
ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/UploadSpecialVO.java Normal file
View File

@@ -0,0 +1,92 @@
package com.ruoyi.system.domain_yada;
import javax.xml.stream.events.DTD;
import java.awt.*;
/**
* @Author: JinSheng Song
* @Date: 2022/7/20 16:47
*/
public class UploadSpecialVO extends SysBaseEntity
{
private String id;
private String fileName;
private String uploadNum;
private String filePath;
private String type;
private String remarks1;
private String remarks2;
private String sign;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getFileName() {
return fileName;
}
public void setFileName(String fileName) {
this.fileName = fileName;
}
public String getUploadNum() {
return uploadNum;
}
public void setUploadNum(String uploadNum) {
this.uploadNum = uploadNum;
}
public String getFilePath() {
return filePath;
}
public void setFilePath(String filePath) {
this.filePath = filePath;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getRemarks1() {
return remarks1;
}
public void setRemarks1(String remarks1) {
this.remarks1 = remarks1;
}
public String getRemarks2() {
return remarks2;
}
public void setRemarks2(String remarks2) {
this.remarks2 = remarks2;
}
public String getSign() {
return sign;
}
public void setSign(String sign) {
this.sign = sign;
}
}

1
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/CityExpandMapper.java
View File

@@ -24,4 +24,5 @@ public interface CityExpandMapper {
List<CityInformation> selectInfrom(@Param("city") String city,
@Param("country") String country,
@Param("year") String year);
List<CityInformation> selectMain( @Param("year") String year);
}

28
ruoyi-system/src/main/java/com/ruoyi/system/mapper_yada/SpecialReportMapper.java Normal file
View File

@@ -0,0 +1,28 @@
package com.ruoyi.system.mapper_yada;
import com.ruoyi.system.domain_yada.SpecialVO;
import com.ruoyi.system.domain_yada.UploadSpecialVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @Author: JinSheng Song
* @Date: 2022/7/20 11:54
*/
public interface SpecialReportMapper {
List<SpecialVO> selectSpecial(@Param("zone") String zone);
List<UploadSpecialVO> selectUploadSpecial(@Param("fileName") String fileName);
List<UploadSpecialVO> selectUploadSpecial1(@Param("fileName") String fileName);
Integer updateUploadSpecial(@Param("id") Integer id);
Integer IntoUploadSpecial(UploadSpecialVO specialVO);
Integer DelSpecial(@Param("id") Integer id);
Integer IntoSpecial(SpecialVO specialVO);
}

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

@@ -18,4 +18,6 @@ public interface ICityExpandService {
List<OrientationVO> selectOrientation(String city, String superior,String country);
List<CityInformation> selectInfrom(String city, String country,String year);
List<CityInformation> selectMain(String year);
}

20
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/ISpecialReportService.java
View File

@@ -1,9 +1,29 @@
package com.ruoyi.system.service_yada;
import com.ruoyi.system.domain_yada.SpecialVO;
import com.ruoyi.system.domain_yada.UploadSpecialVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 专题报告
* @Author: JinSheng Song
* @Date: 2022/5/11 11:39
*/
public interface ISpecialReportService {
List<SpecialVO> selectSpecial(String zone);
List<UploadSpecialVO> selectUploadSpecial(String fileName);
List<UploadSpecialVO> selectUploadSpecial1(String fileName);
Integer updateUploadSpecial( Integer id);
Integer IntoUploadSpecial(UploadSpecialVO specialVO);
Integer DelSpecial( Integer id);
Integer IntoSpecial(SpecialVO specialVO);
}

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

@@ -38,4 +38,9 @@ public class CityExpandServiceimpl implements ICityExpandService {
public List<CityInformation> selectInfrom(String city, String country,String year) {
return mapper.selectInfrom(city,country,year);
}
@Override
public List<CityInformation> selectMain(String year) {
return mapper.selectMain(year);
}
}

45
ruoyi-system/src/main/java/com/ruoyi/system/service_yada/impl/SpecialReportServiceimpl.java
View File

@@ -1,12 +1,57 @@
package com.ruoyi.system.service_yada.impl;
import com.ruoyi.system.domain_yada.SpecialVO;
import com.ruoyi.system.domain_yada.UploadSpecialVO;
import com.ruoyi.system.mapper_yada.SpecialReportMapper;
import com.ruoyi.system.service_yada.ISpecialReportService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
/**
* 专题报告
* @Author: JinSheng Song
* @Date: 2022/5/11 11:48
*/
@Service
public class SpecialReportServiceimpl implements ISpecialReportService {
@Resource
private SpecialReportMapper mapper;
@Override
public List<SpecialVO> selectSpecial(String zone) {
return mapper.selectSpecial(zone);
}
@Override
public List<UploadSpecialVO> selectUploadSpecial(String fileName) {
return mapper.selectUploadSpecial(fileName);
}
@Override
public List<UploadSpecialVO> selectUploadSpecial1(String fileName) {
return mapper.selectUploadSpecial1(fileName);
}
@Override
public Integer updateUploadSpecial(Integer id) {
return mapper.updateUploadSpecial(id);
}
@Override
public Integer IntoUploadSpecial(UploadSpecialVO specialVO) {
return mapper.IntoUploadSpecial(specialVO);
}
@Override
public Integer DelSpecial(Integer id) {
return mapper.DelSpecial(id);
}
@Override
public Integer IntoSpecial(SpecialVO specialVO) {
return mapper.IntoSpecial(specialVO);
}
}

8
ruoyi-system/src/main/resources/mapper/system/CityExpandMapper.xml
View File

@@ -103,5 +103,13 @@
</if>
</select>
<select id="selectMain" resultMap="RM_Inform">
SELECT <include refid="columns_Infrom"/> FROM urban_impervious_surface
where country='澜湄流域'
<if test="year!= null and year !=''">
AND year = #{year}
</if>
</select>
</mapper>

127
ruoyi-system/src/main/resources/mapper/system/SpecialReportMapper.xml Normal file
View File

@@ -0,0 +1,127 @@
<?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_yada.SpecialReportMapper">
<resultMap id="RM_Special" type="com.ruoyi.system.domain_yada.SpecialVO">
<result property="id" column="id"/>
<result property="fileName" column="file_name"/>
<result property="dateTime" column="date_time"/>
<result property="spaceDistinguish" column="space_distinguish"/>
<result property="timeDistinguish" column="time_distinguish"/>
<result property="zone" column="zone"/>
<result property="filePath" column="file_path"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<resultMap id="RM_Upload" type="com.ruoyi.system.domain_yada.UploadSpecialVO">
<result property="id" column="id"/>
<result property="fileName" column="file_name"/>
<result property="uploadNum" column="upload_num"/>
<result property="filePath" column="file_path"/>
<result property="remarks1" column="remarks1"/>
<result property="sign" column="sign"/>
<result property="remarks2" column="remarks2"/>
<result property="type" column="type"/>
<result property="createBy" column="created_by"/>
<result property="createTime" column="created_time"/>
</resultMap>
<sql id="columns">
<![CDATA[
id,file_name,file_path,date_time,space_distinguish,time_distinguish,zone,created_by,created_time
]]>
</sql>
<sql id="Upload">
<![CDATA[
id,file_name,upload_num,file_path,remarks1,remarks2,type,created_by,created_time,sign
]]>
</sql>
<select id="selectSpecial" resultMap="RM_Special">
SELECT <include refid="columns"/> FROM special_table
WHERE 1=1
<if test="zone!= null and zone !=''">
AND zone = #{zone}
</if>
</select>
<select id="selectUploadSpecial" resultMap="RM_Upload">
SELECT <include refid="Upload"/> FROM upload_special
WHERE type='1'
<if test="fileName!= null and fileName !=''">
AND file_name = #{fileName}
</if>
</select>
<select id="selectUploadSpecial1" resultMap="RM_Upload">
SELECT <include refid="Upload"/> FROM upload_special
WHERE type='2'
<if test="fileName!= null and fileName !=''">
AND file_name = #{fileName}
</if>
</select>
<delete id="DelSpecial">
DELETE FROM special_table
WHERE ID=#{id}
</delete>
<insert id="IntoSpecial">
<![CDATA[
INSERT INTO special_table (
file_name ,
date_time ,
space_distinguish ,
time_distinguish ,
zone ,
created_by,
created_time
) VALUES (
#{fileName,jdbcType=VARCHAR},
#{dateTime,jdbcType=VARCHAR},
#{spaceDistinguish,jdbcType=VARCHAR},
#{timeDistinguish,jdbcType=DOUBLE},
#{zone,jdbcType=DOUBLE},
#{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}
)
]]>
</insert>
<update id="updateUploadSpecial">
update upload_special set upload_num=upload_num+1
where id=#{id}
</update>
<insert id="IntoUploadSpecial">
<![CDATA[
INSERT INTO upload_special (
file_name ,
upload_num ,
file_path ,
remarks1 ,
remarks2 ,
type,
created_by,
created_time
) VALUES (
#{fileName,jdbcType=VARCHAR},
#{uploadNum,jdbcType=INTEGER},
#{filePath,jdbcType=VARCHAR},
#{remarks1,jdbcType=VARCHAR},
#{remarks2,jdbcType=VARCHAR},
#{type,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}
)
]]>
</insert>
</mapper>

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

@@ -15,6 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="pictureTime" column="picture_time"/>
<result property="picturePath" column="picture_path"/>
<result property="remarks" column="remarks"/>
<result property="year" column="year"/>
<result property="createdBy" column="created_by"/>
<result property="createdTime" column="created_time"/>
</resultMap>
@@ -30,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="columns">
<![CDATA[
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
id,picture_zh,year,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>
<sql id="cloumns_Map">