Merge branch 'dev' of https://gitea.star-rising.cn/Song/xkrs_ms into dev
# Conflicts:1 # ruoyi-system/src/main/java/com/ruoyi/system/domain_yada/VegetationCoverageVO.java
This commit is contained in:
songjinsheng
@ -15,67 +15,61 @@ public class SysBaseEntity implements Serializable
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 创建者 */
|
||||
private String createBy;
|
||||
private String createdBy;
|
||||
|
||||
/** 创建时间 */
|
||||
private LocalDateTime createTime;
|
||||
private LocalDateTime createdTime;
|
||||
|
||||
/** 更新者 */
|
||||
private String updateBy;
|
||||
private String updatedBy;
|
||||
|
||||
/** 更新时间 */
|
||||
private LocalDateTime updateTime;
|
||||
private LocalDateTime updatedTime;
|
||||
|
||||
/** 备注 */
|
||||
private String remark;
|
||||
private String remarks;
|
||||
|
||||
/** 请求参数 */
|
||||
private Map<String, Object> params;
|
||||
|
||||
public String getCreateBy()
|
||||
{
|
||||
return createBy;
|
||||
public String getCreatedBy() {
|
||||
return createdBy;
|
||||
}
|
||||
|
||||
public void setCreateBy(String createBy)
|
||||
{
|
||||
this.createBy = createBy;
|
||||
public void setCreatedBy(String createdBy) {
|
||||
this.createdBy = createdBy;
|
||||
}
|
||||
|
||||
public LocalDateTime getCreateTime() {
|
||||
return createTime;
|
||||
public LocalDateTime getCreatedTime() {
|
||||
return createdTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(LocalDateTime createTime) {
|
||||
this.createTime = createTime;
|
||||
public void setCreatedTime(LocalDateTime createdTime) {
|
||||
this.createdTime = createdTime;
|
||||
}
|
||||
|
||||
public String getUpdateBy()
|
||||
{
|
||||
return updateBy;
|
||||
public String getUpdatedBy() {
|
||||
return updatedBy;
|
||||
}
|
||||
|
||||
public void setUpdateBy(String updateBy)
|
||||
{
|
||||
this.updateBy = updateBy;
|
||||
public void setUpdatedBy(String updatedBy) {
|
||||
this.updatedBy = updatedBy;
|
||||
}
|
||||
|
||||
public LocalDateTime getUpdateTime() {
|
||||
return updateTime;
|
||||
public LocalDateTime getUpdatedTime() {
|
||||
return updatedTime;
|
||||
}
|
||||
|
||||
public void setUpdateTime(LocalDateTime updateTime) {
|
||||
this.updateTime = updateTime;
|
||||
public void setUpdatedTime(LocalDateTime updatedTime) {
|
||||
this.updatedTime = updatedTime;
|
||||
}
|
||||
|
||||
public String getRemark()
|
||||
{
|
||||
return remark;
|
||||
public String getRemarks() {
|
||||
return remarks;
|
||||
}
|
||||
|
||||
public void setRemark(String remark)
|
||||
{
|
||||
this.remark = remark;
|
||||
public void setRemarks(String remarks) {
|
||||
this.remarks = remarks;
|
||||
}
|
||||
|
||||
public Map<String, Object> getParams()
|
||||
|
||||
@ -0,0 +1,133 @@
|
||||
package com.ruoyi.system.domain_yada;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
/**
|
||||
* 专题图实体类
|
||||
* @Author: taco chen
|
||||
* @Date: 2022/5/20 14:09
|
||||
*/
|
||||
public class ThematicMapDomain extends SysBaseEntity {
|
||||
|
||||
private Long id;
|
||||
|
||||
private String pictureZh;
|
||||
|
||||
private String pictureEn;
|
||||
|
||||
private String pictureName;
|
||||
|
||||
private String pictureType;
|
||||
|
||||
private LocalDateTime pictureTime;
|
||||
|
||||
private String picturePath;
|
||||
|
||||
private String remarks;
|
||||
|
||||
private String createdBy;
|
||||
|
||||
private LocalDateTime createdTime;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getPictureZh() {
|
||||
return pictureZh;
|
||||
}
|
||||
|
||||
public void setPictureZh(String pictureZh) {
|
||||
this.pictureZh = pictureZh;
|
||||
}
|
||||
|
||||
public String getPictureEn() {
|
||||
return pictureEn;
|
||||
}
|
||||
|
||||
public void setPictureEn(String pictureEn) {
|
||||
this.pictureEn = pictureEn;
|
||||
}
|
||||
|
||||
public String getPictureName() {
|
||||
return pictureName;
|
||||
}
|
||||
|
||||
public void setPictureName(String pictureName) {
|
||||
this.pictureName = pictureName;
|
||||
}
|
||||
|
||||
public String getPictureType() {
|
||||
return pictureType;
|
||||
}
|
||||
|
||||
public void setPictureType(String pictureType) {
|
||||
this.pictureType = pictureType;
|
||||
}
|
||||
|
||||
public LocalDateTime getPictureTime() {
|
||||
return pictureTime;
|
||||
}
|
||||
|
||||
public void setPictureTime(LocalDateTime pictureTime) {
|
||||
this.pictureTime = pictureTime;
|
||||
}
|
||||
|
||||
public String getPicturePath() {
|
||||
return picturePath;
|
||||
}
|
||||
|
||||
public void setPicturePath(String picturePath) {
|
||||
this.picturePath = picturePath;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getRemarks() {
|
||||
return remarks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setRemarks(String remarks) {
|
||||
this.remarks = remarks;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCreatedBy() {
|
||||
return createdBy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCreatedBy(String createdBy) {
|
||||
this.createdBy = createdBy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public LocalDateTime getCreatedTime() {
|
||||
return createdTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCreatedTime(LocalDateTime createdTime) {
|
||||
this.createdTime = createdTime;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "ThematicMapDomain{" +
|
||||
"id=" + id +
|
||||
", pictureZh='" + pictureZh + '\'' +
|
||||
", pictureEn='" + pictureEn + '\'' +
|
||||
", pictureName='" + pictureName + '\'' +
|
||||
", pictureType='" + pictureType + '\'' +
|
||||
", pictureTime=" + pictureTime +
|
||||
", picturePath='" + picturePath + '\'' +
|
||||
", remarks='" + remarks + '\'' +
|
||||
", createdBy='" + createdBy + '\'' +
|
||||
", createdTime=" + createdTime +
|
||||
'}';
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,34 @@
|
||||
package com.ruoyi.system.mapper_yada;
|
||||
|
||||
import com.ruoyi.system.domain_yada.ThematicMapDomain;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author taco chen
|
||||
*/
|
||||
public interface ThematicMapMapper {
|
||||
|
||||
/**
|
||||
* 获取所有专题图
|
||||
* @return
|
||||
*/
|
||||
List<ThematicMapDomain> selectAllThematicMap();
|
||||
|
||||
/**
|
||||
* 删除专题图根据编号
|
||||
* @param id 编号
|
||||
* @return
|
||||
*/
|
||||
Integer deleteThematicMap(Long id);
|
||||
|
||||
/**
|
||||
* 保存专题图
|
||||
* @param thematicMapDomain
|
||||
* @return
|
||||
*/
|
||||
Integer saveThematicMap(ThematicMapDomain thematicMapDomain);
|
||||
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
package com.ruoyi.system.service_yada;
|
||||
|
||||
import com.ruoyi.system.domain_yada.ThematicMapDomain;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 专题图服务
|
||||
* @Author: taco chen
|
||||
* @Date: 2022/5/11 11:40
|
||||
*/
|
||||
public interface ThematicMapService {
|
||||
|
||||
|
||||
/**
|
||||
* 获取全部专题图
|
||||
* @return
|
||||
*/
|
||||
List<ThematicMapDomain> selectAll();
|
||||
|
||||
/**
|
||||
* 删除专题图根据编号
|
||||
* @param id 编号
|
||||
* @return
|
||||
*/
|
||||
Integer deleteById(Long id);
|
||||
|
||||
/**
|
||||
* 保存专题图
|
||||
* @param thematicMapDomain
|
||||
* @return
|
||||
*/
|
||||
Integer save(ThematicMapDomain thematicMapDomain);
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,49 @@
|
||||
package com.ruoyi.system.service_yada.impl;
|
||||
|
||||
import com.ruoyi.system.domain_yada.ThematicMapDomain;
|
||||
import com.ruoyi.system.mapper_yada.ThematicMapMapper;
|
||||
import com.ruoyi.system.service_yada.ThematicMapService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* * 专题图服务
|
||||
* @author : taco chen
|
||||
*/
|
||||
@Service
|
||||
public class ThematicMapServiceImpl implements ThematicMapService {
|
||||
|
||||
@Resource
|
||||
private ThematicMapMapper thematicMapMapper;
|
||||
|
||||
/**
|
||||
* 获取全部专题图
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public List<ThematicMapDomain> selectAll(){
|
||||
return thematicMapMapper.selectAllThematicMap();
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除专题图根据编号
|
||||
* @param id 编号
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Integer deleteById(Long id){
|
||||
return thematicMapMapper.deleteThematicMap(id);
|
||||
}
|
||||
|
||||
/**
|
||||
* 保存专题图
|
||||
* @param thematicMapDomain
|
||||
* @return
|
||||
*/
|
||||
@Override
|
||||
public Integer save(ThematicMapDomain thematicMapDomain){
|
||||
return thematicMapMapper.saveThematicMap(thematicMapDomain);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
<?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.ThematicMapMapper">
|
||||
<resultMap id="RM_ThematicMap" type="com.ruoyi.system.domain_yada.ThematicMapDomain">
|
||||
<result property="id" column="id"/>
|
||||
<result property="pictureZh" column="picture_zh"/>
|
||||
<result property="pictureEn" column="picture_en"/>
|
||||
<result property="pictureName" column="picture_name"/>
|
||||
<result property="pictureType" column="picture_type"/>
|
||||
<result property="pictureTime" column="picture_time"/>
|
||||
<result property="picturePath" column="picture_path"/>
|
||||
<result property="pictureTime" column="picture_time"/>
|
||||
<result property="remarks" column="remarks"/>
|
||||
<result property="createdBy" column="created_by"/>
|
||||
<result property="createdTime" column="created_time"/>
|
||||
</resultMap>
|
||||
|
||||
<sql id="columns">
|
||||
<![CDATA[
|
||||
id,picture_zh,picture_en,picture_name,picture_type,picture_time,picture_path,picture_time,remarks,created_by,created_time
|
||||
]]>
|
||||
</sql>
|
||||
|
||||
<select id="selectAllThematicMap" resultMap="RM_ThematicMap">
|
||||
SELECT <include refid="columns"/> FROM thematic_map;
|
||||
</select>
|
||||
|
||||
<delete id="deleteThematicMap">
|
||||
DELETE FROM thematic_map
|
||||
WHERE ID=#{id}
|
||||
</delete>
|
||||
|
||||
<insert id="saveThematicMap">
|
||||
<![CDATA[
|
||||
INSERT INTO thematic_map (
|
||||
id ,
|
||||
picture_zh ,
|
||||
picture_en ,
|
||||
picture_name ,
|
||||
picture_type ,
|
||||
picture_time ,
|
||||
picture_path,
|
||||
remarks,
|
||||
created_by ,
|
||||
created_time
|
||||
) VALUES (
|
||||
#{id,jdbcType=BIGINT},
|
||||
#{pictureZh,jdbcType=VARCHAR}},
|
||||
#{pictureEn,jdbcType=VARCHAR}},
|
||||
#{pictureName,jdbcType=VARCHAR}},
|
||||
#{pictureType,jdbcType=VARCHAR}},
|
||||
#{pictureTime,jdbcType=TIMESTAMP},
|
||||
#{picturePath,jdbcType=VARCHAR},
|
||||
#{remarks,jdbcType=VARCHAR},
|
||||
#{createdBy,jdbcType=VARCHAR},
|
||||
#{createdTime,jdbcType=TIMESTAMP}
|
||||
)
|
||||
]]>
|
||||
</insert>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user