From b9ab775fabb247ec2e05a95df0c4527b2e77b453 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sun, 29 Sep 2024 11:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bonus-common/bonus-common-core/pom.xml | 6 +++- .../core/constant/BusinessConstants.java | 2 ++ .../entity/bracelet/vo/TeamPeopleTreeVo.java | 4 +-- .../service/impl/ConsControlServiceImpl.java | 27 ++++++++++++++-- .../service/impl/PersonMgeServiceImpl.java | 32 +++++++------------ .../mapper/bracelet/ConsControlMapper.xml | 6 ++-- 6 files changed, 47 insertions(+), 30 deletions(-) diff --git a/bonus-common/bonus-common-core/pom.xml b/bonus-common/bonus-common-core/pom.xml index e6fa943..52f7942 100644 --- a/bonus-common/bonus-common-core/pom.xml +++ b/bonus-common/bonus-common-core/pom.xml @@ -161,7 +161,11 @@ dom4j 1.6.1 - + diff --git a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java index 32aed79..15da71b 100644 --- a/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java +++ b/bonus-common/bonus-common-core/src/main/java/com/bonus/common/core/constant/BusinessConstants.java @@ -29,6 +29,8 @@ public class BusinessConstants { public static final int TYPE2 = 2; public static final int TYPE3 = 0; public static final Long PARENT_ID = 0L; + public static final String PARENT_ID_STR = "0"; + public static final String PARENT_ID_STR2 = "-1"; public static final Integer LEVEL = 4; public static final Integer LEVEL1 = 1; public static final Integer LEVEL2 = 2; diff --git a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/TeamPeopleTreeVo.java b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/TeamPeopleTreeVo.java index 2e851d1..95897ec 100644 --- a/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/TeamPeopleTreeVo.java +++ b/bonus-common/bonus-common-entity/src/main/java/com/bonus/common/entity/bracelet/vo/TeamPeopleTreeVo.java @@ -15,7 +15,7 @@ import java.util.List; @Data public class TeamPeopleTreeVo { /**id*/ - private Long id; + private String id; /**名称*/ private String label; /**手环编号*/ @@ -23,7 +23,7 @@ public class TeamPeopleTreeVo { /**手环级联编号*/ private String devCode; /**父ID*/ - private Long parentId; + private String parentId; /**人员类型*/ private Integer userType; private List children = new ArrayList<>(); diff --git a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java index ce2f58e..c2bd00b 100644 --- a/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java +++ b/bonus-modules/bonus-bracelet/src/main/java/com/bonus/bracelet/service/impl/ConsControlServiceImpl.java @@ -333,8 +333,8 @@ public class ConsControlServiceImpl implements IConsControlService { List list = new ArrayList<>(); list = mapper.getTeamPersonByTower(dto); for (TeamPeopleTreeVo vo : list) { - //忽略工程数据 - if (Objects.equals(vo.getParentId(), BusinessConstants.PARENT_ID) || Objects.equals(vo.getId(), BusinessConstants.PARENT_ID)) { + //忽略第一层级和第二层级 只保留人员层级 + if (Objects.equals(vo.getParentId(), BusinessConstants.PARENT_ID_STR) || Objects.equals(vo.getParentId(), BusinessConstants.PARENT_ID_STR2)) { continue; } String[] valArr = vo.getLabel().split("-"); @@ -370,13 +370,34 @@ public class ConsControlServiceImpl implements IConsControlService { return AjaxResult.error("手环编码不能为空"); } } - // 批量下发手环人脸验证指令-未对接 + StringBuilder sb = new StringBuilder(); + List spotCheckList = dto.getSpotCheckList(); + for (BraceletParamsDto.SpotCheckInfo spotCheckInfo : spotCheckList) { + if(StringUtils.isNotBlank(spotCheckInfo.getShCode())){ + sb.append(spotCheckInfo.getShCode()).append("@"); + } + } + if(StringUtils.isNotBlank(sb) && (sb.lastIndexOf("@") == sb.length() - 1)){ + sb.delete(sb.lastIndexOf("@"),sb.length()); + } + // 批量下发手环人脸验证指令 } catch (Exception e) { log.error(e.toString(), e); } return AjaxResult.success("已下达手环人脸验证抽检指令"); } + public static void main(String[] args) { + StringBuilder sb = new StringBuilder(); + sb.append("str").append("@").append("bstr").append("@"); + System.out.println(sb.lastIndexOf("@")); + System.out.println(sb.length() - 1); + if(sb.lastIndexOf("@") == sb.length() - 1){ + sb.delete(sb.lastIndexOf("@"),sb.length()); + } + System.err.println(sb.toString()); + } + @Override @Transactional(rollbackFor = Exception.class) public AjaxResult checkConfig(CheckConfigVo vo) { 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 f90ccea..2f80a12 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 @@ -253,10 +253,17 @@ public class PersonMgeServiceImpl implements IPersonMgeService { vo.setPhone(Sm4Utils.encode(vo.getPhone())); mapper.editPerson(vo); delFileId = uploadFile(file, vo); - if (StringUtils.isNotEmpty(vo.getDelFiles())) { - String personImgBase64 = getPersonImgBase64(vo.getDelFiles()); - // 删除人脸库，添加人脸照片至人脸库 - AjaxResult delAjax = delFaceToLibrary(personImgBase64, FaceCodeUtil.DEL, "bz-" + vo.getId()); + if (file!=null) { + if(StringUtils.isNotBlank(vo.getDelFiles())){ + String personImgBase64 = getPersonImgBase64(vo.getDelFiles()); + // 删除人脸库，添加人脸照片至人脸库 + AjaxResult delAjax = delFaceToLibrary(personImgBase64, FaceCodeUtil.DEL, "bz-" + vo.getId()); + String[] delFiles = vo.getDelFiles().split(","); + for (String fileId : delFiles) { + resourceFileMapper.delResourceFile(vo.getFileId()); + remoteFileService.delFile(fileId, SecurityConstants.INNER); + } + } AjaxResult ajaxResult = addFaceToLibrary(BytesToMultipartFileUtil.multipartFileToBase64(file), FaceCodeUtil.ADD, "bz-" + vo.getId()); JSONObject data = JSONObject.parseObject(JSONObject.toJSONString(ajaxResult.get("data"))); Integer code = data.getInteger("code"); @@ -267,11 +274,6 @@ public class PersonMgeServiceImpl implements IPersonMgeService { }else{ mapper.updatePeoplePushStatus(vo.getId(),0); } - String[] delFiles = vo.getDelFiles().split(","); - for (String fileId : delFiles) { - resourceFileMapper.delResourceFile(vo.getFileId()); - remoteFileService.delFile(fileId, SecurityConstants.INNER); - } } } catch (Exception e) { log.error("修改人员", e); @@ -472,18 +474,6 @@ public class PersonMgeServiceImpl implements IPersonMgeService { if(StringUtils.isNotBlank(errorInfo)){ return AjaxResult.error(errorInfo); } - /*if (StringUtils.isNotBlank(existData)) { - return AjaxResult.error(existData); - } - if (StringUtils.isNotBlank(existData2)) { - return AjaxResult.error(existData2); - } - if (StringUtils.isNotBlank(existData3)) { - return AjaxResult.error(existData3); - } - if (StringUtils.isNotBlank(existData4)) { - return AjaxResult.error(existData4); - }*/ // 校验库中数据的身份证号、手机号、安全帽编号、马甲编号是否重复 List> personIsExist = mapper.personIsExist(new PersonVo()); List> aqmCodes = mapper.aqmCodeIsExist(); diff --git a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml index c0a7350..e5ba05e 100644 --- a/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml +++ b/bonus-modules/bonus-bracelet/src/main/resources/mapper/bracelet/ConsControlMapper.xml @@ -331,7 +331,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" null AS devCode, null AS userType UNION ALL - SELECT twt.team_id AS id, + SELECT DISTINCT CONCAT('team-',twt.team_id) AS id, twt.team_name AS label, 0 AS parentId, null AS shCode, @@ -343,7 +343,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UNION ALL SELECT tpe.id, CONCAT(tpe.name,'-',tpe.phone) AS label, - tpe.team_id AS parentId, + CONCAT('team-',tpe.team_id) AS parentId, tb.sh_code AS shCode, IFNULL(tb.dev_code,'') AS devCode, 0 AS userType @@ -354,7 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" UNION ALL SELECT tlu.id, CONCAT(tlu.name,'-',tlu.phone) AS label, - tlu.team_id AS parentId, + CONCAT('team-',tlu.team_id) AS parentId, tb.sh_code AS shCode, IFNULL(tb.dev_code,'') AS devCode, 1 AS userType