Commit 279faae8 by Ren Ping

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

2 parents b0cc9fc5 700a0d54
...@@ -13,7 +13,7 @@ spring: ...@@ -13,7 +13,7 @@ spring:
protocol: SASL_SSL protocol: SASL_SSL
ssl: ssl:
truststore: truststore:
location: /home/kafka.client.truststore.jks location: /usr/local/src/kafka.client.truststore.jks
sasl: sasl:
mechanism: SCRAM-SHA-512 mechanism: SCRAM-SHA-512
jaas: jaas:
......
...@@ -84,6 +84,32 @@ public interface IBeanRemoteService { ...@@ -84,6 +84,32 @@ public interface IBeanRemoteService {
* @return 分部列表 * @return 分部列表
*/ */
@GetMapping("/api/openapi/department/getBranchDetail") @GetMapping("/api/openapi/department/getBranchDetail")
BeanR<BranchDetail> branchDetail(@RequestHeader(name = "accessToken") String accessToken, String bsTagId); BeanR<BranchDetail> branchDetail(@RequestHeader(name = "accessToken") String accessToken, @RequestParam("bsTagId") String bsTagId);
/* ***********************************工单相关************************************** */
/**
* 服务工单改约
*
* @param accessToken ACCESS_TOKEN
* @param rescheduled 改约参数
* @return 改约是否成功
*/
@PostMapping("/api/openapi/task/rescheduled")
BeanR<?> orderRescheduled(@RequestHeader(name = "accessToken") String accessToken, @RequestBody Rescheduled rescheduled);
/**
* 服务工单取消
*
* @param accessToken ACCESS_TOKEN
* @param orderCancel 取消参数
* @return 取消成功或者失败
*/
@PostMapping("/api/openapi/task/cancel")
BeanR<?> orderTaskCancel(@RequestHeader(name = "accessToken") String accessToken, @RequestBody OrderCancel orderCancel);
} }
package com.dituhui.pea.order.feign.bean;
public class OrderCancel {
private String risId;
private String cancellationReason;
private String cancelNote;
private long cancelStartTime;
private String cancelInitiator;
private Photo cancelPhotograph;
}
package com.dituhui.pea.order.feign.bean;
public class Photo {
private String filename;
private String url;
}
package com.dituhui.pea.order.feign.bean;
import java.util.List;
/**
*
*/
public class Rescheduled {
private String risId;
private long rescheduledDate;
private String reasonForRescheduling;
private String remarksForRescheduling;
private boolean reassignment;
private boolean requireApprove;
private String initiatorOfRescheduling;
private List<Photo> rescheduledPhotos;
}
...@@ -4,9 +4,7 @@ import com.dituhui.pea.common.BusinessException; ...@@ -4,9 +4,7 @@ import com.dituhui.pea.common.BusinessException;
import com.dituhui.pea.order.common.RedisService; import com.dituhui.pea.order.common.RedisService;
import com.dituhui.pea.order.common.jackson.JsonUtil; import com.dituhui.pea.order.common.jackson.JsonUtil;
import com.dituhui.pea.order.feign.IBeanRemoteService; import com.dituhui.pea.order.feign.IBeanRemoteService;
import com.dituhui.pea.order.feign.bean.AccessToken; import com.dituhui.pea.order.feign.bean.*;
import com.dituhui.pea.order.feign.bean.BeanR;
import com.dituhui.pea.order.feign.bean.Department;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
...@@ -37,10 +35,31 @@ public class BeanRemoteServiceImpl { ...@@ -37,10 +35,31 @@ public class BeanRemoteServiceImpl {
//TODO 仅用于联通测试 //TODO 仅用于联通测试
public void testAllDepartment() { public void testAllDepartment() {
String accessToken = getAccessToken(); final String accessToken = getAccessToken();
BeanR<List<Department>> listBeanR = beanRemoteService.allDepartment(accessToken);
log.info("[testAllDepartment]【/api/openapi/department/queryList】返回值-------------------->{}", JsonUtil.toJson(listBeanR)); //1.1 查询BEAN部门详情
BeanR<Department> departmentBeanR = beanRemoteService.departmentDetail(accessToken, "1643063176107991042");
log.info("[查询BEAN部门详情]【/api/openapi/department/detail】返回值-------------------->{}", JsonUtil.toJson(departmentBeanR));
//1.2 查询BEAN维护的分部列表(大区-分部-分站&外围)
BeanR<List<BranchRes>> listBeanR1 = beanRemoteService.departmentBranchList(accessToken);
log.info("[查询BEAN维护的分部列表]【/api/openapi/department/queryBranchList】返回值-------------------->{}", JsonUtil.toJson(listBeanR1));
//1.3 查询BEAN用户列表
BeanR<List<BeanAccountInfo>> listBeanR2 = beanRemoteService.queryUserList(accessToken, "1341423191870971906");
log.info("[查询BEAN用户列表]【/api/openapi/user/queryList】返回值-------------------->{}", JsonUtil.toJson(listBeanR2));
final String centerUserId = "17364505242";
//1.4 查询BEAN账号详情
BeanR<BeanUserDetail> beanUserDetailBeanR = beanRemoteService.userDetail(accessToken, centerUserId);
log.info("[查询BEAN用户详情]【/api/openapi/user/queryDetail】返回值-------------------->{}", JsonUtil.toJson(beanUserDetailBeanR));
//1.6 获取部门全量列表数据
BeanR<List<Department>> listBeanR = beanRemoteService.allDepartment(accessToken);
log.info("[查询BEAN部门全量列表]【/api/openapi/department/queryList】返回值-------------------->{}", JsonUtil.toJson(listBeanR));
//1.8 查询分部列表
BeanR<BranchDetail> branchDetailBeanR = beanRemoteService.branchDetail(accessToken, "1341423191870971906");
log.info("[查询BEAN部门分部详情]【/api/openapi/department/getBranchDetail】返回值-------------------->{}", JsonUtil.toJson(branchDetailBeanR));
} }
......
...@@ -89,4 +89,5 @@ scheduler: ...@@ -89,4 +89,5 @@ scheduler:
day-offset-end: 14 day-offset-end: 14
logging: logging:
level: level:
root: info
org.hibernate.type.descriptor.sql.BasicBinder: trace org.hibernate.type.descriptor.sql.BasicBinder: trace
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!