diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java index ee4d5645..1e849094 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/DmsLoginController.java @@ -38,8 +38,6 @@ public class DmsLoginController { @Resource private WebDmsLoginService webDmsLoginService; @Resource - private SysPermissionService permissionService; - @Resource private TokenService tokenService; @Resource private DmsLoginService dmsLoginService; @@ -51,8 +49,7 @@ public class DmsLoginController { * @return 结果 */ @PostMapping("/login") - public AjaxResult login(@RequestBody LoginBody loginBody) - { + public AjaxResult login(@RequestBody LoginBody loginBody) { AjaxResult ajax = AjaxResult.success(); // 生成令牌 String token = webDmsLoginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), @@ -67,31 +64,20 @@ public class DmsLoginController { * @return 用户信息 */ @GetMapping("getInfo") - public AjaxResult getInfo() - { + public AjaxResult getInfo() { LoginUser loginUser = SecurityUtils.getLoginUser(); SysUser user = loginUser.getUser(); - // 角色集合 - Set roles = permissionService.getRolePermission(user); - // 权限集合 - Set permissions = permissionService.getMenuPermission(user); - if (!loginUser.getPermissions().equals(permissions)) - { - loginUser.setPermissions(permissions); - tokenService.refreshToken(loginUser); - } + //刷新token + tokenService.refreshToken(loginUser); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); ajax.put("tenantId", loginUser.getTenantId()); ajax.put("scoreId", loginUser.getScoreId()); - return ajax; } - @PutMapping("/resetPwd") - public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) - { + public JsonResponse resetPwd(@RequestBody DmsLoginUserVo.DmsUserVo user) { // webDmsLoginService.checkUserAllowed(user); // webDmsLoginService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupQueueController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupQueueController.java new file mode 100644 index 00000000..920c1d4e --- /dev/null +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/FmsFollowupQueueController.java @@ -0,0 +1,46 @@ +package com.acupuncture.web.controller.web; + +import com.acupuncture.common.annotation.Anonymous; +import com.acupuncture.common.core.domain.BaseDto; +import com.acupuncture.common.core.domain.JsonResponse; +import com.acupuncture.system.domain.vo.FmsFollowupDto; +import com.acupuncture.system.domain.vo.FmsFollowupVo; +import com.acupuncture.system.service.FmsFollowupQueueService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +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 javax.annotation.Resource; + +/** + * @Author zzc + * @Package com.acupuncture.web.controller.web + * @Date 2025/2/10 16:59 + * @description: + */ +@Slf4j +@Api(tags = "随访相关") +@RestController +@RequestMapping("/followup") +public class FmsFollowupQueueController { + + @Resource + private FmsFollowupQueueService fmsFollowupQueueService; + + @ApiOperation("查询公共队列") + @PostMapping("/commonQueue") + public JsonResponse> queryCommonQueue(@RequestBody @Validated BaseDto dto) { + if (dto.getPageNum() > 0) { + PageHelper.startPage(dto.getPageNum(), dto.getPageSize()); + } + return JsonResponse.ok(new PageInfo<>(fmsFollowupQueueService.queryCommonQueue(dto.getParam().getName()))); + } + +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupDto.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupDto.java new file mode 100644 index 00000000..ec3072b4 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupDto.java @@ -0,0 +1,20 @@ +package com.acupuncture.system.domain.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author zzc + * @Package com.acupuncture.system.domain.vo + * @Date 2025/2/10 17:02 + * @description: + */ +public class FmsFollowupDto { + + @Data + public static class QueueQuery { + @ApiModelProperty("队列名称") + private String name; + } + +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java new file mode 100644 index 00000000..550560b8 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/domain/vo/FmsFollowupVo.java @@ -0,0 +1,37 @@ +package com.acupuncture.system.domain.vo; + +import com.acupuncture.system.domain.po.FmsFollowupQueue; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author zzc + * @Package com.acupuncture.system.domain.vo + * @Date 2025/2/10 16:42 + * @description: + */ +public class FmsFollowupVo { + + @Data + public static class QueueResult{ + @ApiModelProperty("") + private Long id; + @ApiModelProperty("队列名称") + private String name; + @ApiModelProperty("随访方式（0电话随访；1入户随访；2到院随访）") + private Byte followupMethod; + @ApiModelProperty("随访类型（0单次；1周期）") + private Byte followupType; + @ApiModelProperty("随访频次（cron表达式）") + private String frequency; + @ApiModelProperty("随访总月数") + private Integer followupMonth; + @ApiModelProperty("负责医生名称") + private String personInCharge; + @ApiModelProperty("负责医生账号") + private String personInChargeUsername; + @ApiModelProperty("队列状态(0启用； 1禁用）") + private Byte status; + } + +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java new file mode 100644 index 00000000..9bc81aa4 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java @@ -0,0 +1,18 @@ +package com.acupuncture.system.persist.dao; + +import com.acupuncture.system.domain.vo.FmsFollowupVo; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Author zzc + * @Package com.acupuncture.system.persist.dao + * @Date 2025/2/10 16:51 + * @description: +*/ +public interface FmsFollowupDao { + + List queryCommonQueue(@Param("name") String name); + +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java new file mode 100644 index 00000000..439f3f28 --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/FmsFollowupQueueService.java @@ -0,0 +1,21 @@ +package com.acupuncture.system.service; + +import com.acupuncture.system.domain.vo.FmsFollowupVo; + +import java.util.List; + +/** + * @Author zzc + * @Package com.acupuncture.system.service + * @Date 2025/2/10 16:41 + * @description: + */ +public interface FmsFollowupQueueService { + + /** + * 查询公共队列 + * @return + */ + List queryCommonQueue(String name); + +} diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java new file mode 100644 index 00000000..fbfe598d --- /dev/null +++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupQueueServiceImpl.java @@ -0,0 +1,27 @@ +package com.acupuncture.system.service.impl; + +import com.acupuncture.system.domain.vo.FmsFollowupVo; +import com.acupuncture.system.persist.dao.FmsFollowupDao; +import com.acupuncture.system.service.FmsFollowupQueueService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author zzc + * @Package com.acupuncture.system.service.impl + * @Date 2025/2/10 16:41 + * @description: + */ +@Service +public class FmsFollowupQueueServiceImpl implements FmsFollowupQueueService { + + @Resource + private FmsFollowupDao fmsFollowupDao; + + @Override + public List queryCommonQueue(String name) { + return fmsFollowupDao.queryCommonQueue(name); + } +} diff --git a/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml b/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml new file mode 100644 index 00000000..187132ef --- /dev/null +++ b/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml @@ -0,0 +1,25 @@ + + + + + +