jianjun
4 years ago
175 changed files with 2915 additions and 218 deletions
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetAdminOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetAdminOpenFeignClientFallbackFactory implements FallbackFactory<EpmetAdminOpenFeignClient> { |
|||
|
|||
private EpmetAdminOpenFeignClientFallback fallback = new EpmetAdminOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public EpmetAdminOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -1,45 +1,45 @@ |
|||
/** |
|||
* Copyright (c) 2018 人人开源 All rights reserved. |
|||
* <p> |
|||
* https://www.renren.io
|
|||
* <p> |
|||
* 版权所有，侵权必究！ |
|||
*/ |
|||
|
|||
package com.epmet.commons.tools.aspect; |
|||
|
|||
import com.epmet.commons.tools.constant.ThreadLocalConstant; |
|||
import com.epmet.commons.tools.dto.form.LoginUserInfoResultDTO; |
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import org.aspectj.lang.JoinPoint; |
|||
import org.aspectj.lang.annotation.Aspect; |
|||
import org.aspectj.lang.annotation.Before; |
|||
import org.slf4j.Logger; |
|||
import org.slf4j.LoggerFactory; |
|||
import org.springframework.core.annotation.Order; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* 每次请求，清理ThreadLocal线程中的变量 |
|||
* @Author wxz |
|||
* @Description |
|||
* @Date 2020/4/23 16:16 |
|||
**/ |
|||
@Aspect |
|||
@Component |
|||
@Order(1) |
|||
public class ThreadLocalInitAspect { |
|||
|
|||
private static final Logger log = LoggerFactory.getLogger(ThreadLocalInitAspect.class); |
|||
|
|||
@Before(value = "execution(* com.epmet.controller.*Controller*.*(..)) ") |
|||
public void before(JoinPoint point) throws Throwable { |
|||
// 清理权限过滤中的变量残留
|
|||
try { |
|||
ThreadLocalConstant.sqlFilter.remove(); |
|||
ThreadLocalConstant.requirePermissionTl.remove(); |
|||
} catch (Exception e) { |
|||
log.error("清理sqlFilter缓存失败:{}", ExceptionUtils.getErrorStackTrace(e)); |
|||
} |
|||
} |
|||
} |
|||
///**
|
|||
// * Copyright (c) 2018 人人开源 All rights reserved.
|
|||
// * <p>
|
|||
// * https://www.renren.io
|
|||
// * <p>
|
|||
// * 版权所有，侵权必究！
|
|||
// */
|
|||
//
|
|||
//package com.epmet.commons.tools.aspect;
|
|||
//
|
|||
//import com.epmet.commons.tools.constant.ThreadLocalConstant;
|
|||
//import com.epmet.commons.tools.dto.form.LoginUserInfoResultDTO;
|
|||
//import com.epmet.commons.tools.exception.ExceptionUtils;
|
|||
//import org.aspectj.lang.JoinPoint;
|
|||
//import org.aspectj.lang.annotation.Aspect;
|
|||
//import org.aspectj.lang.annotation.Before;
|
|||
//import org.slf4j.Logger;
|
|||
//import org.slf4j.LoggerFactory;
|
|||
//import org.springframework.core.annotation.Order;
|
|||
//import org.springframework.stereotype.Component;
|
|||
//
|
|||
///**
|
|||
// * 每次请求，清理ThreadLocal线程中的变量(已废弃，改用GlobalFilter)
|
|||
// * @Author wxz
|
|||
// * @Description
|
|||
// * @Date 2020/4/23 16:16
|
|||
// **/
|
|||
//@Aspect
|
|||
//@Component
|
|||
//@Order(1)
|
|||
//public class ThreadLocalInitAspect {
|
|||
//
|
|||
// private static final Logger log = LoggerFactory.getLogger(ThreadLocalInitAspect.class);
|
|||
//
|
|||
// @Before(value = "execution(* com.epmet.controller.*Controller*.*(..)) ")
|
|||
// public void before(JoinPoint point) throws Throwable {
|
|||
// // 清理权限过滤中的变量残留
|
|||
// try {
|
|||
// ThreadLocalConstant.sqlFilter.remove();
|
|||
// ThreadLocalConstant.requirePermissionTl.remove();
|
|||
// } catch (Exception e) {
|
|||
// log.error("清理sqlFilter缓存失败:{}", ExceptionUtils.getErrorStackTrace(e));
|
|||
// }
|
|||
// }
|
|||
//}
|
|||
|
|||
@ -0,0 +1,30 @@ |
|||
package com.epmet.commons.tools.filter; |
|||
|
|||
import com.epmet.commons.tools.constant.ThreadLocalConstant; |
|||
|
|||
import javax.servlet.*; |
|||
import javax.servlet.annotation.WebFilter; |
|||
import java.io.IOException; |
|||
|
|||
/** |
|||
* @Description 全局过滤器，可在请求结束的时候清除线程变量残留 |
|||
* @author wxz |
|||
* @date 2021.07.19 10:19:24 |
|||
*/ |
|||
@WebFilter(value = "/*") |
|||
public class GlobalFilter implements Filter { |
|||
|
|||
@Override |
|||
public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { |
|||
try { |
|||
filterChain.doFilter(servletRequest, servletResponse); |
|||
} catch (Throwable e) { |
|||
throw e; |
|||
} finally { |
|||
// 清除线程变量残留
|
|||
ThreadLocalConstant.sqlFilter.remove(); |
|||
ThreadLocalConstant.requirePermissionTl.remove(); |
|||
ThreadLocalConstant.requestParam.remove(); |
|||
} |
|||
} |
|||
} |
|||
@ -0,0 +1,40 @@ |
|||
package com.epmet.dataaggre.dto.epmetuser.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* @Description 根据客户Id staffId查询人员在客户下的角色列表-接口返参 |
|||
* @Author sun |
|||
*/ |
|||
@Data |
|||
public class StaffRoleListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = -2049883620062097446L; |
|||
|
|||
/** |
|||
* 客户Id |
|||
* */ |
|||
private String customerId; |
|||
/** |
|||
* 员工Id |
|||
* */ |
|||
private String staffId; |
|||
/** |
|||
* 员工姓名 |
|||
* */ |
|||
private String staffName; |
|||
/** |
|||
* 角色Id |
|||
* */ |
|||
private String roleId; |
|||
/** |
|||
* 角色Key |
|||
* */ |
|||
private String roleKey; |
|||
/** |
|||
* 角色名称 |
|||
* */ |
|||
private String roleName; |
|||
|
|||
} |
|||
@ -0,0 +1,48 @@ |
|||
package com.epmet.dataaggre.dto.govorg.result; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.ArrayList; |
|||
import java.util.List; |
|||
|
|||
/** |
|||
* 专题设置-组织网格切换树结构-接口返参 |
|||
* @author sun |
|||
*/ |
|||
@Data |
|||
public class StaffAgencyGridListResultDTO implements Serializable { |
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
//机关组织Id
|
|||
private String agencyId = ""; |
|||
//机关组织名称
|
|||
private String agencyName = ""; |
|||
//机关组织名称
|
|||
private Boolean isOpt = true; |
|||
//网格：grid；社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province
|
|||
private String orgLevel = ""; |
|||
//当前组织id的上级id,如果当前是跟组织返回0
|
|||
private String pid = ""; |
|||
//当前组织id的所有上级id,如果当前是跟组织返回0
|
|||
private String pids = ""; |
|||
//当前机关的下属网格列表
|
|||
private List<StaffAgencyGridListResultDTO.GridResultDTO> gridList = new ArrayList<>(); |
|||
//当前组织的所有下级组织信息(递归)
|
|||
private List<StaffAgencyGridListResultDTO> subAgencyGridList = new ArrayList<>(); |
|||
|
|||
@Data |
|||
public static class GridResultDTO{ |
|||
//机关组织Id
|
|||
private String gridId = ""; |
|||
//机关组织名称
|
|||
private String gridName = ""; |
|||
//网格：grid；社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province
|
|||
private String orgLevel = ""; |
|||
//当前网格所属的组织id
|
|||
private String pid = ""; |
|||
//当前网格所有上级
|
|||
private String pids = ""; |
|||
} |
|||
|
|||
} |
|||
@ -0,0 +1,19 @@ |
|||
package com.epmet.feign.impl; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.DataReportOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class DataReportOpenFeignClientFallBackFactory implements FallbackFactory<DataReportOpenFeignClient> { |
|||
private DataReportOpenFeignClientFallBack fallback = new DataReportOpenFeignClientFallBack(); |
|||
|
|||
@Override |
|||
public DataReportOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetCommonServiceOpenFeignClientFallbackFactory implements FallbackFactory<EpmetCommonServiceOpenFeignClient> { |
|||
|
|||
private EpmetCommonServiceOpenFeignClientFallback fallback = new EpmetCommonServiceOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public EpmetCommonServiceOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetHeartOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetHeartOpenFeignClientFallbackFactory implements FallbackFactory<EpmetHeartOpenFeignClient> { |
|||
|
|||
private EpmetHeartOpenFeignClientFallback fallback = new EpmetHeartOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public EpmetHeartOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetMessageOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetMessageOpenFeignClientFallbackFactory implements FallbackFactory<EpmetMessageOpenFeignClient> { |
|||
|
|||
private EpmetMessageOpenFeignClientFallback fallback = new EpmetMessageOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public EpmetMessageOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.OssFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class OssFeignClientFallbackFactory implements FallbackFactory<OssFeignClient> { |
|||
|
|||
private OssFeignClientFallback fallback = new OssFeignClientFallback(); |
|||
|
|||
@Override |
|||
public OssFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetPointOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetPointOpenFeignClientFallbackFactory implements FallbackFactory<EpmetPointOpenFeignClient> { |
|||
|
|||
private EpmetPointOpenFeignClientFallback fallback = new EpmetPointOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public EpmetPointOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,18 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.EpmetThirdOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class EpmetThirdOpenFeignClientFallbackFactory implements FallbackFactory<EpmetThirdOpenFeignClient> { |
|||
private EpmetThirdOpenFeignClientFallback fallback = new EpmetThirdOpenFeignClientFallback(); |
|||
@Override |
|||
public EpmetThirdOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.ThirdOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class ThirdOpenFeignClientFallbackFactory implements FallbackFactory<ThirdOpenFeignClient> { |
|||
|
|||
private ThirdOpenFeignClientFallback fallback = new ThirdOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public ThirdOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.GovAccessFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
/** |
|||
* @Description fallBackFactory，用于抛出异常之后，返回一个Fallback降级处理对象 |
|||
* @author wxz |
|||
* @date 2021.07.15 09:54:14 |
|||
*/ |
|||
@Component |
|||
@Slf4j |
|||
public class GovAccessFeignClientFallBackFactory implements FallbackFactory<GovAccessFeignClient> { |
|||
|
|||
/** |
|||
* 降级处理对象 |
|||
*/ |
|||
private GovAccessFeignClientFallBack fallBack = new GovAccessFeignClientFallBack(); |
|||
|
|||
@Override |
|||
public GovAccessFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallBack; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.GovIssueOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class GovIssueOpenFeignClientFallBackFactory implements FallbackFactory<GovIssueOpenFeignClient> { |
|||
|
|||
private GovIssueOpenFeignClientFallBack fallback = new GovIssueOpenFeignClientFallBack(); |
|||
|
|||
@Override |
|||
public GovIssueOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.GovOrgOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class GovOrgOpenFeignClientFallbackFactory implements FallbackFactory<GovOrgOpenFeignClient> { |
|||
|
|||
private GovOrgOpenFeignClientFallback fallback = new GovOrgOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public GovOrgOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,20 @@ |
|||
package com.epmet.feign.fallback; |
|||
|
|||
import com.epmet.commons.tools.exception.ExceptionUtils; |
|||
import com.epmet.feign.GovProjectOpenFeignClient; |
|||
import feign.hystrix.FallbackFactory; |
|||
import lombok.extern.slf4j.Slf4j; |
|||
import org.springframework.stereotype.Component; |
|||
|
|||
@Component |
|||
@Slf4j |
|||
public class GovProjectOpenFeignClientFallbackFactory implements FallbackFactory<GovProjectOpenFeignClient> { |
|||
|
|||
private GovProjectOpenFeignClientFallback fallback = new GovProjectOpenFeignClientFallback(); |
|||
|
|||
@Override |
|||
public GovProjectOpenFeignClient create(Throwable cause) { |
|||
log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); |
|||
return fallback; |
|||
} |
|||
} |
|||
@ -0,0 +1,120 @@ |
|||
/** |
|||
* Copyright 2018 人人开源 https://www.renren.io
|
|||
* <p> |
|||
* This program is free software: you can redistribute it and/or modify |
|||
* it under the terms of the GNU General Public License as published by |
|||
* the Free Software Foundation, either version 3 of the License, or |
|||
* (at your option) any later version. |
|||
* <p> |
|||
* This program is distributed in the hope that it will be useful, |
|||
* but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|||
* GNU General Public License for more details. |
|||
* <p> |
|||
* You should have received a copy of the GNU General Public License |
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|||
*/ |
|||
|
|||
package com.epmet.dto; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import java.io.Serializable; |
|||
import java.util.Date; |
|||
|
|||
|
|||
/** |
|||
* 专题表 |
|||
* |
|||
* @author generator generator@elink-cn.com |
|||
* @since v1.0.0 2021-07-15 |
|||
*/ |
|||
@Data |
|||
public class SpecialSubjectDTO implements Serializable { |
|||
|
|||
private static final long serialVersionUID = 1L; |
|||
|
|||
/** |
|||
* 主键(专题id) |
|||
*/ |
|||
private String id; |
|||
|
|||
/** |
|||
* 客户id |
|||
*/ |
|||
private String customerId; |
|||
|
|||
/** |
|||
* 标签id |
|||
*/ |
|||
private String tagId; |
|||
|
|||
/** |
|||
* 新增此专题的用户id |
|||
*/ |
|||
private String addUserId; |
|||
|
|||
/** |
|||
* 新增此专题时用户所在的组织id或者网格id |
|||
*/ |
|||
private String addOrgId; |
|||
|
|||
/** |
|||
* 网格：grid；社区级：community， |
|||
乡（镇、街道）级:street, |
|||
区县级: district, |
|||
市级: city |
|||
省级:province |
|||
*/ |
|||
private String orgLevel; |
|||
|
|||
/** |
|||
* 新增此专题用户所属的组织id |
|||
*/ |
|||
private String addUserAgencyId; |
|||
|
|||
/** |
|||
* 删除标识 0未删除；1已删除 |
|||
*/ |
|||
private String delFlag; |
|||
|
|||
/** |
|||
* 乐观锁 |
|||
*/ |
|||
private Integer revision; |
|||
|
|||
/** |
|||
* 创建人 |
|||
*/ |
|||
private String createdBy; |
|||
|
|||
/** |
|||
* 创建时间 |
|||
*/ |
|||
private Date createdTime; |
|||
|
|||
/** |
|||
* 更新人 |
|||
*/ |
|||
private String updatedBy; |
|||
|
|||
/** |
|||
* 更新时间 |
|||
*/ |
|||
private Date updatedTime; |
|||
|
|||
/** |
|||
* 标签名 |
|||
*/ |
|||
private String tagName; |
|||
|
|||
/** |
|||
* 扩展属性：标签颜色 |
|||
*/ |
|||
private String tagColor; |
|||
|
|||
/** |
|||
* 删除人id |
|||
*/ |
|||
private String delStaffId; |
|||
} |
|||
@ -0,0 +1,56 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 【专题管理】添加专题 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/7/15 14:24 |
|||
*/ |
|||
@Data |
|||
public class AddSpecialSubjectFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -4469613386814496224L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
/** |
|||
* 当前所在网格或者组织id |
|||
*/ |
|||
@NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class) |
|||
private String orgId; |
|||
|
|||
@NotBlank(message = "pid不能为空", groups = AddUserInternalGroup.class) |
|||
private String pid; |
|||
/** |
|||
* orgId的所有上级id |
|||
*/ |
|||
@NotBlank(message = "pids不能为空", groups = AddUserInternalGroup.class) |
|||
private String pids; |
|||
|
|||
/** |
|||
* 网格：grid；社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province |
|||
*/ |
|||
@NotBlank(message = "orgLevel不能为空", groups = AddUserInternalGroup.class) |
|||
private String orgLevel; |
|||
|
|||
/** |
|||
* 所选的标签id |
|||
*/ |
|||
@NotBlank(message = "tagId不能为空", groups = AddUserInternalGroup.class) |
|||
private String tagId; |
|||
|
|||
// 以下属性从token中获取
|
|||
/** |
|||
* 从TokenDto中获取当前用户id |
|||
*/ |
|||
@NotBlank(message = "从token中获取userId为空", groups = AddUserInternalGroup.class) |
|||
private String addUserId; |
|||
|
|||
@NotBlank(message = "从token中获取客户id为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
} |
|||
@ -0,0 +1,42 @@ |
|||
package com.epmet.dto.form; |
|||
|
|||
import lombok.Data; |
|||
|
|||
import javax.validation.constraints.NotBlank; |
|||
import java.io.Serializable; |
|||
|
|||
/** |
|||
* 【专题管理】删除专题 |
|||
* |
|||
* @author yinzuomei@elink-cn.com |
|||
* @date 2021/7/15 20:50 |
|||
*/ |
|||
@Data |
|||
public class DelSpecialSubjectFormDTO implements Serializable { |
|||
private static final long serialVersionUID = -2305529822756834522L; |
|||
|
|||
public interface AddUserInternalGroup { |
|||
} |
|||
|
|||
/** |
|||
* 专题id |
|||
*/ |
|||
@NotBlank(message = "specialSubjectId不能为空", groups = AddUserInternalGroup.class) |
|||
private String specialSubjectId; |
|||
|
|||
/** |
|||
* 当前所在网格或者组织id |
|||
*/ |
|||
@NotBlank(message = "orgId不能为空", groups = AddUserInternalGroup.class) |
|||
private String orgId; |
|||
|
|||
// 以下属性从token中获取
|
|||
/** |
|||
* 从TokenDto中获取当前用户id |
|||
*/ |
|||
@NotBlank(message = "从token中获取userId为空", groups = AddUserInternalGroup.class) |
|||
private String userId; |
|||
@NotBlank(message = "从token中获取客户id为空", groups = AddUserInternalGroup.class) |
|||
private String customerId; |
|||
|
|||
} |
|||
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue