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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zjf committed 2025-03-20 17:31:38 +08:00
2 parents 6b2698849f 0e5e5d31c5
commit af9d9965f9
2 files changed
+9 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

pjcloud-hardware/pjcloud-hardware-api/src/main/java/com/bsd/pjcloud/hard/api/utils/Drawing2D.java
+1 -1
View File
@@ -140,7 +140,7 @@ public class Drawing2D {
public Drawing2D setDefaultStyle() {
graphics.setColor(Color.BLACK);
graphics.setFont(new Font(fontFamily, Font.PLAIN, 22));
graphics.setFont(new Font(fontFamily, Font.PLAIN, 24));
return this;
}
pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/java/com/bsd/pjcloud/thirdparty/mapper/zy/ThirdZyIdDictMapper.java
Vendored
+8 -4
View File
@@ -14,32 +14,36 @@ public interface ThirdZyIdDictMapper extends PjcloudBaseMapper<ThirdZyIdDictEnti
default List<ThirdZyIdDictEntity> getBySelfIds(ThirdZyBizEnumType type, List<String> selfIds) {
if (ObjectUtil.isEmpty(type)) return null;
if (ObjectUtil.isEmpty(selfIds)) return null;
LambdaQueryWrapper<ThirdZyIdDictEntity> wrapper = new LambdaQueryWrapper<ThirdZyIdDictEntity>()
.in(ObjectUtil.isNotEmpty(selfIds), ThirdZyIdDictEntity::getSelfId, selfIds)
.in(ThirdZyIdDictEntity::getSelfId, selfIds)
.eq(ThirdZyIdDictEntity::getBizType, type.getType());
return selectList(wrapper);
}
default ThirdZyIdDictEntity getBySelfId(ThirdZyBizEnumType type, String selfId) {
if (ObjectUtil.isEmpty(type)) return null;
if (ObjectUtil.isEmpty(selfId)) return null;
LambdaQueryWrapper<ThirdZyIdDictEntity> wrapper = new LambdaQueryWrapper<ThirdZyIdDictEntity>()
.eq(ObjectUtil.isNotEmpty(selfId), ThirdZyIdDictEntity::getSelfId, selfId)
.eq(ThirdZyIdDictEntity::getSelfId, selfId)
.eq(ThirdZyIdDictEntity::getBizType, type.getType());
return selectOne(wrapper);
}
default List<ThirdZyIdDictEntity> getByZyIds(ThirdZyBizEnumType type, List<String> zyIds) {
if (ObjectUtil.isEmpty(type)) return null;
if (ObjectUtil.isEmpty(zyIds)) return null;
LambdaQueryWrapper<ThirdZyIdDictEntity> wrapper = new LambdaQueryWrapper<ThirdZyIdDictEntity>()
.in(ObjectUtil.isNotEmpty(zyIds), ThirdZyIdDictEntity::getZyId, zyIds)
.in(ThirdZyIdDictEntity::getZyId, zyIds)
.eq(ThirdZyIdDictEntity::getBizType, type.getType());
return selectList(wrapper);
}
default ThirdZyIdDictEntity getByZyIds(ThirdZyBizEnumType type, String zyId) {
if (ObjectUtil.isEmpty(type)) return null;
if (ObjectUtil.isEmpty(zyId)) return null;
LambdaQueryWrapper<ThirdZyIdDictEntity> wrapper = new LambdaQueryWrapper<ThirdZyIdDictEntity>()
.eq(ObjectUtil.isNotEmpty(zyId), ThirdZyIdDictEntity::getZyId, zyId)
.eq(ThirdZyIdDictEntity::getZyId, zyId)
.eq(ThirdZyIdDictEntity::getBizType, type.getType());
return selectOne(wrapper);
}