zianxin/pj_service_cloud
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:人脸bug修改

Browse Source
This commit is contained in:
dzc committed 2025-01-16 15:34:28 +08:00
1 parent c036fdf744
commit bc0217e01d
2 files changed
+6 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-mqtt/pjcloud-mqtt-biz/src/main/java/com/bsd/pjcloud/mqtt/service/MqttService.java
+4 -2
View File
@@ -43,7 +43,7 @@ public class MqttService {
options.setCleanSession(true);
options.setUserName(mqttConfig.getUsername());
options.setPassword(mqttConfig.getPassword().toCharArray());
crtAuth(options);
// crtAuth(options);
client.setCallback(mqttCallBack);
client.connect(options);
if (!client.isConnected()) {
@@ -52,7 +52,9 @@ public class MqttService {
log.info("|{}|mqtt连接成功;", TAG);
}
setClient(client);
} catch (Exception e) {
} catch (MqttSecurityException e) {
log.error("mqtt连接安全校验错误:{};", e.getMessage());
} catch (MqttException e) {
log.error("mqtt连接错误:{};", e.getMessage());
}
}
pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/mapper/SysUserFaceMapper.java
+2 -1
View File
@@ -7,6 +7,7 @@ import com.bsd.pjcloud.admin.api.entity.SysDept;
import com.bsd.pjcloud.admin.api.entity.SysUser;
import com.bsd.pjcloud.admin.api.entity.SysUserFaceEntity;
import com.bsd.pjcloud.admin.api.vo.SysUserFaceVo;
import com.bsd.pjcloud.common.core.constant.enums.YesNoEnum;
import com.bsd.pjcloud.common.data.datascope.DataScope;
import com.bsd.pjcloud.common.data.datascope.PjcloudBaseMapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
@@ -47,7 +48,7 @@ public interface SysUserFaceMapper extends PjcloudBaseMapper<SysUserFaceEntity>
.in(ObjectUtil.isNotEmpty(dto.getUserIds()), SysUserFaceEntity::getUserId, dto.getUserIds())
.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), SysUser::getDeptId, dto.getDeptIds());
if (ObjectUtil.isNotEmpty(dto.getMerchantDeptIdOrGlobal()) && ObjectUtil.isNotEmpty(dto.getDeptIds())) {
wrapper.and(v -> v.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), SysUser::getDeptId, dto.getDeptIds()).or().eq(SysUser::getIsGlobalFace, true));
wrapper.and(v -> v.in(ObjectUtil.isNotEmpty(dto.getDeptIds()), SysUser::getDeptId, dto.getDeptIds()).or().eq(SysUser::getIsGlobalFace, YesNoEnum.YES.getCode()));
}
return selectJoinPage(page, SysUserFaceVo.class, wrapper);
}