增加资源文件拼接注解

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/ManagementTeacherController.java

@@ -25,6 +25,8 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.info.management.domain.bo.ManagementTeacherBo;
 import com.ruoyi.info.management.domain.bo.ManagementTeacherPageReqBo;
@@ -56,6 +58,7 @@ public class ManagementTeacherController extends BaseController {
     /**
      * 分页查询管理老师信息列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询管理老师信息列表")
     @SaCheckPermission("info:managementTeacher:list")
     @GetMapping("/page")
@@ -66,6 +69,7 @@ public class ManagementTeacherController extends BaseController {
     /**
      * 获取管理老师信息详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取管理老师信息详细信息")
     @SaCheckPermission("info:managementTeacher:query")
     @GetMapping("/info/{id}")
@@ -78,6 +82,7 @@ public class ManagementTeacherController extends BaseController {
     /**
      * 新增管理老师信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增管理老师信息")
     @SaCheckPermission("info:managementTeacher:add")
     @Log(title = "管理老师信息", businessType = BusinessType.INSERT)
@@ -90,6 +95,7 @@ public class ManagementTeacherController extends BaseController {
     /**
      * 修改管理老师信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("修改管理老师信息")
     @SaCheckPermission("info:managementTeacher:edit")
     @Log(title = "管理老师信息", businessType = BusinessType.UPDATE)

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/NursingWorkerController.java

@@ -21,6 +21,8 @@ import com.ruoyi.common.core.validate.AddGroup;
 import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.core.validate.QueryGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.CollectionUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.info.hospital.domain.vo.HospitalVo;
@@ -61,6 +63,7 @@ public class NursingWorkerController extends BaseController {
     /**
      * 分页查询护工信息列表
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("查询护工信息列表")
     @SaCheckPermission("info:nursingWorker:list")
     @GetMapping("/page")
@@ -80,6 +83,7 @@ public class NursingWorkerController extends BaseController {
     /**
      * 获取护工信息详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取护工信息详细信息")
     @SaCheckPermission("info:nursingWorker:query")
     @GetMapping("/info/{id}")
@@ -92,6 +96,7 @@ public class NursingWorkerController extends BaseController {
     /**
      * 新增护工信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增护工信息")
     @SaCheckPermission("info:nursingWorker:add")
     @Log(title = "护工信息", businessType = BusinessType.INSERT)

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiManagementTeacherController.java

@@ -12,6 +12,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.ruoyi.api.controller.common.AbstractApiController;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.CollectionUtils;
 import com.ruoyi.common.utils.DateUtils;
@@ -53,6 +55,7 @@ public class ApiManagementTeacherController extends AbstractApiController {
 
     private final IOrderRefundService orderRefundService;
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("管理老师工作台信息")
     @GetMapping("/workbench")
     public R<ManagementTeacherBenchVo> workbench() {

ruoyi-api/src/main/java/com/ruoyi/api/controller/info/ApiNursingWorkerController.java

@@ -21,7 +21,10 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.annotation.RepeatSubmit;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.enums.FilePathSplicingType;
+import com.ruoyi.common.filepathsplicing.FilePathSplicing;
 import com.ruoyi.common.utils.BeanCopyUtils;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.date.LocalDateTimeUtils;
@@ -63,6 +66,7 @@ public class ApiNursingWorkerController extends AbstractApiController {
 
     private final ITeacherDepartmentRelService teacherDepartmentRelService;
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("护工工作台信息")
     @GetMapping("/workbench")
     public R<NursingWorkerBenchVo> workbench() {
@@ -94,6 +98,7 @@ public class ApiNursingWorkerController extends AbstractApiController {
     }
 
     // 护工列表查询
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("护工列表查询")
     @GetMapping("/list")
     public R<List<NursingWorkerVo>> list(NursingWorkerApiReqBo bo) {
@@ -129,6 +134,7 @@ public class ApiNursingWorkerController extends AbstractApiController {
     /**
      * 获取护工信息详细信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
     @ApiOperation("获取护工信息详细信息")
     @SaCheckPermission("info:nursingWorker:query")
     @GetMapping("/info/{id}")
@@ -153,11 +159,22 @@ public class ApiNursingWorkerController extends AbstractApiController {
     /**
      * 新增护工信息
      */
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
     @ApiOperation("新增护工信息")
     @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody NursingWorkerBo bo) {
-//        return toAjax(iNursingWorkerService.insertByBo(bo) ? 1 : 0);
+        nursingWorkerService.insertByBo(bo);
+        return R.ok();
+    }
+
+
+    @FilePathSplicing(type = FilePathSplicingType.REQUEST)
+    @ApiOperation("修改护工信息")
+    @RepeatSubmit()
+    @PostMapping("/edit")
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody NursingWorkerBo bo) {
+        nursingWorkerService.updateByBo(bo);
         return R.ok();
     }
 

ruoyi-api/src/main/java/com/ruoyi/api/controller/user/ApiUserLoginController.java

@@ -111,6 +111,7 @@ public class ApiUserLoginController extends AbstractApiController {
     @PostMapping("/wxLogout")
     public R<Void> wxLogout() {
         userService.logout(getUserId(true), UserThirdType.WX_MINI_PROGRAM.getCode());
+//        apiTokenService.removeToken(getToken());
         return R.ok("退出成功");
     }
 }

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/ApiTokenService.java

@@ -69,6 +69,10 @@ public class ApiTokenService {
         return doGenerateToken(claims, user.getNickname());
     }
 
+    public void removeToken(String token) {
+        stringRedisTemplate.delete(Constants.JWT_TOKEN +  token);
+    }
+
     /**
      * 生成小程序token
      *

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/bo/ManagementTeacherBo.java

@@ -17,6 +17,7 @@ import java.util.List;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 
 /**
  * 管理老师信息业务对象 tb_management_teacher
@@ -95,6 +96,7 @@ public class ManagementTeacherBo extends BaseEntity {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ApiModelProperty(value = "形象照片url", required = true)
     @NotBlank(message = "形象照片url不能为空", groups = { AddGroup.class, EditGroup.class })
     private String photographUrl;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/vo/ManagementTeacherBenchVo.java

@@ -3,6 +3,7 @@ package com.ruoyi.info.management.domain.vo;
 import java.io.Serializable;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -40,6 +41,7 @@ public class ManagementTeacherBenchVo  implements Serializable {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ApiModelProperty("形象照片url")
     private String photographUrl;
 

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/domain/vo/ManagementTeacherVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -91,6 +93,7 @@ public class ManagementTeacherVo implements Serializable {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ExcelProperty(value = "形象照片url")
     @ApiModelProperty("形象照片url")
     private String photographUrl;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/management/service/impl/ManagementTeacherServiceImpl.java

@@ -258,7 +258,7 @@ public class ManagementTeacherServiceImpl implements IManagementTeacherService {
         wrapper.eq(ManagementTeacher::getPhoneNumber, mobile);
         if (isEnable) {
             // 只查状态为启用的
-            wrapper.eq(ManagementTeacher::getEnableStatus, EnableStatusEnum.ENABLE);
+            wrapper.eq(ManagementTeacher::getEnableStatus, EnableStatusEnum.ENABLE.getKey());
         }
         wrapper.last("limit 1");
         return baseMapper.selectVoOne(wrapper);

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/bo/NursingCertificateBo.java

@@ -11,6 +11,7 @@ import javax.validation.constraints.*;
 import java.util.Date;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 
 /**
  * 护工从业证书信息业务对象 tb_nursing_certificate
@@ -46,6 +47,7 @@ public class NursingCertificateBo extends BaseEntity {
     /**
      * 证书图片url
      */
+    @FilePathValue
     @ApiModelProperty(value = "证书图片url", required = true)
     @NotBlank(message = "证书图片url不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pictureUrl;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/bo/NursingWorkerBo.java

@@ -15,6 +15,7 @@ import java.util.List;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import com.ruoyi.common.core.domain.BaseEntity;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
 
 /**
  * 护工信息业务对象 tb_nursing_worker
@@ -107,6 +108,7 @@ public class NursingWorkerBo extends BaseEntity {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ApiModelProperty(value = "形象照片url", required = true)
     @NotBlank(message = "形象照片url不能为空", groups = { AddGroup.class, EditGroup.class })
     private String photographUrl;
@@ -114,6 +116,7 @@ public class NursingWorkerBo extends BaseEntity {
     /**
      * 护工从业证书信息
      */
+    @FilePathValue
     @ApiModelProperty(value = "护工从业证书信息", required = true)
     private List<NursingCertificateBo> nursingCertificateList;
 

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingCertificateVo.java

@@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -48,6 +50,7 @@ public class NursingCertificateVo implements Serializable {
     /**
      * 证书图片url
      */
+    @FilePathValue
     @ExcelProperty(value = "证书图片url")
     @ApiModelProperty("证书图片url")
     private String pictureUrl;

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingWorkerBenchVo.java

@@ -2,6 +2,8 @@ package com.ruoyi.info.nursing.domain.vo;
 
 import java.io.Serializable;
 
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -46,6 +48,7 @@ public class NursingWorkerBenchVo implements Serializable  {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ApiModelProperty("形象照片url")
     private String photographUrl;
 

ruoyi-info/ruoyi-info-biz/src/main/java/com/ruoyi/info/nursing/domain/vo/NursingWorkerVo.java

@@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.filepathsplicing.FilePathValue;
+
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -114,6 +116,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 形象照片url
      */
+    @FilePathValue
     @ExcelProperty(value = "形象照片url")
     @ApiModelProperty("形象照片url")
     private String photographUrl;
@@ -132,6 +135,7 @@ public class NursingWorkerVo implements Serializable {
     /**
      * 技能信息列表
      */
+    @FilePathValue
     @ApiModelProperty("技能信息列表")
     private List<NursingCertificateVo> nursingCertificateList;