diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java new file mode 100644 index 0000000000..b66de79686 --- /dev/null +++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinDeptFormDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/13 9:33 上午 + */ +@Data +public class StaffSinDeptFormDTO implements Serializable { + + private static final long serialVersionUID = 1827404498483127629L; + + //后端自己看 + public interface StaffSinDept{} + + /** + * appId+customerId+时间戳加密secret + */ +// @NotBlank(message = "secret不能为空",groups = {StaffSinDept.class}) + private String accessToken; + + /** + * 部门Id + */ + @NotBlank(message = "部门Id不能为空",groups = {StaffSinDept.class}) + private String departmentId; +} diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java new file mode 100644 index 0000000000..a694dfddb1 --- /dev/null +++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/form/StaffSinGridFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2020/8/13 9:33 上午 + */ +@Data +public class StaffSinGridFormDTO implements Serializable { + + private static final long serialVersionUID = 1827404498483127629L; + + //后端自己看 + public interface StaffSinGrid{} + + /** + * appId+customerId+时间戳加密secret + */ +// @NotBlank(message = "secret不能为空",groups = {StaffSinGrid.class}) + private String accessToken; + + /** + * 网格Id + */ + @NotBlank(message = "网格Id不能为空",groups = {StaffSinGrid.class}) + private String gridId; +} diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/result/StaffSinDeptResultDTO.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/result/StaffSinDeptResultDTO.java new file mode 100644 index 0000000000..dca9c292a3 --- /dev/null +++ b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/dto/result/StaffSinDeptResultDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2020/8/13 9:25 上午 + */ +@Data +public class StaffSinDeptResultDTO implements Serializable { + + private static final long serialVersionUID = -3440415466710443002L; + + /** + * 工作人员Id + */ + private String staffId; + + /** + * 工作人员名称 + */ + private String staffName; + + /** + * 头像 + */ + private String headPhoto; + + /** + * 性别,1男2女0未知 + */ + private Integer gender; + + /** + * 角色列表 + */ + private List roleList; + +} diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/EpmetExtOpenFeignClient.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/EpmetExtOpenFeignClient.java deleted file mode 100644 index 857129ffed..0000000000 --- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/EpmetExtOpenFeignClient.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.feifn; - -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.feifn.impl.EpmetExtOpenFeignClientFallBack; -import org.springframework.cloud.openfeign.FeignClient; - -/** - * desc: 数据统计 对外feign client - * - * @return: - * @date: 2020/8/11 13:24 - * @author: zxc - */ -//url="http://localhost:8113" -@FeignClient(name = ServiceConstant.EPMET_EXT_SERVER, fallback = EpmetExtOpenFeignClientFallBack.class) -public interface EpmetExtOpenFeignClient { - -} diff --git a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/impl/EpmetExtOpenFeignClientFallBack.java b/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/impl/EpmetExtOpenFeignClientFallBack.java deleted file mode 100644 index 6e46f94381..0000000000 --- a/epmet-module/epmet-ext/epmet-ext-client/src/main/java/com/epmet/feifn/impl/EpmetExtOpenFeignClientFallBack.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.feifn.impl; - -import com.epmet.feifn.EpmetExtOpenFeignClient; -import org.springframework.stereotype.Component; - -/** - * desc: - * - * @return: - * @date: 2020/8/11 13:28 - * @author: zxc - */ -@Component -public class EpmetExtOpenFeignClientFallBack implements EpmetExtOpenFeignClient { - -}