zhangyunjie/edu-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 东区缴费分支初始化

Browse Source
This commit is contained in:
zhangyunjie
2025-05-15 15:08:15 +08:00
parent 39f3acc15f
commit bafd4aa3ab
261 changed files with 3751 additions and 9416 deletions
Download Patch File Download Diff File Expand all files Collapse all files
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/facility/RemoteDormitoryServiceFallback.java
-16
View File
@@ -3,7 +3,6 @@ package com.yida.data.school.fallback.facility;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.school.EduDormitory;
import com.yida.data.common.core.entity.school.EduDormitoryMaster;
import com.yida.data.common.core.entity.school.EduDormitoryRoom;
import com.yida.data.school.dto.index.EditPersonNumDTO;
import com.yida.data.school.dto.index.ListDormRoomDTO;
@@ -106,11 +105,6 @@ public class RemoteDormitoryServiceFallback implements FallbackFactory<RemoteDor
return null;
}
@Override
public ResultBean editPersonNumNoPermission(List<EditPersonNumDTO> dtos) {
return null;
}
/**
* 获取宿舍
*
@@ -134,16 +128,6 @@ public class RemoteDormitoryServiceFallback implements FallbackFactory<RemoteDor
public ResultBean<EduDormitory> getDormNoPermission(Long id) {
return null;
}
@Override
public ResultBean<List<EduDormitory>> getDormBySchoolId(Long schoolId) {
return null;
}
@Override
public ResultBean<List<EduDormitoryRoom>> listDormRoomNoAuth(ListDormRoomDTO dto) {
return null;
}
};
}
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/fallback/leave/RemoteLeaveRequestServiceFallback.java
+6 -9
View File
@@ -3,11 +3,8 @@ package com.yida.data.school.fallback.leave;
import com.yida.data.common.core.annotation.Fallback;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
import com.yida.data.school.feign.leave.RemoteLeaveRequestService;
import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
import feign.hystrix.FallbackFactory;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
/**
@@ -25,16 +22,16 @@ public class RemoteLeaveRequestServiceFallback implements FallbackFactory<Remote
log.error("RemoteLeaveRequestService fallback reason:{}", throwable.getMessage());
return new RemoteLeaveRequestService() {
/**
* 是否存在通过的请假条
*
* @param dto
* @return
*/
@Override
public ResultBean<Boolean> existRequest(ListStudentRequestDetailDTO dto) {
return null;
}
@Override
public ResultBean<List<EduLeaveRequestUserVO>> findList(ListUserRequestDTO dto) {
return null;
}
};
}
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/facility/RemoteDormitoryService.java
+3 -19
View File
@@ -3,7 +3,6 @@ package com.yida.data.school.feign.facility;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
import com.yida.data.common.core.entity.school.EduDormitory;
import com.yida.data.common.core.entity.school.EduDormitoryMaster;
import com.yida.data.common.core.entity.school.EduDormitoryRoom;
import com.yida.data.school.dto.index.EditPersonNumDTO;
import com.yida.data.school.dto.index.ListDormRoomDTO;
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.RequestParam;
import java.util.List;
@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "dormitoryServiceClient",
fallbackFactory = RemoteDormitoryServiceFallback.class)
fallbackFactory = RemoteDormitoryServiceFallback.class)
public interface RemoteDormitoryService {
/**
@@ -37,9 +36,6 @@ public interface RemoteDormitoryService {
@PostMapping("/facility/dormRoom/listDormRoom")
ResultBean<List<EduDormitoryRoom>> listDormRoom(@RequestBody ListDormRoomDTO dto);
@PostMapping("/in/facility/dormRoom/listDormRoom")
ResultBean<List<EduDormitoryRoom>> listDormRoomNoAuth(@RequestBody ListDormRoomDTO dto);
/**
* 查询寝室
*
@@ -66,7 +62,7 @@ public interface RemoteDormitoryService {
*/
@GetMapping("/facility/dormRoom/getDormRoomByNameAndDorm")
ResultBean<EduDormitoryRoom> getDormRoomByNameAndDorm(@RequestParam("name") String name,
@RequestParam("dormId") Long dormId);
@RequestParam("dormId") Long dormId);
/**
* 根据名称查询宿舍
@@ -76,7 +72,7 @@ public interface RemoteDormitoryService {
*/
@GetMapping("/facility/dorm/getDormByName")
ResultBean<EduDormitory> getDormByName(@RequestParam("name") String name,
@RequestParam("schoolId") Long schoolId);
@RequestParam("schoolId") Long schoolId);
/**
* 修改寝室入住的人数
@@ -86,14 +82,6 @@ public interface RemoteDormitoryService {
@PostMapping("/facility/dormRoom/editPersonNum")
ResultBean editPersonNum(@RequestBody List<EditPersonNumDTO> dtos);
/**
* 修改寝室入住的人数
*
* @return
*/
@PostMapping("in/facility/dormRoom/editPersonNum")
ResultBean editPersonNumNoPermission(@RequestBody List<EditPersonNumDTO> dtos);
/**
* 获取宿舍
*
@@ -113,8 +101,4 @@ public interface RemoteDormitoryService {
*/
@GetMapping("/in/facility/dorm/getDorm")
ResultBean<EduDormitory> getDormNoPermission(@RequestParam("id") Long id);
@GetMapping("/in/facility/dorm/getDormListBySchoolId")
ResultBean<List<EduDormitory>> getDormBySchoolId(@RequestParam("schoolId") Long schoolId);
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/feign/leave/RemoteLeaveRequestService.java
+1 -12
View File
@@ -3,10 +3,7 @@ package com.yida.data.school.feign.leave;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.FebsServerConstant;
import com.yida.data.school.dto.leave.ListStudentRequestDetailDTO;
import com.yida.data.school.dto.userLeave.ListUserRequestDTO;
import com.yida.data.school.fallback.leave.RemoteLeaveRequestServiceFallback;
import com.yida.data.school.vo.userLeave.EduLeaveRequestUserVO;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@@ -14,7 +11,7 @@ import org.springframework.web.bind.annotation.PostMapping;
* @author ccl
*/
@FeignClient(value = FebsServerConstant.EDU_SCHOOL, contextId = "leaveRequestServiceClient",
fallbackFactory = RemoteLeaveRequestServiceFallback.class)
fallbackFactory = RemoteLeaveRequestServiceFallback.class)
public interface RemoteLeaveRequestService {
/**
@@ -25,12 +22,4 @@ public interface RemoteLeaveRequestService {
*/
@PostMapping("/in/request/leaveRequest/existRequest")
ResultBean<Boolean> existRequest(ListStudentRequestDetailDTO dto);
/**
* @param dto
* @return
*/
@PostMapping("/in/eduLeaveRequestUser/findList")
ResultBean<List<EduLeaveRequestUserVO>> findList(ListUserRequestDTO dto);
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/vo/index/HomeInfoVO.java
-3
View File
@@ -1,7 +1,6 @@
package com.yida.data.school.vo.index;
import com.yida.data.common.core.entity.home.EduHomeFunction;
import com.yida.data.common.core.entity.school.EduDeptHomeApp;
import com.yida.data.common.core.entity.school.EduSchoolHomeAnnouncement;
import com.yida.data.common.core.entity.school.EduSchoolHomeApp;
import com.yida.data.common.core.entity.school.EduSchoolHomeCover;
@@ -40,6 +39,4 @@ public class HomeInfoVO {
private EduSchoolHomeNews news;
private Integer deptType;
@ApiModelProperty("关联小程序List:新版")
private List<EduDeptHomeApp> eduDeptHomeAppList;
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/vo/index/ManuscriptPageInfoVO.java
+4
View File
@@ -11,6 +11,7 @@ import lombok.Data;
@ApiModel("稿件分页信息")
@Data
public class ManuscriptPageInfoVO {
private Long id;
@ApiModelProperty("标题")
@@ -41,4 +42,7 @@ public class ManuscriptPageInfoVO {
@ApiModelProperty("标签：以逗号分隔")
private String labels;
@ApiModelProperty("状态")
private Integer status;
}
febs-server/edu-school/edu-school-api/src/main/java/com/yida/data/school/vo/news/SchoolNoticePageVO.java
-4
View File
@@ -13,7 +13,6 @@ import lombok.Data;
@Data
@ApiModel("分页查询数据")
public class SchoolNoticePageVO {
private Long id;
@ApiModelProperty("发送时间")
@@ -24,9 +23,6 @@ public class SchoolNoticePageVO {
@ApiModelProperty("标题")
private String title;
@ApiModelProperty("作者")
private String author;
@ApiModelProperty("描述")
private String description;
febs-server/edu-school/edu-school-api/src/main/resources/META-INF/spring.factories
+2 -2
View File
@@ -9,5 +9,5 @@ com.yida.data.school.fallback.news.RemoteNoticeSystemUserServiceFallback,\
com.yida.data.school.fallback.news.RemoteNoticeUpdateServiceFallback,\
com.yida.data.school.fallback.transaction.RemoteProductOrderServiceFallback,\
com.yida.data.school.fallback.transaction.RemoteProductServiceFallback,\
com.yida.data.school.fallback.visitor.RemoteVisitorServiceFallback,\
com.yida.data.school.fallback.smart.RemoteSmartWelcomeServiceFallback
com.yida.data.school.fallback.transaction.RemoteStudentApplyServiceFallback,\
com.yida.data.school.fallback.visitor.RemoteVisitorServiceFallback