Skip to content

C
civil-bigdata
Commit 59e91a04 by 袁伟铭
Options

修改模块名

parent 83eb65a4
Showing with 258 additions and 815 deletions
common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java → civil-common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java
package com.zq.common.entity; package com.zq.common.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/** /**
* 地区婚姻统计(VMarriageStats)实体类 * 地区婚姻统计(VMarriageStats)实体类
......
common-utils/src/main/java/com/zq/common/entity/VSoorganStats.java → civil-common-utils/src/main/java/com/zq/common/entity/VSoorganStats.java
package com.zq.common.entity; package com.zq.common.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.*; import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/** /**
* (VSoorganStats)实体类 * (VSoorganStats)实体类
......
civil-common-utils/src/main/java/com/zq/common/vo/IdVo.java 0 → 100644
package com.zq.common.vo;
import cn.hutool.core.util.StrUtil;
import lombok.*;
import java.util.HashSet;
import java.util.Set;
/**
* @author CodeAnyWay
* @since 2019-04-28
*/
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class IdVo {
private String id;
private Set<String> ids;
public Set<String> getIds() {
if (ids == null) {
ids = new HashSet<>();
}
if (StrUtil.isNotBlank(id)) {
ids.add(id);
}
return ids;
}
}
\ No newline at end of file
common-utils/src/main/java/com/zq/common/utils/CollectionUtil.java deleted 100644 → 0
package com.zq.common.utils;
import java.util.Collection;
/**
* 列表操作类
*
* @author wilmiam
* @date 2015年10月29日
*/
public class CollectionUtil {
/**
* 判断对象是否在集合里
*
* @param searchObj 对象
* @param list 集合
* @param caseInsensetive 忽略大小写
* @return 判断结果
*/
public static boolean inCollection(final Object searchObj, final Collection<Object> list,
final boolean caseInsensetive) {
return CollectionUtil.getInCollectionId(searchObj, list, caseInsensetive) >= 0;
}
/**
* 判断对象是否在集合里
*
* @param searchObj 对象
* @param list 集合
* @return 判断结果
*/
public static boolean inCollection(final Object searchObj, final Collection<Object> list) {
return inCollection(searchObj, list, false);
}
/**
* 判断指定字符串是否属于指定字符串数组中的一个元素
*
* @param strSearch 字符串
* @param stringArray 内部以逗号分割单词的字符串
* @return 判断结果
*/
public static boolean inArray(final String strSearch, final String stringArray) {
return inArray(strSearch, StringUtils.splitString(stringArray, ","));
}
/**
* 判断指定字符串是否属于指定字符串数组中的一个元素
*
* @param strSearch 字符串
* @param stringArray 内部分割单词的字符串
* @param strSplit 分割字符串
* @return 判断结果
*/
public static boolean inArray(final String strSearch, final String stringArray, final String strSplit) {
return inArray(strSearch, StringUtils.splitString(stringArray, strSplit));
}
/**
* 判断指定字符串是否属于指定字符串数组中的一个元素
*
* @param strSearch 字符串
* @param stringArray 内部以逗号分割单词的字符串
* @param strsplit 分割字符串
* @param caseInsensetive 是否不区分大小写, true为不区分, false为区分
* @return 判断结果
*/
public static boolean inArray(final String strSearch, final String stringArray, final String strsplit,
final boolean caseInsensetive) {
return inArray(strSearch, StringUtils.splitString(stringArray, strsplit), caseInsensetive);
}
/**
* 判断制定字符串是否属于制定字符串数组中的一个元素
*
* @param strSearch 字符串
* @param stringArray 字符串数组
* @return 判断结果
*/
public static boolean inArray(final String strSearch, final String[] stringArray) {
return inArray(strSearch, stringArray, false);
}
/**
* 判断制定字符串是否属于制定字符串数组中的一个元素
*
* @param strSearch 字符串
* @param stringArray 字符串数组
* @param caseInsensetive 是否不区分大小写, true为不区分, false为区分
* @return 判断结果
*/
public static boolean inArray(final String strSearch, final String[] stringArray, final boolean caseInsensetive) {
return getInArrayId(strSearch, stringArray, caseInsensetive) >= 0;
}
/**
* 判断指定字符串在指定字符串数组中的位置
*
* @param searchStr 字符串
* @param strArray 字符串数组
* @param caseInsensetice 是否不区分大小写, true为不区分, false为区分
* @return 字符串在指定字符串数组中的位置, 如不存在则返回-1
*/
public static int getInArrayId(final String searchStr, final String[] strArray, final boolean caseInsensetice) {
if (!ValidateUtil.isBlank(searchStr)) {
for (int i = 0; i < strArray.length; i++) {
final String tmpStr = strArray[i];
if (!ValidateUtil.isBlank(tmpStr)) {
if (caseInsensetice) {
if (searchStr.toLowerCase().equals(strArray[i].toLowerCase())) {
return i;
}
} else {
if (searchStr.equals(strArray[i])) {
return i;
}
}
}
}
return -1;
}
return -1;
}
/**
* 判断指定字符串在指定字符串数组中的位置
*
* @param searchStr 字符串
* @param strArray 字符串数组
* @return 字符串在指定字符串数组中的位置, 如不存在则返回-1
*/
public static int getInArrayId(final String searchStr, final String[] strArray) {
return getInArrayId(searchStr, strArray, false);
}
/**
* 查询对象在集合里的索引
*
* @param searchObj 对象
* @param list 集合列表
* @param caseInsensetice 区分大小写
* @return 集合索引
*/
public static int getInCollectionId(final Object searchObj, final Collection<Object> list,
final boolean caseInsensetice) {
if (!ValidateUtil.isBlank(searchObj)) {
int index = 0;
for (Object tempObj : list) {
if (caseInsensetice && searchObj instanceof String && tempObj instanceof String) {
if (((String) searchObj).equalsIgnoreCase((String) tempObj)) {
return index;
}
} else {
if (searchObj.equals(tempObj)) {
return index;
}
}
index++;
}
}
return -1;
}
/**
* 查询对象在集合里的索引
*
* @param searchObj 对象
* @param list 集合列表
* @return 对象在集合中的索引
*/
public static int getInCollectionId(final Object searchObj, final Collection<Object> list) {
return getInCollectionId(searchObj, list, false);
}
}
common-utils/src/main/java/com/zq/common/vo/AdviceFeedbackVo.java deleted 100644 → 0
package com.zq.common.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class AdviceFeedbackVo extends PageReqVo{
@ApiModelProperty("id")
private Integer id;
@ApiModelProperty("用户id")
private Integer userid;
@ApiModelProperty("用户姓名")
private String username;
@ApiModelProperty("用户qq")
private String qq;
@ApiModelProperty("邮件")
private String email;
@ApiModelProperty("手机号")
private String telphone;
@ApiModelProperty("意见反馈内容")
private String content;
@ApiModelProperty("备注")
private String remark;
@ApiModelProperty("是否已读 1.已读 0.未读")
private Integer isRead;
@ApiModelProperty("创建者id")
private Integer createId;
@ApiModelProperty("对反馈问题的回复内容")
private String feedbackContent;
@ApiModelProperty("对反馈问题的回复用户id")
private Integer feedbackUserId;
@ApiModelProperty("对反馈问题的回复者名称")
private String feedbackUserName;
@ApiModelProperty("回复时间")
private String feedbackTime;
}
common-utils/src/main/java/com/zq/common/vo/FolderNoticeVo.java deleted 100644 → 0
package com.zq.common.vo;
import lombok.*;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class FolderNoticeVo {
/**
* 栏目公告
*/
/**
* 栏目id
*/
private Integer id;
/**
* 目录id
*/
private Integer folderId;
/**
* 类型：
*/
private Integer type;
/**
* 图标
*/
private String icon;
/**
* 内容
*/
private String content;
/**
* 链接地址
*/
private String url;
/**
* 排序号
*/
private Integer sort;
/**
* 状态： 1.显示 2.隐藏
*/
private Integer status;
/**
* 删除标记 0.未删除 1.已删除
*/
private Integer isDeleted;
/**
* 更新时间
*/
private String updateTime;
/**
* 更新者id
*/
private Integer updateId;
/**
* 创建时间
*/
private String createTime;
/**
* 创建者id
*/
private Integer createId;
}
common-utils/src/main/java/com/zq/common/vo/FolderRollPictureVo.java deleted 100644 → 0
package com.zq.common.vo;
import lombok.*;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class FolderRollPictureVo extends PageReqVo{
/**
* 栏目轮播图
*/
/**
* 栏目id
*/
private Integer id;
/**
* 目录id
*/
private Integer folderId;
/**
* 目录名称
*/
private String folderName;
/**
* 标题
*/
private String title;
/**
* 内容
*/
private String content;
/**
* 状态： 1.显示 2.隐藏
*/
private Integer status;
/**
* 图片路径
*/
private String imageUrl;
/**
* 网络图片路径
*/
private String imageNetUrl;
/**
* 链接地址
*/
private String url;
/**
* 删除标记 0.未删除 1.已删除
*/
private Integer isDeleted;
/**
* 更新时间
*/
private String updateTime;
/**
* 更新者id
*/
private Integer updateId;
/**
* 创建时间
*/
private String createTime;
/**
* 创建者id
*/
private Integer createId;
}
common-utils/src/main/java/com/zq/common/vo/FolderVo.java deleted 100644 → 0
package com.zq.common.vo;
import lombok.*;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class FolderVo {
/**
* 目录id
*/
private Integer id;
/**
* 父级id
*/
private Integer parentId;
/**
* 目录名称
*/
private String name;
/**
* URL KEY
*/
private String key;
/**
* 模板路径
*/
private String path;
/**
* 描述、说明
*/
private String content;
/**
* 排序号
*/
private Integer sort;
/**
* 状态： 1.显示 2.隐藏
*/
private Integer status;
/**
* 类型： 1.普通目录 2.a标签 3.a标签_blank 4 直接加载url信息
*/
private Integer type;
/**
* 跳转地址
*/
private String jumpUrl;
/**
* 素材类型 （对应sys_dict_detail 表）
*/
private Integer materialType;
/**
* 站点ID
*/
private Integer siteId;
/**
* 站点标题
*/
private String seoTitle;
/**
* 站点内容
*/
private String seoKeywords;
/**
* 站点描述
*/
private String seoDescription;
/**
* 更新时间
*/
private String updateTime;
/**
* 更新者id
*/
private Integer updateId;
/**
* 创建时间
*/
private String createTime;
/**
* 创建者id
*/
private Integer createId;
}
common-utils/src/main/java/com/zq/common/vo/TipOffVo.java deleted 100644 → 0
package com.zq.common.vo;
import lombok.*;
import java.util.Date;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class TipOffVo {
/**
* 用户举报
*/
private Integer id;
/**
* 举报人 用户id
*/
private Integer userid;
/**
* 举报类型 1.偷盗 2.违建3.放牧4.未允进入5.其他
*/
private Integer type;
/**
* 举报对象的姓名
*/
private String person;
/**
* 举报事件的发生地点
*/
private String addr;
/**
* 事件发生时间
*/
private Date happenedTime;
/**
* 举报的事件描述
*/
private String event;
/**
* 状态：1 举报上传 2 处理中 3 处理结束
*/
private Integer status;
/**
* 创建时间
*/
private Date createTime;
/**
* 更新时间
*/
private Date updateTime;
}
common-utils/src/main/java/com/zq/common/vo/WxRedpackVo.java deleted 100644 → 0
package com.zq.common.vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.*;
import java.math.BigDecimal;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class WxRedpackVo extends PageReqVo {
/**
* 红包发放表
*/
/**
* 发放红包记录id
*/
@ApiModelProperty("发放红包记录id")
private Integer id;
/**
* 用户openId
*/
@ApiModelProperty("用户openId")
private String openId;
/**
* 发送金额
*/
@ApiModelProperty("发送金额")
private BigDecimal amount;
/**
* 发送时间
*/
@ApiModelProperty("发送时间")
private String createTime;
/**
* 发送结果：1 成功 2失败
*/
@ApiModelProperty("发送结果：1 成功 2失败")
private Integer sendResult;
/**
* 微信单号(付款返回的订单号)
*/
@ApiModelProperty("微信单号(付款返回的订单号)")
private String sendListid;
/**
* 用户头像
*/
@ApiModelProperty("用户头像")
private String headimgurl;
/**
* 用户昵称
*/
@ApiModelProperty("用户昵称")
private String nickname;
@ApiModelProperty("手机号")
private String phone;
}
common-utils/src/main/java/com/zq/common/vo/WxUserVo.java deleted 100644 → 0
package com.zq.common.vo;
import lombok.*;
import java.util.Date;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class WxUserVo extends PageReqVo {
/**
* 用户id
*/
private Integer id;
/**
* 平台注册id
*/
private Long sellerId;
/**
* 用户所属于的微信公众号
*/
private String authAppId;
/**
* 用户昵称
*/
private String nickname;
/**
* 用户手机号
*/
private String phone;
/**
* 用户密码
*/
private String password;
/**
* 用户头像
*/
private String headimgurl;
/**
* 用户openId
*/
private String openId;
private String email;
/**
* 性别 1.男 2.女
*/
private Integer sex;
private String language;
private String city;
private String province;
private String country;
/**
* 是否订阅
*/
private Integer subscribe;
/**
* 订阅时间
*/
private Date subscribeTime;
private Integer groupid;
/**
* 备注
*/
private String remark;
/**
* 访问的ip
*/
private String accessIp;
/**
* token
*/
private String accessToken;
/**
* 刷新token
*/
private String refreshToken;
/**
* TOKEN 过期时间
*/
private String tokenExpiresIn;
/**
* 登录时间
*/
private Date lastLoginTime;
/**
*
*/
private String unionid;
/**
* 积分
*/
private Integer score;
/**
* 是否消息接收者 0为否，1为true
*/
private Integer isReceiver;
/**
* 删除标记
*/
private Boolean active;
/**
* 创建时间
*/
private Date created;
/**
* 更新时间
*/
private Date updated;
/**
* 1 微信用户 2 手机用户
*/
private Integer userType;
}
config-server/src/main/resources/properties/config-dev.yml
...@@ -27,18 +27,35 @@ redis.port: 6379 ...@@ -27,18 +27,35 @@ redis.port: 6379
#数据库源配置 #数据库源配置
jdbc.driver-class-name: com.mysql.cj.jdbc.Driver jdbc.driver-class-name: com.mysql.cj.jdbc.Driver
#jdbc.username: root
#jdbc.password: Dk2019!23456
#jdbc.master.url: jdbc:mysql://47.107.148.253:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxbz.url: jdbc:mysql://47.107.148.253:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxcj.url: jdbc:mysql://47.107.148.253:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxdb.url: jdbc:mysql://47.107.148.253:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxhy.url: jdbc:mysql://47.107.148.253:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxshzz.url: jdbc:mysql://47.107.148.253:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxet.url: jdbc:mysql://47.107.148.253:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxyl.url: jdbc:mysql://47.107.148.253:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.gxshjz.url: jdbc:mysql://47.107.148.253:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
#jdbc.resource.url: jdbc:mysql://47.107.148.253:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.username: root jdbc.username: root
jdbc.password: Dk2019!23456 jdbc.password: rooT123!321
jdbc.master.url: jdbc:mysql://47.107.148.253:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.master.url: jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxbz.url: jdbc:mysql://47.107.148.253:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxbz.url: jdbc:mysql://192.168.0.193:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxcj.url: jdbc:mysql://47.107.148.253:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxcj.url: jdbc:mysql://192.168.0.193:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxdb.url: jdbc:mysql://47.107.148.253:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxdb.url: jdbc:mysql://192.168.0.193:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxhy.url: jdbc:mysql://47.107.148.253:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxhy.url: jdbc:mysql://192.168.0.193:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshzz.url: jdbc:mysql://47.107.148.253:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxshzz.url: jdbc:mysql://192.168.0.193:3306/shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxet.url: jdbc:mysql://47.107.148.253:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxet.url: jdbc:mysql://192.168.0.193:3306/gx-et?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxyl.url: jdbc:mysql://47.107.148.253:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxyl.url: jdbc:mysql://192.168.0.193:3306/gx-yl?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.gxshjz.url: jdbc:mysql://47.107.148.253:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxshjz.url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.resource.url: jdbc:mysql://47.107.148.253:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.resource.url: jdbc:mysql://192.168.0.193:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
ojdbc.driver-class-name: oracle.jdbc.driver.OracleDriver
ojdbc.username: zt
ojdbc.password: LSZ192125mcm
ojdbc.mzzt.url: jdbc:oracle:thin:@//192.168.0.31:1521/mzzt
#jwt #jwt
jwt: jwt:
......
config-server/src/main/resources/properties/config-product.yml
...@@ -40,6 +40,11 @@ jdbc.gxyl.url: jdbc:mysql://192.168.0.193:3306/gx-yl?characterEncoding=utf8&useS ...@@ -40,6 +40,11 @@ jdbc.gxyl.url: jdbc:mysql://192.168.0.193:3306/gx-yl?characterEncoding=utf8&useS
jdbc.gxshjz.url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.gxshjz.url: jdbc:mysql://192.168.0.193:3306/gx-shjz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
jdbc.resource.url: jdbc:mysql://192.168.0.193:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai jdbc.resource.url: jdbc:mysql://192.168.0.193:3306/mz_resource?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
ojdbc.driver-class-name: oracle.jdbc.driver.OracleDriver
ojdbc.username: zt
ojdbc.password: LSZ192125mcm
ojdbc.mzzt.url: jdbc:oracle:thin:@//192.168.0.31:1521/mzzt
#jwt #jwt
jwt: jwt:
header: Authorization header: Authorization
......
config/lib/mvn-install.txt
mvn install:install-file -Dfile=E:\Gitlab\civil-bigdata\config\lib\ojdbc8-1.0.jar -DgroupId=org.oracle.jdbc -DartifactId=oracle8 -Dversion=1.0 -Dpackaging=jar mvn install:install-file -Dfile=config/lib/ojdbc8.jar -DgroupId=org.oracle -DartifactId=ojdbc8 -Dversion=12.1.0.2.0 -Dpackaging=jar
pom.xml
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<module>gateway-server</module> <module>gateway-server</module>
<module>eureka-server</module> <module>eureka-server</module>
<module>config-server</module> <module>config-server</module>
<module>common-utils</module> <module>civil-common-utils</module>
<module>sys-server</module> <module>sys-server</module>
<module>file-server</module> <module>file-server</module>
<module>api-server</module> <module>api-server</module>
......
common-utils/src/main/java/com/zq/common/config/mybatis/MybatisConfig.java → portal-server/src/main/java/com/zq/portal/config/MybatisConfig.java
package com.zq.common.config.mybatis; package com.zq.portal.config;
import com.baomidou.mybatisplus.annotation.DbType; import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
......
resource-server/pom.xml
...@@ -85,7 +85,18 @@ ...@@ -85,7 +85,18 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!-- oracle8 -->
<dependency>
<groupId>org.oracle</groupId>
<artifactId>ojdbc8</artifactId>
<version>12.1.0.2.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.oracle.database.nls/orai18n -->
<dependency>
<groupId>com.oracle.database.nls</groupId>
<artifactId>orai18n</artifactId>
<version>21.1.0.0</version>
</dependency>
</dependencies> </dependencies>
<build> <build>
......
resource-server/src/main/java/com/zq/resource/config/MybatisConfig.java 0 → 100644
package com.zq.resource.config;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.Properties;
/**
* @author wilmiam
* @since 2021-08-09 15:59
*/
@Configuration
public class MybatisConfig {
/**
* MybatisPlus分页插件
*/
@Bean
public MybatisPlusInterceptor mybatisPlusInterceptor() {
MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.ORACLE_12C));
return interceptor;
}
/**
* PageHelper分页插件
*
* @return
*/
@Bean
public PageInterceptor pageInterceptor() {
PageInterceptor pageInterceptor = new PageInterceptor();
Properties properties = new Properties();
properties.put("helperDialect", "oracle");
pageInterceptor.setProperties(properties);
return pageInterceptor;
}
}
resource-server/src/main/java/com/zq/resource/config/SpringSecurityConfig.java
...@@ -76,7 +76,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { ...@@ -76,7 +76,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
Map<String, Set<String>> anonymousUrls = getAnonymousUrl(handlerMethodMap); Map<String, Set<String>> anonymousUrls = getAnonymousUrl(handlerMethodMap);
Set<String> allType = anonymousUrls.get(RequestMethodEnum.ALL.getType()); Set<String> allType = anonymousUrls.get(RequestMethodEnum.ALL.getType());
//不使用注解的时候在这添加url放行 //不使用注解的时候在这添加url放行
allType.add("/resource/app/**"); allType.add("/resource/api/**");
httpSecurity httpSecurity
// 禁用 CSRF // 禁用 CSRF
......
resource-server/src/main/java/com/zq/resource/constant/ShareStatusEnum.java 0 → 100644
package com.zq.resource.constant;
import lombok.Getter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Getter
public enum ShareStatusEnum {
/**
* 未注册
*/
NOT_REGISTERED(1, "未注册"),
/**
* 已注册
*/
REGISTERED(2, "已注册"),
/**
* 已撤销
*/
REVOKED(3, "已撤销"),
;
private final Integer value;
private final String label;
ShareStatusEnum(Integer value, String label) {
this.value = value;
this.label = label;
}
/**
* 获取指定值得枚举对象
*
* @param value 枚举值
* @return 未找到匹配值则返回{@code null}
*/
public static ShareStatusEnum ofValue(int value) {
ShareStatusEnum result = null;
for (ShareStatusEnum item : values()) {
if (item.value == value) {
result = item;
break;
}
}
return result;
}
/**
* 转List
*
* @return
*/
public static List<Map<String, Object>> toList() {
List<Map<String, Object>> list = new ArrayList<>();
for (ShareStatusEnum item : ShareStatusEnum.values()) {
Map<String, Object> obj = new HashMap<>();
obj.put("value", item.getValue());
obj.put("label", item.getLabel());
list.add(obj);
}
return list;
}
}
resource-server/src/main/java/com/zq/resource/controller/admin/CategoryController.java
package com.zq.resource.controller.admin; package com.zq.resource.controller.admin;
import cn.hutool.core.collection.CollUtil;
import com.zq.common.utils.AssertUtils; import com.zq.common.utils.AssertUtils;
import com.zq.common.vo.IdVo;
import com.zq.common.vo.PageVo; import com.zq.common.vo.PageVo;
import com.zq.common.vo.ResultVo; import com.zq.common.vo.ResultVo;
import com.zq.resource.entity.DataCategory; import com.zq.resource.entity.DataCategory;
...@@ -55,4 +57,13 @@ public class CategoryController { ...@@ -55,4 +57,13 @@ public class CategoryController {
return ResultVo.success(); return ResultVo.success();
} }
@ApiOperation("注册目录")
@PostMapping(value = "/registerCategory")
public ResultVo registerCategory(@RequestBody IdVo vo) {
AssertUtils.isTrue(CollUtil.isNotEmpty(vo.getIds()), "至少选择一项");
categoryService.registerCategory(vo.getIds());
return ResultVo.success();
}
} }
resource-server/src/main/java/com/zq/resource/controller/app/AreaApi.java 0 → 100644
package com.zq.resource.controller.app;
import com.zq.common.vo.ResultVo;
import com.zq.resource.entity.SystemArea;
import com.zq.resource.service.AreaService;
import com.zq.resource.vo.DataTreeVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @author wilmiam
* @since 2021/8/19 14:33
*/
@Api(tags = "区域相关接口")
@RequiredArgsConstructor
@RestController
@RequestMapping(value = "/resource/api/area")
public class AreaApi {
private final AreaService areaService;
@ApiOperation("获取广西全区树形结构")
@GetMapping(value = "/getAreaTree")
public ResultVo<List<DataTreeVo>> getAreaTree() {
return ResultVo.success(areaService.getAreaTree());
}
@ApiOperation("指定条件获取区域列表")
@PostMapping(value = "/getAreaList")
public ResultVo<List<SystemArea>> getAreaList(@RequestBody SystemArea vo) {
return ResultVo.success(areaService.getAreaList(vo));
}
}
resource-server/src/main/java/com/zq/resource/dao/DataCategoryDao.java
package com.zq.resource.dao; package com.zq.resource.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.constant.DBName;
import com.zq.resource.entity.DataCategory; import com.zq.resource.entity.DataCategory;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository; ...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository;
* @author makejava * @author makejava
* @since 2021-08-19 11:25:52 * @since 2021-08-19 11:25:52
*/ */
@DS(DBName.RESOURCE)
@Repository @Repository
public interface DataCategoryDao extends BaseMapper<DataCategory> { public interface DataCategoryDao extends BaseMapper<DataCategory> {
......
resource-server/src/main/java/com/zq/resource/dao/DataDictDao.java
package com.zq.resource.dao; package com.zq.resource.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.constant.DBName;
import com.zq.resource.entity.DataDict; import com.zq.resource.entity.DataDict;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository; ...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository;
* @author makejava * @author makejava
* @since 2021-08-19 11:25:54 * @since 2021-08-19 11:25:54
*/ */
@DS(DBName.RESOURCE)
@Repository @Repository
public interface DataDictDao extends BaseMapper<DataDict> { public interface DataDictDao extends BaseMapper<DataDict> {
......
resource-server/src/main/java/com/zq/resource/dao/GovAffairItemDao.java
package com.zq.resource.dao; package com.zq.resource.dao;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.zq.common.constant.DBName;
import com.zq.resource.entity.GovAffairItem; import com.zq.resource.entity.GovAffairItem;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository; ...@@ -12,7 +10,6 @@ import org.springframework.stereotype.Repository;
* @author makejava * @author makejava
* @since 2021-08-19 11:25:54 * @since 2021-08-19 11:25:54
*/ */
@DS(DBName.RESOURCE)
@Repository @Repository
public interface GovAffairItemDao extends BaseMapper<GovAffairItem> { public interface GovAffairItemDao extends BaseMapper<GovAffairItem> {
......
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