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-device/edu-device-api/src/main/resources/META-INF/spring.factories
+1 -2
View File
@@ -1,5 +1,4 @@
# Auto Configure
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.yida.data.device.fallback.RemoteStudentCardServiceFallback,\
com.yida.data.device.fallback.RemoteTelephoneServiceFallback,\
com.yida.data.device.fallback.RemoteConsumeCardServiceFallback
com.yida.data.device.fallback.RemoteTelephoneServiceFallback
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/studentCard/config/CardRabbitReceiver.java
+1 -1
View File
@@ -119,7 +119,7 @@ public class CardRabbitReceiver {
redisService.hset(CachePrefixConstant.STUDENT_DATA, card.getStudentId().toString(), student);
}
EduApp app = commonService
.getAppByCodeAndSchool(AppConstant.INDEX_PARENT, null, card.getSchoolId());
.getAppByCodeAndSchool(AppConstant.ELECTRONIC_PARENT, null, card.getSchoolId());
String accessToken = wxUtil.getAccessToken(app.getWxCorpId(), app.getWxSecret());
TextSchoolNotice notice = new TextSchoolNotice();
notice.setAgentid(app.getWxAgentId());
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/studentCard/controller/EduStudentCardController.java
+5 -4
View File
@@ -2,6 +2,7 @@ package com.yida.data.device.studentCard.controller;
import cc.mrbird.febs.common.redis.service.RedisService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yida.data.common.core.annotation.ControllerLog;
import com.yida.data.common.core.common.ModuleName;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.CurrentUser;
@@ -20,12 +21,12 @@ import com.yida.data.device.dto.studentCard.CardWithAddressDTO;
import com.yida.data.device.dto.studentCard.DisturbStatusDTO;
import com.yida.data.device.studentCard.service.EduStudentCardDisturbTimeService;
import com.yida.data.device.studentCard.service.EduStudentCardService;
import com.yida.data.device.vo.OnlineCountVO;
import com.yida.data.device.vo.studentCard.CardInfoVO;
import com.yida.data.device.vo.studentCard.CardPageVO;
import com.yida.data.device.vo.studentCard.CardWithAddressVO;
import com.yida.data.device.vo.studentCard.ListStudentCardVO;
import com.yida.data.device.vo.studentCard.LocationVO;
import com.yida.data.device.vo.OnlineCountVO;
import com.yida.data.device.vo.studentCard.TrackVO;
import com.yida.data.log.annotation.OperationLog;
import com.yida.data.system.feign.RemoteDeptService;
@@ -82,7 +83,6 @@ public class EduStudentCardController {
@ApiOperation("更新学生证")
@PostMapping("/updateCard")
@OperationLog(module = ModuleName.ELECTRONIC_STUDENT_CARD, methods = "更新学生证", type = OperationLogTypeEnum.UPDATE)
public ResultBean updateCard(@RequestBody EduStudentCard card) {
eduStudentCardService.updateCard(card);
return ResultBean.buildSuccess();
@@ -154,7 +154,9 @@ public class EduStudentCardController {
@ApiOperation("家长对应学生列表")
@GetMapping("/listStudentCard")
@ControllerLog(operation = "家长对应学生列表")
public ResultBean<List<ListStudentCardVO>> listStudentCard(@ApiParam("家长id") @RequestParam Long parentId) {
return ResultBean.buildSuccess(eduStudentCardService.listStudentCard(parentId));
}
@@ -180,7 +182,7 @@ public class EduStudentCardController {
@ApiOperation("批量免打扰")
@PostMapping("/setDisturbStatus")
@OperationLog(module = ModuleName.ELECTRONIC_STUDENT_CARD, methods = "批量免打扰", type = OperationLogTypeEnum.UPDATE)
@ControllerLog(operation = "批量免打扰")
public ResultBean setDisturbStatus(@RequestBody DisturbStatusDTO disturbStatusDTO) {
eduStudentCardService.setDisturbStatus(disturbStatusDTO);
return ResultBean.buildSuccess();
@@ -211,7 +213,6 @@ public class EduStudentCardController {
@ApiOperation("下发监听指令")
@GetMapping("/issueMonitor")
@OperationLog(module = ModuleName.ELECTRONIC_STUDENT_CARD, methods = "下发监听指令", type = OperationLogTypeEnum.SELECT)
public ResultBean issueMonitor(@ApiParam("接收监听手机号") String mobile,
@ApiParam("学生证imei号") String imei) {
eduStudentCardService.issueMonitor(mobile, imei);
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/studentCard/controller/EduStudentCardPhoneController.java
+4 -6
View File
@@ -2,12 +2,9 @@ package com.yida.data.device.studentCard.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yida.data.common.core.annotation.ControllerLog;
import com.yida.data.common.core.common.ModuleName;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.card.EduStudentCardPhone;
import com.yida.data.common.core.entity.system.enums.OperationLogTypeEnum;
import com.yida.data.device.studentCard.service.EduStudentCardPhoneService;
import com.yida.data.log.annotation.OperationLog;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -42,6 +39,7 @@ public class EduStudentCardPhoneController {
@ApiOperation("查询学生证电话")
@GetMapping("/getFamilyPhone")
@ControllerLog(operation = "查询亲情电话")
public ResultBean getFamilyPhone(@ApiParam("iMei号") @RequestParam String imei,
@ApiParam("1是亲情电话，2是sos电话，3是通话白名单") @RequestParam Integer type) {
List<EduStudentCardPhone> list = eduStudentCardPhoneService.list(Wrappers.lambdaQuery(new EduStudentCardPhone())
@@ -52,7 +50,7 @@ public class EduStudentCardPhoneController {
@ApiOperation("保存电话")
@PostMapping("/savePhone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "保存电话", type = OperationLogTypeEnum.SAVE)
@ControllerLog(operation = "保存电话")
public ResultBean savePhone(@RequestBody EduStudentCardPhone phone) {
eduStudentCardPhoneService.savePhone(phone);
return ResultBean.buildSuccess();
@@ -61,7 +59,7 @@ public class EduStudentCardPhoneController {
@ApiOperation("通用删除电话")
@GetMapping("/delPhone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "通用删除电话", type = OperationLogTypeEnum.DELETE)
@ControllerLog(operation = "通用删除电话")
public ResultBean delPhone(@RequestParam Long id) {
eduStudentCardPhoneService.delPhone(id);
return ResultBean.buildSuccess();
@@ -69,7 +67,7 @@ public class EduStudentCardPhoneController {
@ApiOperation("批量修改电话")
@PostMapping("/updateFamilyPhoneBatch")
@OperationLog(module = ModuleName.TELEPHONE, methods = "批量修改电话", type = OperationLogTypeEnum.UPDATE)
@ControllerLog(operation = "修改电话")
public ResultBean updateFamilyPhoneBatch(@RequestBody List<EduStudentCardPhone> phones,
@ApiParam("1-亲情电话，2-sos，3-白名单") Integer type, String imei) {
eduStudentCardPhoneService.updatePhoneBatch(phones, type, imei);
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/studentCard/service/impl/EduStudentCardAlarmServiceImpl.java
+1 -1
View File
@@ -158,7 +158,7 @@ public class EduStudentCardAlarmServiceImpl extends ServiceImpl
}
private void pushSchoolNotice(EduStudent student, EduStudentCardAlarm alarm, Dept school) {
EduApp app = commonService.getAppByCodeAndSchool(AppConstant.INDEX_PARENT, null, school.getDeptId());
EduApp app = commonService.getAppByCodeAndSchool(AppConstant.ELECTRONIC_PARENT, null, school.getDeptId());
TextSchoolNotice notice = new TextSchoolNotice();
notice.setAgentid(app.getWxAgentId());
notice.setTo_student_userid(Collections.singletonList(student.getWxId()));
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/telephone/controller/EduTelephoneController.java
+1 -9
View File
@@ -2,11 +2,9 @@ package com.yida.data.device.telephone.controller;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yida.data.common.core.annotation.ControllerLog;
import com.yida.data.common.core.common.ModuleName;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.CurrentUser;
import com.yida.data.common.core.entity.system.Dept;
import com.yida.data.common.core.entity.system.enums.OperationLogTypeEnum;
import com.yida.data.common.core.entity.telephone.EduTelephone;
import com.yida.data.common.core.entity.telephone.EduTelephoneBlack;
import com.yida.data.common.core.entity.telephone.EduTelephoneCard;
@@ -21,7 +19,6 @@ import com.yida.data.device.telephone.service.EduTelephoneService;
import com.yida.data.device.vo.OnlineCountVO;
import com.yida.data.device.vo.telephone.DeviceNumberVO;
import com.yida.data.device.vo.telephone.TelephoneVO;
import com.yida.data.log.annotation.OperationLog;
import com.yida.data.system.feign.RemoteDeptService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -87,13 +84,13 @@ public class EduTelephoneController {
*/
@ApiOperation("话机设备数量统计")
@GetMapping("/findDeviceNumber")
@ControllerLog(operation = "话机设备数量统计")
public ResultBean<DeviceNumberVO> findDeviceNumber() throws NoSuchMethodException {
return eduTelephoneService.findDeviceNumber();
}
@ApiOperation("修改或新增")
@PostMapping("/insertTelephone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "修改或新增亲情电话", type = OperationLogTypeEnum.SAVE)
public ResultBean insertTelephone(@RequestBody EduTelephone eduTelephone) {
eduTelephoneService.saveOrUpdate(eduTelephone);
return ResultBean.buildSuccess();
@@ -101,7 +98,6 @@ public class EduTelephoneController {
@ApiOperation("批量设置")
@PostMapping("/updateTelephone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "批量设置亲情电话", type = OperationLogTypeEnum.UPDATE)
public ResultBean updateTelephone(@RequestBody TelephoneDTO telephoneDTO) {
eduTelephoneService.updateTelephone(telephoneDTO);
return ResultBean.buildSuccess();
@@ -116,7 +112,6 @@ public class EduTelephoneController {
@ApiOperation("重置本月通话时间")
@GetMapping("/delTelephoneTime")
@OperationLog(module = ModuleName.TELEPHONE, methods = "重置本月通话时间", type = OperationLogTypeEnum.UPDATE)
public ResultBean delTelephoneTime(@ApiParam("话机Id") @RequestParam Long id) {
EduTelephone eduTelephone = new EduTelephone();
eduTelephone.setId(id);
@@ -127,7 +122,6 @@ public class EduTelephoneController {
@ApiOperation("停运")
@GetMapping("/stopTelephone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "停运亲情电话", type = OperationLogTypeEnum.UPDATE)
public ResultBean stopTelephone(@ApiParam("话机Id") @RequestParam Long id,
@ApiParam("1停运，0正常") @RequestParam Integer status) {
@@ -139,7 +133,6 @@ public class EduTelephoneController {
@ApiOperation("删除和批量删除")
@PostMapping("/delTelephone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "删除和批量删除亲情电话", type = OperationLogTypeEnum.DELETE)
public ResultBean delTelephone(@ApiParam("ids") @RequestBody List<Long> ids) {
eduTelephoneService.removeByIds(ids);
for (Long id : ids) {
@@ -153,7 +146,6 @@ public class EduTelephoneController {
@ApiOperation("批量停运")
@PostMapping("/listStopTelephone")
@OperationLog(module = ModuleName.TELEPHONE, methods = "批量停运亲情电话", type = OperationLogTypeEnum.UPDATE)
public ResultBean listStopTelephone(@ApiParam("话机Id") @RequestBody PhoneStatusDTO phoneStatusDTO) {
List<Long> ids = phoneStatusDTO.getIds();
febs-server/edu-device/edu-device-biz/src/main/java/com/yida/data/device/telephone/controller/EduTelephoneOrderController.java
+5 -9
View File
@@ -4,17 +4,14 @@ import cc.mrbird.febs.common.redis.service.RedisService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.yida.data.common.core.annotation.ControllerLog;
import com.yida.data.common.core.common.ModuleName;
import com.yida.data.common.core.common.ResultBean;
import com.yida.data.common.core.entity.constant.CachePrefixConstant;
import com.yida.data.common.core.entity.system.enums.OperationLogTypeEnum;
import com.yida.data.common.core.entity.telephone.EduTelephoneOrder;
import com.yida.data.common.core.utils.FebsUtil;
import com.yida.data.device.dto.telephone.OrderPageDTO;
import com.yida.data.device.telephone.service.EduTelephoneOrderService;
import com.yida.data.device.vo.telephone.OrderInfoVO;
import com.yida.data.device.vo.telephone.OrderPageVO;
import com.yida.data.log.annotation.OperationLog;
import com.yida.data.school.vo.transcation.PayInfoVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -68,17 +65,17 @@ public class EduTelephoneOrderController {
@GetMapping("/listOrder")
public ResultBean<List<EduTelephoneOrder>> listOrder(@ApiParam("卡id") @RequestParam Long cardId) {
return ResultBean.buildSuccess(eduTelephoneOrderService.list(Wrappers.lambdaQuery(new EduTelephoneOrder())
.eq(EduTelephoneOrder::getCardId, cardId).orderByDesc(EduTelephoneOrder::getCreateDate)));
.eq(EduTelephoneOrder::getCardId, cardId).orderByDesc(EduTelephoneOrder::getCreateDate)));
}
@ApiOperation("生成订单")
@GetMapping("/createOrder")
@OperationLog(module = ModuleName.TELEPHONE, methods = "生成订单", type = OperationLogTypeEnum.INSERT)
@ControllerLog(operation = "生成订单")
public ResultBean<PayInfoVO> insertEduProductOrder(@ApiParam("充值金额") Double money,
@ApiParam("ic卡id") Long icCardId,
@ApiParam("支付方式，0-微信jsapi，1-微信h5") Integer payType) {
@ApiParam("ic卡id") Long icCardId,
@ApiParam("支付方式，0-微信jsapi，1-微信h5") Integer payType) {
return ResultBean.buildSuccess(eduTelephoneOrderService.createOrder(money, icCardId, payType, FebsUtil.getCurrentUser(),
FebsUtil.getHttpServletRequestIpAddress()));
FebsUtil.getHttpServletRequestIpAddress()));
}
@ApiOperation("订单完成（前台支付完成后调用）")
@@ -90,7 +87,6 @@ public class EduTelephoneOrderController {
@ApiOperation("发起支付")
@GetMapping("/payOrder")
@OperationLog(module = ModuleName.TELEPHONE, methods = "发起支付", type = OperationLogTypeEnum.INSERT)
public ResultBean<PayInfoVO> payOrder(String orderCode) {
Object prepay = redisService.get(CachePrefixConstant.ORDER_FLAG + orderCode);
PayInfoVO infoVO = eduTelephoneOrderService.getWxJsSign(orderCode, prepay.toString());