Skip to content

R
rs-cloud-platform
Commit c235a64c authored by unset's avatar unset
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 7cd4ce38 e25da495
Hide whitespace changes
Inline Side-by-side
Showing with 1088 additions and 27 deletions
ace-common/pom.xml
View file @ c235a64c
......@@ -12,6 +12,16 @@
<artifactId>ace-common</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
<repositories>
<repository>
<id>mvn-repo</id>
<url>https://raw.github.com/wxiaoqi/ace-cache/master</url>
<snapshots>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
</snapshots>
</repository>
</repositories>
<build>
<plugins>
<plugin>
......@@ -141,7 +151,6 @@
<groupId>com.github.wxiaoqi</groupId>
<artifactId>ace-cache</artifactId>
<version>0.0.2</version>
<scope>compile</scope>
</dependency>
<!-- excel 组件 -->
......
ace-common/src/main/java/com/ace/cache/config/RedisConfig.java 0 → 100644
View file @ c235a64c
package com.ace.cache.config;
import com.ace.cache.utils.PropertiesLoaderUtils;
import javax.annotation.PostConstruct;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import redis.clients.jedis.JedisPool;
import redis.clients.jedis.JedisPoolConfig;
@Configuration
public class RedisConfig {
@Autowired
private Environment env;
private JedisPool pool;
private String maxActive;
private String maxIdle;
private String maxWait;
private String host;
private String password;
private String timeout;
private String database;
private String port;
private String enable;
private String sysName;
public RedisConfig() {
}
@PostConstruct
public void init() {
PropertiesLoaderUtils prop = new PropertiesLoaderUtils(new String[]{"application.properties"});
this.host = prop.getProperty("redis.host");
if (StringUtils.isBlank(this.host)) {
this.host = this.env.getProperty("redis.host");
this.maxActive = this.env.getProperty("redis.pool.maxActive");
this.maxIdle = this.env.getProperty("redis.pool.maxIdle");
this.maxWait = this.env.getProperty("redis.pool.maxWait");
this.password = this.env.getProperty("redis.password");
this.timeout = this.env.getProperty("redis.timeout");
this.database = this.env.getProperty("redis.database");
this.port = this.env.getProperty("redis.port");
this.sysName = this.env.getProperty("redis.sysName");
this.enable = this.env.getProperty("redis.enable");
} else {
this.maxActive = prop.getProperty("redis.pool.maxActive");
this.maxIdle = prop.getProperty("redis.pool.maxIdle");
this.maxWait = prop.getProperty("redis.pool.maxWait");
this.password = prop.getProperty("redis.password");
this.timeout = prop.getProperty("redis.timeout");
this.database = prop.getProperty("redis.database");
this.port = prop.getProperty("redis.port");
this.sysName = prop.getProperty("redis.sysName");
this.enable = prop.getProperty("redis.enable");
}
}
@Bean
public JedisPoolConfig constructJedisPoolConfig() {
JedisPoolConfig config = new JedisPoolConfig();
config.setMaxTotal(Integer.parseInt(this.maxActive));
config.setMaxIdle(Integer.parseInt(this.maxIdle));
config.setMaxWaitMillis((long)Integer.parseInt(this.maxWait));
config.setTestOnBorrow(true);
return config;
}
@Bean(
name = {"pool"}
)
public JedisPool constructJedisPool() {
String ip = this.host;
int port = Integer.parseInt(this.port);
String password = this.password;
int timeout = Integer.parseInt(this.timeout);
int database = Integer.parseInt(this.database);
if (null == this.pool) {
if (StringUtils.isBlank(password)) {
this.pool = new JedisPool(this.constructJedisPoolConfig(), ip, port, timeout,(String)null, database);
} else {
this.pool = new JedisPool(this.constructJedisPoolConfig(), ip, port, timeout, password, database);
}
}
return this.pool;
}
public String getMaxActive() {
return this.maxActive;
}
public void setMaxActive(String maxActive) {
this.maxActive = maxActive;
}
public String getMaxIdle() {
return this.maxIdle;
}
public void setMaxIdle(String maxIdle) {
this.maxIdle = maxIdle;
}
public String getMaxWait() {
return this.maxWait;
}
public void setMaxWait(String maxWait) {
this.maxWait = maxWait;
}
public String getHost() {
return this.host;
}
public void setHost(String host) {
this.host = host;
}
public String getPassword() {
return this.password;
}
public void setPassword(String password) {
this.password = password;
}
public String getTimeout() {
return this.timeout;
}
public void setTimeout(String timeout) {
this.timeout = timeout;
}
public String getDatabase() {
return this.database;
}
public void setDatabase(String database) {
this.database = database;
}
public String getSysName() {
return this.sysName;
}
public void setSysName(String sysName) {
this.sysName = sysName;
}
public String getEnable() {
return this.enable;
}
public void setEnable(String enable) {
this.enable = enable;
}
public String getPort() {
return this.port;
}
public void setPort(String port) {
this.port = port;
}
}
ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageDataVO.java
View file @ c235a64c
package com.github.wxiaoqi.security.common.vo;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.github.pagehelper.ISelect;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
......@@ -48,4 +50,12 @@ public class PageDataVO<T> {
public static <M> PageDataVO<M> pageInfo(Query query, ISelect select){
return PageDataVO.pageInfo(PageHelper.startPage(query.getPage(), query.getLimit()).doSelectPageInfo(select));
}
public static <M> PageDataVO<M> pageInfo(Query query, ISelect select, Class classz){
PageDataVO<M> pageDataVo = pageInfo(query, select);
if(CollUtil.isNotEmpty(pageDataVo.getData()) && pageDataVo.getData().get(0).getClass() != classz) {
pageDataVo.setData(Convert.toList(classz, pageDataVo.getData()));
}
return pageDataVo;
}
}
ace-common/src/main/java/com/github/wxiaoqi/security/common/vo/PageParam.java
View file @ c235a64c
package com.github.wxiaoqi.security.common.vo;
import com.github.wxiaoqi.security.common.util.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
......@@ -10,5 +11,7 @@ public class PageParam {
@ApiModelProperty("每页限制")
Integer limit;
public Query initQuery() {
return new Query(this);
}
}
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AuthorityMenuTree.java
View file @ c235a64c
package com.github.wxiaoqi.security.admin.vo;
import cn.hutool.core.collection.CollUtil;
import com.github.wxiaoqi.security.common.vo.TreeNode;
import org.springframework.beans.BeanUtils;
......@@ -17,6 +18,15 @@ public class AuthorityMenuTree extends TreeNode implements Serializable{
String text;
List<AuthorityMenuTree> nodes = new ArrayList<AuthorityMenuTree>();
String icon;
List<Integer> elementIds = CollUtil.newArrayList();
public List<Integer> getElementIds() {
return elementIds;
}
public void setElementIds(List<Integer> elementIds) {
this.elementIds = elementIds;
}
public String getIcon() {
return icon;
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/BaseUserVO.java 0 → 100644
View file @ c235a64c
package com.github.wxiaoqi.security.admin.vo;
import com.github.wxiaoqi.security.admin.entity.Group;
import com.github.wxiaoqi.security.admin.entity.User;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.stream.Collectors;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BaseUserVO extends User {
private List<Group> groupList;
private String groupStr;
public String getGroupStr(){
if (groupList != null && groupList.size() > 0){
groupStr= groupList.stream().map(Group::getName).collect(Collectors.joining(","));
}
return groupStr;
}
}
\ No newline at end of file
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/MenuTree.java
View file @ c235a64c
package com.github.wxiaoqi.security.admin.vo;
import cn.hutool.core.collection.CollUtil;
import com.github.wxiaoqi.security.admin.entity.Element;
import com.github.wxiaoqi.security.common.vo.TreeNode;
import java.util.List;
/**
* Created by Ace on 2017/6/12.
*/
......@@ -16,6 +20,15 @@ public class MenuTree extends TreeNode {
String redirect;
String code;
String type;
List<Element> elements = CollUtil.newArrayList();
public List<Element> getElements() {
return elements;
}
public void setElements(List<Element> elements) {
this.elements = elements;
}
public String getCode() {
return code;
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/GroupBiz.java
View file @ c235a64c
......@@ -164,6 +164,24 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
findParentID(map, relationMenus, parentId);
}
/**
* 分配资源权限(批量)
*
* @param groupId
* @param elements
*/
@CacheClear(keys = {"permission:ele","permission:u","app:permission:ele","app:permission:u"})
public void modifyAuthorityElements(int groupId, String[] elements) {
resourceAuthorityMapper.deleteByAuthorityIdAndResourceType(groupId + "", AdminCommonConstant.RESOURCE_TYPE_BTN);
if (elements.length>0){
Set<String> relationElements = new HashSet<String>();
relationElements.addAll(Arrays.asList(elements));
for (String elementId : relationElements) {
modifyAuthorityElement(groupId, 0, Integer.valueOf(elementId));
}
}
}
/**
* 分配资源权限
*
......@@ -207,10 +225,12 @@ public class GroupBiz extends BaseBiz<GroupMapper, Group> {
List<Menu> menus = menuMapper.selectMenuByAuthorityId(String.valueOf(groupId), AdminCommonConstant.AUTHORITY_TYPE_GROUP);
List<AuthorityMenuTree> trees = new ArrayList<AuthorityMenuTree>();
AuthorityMenuTree node = null;
List<Integer> elementIds = getAuthorityElement(groupId);
for (Menu menu : menus) {
node = new AuthorityMenuTree();
node.setText(menu.getTitle());
BeanUtils.copyProperties(menu, node);
node.setElementIds(elementIds);
trees.add(node);
}
return trees;
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/GroupController.java
View file @ c235a64c
......@@ -4,13 +4,18 @@ import com.github.wxiaoqi.security.admin.biz.GroupBiz;
import com.github.wxiaoqi.security.admin.biz.ResourceAuthorityBiz;
import com.github.wxiaoqi.security.admin.constant.AdminCommonConstant;
import com.github.wxiaoqi.security.admin.entity.Group;
import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
import com.github.wxiaoqi.security.admin.vo.GroupTree;
import com.github.wxiaoqi.security.admin.vo.GroupUsers;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.util.TreeUtil;
import com.github.wxiaoqi.security.common.vo.PageDataVO;
import com.github.wxiaoqi.security.common.vo.PageParam;
import io.swagger.annotations.Api;
import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -30,16 +35,24 @@ import java.util.List;
@Controller
@RequestMapping("group")
@Api("群组模块")
public class GroupController extends BaseController<GroupBiz, Group> {
public class GroupController extends BaseController<GroupBiz, Group> implements UserRestInterface {
@Autowired
private ResourceAuthorityBiz resourceAuthorityBiz;
@Autowired
UserFeign userFeign;
@Override
public UserFeign getUserFeign() {
return userFeign;
}
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
public List<Group> list(String name,String groupType) {
if(StringUtils.isBlank(name)&&StringUtils.isBlank(groupType)) {
return new ArrayList<Group>();
}
// if(StringUtils.isBlank(name)&&StringUtils.isBlank(groupType)) {
// return new ArrayList<Group>();
// }
Example example = new Example(Group.class);
if (StringUtils.isNotBlank(name)) {
example.createCriteria().andLike("name", "%" + name + "%");
......@@ -50,13 +63,19 @@ public class GroupController extends BaseController<GroupBiz, Group> {
return baseBiz.selectByExample(example);
}
@RequestMapping(value = "/listPage", method = RequestMethod.GET)
@ResponseBody
public ObjectRestResponse<PageDataVO<Group>> listPage(ListPageDTO dto) {
return ObjectRestResponse.succ(PageDataVO.pageInfo(dto.initQuery(), () -> list(dto.getName(), dto.getGroupType())));
}
@GetMapping(value = "/list_all")
@ResponseBody
public List<Group> listAll() {
return baseBiz.selectListAll();
}
@RequestMapping(value = "/{id}/user", method = RequestMethod.PUT)
@ResponseBody
public ObjectRestResponse modifiyUsers(@PathVariable int id,String members,String leaders){
......@@ -70,6 +89,25 @@ public class GroupController extends BaseController<GroupBiz, Group> {
return new ObjectRestResponse<GroupUsers>().rel(true).data(baseBiz.getGroupUsers(id));
}
@RequestMapping(value = "V2/{id}/authority/menu", method = RequestMethod.PUT)
@ResponseBody
public ObjectRestResponse modifyMenuAuthorityV2(@PathVariable int id, String menuTrees, String elementTrees){
String [] menus =new String[]{};
String [] elements =new String[]{};
if (StringUtils.isNotBlank(menuTrees)){
menus= menuTrees.split(",");
}
if (StringUtils.isNotBlank(elementTrees)){
elements= elementTrees.split(",");
}
baseBiz.modifyAuthorityMenu(id, menus);
baseBiz.modifyAuthorityElements(id, elements);
return new ObjectRestResponse().rel(true);
}
@RequestMapping(value = "/{id}/authority/menu", method = RequestMethod.PUT)
@ResponseBody
public ObjectRestResponse modifyMenuAuthority(@PathVariable int id, String menuTrees){
......@@ -158,4 +196,10 @@ public class GroupController extends BaseController<GroupBiz, Group> {
}
return TreeUtil.bulid(trees,root) ;
}
@Data
static public class ListPageDTO extends PageParam {
String name;
String groupType;
}
}
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MenuController.java
View file @ c235a64c
package com.github.wxiaoqi.security.admin.rest;
import com.github.wxiaoqi.security.admin.biz.ElementBiz;
import com.github.wxiaoqi.security.admin.biz.MenuBiz;
import com.github.wxiaoqi.security.admin.biz.UserBiz;
import com.github.wxiaoqi.security.admin.entity.Element;
import com.github.wxiaoqi.security.admin.entity.Menu;
import com.github.wxiaoqi.security.admin.vo.AuthorityMenuTree;
import com.github.wxiaoqi.security.admin.vo.MenuTree;
......@@ -32,6 +34,9 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
@Autowired
private UserBiz userBiz;
@Autowired
private ElementBiz elementBiz;
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
public List<Menu> list(String title) {
......@@ -122,6 +127,9 @@ public class MenuController extends BaseController<MenuBiz, Menu> {
node = new MenuTree();
BeanUtils.copyProperties(menu, node);
node.setLabel(menu.getTitle());
node.setElements(elementBiz.selectList(new Element(){{
setMenuId(menu.getId().toString());
}}));
trees.add(node);
}
return TreeUtil.bulid(trees,root) ;
......
ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserController.java
View file @ c235a64c
......@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.admin.entity.Menu;
import com.github.wxiaoqi.security.admin.entity.User;
import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.rpc.service.PermissionService;
import com.github.wxiaoqi.security.admin.vo.BaseUserVO;
import com.github.wxiaoqi.security.admin.vo.FrontUser;
import com.github.wxiaoqi.security.admin.vo.GroupUsers;
import com.github.wxiaoqi.security.admin.vo.MenuTree;
......@@ -18,6 +19,7 @@ import com.github.wxiaoqi.security.common.msg.TableResultResponse;
import com.github.wxiaoqi.security.common.rest.CommonBaseController;
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 lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
......@@ -147,14 +149,22 @@ public class UserController extends CommonBaseController {
@RequestMapping(value = "/page",method = RequestMethod.GET)
@ResponseBody
public TableResultResponse<User> list(@RequestParam Map<String, Object> params){
public ObjectRestResponse<PageDataVO<BaseUserVO>> list(@RequestParam Map<String, Object> params){
//查询列表数据
Query query = new Query(params);
try {
return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
PageDataVO<BaseUserVO> dataVO= PageDataVO.pageInfo(query, ()-> userBiz.selectListAll(), BaseUserVO.class);
List<BaseUserVO> list=dataVO.getData();
if (list != null && list.size() > 0){
for (BaseUserVO baseUserVo:list){
baseUserVo.setGroupList(groupBiz.getUserGroups(baseUserVo.getId()));
}
}
return ObjectRestResponse.succ(dataVO);
//return userBiz.selectPage(query, userBiz.getUserByUsername(userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request)).getUniqueName()));
}catch (Exception e) {
log.error(e.getMessage());
return new TableResultResponse<User>();
return ObjectRestResponse.createDefaultFail();
}
}
......
rs-datacenter/rs-datacenter-api/pom.xml
View file @ c235a64c
......@@ -10,6 +10,13 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-datacenter-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>9.4.1212</version>
</dependency>
</dependencies>
</project>
\ No newline at end of file
rs-datacenter/rs-datacenter-api/src/main/java/com/upyuns/platform/rs/datacenter/entity/RscpImageDataTotal.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.datacenter.entity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.persistence.Table;
import java.math.BigDecimal;
import java.sql.Timestamp;
@Data
@Table(name = "rscp_image_data_total")
@ApiModel(description = "")
public class RscpImageDataTotal implements java.io.Serializable {
/** 版本号 */
private static final long serialVersionUID = -5913683428401029013L;
/* This code was generated by TableGo tools, mark 1 begin. */
/** 标识id */
@ApiModelProperty(value = "标识id")
private String id;
/** 编号 */
@ApiModelProperty(value = "编号")
private String dataNo;
/** 数据类型id */
@ApiModelProperty(value = "数据类型id")
private String categoryId;
/** 名称 */
@ApiModelProperty(value = "名称")
private String name;
/** 数据范围数据 */
@ApiModelProperty(value = "数据范围数据")
private String range;
/** 缩略图存储路径 */
@ApiModelProperty(value = "缩略图存储路径")
private String thumbnailPath;
/** 显示名称 */
@ApiModelProperty(value = "显示名称")
private String displayName;
/** 分辨率[数组] */
@ApiModelProperty(value = "分辨率[数组]")
private String imageResolution;
/** 光谱 */
@ApiModelProperty(value = "光谱")
private String imageSpectrumType;
/** 光谱名称 */
@ApiModelProperty(value = "光谱名称")
private String imageSpectrumTypeDisplay;
/** 行列号 */
@ApiModelProperty(value = "行列号")
private String imageRowCol;
/** 行号 */
@ApiModelProperty(value = "行号")
private String imageRow;
/** 列号列号 */
@ApiModelProperty(value = "列号列号")
private String imageCol;
/** 产品类型 */
@ApiModelProperty(value = "产品类型")
private String imageProductType;
/** 产品类型名称 */
@ApiModelProperty(value = "产品类型名称")
private String imageProductTypeDisplay;
/** 影像存储地址目录 */
@ApiModelProperty(value = "影像存储地址目录")
private String imageFilePath;
/** 中心点 */
@ApiModelProperty(value = "中心点")
private String imageCenterPoint;
/** 覆盖地区省 */
@ApiModelProperty(value = "覆盖地区省")
private String imageProvince;
/** 覆盖大区市 */
@ApiModelProperty(value = "覆盖大区市")
private String imageCity;
/** 面积 */
@ApiModelProperty(value = "面积")
private String imageArea;
/** 投影 */
@ApiModelProperty(value = "投影")
private String imageProjection;
/** 卫星 */
@ApiModelProperty(value = "卫星")
private String imageSatelliteType;
/** 卫星名称 */
@ApiModelProperty(value = "卫星名称")
private String imageSatelliteTypeDisplay;
/** 拍摄时间 */
@ApiModelProperty(value = "拍摄时间")
private String imageTakeTime;
/** 云量 */
@ApiModelProperty(value = "云量")
private BigDecimal imageCloudage;
/** 处理级别 */
@ApiModelProperty(value = "处理级别")
private String imageProductLevel;
/** 观测类型 */
@ApiModelProperty(value = "观测类型")
private String imageObservation;
/** 传感器类型 */
@ApiModelProperty(value = "传感器类型")
private String imageSensorType;
/** 销售价格 */
@ApiModelProperty(value = "销售价格")
private BigDecimal sellPrice;
/** 销售状态 */
@ApiModelProperty(value = "销售状态")
private Integer isSell;
/** 删除 0未删除 1已删除 */
@ApiModelProperty(value = "删除 0未删除 1已删除")
private Integer isDel;
/** 备注 */
@ApiModelProperty(value = "备注")
private String remark;
/** 包含那几个文件名称[数组] */
@ApiModelProperty(value = "包含那几个文件名称[数组]")
private String files;
/** wms服务地址 */
@ApiModelProperty(value = "wms服务地址")
private String imageWmsPath;
/** 数据保存的外地址 */
@ApiModelProperty(value = "数据保存的外地址")
private String imageOutPath;
/** 是否存在数据,0不存在 1已存在 */
@ApiModelProperty(value = "是否存在数据,0不存在 1已存在")
private Integer imageIsSave;
/** 创建时间 */
@ApiModelProperty(value = "创建时间")
private Timestamp createDt;
/** imageSensorId */
@ApiModelProperty(value = "")
private String imageSensorId;
/** imageProductType1 */
@ApiModelProperty(value = "")
private String imageProductType1;
/** imageSceneId */
@ApiModelProperty(value = "")
private String imageSceneId;
/** imageProductId */
@ApiModelProperty(value = "")
private String imageProductId;
/** imageProductFormat */
@ApiModelProperty(value = "")
private String imageProductFormat;
/** imageProductTime */
@ApiModelProperty(value = "")
private String imageProductTime;
/** imageSatPath */
@ApiModelProperty(value = "")
private String imageSatPath;
/** imageSatRow */
@ApiModelProperty(value = "")
private String imageSatRow;
/** imageStartTime */
@ApiModelProperty(value = "")
private String imageStartTime;
/** imageEndTime */
@ApiModelProperty(value = "")
private String imageEndTime;
/** imageCenterTime */
@ApiModelProperty(value = "")
private String imageCenterTime;
/** imageWidthInPixels */
@ApiModelProperty(value = "")
private String imageWidthInPixels;
/** imagePitchSatellitessAngle */
@ApiModelProperty(value = "")
private String imagePitchSatellitessAngle;
/** imageSolarAzimuth */
@ApiModelProperty(value = "")
private String imageSolarAzimuth;
/** imageSolarZenith */
@ApiModelProperty(value = "")
private String imageSolarZenith;
/** imageSatelliteAzimuth */
@ApiModelProperty(value = "")
private String imageSatelliteAzimuth;
/** imageSatelliteZenith */
@ApiModelProperty(value = "")
private String imageSatelliteZenith;
/** imageHeightInPixels */
@ApiModelProperty(value = "")
private String imageHeightInPixels;
/** imageYawSatelliteAngle */
@ApiModelProperty(value = "")
private String imageYawSatelliteAngle;
/** 校准任务ID */
@ApiModelProperty(value = "校准任务ID")
private String jobId;
/** 校准图像结果 0 失败 1 成功 */
@ApiModelProperty(value = "校准图像结果 0 失败 1 成功")
private Integer correctStatus;
/** 旧数据的关联影像id，兼容旧数据订单 */
@ApiModelProperty(value = "旧数据的关联影像id，兼容旧数据订单")
private String relationNo;
/** 店铺id */
@ApiModelProperty(value = "店铺id")
private String shopId;
/** 生产tif文件回调的jobid */
@ApiModelProperty(value = "生产tif文件回调的jobid")
private String tifJobId;
/** 生产tif文件回调状态：0 默认 1 成功 2 失败 3更新生产tif */
@ApiModelProperty(value = "生产tif文件回调状态：0 默认 1 成功 2 失败 3更新生产tif")
private Integer tifTaskStatus;
/** 生成josn更新时间 */
@ApiModelProperty(value = "生成josn更新时间")
private Timestamp jsonTaskDate;
/** 生成json文件回调状态 0需要生成 1完成生成 -1 生成失败 2生成中 3请求失败 4已放入队列 */
@ApiModelProperty(value = "生成json文件回调状态 0需要生成 1完成生成 -1 生成失败 2生成中 3请求失败 4已放入队列")
private Integer jsonTaskStatus;
/** imageYear */
@ApiModelProperty(value = "")
private Integer imageYear;
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/pom.xml
View file @ c235a64c
......@@ -3,13 +3,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>rs-datacenter</artifactId>
<groupId>com.github.wxiaoqi</groupId>
<artifactId>rs-common-platform-web</artifactId>
<groupId>com.upyuns.common</groupId>
<version>2.0-rscp-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>rs-datacenter-server</artifactId>
<dependencies>
<dependency>
<groupId>com.upyuns.common</groupId>
<artifactId>rs-datacenter-api</artifactId>
<version>2.0-rscp-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/DatacenterApplication.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.datacenter;
import com.ace.cache.EnableAceCache;
import com.github.wxiaoqi.security.api.vo.config.HeaderConfig;
import com.github.wxiaoqi.security.auth.client.EnableAceAuthClient;
import com.github.wxiaoqi.security.common.annotation.AddBasicConfiguration;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@SpringBootApplication(scanBasePackages = {
"com.upyuns.platform.rs",
"com.github.wxiaoqi.security.common.handler"
})
@EnableDiscoveryClient
@EnableAceAuthClient
@EnableScheduling
@EnableAceCache
@EnableTransactionManagement
@AddBasicConfiguration
@tk.mybatis.spring.annotation.MapperScan(basePackages = "com.upyuns.platform.rs.datacenter.mapper")
@EnableFeignClients(value = {"com.upyuns.platform.rs","com.github.wxiaoqi.security"},defaultConfiguration = HeaderConfig.class)
public class DatacenterApplication {
public static void main(String[] args) {
SpringApplication.run(DatacenterApplication.class, args);
}
}
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/biz/RscpImageDataTotalBiz.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.datacenter.biz;
import com.github.wxiaoqi.security.common.biz.BaseBiz;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper;
import org.springframework.stereotype.Service;
@Service
public class RscpImageDataTotalBiz extends BaseBiz<RscpImageDataTotalMapper, RscpImageDataTotal> {
}
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/mapper/RscpImageDataTotalMapper.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.datacenter.mapper;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import tk.mybatis.mapper.common.Mapper;
import java.util.List;
import java.util.Set;
public interface RscpImageDataTotalMapper extends Mapper<RscpImageDataTotal> {
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/java/com/upyuns/platform/rs/datacenter/rest/RscpImageDataTotalController.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.datacenter.rest;
import com.alibaba.fastjson.JSONObject;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
import com.github.wxiaoqi.security.common.rest.BaseController;
import com.github.wxiaoqi.security.common.util.process.ResultCode;
import com.github.wxiaoqi.security.common.util.result.JsonResultUtil;
import com.upyuns.platform.rs.datacenter.biz.RscpImageDataTotalBiz;
import com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("imageData")
public class RscpImageDataTotalController extends BaseController<RscpImageDataTotalBiz, RscpImageDataTotal> {
}
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/application.yml 0 → 100644
View file @ c235a64c
logging:
config: classpath:logback.xml
level:
com.github.wxiaoqi:
debug
com.upyuns.platform.rs:
debug
servlet:
multipart:
# 启用上传处理，默认是true
enabled: true
# 当上传文件达到20MB的时候进行磁盘写入
file-size-threshold: 20MB
# 设置最大的请求文件的大小
max-request-size: 50MB
# 设置单个文件的最大长度
max-file-size: 50MB
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/bootstrap.yml 0 → 100644
View file @ c235a64c
#spring:
# application:
# name: vehicle
# cloud:
# nacos:
# config:
# server-addr: 127.0.0.1:8848
# file-extension: yaml
# profiles:
# active: dev
spring:
profiles:
active: dev
application:
name: rs-datacenter
cloud:
nacos:
config:
file-extension: yaml
---
spring:
profiles: dev
cloud:
nacos:
config:
server-addr: 127.0.0.1:8848
#共用配置，暂定一个
shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
namespace: rs-cloud-platform
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/logback.xml 0 → 100644
View file @ c235a64c
<?xml version="1.0" encoding="UTF-8"?>
<configuration debug="false">
<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
<property name="LOG_HOME" value="${system.log.path:-logs}"/>
<!-- 彩色日志依赖的渲染类 -->
<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
<!-- 彩色日志格式 -->
<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
<filter class="com.github.wxiaoqi.security.common.filter.NacosLogFilter"></filter>
<encoder>
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
<charset>UTF-8</charset> <!-- 设置字符集 -->
</encoder>
</appender>
<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
</encoder>
</appender>
<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
<MaxHistory>60</MaxHistory><!--日志文件保留天数 -->
</rollingPolicy>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<Pattern>${CONSOLE_LOG_PATTERN}</Pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
</encoder>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="SYSTEM_FILE" />
<appender-ref ref="WEB_FILE" />
</root>
</configuration>
\ No newline at end of file
rs-datacenter/rs-datacenter-server/src/main/resources/mapper/RscpImageDataTotalMapper.xml 0 → 100644
View file @ c235a64c
<?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">
<!-- 影像数据表(分表空间)(rscp_image_data_total) -->
<mapper namespace="com.upyuns.platform.rs.datacenter.mapper.RscpImageDataTotalMapper">
<!-- This code was generated by TableGo tools, mark 1 begin. -->
<!-- 字段映射 -->
<resultMap id="BaseResultMap" type="com.upyuns.platform.rs.datacenter.entity.RscpImageDataTotal">
<result column="id" property="id" jdbcType="VARCHAR" />
<result column="data_no" property="dataNo" jdbcType="VARCHAR" />
<result column="category_id" property="categoryId" jdbcType="VARCHAR" />
<result column="name" property="name" jdbcType="VARCHAR" />
<result column="range" property="range" jdbcType="VARCHAR" />
<result column="thumbnail_path" property="thumbnailPath" jdbcType="VARCHAR" />
<result column="display_name" property="displayName" jdbcType="VARCHAR" />
<result column="image_resolution" property="imageResolution" jdbcType="VARCHAR" />
<result column="image_spectrum_type" property="imageSpectrumType" jdbcType="VARCHAR" />
<result column="image_spectrum_type_display" property="imageSpectrumTypeDisplay" jdbcType="VARCHAR" />
<result column="image_row_col" property="imageRowCol" jdbcType="VARCHAR" />
<result column="image_row" property="imageRow" jdbcType="VARCHAR" />
<result column="image_col" property="imageCol" jdbcType="VARCHAR" />
<result column="image_product_type" property="imageProductType" jdbcType="VARCHAR" />
<result column="image_product_type_display" property="imageProductTypeDisplay" jdbcType="VARCHAR" />
<result column="image_file_path" property="imageFilePath" jdbcType="VARCHAR" />
<result column="image_center_point" property="imageCenterPoint" jdbcType="VARCHAR" />
<result column="image_province" property="imageProvince" jdbcType="VARCHAR" />
<result column="image_city" property="imageCity" jdbcType="VARCHAR" />
<result column="image_area" property="imageArea" jdbcType="VARCHAR" />
<result column="image_projection" property="imageProjection" jdbcType="VARCHAR" />
<result column="image_satellite_type" property="imageSatelliteType" jdbcType="VARCHAR" />
<result column="image_satellite_type_display" property="imageSatelliteTypeDisplay" jdbcType="VARCHAR" />
<result column="image_take_time" property="imageTakeTime" jdbcType="VARCHAR" />
<result column="image_cloudage" property="imageCloudage" jdbcType="INTEGER" />
<result column="image_product_level" property="imageProductLevel" jdbcType="VARCHAR" />
<result column="image_observation" property="imageObservation" jdbcType="VARCHAR" />
<result column="image_sensor_type" property="imageSensorType" jdbcType="VARCHAR" />
<result column="sell_price" property="sellPrice" jdbcType="INTEGER" />
<result column="is_sell" property="isSell" jdbcType="INTEGER" />
<result column="is_del" property="isDel" jdbcType="INTEGER" />
<result column="remark" property="remark" jdbcType="VARCHAR" />
<result column="files" property="files" jdbcType="VARCHAR" />
<result column="image_wms_path" property="imageWmsPath" jdbcType="VARCHAR" />
<result column="image_out_path" property="imageOutPath" jdbcType="VARCHAR" />
<result column="image_is_save" property="imageIsSave" jdbcType="INTEGER" />
<result column="create_dt" property="createDt" jdbcType="TIMESTAMP" />
<result column="image_sensor_id" property="imageSensorId" jdbcType="VARCHAR" />
<result column="image_product_type1" property="imageProductType1" jdbcType="VARCHAR" />
<result column="image_scene_id" property="imageSceneId" jdbcType="VARCHAR" />
<result column="image_product_id" property="imageProductId" jdbcType="VARCHAR" />
<result column="image_product_format" property="imageProductFormat" jdbcType="VARCHAR" />
<result column="image_product_time" property="imageProductTime" jdbcType="VARCHAR" />
<result column="image_sat_path" property="imageSatPath" jdbcType="VARCHAR" />
<result column="image_sat_row" property="imageSatRow" jdbcType="VARCHAR" />
<result column="image_start_time" property="imageStartTime" jdbcType="VARCHAR" />
<result column="image_end_time" property="imageEndTime" jdbcType="VARCHAR" />
<result column="image_center_time" property="imageCenterTime" jdbcType="VARCHAR" />
<result column="image_width_in_pixels" property="imageWidthInPixels" jdbcType="VARCHAR" />
<result column="image_pitch_satellitess_angle" property="imagePitchSatellitessAngle" jdbcType="VARCHAR" />
<result column="image_solar_azimuth" property="imageSolarAzimuth" jdbcType="VARCHAR" />
<result column="image_solar_zenith" property="imageSolarZenith" jdbcType="VARCHAR" />
<result column="image_satellite_azimuth" property="imageSatelliteAzimuth" jdbcType="VARCHAR" />
<result column="image_satellite_zenith" property="imageSatelliteZenith" jdbcType="VARCHAR" />
<result column="image_height_in_pixels" property="imageHeightInPixels" jdbcType="VARCHAR" />
<result column="image_yaw_satellite_angle" property="imageYawSatelliteAngle" jdbcType="VARCHAR" />
<result column="job_id" property="jobId" jdbcType="VARCHAR" />
<result column="correct_status" property="correctStatus" jdbcType="INTEGER" />
<result column="relation_no" property="relationNo" jdbcType="VARCHAR" />
<result column="shop_id" property="shopId" jdbcType="VARCHAR" />
<result column="tif_job_id" property="tifJobId" jdbcType="VARCHAR" />
<result column="tif_task_status" property="tifTaskStatus" jdbcType="INTEGER" />
<result column="json_task_date" property="jsonTaskDate" jdbcType="TIMESTAMP" />
<result column="json_task_status" property="jsonTaskStatus" jdbcType="INTEGER" />
<result column="image_year" property="imageYear" jdbcType="INTEGER" />
</resultMap>
<!-- This code was generated by TableGo tools, mark 1 end. -->
<!-- This code was generated by TableGo tools, mark 2 begin. -->
<!-- 表查询字段 -->
<sql id="allColumns">
ridt.id, ridt.data_no, ridt.category_id, ridt.name, ridt.range, ridt.thumbnail_path, ridt.display_name, ridt.image_resolution,
ridt.image_spectrum_type, ridt.image_spectrum_type_display, ridt.image_row_col, ridt.image_row, ridt.image_col, ridt.image_product_type, ridt.image_product_type_display, ridt.image_file_path,
ridt.image_center_point, ridt.image_province, ridt.image_city, ridt.image_area, ridt.image_projection, ridt.image_satellite_type, ridt.image_satellite_type_display, ridt.image_take_time,
ridt.image_cloudage, ridt.image_product_level, ridt.image_observation, ridt.image_sensor_type, ridt.sell_price, ridt.is_sell, ridt.is_del, ridt.remark,
ridt.files, ridt.image_wms_path, ridt.image_out_path, ridt.image_is_save, ridt.create_dt, ridt.image_sensor_id, ridt.image_product_type1, ridt.image_scene_id,
ridt.image_product_id, ridt.image_product_format, ridt.image_product_time, ridt.image_sat_path, ridt.image_sat_row, ridt.image_start_time, ridt.image_end_time, ridt.image_center_time,
ridt.image_width_in_pixels, ridt.image_pitch_satellitess_angle, ridt.image_solar_azimuth, ridt.image_solar_zenith, ridt.image_satellite_azimuth, ridt.image_satellite_zenith, ridt.image_height_in_pixels, ridt.image_yaw_satellite_angle,
ridt.job_id, ridt.correct_status, ridt.relation_no, ridt.shop_id, ridt.tif_job_id, ridt.tif_task_status, ridt.json_task_date, ridt.json_task_status,
ridt.image_year
</sql>
<!-- This code was generated by TableGo tools, mark 2 end. -->
</mapper>
\ No newline at end of file
rs-universal/rs-universal-server/target/classes/mapper/DictionaryMapper.xml
View file @ c235a64c
<?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.universal.mapper.DictionaryMapper" >
<resultMap id="BaseResultMap" type="Dictionary" >
<resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.Dictionary" >
<!--
WARNING - @mbg.generated
-->
......@@ -13,7 +13,7 @@
<result column="detail" property="detail" jdbcType="VARCHAR" />
</resultMap>
<select id="selectByCodeAndType" parameterType="Dictionary" resultType="Dictionary">
<select id="selectByCodeAndType" parameterType="com.upyuns.platform.rs.universal.entity.Dictionary" resultType="com.upyuns.platform.rs.universal.entity.Dictionary">
select * from data_dictionary
<where>
<if test="type != null">
......@@ -28,7 +28,7 @@
</where>
</select>
<select id = "selectByPid" parameterType="java.lang.Integer" resultType="Dictionary">
<select id = "selectByPid" parameterType="java.lang.Integer" resultType="com.upyuns.platform.rs.universal.entity.Dictionary">
select * from data_dictionary
where pid = #{pid}
</select>
......
rs-universal/rs-universal-server/target/classes/mapper/IdInformationMapper.xml
View file @ c235a64c
......@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.upyuns.platform.rs.universal.mapper.IdInformationMapper">
<resultMap type="IdInformation" id="IdInformation">
<resultMap type="com.upyuns.platform.rs.universal.entity.IdInformation" id="IdInformation">
<result property="id" column="id"/>
<result property="idNumber" column="id_number"/>
<result property="name" column="name"/>
......@@ -13,7 +13,7 @@
<result property="expirationDate" column="expiration_date"/>
<result property="authenticationMethods" column="authentication_methods"/>
</resultMap>
<select id="selectByUserId" resultType="IdInformation" parameterType="java.lang.Integer">
<select id="selectByUserId" resultType="com.upyuns.platform.rs.universal.entity.IdInformation" parameterType="java.lang.Integer">
select * from id_information where user_login_id = #{userLoginId}
</select>
......
rs-universal/rs-universal-server/target/classes/mapper/MemberFamilyInfoMapper.xml
View file @ c235a64c
<?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.universal.mapper.MemberFamilyInfoMapper">
<resultMap id="BaseResultMap" type="MemberFamilyInfo">
<resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.MemberFamilyInfo">
<!--
WARNING - @mbg.generated
-->
......
rs-universal/rs-universal-server/target/classes/mapper/MemberInfoMapper.xml
View file @ c235a64c
<?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.universal.mapper.MemberInfoMapper">
<resultMap id="BaseResultMap" type="MemberInfo">
<resultMap id="BaseResultMap" type="com.upyuns.platform.rs.universal.entity.MemberInfo">
<!--
WARNING - @mbg.generated
-->
......@@ -41,7 +41,7 @@
create_user_name, state
</sql>
<resultMap id="MemberInfoVoResultMap" type="MemberInfoVo">
<resultMap id="MemberInfoVoResultMap" type="com.upyuns.platform.rs.universal.vo.MemberInfoVo">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="sex" jdbcType="BIT" property="sex" />
......
rs-universal/rs-universal-server/target/classes/mapper/OrderPayMapper.xml
View file @ c235a64c
......@@ -4,7 +4,7 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderPayMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="OrderPay" id="orderPayMap">
<resultMap type="com.upyuns.platform.rs.universal.entity.OrderPay" id="orderPayMap">
<result property="id" column="id"/>
<result property="tradeNo" column="trade_no"/>
<result property="orderNo" column="order_no"/>
......
rs-universal/rs-universal-server/target/classes/mapper/OrderRefundMapper.xml
View file @ c235a64c
......@@ -4,7 +4,7 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.OrderRefundMapper">
<!-- 可根据自己的需求，是否要使用 -->
<resultMap type="OrderRefund" id="orderRefundMap">
<resultMap type="com.upyuns.platform.rs.universal.entity.OrderRefund" id="orderRefundMap">
<result property="id" column="id"/>
<result property="refundTradeNo" column="refund_trade_no"/>
<result property="orderNo" column="order_no"/>
......
rs-universal/rs-universal-server/target/classes/mapper/SysRegionMapper.xml
View file @ c235a64c
......@@ -3,12 +3,12 @@
<mapper namespace="com.upyuns.platform.rs.universal.mapper.SysRegionMapper">
<select id="getAllByPage" parameterType="java.util.Map"
resultType="SysRegion">
resultType="com.upyuns.platform.rs.universal.entity.SysRegion">
select `id`, parent_id, `name`, `type`, agency_id from sys_region limit #{pageStart},${pageSize}
</select>
<select id="getByIdList" parameterType="java.util.List"
resultType="SysRegion">
resultType="com.upyuns.platform.rs.universal.entity.SysRegion">
select `id`, parent_id, `name`, `type`, agency_id from sys_region where id in
<foreach collection="list" index="i" item="item" open="(" close=")" separator=",">
#{item}
......@@ -22,7 +22,7 @@
select `id` from sys_region where name like CONCAT('%',#{name},'%') and type=#{type} limit 1
</select>
<select id="findByCityName" resultType="RegionDTO">
<select id="findByCityName" resultType="com.upyuns.platform.rs.universal.dto.RegionDTO">
select `id`,`parent_id` as `parentId` from `sys_region` where `type`=2 and `name` like concat('%',#{city} ,'%')
</select>
</mapper>
\ No newline at end of file
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/constant/RedisKey.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.website.constant;
public class RedisKey {
/**
* 常量缓存key前缀
*/
public static final String TOKEN_CACHE_PREFIX ="cache:token:";
/**
* 地区常量缓存key前缀(子读取列表)
*/
public static final String SYS_REGION_SONS_CACHE_PREFIX ="cache:sysRegion:sons:";
/**
* 地区常量缓存key前缀(子读取列表)
*/
public static final String SYS_REGION_CACHE_PREFIX ="cache:sysRegion:";
/**
* 刷新常量缓存乐观锁前缀
*/
public static final String CONSTANT_REFRESH_LOCK_PREFIX ="lock:constant:";
/**
* 地区常量缓存key前缀
*/
public static final String SYS_REGION_REFRESH_LOCK ="lock:sysRegion:";
/**
* 迁移预定信息rediseky
*/
public static final String DEL_BOOK_INFO_LOCK_PREFIX ="lock:del:bookInfo:";
/**
* 迁移预定记录rediseky
*/
public static final String TRANSFER_BOOK_RECORD_LOCK_PREFIX ="lock:bookRecord:transfer";
/**
* 子公司列表缓存key前缀
*/
public static final String BRANCH_COMPANY_CACHE ="cache:brachCompany";
/**
* 子公司列表缓存key前缀
*/
public static final String BRANCH_COMPANY_CACHE_ALL = BRANCH_COMPANY_CACHE + ":all";
/**
* 片区对应的子公司缓存key前缀
*/
public static final String BRANCH_COMPANY_CACHE_DATAZONE = BRANCH_COMPANY_CACHE + ":dataZone{1}";
/**
* 营地列表缓存key前缀
*/
public static final String CAMPSITE_CACHE ="cache:campsite";
/**
* 营地列表缓存key前缀
*/
public static final String CAMPSITE_CACHE_ALL = CAMPSITE_CACHE + ":all";
/**
* 片区对应的营地缓存key前缀
*/
public static final String CAMPSITE_CACHE_DATAZONE = CAMPSITE_CACHE + ":dataZone{1}";
// 随车物品相关key
public static final String ACCOMPANYING_ITEM_CACHE_ALL ="cache:accompanyItem:all";
/**
* 服务器上传文件序号
*/
public static final String UPLOAD_FILE_NO_PREFIX ="upload:file:no:";
/**
* 预警信息检查乐观锁
*/
public static final String LOCK_VEHICLE_WARNING_MSG ="lock:vehicle:warningMsg";
/**
* 车辆预警，前一天检查的里程数redisKey前缀
*/
public static final String MILEAGE_LAST_DAY_PREFIX ="mileage:last_day:";
/**
* 车辆预警，前一天检查的里程数redisKey前缀
*/
public static final String CACHE_DICTIONARY_PREFIX ="cache:dictionary:";
public static final String CACHE_DICTIONARY_ALL =CACHE_DICTIONARY_PREFIX + "all:";
public static final String CACHE_DICTIONARY_ALL_MAP =CACHE_DICTIONARY_ALL + "map:";
public static final String ILLEGAL_VEHICLE_ENQUIRIES ="cache:violation";
/**
* 服务器上传压缩包文件序号
*/
public static final String UPLOAD_ZIP_NO_PREFIX ="upload:zip:no:";
public static final String CAPTCHA_PHONE_PREFIX = "captcha:phone:";
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/CaptchaBaseParam.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.website.dto;
import java.io.Serializable;
/**
* 基础入参对象
* @author stx
* @date 2018/11/5 16:35
* @desc
*/
public class CaptchaBaseParam implements Serializable {
private String urlOrPath;
public String getUrlOrPath() {
return urlOrPath;
}
public void setUrlOrPath(String urlOrPath) {
this.urlOrPath = urlOrPath;
}
}
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/entity/Demo.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.website.entity;
import lombok.Data;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.io.Serializable;
import java.util.Set;
@Data
@Table(name = "demo")
public class Demo implements Serializable {
@Id
private Integer id;
private String name;
}
\ No newline at end of file
rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/feign/WebsiteFeign.java 0 → 100644
View file @ c235a64c
package com.upyuns.platform.rs.website.feign;
import org.springframework.cloud.openfeign.FeignClient;
/**
* ${DESCRIPTION}
*
* @author wanghaobin
* @create 2017-06-21 8:11
*/
@FeignClient(value = "rs-website", contextId = "website-base")
public interface WebsiteFeign {
}
rs-website/rs-website-server/pom.xml
View file @ c235a64c
......@@ -25,4 +25,22 @@
<scope>compile</scope>
</dependency>
</dependencies>
<build>
<finalName>rs-website</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ 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