Skip to content

S
smart_gov_platform
Commit d229e043 authored by 廖旭伟's avatar 廖旭伟
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteVo.java
#	base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
#	base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
#	portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java
parents aebcbd90 ec23f567
Hide whitespace changes
Inline Side-by-side
Showing with 2007 additions and 299 deletions
base-manager/db/base_modules.sql
View file @ d229e043
......@@ -43,48 +43,49 @@ CREATE TABLE `mortals_sys_area` (
PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '区域表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- 站点表
-- ----------------------------
DROP TABLE IF EXISTS `mortals_sys_site`;
CREATE TABLE `mortals_sys_site` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteName` varchar(255) DEFAULT NULL COMMENT '站点名称',
`siteCode` varchar(64) DEFAULT NULL COMMENT '站点编号',
`areaID` varchar(32) DEFAULT NULL COMMENT '区域Id',
`areaCode` varchar(32) DEFAULT NULL COMMENT '区域编号',
`areaName` varchar(32) DEFAULT NULL COMMENT '区域名称',
`proCode` varchar(32) DEFAULT NULL COMMENT '省编码',
`cityCode` varchar(32) DEFAULT NULL COMMENT '市编码',
`districtCode` varchar(32) DEFAULT NULL COMMENT '区编码',
`siteIp` varchar(32) DEFAULT NULL COMMENT '站点服务器ip',
`sitePort` varchar(8) DEFAULT NULL COMMENT '站点服务器端口',
`longitude` varchar(32) DEFAULT NULL COMMENT '经度',
`latitude` varchar(32) DEFAULT NULL COMMENT '纬度',
`siteTel` varchar(32) DEFAULT NULL COMMENT '中心联系电话',
`detailAddress` varchar(255) DEFAULT NULL COMMENT '中心详细地址',
`siteRemark` text COMMENT '中心介绍',
`amWorkStartTime` datetime DEFAULT NULL COMMENT '上午上班开始时间',
`amWorkEndTime` datetime DEFAULT NULL COMMENT '上午上班结束时间',
`pmWorkStartTime` datetime DEFAULT NULL COMMENT '下午上班开始时间',
`pmWorkEndTime` datetime DEFAULT NULL COMMENT '下午上班结束时间',
`workday1` tinyint(2) DEFAULT '1' COMMENT '周一 (1.上班，0.不上)',
`workday2` tinyint(2) DEFAULT '1' COMMENT '周二 (1.上班，0.不上)',
`workday3` tinyint(2) DEFAULT '1' COMMENT '周三 (1.上班，0.不上)',
`workday4` tinyint(2) DEFAULT '1' COMMENT '周四 (1.上班，0.不上)',
`workday5` tinyint(2) DEFAULT '1' COMMENT '周五 (1.上班，0.不上)',
`workday6` tinyint(2) DEFAULT '0' COMMENT '周六 (1.上班，0.不上)',
`workday7` tinyint(2) DEFAULT '0' COMMENT '周日 (1.上班，0.不上)',
`level` int(4) DEFAULT 1 COMMENT '楼层',
`building` int(4) DEFAULT 1 COMMENT '楼栋',
`modelIds` varchar(256) DEFAULT '' COMMENT '部署模块，逗号分隔',
`createTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '创建时间',
`createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
`updateTime` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '站点表' ROW_FORMAT = Dynamic;
CREATE TABLE mortals_sys_site(
`id` bigint(20) AUTO_INCREMENT COMMENT '序号，主键，自增长',
`siteName` varchar(255) COMMENT '站点名称',
`siteCode` varchar(64) COMMENT '站点编号',
`areaID` varchar(32) COMMENT '区域Id',
`areaCode` varchar(32) COMMENT '区域编号',
`areaName` varchar(32) COMMENT '区域名称',
`proCode` varchar(32) COMMENT '省编码',
`cityCode` varchar(32) COMMENT '市编码',
`districtCode` varchar(32) COMMENT '区编码',
`siteIp` varchar(32) COMMENT '站点服务器ip',
`sitePort` varchar(8) COMMENT '站点服务器端口',
`longitude` varchar(32) COMMENT '经度',
`latitude` varchar(32) COMMENT '纬度',
`siteTel` varchar(32) COMMENT '中心联系电话',
`detailAddress` varchar(255) COMMENT '中心详细地址',
`siteRemark` text COMMENT '中心介绍',
`amWorkStartTime` datetime COMMENT '上午上班开始时间',
`amWorkEndTime` datetime COMMENT '上午上班结束时间',
`pmWorkStartTime` datetime COMMENT '下午上班开始时间',
`pmWorkEndTime` datetime COMMENT '下午上班结束时间',
`workday1` tinyint(2) COMMENT '周一 (1.上班，0.不上)',
`workday2` tinyint(2) COMMENT '周二 (1.上班，0.不上)',
`workday3` tinyint(2) COMMENT '周三 (1.上班，0.不上)',
`workday4` tinyint(2) COMMENT '周四 (1.上班，0.不上)',
`workday5` tinyint(2) COMMENT '周五 (1.上班，0.不上)',
`workday6` tinyint(2) COMMENT '周六 (1.上班，0.不上)',
`workday7` tinyint(2) COMMENT '周日 (1.上班，0.不上)',
`level` int(4) COMMENT '楼层',
`building` int(4) COMMENT '楼栋',
`logoPath` varchar(255) COMMENT 'logo图片地址',
`englishName` varchar(255) COMMENT '英文名称',
`modelIds` varchar(256) COMMENT '部署模块，逗号分隔',
`createTime` datetime COMMENT '创建时间',
`createUserId` bigint(20) COMMENT '创建用户',
`updateTime` datetime COMMENT '修改时间',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='站点';
-- ----------------------------
......
base-manager/doc/api.md
View file @ d229e043
......@@ -905,6 +905,9 @@ data|object|数据对象|-
  level|Integer|楼层|-
  building|Integer|楼栋|-
  modelIds|String|部署模块，逗号分隔|-
  logoPath|String|设备logo地址
  logoFullPath|String|设备logo全地址
  englishName|String|站点英文名称
  createTime|Date|创建时间|-
  createUserId|Long|创建用户|-
  updateTime|Date|修改时间|-
......@@ -1072,6 +1075,9 @@ data|object|数据对象|-
 workday7|Integer|周日 (1.上班，0.不上)|-
 level|Integer|楼层|-
 building|Integer|楼栋|-
 logoPath|String|设备logo地址
 logoFullPath|String|设备logo全地址
 englishName|String|站点英文名称
 modelIds|String|部署模块，逗号分隔|-
 createTime|Date|创建时间|-
 createUserId|Long|创建用户|-
......@@ -1134,6 +1140,8 @@ workday6|Integer|周六 (1.上班，0.不上)|是|-
workday7|Integer|周日 (1.上班，0.不上)|是|-
level|Integer|楼层|是|-
building|Integer|楼栋|是|-
logoPath|String|是|设备logo地址
englishName|String|是|站点英文名称
modelIds|String|部署模块，逗号分隔|是|-
**请求样例:**
......
base-manager/src/main/java/com/mortals/xhx/base/framework/aspect/WebLogAspect.java
View file @ d229e043
......@@ -51,7 +51,7 @@ public class WebLogAspect {
public void doBefore(JoinPoint joinPoint) {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
// log.debug("请求路径 {} ,进入方法 {}", request.getRequestURI(), joinPoint.getSignature().getDeclaringTypeName() + ":" + joinPoint.getSignature().getName());
// log.debug("请求路径 {} ,进入方法 {}", request.getRequestURI(), joinPoint.getSignature().getDeclaringTypeName() + ":" + joinPoint.getSignature().getName());
MDC.put("req", getRequestInfo(request).toJSONString());
MDC.put("startTime", String.valueOf(System.currentTimeMillis()));
}
......@@ -64,12 +64,19 @@ public class WebLogAspect {
ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
HttpServletRequest request = attributes.getRequest();
Map<String, String> map = MDC.getCopyOfContextMap();
if (map != null&&result!=null) {
if (map != null && result != null) {
String startTime = map.getOrDefault("startTime", String.valueOf(System.currentTimeMillis()));
long takeTime = (System.currentTimeMillis() - Long.parseLong(startTime));
log.info(" \n 请求路径:{} \n 耗时：{}ms \n 请求报文：{} \n 响应报文：{}"
, request.getRequestURI(), takeTime, map.getOrDefault("req", ""), result == null ? "" : result.toString());
if (result instanceof String) {
log.info(" \n 请求路径:{} 耗时：{}ms \n 请求报文：{} \n 响应报文：{}"
, request.getRequestURI(), takeTime, map.getOrDefault("req", ""), result);
} else {
log.info(" \n 请求路径:{} 耗时：{}ms \n 请求报文：{} \n 响应报文：{}"
, request.getRequestURI(), takeTime, map.getOrDefault("req", ""), JSON.toJSONString(result));
}
}
}
......
base-manager/src/main/java/com/mortals/xhx/base/framework/config/CrossInterceptor.java
View file @ d229e043
......@@ -21,6 +21,7 @@ public class CrossInterceptor extends HandlerInterceptorAdapter {
response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Headers", "*");
response.setHeader("Access-Control-Allow-Credentials", "true");
response.setHeader("Content-Type", "true");
return true;
}
}
base-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java
View file @ d229e043
......@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -39,12 +40,19 @@ public class AuthUserInterceptor extends BaseInterceptor {
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception {
response.setContentType("application/json");
JSONObject ret = new JSONObject();
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
UnAuth annotation = method.getAnnotation(UnAuth.class);
if (annotation != null) {
//取消校验
if(handler instanceof HandlerMethod){
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
UnAuth annotation = method.getAnnotation(UnAuth.class);
if (annotation != null) {
//取消校验
return true;
}
}else if(handler instanceof ResourceHttpRequestHandler){
return true;
}
try {
......
base-manager/src/main/java/com/mortals/xhx/base/login/interceptor/AuthJsonInterceptor.java
View file @ d229e043
package com.mortals.xhx.base.login.interceptor;
import com.mortals.xhx.base.framework.config.InterceptorConfig;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.ap.CookieService;
import com.mortals.framework.ap.SysConstains;
import com.mortals.framework.model.CookieInfo;
......@@ -9,13 +9,15 @@ import com.mortals.framework.util.AESUtil;
import com.mortals.framework.util.HttpUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.interceptor.BaseInterceptor;
import com.mortals.xhx.base.framework.config.InterceptorConfig;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
@Order(1)
//@Component
public class AuthJsonInterceptor extends BaseInterceptor {
......@@ -35,13 +37,17 @@ public class AuthJsonInterceptor extends BaseInterceptor {
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception {
try {
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
UnAuth annotation = method.getAnnotation(UnAuth.class);
if (annotation != null) {
//取消校验
return true;
}
String uri = request.getServletPath();
//校验配置的请求路径是否需要检查权限
if (config.needCheckAuth(uri)) {
//需要校验权限
boolean auth = this.checkAuth(request, uri, config.getSecurityKey());
if (!auth) {
//不存在时候 如果是管理员也不做拦截
CookieInfo cookie = CookieService.getLoginCookie(request, config.getSecurityKey());
if (cookie == null || cookie.getUser() == null) {
writeJsonResponse(response, HttpServletResponse.SC_FORBIDDEN, "用户未登录或登录失效，请重新登录");
......
base-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
View file @ d229e043
......@@ -63,4 +63,11 @@ public final class Constant {
public final static String BASEMANAGER_VERSION = "Z-BASE.MANAGER-S1.0.0";
/**
* 服务器http
*/
public final static String PARAM_SERVER_HTTP_IMAGE_URL = "server_http_image_url";
}
base-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DemoStartedService.java
View file @ d229e043
......@@ -10,6 +10,7 @@ import com.mortals.xhx.base.system.user.service.UserService;
import com.mortals.xhx.common.utils.SyncTreeSiteThread;
import com.mortals.xhx.module.site.model.SiteTreeSelect;
import com.mortals.xhx.module.site.service.SiteService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -26,11 +27,9 @@ import java.util.List;
* 应用场景：
* 1、应用任务，应用启动后定时或间隔执行的任务
* 2、Socket服务端
*
* @author GM
* @date 2020年7月15日
*/
@Component
@Slf4j
public class DemoStartedService implements IApplicationStartedService {
private static Log logger = LogFactory.getLog(DemoStartedService.class);
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteEntity.java
View file @ d229e043
......@@ -3,12 +3,11 @@ package com.mortals.xhx.module.site.model;
import com.mortals.xhx.module.site.model.vo.SiteVo;
import java.util.Date;
/**
* 站点实体对象
*
* @author zxfei
* @date 2022-01-21
* @date 2022-06-29
*/
public class SiteEntity extends SiteVo {
......@@ -126,6 +125,14 @@ public class SiteEntity extends SiteVo {
* 楼栋
*/
private Integer building;
/**
* logo图片地址
*/
private String logoPath;
/**
* 英文名称
*/
private String englishName;
/**
* 部署模块，逗号分隔
*/
......@@ -526,6 +533,34 @@ public class SiteEntity extends SiteVo {
public void setBuilding(Integer building){
this.building = building;
}
/**
* 获取 logo图片地址
* @return String
*/
public String getLogoPath(){
return logoPath;
}
/**
* 设置 logo图片地址
* @param logoPath
*/
public void setLogoPath(String logoPath){
this.logoPath = logoPath;
}
/**
* 获取 英文名称
* @return String
*/
public String getEnglishName(){
return englishName;
}
/**
* 设置 英文名称
* @param englishName
*/
public void setEnglishName(String englishName){
this.englishName = englishName;
}
/**
* 获取 部署模块，逗号分隔
* @return String
......@@ -590,15 +625,17 @@ public class SiteEntity extends SiteVo {
sb.append(",workday7:").append(getWorkday7());
sb.append(",level:").append(getLevel());
sb.append(",building:").append(getBuilding());
sb.append(",logoPath:").append(getLogoPath());
sb.append(",englishName:").append(getEnglishName());
sb.append(",modelIds:").append(getModelIds());
return sb.toString();
}
public void initAttrValue(){
this.siteName = null;
this.siteName = "";
this.siteCode = null;
this.siteCode = "";
this.areaID = null;
......@@ -652,6 +689,10 @@ public class SiteEntity extends SiteVo {
this.building = 1;
this.logoPath = "";
this.englishName = "";
this.modelIds = "";
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteQuery.java
View file @ d229e043
......@@ -7,7 +7,7 @@ import com.mortals.xhx.module.site.model.SiteEntity;
* 站点查询对象
*
* @author zxfei
* @date 2022-01-21
* @date 2022-06-29
*/
public class SiteQuery extends SiteEntity {
/** 开始 序号，主键，自增长 */
......@@ -199,6 +199,12 @@ public class SiteQuery extends SiteEntity {
/** 楼栋列表 */
private List <Integer> buildingList;
/** logo图片地址 */
private List<String> logoPathList;
/** 英文名称 */
private List<String> englishNameList;
/** 部署模块，逗号分隔 */
private List<String> modelIdsList;
......@@ -1227,6 +1233,36 @@ public class SiteQuery extends SiteEntity {
this.buildingList = buildingList;
}
/**
* 获取 logo图片地址
* @return logoPathList
*/
public List<String> getLogoPathList(){
return this.logoPathList;
}
/**
* 设置 logo图片地址
* @param logoPathList
*/
public void setLogoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
}
/**
* 获取 英文名称
* @return englishNameList
*/
public List<String> getEnglishNameList(){
return this.englishNameList;
}
/**
* 设置 英文名称
* @param englishNameList
*/
public void setEnglishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
}
/**
* 获取 部署模块，逗号分隔
* @return modelIdsList
......@@ -2110,6 +2146,44 @@ public class SiteQuery extends SiteEntity {
}
/**
* 设置 logo图片地址
* @param logoPath
*/
public SiteQuery logoPath(String logoPath){
setLogoPath(logoPath);
return this;
}
/**
* 设置 logo图片地址
* @param logoPathList
*/
public SiteQuery logoPathList(List<String> logoPathList){
this.logoPathList = logoPathList;
return this;
}
/**
* 设置 英文名称
* @param englishName
*/
public SiteQuery englishName(String englishName){
setEnglishName(englishName);
return this;
}
/**
* 设置 英文名称
* @param englishNameList
*/
public SiteQuery englishNameList(List<String> englishNameList){
this.englishNameList = englishNameList;
return this;
}
/**
* 设置 部署模块，逗号分隔
* @param modelIds
......
base-manager/src/main/java/com/mortals/xhx/module/site/model/SiteTreeSelect.java
View file @ d229e043
......@@ -25,6 +25,11 @@ public class SiteTreeSelect implements Serializable {
*/
private String id;
/**
* 站点编码
*/
private String siteCode;
/**
* 节点名称
*/
......@@ -38,6 +43,15 @@ public class SiteTreeSelect implements Serializable {
*/
private Boolean isLeaf;
/**
* 经度
*/
private String longitude;
/**
* 纬度
*/
private String latitude;
/**
* 节点类型
*/
......@@ -76,8 +90,11 @@ public class SiteTreeSelect implements Serializable {
if (!ObjectUtils.isEmpty(collect)) {
this.id = collect.stream().map(item -> item.getId().toString()).collect(Collectors.joining(","));
this.label = collect.stream().map(item -> item.getSiteName()).collect(Collectors.joining(","));
this.siteCode = collect.stream().map(item -> item.getSiteCode()).collect(Collectors.joining(","));
this.type = "site";
this.icon = "el-icon-document";
this.longitude = collect.stream().findFirst().map(item -> item.getLongitude()).orElseGet(() -> "");
this.latitude = collect.stream().findFirst().map(item -> item.getLatitude()).orElseGet(() -> "");
} else {
this.id = entity.getIid();
this.label = entity.getName();
......@@ -103,6 +120,9 @@ public class SiteTreeSelect implements Serializable {
this.type = "site";
this.icon = "el-icon-document";
this.longitude = entity.getLongitude();
this.latitude = entity.getLatitude();
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/model/vo/SiteVo.java
View file @ d229e043
package com.mortals.xhx.module.site.model.vo;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.site.model.SiteEntity;
......@@ -6,16 +7,15 @@ import lombok.Data;
import java.util.ArrayList;
import java.util.List;
/**
* 站点视图对象
*
* @author zxfei
* @date 2022-01-12
*/
* 站点视图对象
*
* @author zxfei
* @date 2022-01-12
*/
@Data
public class SiteVo extends BaseEntityLong {
private List<Long> idList;
/** 站点包含的模块 */
private List<ModelEntity> modelList;
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/SiteService.java
View file @ d229e043
......@@ -49,10 +49,19 @@ public interface SiteService extends ICRUDCacheService<SiteEntity, Long> {
List<SiteEntity> getFlatSitesByAreaCode(String areaCode,Context context);
/**
* 根据Site获取子站点
*
* @param context
* @return
*/
List<SiteEntity> getFlatSitesBySiteId(Long siteId,Context context);
void setSiteTree(List<SiteTreeSelect> list, Context context);
List<SiteEntity> getListAllInfoByQuery(SiteQuery query,Context context) throws AppException;
void changeUrlPath(SiteEntity siteEntity);
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/service/impl/SiteServiceImpl.java
View file @ d229e043
package com.mortals.xhx.module.site.service.impl;
import cn.hutool.core.util.URLUtil;
import com.mortals.framework.ap.GlobalSysInfo;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.framework.util.DataUtil;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.utils.SyncTreeSiteThread;
import com.mortals.xhx.module.area.model.AreaEntity;
import com.mortals.xhx.module.area.model.AreaQuery;
import com.mortals.xhx.module.area.model.AreaTreeSelect;
import com.mortals.xhx.module.area.service.AreaService;
import com.mortals.xhx.module.model.model.ModelEntity;
import com.mortals.xhx.module.model.model.ModelQuery;
import com.mortals.xhx.module.model.service.ModelService;
import com.mortals.xhx.module.site.model.SiteQuery;
import com.mortals.xhx.module.site.model.SiteTreeSelect;
import lombok.Getter;
import com.mortals.xhx.module.site.service.SiteService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.site.dao.SiteDao;
import com.mortals.xhx.module.site.model.SiteEntity;
import com.mortals.xhx.module.site.service.SiteService;
import org.springframework.util.ObjectUtils;
import java.util.*;
import java.util.stream.Collectors;
import static com.mortals.xhx.common.key.Constant.PARAM_SERVER_HTTP_IMAGE_URL;
/**
* SiteService
* 站点 service实现
......@@ -210,27 +206,51 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
throw new AppException(String.format("区域不存在！区域编码：%s", areaCode));
}
List<SiteEntity> siteEntities = this.find(new SiteQuery());
List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
for (SiteEntity siteEntity : siteEntities) {
boolean bool = getSite(areaCode,siteEntity.getAreaCode(), siteList, siteEntity);
boolean bool = getSite(areaCode, siteEntity.getAreaCode(), siteList, siteEntity);
if (bool) continue;
}
return siteList;
}
@Override
public List<SiteEntity> getFlatSitesBySiteId(Long siteId, Context context) {
List<SiteEntity> siteList = new ArrayList<>();
if (ObjectUtils.isEmpty(siteId)) {
throw new AppException("站点Id不能为空！");
}
SiteEntity siteCache = this.getCache(siteId.toString());
if (ObjectUtils.isEmpty(siteCache)) {
throw new AppException("站点不存在，siteId:" + siteId);
}
AreaEntity areaEntity = areaService.getExtCache(siteCache.getAreaCode());
if (ObjectUtils.isEmpty(areaEntity)) {
throw new AppException(String.format("区域不存在！区域编码：%s", siteCache.getAreaCode()));
}
List<SiteEntity> siteEntities = this.find(new SiteQuery()).stream().peek(site -> changeUrlPath(site)).collect(Collectors.toList());
;
for (SiteEntity siteEntity : siteEntities) {
boolean bool = getSite(siteCache.getAreaCode(), siteEntity.getAreaCode(), siteList, siteEntity);
if (bool) continue;
}
return siteList;
}
private boolean getSite(String rootAreaCode,String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
// AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
private boolean getSite(String rootAreaCode, String areaCode, List<SiteEntity> siteList, SiteEntity siteEntity) {
// AreaEntity areaTemp = areaService.getExtCache(siteEntity.getAreaCode());
if (rootAreaCode.equals(areaCode)) {
siteList.add(siteEntity);
log.info("add site:{}", siteEntity.getSiteCode());
return true;
} else {
AreaEntity areaTemp = areaService.getExtCache(areaCode);
if (!ObjectUtils.isEmpty(areaTemp.getPid())) {
if (!ObjectUtils.isEmpty(areaTemp)&&!ObjectUtils.isEmpty(areaTemp.getPid())) {
AreaEntity areaEntity = areaService.selectOne(new AreaQuery().iid(areaTemp.getPid()));
if (!ObjectUtils.isEmpty(areaEntity)) {
return getSite(rootAreaCode,areaEntity.getAreaCode(), siteList, siteEntity);
return getSite(rootAreaCode, areaEntity.getAreaCode(), siteList, siteEntity);
}
}
return false;
......@@ -242,24 +262,24 @@ public class SiteServiceImpl extends AbstractCRUDCacheServiceImpl<SiteDao, SiteE
siteTreeMap.put(context.getUser().getId(), list);
}
@Override
public List<SiteEntity> getListAllInfoByQuery(SiteQuery query, Context context) throws AppException {
List<SiteEntity> list = this.find(query,context);
if(CollectionUtils.isNotEmpty(list)){
list.stream().forEach(item->{
ModelQuery modelQuery = new ModelQuery();
List<String> modelIds = StringUtils.converStr2List(item.getModelIds());
List<Long> ids = modelIds.stream().map(s -> DataUtil.converStr2Long(s.trim(),0)).collect(Collectors.toList());
if(ids.isEmpty()){
ids.add(0l);
}
modelQuery.setIdList(ids);
List<ModelEntity> modelEntityList = modelService.find(modelQuery);
item.setModelList(modelEntityList);
});
protected void findAfter(SiteEntity params, PageInfo pageInfo, Context context, List<SiteEntity> list) throws AppException {
list.stream().forEach(site -> changeUrlPath(site));
super.findAfter(params, pageInfo, context, list);
}
@Override
public void changeUrlPath(SiteEntity siteEntity) {
if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getLogoPath())) {
String domain = GlobalSysInfo.getParamValue(PARAM_SERVER_HTTP_IMAGE_URL, "http://192.168.0.98:11091");
String fullPath = URLUtil.completeUrl(domain, siteEntity.getLogoPath());
siteEntity.setLogoFullPath(fullPath);
}
return list;
if (!ObjectUtils.isEmpty(siteEntity) && !ObjectUtils.isEmpty(siteEntity.getModelIds())) {
List<ModelEntity> collect = Arrays.asList(siteEntity.getModelIds().split(",")).stream().map(modelId -> modelService.get(Long.parseLong(modelId))).collect(Collectors.toList());
siteEntity.setModelList(collect);
}
}
}
\ No newline at end of file
base-manager/src/main/java/com/mortals/xhx/module/site/web/SiteController.java
View file @ d229e043
......@@ -2,7 +2,6 @@ package com.mortals.xhx.module.site.web;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
......@@ -126,7 +125,7 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
Map<String, Object> model = new HashMap<>();
String busiDesc = "根据区域编码查询站点列表" + this.getModuleDesc();
try {
String siteIds = site.getAreaIDList().stream().flatMap(areaId ->
String siteIds = site.getAreaCodeList().stream().flatMap(areaId ->
this.service.getFlatSitesByAreaCode(areaId, getContext()).stream()
).map(item -> item.getId().toString()).distinct().collect(Collectors.joining(","));
......@@ -143,35 +142,38 @@ public class SiteController extends BaseCRUDJsonBodyMappingController<SiteServic
}
/**
* 条件查询，无分页信息
* @param query
* @return
* 根据站点id查询站点列表子集，包含当前站点
*/
@PostMapping({"list/noPage"})
@PostMapping(value = "getFlatSitesBySiteId")
@UnAuth
public Rest<Object> getList(@RequestBody SiteQuery query) {
Rest<Object> ret = new Rest();
Map<String, Object> model = new HashMap();
Context context = this.getContext();
String busiDesc = "查询" + this.getModuleDesc();
int code=1;
public String getFlatSitesBySiteId(@RequestBody SiteQuery site) {
JSONObject jsonObject = new JSONObject();
Map<String, Object> model = new HashMap<>();
String busiDesc = "根据站点id查询站点列表子集" + this.getModuleDesc();
try {
List<SiteEntity> result = this.getService().find(query, context);
model.put("data", result);
model.put("message_info", busiDesc + "成功");
this.recordSysLog(this.request, busiDesc + " 【成功】");
} catch (Exception var9) {
code = -1;
this.doException(this.request, busiDesc, model, var9);
List<SiteEntity> siteEntityList = this.service.getFlatSitesBySiteId(site.getId(), getContext());
recordSysLog(request, busiDesc + " 【成功】");
jsonObject.put(KEY_RESULT_DATA, siteEntityList);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_SUCCESS);
jsonObject.put(KEY_RESULT_MSG, busiDesc+"成功！");
} catch (Exception e) {
log.error("获取异常", e);
jsonObject.put(KEY_RESULT_CODE, VALUE_RESULT_FAILURE);
jsonObject.put(KEY_RESULT_MSG, super.convertException(e));
}
//this.init(model, context);
ret.setCode(code);
ret.setData(model);
//ret.setDict(model.remove("dict"));
ret.setMsg(model.get("message_info") == null ? "" : model.remove("message_info").toString());
return ret;
return jsonObject.toJSONString();
}
@Override
protected int infoAfter(Long id, Map<String, Object> model, SiteEntity entity, Context context) throws AppException {
this.service.changeUrlPath(entity);
return super.infoAfter(id, model, entity, context);
}
public static void main(String[] args) {
//深度克隆
/**
* 包含站点下面的模块以及模块下面的数据统计
* @param query
......
base-manager/src/main/resources/bootstrap.yml
View file @ d229e043
......@@ -11,9 +11,11 @@ spring:
max-file-size: 500MB
max-request-size: 5000MB
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
default-property-inclusion: non_null
serialization:
WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL
# time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss
dao:
exceptiontranslation:
enabled: false
......
base-manager/src/main/resources/sqlmap/module/site/SiteMapper.xml
View file @ d229e043
......@@ -34,6 +34,8 @@
<result property="workday7" column="workday7" />
<result property="level" column="level" />
<result property="building" column="building" />
<result property="logoPath" column="logoPath" />
<result property="englishName" column="englishName" />
<result property="modelIds" column="modelIds" />
<result property="createTime" column="createTime" />
<result property="createUserId" column="createUserId" />
......@@ -46,121 +48,127 @@
<sql id="_columns">
<trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id as id,
a.id,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
a.siteName as siteName,
a.siteName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteCode') or colPickMode == 1 and data.containsKey('siteCode')))">
a.siteCode as siteCode,
a.siteCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaID') or colPickMode == 1 and data.containsKey('areaID')))">
a.areaID as areaID,
a.areaID,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaCode') or colPickMode == 1 and data.containsKey('areaCode')))">
a.areaCode as areaCode,
a.areaCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('areaName') or colPickMode == 1 and data.containsKey('areaName')))">
a.areaName as areaName,
a.areaName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('proCode') or colPickMode == 1 and data.containsKey('proCode')))">
a.proCode as proCode,
a.proCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('cityCode') or colPickMode == 1 and data.containsKey('cityCode')))">
a.cityCode as cityCode,
a.cityCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('districtCode') or colPickMode == 1 and data.containsKey('districtCode')))">
a.districtCode as districtCode,
a.districtCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteIp') or colPickMode == 1 and data.containsKey('siteIp')))">
a.siteIp as siteIp,
a.siteIp,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('sitePort') or colPickMode == 1 and data.containsKey('sitePort')))">
a.sitePort as sitePort,
a.sitePort,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('longitude') or colPickMode == 1 and data.containsKey('longitude')))">
a.longitude as longitude,
a.longitude,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('latitude') or colPickMode == 1 and data.containsKey('latitude')))">
a.latitude as latitude,
a.latitude,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteTel') or colPickMode == 1 and data.containsKey('siteTel')))">
a.siteTel as siteTel,
a.siteTel,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('detailAddress') or colPickMode == 1 and data.containsKey('detailAddress')))">
a.detailAddress as detailAddress,
a.detailAddress,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteRemark') or colPickMode == 1 and data.containsKey('siteRemark')))">
a.siteRemark as siteRemark,
a.siteRemark,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkStartTime') or colPickMode == 1 and data.containsKey('amWorkStartTime')))">
a.amWorkStartTime as amWorkStartTime,
a.amWorkStartTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('amWorkEndTime') or colPickMode == 1 and data.containsKey('amWorkEndTime')))">
a.amWorkEndTime as amWorkEndTime,
a.amWorkEndTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkStartTime') or colPickMode == 1 and data.containsKey('pmWorkStartTime')))">
a.pmWorkStartTime as pmWorkStartTime,
a.pmWorkStartTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('pmWorkEndTime') or colPickMode == 1 and data.containsKey('pmWorkEndTime')))">
a.pmWorkEndTime as pmWorkEndTime,
a.pmWorkEndTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday1') or colPickMode == 1 and data.containsKey('workday1')))">
a.workday1 as workday1,
a.workday1,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday2') or colPickMode == 1 and data.containsKey('workday2')))">
a.workday2 as workday2,
a.workday2,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday3') or colPickMode == 1 and data.containsKey('workday3')))">
a.workday3 as workday3,
a.workday3,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday4') or colPickMode == 1 and data.containsKey('workday4')))">
a.workday4 as workday4,
a.workday4,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday5') or colPickMode == 1 and data.containsKey('workday5')))">
a.workday5 as workday5,
a.workday5,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday6') or colPickMode == 1 and data.containsKey('workday6')))">
a.workday6 as workday6,
a.workday6,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('workday7') or colPickMode == 1 and data.containsKey('workday7')))">
a.workday7 as workday7,
a.workday7,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('level') or colPickMode == 1 and data.containsKey('level')))">
a.level as level,
a.level,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('building') or colPickMode == 1 and data.containsKey('building')))">
a.building as building,
a.building,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logoPath') or colPickMode == 1 and data.containsKey('logoPath')))">
a.logoPath,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('englishName') or colPickMode == 1 and data.containsKey('englishName')))">
a.englishName,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('modelIds') or colPickMode == 1 and data.containsKey('modelIds')))">
a.modelIds as modelIds,
a.modelIds,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime as createTime,
a.createTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId as createUserId,
a.createUserId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime as updateTime,
a.updateTime,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="SiteEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,modelIds,createTime,createUserId,updateTime)
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
VALUES
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{modelIds},#{createTime},#{createUserId},#{updateTime})
(#{siteName},#{siteCode},#{areaID},#{areaCode},#{areaName},#{proCode},#{cityCode},#{districtCode},#{siteIp},#{sitePort},#{longitude},#{latitude},#{siteTel},#{detailAddress},#{siteRemark},#{amWorkStartTime},#{amWorkEndTime},#{pmWorkStartTime},#{pmWorkEndTime},#{workday1},#{workday2},#{workday3},#{workday4},#{workday5},#{workday6},#{workday7},#{level},#{building},#{logoPath},#{englishName},#{modelIds},#{createTime},#{createUserId},#{updateTime})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_sys_site
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,modelIds,createTime,createUserId,updateTime)
(siteName,siteCode,areaID,areaCode,areaName,proCode,cityCode,districtCode,siteIp,sitePort,longitude,latitude,siteTel,detailAddress,siteRemark,amWorkStartTime,amWorkEndTime,pmWorkStartTime,pmWorkEndTime,workday1,workday2,workday3,workday4,workday5,workday6,workday7,level,building,logoPath,englishName,modelIds,createTime,createUserId,updateTime)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
(#{item.siteName},#{item.siteCode},#{item.areaID},#{item.areaCode},#{item.areaName},#{item.proCode},#{item.cityCode},#{item.districtCode},#{item.siteIp},#{item.sitePort},#{item.longitude},#{item.latitude},#{item.siteTel},#{item.detailAddress},#{item.siteRemark},#{item.amWorkStartTime},#{item.amWorkEndTime},#{item.pmWorkStartTime},#{item.pmWorkEndTime},#{item.workday1},#{item.workday2},#{item.workday3},#{item.workday4},#{item.workday5},#{item.workday6},#{item.workday7},#{item.level},#{item.building},#{item.logoPath},#{item.englishName},#{item.modelIds},#{item.createTime},#{item.createUserId},#{item.updateTime})
</foreach>
</insert>
......@@ -281,6 +289,12 @@
<if test="(colPickMode==0 and data.containsKey('buildingIncrement')) or (colPickMode==1 and !data.containsKey('buildingIncrement'))">
a.building=ifnull(a.building,0) + #{data.buildingIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('logoPath')) or (colPickMode==1 and !data.containsKey('logoPath'))">
a.logoPath=#{data.logoPath},
</if>
<if test="(colPickMode==0 and data.containsKey('englishName')) or (colPickMode==1 and !data.containsKey('englishName'))">
a.englishName=#{data.englishName},
</if>
<if test="(colPickMode==0 and data.containsKey('modelIds')) or (colPickMode==1 and !data.containsKey('modelIds'))">
a.modelIds=#{data.modelIds},
</if>
......@@ -549,6 +563,20 @@
</choose>
</foreach>
</trim>
<trim prefix="logoPath=(case" suffix="ELSE logoPath end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('logoPath')) or (colPickMode==1 and !item.containsKey('logoPath'))">
when a.id=#{item.id} then #{item.logoPath}
</if>
</foreach>
</trim>
<trim prefix="englishName=(case" suffix="ELSE englishName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('englishName')) or (colPickMode==1 and !item.containsKey('englishName'))">
when a.id=#{item.id} then #{item.englishName}
</if>
</foreach>
</trim>
<trim prefix="modelIds=(case" suffix="ELSE modelIds end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('modelIds')) or (colPickMode==1 and !item.containsKey('modelIds'))">
......@@ -1179,6 +1207,36 @@
</if>
<if test="conditionParamRef.containsKey('logoPath')">
<if test="conditionParamRef.logoPath != null and conditionParamRef.logoPath != ''">
${_conditionType_} a.logoPath like #{${_conditionParam_}.logoPath}
</if>
<if test="conditionParamRef.logoPath == null">
${_conditionType_} a.logoPath is null
</if>
</if>
<if test="conditionParamRef.containsKey('logoPathList')">
${_conditionType_} a.logoPath in
<foreach collection="conditionParamRef.logoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('englishName')">
<if test="conditionParamRef.englishName != null and conditionParamRef.englishName != ''">
${_conditionType_} a.englishName like #{${_conditionParam_}.englishName}
</if>
<if test="conditionParamRef.englishName == null">
${_conditionType_} a.englishName is null
</if>
</if>
<if test="conditionParamRef.containsKey('englishNameList')">
${_conditionType_} a.englishName in
<foreach collection="conditionParamRef.englishNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('modelIds')">
<if test="conditionParamRef.modelIds != null and conditionParamRef.modelIds != ''">
${_conditionType_} a.modelIds like #{${_conditionParam_}.modelIds}
......@@ -1402,6 +1460,16 @@
<if test='orderCol.building != null and "DESC".equalsIgnoreCase(orderCol.building)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('logoPath')">
a.logoPath
<if test='orderCol.logoPath != null and "DESC".equalsIgnoreCase(orderCol.logoPath)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('englishName')">
a.englishName
<if test='orderCol.englishName != null and "DESC".equalsIgnoreCase(orderCol.englishName)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('modelIds')">
a.modelIds
<if test='orderCol.modelIds != null and "DESC".equalsIgnoreCase(orderCol.modelIds)'>DESC</if>
......
base-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ d229e043
......@@ -6,6 +6,6 @@
"baseUrl": "http://192.168.0.217:17211/base"
},
"base-test": {
"baseUrl": "http://192.168.0.98:11071/zwfw"
"baseUrl": "http://192.168.0.98:11078/base"
}
}
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/common/pdu/user/UserPdu.java
View file @ d229e043
package com.mortals.xhx.common.pdu.user;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.mortals.framework.model.BaseEntityLong;
/**
* 用户信息
* 用户信息业务Pdu对象
*
* @author: zxfei
* @date: 2022/5/30 10:46
* @author zxfei
* @date 2022-07-06
*/
@Data
public class UserPdu implements Serializable {
/**
* 用户Id
*/
private Long id;
public class UserPdu extends BaseEntityLong {
private static final long serialVersionUID = 1L;
/**
* 登录名
......@@ -26,6 +21,10 @@ public class UserPdu implements Serializable {
* 登录密码，使用md5双次加密
*/
private String loginPwd;
private String password;
private String securityCode;
/**
* 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
*/
......@@ -51,7 +50,7 @@ public class UserPdu implements Serializable {
*/
private String qq;
/**
* 用户类型，0：系统用户 1:普通用户 2:工作人员，默认2
* 用户类型(0.系统用户,1.普通用户,2.工作人员)
*/
private Integer userType;
/**
......@@ -59,13 +58,13 @@ public class UserPdu implements Serializable {
*/
private String siteIds;
/**
* 用户状态，0：停用，1：正常，2：冻结，3：销户，4：离职，默认1
* 所属区域code,多个逗号分隔
*/
private Integer status;
private String areaCodes;
/**
* 客户ID
* 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
*/
private Long customerId;
private Integer status;
/**
* 创建用户名称
*/
......@@ -79,4 +78,1326 @@ public class UserPdu implements Serializable {
*/
private String lastLoginAddress;
}
/** 开始 用户ID，主键，自增长 */
private Long idStart;
/** 结束 用户ID，主键，自增长 */
private Long idEnd;
/** 增加 用户ID，主键，自增长 */
private Long idIncrement;
/** 用户ID，主键，自增长列表 */
private List <Long> idList;
/** 登录名 */
private List<String> loginNameList;
/** 登录密码，使用md5双次加密 */
private List<String> loginPwdList;
/** 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录 */
private List<String> loginLimitAddressList;
/** 用户名 */
private List<String> realNameList;
/** 用户手机号 */
private List<String> mobileList;
/** 用户联系电话 */
private List<String> phoneList;
/** 用户邮箱 */
private List<String> emailList;
/** QQ号码 */
private List<String> qqList;
/** 开始 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeStart;
/** 结束 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeEnd;
/** 增加 用户类型(0.系统用户,1.普通用户,2.工作人员) */
private Integer userTypeIncrement;
/** 用户类型(0.系统用户,1.普通用户,2.工作人员)列表 */
private List <Integer> userTypeList;
/** 所属站点id,多个逗号分隔 */
private List<String> siteIdsList;
/** 所属区域code,多个逗号分隔 */
private List<String> areaCodesList;
/** 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusStart;
/** 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusEnd;
/** 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职) */
private Integer statusIncrement;
/** 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)列表 */
private List <Integer> statusList;
/** 开始 创建时间 */
private String createTimeStart;
/** 结束 创建时间 */
private String createTimeEnd;
/** 开始 创建用户 */
private Long createUserIdStart;
/** 结束 创建用户 */
private Long createUserIdEnd;
/** 增加 创建用户 */
private Long createUserIdIncrement;
/** 创建用户列表 */
private List <Long> createUserIdList;
/** 创建用户名称 */
private List<String> createUserNameList;
/** 开始 最后一次登录时间 */
private String lastLoginTimeStart;
/** 结束 最后一次登录时间 */
private String lastLoginTimeEnd;
/** 最后一次登录地址 */
private List<String> lastLoginAddressList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<UserPdu> orConditionList;
/** AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) */
private List<UserPdu> andConditionList;
public UserPdu(){}
/**
* 获取 登录名
* @return String
*/
public String getLoginName(){
return loginName;
}
/**
* 设置 登录名
* @param loginName
*/
public void setLoginName(String loginName){
this.loginName = loginName;
}
/**
* 获取 登录密码，使用md5双次加密
* @return String
*/
public String getLoginPwd(){
return loginPwd;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwd
*/
public void setLoginPwd(String loginPwd){
this.loginPwd = loginPwd;
}
/**
* 获取 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @return String
*/
public String getLoginLimitAddress(){
return loginLimitAddress;
}
/**
* 设置 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @param loginLimitAddress
*/
public void setLoginLimitAddress(String loginLimitAddress){
this.loginLimitAddress = loginLimitAddress;
}
/**
* 获取 用户名
* @return String
*/
public String getRealName(){
return realName;
}
/**
* 设置 用户名
* @param realName
*/
public void setRealName(String realName){
this.realName = realName;
}
/**
* 获取 用户手机号
* @return String
*/
public String getMobile(){
return mobile;
}
/**
* 设置 用户手机号
* @param mobile
*/
public void setMobile(String mobile){
this.mobile = mobile;
}
/**
* 获取 用户联系电话
* @return String
*/
public String getPhone(){
return phone;
}
/**
* 设置 用户联系电话
* @param phone
*/
public void setPhone(String phone){
this.phone = phone;
}
/**
* 获取 用户邮箱
* @return String
*/
public String getEmail(){
return email;
}
/**
* 设置 用户邮箱
* @param email
*/
public void setEmail(String email){
this.email = email;
}
/**
* 获取 QQ号码
* @return String
*/
public String getQq(){
return qq;
}
/**
* 设置 QQ号码
* @param qq
*/
public void setQq(String qq){
this.qq = qq;
}
/**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return Integer
*/
public Integer getUserType(){
return userType;
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userType
*/
public void setUserType(Integer userType){
this.userType = userType;
}
/**
* 获取 所属站点id,多个逗号分隔
* @return String
*/
public String getSiteIds(){
return siteIds;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIds
*/
public void setSiteIds(String siteIds){
this.siteIds = siteIds;
}
/**
* 获取 所属区域code,多个逗号分隔
* @return String
*/
public String getAreaCodes(){
return areaCodes;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodes
*/
public void setAreaCodes(String areaCodes){
this.areaCodes = areaCodes;
}
/**
* 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return Integer
*/
public Integer getStatus(){
return status;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param status
*/
public void setStatus(Integer status){
this.status = status;
}
/**
* 获取 创建用户名称
* @return String
*/
public String getCreateUserName(){
return createUserName;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
public void setCreateUserName(String createUserName){
this.createUserName = createUserName;
}
/**
* 获取 最后一次登录时间
* @return Date
*/
public Date getLastLoginTime(){
return lastLoginTime;
}
/**
* 设置 最后一次登录时间
* @param lastLoginTime
*/
public void setLastLoginTime(Date lastLoginTime){
this.lastLoginTime = lastLoginTime;
}
/**
* 获取 最后一次登录地址
* @return String
*/
public String getLastLoginAddress(){
return lastLoginAddress;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public void setLastLoginAddress(String lastLoginAddress){
this.lastLoginAddress = lastLoginAddress;
}
/**
* 获取 开始 用户ID，主键，自增长
* @return idStart
*/
public Long getIdStart(){
return this.idStart;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param idStart
*/
public void setIdStart(Long idStart){
this.idStart = idStart;
}
/**
* 获取 结束 用户ID，主键，自增长
* @return $idEnd
*/
public Long getIdEnd(){
return this.idEnd;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param idEnd
*/
public void setIdEnd(Long idEnd){
this.idEnd = idEnd;
}
/**
* 获取 增加 用户ID，主键，自增长
* @return idIncrement
*/
public Long getIdIncrement(){
return this.idIncrement;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param idIncrement
*/
public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement;
}
/**
* 获取 用户ID，主键，自增长
* @return idList
*/
public List<Long> getIdList(){
return this.idList;
}
/**
* 设置 用户ID，主键，自增长
* @param idList
*/
public void setIdList(List<Long> idList){
this.idList = idList;
}
/**
* 获取 登录名
* @return loginNameList
*/
public List<String> getLoginNameList(){
return this.loginNameList;
}
/**
* 设置 登录名
* @param loginNameList
*/
public void setLoginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
}
/**
* 获取 登录密码，使用md5双次加密
* @return loginPwdList
*/
public List<String> getLoginPwdList(){
return this.loginPwdList;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public void setLoginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
}
/**
* 获取 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @return loginLimitAddressList
*/
public List<String> getLoginLimitAddressList(){
return this.loginLimitAddressList;
}
/**
* 设置 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @param loginLimitAddressList
*/
public void setLoginLimitAddressList(List<String> loginLimitAddressList){
this.loginLimitAddressList = loginLimitAddressList;
}
/**
* 获取 用户名
* @return realNameList
*/
public List<String> getRealNameList(){
return this.realNameList;
}
/**
* 设置 用户名
* @param realNameList
*/
public void setRealNameList(List<String> realNameList){
this.realNameList = realNameList;
}
/**
* 获取 用户手机号
* @return mobileList
*/
public List<String> getMobileList(){
return this.mobileList;
}
/**
* 设置 用户手机号
* @param mobileList
*/
public void setMobileList(List<String> mobileList){
this.mobileList = mobileList;
}
/**
* 获取 用户联系电话
* @return phoneList
*/
public List<String> getPhoneList(){
return this.phoneList;
}
/**
* 设置 用户联系电话
* @param phoneList
*/
public void setPhoneList(List<String> phoneList){
this.phoneList = phoneList;
}
/**
* 获取 用户邮箱
* @return emailList
*/
public List<String> getEmailList(){
return this.emailList;
}
/**
* 设置 用户邮箱
* @param emailList
*/
public void setEmailList(List<String> emailList){
this.emailList = emailList;
}
/**
* 获取 QQ号码
* @return qqList
*/
public List<String> getQqList(){
return this.qqList;
}
/**
* 设置 QQ号码
* @param qqList
*/
public void setQqList(List<String> qqList){
this.qqList = qqList;
}
/**
* 获取 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeStart
*/
public Integer getUserTypeStart(){
return this.userTypeStart;
}
/**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeStart
*/
public void setUserTypeStart(Integer userTypeStart){
this.userTypeStart = userTypeStart;
}
/**
* 获取 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return $userTypeEnd
*/
public Integer getUserTypeEnd(){
return this.userTypeEnd;
}
/**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeEnd
*/
public void setUserTypeEnd(Integer userTypeEnd){
this.userTypeEnd = userTypeEnd;
}
/**
* 获取 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeIncrement
*/
public Integer getUserTypeIncrement(){
return this.userTypeIncrement;
}
/**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeIncrement
*/
public void setUserTypeIncrement(Integer userTypeIncrement){
this.userTypeIncrement = userTypeIncrement;
}
/**
* 获取 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @return userTypeList
*/
public List<Integer> getUserTypeList(){
return this.userTypeList;
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeList
*/
public void setUserTypeList(List<Integer> userTypeList){
this.userTypeList = userTypeList;
}
/**
* 获取 所属站点id,多个逗号分隔
* @return siteIdsList
*/
public List<String> getSiteIdsList(){
return this.siteIdsList;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public void setSiteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
}
/**
* 获取 所属区域code,多个逗号分隔
* @return areaCodesList
*/
public List<String> getAreaCodesList(){
return this.areaCodesList;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public void setAreaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
}
/**
* 获取 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusStart
*/
public Integer getStatusStart(){
return this.statusStart;
}
/**
* 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusStart
*/
public void setStatusStart(Integer statusStart){
this.statusStart = statusStart;
}
/**
* 获取 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return $statusEnd
*/
public Integer getStatusEnd(){
return this.statusEnd;
}
/**
* 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusEnd
*/
public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
}
/**
* 获取 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusIncrement
*/
public Integer getStatusIncrement(){
return this.statusIncrement;
}
/**
* 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusIncrement
*/
public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
}
/**
* 获取 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @return statusList
*/
public List<Integer> getStatusList(){
return this.statusList;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusList
*/
public void setStatusList(List<Integer> statusList){
this.statusList = statusList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
*/
public String getCreateTimeStart(){
return this.createTimeStart;
}
/**
* 设置 开始 创建时间
* @param createTimeStart
*/
public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart;
}
/**
* 获取 结束 创建时间
* @return createTimeEnd
*/
public String getCreateTimeEnd(){
return this.createTimeEnd;
}
/**
* 设置 结束 创建时间
* @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){
return this.createUserIdStart;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
}
/**
* 获取 结束 创建用户
* @return $createUserIdEnd
*/
public Long getCreateUserIdEnd(){
return this.createUserIdEnd;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
}
/**
* 获取 增加 创建用户
* @return createUserIdIncrement
*/
public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
}
/**
* 获取 创建用户
* @return createUserIdList
*/
public List<Long> getCreateUserIdList(){
return this.createUserIdList;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
}
/**
* 获取 创建用户名称
* @return createUserNameList
*/
public List<String> getCreateUserNameList(){
return this.createUserNameList;
}
/**
* 设置 创建用户名称
* @param createUserNameList
*/
public void setCreateUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList;
}
/**
* 获取 开始 最后一次登录时间
* @return lastLoginTimeStart
*/
public String getLastLoginTimeStart(){
return this.lastLoginTimeStart;
}
/**
* 设置 开始 最后一次登录时间
* @param lastLoginTimeStart
*/
public void setLastLoginTimeStart(String lastLoginTimeStart){
this.lastLoginTimeStart = lastLoginTimeStart;
}
/**
* 获取 结束 最后一次登录时间
* @return lastLoginTimeEnd
*/
public String getLastLoginTimeEnd(){
return this.lastLoginTimeEnd;
}
/**
* 设置 结束 最后一次登录时间
* @param lastLoginTimeEnd
*/
public void setLastLoginTimeEnd(String lastLoginTimeEnd){
this.lastLoginTimeEnd = lastLoginTimeEnd;
}
/**
* 获取 最后一次登录地址
* @return lastLoginAddressList
*/
public List<String> getLastLoginAddressList(){
return this.lastLoginAddressList;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public void setLastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
}
/**
* 设置 用户ID，主键，自增长
* @param id
*/
public UserPdu id(Long id){
setId(id);
return this;
}
/**
* 设置 开始 用户ID，主键，自增长
* @param idStart
*/
public UserPdu idStart(Long idStart){
this.idStart = idStart;
return this;
}
/**
* 设置 结束 用户ID，主键，自增长
* @param idEnd
*/
public UserPdu idEnd(Long idEnd){
this.idEnd = idEnd;
return this;
}
/**
* 设置 增加 用户ID，主键，自增长
* @param idIncrement
*/
public UserPdu idIncrement(Long idIncrement){
this.idIncrement = idIncrement;
return this;
}
/**
* 设置 用户ID，主键，自增长
* @param idList
*/
public UserPdu idList(List<Long> idList){
this.idList = idList;
return this;
}
/**
* 设置 登录名
* @param loginName
*/
public UserPdu loginName(String loginName){
setLoginName(loginName);
return this;
}
/**
* 设置 登录名
* @param loginNameList
*/
public UserPdu loginNameList(List<String> loginNameList){
this.loginNameList = loginNameList;
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwd
*/
public UserPdu loginPwd(String loginPwd){
setLoginPwd(loginPwd);
return this;
}
/**
* 设置 登录密码，使用md5双次加密
* @param loginPwdList
*/
public UserPdu loginPwdList(List<String> loginPwdList){
this.loginPwdList = loginPwdList;
return this;
}
/**
* 设置 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @param loginLimitAddress
*/
public UserPdu loginLimitAddress(String loginLimitAddress){
setLoginLimitAddress(loginLimitAddress);
return this;
}
/**
* 设置 登录限制地址，多个IP地址用逗号分隔，可以使用IP段匹配，如：172.17.*非空：则只能该值内的IP可以登录
* @param loginLimitAddressList
*/
public UserPdu loginLimitAddressList(List<String> loginLimitAddressList){
this.loginLimitAddressList = loginLimitAddressList;
return this;
}
/**
* 设置 用户名
* @param realName
*/
public UserPdu realName(String realName){
setRealName(realName);
return this;
}
/**
* 设置 用户名
* @param realNameList
*/
public UserPdu realNameList(List<String> realNameList){
this.realNameList = realNameList;
return this;
}
/**
* 设置 用户手机号
* @param mobile
*/
public UserPdu mobile(String mobile){
setMobile(mobile);
return this;
}
/**
* 设置 用户手机号
* @param mobileList
*/
public UserPdu mobileList(List<String> mobileList){
this.mobileList = mobileList;
return this;
}
/**
* 设置 用户联系电话
* @param phone
*/
public UserPdu phone(String phone){
setPhone(phone);
return this;
}
/**
* 设置 用户联系电话
* @param phoneList
*/
public UserPdu phoneList(List<String> phoneList){
this.phoneList = phoneList;
return this;
}
/**
* 设置 用户邮箱
* @param email
*/
public UserPdu email(String email){
setEmail(email);
return this;
}
/**
* 设置 用户邮箱
* @param emailList
*/
public UserPdu emailList(List<String> emailList){
this.emailList = emailList;
return this;
}
/**
* 设置 QQ号码
* @param qq
*/
public UserPdu qq(String qq){
setQq(qq);
return this;
}
/**
* 设置 QQ号码
* @param qqList
*/
public UserPdu qqList(List<String> qqList){
this.qqList = qqList;
return this;
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userType
*/
public UserPdu userType(Integer userType){
setUserType(userType);
return this;
}
/**
* 设置 开始 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeStart
*/
public UserPdu userTypeStart(Integer userTypeStart){
this.userTypeStart = userTypeStart;
return this;
}
/**
* 设置 结束 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeEnd
*/
public UserPdu userTypeEnd(Integer userTypeEnd){
this.userTypeEnd = userTypeEnd;
return this;
}
/**
* 设置 增加 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeIncrement
*/
public UserPdu userTypeIncrement(Integer userTypeIncrement){
this.userTypeIncrement = userTypeIncrement;
return this;
}
/**
* 设置 用户类型(0.系统用户,1.普通用户,2.工作人员)
* @param userTypeList
*/
public UserPdu userTypeList(List<Integer> userTypeList){
this.userTypeList = userTypeList;
return this;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIds
*/
public UserPdu siteIds(String siteIds){
setSiteIds(siteIds);
return this;
}
/**
* 设置 所属站点id,多个逗号分隔
* @param siteIdsList
*/
public UserPdu siteIdsList(List<String> siteIdsList){
this.siteIdsList = siteIdsList;
return this;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodes
*/
public UserPdu areaCodes(String areaCodes){
setAreaCodes(areaCodes);
return this;
}
/**
* 设置 所属区域code,多个逗号分隔
* @param areaCodesList
*/
public UserPdu areaCodesList(List<String> areaCodesList){
this.areaCodesList = areaCodesList;
return this;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param status
*/
public UserPdu status(Integer status){
setStatus(status);
return this;
}
/**
* 设置 开始 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusStart
*/
public UserPdu statusStart(Integer statusStart){
this.statusStart = statusStart;
return this;
}
/**
* 设置 结束 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusEnd
*/
public UserPdu statusEnd(Integer statusEnd){
this.statusEnd = statusEnd;
return this;
}
/**
* 设置 增加 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusIncrement
*/
public UserPdu statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement;
return this;
}
/**
* 设置 用户状态(0.停用，1.正常，2.冻结，3.销户，4.离职)
* @param statusList
*/
public UserPdu statusList(List<Integer> statusList){
this.statusList = statusList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public UserPdu createUserId(Long createUserId){
setCreateUserId(createUserId);
return this;
}
/**
* 设置 开始 创建用户
* @param createUserIdStart
*/
public UserPdu createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart;
return this;
}
/**
* 设置 结束 创建用户
* @param createUserIdEnd
*/
public UserPdu createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd;
return this;
}
/**
* 设置 增加 创建用户
* @param createUserIdIncrement
*/
public UserPdu createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement;
return this;
}
/**
* 设置 创建用户
* @param createUserIdList
*/
public UserPdu createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList;
return this;
}
/**
* 设置 创建用户名称
* @param createUserName
*/
public UserPdu createUserName(String createUserName){
setCreateUserName(createUserName);
return this;
}
/**
* 设置 创建用户名称
* @param createUserNameList
*/
public UserPdu createUserNameList(List<String> createUserNameList){
this.createUserNameList = createUserNameList;
return this;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddress
*/
public UserPdu lastLoginAddress(String lastLoginAddress){
setLastLoginAddress(lastLoginAddress);
return this;
}
/**
* 设置 最后一次登录地址
* @param lastLoginAddressList
*/
public UserPdu lastLoginAddressList(List<String> lastLoginAddressList){
this.lastLoginAddressList = lastLoginAddressList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList
*/
public List<UserPdu> getOrConditionList(){
return this.orConditionList;
}
/**
* 设置 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @param orConditionList
*/
public void setOrConditionList(List<UserPdu> orConditionList){
this.orConditionList = orConditionList;
}
/**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList
*/
public List<UserPdu> getAndConditionList(){
return this.andConditionList;
}
/**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList
*/
public void setAndConditionList(List<UserPdu> andConditionList){
this.andConditionList = andConditionList;
}
public String getSecurityCode() {
return securityCode;
}
public void setSecurityCode(String securityCode) {
this.securityCode = securityCode;
}
public String getPassword() {
return password;
}
public void setPassword(String password) {
this.password = password;
}
@Override
public int hashCode() {
return this.getId().hashCode();
}
@Override
public boolean equals(Object obj) {
if (obj == null) return false;
if (obj instanceof UserPdu) {
UserPdu tmp = (UserPdu) obj;
if (this.getId() == tmp.getId()) {
return true;
}
}
return false;
}
public void initAttrValue(){
this.loginName = "";
this.loginPwd = "";
this.loginLimitAddress = "";
this.realName = "";
this.mobile = "";
this.phone = "";
this.email = "";
this.qq = "";
this.userType = null;
this.siteIds = "";
this.areaCodes = "";
this.status = 1;
this.createUserName = "";
this.lastLoginTime = null;
this.lastLoginAddress = "";
}
}
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/feign/area/IApiAreaFeign.java
View file @ d229e043
......@@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
* @author: zxfei
* @date: 2022/5/30 10:40
*/
@FeignClient(name = "base-manager", path = "/zwfw", fallback = AreaFeignFallbackFactory.class)
@FeignClient(name = "base-manager", path = "/base", fallback = AreaFeignFallbackFactory.class)
public interface IApiAreaFeign extends IFeign {
......
common-lib/src/main/java/com/mortals/xhx/feign/user/IApiUserFeign.java deleted 100644 → 0
View file @ aebcbd90
package com.mortals.xhx.feign.user;
import com.alibaba.fastjson.JSON;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.feign.IFeign;
import com.mortals.xhx.feign.req.BaseUserQuery;
import com.mortals.xhx.feign.req.BaseUserReq;
import com.mortals.xhx.feign.rsp.ApiResp;
import com.mortals.xhx.feign.rsp.UserRsp;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
/**
* 用户服务
*
* @author: zxfei
* @date: 2022/5/30 10:40
*/
@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
public interface IApiUserFeign extends IFeign {
/**
* 查询用户列表
*
* @param req
* @return
*/
@PostMapping("/api/user/findAllUser")
ApiResp<UserRsp> findAllUser(@RequestBody BaseUserReq<BaseUserQuery> req);
}
@Slf4j
@Component
class UserFeignFallbackFactory implements FallbackFactory<IApiUserFeign> {
@Override
public IApiUserFeign create(Throwable t) {
return new IApiUserFeign() {
@Override
public ApiResp<UserRsp> findAllUser(BaseUserReq<BaseUserQuery> req) {
ApiResp<UserRsp> failResp = new ApiResp<>();
failResp.setCode(ApiRespCodeEnum.FAILED.getValue());
failResp.setMsg("暂时无法获取站点列表，请稍后再试!");
return failResp;
}
};
}
}
\ No newline at end of file
common-lib/src/main/java/com/mortals/xhx/feign/user/IUserFeign.java 0 → 100644
View file @ d229e043
package com.mortals.xhx.feign.user;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest;
import com.mortals.xhx.common.pdu.user.UserPdu;
import com.mortals.xhx.feign.IFeign;
import feign.hystrix.FallbackFactory;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.*;
/**
* 用户信息业务 Feign接口
* @author zxfei
* @date 2022-07-06
*/
@FeignClient(name = "portal-manager", path = "/zwfw", fallback = UserFeignFallbackFactory.class)
public interface IUserFeign extends IFeign {
/**
* 查看用户信息业务列表
*
* @param userPdu
* @return
*/
@PostMapping(value = "/user/list")
String list(@RequestBody UserPdu userPdu);
/**
* 查看用户信息业务
*
* @param id
* @return
*/
@GetMapping(value = "/user/info")
String info(@RequestParam(value = "id") Long id);
/**
* 删除用户信息业务
*
* @param ids
* @return
*/
@GetMapping(value = "/user/delete")
String delete(Long[] ids,@RequestHeader("Authorization") String authorization);
/**
* 用户信息业务保存更新
*
* @param userPdu
* @return
*/
@PostMapping(value = "/user/save")
String save(@RequestBody UserPdu userPdu,@RequestHeader("Authorization") String authorization);
/**
* 查询用户列表
*
* @param userPdu
* @return
*/
@PostMapping("/api/user/findAllUser")
String findAllUser(@RequestBody UserPdu userPdu);
}
@Slf4j
@Component
class UserFeignFallbackFactory implements FallbackFactory<IUserFeign> {
@Override
public IUserFeign create(Throwable t) {
return new IUserFeign() {
@Override
public String list(UserPdu userPdu) {
return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!"));
}
@Override
public String info(Long id) {
return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务详细，请稍后再试!"));
}
@Override
public String delete(Long[] ids, String authorization) {
return JSON.toJSONString(Rest.fail("暂时无法删除用户信息业务，请稍后再试!"));
}
@Override
public String save(UserPdu userPdu, String authorization) {
return JSON.toJSONString(Rest.fail("暂时无法保存用户信息业务，请稍后再试!"));
}
@Override
public String findAllUser(UserPdu userPdu) {
return JSON.toJSONString(Rest.fail("暂时无法获取用户信息业务列表，请稍后再试!"));
}
};
}
}
portal-manager/src/main/java/com/mortals/xhx/base/framework/interceptor/AuthUserInterceptor.java
View file @ d229e043
package com.mortals.xhx.base.framework.interceptor;
import com.alibaba.druid.support.http.ResourceServlet;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.service.IAuthTokenService;
......@@ -13,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.ObjectUtils;
import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.resource.ResourceHttpRequestHandler;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
......@@ -50,6 +52,8 @@ public class AuthUserInterceptor extends BaseInterceptor {
//取消校验
return true;
}
}else if(handler instanceof ResourceHttpRequestHandler){
return true;
}
String uri = request.getServletPath();
//校验配置的请求路径是否需要检查权限
......
portal-manager/src/main/java/com/mortals/xhx/busiz/web/UserApiController.java
View file @ d229e043
package com.mortals.xhx.busiz.web;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.common.Rest;
import com.mortals.framework.model.PageInfo;
import com.mortals.framework.model.Result;
import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.code.YesNoEnum;
......@@ -10,6 +13,7 @@ import com.mortals.xhx.common.utils.BeanUtil;
import com.mortals.xhx.feign.req.BaseUserQuery;
import com.mortals.xhx.feign.req.BaseUserReq;
import com.mortals.xhx.feign.rsp.UserRsp;
import com.mortals.xhx.module.user.model.UserEntity;
import com.mortals.xhx.module.user.model.UserQuery;
import com.mortals.xhx.module.user.service.UserService;
import lombok.extern.apachecommons.CommonsLog;
......@@ -21,9 +25,13 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import static com.mortals.framework.ap.SysConstains.PAGEINFO_KEY;
/**
* 用户对外服务接口
*
......@@ -39,42 +47,32 @@ public class UserApiController {
/**
* 用户列表
* @param req
* @param userPdu
* @return
*/
@PostMapping("/findAllUser")
public ApiResp<UserRsp> findAllUser(@RequestBody BaseUserReq<BaseUserQuery> req) {
ApiResp<UserRsp> rsp = new ApiResp<>();
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
public String findAllUser(@RequestBody UserEntity userPdu) {
Rest<Object> rest = Rest.ok("获取列表成功");
PageInfo page = new PageInfo();
page.setPrePageResult(-1);
UserRsp userRsp = new UserRsp();
try {
if (!ObjectUtils.isEmpty(req.getPage())) {
page.setPrePageResult(req.getPage().getPer() == 0 ? -1 : req.getPage().getPer());
page.setCurrPage(req.getPage().getSize() == 0 ? 1 : req.getPage().getSize());
if (!ObjectUtils.isEmpty(userPdu.getPage())) {
page.setPrePageResult(userPdu.getSize() );
page.setCurrPage(userPdu.getPage());
}
Result<UserEntity> result = userService.find(userPdu, page, null);
Map<String, Object> model = new HashMap<>();
model.put("data", result.getList());
model.put(PAGEINFO_KEY, result.getPageInfo());
rest.setData(model);
UserQuery userQuery = new UserQuery();
BeanUtils.copyProperties(req.getQuery(), userQuery, BeanUtil.getNullPropertyNames(req.getQuery()));
List<UserPdu> collect = userService.find(userQuery, page, null).getList().stream().map(item -> {
UserPdu userPdu = new UserPdu();
BeanUtils.copyProperties(item, userPdu, BeanUtil.getNullPropertyNames(item));
return userPdu;
}).collect(Collectors.toList());
userRsp.setList(collect);
userRsp.setPage(req.getPage());
} catch (Exception e) {
log.error("获取用户列表异常", e);
rsp.setCode(YesNoEnum.NO.getValue());
rsp.setMsg(e.getMessage());
return rsp;
rest.setCode(YesNoEnum.NO.getValue());
rest.setMsg(e.getMessage());
}
rsp.setData(userRsp);
log.info("响应【用户列表】【响应体】--> " + JSONObject.toJSONString(rsp));
return rsp;
log.info("响应【用户列表】【响应体】--> " + JSONObject.toJSONString(rest));
return JSON.toJSONString(rest);
}
}
portal-manager/src/main/java/com/mortals/xhx/module/user/web/UserController.java
View file @ d229e043
......@@ -96,6 +96,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
}
@Override
@UnAuth
public Rest<Object> list(UserEntity query) {
Map<String, Object> model = new HashMap();
Rest<Object> ret = new Rest<>();
......@@ -108,6 +109,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
Result result = this.getService().findExt(query, pageInfo, context);
model.put("data", result.getList());
model.put("pageInfo", result.getPageInfo());
super.parsePageInfo(model,result.getPageInfo());
this.parsePageInfo(model, result.getPageInfo());
code = this.doListAfter(query, model, context);
this.recordSysLog(this.request, busiDesc + " 【成功】");
......@@ -119,7 +121,7 @@ public class UserController extends BaseCRUDJsonBodyMappingController<UserServic
this.init(model, context);
ret.setCode(code);
ret.setData(model);
ret.setDict(model.get(KEY_RESULT_DICT)==null?null:(Map<String,Object>)model.remove(KEY_RESULT_DICT));
ret.setDict(model.get(KEY_RESULT_DICT));
ret.setMsg(model.get(MESSAGE_INFO)==null?"":model.remove(MESSAGE_INFO).toString());
return ret;
}
......
portal-manager/src/main/resources/bootstrap.yml
View file @ d229e043
......@@ -11,8 +11,11 @@ spring:
max-file-size: 500MB
max-request-size: 5000MB
jackson:
date-format: yyyy-MM-dd HH:mm:ss
time-zone: GMT+8
serialization:
WRITE_DATES_AS_TIMESTAMPS: true
default-property-inclusion: NON_NULL
# time-zone: GMT+8
# date-format: yyyy-MM-dd HH:mm:ss
dao:
exceptiontranslation:
enabled: false
......
portal-manager/src/test/java/com/mortals/httpclient/http-client.env.json
View file @ d229e043
......@@ -6,6 +6,6 @@
"baseUrl": "http://192.168.0.217:17212/zwfw"
},
"portal-test": {
"baseUrl": "http://192.168.0.98:11072/zwfw"
"baseUrl": "http://192.168.0.98:11078/zwfw"
}
}
\ No newline at end of file
smart-gateway/pom.xml
View file @ d229e043
......@@ -22,7 +22,7 @@
</activation>
<properties>
<profiles.active>develop</profiles.active>
<profiles.server.port>17213</profiles.server.port>
<profiles.server.port>17214</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
......@@ -37,7 +37,7 @@
<id>test</id>
<properties>
<profiles.active>test</profiles.active>
<profiles.server.port>17213</profiles.server.port>
<profiles.server.port>17214</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
......@@ -52,7 +52,7 @@
<id>product</id>
<properties>
<profiles.active>product</profiles.active>
<profiles.server.port>17213</profiles.server.port>
<profiles.server.port>17214</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.kafka.brokers>192.168.0.100:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.100</profiles.rabbitmq.host>
......@@ -156,7 +156,7 @@
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<jvmArguments>-Dfile.encoding=UTF-8</jvmArguments>
<outputDirectory>${project.parent.basedir}/dist/${project.parent.artifactId}/boot</outputDirectory>
<outputDirectory>${project.basedir}/dist/${project.artifactId}/boot</outputDirectory>
<layout>ZIP</layout>
</configuration>
</plugin>
......
smart-gateway/src/main/bin/shutdown.sh
View file @ d229e043
#! /bin/sh
PORT="17211"
PORT="@profiles.server.port@"
BASEDIR=`dirname $0`
BASEDIR=`(cd "$BASEDIR"; pwd)`
PROJECT_NAME="appbuild-manager"
PROJECT_NAME="@project.artifactId@"
MAIN_CLASS="$PROJECT_NAME";
if [ ! -n "$PORT" ]; then
......@@ -19,7 +19,7 @@ fi
echo "stoping application $PROJECT_NAME......"
kill ${pid}
kill -9 ${pid}
echo "Send shutdown request to Server $PROJECT_NAME OK"
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/config/GatewayConfig.java
View file @ d229e043
package com.mortals.xhx.base.framework.config;
import com.mortals.xhx.base.framework.handler.SentinelFallbackHandler;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.Ordered;
......@@ -18,11 +17,11 @@ import org.springframework.security.web.server.SecurityWebFilterChain;
@Configuration
@EnableWebFluxSecurity
public class GatewayConfig {
@Bean
@Order(Ordered.HIGHEST_PRECEDENCE)
public SentinelFallbackHandler sentinelGatewayExceptionHandler() {
return new SentinelFallbackHandler();
}
// @Bean
// @Order(Ordered.HIGHEST_PRECEDENCE)
// public SentinelFallbackHandler sentinelGatewayExceptionHandler() {
// return new SentinelFallbackHandler();
// }
@Bean
public SecurityWebFilterChain springSecurityFilterChain(ServerHttpSecurity http) {
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/AuthFilter.java
View file @ d229e043
......@@ -15,7 +15,7 @@ import org.springframework.context.annotation.Configuration;
* @author: zxfei
* @date: 2022/6/17 15:18
*/
@Configuration
//@Configuration
public class AuthFilter {
/**
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/BlackListUrlFilter.java
View file @ d229e043
......@@ -16,7 +16,7 @@ import java.util.regex.Pattern;
* @author: zxfei
* @date: 2022/6/20 16:49
*/
@Component
//@Component
public class BlackListUrlFilter extends AbstractGatewayFilterFactory<BlackListUrlFilter.Config> {
@Override
public GatewayFilter apply(Config config) {
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/ForwardAuthFilter.java
View file @ d229e043
......@@ -14,7 +14,7 @@ import reactor.core.publisher.Mono;
* @author: zxfei
* @date: 2022/6/20 16:57
*/
@Component
//@Component
public class ForwardAuthFilter implements GlobalFilter {
@Override
public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain) {
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalCacheRequestFilter.java
View file @ d229e043
......@@ -15,7 +15,7 @@ import reactor.core.publisher.Mono;
* @author: zxfei
* @date: 2022/6/20 16:59
*/
@Component
//@Component
public class GlobalCacheRequestFilter implements GlobalFilter, Ordered {
@Override
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/filter/GlobalLogFilter.java
View file @ d229e043
......@@ -32,7 +32,7 @@ import static org.springframework.cloud.gateway.support.ServerWebExchangeUtils.G
* @date: 2022/6/20 17:00
*/
@Slf4j
@Component
//@Component
public class GlobalLogFilter implements GlobalFilter, Ordered {
@Autowired
......
smart-gateway/src/main/java/com/mortals/xhx/base/framework/handler/SentinelFallbackHandler.java
View file @ d229e043
......@@ -19,18 +19,22 @@ public class SentinelFallbackHandler implements WebExceptionHandler {
@Override
public Mono<Void> handle(ServerWebExchange exchange, Throwable ex) {
ex.printStackTrace();
// TODO: 2022/7/6
return Mono.error(ex);
/* ex.printStackTrace();
if (exchange.getResponse().isCommitted()) {
return Mono.error(ex);
}
return null;
/* if (!BlockException.isBlockException(ex)) {
if (!BlockException.isBlockException(ex)) {
return Mono.error(ex);
}
return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange));*/
return handleBlockedRequest(exchange, ex).flatMap(response -> writeResponse(response, exchange));
*/
}
/* private Mono<ServerResponse> handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) {
/*private Mono<ServerResponse> handleBlockedRequest(ServerWebExchange exchange, Throwable throwable) {
return GatewayCallbackManager.getBlockHandler().handleRequest(exchange, throwable);
}*/
}
smart-gateway/src/main/java/com/mortals/xhx/base/framework/service/impl/ValidateCodeServiceImpl.java
View file @ d229e043
......@@ -98,7 +98,6 @@ public class ValidateCodeServiceImpl implements ValidateCodeService {
String verifyKey = Constant.CAPTCHA_CODE_KEY + uuid;
String captcha = cacheService.get(verifyKey);
cacheService.del(verifyKey);
// RedisUtils.deleteObject(verifyKey);
if (!code.equalsIgnoreCase(captcha)) {
throw new CaptchaException();
}
......
smart-gateway/src/main/resources/bootstrap.yml
View file @ d229e043
......@@ -16,6 +16,14 @@ spring:
cloud:
# 网关配置
gateway:
globalcors:
cors-configurations:
'[/**]':
allowedOrigins: "*"
allowedHeaders: "*"
allowedMethods: "*"
default-filters:
- DedupeResponseHeader=Vary Access-Control-Allow-Origin Access-Control-Allow-Credentials, RETAIN_FIRST
httpclient:
connect-timeout: 1000
response-timeout: 5s
......@@ -34,6 +42,17 @@ spring:
- Path=/base/**
# filters:
# - StripPrefix=1
# 门户服务
- id: portal-manager
# uri: http://127.0.0.1:17211
uri: lb://portal-manager
predicates:
- Path=/zwfw/**
# 设备管理服务
- id: device-manager
uri: lb://device-manager
predicates:
- Path=/m/**
nacos:
# Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类
discovery:
......
smart-gateway/src/main/resources/logback-spring.xml
View file @ d229e043
<?xml version="1.0" encoding="utf-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
<!-- 定义变量后，可以使“${}”来使用变量 source来源为spring 上下文信息 -->
<springProperty scope="context" name="springApplicationName" source="spring.application.name"/>
<springProperty scope="context" name="serverPort" source="server.port"/>
<springProperty scope="context" name="logFilePath" source="application.log.path" defaultValue="/mortals/www.iot.com/logs" />
<springProperty scope="context" name="logFilePath" source="application.log.path" defaultValue="/mortals/app/logs" />
<springProperty scope="context" name="logLevel" source="application.log.level" defaultValue="INFO" />
<property name="logFilePath" value="${logFilePath:-/mortals/www.iot.com/logs}" />
<property name="logLevel" value="${logLevel:-INFO}" />
<!-- appender用来格式化日志输出节点，有俩个属性name和class，class用来指定哪种输出策略，常用就是控制台输出策略和文件输出策略 -->
<!-- 控制台输出策略-->
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
<!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
</encoder>
</appender>
<!-- 文件输出策略-->
<appender name="fileInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
</encoder>
<file>${logFilePath}/${springApplicationName:-default}/${serverPort:-default}-info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<!-- 文件保存策略-->
<fileNamePattern>${logFilePath}/${springApplicationName:-default}/${serverPort:-default}-info.log.%d{yyyyMMdd}</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>15</MaxHistory>
</rollingPolicy>
</appender>
<!-- 异常文件输出策略-->
<appender name="fileError" class="ch.qos.logback.core.rolling.RollingFileAppender">
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>ERROR</level>
</filter>
<encoder>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
<pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%-5level] [%X{traceId}] [%thread] [%.50c\(%L\)] - %msg%n</pattern>
</encoder>
<file>${logFilePath}/${springApplicationName:-default}/${serverPort:-default}-error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logFilePath}/${springApplicationName:-default}/${serverPort:-default}-error.log.%d{yyyyMMdd}</fileNamePattern>
<!--日志文件保留天数-->
<MaxHistory>15</MaxHistory>
</rollingPolicy>
</appender>
<root level="${logLevel}">
<appender-ref ref="console"/>
<appender-ref ref="fileInfo"/>
<appender-ref ref="fileError"/>
</root>
<!--TRACE < DEBUG < INFO < WARN < ERROR < FATAL -->
<!--用来设置某一个包或者具体的某一个类的日志打印级别、以及指定<appender>。<logger>仅有一个name属性，一个可选的level和一个可选的additivity属性。-->
<!-- name 用来指定受此loger约束的某一个包或者具体的某一个类-->
<!-- level 用来设置打印级别，大小写无关：TRACE, DEBUG, INFO, WARN, ERROR, ALL 和 OFF，还有一个特俗值INHERITED或者同义词NULL，代表强制执行上级的级别。如果未设置此属性，那么当前logger将会继承上级的级别-->
<!-- additivity 是否向上级logger传递打印信息。默认是true。false：表示只用当前logger的appender-ref。true：表示当前logger的appender-ref和rootLogger的appender-ref都有效。-->
<logger name="com.mortals" level="INFO" additivity="false">
<appender-ref ref="console"/>
<appender-ref ref="fileInfo"/>
<appender-ref ref="fileError"/>
</logger>
</configuration>
\ 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