From f768c092c148d0830f10a12284bab2a186cd8398 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 12 Oct 2021 11:33:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ccsens/carbasics/api/RoleController.java | 56 ++++++++------- .../carbasics/service/IRoleCarService.java | 18 +++++ .../carbasics/service/RoleCarService.java | 69 +++++++++++++++++++ .../com/ccsens/carbasics/util/Constant.java | 3 +- 4 files changed, 119 insertions(+), 27 deletions(-) create mode 100644 src/main/java/com/ccsens/carbasics/service/IRoleCarService.java create mode 100644 src/main/java/com/ccsens/carbasics/service/RoleCarService.java diff --git a/src/main/java/com/ccsens/carbasics/api/RoleController.java b/src/main/java/com/ccsens/carbasics/api/RoleController.java index bebd2cb..92f66c6 100644 --- a/src/main/java/com/ccsens/carbasics/api/RoleController.java +++ b/src/main/java/com/ccsens/carbasics/api/RoleController.java @@ -2,6 +2,7 @@ package com.ccsens.carbasics.api; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.ObjectUtil; +import com.ccsens.carbasics.service.IRoleCarService; import com.ccsens.cloudutil.annotation.MustLogin; import com.ccsens.common.bean.dto.CRoleDto; import com.ccsens.common.bean.vo.CRoleVo; @@ -32,38 +33,41 @@ import java.util.List; public class RoleController { @Resource private IProRoleService roleService; + @Resource + private IRoleCarService roleCarService; @MustLogin @ApiOperation(value = "根据项目id查找角色", notes = "") @RequestMapping(value = "/show", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) public JsonResponse queryByProjectId(@ApiParam @Validated @RequestBody QueryDto params) { params.getParam().setNum(0); - CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId()); - List r1 = new ArrayList<>(); - List r2 = new ArrayList<>(); - //处理角色，只查看自己所属的角色 - if(ObjectUtil.isNotNull(queryRole)){ - if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){ - queryRole.getVisibleList().forEach(roleInfo -> { - if(roleInfo.getMine() == 1){ - r1.add(roleInfo); - }else { - r2.add(roleInfo); - } - }); - } - if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){ - queryRole.getInvisibleList().forEach(roleInfo -> { - if(roleInfo.getMine() == 1){ - r1.add(roleInfo); - }else { - r2.add(roleInfo); - } - }); - } - } - queryRole.setVisibleList(r1); - queryRole.setInvisibleList(r2); +// CRoleVo.QueryRole queryRole = roleService.queryShowRole(params.getParam(), params.getUserId()); + CRoleVo.QueryRole queryRole = roleCarService.queryShowRoleCar(params.getParam(), params.getUserId()); +// List r1 = new ArrayList<>(); +// List r2 = new ArrayList<>(); +// //处理角色，只查看自己所属的角色 +// if(ObjectUtil.isNotNull(queryRole)){ +// if(CollectionUtil.isNotEmpty(queryRole.getVisibleList())){ +// queryRole.getVisibleList().forEach(roleInfo -> { +// if(roleInfo.getMine() == 1){ +// r1.add(roleInfo); +// }else { +// r2.add(roleInfo); +// } +// }); +// } +// if(CollectionUtil.isNotEmpty(queryRole.getInvisibleList())){ +// queryRole.getInvisibleList().forEach(roleInfo -> { +// if(roleInfo.getMine() == 1){ +// r1.add(roleInfo); +// }else { +// r2.add(roleInfo); +// } +// }); +// } +// } +// queryRole.setVisibleList(r1); +// queryRole.setInvisibleList(r2); return JsonResponse.newInstance().ok(queryRole); } diff --git a/src/main/java/com/ccsens/carbasics/service/IRoleCarService.java b/src/main/java/com/ccsens/carbasics/service/IRoleCarService.java new file mode 100644 index 0000000..1763aaa --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/IRoleCarService.java @@ -0,0 +1,18 @@ +package com.ccsens.carbasics.service; + +import com.ccsens.common.bean.dto.CRoleDto; +import com.ccsens.common.bean.vo.CRoleVo; + +/** + * @author AUSU + */ +public interface IRoleCarService { + /** + * 查询用户角色列表 + * @param param 项目id + * @param userId 用户id + * @return 角色展示列表 + */ + CRoleVo.QueryRole queryShowRoleCar(CRoleDto.QueryRoleById param, Long userId); + +} diff --git a/src/main/java/com/ccsens/carbasics/service/RoleCarService.java b/src/main/java/com/ccsens/carbasics/service/RoleCarService.java new file mode 100644 index 0000000..5d5101d --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/RoleCarService.java @@ -0,0 +1,69 @@ +package com.ccsens.carbasics.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ccsens.carbasics.util.Constant; +import com.ccsens.common.bean.dto.CRoleDto; +import com.ccsens.common.bean.po.ProRole; +import com.ccsens.common.bean.vo.CRoleVo; +import com.ccsens.common.persist.dao.ProRoleDao; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +/** + * @author AUSU + */ +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class RoleCarService implements IRoleCarService { + + @Resource + private ProRoleDao proRoleDao; + + @Override + public CRoleVo.QueryRole queryShowRoleCar(CRoleDto.QueryRoleById param, Long userId) { + //返回的对象 + CRoleVo.QueryRole queryRole = new CRoleVo.QueryRole(); + List visibleList = new ArrayList<>(); + List invisibleList = new ArrayList<>(); + //查询当前用户在项目下的角色，没有则算作关注者 + List userRoleList = proRoleDao.queryRoleByUserId(param.getProjectId(),userId); + //查询平车角色 + CRoleVo.RoleInfo carRole = proRoleDao.queryByName(Constant.CAR_ROLE_NAME, param.getProjectId()); + if (CollectionUtil.isNotEmpty(userRoleList)) { + if (1 < userRoleList.size()) { + userRoleList.forEach(userRole -> { + if (CollectionUtil.isEmpty(visibleList)) { + CRoleVo.RoleInfo userRoleInfo = new CRoleVo.RoleInfo(); + BeanUtil.copyProperties(userRole,userRoleInfo); + visibleList.add(userRoleInfo); + }else { + CRoleVo.RoleInfo userRoleInfo = new CRoleVo.RoleInfo(); + BeanUtil.copyProperties(userRole,userRoleInfo); + invisibleList.add(userRoleInfo); + } + }); + }else { + CRoleVo.RoleInfo userRoleInfo = new CRoleVo.RoleInfo(); + BeanUtil.copyProperties(userRoleList.get(0),userRoleInfo); + invisibleList.add(userRoleInfo); + } + } + if (ObjectUtil.isNotNull(carRole)) { + visibleList.add(carRole); + } + queryRole.setVisibleList(visibleList); + queryRole.setInvisibleList(invisibleList); + //查询平车角色 + return queryRole; + } + +} diff --git a/src/main/java/com/ccsens/carbasics/util/Constant.java b/src/main/java/com/ccsens/carbasics/util/Constant.java index 67064e2..40ce4da 100644 --- a/src/main/java/com/ccsens/carbasics/util/Constant.java +++ b/src/main/java/com/ccsens/carbasics/util/Constant.java @@ -20,7 +20,8 @@ public class Constant { public static final String STRING_REGEX = "，|,|；|;|、|/"; /**xls*/ public static final String XLS = "xls"; - + /**平车角色名*/ + public static final String CAR_ROLE_NAME = "平车"; public static final class TimeCheck{ public static final Map> compareItems = new HashMap<>(); From 2f2839c8e4524d1eadbf46ab6677c858a8da645b Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 12 Oct 2021 15:20:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=87=BApdf=20b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ccsens/carbasics/service/ExportService.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ccsens/carbasics/service/ExportService.java b/src/main/java/com/ccsens/carbasics/service/ExportService.java index abd566f..f00e4cb 100644 --- a/src/main/java/com/ccsens/carbasics/service/ExportService.java +++ b/src/main/java/com/ccsens/carbasics/service/ExportService.java @@ -50,9 +50,15 @@ public class ExportService implements IExportService{ //基本信息查询患者年龄 FirstAid firstAid = firstAidDao.selectByPrimaryKey(param.getFirstAidId()); if (ObjectUtil.isNotNull(firstAid)) { - textMap.put("age",String.valueOf(firstAid.getAge())); - textMap.put("CJBL-NAME",firstAid.getName()); - textMap.put("CJBL-SEX",firstAid.getGender()==1?"男":"女"); + if (ObjectUtil.isNotNull(firstAid.getAge())) { + textMap.put("age",String.valueOf(firstAid.getAge())); + } + if (StrUtil.isNotBlank(firstAid.getName())) { + textMap.put("CJBL-NAME",firstAid.getName()); + } + if (ObjectUtil.isNotNull(firstAid.getGender())) { + textMap.put("CJBL-SEX",firstAid.getGender()==1?"男":"女"); + } } //当前时间 // long currentTime = System.currentTimeMillis(); From f7dc6ce1b992d7a6946fda073673c1949b3317e5 Mon Sep 17 00:00:00 2001 From: ma <1062634917@qq.com> Date: Tue, 12 Oct 2021 16:55:47 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ccsens/carbasics/service/RoleCarService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ccsens/carbasics/service/RoleCarService.java b/src/main/java/com/ccsens/carbasics/service/RoleCarService.java index 5d5101d..248054c 100644 --- a/src/main/java/com/ccsens/carbasics/service/RoleCarService.java +++ b/src/main/java/com/ccsens/carbasics/service/RoleCarService.java @@ -54,7 +54,7 @@ public class RoleCarService implements IRoleCarService { }else { CRoleVo.RoleInfo userRoleInfo = new CRoleVo.RoleInfo(); BeanUtil.copyProperties(userRoleList.get(0),userRoleInfo); - invisibleList.add(userRoleInfo); + visibleList.add(userRoleInfo); } } if (ObjectUtil.isNotNull(carRole)) {