From 9732ebeaa97c6f205a955fee5d057026b9ed1c46 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 19 Aug 2024 16:19:55 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=B5=8B=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/gateway/filter/CorsConfig.java | 26 +++++++++++++++++++ .../bracelet/mapper/EquipmentReqMapper.java | 9 +++++++ .../bracelet/mapper/PersonMgeMapper.java | 18 +++++++++++++ .../service/impl/EquipmentReqServiceImpl.java | 5 ++++ .../service/impl/PersonMgeServiceImpl.java | 18 +++++++++++-- .../mapper/bracelet/EquipmentReqMapper.xml | 4 +++ .../mapper/bracelet/PersonMgeMapper.xml | 13 +++++++++- .../mapper/bracelet/TeamMgeMapper.xml | 6 ++--- 8 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 bonus-gateway/src/main/java/com/bonus/gateway/filter/CorsConfig.java diff --git a/bonus-gateway/src/main/java/com/bonus/gateway/filter/CorsConfig.java b/bonus-gateway/src/main/java/com/bonus/gateway/filter/CorsConfig.java new file mode 100644 index 0000000..b7a22dc --- /dev/null +++ b/bonus-gateway/src/main/java/com/bonus/gateway/filter/CorsConfig.java @@ -0,0 +1,26 @@ +package com.bonus.gateway.filter; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.reactive.CorsWebFilter; +import org.springframework.web.cors.reactive.UrlBasedCorsConfigurationSource; +import org.springframework.web.util.pattern.PathPatternParser; + +/** + * description: + * java项目fhadmin.cn + */ +@Configuration +public class CorsConfig { + @Bean + public CorsWebFilter corsFilter() { + CorsConfiguration config = new CorsConfiguration(); + config.addAllowedMethod("*"); // 是什么请求方法，比如GET POST PUT DELATE ... + config.addAllowedOrigin("*"); // 来自哪个域名的请求，*号表示所有 + config.addAllowedOriginPattern("*"); // 来自哪个域名的请求，*号表示所有 + config.addAllowedHeader("*"); // 是什么请求头部 + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(new PathPatternParser()); + source.registerCorsConfiguration("/**", config); + return new CorsWebFilter(source); + } +} \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java index 2b57bb1..2225c55 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/EquipmentReqMapper.java @@ -115,4 +115,13 @@ public interface EquipmentReqMapper { * @date 2024/8/7 14:53 */ Long getTeamLeader(EquipmentReqDataVo vo); + + /** + * 判断班组是否已经解散 + * @param teamId + * @return int + * @author cwchen + * @date 2024/8/19 10:04 + */ + int isTeamDissolve(Long teamId); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java index f34f4de..4cfd340 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/mapper/PersonMgeMapper.java @@ -227,4 +227,22 @@ public interface PersonMgeMapper { * @date 2024/8/12 13:12 */ void updatePeoplePushStatus(Long id); + + /** + * 判断人员是否绑定了设备 + * @param vo + * @return List + * @author cwchen + * @date 2024/8/19 10:57 + */ + List isLyDevices(PersonVo vo); + + /** + * 人员已分配班组，岗位限制修改 + * @param vo + * @return Integer + * @author cwchen + * @date 2024/8/19 15:08 + */ + Integer canItBeModified(PersonVo vo); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java index eae2788..9b7037d 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/EquipmentReqServiceImpl.java @@ -55,6 +55,11 @@ public class EquipmentReqServiceImpl implements IEquipmentReqService { if(!isDepartRoleCode){ return AjaxResult.error("非项目部角色，无领用设备权限"); } + // 判断班组是否已经解散 + int isTeamDissolve = mapper.isTeamDissolve(vo.getTeamId()); + if(isTeamDissolve == 0){ + return AjaxResult.error("该班组已解散，无法领用设备"); + } if (CollectionUtils.isEmpty(vo.getList())) { return AjaxResult.error("领用设备不能为空"); } diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java index 8c1e666..1640424 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/PersonMgeServiceImpl.java @@ -184,6 +184,11 @@ public class PersonMgeServiceImpl implements IPersonMgeService { if (StringUtils.isNotBlank(validResult)) { return AjaxResult.error(validResult); } + // 人员已分配班组，岗位限制修改 + Integer canItBeModified = mapper.canItBeModified(vo); + if(canItBeModified > 0){ + return AjaxResult.error("人员已分配班组，岗位已限制修改"); + } // 验证身份证是否重复、手机号 List> list = mapper.personIsExist(vo); if (idCardIsExist(list, vo, 1)) { @@ -300,9 +305,18 @@ public class PersonMgeServiceImpl implements IPersonMgeService { public AjaxResult delPerson(BraceletParamsDto dto) { List list = new ArrayList<>(); try { - if (dto.getTeamId() != null) { + PersonVo vo = mapper.getPersonInfo(dto); + if (vo.getTeamId() != null) { return AjaxResult.error("该人员已分配班组，请先从班组中移除该人员"); } + // 判断人员是否领用设备包括手环箱、手环、安全帽等设备 + List isLyDevices = mapper.isLyDevices(vo); + if(isLyDevices.get(0) > 0){ + return AjaxResult.error("该人员已绑定手环"); + } + if(isLyDevices.get(1) > 0){ + return AjaxResult.error("该人员已绑定设备"); + } // 删除人员、资源文件、人脸照片 mapper.delPerson(dto); list = mapper.getCertificate(dto); @@ -473,7 +487,7 @@ public class PersonMgeServiceImpl implements IPersonMgeService { String encodeValue = Sm4Utils.encode(type == BusinessConstants.TYPE ? vo.getIdCard() : vo.getPhone()); for (Map map : list) { String value = type == BusinessConstants.TYPE ? map.get("value") : map.get("phone"); - if (Objects.equals(encodeValue, map.get("value"))) { + if (Objects.equals(encodeValue, value)) { return true; } } diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml index f65a655..ef9ade5 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/EquipmentReqMapper.xml @@ -189,4 +189,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM t_work_team twt WHERE twt.team_id = #{teamId} + + \ No newline at end of file diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml index 17d04c5..b48ad86 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/PersonMgeMapper.xml @@ -68,7 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" tp.mj_code AS mjCode, sfs.file_path AS filePath, sfs.id AS fileId, - tp.post + tp.post, + tp.team_id AS teamId FROM tb_people tp LEFT JOIN sys_file_source sfs ON tp.id = sfs.source_id AND sfs.source_type = #{sourceType} AND sfs.del_flag = 0 WHERE tp.id = #{id} AND tp.del_flag = 0 @@ -254,6 +255,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT dict_label AS name, dict_value AS value FROM sys_dict_data sdd WHERE sdd.dict_type = 'post_type' AND sdd.status = '0' + + + + diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml index a7ddeb9..6297297 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/TeamMgeMapper.xml @@ -142,13 +142,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM tb_people WHERE del_flag = 0 - AND team_id IS NULL + AND team_id IS NULL AND post !='team_leader' - AND team_id IS NOT NULL + AND team_id IS NOT NULL AND post !='team_leader' - AND team_id =#{teamId} + AND team_id =#{teamId} AND post !='team_leader'