Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

fwq

2022-10-20 dce20bc3e1d912f75d977acafba98e1eaf19cc9a

Merge branch 'master' of http://1.15.4.62/r/~chenjiahe/phis-service-feign

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeSchedule.java

New file
@@ -0,0 +1,51 @@
package com.hz.his.dto.employee;

import lombok.Data;

/**
 * 工作人员排班数据
 */
@Data
public class EmployeeSchedule   {


    private String shopId;

    private String shopName;


    private String employeeId;

    private String employeeName;

    private String employeeImgUrl;


    private String dayTime;


    private String monthTime;

    private String uniqueStr;

    private String operatorId;

    private String operatorName;

    private Integer operatorType;

    private String remark;

    public EmployeeSchedule() {

    }

    /**操作人类型-管理员*/
    public static Integer OPERATOR_TYPE_ADMIN = 0;
    /**操作人类型-员工*/
    public static Integer OPERATOR_TYPE_EMPLOYEE = 1;
    /**操作人类型-用户*/
    public static Integer OPERATOR_TYPE_USER = 2;
    /**操作人类型-系统*/
    public static Integer OPERATOR_TYPE_SYSTEM = 3;
}

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleDto.java

New file
@@ -0,0 +1,23 @@
package com.hz.his.dto.employee;

import lombok.Data;

import java.util.List;

/**
 * 员工排班dtp
 * @author Andru
 */
@Data
public class EmployeeScheduleDto {

    /** 员工排班对象 */
    private EmployeeSchedule employeeSchedule;

    /** 排班时间数据列表 */
    private List<EmployeeScheduleItem> employeeScheduleItemList;

    public EmployeeScheduleDto() {

    }
}

 phis-feign/src/main/java/com/hz/his/dto/employee/EmployeeScheduleItem.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.dto.employee;

import lombok.Data;

import java.util.Date;

/**
 * 工作人员排班数据子项数据
 */
@Data

public class EmployeeScheduleItem   {


    private String employeeScheduleId;


    private String dayTime;

    private Integer intervalTime ;

    private Date startTime;


    private Date endTime;

    public EmployeeScheduleItem() {

    }
}

 phis-feign/src/main/java/com/hz/his/dto/preOrder/PreOrderDto.java

@@ -3,7 +3,6 @@
import com.hz.his.dto.PageDto;
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
@@ -22,9 +21,9 @@
    /*用户名称*/
    private String userName;
    /*预约开始时间*/
    private Date startTime;
    private String startTime;
    /*预约结束时间*/
    private Date endTime;
    private String endTime;
    /*门店Id*/
    private String shopId;
    /*门店名称*/
@@ -51,6 +50,11 @@
    private String platSourceName;
    /*是否SPA(0:否,1:是)*/
    private Integer isSpa;
    /*备注*/
    private String remarks;
    /*状态  0：待到店；1：取消预约；2：已到店；3：预约完成*/
    private Integer status;

    //预约项目
    List<PreOrderItemDto> preOrderItems;


 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipEmployeeScheduleService.java

New file
@@ -0,0 +1,30 @@
package com.hz.his.feign.service.platform;

import com.hx.resultTool.Result;
import com.hz.his.dto.employee.EmployeeScheduleDto;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * 这里这个name 需要填写 请求的服务提供者的注册到nacos Server上面的服务名，path 是请求接口前缀
 */
@FeignClient(name="phi-platform-service",path = "/phip",contextId = "phip-employeeSchedule")
public interface SPhipEmployeeScheduleService {

    /**
     * 员工排班列表
     */
    @PostMapping(value = "/employee/schedule/list")
    Result list(@RequestBody EmployeeScheduleDto employeeScheduleDto);



    /**
     * 员工排班时间信息
     */
    @PostMapping(value = "/employee/schedule/info")
    Result info(@RequestBody EmployeeScheduleDto employeeScheduleDto);


}