Commit 7cd4ce38 authored by unset's avatar unset

新增影像信息,收货地址,影像图框模块接口

parent ccea5ec7
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : ImageInformationDto
* @Description : 图像信息
* @Author : jiaoruizhen
* @Date: 2020-11-28 15:49
*/
@Data
public class ImageInformationDto extends PageParam {
}
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : ImageInfomationStorgeDto
* @Description : 图像库信息
* @Author : jiaoruizhen
* @Date: 2020-11-28 15:53
*/
@Data
public class ImageInformationStorageDto extends PageParam {
}
package com.upyuns.platform.rs.website.dto;
import com.github.wxiaoqi.security.common.vo.PageParam;
import lombok.Data;
/**
* @ClassName : UserAddressDto
* @Description : 用户收货地址
* @Author : jiaoruizhen
* @Date: 2020-11-28 14:49
*/
@Data
public class UserAddressDto extends PageParam {
private String phone;
private String name;
private Long userId;
}
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 影像图库
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Data
@Table(name = "image_img_storage")
public class ImageImgStorage implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Integer id;
/**
* 类型 1--影像美图 2--专题图 3--遥感成果图
*/
@Column(name = "type")
@ApiModelProperty(value = "类型 1--影像美图 2--专题图 3--遥感成果图")
private Integer type;
/**
* 名称
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
/**
* 介绍
*/
@Column(name = "intro")
@ApiModelProperty(value = "介绍")
private String intro;
/**
* 封面图
*/
@Column(name = "cover_img")
@ApiModelProperty(value = "封面图")
private String coverImg;
/**
* 详情图
*/
@Column(name = "detail_img")
@ApiModelProperty(value = "详情图")
private String detailImg;
/**
* 产品参数json
*/
@Column(name = "param_json")
@ApiModelProperty(value = "产品参数json")
private String paramJson;
/**
* 内容-富文本
*/
@Column(name = "content")
@ApiModelProperty(value = "内容-富文本")
private String content;
/**
* 是否允许定制:0、否, 1、是
*/
@Column(name = "allow_custom")
@ApiModelProperty(value = "是否允许定制:0、否, 1、是")
private Integer allowCustom;
/**
* 是否删除:0、否, 1、是
*/
@Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0、否, 1、是")
private Integer isDel;
/**
* 排序
*/
@Column(name = "rank")
@ApiModelProperty(value = "排序")
private Integer rank;
/**
* 是否启用:1、启用,2、禁用
*/
@Column(name = "status")
@ApiModelProperty(value = "是否启用:1、启用,2、禁用")
private Integer status;
/**
* 关联ids
*/
@Column(name = "related_ids")
@ApiModelProperty(value = "关联ids")
private String relatedIds;
}
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* 影像信息介绍信息表
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Data
@Table(name = "image_information")
public class ImageInformation implements Serializable {
private static final long serialVersionUID = 1L;
/**
*
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("")
private Integer id;
/**
* 名称
*/
@Column(name = "name")
@ApiModelProperty(value = "名称")
private String name;
/**
* 分辨率
*/
@Column(name = "resolution")
@ApiModelProperty(value = "分辨率")
private String resolution;
/**
* 封面图
*/
@Column(name = "cover_img")
@ApiModelProperty(value = "封面图")
private String coverImg;
/**
* icon图
*/
@Column(name = "icon_img")
@ApiModelProperty(value = "icon图")
private String iconImg;
/**
* 介绍
*/
@Column(name = "intro")
@ApiModelProperty(value = "介绍")
private String intro;
/**
* 内容-富文本
*/
@Column(name = "content")
@ApiModelProperty(value = "内容-富文本")
private String content;
/**
* 是否删除:0、否, 1、是
*/
@Column(name = "is_del")
@ApiModelProperty(value = "是否删除:0、否, 1、是")
private Integer isDel;
/**
* 排序
*/
@Column(name = "rank")
@ApiModelProperty(value = "排序")
private Integer rank;
/**
* 是否启用:1、启用,2、禁用
*/
@Column(name = "status")
@ApiModelProperty(value = "是否启用:1、启用,2、禁用")
private Integer status;
}
package com.upyuns.platform.rs.website.entity;
import java.io.Serializable;
import java.util.Date;
import javax.persistence.*;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Data
@Table(name = "user_address")
public class UserAddress implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 订单收获地址id
*/
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@ApiModelProperty("订单收获地址id")
private Long id;
/**
* 收获人姓名
*/
@Column(name = "consignee_name")
@ApiModelProperty(value = "收获人姓名")
private String consigneeName;
/**
* 收件人电话
*/
@Column(name = "consignee_phone")
@ApiModelProperty(value = "收件人电话")
private String consigneePhone;
/**
* 收货人详细地址,不包含省市区乡镇
*/
@Column(name = "consignee_address")
@ApiModelProperty(value = "收货人详细地址,不包含省市区乡镇")
private String consigneeAddress;
/**
* 省份
*/
@Column(name = "province")
@ApiModelProperty(value = "省份")
private String province;
/**
* 市
*/
@Column(name = "city")
@ApiModelProperty(value = "市")
private String city;
/**
* 区县
*/
@Column(name = "district")
@ApiModelProperty(value = "区县")
private String district;
/**
* 乡镇/街道
*/
@Column(name = "town")
@ApiModelProperty(value = "乡镇/街道")
private String town;
/**
* 行政编码
*/
@Column(name = "area_code")
@ApiModelProperty(value = "行政编码")
private String areaCode;
/**
*
*/
@Column(name = "crt_time")
@ApiModelProperty(value = "创建时间")
private Date crtTime;
/**
*
*/
@Column(name = "upd_time")
@ApiModelProperty(value = "更新时间")
private Date updTime;
@Column(name = "user_id")
@ApiModelProperty(value = "用户ID")
private Long userId;
/**
* 是否删除: 0、否,1、是
*/
private Integer isDel;
}
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.ImageInformationDto;
import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.ImageImgStorage;
import com.upyuns.platform.rs.website.mapper.ImageImgStorageMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
/**
* 影像图库
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Service
public class ImageImgStorageBiz extends BaseBiz<ImageImgStorageMapper,ImageImgStorage> {
/**
* 新增或者编辑图像库信息
* @param imageImgStorage
* @return
*/
public ObjectRestResponse addUpdate(ImageImgStorage imageImgStorage) {
if (imageImgStorage == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (imageImgStorage.getId() == null) {
insertSelectiveRe(imageImgStorage);
} else {
ImageImgStorage old = selectById(imageImgStorage.getId());
if (old == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
} else {
BeanUtil.copyProperties(imageImgStorage, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
}
return ObjectRestResponse.succ();
}
/**
* 分页查询图像库信息
* @param imageInformationStorageDto
* @return
*/
public ObjectRestResponse selectList(ImageInformationStorageDto imageInformationStorageDto) {
Example example = new Example(ImageImgStorage.class);
Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDel", 0);
Query query = new Query(imageInformationStorageDto);
PageDataVO<ImageImgStorage> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.ImageInformationDto;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import com.upyuns.platform.rs.website.mapper.ImageInformationMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
/**
* 影像信息介绍信息表
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Service
public class ImageInformationBiz extends BaseBiz<ImageInformationMapper,ImageInformation> {
/**
* 新增或者编辑图像信息
* @param imageInformation
* @return
*/
public ObjectRestResponse addUpdate(ImageInformation imageInformation) {
if (imageInformation == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (imageInformation.getId() == null) {
insertSelectiveRe(imageInformation);
} else {
ImageInformation old = selectById(imageInformation.getId());
if (old == null) {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
} else {
BeanUtil.copyProperties(imageInformation, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
}
}
return ObjectRestResponse.succ();
}
/**
* 分页查询图像信息
* @param imageInformationDto
* @return
*/
public ObjectRestResponse selectList(ImageInformationDto imageInformationDto) {
Example example = new Example(ImageInformation.class);
Example.Criteria criteria = example.createCriteria();
criteria.andEqualTo("isDel", 0);
Query query = new Query(imageInformationDto);
PageDataVO<ImageInformation> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.biz;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.bean.copier.CopyOptions;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.util.Query;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.upyuns.platform.rs.website.dto.UserAddressDto;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import com.upyuns.platform.rs.website.entity.UserAddress;
import com.upyuns.platform.rs.website.mapper.UserAddressMapper;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import tk.mybatis.mapper.entity.Example;
import java.util.List;
/**
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
@Service
public class UserAddressBiz extends BaseBiz<UserAddressMapper, UserAddress> {
/**
* 分页查询 用户地址信息
* @param userAddressDto
* @return
*/
public ObjectRestResponse<PageDataVO<UserAddress>> selectList(UserAddressDto userAddressDto) {
Example example = new Example(UserAddress.class);
Example.Criteria criteria = example.createCriteria();
if (StringUtils.isNotBlank(userAddressDto.getName())) {
criteria.andLike("consigneeName", "%" + userAddressDto.getName() + "%");
}
if (StringUtils.isNotBlank(userAddressDto.getPhone())) {
criteria.andLike("consigneePhone", "%" + userAddressDto.getPhone() + "%");
}
if (userAddressDto.getUserId() != null) {
criteria.andEqualTo("userId", userAddressDto.getUserId());
}
criteria.andEqualTo("isDel", 0);
example.orderBy("updTime").desc();
Query query = new Query(userAddressDto);
PageDataVO<UserAddress> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
return ObjectRestResponse.succ(pageDataVO);
}
/**
* 新增用户地址
* @param userAddress
* @return
*/
public ObjectRestResponse addUpdate(UserAddress userAddress) {
if (userAddress == null) {
return ObjectRestResponse.paramIsEmpty();
}
if (userAddress.getId() != null) {
UserAddress old = selectById(userAddress.getId());
if (old != null && old.getIsDel() != 1) {
BeanUtil.copyProperties(userAddress, old, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
updateSelectiveByIdRe(old);
} else {
return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE, ResultCode.getMsg(ResultCode.NOTEXIST_CODE));
}
} else {
insertSelectiveRe(userAddress);
}
return ObjectRestResponse.succ();
}
/**
* 查询用户所有收货地址
*
* @param userId
* @return
*/
public List<UserAddress> getUserAddress(Long userId) {
Example example = new Example(UserAddress.class);
example.createCriteria().andEqualTo("userId", userId).andEqualTo("isDel", 0);
return mapper.selectByExample(example);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.ImageImgStorageBiz;
import com.upyuns.platform.rs.website.dto.ImageInformationDto;
import com.upyuns.platform.rs.website.dto.ImageInformationStorageDto;
import com.upyuns.platform.rs.website.entity.ImageImgStorage;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("imageImgStorage")
public class ImageImgStorageController extends BaseController<ImageImgStorageBiz,ImageImgStorage> {
@GetMapping(value = "getList")
public ObjectRestResponse getList(ImageInformationStorageDto imageInformationStorageDto) {
return baseBiz.selectList(imageInformationStorageDto);
}
@PostMapping(value = "addUpdate")
public ObjectRestResponse addUpdate(@RequestBody ImageImgStorage imageImgStorage) {
return baseBiz.addUpdate(imageImgStorage);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.ImageInformationBiz;
import com.upyuns.platform.rs.website.dto.ImageInformationDto;
import com.upyuns.platform.rs.website.dto.UserAddressDto;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import com.upyuns.platform.rs.website.entity.UserAddress;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("imageInformation")
public class ImageInformationController extends BaseController<ImageInformationBiz,ImageInformation> {
@GetMapping(value = "getList")
public ObjectRestResponse getList(ImageInformationDto imageInformationDto) {
return baseBiz.selectList(imageInformationDto);
}
@PostMapping(value = "addUpdate")
public ObjectRestResponse addUpdate(@RequestBody ImageInformation imageInformation) {
return baseBiz.addUpdate(imageInformation);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.controller;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.upyuns.platform.rs.website.biz.UserAddressBiz;
import com.upyuns.platform.rs.website.dto.UserAddressDto;
import com.upyuns.platform.rs.website.entity.UserAddress;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("userAddress")
public class UserAddressController extends BaseController<UserAddressBiz,UserAddress> {
@GetMapping(value = "getList")
public ObjectRestResponse getList(UserAddressDto userAddressDto) {
return baseBiz.selectList(userAddressDto);
}
@PostMapping(value = "addUpdate")
public ObjectRestResponse addUpdate(@RequestBody UserAddress userAddress) {
return baseBiz.addUpdate(userAddress);
}
}
\ No newline at end of file
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.ImageImgStorage;
import tk.mybatis.mapper.common.Mapper;
/**
* 影像图库
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
public interface ImageImgStorageMapper extends Mapper<ImageImgStorage> {
}
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.ImageInformation;
import tk.mybatis.mapper.common.Mapper;
/**
* 影像信息介绍信息表
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
public interface ImageInformationMapper extends Mapper<ImageInformation> {
}
package com.upyuns.platform.rs.website.mapper;
import com.upyuns.platform.rs.website.entity.UserAddress;
import tk.mybatis.mapper.common.Mapper;
/**
*
*
* @author jiaoruizhen
* @email jiaoruizhen@126.com
* @date 2020-11-28 14:15:32
*/
public interface UserAddressMapper extends Mapper<UserAddress> {
}
<?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.upyuns.platform.rs.website.mapper.ImageImgStorageMapper">
</mapper>
\ No newline at end of file
<?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.upyuns.platform.rs.website.mapper.ImageInformationMapper">
</mapper>
\ No newline at end of file
<?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.upyuns.platform.rs.website.mapper.UserAddressMapper">
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment