diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java new file mode 100644 index 0000000..76c8de8 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java @@ -0,0 +1,38 @@ +package com.casic.missiles.modular.register.dto; + +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.modular.system.model.Person; +import lombok.Data; +import org.springframework.beans.BeanUtils; + +import java.util.Date; + +@Data +public class PersonDTO { + private Long id; + private String delflag; + private String createtime; + private String updatetime; + private String name; + private String sex; + private Long deptid; + private String idCardNo; + private String remarks; + private String photo; + private String personType; + private String personCode; + private Long oprationId; + private String duty; + private String nation; + private String birthday; + private String cardType; + + public static PersonDTO personToDTO(Person person){ + PersonDTO personDTO = new PersonDTO(); + BeanUtils.copyProperties(person,personDTO); + personDTO.setCreatetime(DateUtil.getTime(person.getCreatetime())); + personDTO.setUpdatetime(DateUtil.getTime(person.getUpdatetime())); + personDTO.setBirthday(DateUtil.getDay(person.getBirthday())); + return personDTO; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java new file mode 100644 index 0000000..76c8de8 --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/PersonDTO.java @@ -0,0 +1,38 @@ +package com.casic.missiles.modular.register.dto; + +import com.casic.missiles.core.util.DateUtil; +import com.casic.missiles.modular.system.model.Person; +import lombok.Data; +import org.springframework.beans.BeanUtils; + +import java.util.Date; + +@Data +public class PersonDTO { + private Long id; + private String delflag; + private String createtime; + private String updatetime; + private String name; + private String sex; + private Long deptid; + private String idCardNo; + private String remarks; + private String photo; + private String personType; + private String personCode; + private Long oprationId; + private String duty; + private String nation; + private String birthday; + private String cardType; + + public static PersonDTO personToDTO(Person person){ + PersonDTO personDTO = new PersonDTO(); + BeanUtils.copyProperties(person,personDTO); + personDTO.setCreatetime(DateUtil.getTime(person.getCreatetime())); + personDTO.setUpdatetime(DateUtil.getTime(person.getUpdatetime())); + personDTO.setBirthday(DateUtil.getDay(person.getBirthday())); + return personDTO; + } +} diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java index b15627c..b6fb18c 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/service/impl/IrisPersonServiceImpl.java @@ -21,6 +21,7 @@ import com.casic.missiles.modular.register.dao.IrisDataMapper; import com.casic.missiles.modular.register.dao.IrisPersonMapper; import com.casic.missiles.modular.register.dto.PersonAtdDTO; +import com.casic.missiles.modular.register.dto.PersonDTO; import com.casic.missiles.modular.register.enums.PersonTypeEnums; import com.casic.missiles.modular.register.model.IrisData; import com.casic.missiles.modular.register.model.IrisPersonPhoto; @@ -305,11 +306,11 @@ @Override public List updateData(List personIds, List deviceIds) { - List personList = new ArrayList<>(); + List personList = new ArrayList<>(); Set deptIds = new HashSet<>(); for (Long personId : personIds) { Person person = personService.getPersonById(personId); - personList.add(person); + personList.add(PersonDTO.personToDTO(person)); deptIds.add(person.getDeptid()); } List deptList = new ArrayList<>(); @@ -326,7 +327,7 @@ jsonObject.put("sys_person",personList); jsonObject.put("sys_dept",deptList); String socketMsg = SocketConst.SOCKET_PREFIX_ADD_PERSON.concat(jsonObject.toJSONString()); - + //System.out.println(socketMsg); List errorList = new ArrayList<>(); for (Long deviceId : deviceIds) { Device device = deviceSupportService.selectById(deviceId);