XA/xa-master-prod
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化数据类型

Browse Source
This commit is contained in:
zc
2026-01-07 14:29:25 +08:00
parent 945ef99da8
commit 48396f6224
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/domain/SysPeopleRecord.java
View File

@@ -25,10 +25,10 @@ public class SysPeopleRecord extends BaseEntity
private Long id; private Long id;
/** 人员id */ /** 人员id */
private String peopleId; private Long peopleId;
/** 设备id */ /** 设备id */
private String equipmentId; private Long equipmentId;
/** 设备内网ip */ /** 设备内网ip */
private String deviceIp; private String deviceIp;
@@ -210,21 +210,21 @@ public class SysPeopleRecord extends BaseEntity
{ {
return id; return id;
} }
public void setPeopleId(String peopleId) public void setPeopleId(Long peopleId)
{ {
this.peopleId = peopleId; this.peopleId = peopleId;
} }
public String getPeopleId() public Long getPeopleId()
{ {
return peopleId; return peopleId;
} }
public void setEquipmentId(String equipmentId) public void setEquipmentId(Long equipmentId)
{ {
this.equipmentId = equipmentId; this.equipmentId = equipmentId;
} }
public String getEquipmentId() public Long getEquipmentId()
{ {
return equipmentId; return equipmentId;
} }

4
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysApiController.java
View File

@@ -137,7 +137,7 @@ public class SysApiController {
String data=event.getEventMsg(); String data=event.getEventMsg();
SysPeopleRecord peopleRecord = JSON.parseObject(data,SysPeopleRecord.class); SysPeopleRecord peopleRecord = JSON.parseObject(data,SysPeopleRecord.class);
SysEquipment eqs=equipmentService.selectEquipmentBySequence(peopleRecord.getDeviceNo()); SysEquipment eqs=equipmentService.selectEquipmentBySequence(peopleRecord.getDeviceNo());
peopleRecord.setEquipmentId(eqs.getId()+""); peopleRecord.setEquipmentId(eqs.getId());
SysPeople pq=new SysPeople(); SysPeople pq=new SysPeople();
pq.setGuid(peopleRecord.getAdmitGuid()); pq.setGuid(peopleRecord.getAdmitGuid());
@@ -157,7 +157,7 @@ public class SysApiController {
}else{ }else{
Visitor vis= visitorService.selectByGuid(peopleRecord.getAdmitGuid()); Visitor vis= visitorService.selectByGuid(peopleRecord.getAdmitGuid());
if(vis!=null){ if(vis!=null){
peopleRecord.setPeopleId(vis.getId()+""); peopleRecord.setPeopleId(vis.getId());
} }
peopleRecord.setFlag("1"); peopleRecord.setFlag("1");
} }

10
dcsoft-modules/dcsoft-system/src/main/java/com/dcsoft/system/uniubi/controller/SysSdkController.java
View File

@@ -313,7 +313,7 @@ public class SysSdkController {
if (!"STRANGERBABY".equals(info.getPersonId())){ if (!"STRANGERBABY".equals(info.getPersonId())){
log.info("设备序列号：{}", info); log.info("设备序列号：{}", info);
SysEquipment eqs=equipmentService.selectEquipmentBySequence(info.getDeviceKey()); SysEquipment eqs=equipmentService.selectEquipmentBySequence(info.getDeviceKey());
peopleRecord.setEquipmentId(eqs.getId()+""); peopleRecord.setEquipmentId(eqs.getId());
peopleRecord.setAdmitGuid(info.getPersonId()); peopleRecord.setAdmitGuid(info.getPersonId());
peopleRecord.setAliveType(info.getAliveType()); peopleRecord.setAliveType(info.getAliveType());
peopleRecord.setDeviceNo(info.getDeviceKey()); peopleRecord.setDeviceNo(info.getDeviceKey());
@@ -353,7 +353,7 @@ public class SysSdkController {
sysPeople.setGuid(info.getPersonId()); sysPeople.setGuid(info.getPersonId());
SysPeople people= peopleService.selectByGuid(sysPeople); SysPeople people= peopleService.selectByGuid(sysPeople);
if (people != null) { if (people != null) {
peopleRecord.setPeopleId(people.getId() + ""); peopleRecord.setPeopleId(people.getId());
//考勤版本 //考勤版本
// ; // ;
// peopleRecord.setFlag("0"); // peopleRecord.setFlag("0");
@@ -615,7 +615,7 @@ public class SysSdkController {
people.setGuid(peopleRecord.getAdmitGuid()); people.setGuid(peopleRecord.getAdmitGuid());
SysPeople peoples=peopleService.selectByGuid(people); SysPeople peoples=peopleService.selectByGuid(people);
if(peoples!=null){ if(peoples!=null){
peopleRecord.setPeopleId(peoples.getId()+""); peopleRecord.setPeopleId(peoples.getId());
}else{ }else{
peopleRecord.setPeopleId(null); peopleRecord.setPeopleId(null);
} }
@@ -772,8 +772,8 @@ public class SysSdkController {
peopleRecord.setDeviceName(equipment.getName()); peopleRecord.setDeviceName(equipment.getName());
peopleRecord.setRecType("1"); peopleRecord.setRecType("1");
peopleRecord.setTimestamp(new Date().getTime()); peopleRecord.setTimestamp(new Date().getTime());
peopleRecord.setEquipmentId(String.valueOf(equipment.getId())); peopleRecord.setEquipmentId(equipment.getId());
peopleRecord.setPeopleId(String.valueOf(people.getId())); peopleRecord.setPeopleId(people.getId());
peopleRecordService.insertSysPeopleRecord(peopleRecord); peopleRecordService.insertSysPeopleRecord(peopleRecord);
} }
} }