diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index 3b41f00..1d3b4ec 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -2,12 +2,14 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.service.ICommonDeptService; +import com.casic.missiles.modular.register.dto.DeptDTO; import com.casic.missiles.modular.system.model.Dept; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.List; @Controller @@ -18,7 +20,11 @@ @RequestMapping("/dept/listAll") @ResponseBody public Object deptListAll(){ - List list = deptService.getDeptByTips(null); - return ResponseData.success(list); + List depts = deptService.getDeptByTips(null); + List deptDTOS = new ArrayList<>(); + for (Dept dept : depts) { + deptDTOS.add(DeptDTO.convDeptToDTO(dept)); + } + return ResponseData.success(deptDTOS); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java index 3b41f00..1d3b4ec 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisOfflineController.java @@ -2,12 +2,14 @@ import com.casic.missiles.core.base.response.ResponseData; import com.casic.missiles.core.common.service.ICommonDeptService; +import com.casic.missiles.modular.register.dto.DeptDTO; import com.casic.missiles.modular.system.model.Dept; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import java.util.ArrayList; import java.util.List; @Controller @@ -18,7 +20,11 @@ @RequestMapping("/dept/listAll") @ResponseBody public Object deptListAll(){ - List list = deptService.getDeptByTips(null); - return ResponseData.success(list); + List depts = deptService.getDeptByTips(null); + List deptDTOS = new ArrayList<>(); + for (Dept dept : depts) { + deptDTOS.add(DeptDTO.convDeptToDTO(dept)); + } + return ResponseData.success(deptDTOS); } } diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/DeptDTO.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/DeptDTO.java new file mode 100644 index 0000000..449b7ca --- /dev/null +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/dto/DeptDTO.java @@ -0,0 +1,29 @@ +package com.casic.missiles.modular.register.dto; + +import com.casic.missiles.modular.system.model.Dept; +import lombok.Data; + +@Data +public class DeptDTO { + private Long id; + private Integer num; + private Long pid; + private String pids; + private String simplename; + private String fullname; + private String tips; + private Integer version; + + public static DeptDTO convDeptToDTO(Dept dept){ + DeptDTO deptDTO = new DeptDTO(); + deptDTO.setId(dept.getId()); + deptDTO.setNum(dept.getNum()); + deptDTO.setPid(dept.getPid()); + deptDTO.setPids(dept.getPids()); + deptDTO.setSimplename(dept.getSimplename()); + deptDTO.setFullname(dept.getFullname()); + deptDTO.setTips(dept.getTips()); + deptDTO.setVersion(dept.getVersion()); + return deptDTO; + } +}