2020年5月27日14:01:30

blade-sched-api/src/main/java/org.springblade.mid/convert/ScheduleVO2ExcelScheduleVOConverter.java

+package org.springblade.mid.convert;
+
+import org.springblade.mid.excel.BaseSchedule;
+import org.springblade.mid.excel.ThirtyOneSchedule;
+import org.springblade.mid.excel.ThirtySchedule;
+import org.springblade.mid.vo.ExcelScheduleVO;
+import org.springblade.mid.vo.ScheduleDetailVO;
+import org.springblade.mid.vo.ScheduleVO;
+import org.springframework.beans.BeanUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.stream.Collectors;
+
+/** List<ScheduleVO> => List<ExcelScheduleVO>
+ * @author Night
+ * Date:  2020/1/6
+ */
+public class ScheduleVO2ExcelScheduleVOConverter {
+	
+	/** 排班
+	 * @param scheduleVOList  scheduleVOList
+	 * @return List<ExcelScheduleVO>
+	 */
+	public static List<ExcelScheduleVO> schvos2Excelvos(List<ScheduleVO> scheduleVOList){
+		List<ExcelScheduleVO> excelScheduleVOList = new ArrayList<>();
+		for (ScheduleVO scheduleVO : scheduleVOList){
+			ExcelScheduleVO excelScheduleVO = new ExcelScheduleVO();
+			BeanUtils.copyProperties(scheduleVO,excelScheduleVO);
+			excelScheduleVO.setMonday(scheduleVO.getScheduleDetailVOList().get(0).getWorktime());
+			excelScheduleVO.setTuesday(scheduleVO.getScheduleDetailVOList().get(1).getWorktime());
+			excelScheduleVO.setWednesday(scheduleVO.getScheduleDetailVOList().get(2).getWorktime());
+			excelScheduleVO.setThursday(scheduleVO.getScheduleDetailVOList().get(3).getWorktime());
+			excelScheduleVO.setFriday(scheduleVO.getScheduleDetailVOList().get(4).getWorktime());
+			excelScheduleVO.setSaturday(scheduleVO.getScheduleDetailVOList().get(5).getWorktime());
+			excelScheduleVO.setSunday(scheduleVO.getScheduleDetailVOList().get(6).getWorktime());
+			excelScheduleVOList.add(excelScheduleVO);
+		}
+		return excelScheduleVOList;
+	}
+	
+	/** 考勤
+	 * @param scheduleVOList  scheduleVOList
+	 * @return List<ExcelScheduleVO>
+	 */
+	public static List<ExcelScheduleVO> schvos2Excelvosatten(List<ScheduleVO> scheduleVOList){
+		List<ExcelScheduleVO> excelScheduleVOList = new ArrayList<>();
+		for (ScheduleVO scheduleVO : scheduleVOList){
+			ExcelScheduleVO excelScheduleVO = new ExcelScheduleVO();
+			BeanUtils.copyProperties(scheduleVO,excelScheduleVO);
+			excelScheduleVO.setMonday(scheduleVO.getScheduleDetailVOList().get(0).getAttendanceTime());
+			excelScheduleVO.setTuesday(scheduleVO.getScheduleDetailVOList().get(1).getAttendanceTime());
+			excelScheduleVO.setWednesday(scheduleVO.getScheduleDetailVOList().get(2).getAttendanceTime());
+			excelScheduleVO.setThursday(scheduleVO.getScheduleDetailVOList().get(3).getAttendanceTime());
+			excelScheduleVO.setFriday(scheduleVO.getScheduleDetailVOList().get(4).getAttendanceTime());
+			excelScheduleVO.setSaturday(scheduleVO.getScheduleDetailVOList().get(5).getAttendanceTime());
+			excelScheduleVO.setSunday(scheduleVO.getScheduleDetailVOList().get(6).getAttendanceTime());
+			excelScheduleVOList.add(excelScheduleVO);
+		}
+		return excelScheduleVOList;
+	}
+	
+	/** 排班(28)/考勤
+	 * @param scheduleVOList  scheduleVOList
+	 * @return List<>
+	 */
+	public static List<BaseSchedule> schvos2Base(List<ScheduleVO> scheduleVOList, Integer type){
+		List<BaseSchedule> baseScheduleList = new ArrayList<>();
+		for (ScheduleVO scheduleVO : scheduleVOList){
+			BaseSchedule baseSchedule = new BaseSchedule();
+			BeanUtils.copyProperties(scheduleVO,baseSchedule);
+			List<ScheduleDetailVO> list = scheduleVO.getScheduleDetailVOList();
+			List<String> stringList = new ArrayList<>();
+			if (type == 1){
+				stringList = list.stream().map(ScheduleDetailVO::getWorktime).collect(Collectors.toList());
+			} else if (type == 2){
+				stringList = list.stream().map(ScheduleDetailVO::getAttendanceTime).collect(Collectors.toList());
+			}
+			ListIterator<String> iterator = stringList.listIterator();
+			baseSchedule.setTwentyFirst(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentySecond(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentyThird(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentyFourth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentyFifth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentySixth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentySeventh(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentyEighth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setFirst(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setSecond(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setThird(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setFourth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setFifth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setSixth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setSeventh(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setEighth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setNinth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setEleventh(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwelfth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setThirteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setFourteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setFifteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setSixteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setSeventeenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setEighteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setNineteenth(iterator.hasNext() ? iterator.next() : null);
+			baseSchedule.setTwentieth(iterator.hasNext() ? iterator.next() : null);
+			
+			baseScheduleList.add(baseSchedule);
+		}
+		return baseScheduleList;
+	}
+	
+	/** 排班(30)
+	 * @param scheduleVOList  scheduleVOList
+	 * @return List<>
+	 */
+	public static List<ThirtySchedule> schvos2Thirty(List<ScheduleVO> scheduleVOList, Integer type){
+		List<ThirtySchedule> thirtyScheduleList = new ArrayList<>();
+		for (ScheduleVO scheduleVO : scheduleVOList){
+			ThirtySchedule thirtySchedule = new ThirtySchedule();
+			BeanUtils.copyProperties(scheduleVO,thirtySchedule);
+			List<ScheduleDetailVO> list = scheduleVO.getScheduleDetailVOList();
+			List<String> stringList = new ArrayList<>();
+			if (type == 1){
+				stringList = list.stream().map(ScheduleDetailVO::getWorktime).collect(Collectors.toList());
+			} else if (type == 2){
+				stringList = list.stream().map(ScheduleDetailVO::getAttendanceTime).collect(Collectors.toList());
+			}
+			ListIterator<String> iterator = stringList.listIterator();
+			thirtySchedule.setTwentyFirst(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentySecond(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentyThird(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentyFourth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentyFifth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentySixth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentySeventh(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentyEighth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentyNinth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setThirtieth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setFirst(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setSecond(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setThird(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setFourth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setFifth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setSixth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setSeventh(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setEighth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setNinth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setEleventh(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwelfth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setThirteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setFourteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setFifteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setSixteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setSeventeenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setEighteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setNineteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtySchedule.setTwentieth(iterator.hasNext() ? iterator.next() : null);
+			
+			thirtyScheduleList.add(thirtySchedule);
+		}
+		return thirtyScheduleList;
+	}
+	
+	
+	/** 排班(31)
+	 * @param scheduleVOList  scheduleVOList
+	 * @return List<>
+	 */
+	public static List<ThirtyOneSchedule> schvos2ThirtyOne(List<ScheduleVO> scheduleVOList, Integer type){
+		List<ThirtyOneSchedule> thirtyOneScheduleList = new ArrayList<>();
+		for (ScheduleVO scheduleVO : scheduleVOList){
+			ThirtyOneSchedule thirtyOneSchedule = new ThirtyOneSchedule();
+			BeanUtils.copyProperties(scheduleVO,thirtyOneSchedule);
+			List<ScheduleDetailVO> list = scheduleVO.getScheduleDetailVOList();
+			List<String> stringList = new ArrayList<>();
+			if (type == 1){
+				stringList = list.stream().map(ScheduleDetailVO::getWorktime).collect(Collectors.toList());
+			} else if (type == 2){
+				stringList = list.stream().map(ScheduleDetailVO::getAttendanceTime).collect(Collectors.toList());
+			}
+			ListIterator<String> iterator = stringList.listIterator();
+			thirtyOneSchedule.setTwentyFirst(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentySecond(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentyThird(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentyFourth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentyFifth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentySixth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentySeventh(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentyEighth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentieth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setThirteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setThirtyOne(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setFirst(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setSecond(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setThird(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setFourth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setFifth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setSixth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setSeventh(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setEighth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setNinth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setEleventh(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwelfth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setThirteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setFourteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setFifteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setSixteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setSeventeenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setEighteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setNineteenth(iterator.hasNext() ? iterator.next() : null);
+			thirtyOneSchedule.setTwentieth(iterator.hasNext() ? iterator.next() : null);
+			
+			thirtyOneScheduleList.add(thirtyOneSchedule);
+		}
+		return thirtyOneScheduleList;
+	}
+	
+}

blade-sched-api/src/main/java/org.springblade.mid/entity/AddressEntity.java

-package org.springblade.mid.entity;
-
-public class AddressEntity {
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Agent.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_agent")
-public class Agent extends BaseEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 租户ID
-	 */
-	private String tenantId;
-
-	/**
-	 * 负责人user_id
-	 */
-	private String userId;
-
-	/**
-	 * 省ID
-	 */
-	private Integer provinceId;
-
-	/**
-	 * 市ID
-	 */
-	private Integer cityId;
-
-	/**
-	 * 区ID
-	 */
-	private Integer areaId;
-
-	/**
-	 * 机构名称
-	 */
-	private String agentName;
-
-	/**
-	 * 机构介绍
-	 */
-	private String agentIntroduce;
-
-	/**
-	 * 机构电话
-	 */
-	private String agentTel;
-
-	/**
-	 * 机构logo
-	 */
-	private String agentLogo;
-
-	/**
-	 * 机构地址
-	 */
-	private String agentPosition;
-
-	/**
-	 * 详细地址
-	 */
-	private String detailAddress;
-
-	/**
-	 * 数据隔离ID
-	 */
-	private String dataId;
-
-	/**
-	 * 账号
-	 */
-	private String username;
-
-
-}
-

blade-sched-api/src/main/java/org.springblade.mid/entity/AgentHos.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import java.io.Serializable;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author max
- * @since 2020-04-27
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="AgentHos对象", description="")
-@TableName("care_agent_hos")
-public class AgentHos  extends SuperEntity {
-
-    private static final long serialVersionUID = 1L;
-
-	private String agentId;
-
-	private String agentName;
-
-	private String hosId;
-
-	private String hosName;
-
-	private String time;
-	@TableLogic
-	private int isDeleted;
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/AppConfig.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-@ApiModel("应用配置entity")
-@TableName("app_config")
-public class AppConfig implements Serializable {
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	@TableId(value = "id", type = IdType.ASSIGN_ID)
-	private Long id;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
-
-	/**
-	 * appid
-	 */
-	@ApiModelProperty(value = "appid")
-	private String appId;
-
-	/**
-	 * secret
-	 */
-	@ApiModelProperty(value = "secret")
-	private String appSecret;
-
-	/**
-	 * 商户号
-	 */
-	@ApiModelProperty(value = "商户号")
-	private String mchId;
-
-	/**
-	 * 商户号
-	 */
-	@ApiModelProperty(value = "商户收款key")
-	private String mchKey;
-
-	/**
-	 * 小程序
-	 */
-	@ApiModelProperty(value = "小程序")
-	private String miniProgram;
-	/**
-	 * 小程序
-	 */
-	@ApiModelProperty(value = "退款证书")
-	private String certificate;
-	/**
-	 * 小程序
-	 */
-	@ApiModelProperty(value = "退款开关 0关闭 1开启")
-	private Integer refund;
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Area.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * <p>
- * 地区信息表
- * </p>
- *
- * @author MIND
- * @since 2019-09-28
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_area")
-public class Area extends SuperEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 代码
-	 */
-	private Integer code;
-
-	/**
-	 * 名称
-	 */
-	private String name;
-
-	/**
-	 * 层级，1=省，2=市，3=区
-	 */
-	private Integer lvl;
-
-	/**
-	 * 上级代码
-	 */
-	private Integer parentCode;
-
-	//子
-	@TableField(exist = false)
-	private List<Area> areas;
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Classes.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author XYTX
- * @since 2019-12-03
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_classes")
-public class Classes extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 班次名称
-     */
-    private String name;
-
-    /**
-     * 所属医院
-     */
-    private String hosName;
-
-    /**
-     * 班次开始时间
-     */
-    private String starTime;
-
-    /**
-     * 班次结束时间
-     */
-    private String endTime;
-
-    /**
-     * 护士长id，用来查询班次列表
-     */
-    private String doctorId;
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Doctor.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author XYTX
- * @since 2019-11-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_doctor")
-public class Doctor extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 医院id
-     */
-	@ApiModelProperty(value = "医院id",notes = "医院id")
-    private String hospitalId;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID",notes = "租户ID")
-    private String tenantId;
-
-    /**
-     * 姓名
-     */
-	@ApiModelProperty(value = "真实姓名",notes = "真实姓名")
-    private String relName;
-
-    /**
-     * 性别 0 女  1 男
-     */
-	@ApiModelProperty(value = "性别 0 女  1 男",notes = "性别 0 女  1 男")
-    private Integer sex;
-
-    /**
-     * 等级
-     */
-	@ApiModelProperty(value = "等级",notes = "等级")
-    private String level;
-    /**
-     * 0 医生 1 护士长
-     */
-	@ApiModelProperty(value = "0 医生 1 护士长",notes = "0 医生 1 护士长")
-    private Integer type;
-
-    /**
-     * 所属医院
-     */
-	@ApiModelProperty(value = "所属医院",notes = "所属医院")
-    private String hospital;
-
-    /**
-     * 电话
-     */
-	@ApiModelProperty(value = "电话",notes = "电话")
-    private String phone;
-    /**
-     * 添加人
-     */
-	@ApiModelProperty(value = "添加人",notes = "添加人")
-    private String addPeople;
-    /**
-     * 科室
-     */
-	@ApiModelProperty(value = "科室",notes = "科室")
-    private String depart;
-    /**
-     * 登录账号
-     */
-	@ApiModelProperty(value = "登录账号",notes = "登录账号")
-    private String account;
-    /**
-     * 0 未删除 1已删除
-     */
-    @TableLogic
-	@ApiModelProperty(value = "0 未删除 1已删除",notes = "0 未删除 1已删除")
-    private int isDeleted;
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Hospital.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_hospital")
-public class Hospital extends BaseEntity {
-
-	private static final long serialVersionUID = 1L;
-
-
-	/**
-	 * 租户ID
-	 */
-	private String tenantId;
-	/**
-	 * 省ID
-	 */
-	private Integer provinceId;
-
-	/**
-	 * 市ID
-	 */
-	private Integer cityId;
-
-	/**
-	 * 区ID
-	 */
-	private Integer areaId;
-
-	/**
-	 * 医院类别
-	 */
-	private String type;
-
-	/**
-	 * 医院名称
-	 */
-	private String hosName;
-
-	/**
-	 * 科室
-	 */
-	private String depart;
-
-	/**
-	 * 医院介绍
-	 */
-	private String hosIntroduce;
-
-	/**
-	 * 医院电话
-	 */
-	private String hosTel;
-
-	/**
-	 * 医院logo
-	 */
-	private String hosLogo;
-
-
-	/**
-	 * 医院地址
-	 */
-	private String hosPosition;
-
-	/**
-	 * 代理商ID
-	 */
-	private String agentId;
-
-	/**
-	 * 代理商名称
-	 */
-	private String agentName;
-
-	/**
-	 * 详细地址
-	 */
-	private String detailAddress;
-
-	/**
-	 * 数据隔离ID
-	 */
-	private String dataId;
-
-	/**
-	 * 乐观锁
-	 */
-	private Integer revision;
-	/**
-	 * 等级
-	 */
-	private String  level;
-	/**
-	 * 账号
-	 */
-	private String  username;
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Login.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author XYTX
- * @since 2019-11-26
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_login")
-public class Login extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 登录账号
-     */
-    private String username;
-
-    /**
-     * 密码
-     */
-    private String password;
-
-    /**
-     * 电话
-     */
-    private String tel;
-
-    /**
-     * 言
-     */
-    private String salt;
-
-    /**
-     * 1 正常 2 停用
-     */
-    private Integer status;
-
-    /**
-     * 0 未删除 1已删除
-     */
-    @TableLogic
-    private int isDeleted;
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Nurse.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 护工护士表
- * </p>
- *
- * @author MIND
- * @since 2019-09-18
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_nurse")
-public class Nurse extends BaseEntity {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "租户id",notes = "租户id")
-    private String tenantId;
-
-    /**
-     * 会员ID
-     */
-    private String memberId;
-
-    /**
-     * 代理商ID
-     */
-	@ApiModelProperty(value = "代理商ID",notes = "代理商ID")
-    private String agentId;
-
-    /**
-     * 所属护理公司
-     */
-	@ApiModelProperty(value = "所属护理公司",notes = "所属护理公司")
-    private String agentName;
-
-    /**
-     * 所属医院ID
-     */
-	@ApiModelProperty(value = "所属医院ID",notes = "所属医院ID")
-    private String hosId;
-
-    /**
-     * 所属医院名称
-     */
-	@ApiModelProperty(value = "所属医院名称",notes = "所属医院名称")
-    private String hosName;
-    /**
-     * 添加人
-     */
-	@ApiModelProperty(value = "添加人",notes = "添加人")
-    private String addUser;
-    /**
-     * 电话
-     */
-	@ApiModelProperty(value = "电话",notes = "电话")
-    private String tel;
-
-    /**
-     * 登录账号
-     */
-	@ApiModelProperty(value = "登录账号",notes = "登录账号")
-    private String username;
-
-    /**
-     * 服务省ID
-     */
-	@ApiModelProperty(value = "服务省ID",notes = "服务省ID")
-    private String provinceId;
-
-    /**
-     * 服务市ID
-     */
-	@ApiModelProperty(value = "服务市ID",notes = "服务市ID")
-    private String cityId;
-
-    /**
-     * 服务区ID
-     */
-	@ApiModelProperty(value = "服务区ID",notes = "服务区ID")
-    private String areaId;
-
-    /**
-     * 护工类型1护士,2护工
-     */
-	@ApiModelProperty(value = "护工类型1护士,2护工",notes = "护工类型1护士,2护工")
-    private Integer type;
-
-    /**
-     * 头像
-     */
-	@ApiModelProperty(value = "头像",notes = "头像")
-    private String avator;
-
-    /**
-     * 真实姓名
-     */
-	@ApiModelProperty(value = "真实姓名",notes = "真实姓名")
-    private String realName;
-
-    /**
-     * 身份证
-     */
-	@ApiModelProperty(value = "身份证",notes = "身份证")
-    @TableField("ID_card")
-    private String idCard;
-
-    /**
-     * 正面证件照
-     */
-	@ApiModelProperty(value = "正面证件照",notes = "正面证件照")
-    private String froutCardImg;
-
-    /**
-     * 反面证件照
-     */
-	@ApiModelProperty(value = "反面证件照",notes = "反面证件照")
-    private String backCardImg;
-
-    /**
-     * 性别,1男,2女,3待定
-     */
-	@ApiModelProperty(value = "性别,1男,2女,3待定",notes = "性别,1男,2女,3待定")
-    private Integer sex;
-
-    /**
-     * 认证状态 1认证中，2认证通过，3认证未通过
-     */
-	@ApiModelProperty(value = "认证状态 1认证中，2认证通过，3认证未通过",notes = "认证状态 1认证中，2认证通过，3认证未通过")
-    private String status;
-
-    /**
-     * 从业时间
-     */
-	@ApiModelProperty(value = "从业时间",notes = "从业时间")
-    private String employmentTime;
-
-    /**
-     * 护理年份
-     */
-	@ApiModelProperty(value = "护理年份",notes = "护理年份")
-    private String employmentYear;
-
-    /**
-     * 护士等级
-     */
-	@ApiModelProperty(value = "护士等级",notes = "护士等级")
-    private Integer level;
-
-    /**
-     * 服务标签以","分割 以","分割
-     */
-	//@ApiModelProperty(value = "身份证",notes = "身份证")
-    private String tags;
-
-    /**
-     * 资质证明
-     */
-	@ApiModelProperty(value = "资质证明",notes = "资质证明")
-    private String qualificationProofImg;
-
-    /**
-     * 执业证明
-     */
-	@ApiModelProperty(value = "执业证明",notes = "执业证明")
-    private String licenseProofImg;
-
-    /**
-     * 工作证明
-     */
-	@ApiModelProperty(value = "工作证明",notes = "工作证明")
-    private String workProofImg;
-
-    /**
-     * 民族
-     */
-	@ApiModelProperty(value = "民族",notes = "民族")
-    private String nation;
-
-    /**
-     * 出生日期
-     */
-	@ApiModelProperty(value = "出生日期",notes = "出生日期")
-    private String birthday;
-
-    /**
-     * 戶籍
-     */
-	@ApiModelProperty(value = "戶籍",notes = "戶籍")
-    private String registeredPermanent;
-
-    /**
-     * 身高
-     */
-	@ApiModelProperty(value = "身高",notes = "身高")
-    private String stature;
-
-    /**
-     * 体重
-     */
-	@ApiModelProperty(value = "体重",notes = "体重")
-    private String weight;
-
-    /**
-     * 自我介紹
-     */
-	@ApiModelProperty(value = "自我介紹",notes = "自我介紹")
-    private String introduce;
-
-    /**
-     * 监管员
-     */
-	@ApiModelProperty(value = "监管员",notes = "监管员")
-    private String supervisor;
-
-    /**
-     * 服务数
-     */
-	@ApiModelProperty(value = "服务数",notes = "服务数")
-    private Integer serviceNum;
-
-    /**
-     * 好评率
-     */
-	@ApiModelProperty(value = "好评率",notes = "好评率")
-    private String favorableRate;
-
-	/**
-	 * 合作方式
-	 */
-	@ApiModelProperty(value = "合作方式",notes = "合作方式")
-	private String withMethod;
-
-	/**
-	 * 结算方式
-	 */
-	@ApiModelProperty(value = "结算方式",notes = "结算方式")
-	private String payMethod;
-
-	/**
-	 * 职业
-	 */
-	@ApiModelProperty(value = "职业",notes = "职业")
-	private String profession;
-
-	/**
-	 * 学历
-	 */
-	@ApiModelProperty(value = "学历",notes = "学历")
-	private String education;
-
-	/**
-	 * 年龄
-	 */
-	@ApiModelProperty(value = "年龄",notes = "年龄")
-	private Integer age;
-
-	/**
-	 * 街道地址
-	 */
-	@ApiModelProperty(value = "街道地址",notes = "街道地址")
-	private String address;
-
-    /**
-     * 数据隔离ID
-     */
-    private String dataId;
-
-    /**
-     * 乐观锁
-     */
-    private Long revision;
-
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/PayMethod.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springblade.core.tool.utils.DateUtil;
-import org.springframework.format.annotation.DateTimeFormat;
-import javax.validation.constraints.NotNull;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-/**
- * @author Night
- * Date:  2020/5/11
- */
-@Data
-@Accessors(chain = true)
-@TableName("care_pay_method")
-@ApiModel(value = "PayMethod对象", description = "支付方式对象")
-public class PayMethod implements Serializable {
-	
-	private static final long serialVersionUID = 1L;
-	
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	@TableId(value = "id",type = IdType.ASSIGN_ID)
-	private Long id;
-	@TableLogic
-	@ApiModelProperty(value = "逻辑删除标识")
-	private int isDeleted;
-	@ApiModelProperty(value = "创建时间")
-	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
-	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-	private LocalDateTime createdTime;
-	@TableField(value = "updated_time",update = "now()")
-	@ApiModelProperty(value = "修改时间")
-	@DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME)
-	@JsonFormat(pattern = DateUtil.PATTERN_DATETIME)
-	private LocalDateTime updatedTime;
-	@ApiModelProperty(value = "创建人")
-	@JsonSerialize(using = ToStringSerializer.class)
-	private Long createdBy;
-	@ApiModelProperty(value = "修改人")
-	@JsonSerialize(using = ToStringSerializer.class)
-	private Long updatedBy;
-	
-	@NotNull
-	@ApiModelProperty(value = "支付方式名称",required=true)
-	private String name;
-	
-	@ApiModelProperty(value = "支付类型 1 款到发货 2 货到付款")
-	private Integer type;
-	
-	@ApiModelProperty(value = "支付方式 1 在线支付 2 线下支付")
-	private Integer method;
-	
-	@ApiModelProperty(value = "图标")
-	private String icon;
-	
-	@ApiModelProperty(value = "介绍")
-	private String introduce;
-	
-	@ApiModelProperty(value = "排序")
-	private Integer sortnum;
-	
-	@ApiModelProperty(value = "内容")
-	private String content;
-	
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Pension.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Accessors(chain = true)
-@TableName("care_nurse")
-public class Pension extends BaseEntity {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
-
-	/**
-	 * 省ID
-	 */
-	private Integer provinceId;
-
-	/**
-	 * 市ID
-	 */
-	private Integer cityId;
-
-	/**
-	 * 区ID
-	 */
-	private Integer areaId;
-
-	/**
-	 * 机构名称
-	 */
-	private String agentName;
-
-	/**
-	 * 机构介绍
-	 */
-	private String agentIntroduce;
-
-	/**
-	 * 机构电话
-	 */
-	private String agentTel;
-
-	/**
-	 * 机构logo
-	 */
-	private String agentLogo;
-
-	/**
-	 * 机构地址
-	 */
-	private String agentPosition;
-
-	/**
-	 * 详细地址
-	 */
-	private String detailAddress;
-
-	/**
-	 * 数据隔离ID
-	 */
-	private String dataId;
-
-	/**
-	 * 账号
-	 */
-	private String username;
-
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/Schedule.java

@@ -98,5 +98,10 @@ public class Schedule extends BaseEntity {
      * 班次名称
      */
     private String classesName;
+	
+	/**
+	 * 租户id
+	 */
+    private String tenId;
 
 }

blade-sched-api/src/main/java/org.springblade.mid/entity/SocialUser.java

-package org.springblade.mid.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.Date;
-
-@TableName("social_user")
-@Data
-public class SocialUser implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * 主键
-	 */
-	@JsonSerialize(using = ToStringSerializer.class)
-	@ApiModelProperty(value = "主键")
-	@TableId(value = "id", type = IdType.ASSIGN_ID)
-	private Long id;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "租户ID")
-	private String tenantId;
-
-	@ApiModelProperty(value = "创建日期")
-	private Date createdDate;
-
-	@ApiModelProperty(value = "修改日期")
-	private Date lastModifiedDate;
-
-	@ApiModelProperty(value = "修改日期")
-	private Integer version;
-
-	@ApiModelProperty(value = "openId")
-	private String uniqueId;
-
-	@ApiModelProperty(value = "用户ID")
-	private Long userId;
-
-	@ApiModelProperty(value = "昵称")
-	private Integer name;
-
-	@ApiModelProperty(value = "性别")
-	private Integer gender;
-
-	@ApiModelProperty(value = "头像")
-	private Integer averter;
-
-	@ApiModelProperty(value = "电话")
-	private Integer tel;
-
-	@ApiModelProperty(value = "account")
-	private String account;
-
-	@TableLogic
-	private Integer isEnabled;
-}

blade-sched-api/src/main/java/org.springblade.mid/entity/WXConfig.java

-package org.springblade.mid.entity;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class WXConfig implements Serializable {
-//{"mchId":"1520601861","apiKey":"GRMd42LnZBf0ce1tuiKo4cTUsXYMB8aX","displayName":"微信支付(小程序）","appId":"wx97a520365a9cc0b9","fee":"0","logo":"http://xy-health-pro.oss-cn-beijing.aliyuncs.com/upload/image/202003/13949ffb-76e3-4e9e-9225-b16d8cc99ed5.png","description":null,"appSecret":"ae90c42a8dd8853259d409eb169e337b","feeType":"SCALE"}
-	private String openIdRequestURL = "https://api.weixin.qq.com/sns/oauth2/access_token";
-	private String apiKey;
-	private String appId;
-	private String appSecret;
-	private String mchId;
-
-}

blade-sched-api/src/main/java/org.springblade.mid/excel/BaseSchedule.java

+package org.springblade.mid.excel;
+
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 每个月的考勤都会有的综合信息
+ * 可以用作3月份的考勤模板（平年）
+ * @author Night
+ * Date:  2020/4/21
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class BaseSchedule {
+	
+	/**
+	 * 基础信息
+	 */
+	private String nurseName;
+	
+	private String agentName;
+	
+	private String doctorName;
+	
+	private String departmentName;
+	
+	private String hosName;
+	
+	/**
+	 * 上个月份的几天的考勤
+	 */
+	private String twentyFirst;
+	
+	private String twentySecond;
+	
+	private String twentyThird;
+	
+	private String twentyFourth;
+	
+	private String twentyFifth;
+	
+	private String twentySixth;
+	
+	private String twentySeventh;
+	
+	private String twentyEighth;
+	
+	/**
+	 * 当前月份考勤
+	 */
+	private String first;
+	
+	private String second;
+	
+	private String third;
+	
+	private String fourth;
+	
+	private String fifth;
+	
+	private String sixth;
+	
+	private String seventh;
+	
+	private String eighth;
+	
+	private String ninth;
+	
+	private String tenth;
+	
+	private String eleventh;
+	
+	private String twelfth;
+	
+	private String thirteenth;
+	
+	private String fourteenth;
+	
+	private String fifteenth;
+	
+	private String sixteenth;
+	
+	private String seventeenth;
+	
+	private String eighteenth;
+	
+	private String nineteenth;
+	
+	private String twentieth;
+	
+	public static List<String> titles = Arrays.
+			asList("护理员","服务公司","所属护士长","所属科室","所属医院","21","22","23","24","25",
+					"26","27","28","1","2","3","4","5","6","7","8","9","10","11","12","13","14",
+					"15","16","17","18","19","20");
+	public static List<String> order = Arrays.
+			asList("nurseName","agentName","doctorName","departmentName","hosName","twentyFirst",
+					"twentySecond","twentyThird","twentyFourth","twentyFifth",
+					"twentySixth","twentySeventh","twentyEighth","first","second",
+					"third","fourth","fifth","sixth","seventh","eighth","ninth","tenth",
+					"eleventh","twentieth","thirteenth","fourteenth", "fifteenth",
+					"sixteenth","seventeenth","eighteenth","nineteenth","twentieth");
+	
+	public static String Feb = "02";
+}

blade-sched-api/src/main/java/org.springblade.mid/excel/NurseCrowd.java

-package org.springblade.mid.excel;
-
-
-import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
-import lombok.Data;
-
-/**
- * @author Night
- * Date:  2020/4/13
- */
-@Data
-public class NurseCrowd {
-
-	/**
-	 * 代理商ID
-	 */
-	@ExcelColumn(index = 0)
-	private String agentId;
-
-	/**
-	 * 所属护理公司
-	 */
-	@ExcelColumn(index = 1)
-	private String agentName;
-
-	/**
-	 * 所属医院ID
-	 */
-	@ExcelColumn(index = 2)
-	private String hosId;
-
-	/**
-	 * 所属医院名称
-	 */
-	@ExcelColumn(index = 3)
-	private String hosName;
-	/**
-	 * 添加人
-	 */
-	@ExcelColumn(index = 4)
-	private String addUser;
-	/**
-	 * 电话
-	 */
-	@ExcelColumn(index = 5)
-	private String tel;
-
-	/**
-	 * 护工类型1护士,2护工
-	 */
-	@ExcelColumn(index = 6)
-	private Integer type;
-
-	/**
-	 * 真实姓名
-	 */
-	@ExcelColumn(index = 7)
-	private String realName;
-
-	/**
-	 * 性别,1男,2女,3待定
-	 */
-	@ExcelColumn(index = 8)
-	private Integer sex;
-
-	/**
-	 * 认证状态 1认证中，2认证通过，3认证未通过
-	 */
-	@ExcelColumn(index = 9)
-	private String status;
-
-
-}

blade-sched-api/src/main/java/org.springblade.mid/excel/ThirtyOneSchedule.java

+package org.springblade.mid.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Night
+ * Date:  2020/4/21
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class ThirtyOneSchedule extends BaseSchedule {
+	
+	private String thirtyOne;
+	
+	public static List<String> titles = Arrays.
+			asList("护理员","服务公司","所属护士长","所属科室","所属医院","21","22","23","24","25",
+					"26","27","28","29","30","31","1","2","3","4","5","6","7","8","9","10","11","12","13","14",
+					"15","16","17","18","19","20");
+	public static List<String> order = Arrays.
+			asList("nurseName","agentName","doctorName","departmentName","hosName","twentyFirst",
+					"twentySecond","twentyThird","twentyFourth","twentyFifth",
+					"twentySixth","twentySeventh","twentyEighth","twentyNinth","thirtieth",
+					"thirtyOne","first","second",
+					"third","fourth","fifth","sixth","seventh","eighth","ninth","tenth",
+					"eleventh","twentieth","thirteenth","fourteenth", "fifteenth",
+					"sixteenth","seventeenth","eighteenth","nineteenth","twentieth");
+	
+	public static List<String> thirtyOneDays = Arrays.asList("01","03","05","07","08","10","12");
+}

blade-sched-api/src/main/java/org.springblade.mid/excel/ThirtySchedule.java

+package org.springblade.mid.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * @author Night
+ * Date:  2020/4/21
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class ThirtySchedule extends BaseSchedule {
+	
+	private String twentyNinth;
+	
+	private String thirtieth;
+	
+	public static List<String> titles = Arrays.
+			asList("护理员","服务公司","所属护士长","所属科室","所属医院","21","22","23","24","25",
+					"26","27","28","29","30","1","2","3","4","5","6","7","8","9","10","11","12","13","14",
+					"15","16","17","18","19","20");
+	public static List<String> order = Arrays.
+			asList("nurseName","agentName","doctorName","departmentName","hosName","twentyFirst",
+					"twentySecond","twentyThird","twentyFourth","twentyFifth",
+					"twentySixth","twentySeventh","twentyEighth","twentyNinth","thirtieth","first","second",
+					"third","fourth","fifth","sixth","seventh","eighth","ninth","tenth",
+					"eleventh","twentieth","thirteenth","fourteenth", "fifteenth",
+					"sixteenth","seventeenth","eighteenth","nineteenth","twentieth");
+	
+	public static List<String> thirtyDays = Arrays.asList("04","06","09","11");
+}

blade-sched-api/src/main/java/org.springblade.mid/excel/TwentyNineSchedule.java

+package org.springblade.mid.excel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+/**
+ * @author Night
+ * Date:  2020/4/21
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Accessors(chain = true)
+public class TwentyNineSchedule extends BaseSchedule {
+	
+	private String twentyNinth;
+}

blade-sched-api/src/main/java/org.springblade.mid/feign/IAgentClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.core.tool.api.R;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = IAgentClientFallback.class
-)
-public interface IAgentClient {
-
-	String API_PREFIX = "/api-agent";
-	String SAVE = API_PREFIX + "/save";
-
-	@GetMapping(SAVE)
-	R save(@RequestBody Agent agent);
-
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IAgentClientFallback.java

-package org.springblade.mid.feign;
-
-
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.core.tool.api.R;
-import org.springframework.stereotype.Component;
-
-@Component
-public class IAgentClientFallback implements IAgentClient {
-	@Override
-	public R save(Agent agent) {
-		return R.data(new Hospital());
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IAppConfigClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.AppConfig;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = IConfigClientFallback.class
-)
-public interface IAppConfigClient {
-
-	String API_PREFIX = "/api-config";
-	String FIND = API_PREFIX + "/find";
-
-	@GetMapping(FIND)
-	R<AppConfig> find(@RequestParam String tenantId);
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IConfigClientFallback.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.AppConfig;
-import org.springframework.stereotype.Component;
-
-@Component
-public class IConfigClientFallback implements IAppConfigClient {
-
-	@Override
-	public R<AppConfig> find(String tenantId) {
-		return null;
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IDoctorClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Doctor;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = IDoctorClientFallback.class
-)
-public interface IDoctorClient {
-
-	String API_PREFIX = "/api-doctor";
-	String FIND = API_PREFIX + "/find";
-
-	@GetMapping(FIND)
-	R<Doctor> find(String id);
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IDoctorClientFallback.java

-package org.springblade.mid.feign;
-
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Doctor;
-import org.springframework.stereotype.Component;
-
-//@Component
-public class IDoctorClientFallback{
-//	implements IDoctorClient {
-
-//	@Override
-//	public R<Doctor> find(String id) {
-//		return R.data(null);
-//	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IHospitalClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.mid.entity.Hospital;
-import org.springblade.core.tool.api.R;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = IHospitalClientFallback.class
-)
-public interface IHospitalClient {
-
-	String API_PREFIX = "/api-hospital";
-	String SAVE = API_PREFIX + "/save";
-	String FIND = API_PREFIX + "/find";
-
-	@GetMapping(SAVE)
-	R save(@RequestBody Hospital hospital);
-
-	@GetMapping(FIND)
-	R<Hospital> find(String id);
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IHospitalClientFallback.java

-package org.springblade.mid.feign;
-
-
-import org.springblade.mid.entity.Hospital;
-import org.springblade.core.tool.api.R;
-import org.springframework.stereotype.Component;
-
-@Component
-public class IHospitalClientFallback implements IHospitalClient {
-	@Override
-	public R save(Hospital hospital) {
-		return R.data(new Hospital());
-	}
-
-	@Override
-	public R<Hospital> find(String id) {
-		return R.fail("获取数据失败");
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/INurseClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Nurse;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = INurseClientFallback.class
-)
-public interface INurseClient {
-
-	String API_PREFIX = "/api-nurse";
-	String FIND = API_PREFIX + "/nurseByIds";
-
-	@GetMapping(FIND)
-	R<List<Nurse>> find(@RequestParam("nurseIds") String nurseIds);
-
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/INurseClientFallback.java

-package org.springblade.mid.feign;
-
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.mid.entity.Nurse;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-@Component
-public class INurseClientFallback implements INurseClient {
-
-	@Override
-	public R<List<Nurse>> find(String nurseIds) {
-		return R.fail("获取数据失败");
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IOauthClient.java

-package org.springblade.mid.feign;
-
-import com.fasterxml.jackson.databind.util.JSONPObject;
-import org.springblade.mid.vo.OauthReq;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.Map;
-
-@FeignClient(
-	value = "blade-auth",
-	fallback = IOauthFallback.class
-)
-public interface IOauthClient {
-
-	/**
-	 *
-	 * @param tenantId
-	 * @param username
-	 * @param password
-	 * @param type
-	 * @param scope
-	 * @param grantType
-	 * @param tid
-	 * @param auth
-	 * @return
-	 */
-	@PostMapping(value = "/oauth/token")
-	public Map<String,String> token1(@RequestParam String tenantId,@RequestParam String username,@RequestParam String password,@RequestParam String type,@RequestParam String scope,@RequestParam("grant_type")String grantType,@RequestHeader("Tenant-Id") String tid,@RequestHeader("Authorization") String auth);
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IOauthFallback.java

-package org.springblade.mid.feign;
-
-import org.springblade.mid.vo.OauthReq;
-import org.springframework.stereotype.Component;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Component
-public class IOauthFallback implements IOauthClient {
-
-	@Override
-	public Map<String, String> token1(String tenantId, String username, String password, String type, String scope, String grantType, String tid, String auth) {
-		return null;
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IPensionClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Pension;
-
-public interface IPensionClient {
-
-	public R<Pension> find(String id );
-	public R save(Pension pension);
-	public R upd(Pension pension);
-	public R del(String ids);
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/IPensionClientFallback.java

-package org.springblade.mid.feign;
-
-import org.springblade.mid.entity.Pension;
-import org.springblade.core.tool.api.R;
-import org.springframework.stereotype.Component;
-
-//@Component
-public class IPensionClientFallback implements IPensionClient {
-	@Override
-	public R<Pension> find(String id) {
-		return null;
-	}
-
-	@Override
-	public R<Pension> save(Pension pension) {
-		return null;
-	}
-
-	@Override
-	public R<Pension> upd(Pension pension) {
-		return null;
-	}
-
-	@Override
-	public R<Pension> del(String ids) {
-		return null;
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/ISocialUserClient.java

-package org.springblade.mid.feign;
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
-
-@FeignClient(
-	value = "blade-mid",
-	fallback = ISocialUserClientFallback.class
-)
-public interface ISocialUserClient {
-
-	String API_PREFIX = "/api-socialUser";
-	String FIND = API_PREFIX + "/find";
-
-	@GetMapping(FIND)
-	R find(@RequestParam("userId") Long userId);
-
-}

blade-sched-api/src/main/java/org.springblade.mid/feign/ISocialUserClientFallback.java

-package org.springblade.mid.feign;
-
-
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Hospital;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ISocialUserClientFallback implements ISocialUserClient {
-
-	@Override
-	public R find(Long userId) {
-		return R.fail("获取数据失败");
-	}
-}

blade-sched-api/src/main/java/org.springblade.mid/vo/ExcelHourStatisticVO.java

+package org.springblade.mid.vo;
+
+import com.github.liaochong.myexcel.core.WorkbookType;
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelTable;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Night
+ * Date:  2020/1/2
+ */
+@ExcelTable(sheetName = "工时统计信息", workbookType = WorkbookType.SXLSX, rowAccessWindowSize = 1000, useFieldNameAsTitle = true)
+@Data
+public class ExcelHourStatisticVO implements Serializable {
+    
+    @ExcelColumn(order = 1, title = "护理员名字")
+    private String nurseName;
+    @ExcelColumn(order = 2, title = "所属服务公司")
+    private String agentName;
+    @ExcelColumn(order = 3, title = "护士长名字")
+    private String doctorName;
+    @ExcelColumn(order = 4, title = "科室名称")
+    private String departmentName;
+    @ExcelColumn(order = 5, title = "所属医院")
+    private String hosName;
+    @ExcelColumn(order = 6, title = "总工时")
+    private int totalHours;
+    @ExcelColumn(order = 7, title = "标准工时")
+    private int stdHours;
+    @ExcelColumn(order = 8,title = "超时工时")
+    private int outHour;
+    
+}

blade-sched-api/src/main/java/org.springblade.mid/vo/ExcelScheduleVO.java

+package org.springblade.mid.vo;
+
+import com.github.liaochong.myexcel.core.WorkbookType;
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelTable;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author Night
+ * Date:  2020/1/2
+ */
+@ExcelTable(sheetName = "排班考勤统计信息", workbookType = WorkbookType.SXLSX, rowAccessWindowSize = 1000, useFieldNameAsTitle = true)
+@Data
+public class ExcelScheduleVO implements Serializable {
+    
+    @ExcelColumn(order = 1, title = "护理员名字")
+    private String nurseName;
+    @ExcelColumn(order = 2, title = "所属服务公司")
+    private String agentName;
+    @ExcelColumn(order = 3, title = "护士长名字")
+    private String doctorName;
+    @ExcelColumn(order = 4, title = "科室名称")
+    private String departmentName;
+    @ExcelColumn(order = 5, title = "所属医院")
+    private String hosName;
+    @ExcelColumn(order = 6, title = "周一")
+    private String monday;
+    @ExcelColumn(order = 7, title = "周二")
+    private String tuesday;
+    @ExcelColumn(order = 8,title = "周三")
+    private String wednesday;
+    @ExcelColumn(order = 9,title = "周四")
+    private String thursday;
+    @ExcelColumn(order = 10,title = "周五")
+    private String friday;
+    @ExcelColumn(order = 11,title = "周六")
+    private String saturday;
+    @ExcelColumn(order = 12,title = "周日")
+    private String sunday;
+    
+}

blade-sched-api/src/main/java/org.springblade.mid/vo/OauthReq.java

-package org.springblade.mid.vo;
-
-import lombok.Data;
-
-@Data
-public class OauthReq {
-	private String username;
-	private String password;
-	private String tenantId;
-	private String scope="all";
-	private String grant_type="password";
-	private String type="account";
-
-}

blade-sched-api/src/main/java/org.springblade.mid/vo/ScheduleVO.java

@@ -53,5 +53,7 @@ public class ScheduleVO implements Serializable {
      */
     private String departmentName;
     
+    private String tenId;
+    
     private List<ScheduleDetailVO> scheduleDetailVOList = new ArrayList<>();
 }

blade-sched-api/src/main/java/org.springblade.mid/vo/SelectScheduleVO.java

+package org.springblade.mid.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 查询排班时的参数vo对象
+ * @author Night
+ * Date:  2020/5/26
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class SelectScheduleVO {
+	
+	String doctorId;
+	String startTime;
+	String endTime;
+	String agentName;
+	String agentId;
+	String nurseId;
+	String nurseName;
+	String hosId;
+	String departmentName;
+	String tenId;
+	
+}

blade-sched-api/src/main/java/org.springblade.mid/vo/WxConfig.java

-package org.springblade.mid.vo;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-@Data
-public class WxConfig {
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "appid")
-	private String appId;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "secret")
-	private String appSecret;
-
-	/**
-	 * 租户ID
-	 */
-	@ApiModelProperty(value = "商户号")
-	private String mchId;
-}

blade-sched/pom.xml

@@ -52,6 +52,11 @@
             <artifactId>blade-system</artifactId>
             <version>${bladex.project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-mid-api</artifactId>
+            <version>${bladex.project.version}</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

blade-sched/src/main/java/org/springblade/agent/controller/AddressController.java

-package org.springblade.agent.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.agent.service.IAddressService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Area;
-import org.springframework.cache.annotation.Cacheable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@Slf4j
-@RequestMapping("/address")
-@Api("地址信息")
-public class AddressController {
-
-	private IAddressService addressService;
-
-	@RequestMapping(value = "/addressList", method = RequestMethod.GET)
-	@ApiOperation("获取地理位置信息")
-	@Cacheable("areasist")
-	public R addressList() {
-		log.info("---->获取地址列表");
-		return R.data(addressService.addressList());
-	}
-
-	@RequestMapping(value = "/lazyList", method = RequestMethod.GET)
-	@ApiOperation("获取地理位置信息")
-	@ApiImplicitParams({
-		@ApiImplicitParam(value = "lvl",dataType ="String"),
-		@ApiImplicitParam(value = "parentCode",dataType ="String")
-	})
-	public R lazyList(@RequestParam Map<String,Object> params) {
-		log.info("---->获取地址列表");
-		return R.data(addressService.list(Condition.getQueryWrapper(params, Area.class)));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/AgentController.java

-package org.springblade.agent.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.mid.entity.Agent;
-import org.springblade.agent.service.IAgentService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/agent")
-@Slf4j
-@Api(tags = "代理商（(弃用)），租户里面增删改")
-public class AgentController extends BladeController {
-
-
-	private IAgentService agentService;
-
-
-	@PostMapping(value = "/select/list")
-	public R<List<Agent>> selAgentList() {
-		log.info("接口【selAgentList】");
-		return R.data(agentService.list());
-	}
-
-	@PostMapping(value = "/manage/list")
-	public R<IPage<Agent>> manageList(@RequestBody Map<String,Object> jsonObject, Query query) {
-		log.info("接口【selAgentList】");
-		return R.data(agentService.page(Condition.getPage(query),Condition.getQueryWrapper(jsonObject,Agent.class)));
-
-	}
-
-	/**
-	 *
-	 * @return
-	 */
-	@PostMapping(value = "/manage/ins")
-	public R insAgent(@RequestBody Agent agent) {
-		log.info("新增代理商【insAgent】，入参={}",agent);
-		return R.status(agentService.save(agent));
-	}
-
-
-	/**
-	 * 护工/护士列表
-	 * @return
-	 */
-	@PostMapping(value = "/manage/upd")
-	public R updAgent(@RequestBody Agent agent) {
-		log.info("修改代理商【updAgent】，入参={}",agent);
-		return R.status(agentService.update(Condition.getQueryWrapper(agent)));
-	}
-
-
-	/**
-	 * 删除代理商
-	 * @return
-	 */
-	@PostMapping(value = "/manage/del")
-	public R delAgent(String ids) {
-		log.info("删除代理商【delAgent】，入参={}",ids);
-		return R.status(agentService.removeByIds(Func.toLongList(ids)));
-	}
-
-	/**
-	 * @param id
-	 * @return
-	 */
-	@PostMapping(value = "/manage/byid")
-	public R<Agent> selById(String id) {
-		log.info("查询代理商【selById】，入参={}",id);
-		return R.data(agentService.getById(id));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/AgentHosController.java

-package org.springblade.agent.controller;
-
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.mid.entity.AgentHos;
-import org.springblade.agent.service.IAgentHosService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.annotation.PreAuth;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author max
- * @since 2020-04-27
- */
-@RestController
-@RequestMapping("/bind")
-@Slf4j
-@AllArgsConstructor
-@Api(value = "医院和代理商绑定",tags = "医院和代理商绑定")
-public class AgentHosController extends BladeController {
-
-	private IAgentHosService agentHosService;
-
-	/**
-	 * @Author: ssh
-	 * @Description: 服务公司
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping(value = "/agenttohos/list")
-	@ApiOperation(value = "绑定列表",notes = "绑定列表")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R<IPage<AgentHos>> bindAgentToHosListCro(@RequestBody JSONObject jsonObject, Query query){
-//        CommonUtil.hasAllRequired(jsonObject, "agentId");
-		log.info("【BindController>>>detail】Param = {}", jsonObject);
-		return R.data(agentHosService.page(Condition.getPage(query),Condition.getQueryWrapper(jsonObject,AgentHos.class)));
-	}
-
-	/**
-	 * @Author: ssh
-	 * @Description: 绑定
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping(value = "/agenttohos/bind")
-	@ApiImplicitParams(
-		{
-			@ApiImplicitParam(value = "agentId",required = true),
-			@ApiImplicitParam(value = "agentName",required = true),
-			@ApiImplicitParam(value = "hosId",required = true),
-			@ApiImplicitParam(value = "hosName",required = true)
-		}
-	)
-	@ApiOperation(value = "绑定",notes = "绑定")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R bindAgentToHos(@RequestBody Map<String,Object> jsonObject){
-//        CommonUtil.hasAllRequired(jsonObject, "agentId,agentName,hosId,hosName");
-		log.info("【BindController>>>bindAgentToHos】Param = {}", jsonObject);
-		return R.status(agentHosService.bindAgentToHos(jsonObject));
-
-	}
-
-	/**
-	 * @Author: ssh
-	 * @Description: 修改
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping(value = "/agenttohos/updtime")
-	@ApiOperation(value = "修改",notes = "修改")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R updAgentToHos(@RequestBody AgentHos agentHos){
-		log.info("【BindController>>>bindAgentToHos】Param = {}", agentHos);
-		return R.status(agentHosService.update(Condition.getQueryWrapper(agentHos)));
-
-	}
-
-	/**
-	 * @Author: ssh
-	 * @Description: 删除
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping(value = "/agenttohos/del")
-	@ApiOperation(value = "删除",notes = "删除")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	public R delAgentToHos(String ids){
-//        CommonUtil.hasAllRequired(json, "id");
-		log.info("【BindController>>>bindAgentToHos】Param = {}", ids);
-		return R.status(agentHosService.removeByIds(Func.toLongList(ids)));
-
-	}
-
-}

blade-sched/src/main/java/org/springblade/agent/controller/AppConfigController.java

-package org.springblade.agent.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.AppConfig;
-import org.springblade.agent.service.IAppConfigService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.PreAuth;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RequestMapping("/config")
-@RestController
-@AllArgsConstructor
-public class AppConfigController {
-
-	private IAppConfigService appConfigService;
-
-	@GetMapping("/detail")
-	@ApiOperation(value = "配置详情",notes = "配置详情")
-	public R findConfig(String tenantId,BladeUser user){
-		return R.data(appConfigService.getOne(new QueryWrapper<AppConfig>().lambda().eq(AppConfig::getTenantId,tenantId)));
-	}
-
-	@PostMapping("/submit")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	@ApiOperation(value = "配置新增",notes = "配置新增")
-	public R submit(@RequestBody AppConfig appConfig, BladeUser user){
-		AppConfig config = appConfigService.getOne(Wrappers.<AppConfig>query().lambda().eq(AppConfig::getTenantId,user.getTenantId()));
-		if(config != null){
-			return R.fail("该用户已有配置信息,请勿重复添加");
-		}
-		return R.data(appConfigService.save(appConfig));
-	}
-
-	@PutMapping("/update")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	@ApiOperation(value = "配置修改",notes = "配置修改")
-	public R update(@RequestBody AppConfig appConfig, BladeUser user){
-		AppConfig config = appConfigService.getOne(Wrappers.<AppConfig>query().lambda().eq(AppConfig::getTenantId,user.getTenantId()).ne(AppConfig::getId,appConfig.getId()));
-		if(config != null){
-			return R.fail("参数错误，请确认");
-		}
-		return R.data(appConfigService.updateById(appConfig));
-	}
-
-	@PostMapping("/del")
-	@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
-	@ApiOperation(value = "删除配置",notes = "删除配置")
-	public R delConfig(String ids,BladeUser user){
-		return R.data(appConfigService.removeByIds(Func.toLongList(ids)));
-	}
-
-	@GetMapping("/list")
-	@ApiOperation(value = "配置列表",notes = "配置列表")
-	public R list(@RequestParam Map<String,Object> config, Query query, BladeUser user){
-		return R.data(appConfigService.page(Condition.getPage(query),Condition.getQueryWrapper(config,AppConfig.class)));
-	}
-
-	@GetMapping("/find")
-	@ApiOperation(value = "通过域名主站获取配置",notes = "通过域名主站获取配置")
-	public R lists(String miniProgram){
-		return R.data(StringUtils.isEmpty(miniProgram)?new Object():appConfigService.getOne(Wrappers.lambdaQuery(AppConfig.class).eq(AppConfig::getMiniProgram,miniProgram)));
-	}
-
-
-}

blade-sched/src/main/java/org/springblade/agent/controller/ClassController.java

-package org.springblade.agent.controller;
-
-import io.swagger.annotations.Api;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@AllArgsConstructor
-@Slf4j
-@RequestMapping("/address")
-@Api("排班")
-public class ClassController extends BladeController {
-
-}

blade-sched/src/main/java/org/springblade/agent/controller/DoctorController.java

-package org.springblade.agent.controller;
-
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.mid.entity.Doctor;
-import org.springblade.agent.service.IDoctorService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.annotation.PreAuth;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * @Auther FREAKS
- * @Date 2019/12/6
- */
-
-@RequestMapping(value = "/doctor")
-@RestController
-@AllArgsConstructor
-@Slf4j
-@Api("医生/护士长操作")
-public class DoctorController {
-
-    private IDoctorService doctorService;
-
-    /**
-     * @Author: FREAKS
-     * @Description: 医生列表
-     * @Date: 2019/12/6
-     * @Param:
-     * @Return:
-     */
-    @PostMapping("list")
-	@ApiImplicitParams({
-		@ApiImplicitParam(value = "type",required = true,example="0 医生 1 护士长"),
-		@ApiImplicitParam(value = "relName",required = false),
-		@ApiImplicitParam(value = "depart",required = false),
-		@ApiImplicitParam(value = "tenantId",required = true)
-	})
-	@ApiOperation(value = "医生列表",notes = "医生列表")
-//	@PreAuth("hasAnyRole('doctor', 'header_nurse')")
-    public R<IPage> doctorList(@RequestBody Map<String,Object> doctor, Query query){
-        log.info("DoctorController===>>>【doctorList】，入参={}",doctor);
-		return R.data(doctorService.page(Condition.getPage(query), Condition.getQueryWrapper(doctor, Doctor.class)));
-
-    }
-    /**
-     * @Author: Max Su
-     * @Description: 新增医生信息
-     * @Date: 2019/12/6
-     * @Param:
-     * @Return:
-     */
-    @PostMapping("ins")
-	@ApiOperation(value = "新增医生信息",notes = "新增医生信息")
-//	@PreAuth("hasAnyRole('doctor', 'header_nurse')")
-    public R insDoc(@RequestBody Doctor doctor, BladeUser user){
-        log.info("DoctorController===>>>【insDoc】，入参={}",doctor);
-//		doctor.setTenantId(user.getTenantId());
-        return R.status(doctorService.save(doctor));
-
-    }
-
-	/**
-	 * @Author: Max Su
-	 * @Description: 新增医生信息
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping("detail")
-	@ApiOperation(value = "医生信息",notes = "医生信息")
-//	@PreAuth("hasAnyRole('doctor', 'header_nurse')")
-	public R selectDoc(String id, BladeUser user){
-		log.info("DoctorController===>>>【insDoc】，入参={}",id);
-		return R.data(doctorService.getById(id));
-
-	}
-    /**
-     * @Author: Max Su
-     * @Description: 修改医生信息
-     * @Date: 2019/12/6
-     * @Param:
-     * @Return:
-     */
-    @PostMapping("upd")
-	@ApiOperation(value = "修改医生信息",notes = "修改医生信息")
-//	@PreAuth("hasAnyRole('doctor', 'header_nurse')")
-    public R updDoc(@RequestBody Doctor doctor, BladeUser user){
-        log.info("DoctorController===>>>【updDoc】，入参={}",doctor);
-		doctor.setTenantId(user.getTenantId());
-		return R.status(doctorService.updateById(doctor));
-    }
-
-//    /**
-//     * @Author: Max Su
-//     * @Description: 查询停用启用状态
-//     * @Date: 2019/12/6
-//     * @Param:
-//     * @Return:
-//     */
-//    @PostMapping("selLoginStatus")
-//    @ResponseBody
-//    public R selLoginStatus(@RequestBody JSONObject jsonObject){
-////        log.info("DoctorController===>>>【updDoc】，入参={}",jsonObject);
-////        TxResultResponse tx = new TxResultResponse(CommonCode.SUCCESS.getCode(), "操作成功！");
-////        try {
-////            if(Strings.isNullOrEmpty(jsonObject.getString("username"))){
-////                throw new CommonException(CommonCode.DATA_NOT_FOUND.getCode(),"入参username为空");
-////            }
-////            return loginService.selByUsername(jsonObject.getString("username"));
-////        } catch (CommonException e) {
-////            log.error("DoctorController===>>>【updDoc】,e={}", e);
-////            return new TxResultResponse(e.getCode(), e.getMsg());
-////        } catch (Exception e) {
-////            e.printStackTrace();
-////            log.error("DoctorController===>>>【updDoc】,e={}", e);
-////            return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-////        }
-////    }
-    /**
-     * @Author: Max Su
-     * @Description: 删除医生信息
-     * @Date: 2019/12/6
-     * @Param:
-     * @Return:
-     */
-    @PostMapping("del")
-	@ApiOperation(value = "删除医生信息",notes = "删除医生信息")
-//	@PreAuth("hasAnyRole('doctor', 'header_nurse')")
-    public R delDoc(String ids){
-        log.info("DoctorController===>>>【delDoc】，入参={}",ids);
-		return R.status(doctorService.removeByIds(Func.toLongList(ids)));
-    }
-    /**
-     * @Author: Max Su
-     * @Description: 重置密码
-     * @Date: 2019/12/6
-     * @Param:
-     * @Return:
-     */
-//    @PostMapping("reset")
-//    @ResponseBody
-//    public TxResultResponse resetPassword(@RequestBody JSONObject jsonObject){
-//        log.info("DoctorController===>>>【resetPassword】，入参={}",jsonObject);
-//        try {
-//            TxResultResponse tx = loginService.resetPassword(jsonObject.getString("username"));
-//            return tx;
-//        } catch (CommonException e) {
-//            log.error("DoctorController===>>>【resetPassword】,e={}", e);
-//            return new TxResultResponse(e.getCode(), e.getMsg());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error("DoctorController===>>>【resetPassword】,e={}", e);
-//            return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-//        }
-//    }
-//    /**
-//     * @Author: Max Su
-//     * @Description: 科室列表
-//     * @Date: 2019/12/10
-//     * @Param:
-//     * @Return:
-//     */
-//    @PostMapping("depart")
-//    @ResponseBody
-//    public R getDepart(@RequestBody JSONObject jsonObject){
-//        TxResultResponse tx = new TxResultResponse(CommonCode.SUCCESS.getCode(),"操作成功!");
-//        log.info("DoctorController===>>>【getDepart】，入参={}",jsonObject);
-//        try {
-//            List<String> departList = doctorService.getDepart(jsonObject);
-//            tx.setData(departList);
-//            return tx;
-//        } catch (CommonException e) {
-//            log.error("DoctorController===>>>【getDepart】,e={}", e);
-//            return new TxResultResponse(e.getCode(), e.getMsg());
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//            log.error("DoctorController===>>>【getDepart】,e={}", e);
-//            return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-//        }
-//    }
-}

blade-sched/src/main/java/org/springblade/agent/controller/ExportScheduleController.java

+package org.springblade.agent.controller;
+
+import com.github.liaochong.myexcel.core.DefaultExcelBuilder;
+import com.github.liaochong.myexcel.utils.AttachmentExportUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springblade.agent.service.ScheduleService;
+import org.springblade.core.mp.support.Query;
+import org.springblade.mid.convert.ScheduleVO2ExcelScheduleVOConverter;
+import org.springblade.mid.excel.BaseSchedule;
+import org.springblade.mid.excel.ThirtyOneSchedule;
+import org.springblade.mid.excel.ThirtySchedule;
+import org.springblade.mid.vo.ExcelHourStatisticVO;
+import org.springblade.mid.vo.HourStatisticsVO;
+import org.springblade.mid.vo.ScheduleVO;
+import org.springblade.mid.vo.SelectScheduleVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created with IDEA
+ * author: Night
+ * p _ p
+ * Date:2019/1/2
+ * Time:15:18
+ * 排班，考勤，工时导出
+ * 导出报表
+ */
+@RequestMapping(value = "/export")
+@RestController
+@Slf4j
+public class ExportScheduleController {
+    
+    @Resource
+    private ScheduleService scheduleService;
+    
+    
+    /**
+     * 导出工时统计excel
+     */
+    @GetMapping("/hourStatistic")
+    public void streamBuild(SelectScheduleVO selectScheduleVO, HttpServletResponse response) throws Exception {
+        log.info("[进入exportScheduled]，导出工时统计报表");
+        long start  = System.currentTimeMillis();
+	    Query query = new Query();
+	    query.setCurrent(0);
+	    query.setSize(10000);
+        List<HourStatisticsVO> list = scheduleService.hourStatistic(selectScheduleVO,query).getData().getRecords();
+        List<ExcelHourStatisticVO> excelHourStatisticVOList = new ArrayList<>();
+	    list.forEach(hourStatisticsVO -> {
+		    ExcelHourStatisticVO excelHourStatisticVO = new ExcelHourStatisticVO();
+		    BeanUtils.copyProperties(hourStatisticsVO, excelHourStatisticVO);
+		    excelHourStatisticVOList.add(excelHourStatisticVO);
+	    });
+        if(excelHourStatisticVOList.size() != 0){
+	        excelHourStatisticVOList.forEach(ex -> ex.setOutHour(ex.getTotalHours() - ex.getStdHours()));
+        }
+        Workbook workbook = DefaultExcelBuilder.of(ExcelHourStatisticVO.class)
+                .build(excelHourStatisticVOList);
+        String title = selectScheduleVO.getStartTime() + "-" + selectScheduleVO.getEndTime();
+        AttachmentExportUtil.export(workbook, title + "工时统计信息", response);
+        long end = System.currentTimeMillis(); // 获取结束时间
+        log.info("程序运行时间============>： " + (end - start) + "ms");
+    }
+    
+    /**
+     * 导出排班统计excel  type为1,2  1是排班  2是考勤
+     */
+    @GetMapping("/test")
+    public void test(SelectScheduleVO selectScheduleVO, Integer type, HttpServletResponse response) throws Exception {
+        log.info("[进入test]，导出排班统计报表");
+        long start  = System.currentTimeMillis();
+	    Query query = new Query();
+	    query.setCurrent(0);
+	    query.setSize(10000);
+        List<ScheduleVO> scheduleVOList = scheduleService.getScheduleList(selectScheduleVO);
+        String month = selectScheduleVO.getStartTime().substring(5,7);
+        Workbook workbook;
+        if (month.equals(BaseSchedule.Feb)){
+            List<BaseSchedule> baseScheduleList = ScheduleVO2ExcelScheduleVOConverter.schvos2Base(scheduleVOList,type);
+            workbook = DefaultExcelBuilder.of(BaseSchedule.class).sheetName("test").titles(BaseSchedule.titles)
+                    .fieldDisplayOrder(BaseSchedule.order).build(baseScheduleList);
+        } else if (ThirtySchedule.thirtyDays.contains(month)){
+            List<ThirtySchedule> thirtyScheduleList = ScheduleVO2ExcelScheduleVOConverter.schvos2Thirty(scheduleVOList,type);
+            workbook = DefaultExcelBuilder.of(ThirtySchedule.class).sheetName("test").titles(ThirtySchedule.titles)
+                    .fieldDisplayOrder(ThirtySchedule.order).build(thirtyScheduleList);
+        } else {
+            List<ThirtyOneSchedule> thirtyOneScheduleList = ScheduleVO2ExcelScheduleVOConverter.schvos2ThirtyOne(scheduleVOList,type);
+            workbook = DefaultExcelBuilder.of(ThirtyOneSchedule.class).sheetName("test").titles(ThirtyOneSchedule.titles)
+                    .fieldDisplayOrder(ThirtyOneSchedule.order).build(thirtyOneScheduleList);
+        }
+        
+        String title = selectScheduleVO.getStartTime() + "-" + selectScheduleVO.getEndTime();
+        String content;
+        if (type == 1){
+            content = "排班统计信息";
+        } else {
+            content = "考勤统计信息";
+        }
+        AttachmentExportUtil.export(workbook, title + content, response);
+        long end = System.currentTimeMillis(); // 获取结束时间
+        log.info("程序运行时间============>： " + (end - start) + "ms");
+    }
+    
+}

blade-sched/src/main/java/org/springblade/agent/controller/HospitalController.java

-package org.springblade.agent.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.agent.service.IHospitalService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RequestMapping(value = "/hospital")
-@RestController
-@Api("医院操作（(弃用)），租户里面增删改")
-@AllArgsConstructor
-@Slf4j
-public class HospitalController extends BladeController {
-
-	IHospitalService hospitalService;
-
-	/**
-	 * 新增医院
-	 * @param hospital
-	 * @return
-	 */
-	@PostMapping(value = "/manage/ins")
-	@ApiOperation(value = "新增医院(弃用)",notes = "新增医院(弃用)")
-	public R insHospital(@RequestBody Hospital hospital) {
-		log.info("HospitalController-->>>【insHospital】，入参={}",hospital);
-		return R.status(hospitalService.save(hospital));
-
-	}
-
-	/**
-	 * 修改医院
-	 * @param hospital
-	 * @return
-	 */
-	@PostMapping(value = "/manage/upd")
-	@ApiOperation(value = "修改医院",notes = "修改医院")
-	public R updHospital(@RequestBody Hospital hospital) {
-		log.info("HospitalController-->>>【updHospital】，入参={}",hospital);
-		return R.status(hospitalService.update(Condition.getQueryWrapper(hospital)));
-	}
-
-	/**
-	 * 删除医院
-	 * @param ids
-	 * @return
-	 */
-	@PostMapping(value = "/manage/del")
-	@ApiOperation(value = "删除医院",notes = "删除医院")
-	public R delHospital(@RequestBody String ids) {
-		log.info("HospitalController-->>>【delHospital】，入参={}",ids);
-		return R.status(hospitalService.removeByIds(Func.toLongList(ids)));
-	}
-
-	/**
-	 *
-	 * @param json
-	 * @param query
-	 * @return
-	 */
-	@PostMapping(value = "/manage/list")
-	@ApiOperation(value = "医院列表",notes = "医院列表")
-	public R<IPage<Hospital>> getHosList(@RequestBody Map<String,Object> json, Query query) {
-		log.info("HospitalController-->>>【getHosList】 列表，入参={}",json);
-		return R.data(hospitalService.page(Condition.getPage(query), Condition.getQueryWrapper(json, Hospital.class)));
-	}
-
-	/**
-	 * @param agentId
-	 * @return
-	 */
-	@GetMapping(value = "/manage/byid")
-	@ApiOperation(value = "通过id获取医院信息",notes = "通过id获取医院信息")
-	public R<Hospital> selById(String  agentId) {
-		log.info("查询代理商【selById】，入参={}",agentId);
-		return R.data(hospitalService.getById(Func.toLong(agentId)));
-
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/NurseController.java

-package org.springblade.agent.controller;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.github.liaochong.myexcel.core.DefaultExcelReader;
-import com.google.common.base.Strings;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springblade.core.tool.constant.RoleConstant;
-import org.springblade.mid.entity.Login;
-import org.springblade.mid.entity.Nurse;
-import org.springblade.mid.excel.NurseCrowd;
-import org.springblade.agent.service.IHospitalService;
-import org.springblade.agent.service.ILoginService;
-import org.springblade.agent.service.INurseService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.secure.annotation.PreAuth;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-@RestController
-@RequestMapping("/nurse")
-@Slf4j
-@AllArgsConstructor
-@Api("护士护工操作")
-public class NurseController extends BladeController {
-
-	private INurseService nurseService;
-
-	private ILoginService loginService;
-
-	private IHospitalService hospitalService;
-
-	/**
-	 * 指派更换治疗室接口
-	 * @param params
-	 * @return
-	 */
-	@PostMapping(value = "/nurseList")
-	@ApiImplicitParam(value = "agentId",required = true)
-	@ApiOperation(value = "根据代理商id获取，护工/护士列表",notes = "根据代理商id获取，护工/护士列表")
-	public R nurseList(@RequestBody Map<String,Object> params) {
-		log.info("根据代理商id获取，护工/护士列表【nurseList】，入参={}",params);
-		List<Nurse> nurses = nurseService.list(Condition.getQueryWrapper(params, Nurse.class).eq("type", 4).eq("is_deleted", 0));
-		ArrayList<JSONObject> jsonObjects = new ArrayList<>();
-		nurses.forEach(N->{
-			JSONObject json = new JSONObject();
-			json.put("id",N.getId());
-			json.put("name",N.getRealName());
-			jsonObjects.add(json);
-		});
-		log.info("根据代理商id获取，护工/护士列表【nurseList】，response={}",jsonObjects);
-		return R.data(jsonObjects);
-	}
-
-	/**
-	 * 护工/护士列表
-	 * @return
-	 */
-	@PostMapping(value = "/list")
-	@ApiOperation(value = "获取护工/护士列表",notes = "获取护工/护士列表")
-	public R<IPage<Nurse>> selectNurse(@RequestBody Nurse json, Query query) {
-		log.info("NurseController-->>>【selectNurse】 列表，入参={}",json);
-		return R.data(nurseService.page(Condition.getPage(query),Condition.getQueryWrapper(json).orderByDesc("created_time")));
-	}
-
-
-	/**
-	 * 护工/护士列表
-	 * @return
-	 */
-	@PreAuth("hasAnyRole('header_nurse','admin','administrator')")
-	@PostMapping(value = "/ins")
-	@ApiOperation(value = "新增护工/护士列表",notes = "新增护工/护士列表")
-	public R insNurse(@RequestBody Nurse jsonObject) {
-		log.info("NurseController-->>>【insNurse】，入参={}",jsonObject);
-		return R.status(nurseService.save(jsonObject));
-	}
-
-	/**
-	 * @Author: FREAKS
-	 * @Description: 查询停用启用状态
-	 * @Date: 2019/12/6
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping("/selLoginStatus")
-	@ApiOperation(value = "查询停用启用状态",notes = "查询停用启用状态")
-	public R selLoginStatus(@RequestBody Map<String,Object> jsonObject){
-		log.info("DoctorController===>>>【updDoc】，入参={}",jsonObject);
-		return R.data(loginService.getOne(Condition.getQueryWrapper(jsonObject, Login.class)));
-	}
-
-	/**
-	 * 修改
-	 * @return
-	 */
-	@PreAuth("hasAnyRole('header_nurse','admin','administrator')")
-	@PostMapping(value = "/upd")
-	@ApiOperation(value = "修改护士护工",notes = "修改护士护工")
-	public R updNurse(@RequestBody Nurse jsonObject) {
-		log.info("NurseController-->>>【updNurse】，入参={}",jsonObject);
-		return R.status(nurseService.updateById(jsonObject));
-	}
-
-
-	/**
-	 * 删除
-	 * @return
-	 */
-	@PreAuth("hasAnyRole('header_nurse','admin','administrator')")
-	@PostMapping(value = "/del")
-	@ApiOperation(value = "删除护士护工",notes = "删除护士护工")
-	public R delNurse(String  ids) {
-		log.info("NurseController-->>>【delNurse】，入参={}",ids);
-		return R.status(nurseService.removeByIds(Func.toLongList(ids)));
-	}
-
-	/**
-	 * 删除
-	 * @return
-	 */
-
-	@PostMapping(value = "/detail")
-	@ApiOperation(value = "护士护工详情",notes = "护士护工详情")
-	public R selectNurse(String  id) {
-		log.info("NurseController-->>>【delNurse】，入参={}",id);
-		return R.data(nurseService.getById(id));
-	}
-
-	/**
-	 * @Author: FREAKS
-	 * @Description: 医院列表
-	 * @Date: 2019/12/10
-	 * @Param:
-	 * @Return:
-	 */
-	@PostMapping(value = "/hospital")
-	@ApiOperation(value = "查询停用启用状态",notes = "查询停用启用状态")
-	public R hospitalList() {
-		return R.data(hospitalService.list());
-	}
-
-
-
-	@PostMapping(value = "exceltosql")
-	@ApiOperation(value = "查询停用启用状态",notes = "查询停用启用状态")
-	public R exceltosql(MultipartFile file) throws Exception {
-		log.info("进入导入excel表格方法,文件名为{}",file.getOriginalFilename());
-		List<Nurse> list = new ArrayList<>();
-		List<NurseCrowd> result = DefaultExcelReader.of(NurseCrowd.class).sheet(0)
-			.rowFilter(row -> row.getRowNum() > 0).read(file.getInputStream());
-		result.forEach(e -> {
-			if (nurseHasNullOrEmpty(e)) {
-				Nurse nurse = new Nurse();
-				BeanUtils.copyProperties(e, nurse);
-				list.add(nurse);
-			}
-		});
-		return R.status(nurseService.saveBatch(list));
-
-	}
-
-	/**
-	 * @param nurseCrowd 保证导入的地段没空或者null。
-	 * @return
-	 */
-	private boolean nurseHasNullOrEmpty(NurseCrowd nurseCrowd) {
-		for (Field f : nurseCrowd.getClass().getDeclaredFields()){
-			f.setAccessible(true);
-			try {
-				if (f.get(nurseCrowd) == null || StringUtils.isBlank(f.get(nurseCrowd).toString())){
-					return false;
-				}
-			} catch (IllegalAccessException e) {
-				e.printStackTrace();
-			}
-		}
-		return true;
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/PayMethodController.java

-package org.springblade.agent.controller;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.agent.service.PayMethodService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mid.entity.PayMethod;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@Slf4j
-@RequestMapping("/paymethod")
-@Api("支付方式信息")
-public class PayMethodController {
-
-	private PayMethodService payMethodService;
-
-	@RequestMapping(value = "/payMethodList", method = RequestMethod.GET)
-	@ApiOperation("获取支付方式信息")
-	public R PayMethodList(@RequestParam Map<String,Object> payMethod, Query query) {
-		log.info("---->获取支付方式列表");
-		return R.data(payMethodService.page(Condition.getPage(query),Condition.getQueryWrapper(payMethod,PayMethod.class)));
-	}
-
-	@RequestMapping(value = "/addPayMethod", method = RequestMethod.POST)
-	@ApiOperation("增加支付方式信息")
-	public R insert(@RequestBody PayMethod payMethod) {
-		log.info("---->增加支付方式");
-		return R.data(payMethodService.save(payMethod));
-	}
-	
-	@RequestMapping(value = "/updatePayMethod", method = RequestMethod.POST)
-	@ApiOperation("编辑支付方式信息")
-	public R update(@RequestBody PayMethod payMethod) {
-		log.info("---->编辑支付方式");
-		return R.data(payMethodService.updateById(payMethod));
-	}
-	
-	@RequestMapping(value = "/deletePayMethod", method = RequestMethod.POST)
-	@ApiOperation("删除支付方式信息")
-	public R delete(@RequestParam String ids) {
-		log.info("---->删除支付方式");
-		return R.data(payMethodService.removeByIds(Func.toLongList(ids)));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/PensionController.java

-package org.springblade.agent.controller;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.mid.entity.Pension;
-import org.springblade.agent.service.IPensionService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/pension")
-@Slf4j
-@Api(value = "养老机构管理",tags = "养老机构管理（(弃用)），租户里面增删改")
-public class PensionController extends BladeController {
-
-	private IPensionService pensionService;
-
-	@GetMapping("/detail")
-	@ApiOperation(value = "养老机构详情",notes = "养老机构详情")
-	public R find(String id ){
-		return R.data(pensionService.getById(id));
-	}
-
-	@GetMapping("/list")
-	@ApiOperation(value = "养老机构列表",notes = "养老机构列表")
-	public R<IPage<Pension>> list(@RequestParam Map<String,Object> pension, Query query){
-		return R.data(pensionService.page(Condition.getPage(query),Condition.getQueryWrapper(pension, Pension.class)));
-	}
-
-	@GetMapping("/submit")
-	@ApiOperation(value = "养老机构新增",notes = "养老机构新增")
-	public R add(@RequestBody Pension pension ){
-		return R.data(pensionService.saveOrUpdate(pension));
-	}
-
-	@GetMapping("/del")
-	@ApiOperation(value = "养老机构删除",notes = "养老机构删除")
-	public R del(String ids ){
-		return R.data(pensionService.removeByIds(Func.toLongList(ids)));
-	}
-
-	@GetMapping("/upd")
-	@ApiOperation(value = "养老机构更新",notes = "养老机构更新")
-	public R upd( Pension pension ){
-		return R.data(pensionService.update());
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/Plugin.java

-package org.springblade.agent.controller;
-
-public class Plugin {
-
-
-}

blade-sched/src/main/java/org/springblade/agent/controller/ScheduleController.java

 package org.springblade.agent.controller;
 
-import com.alibaba.fastjson.JSONObject;
-import com.xytx.common.code.CommonCode;
-import com.xytx.common.code.TxResultResponse;
-import com.xytx.common.exception.CommonException;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.springblade.agent.service.IScheduleService;
 import org.springblade.agent.service.ScheduleService;
-import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
+import org.springblade.mid.entity.Schedule;
+import org.springblade.mid.vo.HourStatisticsVO;
+import org.springblade.mid.vo.ScheduleVO;
+import org.springblade.mid.vo.SelectScheduleVO;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
 * @author Night
@@ -26,141 +27,43 @@ public class ScheduleController {
 
    @Resource
    private ScheduleService scheduleService;
-
+	
+	@PostMapping("/setlist")
+	@ResponseBody
+	public R<List<ScheduleVO>> setScheduleList(@RequestBody SelectScheduleVO selectScheduleVO, BladeUser bladeUser){
+		log.info("ScheduleController===>>>【scheduleList】，入参={}",selectScheduleVO);
+		selectScheduleVO.setTenId(bladeUser.getTenantId().equals("000000") ? null : bladeUser.getTenantId());
+		return scheduleService.setScheduleList(selectScheduleVO);
+	}
+   
    @PostMapping("/list")
    @ResponseBody
-   public R scheduleList(@RequestBody JSONObject jsonObject, BladeUser bladeUser){
-       log.info("ScheduleController===>>>【scheduleList】，入参={}",jsonObject);
-       jsonObject.put("tenId",bladeUser.getTenantId());
-       return scheduleService.scheduleList(jsonObject);
+   public R<IPage<ScheduleVO>> scheduleList(@RequestBody SelectScheduleVO selectScheduleVO, Query query, BladeUser bladeUser){
+       log.info("ScheduleController===>>>【scheduleList】，入参={}",selectScheduleVO);
+	   selectScheduleVO.setTenId(bladeUser.getTenantId().equals("000000") ? null : bladeUser.getTenantId());
+       return scheduleService.scheduleList(selectScheduleVO, query);
    }
 
    @PostMapping("/insert")
    @ResponseBody
-   public TxResultResponse insSchedule(@RequestBody ScheduleVO scheduleVO){
+   public R insSchedule(@RequestBody ScheduleVO scheduleVO,BladeUser bladeUser){
        log.info("ScheduleController===>>>【insSchedule】，入参={}",scheduleVO);
-       try {
-           return scheduleService.insSchedule(scheduleVO);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【insSchedule】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【insSchedule】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
+       scheduleVO.setTenId(bladeUser.getTenantId());
+       return scheduleService.insSchedule(scheduleVO);
    }
 
    @PostMapping("/update")
    @ResponseBody
-   public TxResultResponse updateSchedule(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【updateSchedule】，入参={}",jsonObject);
-       try {
-           return scheduleService.updateAttendanceTime(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【updateSchedule】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【updateSchedule】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
+   public R updateSchedule(@RequestBody Schedule schedule){
+       log.info("ScheduleController===>>>【updateSchedule】，入参={}",schedule);
+       return scheduleService.updateAttendanceTime(schedule);
    }
 
    @PostMapping("/hourstatistic")
    @ResponseBody
-   public TxResultResponse hourStatistic(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【hourStatistic】，入参={}",jsonObject);
-       try {
-           return scheduleService.hourStatistic(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【hourStatistic】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【hourStatistic】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
-   }
-
-   @PostMapping("/getnurselist")
-   @ResponseBody
-   public TxResultResponse getnurselist(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【getnurselist】，入参={}",jsonObject);
-       try {
-           return scheduleService.getNurseOfDoctor(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【getnurselist】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【getnurselist】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
-   }
-
-   @PostMapping("/getagentlist")
-   @ResponseBody
-   public TxResultResponse getagentlist(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【getagentlist】，入参={}",jsonObject);
-       try {
-           return scheduleService.getAgentOfDoctor(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【getagentlist】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【getagentlist】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
-   }
-
-   @PostMapping("/getHeadNurseList")
-   @ResponseBody
-   public TxResultResponse getHeadNurseList(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【getHeadNurseList】，入参={}",jsonObject);
-       try {
-           return scheduleService.getHeadNurseList(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【getHeadNurseList】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【getHeadNurseList】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
-   }
-
-
-   @PostMapping("/getNurseListofagent")
-   @ResponseBody
-   public TxResultResponse getNurseList(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【getNurseList】，入参={}",jsonObject);
-       try {
-           return scheduleService.getNurseList(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【getNurseList】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【getNurseList】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
-   }
-
-   @PostMapping("/getAgentOfHos")
-   @ResponseBody
-   public TxResultResponse getAgentOfHos(@RequestBody JSONObject jsonObject){
-       log.info("ScheduleController===>>>【getAgentOfHos】，入参={}",jsonObject);
-       try {
-           return scheduleService.getAgentOfHos(jsonObject);
-       } catch (CommonException e) {
-           log.error("ScheduleController===>>>【getAgentOfHos】,e={}", e);
-           return new TxResultResponse(e.getCode(), e.getMsg());
-       } catch (Exception e) {
-           e.printStackTrace();
-           log.error("ScheduleController===>>>【getAgentOfHos】,e={}", e);
-           return new TxResultResponse(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-       }
+   public R<Page<HourStatisticsVO>> hourStatistic(@RequestBody SelectScheduleVO selectScheduleVO, Query query,BladeUser bladeUser){
+       log.info("ScheduleController===>>>【hourStatistic】，入参={}",selectScheduleVO);
+	   selectScheduleVO.setTenId(bladeUser.getTenantId().equals("000000") ? null : bladeUser.getTenantId());
+       return scheduleService.hourStatistic(selectScheduleVO,query);
    }
 }

blade-sched/src/main/java/org/springblade/agent/controller/login/SocialUserLoginController.java

-package org.springblade.agent.controller.login;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.AllArgsConstructor;
-import org.springblade.agent.service.ISocialUsersService;
-import org.springblade.core.boot.ctrl.BladeController;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mid.entity.SocialUser;
-import org.springblade.system.user.entity.User;
-import org.springblade.system.user.entity.UserInfo;
-import org.springblade.system.user.feign.IUserClient;
-import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/social")
-public class SocialUserLoginController extends BladeController {
-
-	private ISocialUsersService socialUserService;
-
-	private IUserClient userClient;
-
-	@PostMapping("/login")
-	public R login(String code, String tenantId){
-		JSONObject signSuccess = null;
-		try {
-			signSuccess = socialUserService.isSignSuccess(code, tenantId);
-		}catch (Exception e){
-			return R.fail(e.getMessage());
-		}
-
-		if(StringUtils.isEmpty(signSuccess.getString("openid"))){
-			return R.data(signSuccess);
-		}
-		SocialUser one = socialUserService.getOne(new QueryWrapper<SocialUser>().lambda()
-			.eq(SocialUser::getTenantId, tenantId)
-			.eq(SocialUser::getUniqueId,signSuccess.getString("openid")));
-		// 没有关联则创建虚拟账号
-		if(null == one){
-			String account = Func.randomUUID();
-			User user = new User();
-			user.setAccount(account);
-			user.setPassword("xy2020");
-			user.setTenantId(tenantId);
-			user.setRoleId("1123598816738675202");
-			userClient.saveUser(user);
-			R<UserInfo> userInfoR = userClient.userInfo(tenantId, account);
-			Long id = userInfoR.getData().getUser().getId();
-			SocialUser socialUser = new SocialUser();
-			socialUser.setIsEnabled(0);
-			socialUser.setTenantId(tenantId);
-			socialUser.setUniqueId(signSuccess.getString("openid"));
-			socialUser.setAccount(account);
-			socialUser.setUserId(id);
-			socialUser.setVersion(1);
-			boolean save = socialUserService.save(socialUser);
-			if(save){
-				one=socialUser;
-			}else {
-				return R.fail("登陆失败");
-			}
-		}
-		// login
-		Map<String, String> login = socialUserService.login(one);
-		login.put("openid",signSuccess.getString("openid"));
-		// 有则返回信息
-		return R.data(login);
-	}
-
-	@PostMapping("/save")
-	public R login(@RequestBody SocialUser socialUser){
-
-		return R.status(socialUserService.save(socialUser));
-	}
-
-	@PostMapping("/list")
-	public R list(@RequestBody SocialUser socialUser, Query query){
-
-		return R.data(socialUserService.page(Condition.getPage(query),Condition.getQueryWrapper(socialUser)));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/controller/login/WeiXinController.java

-package org.springblade.agent.controller.login;
-
-//@RestController
-//@AllArgsConstructor
-//@RequestMapping
-//public class WeiXinController extends BladeController {
-//
-//	private ISocialUserService socialUserService;
-//
-//	private IPluginService pluginService;
-//
-//	public static void main(String[] args) {
-//
-//	}
-//
-//
-//}

blade-sched/src/main/java/org/springblade/agent/controller/upload/FileUtils.java

-package org.springblade.agent.controller.upload;
-
-import org.springframework.web.multipart.MultipartFile;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * 文件上传工具包
- */
-public class FileUtils {
-
-    /**
-     *
-     * @param file 文件
-     * @param path 文件存放路径
-     * @param fileName 源文件名
-     * @return
-     */
-    public static boolean upload(MultipartFile file, String path, String fileName){
-
-
-        // 生成新的文件名
-        //String realPath = path + "/" + FileNameUtils.getFileName(fileName);
-
-        //使用原文件名
-        String realPath = path + "/" + fileName;
-
-        File dest = new File(realPath);
-
-        //判断文件父目录是否存在
-        if(!dest.getParentFile().exists()){
-            dest.getParentFile().mkdir();
-        }
-
-        try {
-            //保存文件
-            file.transferTo(dest);
-            return true;
-        } catch (IllegalStateException e) {
-            // Auto-generated catch block
-            e.printStackTrace();
-            return false;
-        } catch (IOException e) {
-            // Auto-generated catch block
-            e.printStackTrace();
-            return false;
-        }
-
-    }
-
-
-}

blade-sched/src/main/java/org/springblade/agent/controller/upload/UploadController.java

-package org.springblade.agent.controller.upload;
-
-import io.swagger.annotations.Api;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springblade.core.tool.api.R;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.Map;
-
-/**
- * @program: care_app_consumer
- * @description:
- * @author: shenshanghua@ez-hosbed.com
- * @create: 2019-08-26 17:25
- */
-@RestController
-@RequestMapping("/up")
-@Api("上传操作")
-public class UploadController {
-
-	private static final Logger log = LoggerFactory.getLogger(UploadController.class);
-
-	//@Value("${upload.filePath}")
-	private String path;
-
-	/**
-	 * @param file 要上传的文件
-	 * @return
-	 */
-	@RequestMapping("fileUpload")
-	public String upload(@RequestParam("fileName") MultipartFile file, Map<String, Object> map) {
-
-		// 要上传的目标文件存放路径
-		String localPath = "/opt/photo_file";
-		// 上传成功或者失败的提示
-		String msg = "";
-
-		if (FileUtils.upload(file, localPath, file.getOriginalFilename())) {
-			// 上传成功，给出页面提示
-			msg = "上传成功！";
-		} else {
-			msg = "上传失败！";
-
-		}
-
-		// 显示图片
-		map.put("msg", msg);
-		map.put("fileName", file.getOriginalFilename());
-
-		return "forward:/test";
-	}
-
-	@PostMapping(value = "uploadPic")
-	public R uploadPic(@RequestParam("fileName") MultipartFile file, Map<String, Object> map) {
-
-		log.info("【TestController>>>uploadPic】Param = {}", file.getOriginalFilename());
-		// 要上传的目标文件存放路径
-		String localPath = "/opt/photo_file_app/image";
-//            String localPath = "C:\\Users\\EDZ\\Pictures\\new";
-		// 上传成功或者失败的提示
-		String msg = "";
-		log.info("【TestController>>>uploadPic】{}", "111");
-		if (FileUtils.upload(file, localPath, file.getOriginalFilename())) {
-			// 上传成功，给出页面提示
-			log.info("【TestController>>>uploadPic】{}", "222");
-			msg = "上传成功！";
-		} else {
-			msg = "上传失败！";
-			log.info("【TestController>>>uploadPic】{}", "333");
-			log.error("【TestController>>>uploadPic】异常{}");
-			R.fail("上传失败");
-		}
-		log.info("【TestController>>>uploadPic】{}", "444");
-		// 显示图片
-		map.put("msg", msg);
-		map.put("fileName", file.getOriginalFilename());
-		map.put("filePath", path + file.getOriginalFilename());
-		log.info("【TestController>>>uploadPic】{}", "555");
-		log.info("【tx】={}", map);
-		return R.data(map);
-	}
-
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiAgentClient.java

-package org.springblade.agent.feign;
-
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.Agent;
-import org.springblade.agent.service.IAgentService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.feign.IAgentClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@ApiIgnore
-@RestController
-@AllArgsConstructor
-public class ApiAgentClient implements IAgentClient {
-
-	private IAgentService agentService;
-	@GetMapping(SAVE)
-	@Override
-	public R save(Agent agent) {
-		return R.status(agentService.save(agent));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiDockerClient.java

-package org.springblade.agent.feign;
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.Doctor;
-import org.springblade.agent.service.IDoctorService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.feign.IDoctorClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-
-@ApiIgnore
-@RestController
-@AllArgsConstructor
-public class ApiDockerClient implements IDoctorClient {
-
-	private IDoctorService iDoctorService;
-
-
-	@GetMapping(FIND)
-	@Override
-	public R<Doctor> find(String id) {
-		Doctor doctor = iDoctorService.getById(id);
-		if(null == doctor){
-			return R.fail("未找到医生信息");
-		}
-		return R.data(doctor);
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiHospitalClient.java

-package org.springblade.agent.feign;
-
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.agent.service.IHospitalService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.feign.IHospitalClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-/**
- * 接口权限Feign实现类
- *
- * @author Chill
- */
-@ApiIgnore
-@RestController
-@AllArgsConstructor
-public class ApiHospitalClient implements IHospitalClient {
-
-	private IHospitalService hospitalService;
-	@PostMapping(SAVE)
-	@Override
-	public R save(Hospital hospital) {
-		return R.status(hospitalService.save(hospital));
-	}
-	@GetMapping(FIND)
-	@Override
-	public R<Hospital> find(String id) {
-		return null;
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiNurseClient.java

-package org.springblade.agent.feign;
-
-import lombok.AllArgsConstructor;
-import org.springblade.agent.service.IAgentService;
-import org.springblade.agent.service.INurseService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.Nurse;
-import org.springblade.mid.feign.IAgentClient;
-import org.springblade.mid.feign.INurseClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import java.util.List;
-
-@ApiIgnore
-@RestController
-@AllArgsConstructor
-public class ApiNurseClient implements INurseClient {
-
-	private INurseService iNurseService;
-	@GetMapping(FIND)
-	@Override
-	public R<List<Nurse>> find(String nurseIds) {
-		return R.data(iNurseService.getNurseByIds(nurseIds));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiPensionClient.java

-package org.springblade.agent.feign;
-
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.Pension;
-import org.springblade.agent.service.IPensionService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mid.feign.IPensionClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.Map;
-
-@RestController
-@AllArgsConstructor
-@RequestMapping("/api-pension")
-public class ApiPensionClient implements IPensionClient {
-
-	private IPensionService pensionService;
-
-	@Override
-	@GetMapping("/detail")
-	public R find(String id ){
-		return R.data(pensionService.getById(id));
-	}
-
-	@Override
-	public R save(Pension pension) {
-		return R.data(pensionService.saveOrUpdate(pension));
-	}
-
-	@GetMapping("/list")
-	public R<IPage<Pension>> list(@RequestParam Map<String,Object> pension, Query query){
-		return R.data(pensionService.page(Condition.getPage(query),Condition.getQueryWrapper(pension, Pension.class)));
-	}
-
-	@Override
-	@GetMapping("/del")
-	public R del(String ids ){
-		return R.data(pensionService.removeByIds(Func.toLongList(ids)));
-	}
-
-	@Override
-	@GetMapping("/upd")
-	public R upd( Pension pension ){
-		return R.data(pensionService.update());
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/ApiSocialUserClient.java

-package org.springblade.agent.feign;
-
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import lombok.AllArgsConstructor;
-import org.springblade.agent.service.IAgentService;
-import org.springblade.agent.service.ISocialUsersService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.entity.Agent;
-import org.springblade.mid.entity.SocialUser;
-import org.springblade.mid.feign.IAgentClient;
-import org.springblade.mid.feign.ISocialUserClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-@ApiIgnore
-@RestController
-@AllArgsConstructor
-public class ApiSocialUserClient implements ISocialUserClient {
-
-	private ISocialUsersService iSocialUsersService;
-
-	@GetMapping(FIND)
-	@Override
-	public R find(Long userId) {
-		return R.data(iSocialUsersService.getOne(Wrappers.<SocialUser>query().lambda().eq(SocialUser::getUserId,userId)));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/feign/AppConfigClient.java

-package org.springblade.agent.feign;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import lombok.AllArgsConstructor;
-import org.springblade.mid.entity.AppConfig;
-import org.springblade.agent.service.IAppConfigService;
-import org.springblade.core.tool.api.R;
-import org.springblade.mid.feign.IAppConfigClient;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@AllArgsConstructor
-public class AppConfigClient implements IAppConfigClient {
-
-	private IAppConfigService appConfigService;
-
-	@Override
-	@GetMapping(FIND)
-	public R<AppConfig> find(String tenantId) {
-		return R.data(appConfigService.getOne(new QueryWrapper<AppConfig>().lambda().eq(AppConfig::getTenantId,tenantId)));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/mapper/AddressMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Area;
-
-public interface AddressMapper extends BaseMapper<Area> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/AgentHosMapper.java

-package org.springblade.agent.mapper;
-
-import org.springblade.mid.entity.AgentHos;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author max
- * @since 2020-04-27
- */
-public interface AgentHosMapper extends BaseMapper<AgentHos> {
-
-}

blade-sched/src/main/java/org/springblade/agent/mapper/AgentMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Agent;
-
-public interface AgentMapper extends BaseMapper<Agent> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/AppConfigMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.AppConfig;
-
-public interface AppConfigMapper extends BaseMapper<AppConfig> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/ClassMapper.java

-package org.springblade.agent.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Classes;
-
-import java.util.List;
-
-public interface ClassMapper extends BaseMapper<Classes> {
-	
-	List<JSONObject> relationList(Integer type, String doctorId, String nurseName);
-}

blade-sched/src/main/java/org/springblade/agent/mapper/ClassMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.agent.mapper.ClassMapper">
-
-    <insert id="relationNurse">
-     INSERT INTO care_doctor_nurse (doctor_id,nurse_id,doc_name,nurse_name,hos_id,hos_name,agent_id,agent_name,`type`) values
-       (#{doctorId},#{nurseId},#{docName},#{nurseName},#{hosId},#{hosName},#{agentId},#{agentName},#{type})
-    </insert>
-
-    <select id="relationList" resultType="com.alibaba.fastjson.JSONObject">
-        select
-        cdn.doctor_id as 'doctorId',
-        cdn.nurse_id as 'nurseId',
-        cdn.doc_name as 'docName',
-        cdn.nurse_name as 'nurseName',
-        cdn.hos_id  as 'hosId',
-        cdn.hos_name  as 'hosName',
-        cdn.agent_id as 'agentId',
-        cdn.agent_name as 'agentName',
-        cdn.`type` as 'type'
-        from  care_doctor_nurse cdn
-        <where>
-            <if test="type !=null and type !=''">
-                and cdn.`type` = #{type}
-            </if>
-            <if test="doctorId !=null and doctorId !=''">
-                and cdn.doctor_id = #{doctorId}
-            </if>
-            <if test="nurseName !=null and nurseName !=''">
-                and cdn.nurse_name = #{nurseName}
-            </if>
-        </where>
-    </select>
-
-    <delete id="delRelation" parameterType="string">
-       delete from  care_doctor_nurse
-         where nurse_id = #{nurseId}
-    </delete>
-
-    <select id="hasRelation" parameterType="string" resultType="boolean">
-        <![CDATA[select count(nurse_id) from care_doctor_nurse
-        where nurse_id = #{nurseId} ]]>
-    </select>
-
-</mapper>

blade-sched/src/main/java/org/springblade/agent/mapper/DoctorMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Doctor;
-
-public interface DoctorMapper extends BaseMapper<Doctor> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/HospitalMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Hospital;
-
-public interface HospitalMapper extends BaseMapper<Hospital> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/LoginMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Login;
-
-public interface LoginMapper extends BaseMapper<Login> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/NurseMapper.java

-package org.springblade.agent.mapper;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Nurse;
-
-import java.util.List;
-
-public interface NurseMapper extends BaseMapper<Nurse> {
-	List<Nurse> getNurseByIds(Long[] ids);
-	
-	List<JSONObject> getNurseOfDoctor(JSONObject jsonObject);
-	
-	List<JSONObject> getAgentOfDoctor(JSONObject jsonObject);
-}

blade-sched/src/main/java/org/springblade/agent/mapper/NurseMapper.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.springblade.agent.mapper.NurseMapper">
-    <resultMap id="nurseResultMap" type="org.springblade.mid.entity.Nurse">
-            <result column="id" property="id"/>
-            <result column="real_name" property="realName"/>
-    </resultMap>
-
-    <select id="getNurseByIds" resultMap="nurseResultMap">
-        SELECT
-        id,real_name
-        FROM
-        care_nurse
-        WHERE
-        id IN
-        <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
-            #{ids}
-        </foreach>
-        and is_deleted = 0
-    </select>
-
-    <select id="getNurseOfDoctor" resultType="com.alibaba.fastjson.JSONObject">
-        select distinct nurse_id as nurseId,
-                        nurse_name as nurseName,
-                        agent_name as agentName
-        from care_doctor_nurse
-        where doctor_id = #{doctorId}
-    </select>
-
-    <select id="getAgentOfDoctor" resultType="com.alibaba.fastjson.JSONObject">
-        select distinct agent_id as agentId,
-                        agent_name as agentName
-        from care_doctor_nurse
-        where doctor_id = #{doctorId}
-    </select>
-</mapper>

blade-sched/src/main/java/org/springblade/agent/mapper/PayMethodMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.PayMethod;
-
-/**
- * @author Night
- * Date:  2020/5/11
- */
-public interface PayMethodMapper extends BaseMapper<PayMethod> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/PensionMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.Pension;
-
-public interface PensionMapper extends BaseMapper<Pension> {
-}

blade-sched/src/main/java/org/springblade/agent/mapper/SocialUserMapper.java

-package org.springblade.agent.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.springblade.mid.entity.SocialUser;
-
-public interface SocialUserMapper extends BaseMapper<SocialUser> {
-}

blade-sched/src/main/java/org/springblade/agent/service/IAddressService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Area;
-import org.springblade.core.tool.api.R;
-
-import java.util.List;
-
-public interface IAddressService extends IService<Area> {
-	List<Area> addressList();
-}

blade-sched/src/main/java/org/springblade/agent/service/IAgentHosService.java

-package org.springblade.agent.service;
-
-import org.springblade.mid.entity.AgentHos;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-import java.util.Map;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author max
- * @since 2020-04-27
- */
-public interface IAgentHosService extends IService<AgentHos> {
-
-	Boolean bindAgentToHos(Map<String, Object> jsonObject);
-}

blade-sched/src/main/java/org/springblade/agent/service/IAgentService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Agent;
-
-public interface IAgentService extends IService<Agent> {
-}

blade-sched/src/main/java/org/springblade/agent/service/IAppConfigService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.AppConfig;
-
-public interface IAppConfigService extends IService<AppConfig> {
-}

blade-sched/src/main/java/org/springblade/agent/service/IClassService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Classes;
-
-public interface IClassService extends IService<Classes> {
-}

blade-sched/src/main/java/org/springblade/agent/service/IDoctorService.java

-package org.springblade.agent.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Doctor;
-
-import java.util.List;
-
-public interface IDoctorService extends IService<Doctor> {
-
-
-    int updDoctor(JSONObject jsonObject);
-
-    int delDoctor(JSONObject jsonObject);
-
-    List<String> getDepart(JSONObject jsonObject);
-
-    Doctor getDocInfo(String username);
-}

blade-sched/src/main/java/org/springblade/agent/service/IHospitalService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Hospital;
-
-public interface IHospitalService extends IService<Hospital> {
-}

blade-sched/src/main/java/org/springblade/agent/service/ILoginService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Login;
-
-public interface ILoginService extends IService<Login> {
-}

blade-sched/src/main/java/org/springblade/agent/service/INurseService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Nurse;
-
-import java.util.List;
-
-public interface INurseService extends IService<Nurse> {
-	List<Nurse> getNurseByIds(String ids);
-}

blade-sched/src/main/java/org/springblade/agent/service/IPensionService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Pension;
-
-public interface IPensionService extends IService<Pension> {
-}

blade-sched/src/main/java/org/springblade/agent/service/IPluginService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-
-public interface IPluginService extends IService {
-}

blade-sched/src/main/java/org/springblade/agent/service/IScheduleService.java

-package org.springblade.agent.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.Schedule;
-import org.springblade.core.tool.api.R;
-
-public interface IScheduleService extends IService<Schedule> {
-	Object scheduleList(JSONObject jsonObject);
-}

blade-sched/src/main/java/org/springblade/agent/service/ISocialUsersService.java

-package org.springblade.agent.service;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.SocialUser;
-
-import java.util.Map;
-
-public interface ISocialUsersService extends IService<SocialUser> {
-
-	JSONObject isSignSuccess(String code, String tenantId);
-
-	Map<String,String> login(SocialUser one);
-}

blade-sched/src/main/java/org/springblade/agent/service/PayMethodService.java

-package org.springblade.agent.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.springblade.mid.entity.PayMethod;
-
-public interface PayMethodService extends IService<PayMethod> {
-}

blade-sched/src/main/java/org/springblade/agent/service/ScheduleService.java

 package org.springblade.agent.service;
 
-import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.mid.entity.Schedule;
+import org.springblade.mid.vo.HourStatisticsVO;
 import org.springblade.mid.vo.ScheduleVO;
+import org.springblade.mid.vo.SelectScheduleVO;
 
 
 import java.util.List;
 
 public interface ScheduleService extends IService<Schedule> {
 	
-	R scheduleList(JSONObject jsonObject);
+	R<List<ScheduleVO>> setScheduleList(SelectScheduleVO selectScheduleVO);
 	
-	R insSchedule(ScheduleVO scheduleVO);
-	
-	R updateAttendanceTime(JSONObject jsonObject);
-	
-	R hourStatistic(JSONObject jsonObject);
+	R<IPage<ScheduleVO>> scheduleList(SelectScheduleVO selectScheduleVO, Query query);
 	
-	R getNurseOfDoctor(JSONObject jsonObject);
-	
-	R getAgentOfDoctor(JSONObject jsonObject);
-	
-	List<ScheduleVO> getScheduleList(JSONObject jsonObject);
+	R insSchedule(ScheduleVO scheduleVO);
 	
-	R getHeadNurseList(JSONObject jsonObject);
+	R updateAttendanceTime(Schedule schedule);
 	
-	R getNurseList(JSONObject jsonObject);
+	R<Page<HourStatisticsVO>> hourStatistic(SelectScheduleVO selectScheduleVO, Query query);
 	
-	R getAgentOfHos(JSONObject jsonObject);
+	List<ScheduleVO> getScheduleList(SelectScheduleVO selectScheduleVO);
 }

blade-sched/src/main/java/org/springblade/agent/service/impl/AddressServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.common.collect.Lists;
-import org.springblade.mid.entity.Area;
-import org.springblade.agent.mapper.AddressMapper;
-import org.springblade.agent.service.IAddressService;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-@Service
-public class AddressServiceImpl extends ServiceImpl<AddressMapper, Area> implements IAddressService {
-
-	@Override
-	public List<Area> addressList() {
-		List<Area> areas = list();
-		Iterator<Area> iterator = areas.iterator();
-		ArrayList<Area> areaArrayList = Lists.newArrayList();
-		while (iterator.hasNext()) {
-			Area area = iterator.next();
-			if (area.getParentCode() == null) {
-				areaArrayList.add(area);
-				iterator.remove();
-			}
-		}
-		areaArrayList.forEach(ap -> constructTree(ap, areas));
-
-		return areaArrayList;
-	}
-
-	private void constructTree(Area area, List<Area> treeModels) {
-		Iterator<Area> iterator = treeModels.iterator();
-		//保存子节点
-		List<Area> childrens = new ArrayList<>();
-
-		while (iterator.hasNext()) {
-			Area node = iterator.next();
-			//找出下一级的节点
-			if (area.getCode().equals(node.getParentCode())) {
-				childrens.add(node);
-				iterator.remove();
-			}
-		}
-		if (!CollectionUtils.isEmpty(childrens)) {
-			area.setAreas(childrens);
-		}
-		if (!CollectionUtils.isEmpty(treeModels) && !childrens.isEmpty()) {
-			childrens.forEach(node -> constructTree(node, treeModels));
-		}
-	}
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/AgentHosServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springblade.mid.entity.AgentHos;
-import org.springblade.agent.mapper.AgentHosMapper;
-import org.springblade.agent.service.IAgentHosService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.core.mp.support.Condition;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author max
- * @since 2020-04-27
- */
-@Service
-public class AgentHosServiceImpl extends ServiceImpl<AgentHosMapper, AgentHos> implements IAgentHosService {
-
-	@Override
-	public Boolean bindAgentToHos(Map<String, Object> jsonObject) {
-		QueryWrapper<AgentHos> queryWrapper = Condition.getQueryWrapper(jsonObject, AgentHos.class);
-		List<AgentHos> agentHosList = list(queryWrapper);
-		if (agentHosList.size()  < 1 ) {
-			return save(queryWrapper.getEntity());
-		}
-		return Boolean.FALSE;
-	}
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/AgentServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.Agent;
-import org.springblade.agent.mapper.AgentMapper;
-import org.springblade.agent.service.IAgentService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AgentServiceImpl extends ServiceImpl<AgentMapper, Agent> implements IAgentService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/AppConfigServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.AppConfig;
-import org.springblade.agent.mapper.AppConfigMapper;
-import org.springblade.agent.service.IAppConfigService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class AppConfigServiceImpl extends ServiceImpl<AppConfigMapper, AppConfig> implements IAppConfigService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/ClassServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.agent.mapper.ClassMapper;
-import org.springblade.agent.service.IClassService;
-import org.springblade.mid.entity.Classes;
-import org.springframework.stereotype.Service;
-
-@Service
-public class ClassServiceImpl extends ServiceImpl<ClassMapper, Classes> implements IClassService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/DoctorServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.Doctor;
-import org.springblade.agent.mapper.DoctorMapper;
-import org.springblade.agent.service.IDoctorService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class DoctorServiceImpl extends ServiceImpl<DoctorMapper, Doctor> implements IDoctorService {
-
-
-	@Override
-	public int updDoctor(JSONObject jsonObject) {
-		return 0;
-	}
-
-	@Override
-	public int delDoctor(JSONObject jsonObject) {
-		return 0;
-	}
-
-	@Override
-	public List<String> getDepart(JSONObject jsonObject) {
-		return null;
-	}
-
-	@Override
-	public Doctor getDocInfo(String username) {
-		return null;
-	}
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/HospitalServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.Hospital;
-import org.springblade.agent.mapper.HospitalMapper;
-import org.springblade.agent.service.IHospitalService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> implements IHospitalService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/LoginServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.Login;
-import org.springblade.agent.mapper.LoginMapper;
-import org.springblade.agent.service.ILoginService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class LoginServiceImpl extends ServiceImpl<LoginMapper, Login> implements ILoginService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/NurseServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import lombok.AllArgsConstructor;
-import org.springblade.core.tool.utils.Func;
-import org.springblade.mid.entity.Nurse;
-import org.springblade.agent.mapper.NurseMapper;
-import org.springblade.agent.service.INurseService;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@AllArgsConstructor
-public class NurseServiceImpl extends ServiceImpl<NurseMapper, Nurse> implements INurseService {
-	private NurseMapper nurseMapper;
-	@Override
-	public List<Nurse> getNurseByIds(String ids) {
-		return nurseMapper.getNurseByIds(Func.toLongArray(ids));
-	}
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/PayMethodServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.agent.mapper.PayMethodMapper;
-import org.springblade.agent.service.PayMethodService;
-import org.springblade.mid.entity.PayMethod;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PayMethodServiceImpl extends ServiceImpl<PayMethodMapper, PayMethod> implements PayMethodService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/PensionServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springblade.mid.entity.Pension;
-import org.springblade.agent.mapper.PensionMapper;
-import org.springblade.agent.service.IPensionService;
-import org.springframework.stereotype.Service;
-
-@Service
-public class PensionServiceImpl extends ServiceImpl<PensionMapper, Pension> implements IPensionService {
-}

blade-sched/src/main/java/org/springblade/agent/service/impl/ScheduleServiceImpl.java

@@ -9,22 +9,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.mysql.cj.util.StringUtils;
 import com.xytx.common.code.CommonCode;
-import com.xytx.common.code.TxResultResponse;
 import com.xytx.common.exception.CommonException;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.agent.mapper.*;
 import org.springblade.agent.service.ScheduleService;
 import org.springblade.common.utils.AttendanceTimeUtil;
-import org.springblade.common.utils.UnixTimestampUtils;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springblade.mid.convert.AboutScheduleConverter;
-import org.springblade.mid.entity.AgentHos;
-import org.springblade.mid.entity.Doctor;
-import org.springblade.mid.entity.Nurse;
 import org.springblade.mid.entity.Schedule;
+import org.springblade.mid.feign.IClassClient;
 import org.springblade.mid.vo.HourStatisticsVO;
 import org.springblade.mid.vo.ScheduleVO;
-import org.springblade.system.feign.ISysClient;
+import org.springblade.mid.vo.SelectScheduleVO;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -47,74 +44,51 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 	@Resource
 	private ScheduleMapper scheduleMapper;
 	@Resource
-	private ClassMapper classesMapper;
+	private IClassClient classClient;
 	@Resource
 	private HolidayMapper holidayMapper;
 	@Resource
 	private WorkweekendMapper workweekendMapper;
-	@Resource
-	private DoctorMapper doctorMapper;
-	@Resource
-	private NurseMapper nurseMapper;
-	@Resource
-	private AgentHosMapper agentHosMapper;
-	@Resource
-	private ISysClient sysClient;
+	
+	/** 护士长排班使用的查询列表接口
+	 * @param selectScheduleVO 查询对象
+	 * @return R
+	 */
+	@Override
+	public R<List<ScheduleVO>> setScheduleList(SelectScheduleVO selectScheduleVO) {
+		List<Schedule> schedules = scheduleMapper.selectList(getqueryWrapper(selectScheduleVO));
+		List<ScheduleVO> fakeScheduleVOList = getfakeScheduleVoList(selectScheduleVO.getDoctorId());
+		List<ScheduleVO> result;
+		if (schedules.size() == 0) {
+			result = fakeScheduleVOList;
+		} else {
+//            拿取当前周的信息拼装成ScheduleVO
+			List<ScheduleVO> scheduleVOList = getScheduleVoList(schedules);
+			Map<String, ScheduleVO> map = fakeScheduleVOList.stream().collect(Collectors.toMap(ScheduleVO::getNurseId, e -> e, (k1, k2) -> k2));
+			map.putAll(scheduleVOList.stream().collect(Collectors.toMap(ScheduleVO::getNurseId, e -> e, (k1, k2) -> k2)));
+			result = new ArrayList<>(map.values());
+		}
+		return R.data(result);
+	}
 	
 	/**
 	 * 查看排班信息
 	 *
-	 * @param jsonObject jsonObject
+	 * @param selectScheduleVO 查询对象
 	 * @return TxResultResponse
 	 * @throws CommonException CommonException
 	 */
+	
 	@Override
-	public R scheduleList(JSONObject jsonObject) throws CommonException {
-		log.info("【ScheduleServiceImpl>>>scheduleList】jsonObject = {}", jsonObject);
+	public R<IPage<ScheduleVO>> scheduleList(SelectScheduleVO selectScheduleVO, Query query) throws CommonException {
+		log.info("【ScheduleServiceImpl>>>scheduleList】jsonObject = {}", selectScheduleVO);
 		try {
-			String tenId = jsonObject.getString("tenId");
-			sysClient.getTenant(tenId).getData().getType();
-			
-			
-			
-			QueryWrapper<Schedule> queryWrapper = getqueryWrapper(jsonObject);
-			Integer pageSize = jsonObject.getInteger("pageSize");
-			Integer pageNum = jsonObject.getInteger("pageNum");
-			IPage<Schedule> iPage = new Page<>(pageNum,pageSize * 7);
+			IPage<Schedule> iPage = new Page<>(query.getCurrent(),query.getSize() * 7);
 			IPage<ScheduleVO> voiPage = new Page<>();
 //            查询时间段内的所有信息
-			List<Schedule> schedules = scheduleMapper.selectPage(iPage,queryWrapper).getRecords();
-//			判断是不是护士长平台的检索请求
-			if (jsonObject.getString("doctorId") != null && !jsonObject.getString("doctorId").equals("")) {
-//				确定是护士长平台的检索请求，接下来判断是不是检索已经排班后的数据
-				if ((jsonObject.getString("nurseId") == null || jsonObject.getString("nurseId").equals("")) &&
-						(jsonObject.getString("hosId") == null || jsonObject.getString("hosId").equals("")) &&
-						(jsonObject.getString("departmentName") == null || jsonObject.getString("departmentName").equals("")) &&
-						(jsonObject.getString("agentId") == null || jsonObject.getString("agentId").equals(""))){
-//					没传上述参数 表示是正在排版中的检索请求
-					String doctorId = jsonObject.getString("doctorId");
-					List<ScheduleVO> fakeScheduleVOList = getfakeScheduleVoList(doctorId);
-					if (schedules.size() == 0) {
-						voiPage.setRecords(fakeScheduleVOList);
-					} else {
-//                 拿取当前周的信息拼装成ScheduleVO
-						List<ScheduleVO> scheduleVOList = getScheduleVoList(schedules);
-						Map<String, ScheduleVO> map = fakeScheduleVOList.stream().collect(Collectors.toMap(ScheduleVO::getNurseId, e -> e, (k1, k2) -> k2));
-						map.putAll(scheduleVOList.stream().collect(Collectors.toMap(ScheduleVO::getNurseId, e -> e, (k1, k2) -> k2)));
-						List<ScheduleVO> result = new ArrayList<>(map.values());
-						voiPage.setRecords(result);
-					}
-					return R.data(iPage);
-				} else{
-//					是护士长排班完成之后的检索请求
-					List<ScheduleVO> scheduleVOList = getScheduleVoList(schedules);
-					voiPage.setRecords(scheduleVOList);
-				}
-			} else {
-//				不是护士长平台
-				List<ScheduleVO> scheduleVOList = getScheduleVoList(schedules);
-				voiPage.setRecords(scheduleVOList);
-			}
+			List<Schedule> schedules = scheduleMapper.selectPage(iPage,getqueryWrapper(selectScheduleVO)).getRecords();
+			List<ScheduleVO> scheduleVOList = getScheduleVoList(schedules);
+			voiPage.setRecords(scheduleVOList);
 			return R.data(voiPage);
 		} catch (CommonException e) {
 			log.error("【ScheduleServiceImpl>>>scheduleList】CommonException e={}", e.getMsg());
@@ -160,23 +134,20 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 	/**
 	 * 更新考勤信息
 	 *
-	 * @param jsonObject jsonObject
+	 * @param schedule schedule
 	 * @return TxResultResponse
 	 */
 	@Override
 	@Transactional
-	public R updateAttendanceTime(JSONObject jsonObject) {
-		log.info("【ScheduleServiceImpl>>>updateAttendanceTime】jsonObject = {}", jsonObject);
+	public R updateAttendanceTime(Schedule schedule) {
+		log.info("【ScheduleServiceImpl>>>updateAttendanceTime】jsonObject = {}", schedule);
 		try {
 			List<String> holidayList = holidayMapper.dateList();
 			List<String> workweekendList = workweekendMapper.dateList();
-			String attendanceTime = jsonObject.getString("attendanceTime");
-			String scheduleId = jsonObject.getString("scheduleId");
-			int hours = AttendanceTimeUtil.regexAndCalcHours(attendanceTime);
-			Schedule schedule = scheduleMapper.selectById(scheduleId);
-			schedule.setAttendanceTime(attendanceTime).setHours(hours);
-			schedule = AboutScheduleConverter.calcAllHours(schedule, holidayList, workweekendList);
-			int count = scheduleMapper.updateById(schedule);
+			int hours = AttendanceTimeUtil.regexAndCalcHours(schedule.getAttendanceTime());
+			Schedule dbschedule = scheduleMapper.selectById(schedule.getId());
+			dbschedule.setAttendanceTime(schedule.getAttendanceTime()).setHours(hours);
+			int count = scheduleMapper.updateById(AboutScheduleConverter.calcAllHours(dbschedule, holidayList, workweekendList));
 			if (count < 1) {
 				throw new CommonException(CommonCode.SERVER_ERROR.getCode(), "更新考勤信息失败");
 			}
@@ -194,30 +165,23 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 	/**
 	 * 工时统计
 	 *
-	 * @param jsonObject jsonObject
-	 * @return TxResultResponse
+	 * @param selectScheduleVO selectScheduleVO
+	 * @return R
 	 * @throws CommonException CommonException
 	 */
 	@Override
-	public R hourStatistic(JSONObject jsonObject) throws CommonException {
-		TxResultResponse tx = new TxResultResponse(CommonCode.SUCCESS.getCode(), CommonCode.SUCCESS.getMsg());
-		log.info("【ScheduleServiceImpl>>>hourStatistic】jsonObject = {}", jsonObject);
+	public R<Page<HourStatisticsVO>> hourStatistic(SelectScheduleVO selectScheduleVO, Query query) throws CommonException {
+		log.info("【ScheduleServiceImpl>>>hourStatistic】jsonObject = {}", selectScheduleVO);
 		try {
-			QueryWrapper<Schedule> queryWrapper = getqueryWrapper(jsonObject);
 //            查询时间段内的所有信息
-			List<Schedule> schedules = scheduleMapper.selectList(queryWrapper);
+			List<Schedule> schedules = scheduleMapper.selectList(getqueryWrapper(selectScheduleVO));
 			
 //                 拿取当前周的信息拼装成HourStatisticsVO
 				Set<String> nurseIdSet = schedules.stream().map(Schedule::getNurseId).collect(Collectors.toSet());
 				List<HourStatisticsVO> hourStatisticsVOList = AboutScheduleConverter.calcAttendanceOfHours(schedules, nurseIdSet);
-				Integer pageSize = (Integer) jsonObject.get("pageSize");
-				Integer pageNum = (Integer) jsonObject.get("pageNum");
-				if (pageNum == null || pageSize == null) {
-					pageNum = 1;
-					pageSize = 15;
-				}
-				Page iPage = new Page(pageNum,pageSize);
-				iPage.setRecords(hourStatisticsVOList);
+				Page<HourStatisticsVO> iPage = new Page<>(query.getCurrent(),query.getSize());
+				List<HourStatisticsVO> result = hourStatisticsVOList.stream().skip(query.getSize() * query.getCurrent()).limit(query.getSize()).collect(Collectors.toList());
+				iPage.setRecords(result);
 			return R.data(iPage);
 		} catch (CommonException e) {
 			log.error("【ScheduleServiceImpl>>>hourStatistic】CommonException e={}", e.getMsg());
@@ -229,104 +193,40 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 		}
 	}
 	
-	/**
-	 * 获取当前护士长的护理员
-	 *
-	 * @param jsonObject jsonObject
-	 * @return TxResultResponse
-	 * @throws CommonException CommonException
-	 */
-	@Override
-	public R getNurseOfDoctor(JSONObject jsonObject) throws CommonException {
-		log.info("【ScheduleServiceImpl>>>getNurseOfDoctor】jsonObject = {}", jsonObject);
-		try {
-			List<JSONObject> nameList = nurseMapper.getNurseOfDoctor(jsonObject);
-			return R.data(nameList);
-		} catch (CommonException e) {
-			log.error("【ScheduleServiceImpl>>>getNurseOfDoctor】CommonException e={}", e.getMsg());
-			throw new CommonException(e.getCode(), e.getMsg());
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("【ScheduleServiceImpl>>>getNurseOfDoctor】Exception e={}", e.getMessage());
-			throw new CommonException(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-		}
-	}
-	
-	/**
-	 * 获取当前护士长相关服务公司名字
-	 *
-	 * @param jsonObject jsonObject
-	 * @return TxResultResponse
-	 */
-	@Override
-	public R getAgentOfDoctor(JSONObject jsonObject) {
-		log.info("【ScheduleServiceImpl>>>getAgentOfDoctor】jsonObject = {}", jsonObject);
-		try {
-			List<JSONObject> nameList = nurseMapper.getAgentOfDoctor(jsonObject);
-			return R.data(nameList);
-		} catch (CommonException e) {
-			log.error("【ScheduleServiceImpl>>>getAgentOfDoctor】CommonException e={}", e.getMsg());
-			throw new CommonException(e.getCode(), e.getMsg());
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("【ScheduleServiceImpl>>>getAgentOfDoctor】Exception e={}", e.getMessage());
-			throw new CommonException(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-		}
-	}
-	
 	/**
 	 * 组建QueryWrapper
 	 *
-	 * @param jsonObject jsonObject
+	 * @param selectScheduleVO selectScheduleVO
 	 * @return QueryWrapper
 	 */
-	private QueryWrapper<Schedule> getqueryWrapper(JSONObject jsonObject) {
+	private QueryWrapper<Schedule> getqueryWrapper(SelectScheduleVO selectScheduleVO) {
 		QueryWrapper<Schedule> queryWrapper = new QueryWrapper<>();
 //            拼装条件 当前护士长下面的护理员
-		if (jsonObject.getString("doctorId") != null && !jsonObject.getString("doctorId").equals("")) {
-			queryWrapper.eq("doctor_id", jsonObject.getString("doctorId"));
-		}
-		if (jsonObject.getString("startTime") != null && !jsonObject.getString("startTime").equals("")) {
-			queryWrapper.ge("date", UnixTimestampUtils.getFormatDate(jsonObject.getString("startTime")));
-		}
-		if (jsonObject.getString("endTime") != null && !jsonObject.getString("endTime").equals("")) {
-			queryWrapper.le("date", UnixTimestampUtils.getFormatDate(jsonObject.getString("endTime")));
-		}
-		if (jsonObject.getString("agentName") != null && !jsonObject.getString("agentName").equals("")) {
-			queryWrapper.eq("agent_name", jsonObject.getString("agentName"));
-		}
-		if (jsonObject.getString("agentId") != null && !jsonObject.getString("agentId").equals("")) {
-			queryWrapper.eq("agent_id", jsonObject.getString("agentId"));
-		}
-		if (jsonObject.getString("nurseId") != null && !jsonObject.getString("nurseId").equals("")) {
-			queryWrapper.eq("nurse_id", jsonObject.getString("nurseId"));
-		}
-		if (jsonObject.getString("nurseName") != null && !jsonObject.getString("nurseName").equals("")) {
-			queryWrapper.eq("nurse_name", jsonObject.getString("nurseName"));
-		}
-		if (jsonObject.getString("hosId") != null && !jsonObject.getString("hosId").equals("")) {
-			queryWrapper.eq("hos_id", jsonObject.getString("hosId"));
-		}
-		if (jsonObject.getString("departmentName") != null && !jsonObject.getString("departmentName").equals("")) {
-			queryWrapper.eq("department_name", jsonObject.getString("departmentName"));
-		}
-		queryWrapper.orderByDesc("nurse_id");
-		queryWrapper.orderByAsc("date");
+		queryWrapper.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getDoctorId()),"doctor_id", selectScheduleVO.getDoctorId())
+			.ge(!StringUtils.isNullOrEmpty(selectScheduleVO.getStartTime()),"date",selectScheduleVO.getStartTime())
+			.le(!StringUtils.isNullOrEmpty(selectScheduleVO.getEndTime()),"date",selectScheduleVO.getEndTime())
+			.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getAgentId()),"agent_id", selectScheduleVO.getAgentId())
+			.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getNurseId()),"nurse_id", selectScheduleVO.getNurseId())
+			.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getHosId()),"hos_id", selectScheduleVO.getHosId())
+			.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getDepartmentName()),"department_name", selectScheduleVO.getDepartmentName())
+			.eq(!StringUtils.isNullOrEmpty(selectScheduleVO.getTenId()),"ten_id", selectScheduleVO.getTenId())
+			.orderByDesc("nurse_id")
+			.orderByAsc("date");
 		return queryWrapper;
 	}
 	
 	/**
 	 * 导出排班、考勤信息用这个接口
 	 *
-	 * @param jsonObject jsonObject
+	 * @param selectScheduleVO selectScheduleVO
 	 * @return TxResultResponse
 	 * @throws CommonException CommonException
 	 */
 	@Override
-	public List<ScheduleVO> getScheduleList(JSONObject jsonObject) throws CommonException {
-		log.info("【ScheduleServiceImpl>>>getScheduleList】jsonObject = {}", jsonObject);
+	public List<ScheduleVO> getScheduleList(SelectScheduleVO selectScheduleVO) throws CommonException {
+		log.info("【ScheduleServiceImpl>>>getScheduleList】jsonObject = {}", selectScheduleVO);
 		try {
-			QueryWrapper<Schedule> queryWrapper = getqueryWrapper(jsonObject);
+			QueryWrapper<Schedule> queryWrapper = getqueryWrapper(selectScheduleVO);
 //            查询时间段内的所有信息
 			List<Schedule> schedules = scheduleMapper.selectList(queryWrapper);
 //                 拿取当前周的信息拼装成ScheduleVO
@@ -348,7 +248,7 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 	 * @return List<ScheduleVO>
 	 */
 	private List<ScheduleVO> getfakeScheduleVoList(String doctorId){
-		List<JSONObject> relationList = classesMapper.relationList(3, doctorId,null);
+		List<JSONObject> relationList = classClient.relationList(3, doctorId,null).getData();
 		JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(relationList));
 		List<ScheduleVO> fakeScheduleVOList = JSONObject.parseArray(jsonArray.toJSONString(), ScheduleVO.class);
 		return fakeScheduleVOList;
@@ -363,76 +263,4 @@ public class ScheduleServiceImpl extends ServiceImpl<ScheduleMapper, Schedule> i
 		List<ScheduleVO> scheduleVOList = AboutScheduleConverter.schedule2ScheuleVO(schedules, nurseIdSet);
 		return scheduleVOList;
 	}
-	
-	/** xy平台使用的查看护士长列表
-	 * @return 全部护士长信息
-	 */
-	@Override
-	public R getHeadNurseList(JSONObject jsonObject) {
-		log.info("【ScheduleServiceImpl>>>getHeadNurseList】参数={}",jsonObject);
-		try {
-			TxResultResponse tx = new TxResultResponse(CommonCode.SUCCESS.getCode(), CommonCode.SUCCESS.getMsg());
-			QueryWrapper<Doctor> queryWrapper = new QueryWrapper<>();
-			String hospitalId = jsonObject.getString("hosId");
-			String departmentName = jsonObject.getString("departmentName");
-			String doctorId = jsonObject.getString("doctorId");
-			queryWrapper.eq(!StringUtils.isNullOrEmpty(hospitalId),"hospital_id",hospitalId);
-			queryWrapper.eq(!StringUtils.isNullOrEmpty(departmentName),"depart",departmentName);
-			queryWrapper.eq(!StringUtils.isNullOrEmpty(doctorId),"id",doctorId);
-			queryWrapper.like("account","hsz");
-			return R.data(doctorMapper.selectList(queryWrapper));
-		} catch (CommonException e) {
-			log.error("【ScheduleServiceImpl>>>getHeadNurseList】CommonException e={}", e.getMsg());
-			throw new CommonException(e.getCode(), e.getMsg());
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("【ScheduleServiceImpl>>>getHeadNurseList】Exception e={}", e.getMessage());
-			throw new CommonException(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-		}
-	}
-	
-	/** xy平台使用的查看护理员列表
-	 * @return 全部护理员信息
-	 */
-	@Override
-	public R getNurseList(JSONObject jsonObject) {
-		log.info("【ScheduleServiceImpl>>>getNurseList】参数={}",jsonObject);
-		try {
-			QueryWrapper<Nurse> queryWrapper = new QueryWrapper<>();
-			String agentId = jsonObject.getString("agentId");
-			queryWrapper.eq(!StringUtils.isNullOrEmpty(agentId),"agent_id",agentId);
-			queryWrapper.eq("type",3);
-			return R.data(nurseMapper.selectList(queryWrapper));
-		} catch (CommonException e) {
-			log.error("【ScheduleServiceImpl>>>getNurseList】CommonException e={}", e.getMsg());
-			throw new CommonException(e.getCode(), e.getMsg());
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("【ScheduleServiceImpl>>>getNurseList】Exception e={}", e.getMessage());
-			throw new CommonException(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-		}
-	}
-	
-	/** 医院平台使用的查看关联的服务公司列表接口
-	 * @param jsonObject  jsonObject
-	 * @return TxResultResponse
-	 */
-	@Override
-	public R getAgentOfHos(JSONObject jsonObject) {
-		log.info("【ScheduleServiceImpl>>>getAgentOfHos】参数={}",jsonObject);
-		try {
-			QueryWrapper<AgentHos> queryWrapper = new QueryWrapper<>();
-			String hosId = jsonObject.getString("hosId");
-			queryWrapper.eq(!StringUtils.isNullOrEmpty(hosId),"hos_id",hosId);
-			queryWrapper.eq("is_deleted",0);
-			return R.data(agentHosMapper.selectList(queryWrapper));
-		} catch (CommonException e) {
-			log.error("【ScheduleServiceImpl>>>getAgentOfHos】CommonException e={}", e.getMsg());
-			throw new CommonException(e.getCode(), e.getMsg());
-		} catch (Exception e) {
-			e.printStackTrace();
-			log.error("【ScheduleServiceImpl>>>getAgentOfHos】Exception e={}", e.getMessage());
-			throw new CommonException(CommonCode.SERVER_ERROR.getCode(), CommonCode.SERVER_ERROR.getMsg());
-		}
-	}
 }

blade-sched/src/main/java/org/springblade/agent/service/impl/SocialUsersServiceImpl.java

-package org.springblade.agent.service.impl;
-
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jodd.util.Base64;
-import org.apache.commons.lang.StringUtils;
-import org.apache.oltu.oauth2.client.OAuthClient;
-import org.apache.oltu.oauth2.client.URLConnectionClient;
-import org.apache.oltu.oauth2.client.request.OAuthClientRequest;
-import org.apache.oltu.oauth2.client.response.OAuthAccessTokenResponse;
-import org.apache.oltu.oauth2.client.response.OAuthJSONAccessTokenResponse;
-import org.apache.oltu.oauth2.common.OAuth;
-import org.apache.oltu.oauth2.common.exception.OAuthProblemException;
-import org.apache.oltu.oauth2.common.exception.OAuthSystemException;
-import org.apache.oltu.oauth2.common.message.types.GrantType;
-import org.springblade.agent.service.IAppConfigService;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.mid.entity.AppConfig;
-import org.springblade.mid.entity.SocialUser;
-import org.springblade.agent.mapper.SocialUserMapper;
-import org.springblade.agent.service.ISocialUsersService;
-import org.springblade.mid.feign.IOauthClient;
-import org.springblade.mid.vo.OauthReq;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.web.client.RestTemplate;
-
-import java.util.HashMap;
-import java.util.Map;
-
-@Service
-public class SocialUsersServiceImpl extends ServiceImpl<SocialUserMapper, SocialUser> implements ISocialUsersService {
-	@Autowired
-	IAppConfigService appConfigService;
-	@Autowired
-	IOauthClient oauthClient;
-
-	/**
-	 * openId请求URL
-	 */
-	private static final String OPEN_ID_REQUEST_URL = "https://open.weixin.qq.com/connect/oauth2/authorize#wechat_redirect";
-
-	/**
-	 * openId请求URL
-	 */
-	private static final String LOGIN_URL = "https://api.weixin.qq.com/sns/jscode2session";
-
-	RestTemplate restTemplate = new RestTemplate();
-
-	@Override
-	public JSONObject isSignSuccess(String code,String tenantId) {
-		if (StringUtils.isEmpty(code)) {
-			return null;
-		}
-		AppConfig one = appConfigService.getOne( new QueryWrapper<AppConfig>().lambda().eq(AppConfig::getTenantId,tenantId));
-		Map<String,String> m = new HashMap<>();
-		m.put("appid", one.getAppId());
-		m.put("secret", one.getAppSecret());
-		m.put("js_code",code);
-		String x = restTemplate.getForObject(LOGIN_URL+"?appid={appid}&secret={secret}&js_code={js_code}&grant_type=authorization_code",String.class,m);
-		JSONObject parse = JSONObject.parseObject(x);
-		System.out.println(parse);
-		return parse;
-	}
-
-	@Override
-	public Map<String,String> login(SocialUser one) {
-		OauthReq oauthReq = new OauthReq();
-		oauthReq.setUsername(one.getAccount());
-		oauthReq.setPassword("xy2020");
-		oauthReq.setTenantId(one.getTenantId());
-		Map<String,String> jsonpObject = oauthClient.token1(oauthReq.getTenantId(), oauthReq.getUsername(),oauthReq.getPassword(),oauthReq.getType(),oauthReq.getScope(),oauthReq.getGrant_type(),oauthReq.getTenantId(),"Basic " + Base64.encodeToString("saber:saber_secret"));
-		return jsonpObject;
-	}
-
-
-}

pom.xml

@@ -72,6 +72,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.springblade</groupId>
+                <artifactId>blade-mid-api</artifactId>
+                <version>${bladex.project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>