lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

新增在机构管理增加日志@LogRecord
Some checks failed
Java CI with Maven / build (11) (push) Has been cancelled
Details
Java CI with Maven / build (17) (push) Has been cancelled
Details
Java CI with Maven / build (8) (push) Has been cancelled
Details
yudao-ui-admin CI / build (14.x) (push) Has been cancelled
Details
yudao-ui-admin CI / build (16.x) (push) Has been cancelled
Details

Browse Source
This commit is contained in:
lxd 2024-07-26 18:28:53 +08:00
parent ac7d9dc198
commit f006b6076f
13 changed files with 43 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/doctor/DoctorController.java
View File

@ -34,7 +34,7 @@ import javax.validation.Valid;
@Tag(name = "管理后台 - 医生管理")
@RestController
@RequestMapping("/mapper/doctor/")
@RequestMapping("/doctor/")
@Validated
public class DoctorController {

13
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/OrgUnitController.java
View File

@ -1,5 +1,8 @@
package cn.iocoder.yudao.module.system.controller.admin.org;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import com.mzt.logapi.context.LogRecordContext;
import com.mzt.logapi.starter.annotation.LogRecord;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@ -22,6 +25,7 @@ import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.*;
import static cn.iocoder.yudao.module.system.enums.LogRecordConstants.*;
import cn.iocoder.yudao.module.system.controller.admin.org.vo.*;
import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO;
@ -43,6 +47,7 @@ public class OrgUnitController {
@PostMapping("/create")
@Operation(summary = "创建机构管理")
@PreAuthorize("@ss.hasPermission('org::create')")
@LogRecord(type = "机构管理", subType = "创建", bizNo ="{{#createReqVO.getOrgID}}" , success = "创建ID为{{#createReqVO.getOrgID}}的机构")
public CommonResult<String> create(@Valid @RequestBody OrgUnitSaveReqVO createReqVO) {
String msg="";
@ -58,7 +63,7 @@ public class OrgUnitController {
{
msg="机构ID已经存在";
}
// LogRecordContext.putVariable("机构管理","进行了创建操作");
return success(msg);
}
@ -75,7 +80,11 @@ public class OrgUnitController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('org::delete')")
public CommonResult<Boolean> delete(@RequestParam("id") String id) {
Service.delete(id);
OrgUnitSaveReqVO updateReqVO=new OrgUnitSaveReqVO();
updateReqVO.setOrgID(id);
updateReqVO.setIsdelete("1");
Service.update(updateReqVO);
// Service.delete(id);
return success(true);
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitPageReqVO.java
View File

@ -48,4 +48,6 @@ public class OrgUnitPageReqVO extends PageParam {
@Schema(description = "机构logo的URL", example = "https://www.iocoder.cn")
private String orgLogoUrl;
@Schema(description = "是否删除")
private String isdelete;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitRespVO.java
View File

@ -59,4 +59,6 @@ public class OrgUnitRespVO {
@ExcelProperty("机构logo的URL")
private String orgLogoUrl;
@Schema(description = "是否删除")
private String isdelete;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/org/vo/OrgUnitSaveReqVO.java
View File

@ -45,4 +45,7 @@ public class OrgUnitSaveReqVO {
@Schema(description = "机构logo的URL", example = "https://www.iocoder.cn")
private String orgLogoUrl;
@Schema(description = "是否删除")
private String isdelete;
}

6
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/wx/WxController.java
View File

@ -62,7 +62,11 @@ public class WxController {
@Parameter(name = "id", description = "编号", required = true)
@PreAuthorize("@ss.hasPermission('system:wx:delete')")
public CommonResult<Boolean> deleteWx(@RequestParam("id") String id) {
wxService.deleteWx(id);
WxSaveReqVO updateReqVO=new WxSaveReqVO();
updateReqVO.setId(id);
updateReqVO.setIsdelete("1");
wxService.updateWx(updateReqVO);
// wxService.deleteWx(id);
return success(true);
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/wx/vo/WxPageReqVO.java
View File

@ -24,4 +24,6 @@ public class WxPageReqVO extends PageParam {
@Schema(description = "微信号所属人的姓名，通过公众号发固定格式命令获取", example = "王五")
private String personName;
@Schema(description = "是否删除")
private String isdelete;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/wx/vo/WxRespVO.java
View File

@ -41,4 +41,6 @@ public class WxRespVO {
@ExcelProperty("机构ID")
private String orgId;
@Schema(description = "是否删除")
private String isdelete;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/wx/vo/WxSaveReqVO.java
View File

@ -1,5 +1,6 @@
package cn.iocoder.yudao.module.system.controller.admin.wx.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.util.*;
@ -31,5 +32,7 @@ public class WxSaveReqVO {
@Schema(description = "机构ID", example = "4736")
private String orgId;
@Schema(description = "是否删除")
private String isdelete;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/org/OrgUnitDO.java
View File

@ -80,4 +80,7 @@ public class OrgUnitDO {
@TableField("orgLogoUrl")
private String orgLogoUrl;
@TableField("isdelete")
private String isdelete;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/wx/WxDO.java
View File

@ -56,4 +56,7 @@ public class WxDO {
@TableField("orgId")
private String orgId;
@TableField("isdelete")
private String isdelete;
}

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/org/OrgUnitMapper.java
View File

@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.org;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.system.dal.dataobject.doctor.DoctorDO;
import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
@ -31,6 +32,8 @@ public interface OrgUnitMapper extends BaseMapperX<OrgUnitDO> {
.betweenIfPresent(OrgUnitDO::getCreateDate, reqVO.getCreateDate())
.likeIfPresent(OrgUnitDO::getHighLevelOrgName, reqVO.getHighLevelOrgName())
.eqIfPresent(OrgUnitDO::getOrgLogoUrl, reqVO.getOrgLogoUrl())
.or(wrapper -> wrapper.eq(OrgUnitDO::getIsdelete, 0))
.or(wrapper -> wrapper.isNull(OrgUnitDO::getIsdelete))
.orderByDesc(OrgUnitDO::getOrgID));
}
//查询当前ID 是否存在

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/wx/WxMapper.java
View File

@ -5,6 +5,7 @@ import java.util.*;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
import cn.iocoder.yudao.module.system.dal.dataobject.org.OrgUnitDO;
import cn.iocoder.yudao.module.system.dal.dataobject.wx.WxDO;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import org.apache.ibatis.annotations.Mapper;
@ -24,6 +25,8 @@ public interface WxMapper extends BaseMapperX<WxDO> {
.likeIfPresent(WxDO::getWxUserid, reqVO.getWxUserid())
.likeIfPresent(WxDO::getBindTel, reqVO.getBindTel())
.likeIfPresent(WxDO::getPersonName, reqVO.getPersonName())
.or(wrapper -> wrapper.eq(WxDO::getIsdelete, 0))
.or(wrapper -> wrapper.isNull(WxDO::getIsdelete))
.orderByDesc(WxDO::getId));
}