From 6a4b807ecb742aec60d612e18cb62a0c90953cc7 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 7 Jan 2022 16:21:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=B3=A8=E8=A7=A3=E4=B8=8D?= =?UTF-8?q?=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=20=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E5=B7=AE=E5=85=AB=E5=B0=8F=E6=97=B6=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../da/slrs/sarRole/controller/TsRoleController.java | 12 ++++++++++-- .../java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java | 3 +++ .../java/com/adc/da/slrs/sarRole/entity/TsRole.java | 6 +++--- .../adc/da/slrs/sarRole/service/ITsRoleService.java | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java index afcda9b0..60d50527 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/controller/TsRoleController.java @@ -8,6 +8,7 @@ import com.adc.da.login.util.UserUtils; import com.adc.da.slrs.sarMenu.entity.SarMenu; import com.adc.da.slrs.sarResource.entity.TsResource; import com.adc.da.slrs.sarResource.service.ITsResourceService; +import com.adc.da.slrs.sarRole.dao.TsRoleDao; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.adc.da.slrs.sarRole.service.ITsRoleService; @@ -39,6 +40,8 @@ import java.util.List; public class TsRoleController extends BaseController { @Autowired private ITsRoleService tsRoleService; + @Autowired + private TsRoleDao tsRoleDao; @ApiOperation("查询所有角色") @GetMapping @@ -95,9 +98,14 @@ public class TsRoleController extends BaseController { @ApiOperation("查询角色详情") @GetMapping("/id") public ResponseMessage getRoleById(@RequestParam String roleId){ - TsRole tsRole=tsRoleService.getById(roleId); +// TsRole tsRole=tsRoleService.getById(roleId); +// if(tsRole.getParentId()!=null){ +// TsRole parent=tsRoleService.getById(tsRole.getParentId()); +// tsRole.setParent(parent.getName()); +// } + TsRole tsRole=tsRoleDao.getAllDatas(roleId); if(tsRole.getParentId()!=null){ - TsRole parent=tsRoleService.getById(tsRole.getParentId()); + TsRole parent=tsRoleDao.getAllDatas(tsRole.getParentId()); tsRole.setParent(parent.getName()); } return Result.success(tsRole); diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java index d709188b..a6edddff 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/dao/TsRoleDao.java @@ -99,4 +99,7 @@ public interface TsRoleDao extends BaseMapper { * @return List */ List getRootMenuIdsByRoleIds(List roleIds); + + @Select("select *,DATE_ADD(ts_role.operate_time,INTERVAL 8 HOUR) as operateTime from ts_role where ts_role.ID = #{roleId}") + TsRole getAllDatas(@Param("roleId") String roleId); } diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java index a2a705b2..cd72e305 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/entity/TsRole.java @@ -69,7 +69,7 @@ public class TsRole extends BaseEntity { private String remarks; @ApiModelProperty(value = "操作时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss",locale = "zh") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp operateTime; @@ -89,13 +89,13 @@ public class TsRole extends BaseEntity { @ApiModelProperty(value = "创建时间") @TableField("CREATION_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp creationTime; @ApiModelProperty(value = "修改时间") @TableField("MODIFY_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Timestamp modifyTime; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java index 4f009999..3c9910bb 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarRole/service/ITsRoleService.java @@ -5,6 +5,7 @@ import com.adc.da.slrs.sarRole.entity.TsRole; import com.adc.da.slrs.sarRole.entity.TsRoleMenuVO; import com.adc.da.slrs.sarRole.entity.TsRoleResourceVO; import com.baomidou.mybatisplus.extension.service.IService; +import org.apache.ibatis.annotations.Param; import java.util.List;