项目信息

wrdep-biz/src/main/java/com/jiayue/biz/controller/ProjectController.java

@@ -56,7 +56,7 @@ public class ProjectController extends BaseController {
     @PreAuthorize("@ss.hasPermi('dataQuery:project:list')")
     @GetMapping("/list")
     public TableDataInfo list(Project project) {
-        List<ProjectDto> list = iProjectService.getProject(project);
+        List<Project> list = iProjectService.getProject(project);
         return getDataTable(list);
     }
 
@@ -79,15 +79,15 @@ public class ProjectController extends BaseController {
     /**
      * 导出项目列表
      */
-    @PreAuthorize("@ss.hasPermi('dataQuery:project:export')")
-    @Log(title = "项目", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, Project project) {
-        LambdaQueryWrapper<Project> queryWrapper = this.buildQueryParams(project);
-        List<Project> list = iProjectService.list(queryWrapper);
-        ExcelUtil<Project> util = new ExcelUtil<>(Project.class);
-        util.exportExcel(response, list, "项目数据");
-    }
+//    @PreAuthorize("@ss.hasPermi('dataQuery:project:export')")
+//    @Log(title = "项目", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, Project project) {
+//        LambdaQueryWrapper<Project> queryWrapper = this.buildQueryParams(project);
+//        List<Project> list = iProjectService.list(queryWrapper);
+//        ExcelUtil<Project> util = new ExcelUtil<>(Project.class);
+//        util.exportExcel(response, list, "项目数据");
+//    }
 
     /**
      * 获取项目详细信息
@@ -104,9 +104,8 @@ public class ProjectController extends BaseController {
     @PreAuthorize("@ss.hasPermi('dataQuery:project:add')")
     @Log(title = "项目", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody ProjectDto projectDto) {
-        iProjectService.saveProject(projectDto);
-        return success("200");
+    public AjaxResult add(@RequestBody Project project) {
+        return AjaxResult.success(iProjectService.saveProject(project));
     }
 
     /**
@@ -115,11 +114,8 @@ public class ProjectController extends BaseController {
     @PreAuthorize("@ss.hasPermi('dataQuery:project:edit')")
     @Log(title = "项目", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody ProjectDto projectDto) {
-
-        iProjectService.updateProject(projectDto);
-
-        return success("200");
+    public AjaxResult edit(@RequestBody Project project) {
+        return AjaxResult.success( iProjectService.updateProject(project));
     }
 
     /**
@@ -129,42 +125,15 @@ public class ProjectController extends BaseController {
     @Log(title = "项目", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String ids) {
-        iProjectService.delProject(ids);
-        return toAjax(1 );
-    }
-
-    /**
-     * 构建查询条件
-     **/
-    private LambdaQueryWrapper<Project> buildQueryParams(Project project) {
-        LambdaQueryWrapper<Project> queryWrapper = Wrappers.lambdaQuery();
-        if (StrUtil.isNotBlank(project.getProjectName())) {
-            queryWrapper.like(Project::getProjectName, project.getProjectName());
-        }
-        if (StrUtil.isNotBlank(project.getCompany())) {
-            queryWrapper.eq(Project::getCompany, project.getCompany());
-        }
-        if (StrUtil.isNotBlank(project.getProvince())) {
-            queryWrapper.eq(Project::getProvince, project.getProvince());
-        }
-        if (ObjectUtil.isNotNull(project.getStartDate())) {
-            queryWrapper.eq(Project::getStartDate, project.getStartDate());
-        }
-        if (ObjectUtil.isNotNull(project.getEndDate())) {
-            queryWrapper.eq(Project::getEndDate, project.getEndDate());
-        }
-        if (StrUtil.isNotBlank(project.getStatus())) {
-            queryWrapper.eq(Project::getStatus, project.getStatus());
-        }
-        return queryWrapper;
+        return AjaxResult.success(iProjectService.delProject(ids));
     }
 
     /*所有的项目列表*/
-    @GetMapping("/listAll")
-    public TableDataInfo listAll() {
-        List<Project> list = iProjectService.lambdaQuery().orderByAsc(Project::getStartDate).list();
-        return getDataTable(list);
-    }
+//    @GetMapping("/listAll")
+//    public TableDataInfo listAll() {
+//        List<Project> list = iProjectService.lambdaQuery().orderByAsc(Project::getStartDate).list();
+//        return getDataTable(list);
+//    }
 
     /*根据项目名称模糊查询*/
     @GetMapping("/findByProjectName")

wrdep-biz/src/main/java/com/jiayue/biz/domain/Project.java

@@ -27,52 +27,37 @@ public class Project implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
     /**
      * 主键id
      */
     @TableId(type = IdType.ASSIGN_UUID)
     private String id;
-
     /**
-     * 项目名称
+     * 项目全称
      */
-    @Excel(name = "项目名称")
     private String projectName;
-
     /**
-     * 所属公司
+     * 项目简称
      */
-    @Excel(name = "所属公司")
-    private String company;
-
+    private String projectNameEasy;
     /**
-     * 省份
+     * 项目状态
      */
-    @Excel(name = "省份")
-    private String province;
-
+    private String projectState;
     /**
-     * 开始日期
+     * 项目类型
      */
-    @Excel(name = "开始日期")
-    private Date startDate;
-
+    private String projectSort;
     /**
-     * 完工日期
+     * 经度
      */
-    @Excel(name = "完工日期")
-    private Date endDate;
-
+    private String longitude;
     /**
-     * 项目状态 0:立项 1：运行 2：终止 3：结束
+     * 纬度
      */
-    @Excel(name = "项目状态")
-    private String status;
-
+    private String latitude;
     /**
      * 关联设备
      */
-    @Excel(name = "关联设备")
     private String relationEquipment;
 }

wrdep-biz/src/main/java/com/jiayue/biz/service/ProjectService.java

@@ -18,13 +18,13 @@ public interface ProjectService extends IService<Project> {
     Page getByProjectName(Integer current, Integer size,String projectName);
 
     //查询组装项目列表
-    List<ProjectDto> getProject(Project project);
+    List<Project> getProject(Project project);
 
     //修改项目
-    void updateProject(ProjectDto projectDto);
+    boolean updateProject(Project project);
     //新增项目
-    void saveProject(ProjectDto projectDto);
+    boolean saveProject(Project project);
 
-    void delProject(String id);
+    boolean delProject(String id);
 
 }

wrdep-biz/src/main/java/com/jiayue/biz/service/impl/ProjectServiceImpl.java

@@ -35,12 +35,14 @@ import java.util.stream.Collectors;
 @Service
 public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> implements ProjectService {
 
-    private final ProjectInfoService projectInfoService;
-
-    private final WindTowerInfoService windTowerInfoService;
-
-
-    private final MongoTemplate mongoTemplate;
+//    private final ProjectInfoService projectInfoService;
+//
+//
+//
+//    private final WindTowerInfoService windTowerInfoService;
+//
+//
+//    private final MongoTemplate mongoTemplate;
 
     /*
      * 根据项目名称模糊查询
@@ -54,134 +56,157 @@ public class ProjectServiceImpl extends ServiceImpl<ProjectMapper, Project> impl
     }
 
 
-    //查询组装项目列表
-    public List<ProjectDto> getProject(Project project) {
-        List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
-        ArrayList<ProjectDto> projectList = new ArrayList<>();
-        for (ProjectInfo projectInfo : projectInfoList) {
-            StringBuilder builder = new StringBuilder();
-            ProjectDto projectDto = new ProjectDto();
-            projectDto.setId(projectInfo.getId());
-            if (projectInfo.getProjectBasicInfo() != null) {
-                projectDto.setProjectSort(projectInfo.getProjectBasicInfo().getProjectSort());
-                projectDto.setProjectState(projectInfo.getProjectBasicInfo().getProjectState());
-                projectDto.setProjectType(projectInfo.getProjectBasicInfo().getProjectType());
-                projectDto.setProjectName(projectInfo.getProjectBasicInfo().getProjectName());
-                projectDto.setProjectOverview(projectInfo.getProjectBasicInfo().getProjectOverview());
-                projectDto.setResourcesOverview(projectInfo.getProjectBasicInfo().getResourcesOverview());
-                projectDto.setProjectNameEasy(projectInfo.getProjectBasicInfo().getProjectNameEasy());
-                if (projectInfo.getProjectBasicInfo().getPosition() != null && !projectInfo.getProjectBasicInfo().getPosition().equals("")) {
-                    String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
-                    projectDto.setLongitude(split[0]);
-                    projectDto.setLatitude(split[1]);
-                }
-            }
-            if (projectInfo.getEquipment() != null) {
-                List<String> collect = projectInfo.getEquipment().stream().map(Equipment::getName).collect(Collectors.toList());
-                if (projectInfo.getEquipment() != null && !projectInfo.getEquipment().equals("")) {
-                    for (String s : collect) {
-                        builder.append(s).append(",");
-                    }
-                    if (builder.length() > 0) {
-                        builder.delete(builder.length() - 1, builder.length());
-                    }
-                    projectDto.setEquipment(builder.toString());
-                }
-            }
-
-            StringBuilder stringBuilder = new StringBuilder();
-            List<List<Coordinates>> coordinates = projectInfo.getCoordinates();
-            if (coordinates != null && coordinates.size() > 0) {
-                for (List<Coordinates> coordinate : coordinates) {
-                    for (Coordinates coordinates1 : coordinate) {
-                        stringBuilder.append(coordinates1.getLongitude()).append(",").append(coordinates1.getLatitude()).append(";");
-                    }
-                    stringBuilder.delete(stringBuilder.length() - 1, stringBuilder.length());
-                    stringBuilder.append("。");
-                }
-            }
-            projectDto.setCoordinates(stringBuilder.toString());
-            projectList.add(projectDto);
-        }
-        if (project.getProjectName() != null) {
-            return projectList.stream().filter(p -> p.getProjectName().contains(project.getProjectName())).collect(Collectors.toList());
-        }
-        return projectList;
+    //查询组装项目列表（mongo）
+//    public List<ProjectDto> getProject(Project project) {
+//        List<ProjectInfo> projectInfoList = projectInfoService.getProjectInfoList();
+//        ArrayList<ProjectDto> projectList = new ArrayList<>();
+//        for (ProjectInfo projectInfo : projectInfoList) {
+//            StringBuilder builder = new StringBuilder();
+//            ProjectDto projectDto = new ProjectDto();
+//            projectDto.setId(projectInfo.getId());
+//            if (projectInfo.getProjectBasicInfo() != null) {
+//                projectDto.setProjectSort(projectInfo.getProjectBasicInfo().getProjectSort());
+//                projectDto.setProjectState(projectInfo.getProjectBasicInfo().getProjectState());
+//                projectDto.setProjectType(projectInfo.getProjectBasicInfo().getProjectType());
+//                projectDto.setProjectName(projectInfo.getProjectBasicInfo().getProjectName());
+//                projectDto.setProjectOverview(projectInfo.getProjectBasicInfo().getProjectOverview());
+//                projectDto.setResourcesOverview(projectInfo.getProjectBasicInfo().getResourcesOverview());
+//                projectDto.setProjectNameEasy(projectInfo.getProjectBasicInfo().getProjectNameEasy());
+//                if (projectInfo.getProjectBasicInfo().getPosition() != null && !projectInfo.getProjectBasicInfo().getPosition().equals("")) {
+//                    String[] split = projectInfo.getProjectBasicInfo().getPosition().split(",");
+//                    projectDto.setLongitude(split[0]);
+//                    projectDto.setLatitude(split[1]);
+//                }
+//            }
+//            if (projectInfo.getEquipment() != null) {
+//                List<String> collect = projectInfo.getEquipment().stream().map(Equipment::getName).collect(Collectors.toList());
+//                if (projectInfo.getEquipment() != null && !projectInfo.getEquipment().equals("")) {
+//                    for (String s : collect) {
+//                        builder.append(s).append(",");
+//                    }
+//                    if (builder.length() > 0) {
+//                        builder.delete(builder.length() - 1, builder.length());
+//                    }
+//                    projectDto.setEquipment(builder.toString());
+//                }
+//            }
+//
+//            StringBuilder stringBuilder = new StringBuilder();
+//            List<List<Coordinates>> coordinates = projectInfo.getCoordinates();
+//            if (coordinates != null && coordinates.size() > 0) {
+//                for (List<Coordinates> coordinate : coordinates) {
+//                    for (Coordinates coordinates1 : coordinate) {
+//                        stringBuilder.append(coordinates1.getLongitude()).append(",").append(coordinates1.getLatitude()).append(";");
+//                    }
+//                    stringBuilder.delete(stringBuilder.length() - 1, stringBuilder.length());
+//                    stringBuilder.append("。");
+//                }
+//            }
+//            projectDto.setCoordinates(stringBuilder.toString());
+//            projectList.add(projectDto);
+//        }
+//        if (project.getProjectName() != null) {
+//            return projectList.stream().filter(p -> p.getProjectName().contains(project.getProjectName())).collect(Collectors.toList());
+//        }
+//        return projectList;
+//    }
+
+
+    //查询组装项目列表（mysql）
+    public List<Project> getProject(Project project) {
+        return this.lambdaQuery().list();
     }
-
-
-    public void delProject(String id) {
-        projectInfoService.delProjectInfo(id);
+    //删除（mongo）
+//    public void delProject(String id) {
+//        projectInfoService.delProjectInfo(id);
+//    }
+
+    public boolean delProject(String id) {
+       return this.removeById(id);
+//        projectInfoService.delProjectInfo(id);
     }
 
 
-    //新增
-    public void saveProject(ProjectDto projectDto) {
-        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.list();
-        ProjectInfo projectInfo = new ProjectInfo();
-        projectInfo.setId(UUID.randomUUID().toString());
-        ProjectBasicInfo projectBasicInfo = projectInfo.getProjectBasicInfo();
-        if (projectBasicInfo == null) {
-            projectBasicInfo = new ProjectBasicInfo();
-            this.getProjectBasicInfo(projectBasicInfo, projectDto);
-        }
-        projectInfo.setProjectBasicInfo(projectBasicInfo);
-
-        if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
-            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
-            projectInfo.setEquipment(equipment);
-        } else {
-            projectInfo.setEquipment(new ArrayList<>());
-        }
+    //新增(mongo)
+//    public void saveProject(ProjectDto projectDto) {
+//        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.list();
+//        ProjectInfo projectInfo = new ProjectInfo();
+//        projectInfo.setId(UUID.randomUUID().toString());
+//        ProjectBasicInfo projectBasicInfo = projectInfo.getProjectBasicInfo();
+//        if (projectBasicInfo == null) {
+//            projectBasicInfo = new ProjectBasicInfo();
+//            this.getProjectBasicInfo(projectBasicInfo, projectDto);
+//        }
+//        projectInfo.setProjectBasicInfo(projectBasicInfo);
+//
+//        if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
+//            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
+//            projectInfo.setEquipment(equipment);
+//        } else {
+//            projectInfo.setEquipment(new ArrayList<>());
+//        }
+//
+//        ArrayList<List<Coordinates>> cooList = new ArrayList<>();
+//        if (projectDto.getCoordinates() != null) {
+//            if (projectDto.getCoordinates().contains("。")) {
+//                String[] split = projectDto.getCoordinates().split("。");
+//                for (String s : split) {
+//                    List<Coordinates> coordinatesList = this.getCoordinates(s);
+//                    cooList.add(coordinatesList);
+//                }
+//            } else {
+//                List<Coordinates> coordinatesList1 = this.getCoordinates(projectDto.getCoordinates());
+//                cooList.add(coordinatesList1);
+//            }
+//        } else {
+//            projectInfo.setCoordinates(new ArrayList<>());
+//        }
+//
+//        mongoTemplate.save(projectInfo);
+//
+//
+//    }
 
-        ArrayList<List<Coordinates>> cooList = new ArrayList<>();
-        if (projectDto.getCoordinates() != null) {
-            if (projectDto.getCoordinates().contains("。")) {
-                String[] split = projectDto.getCoordinates().split("。");
-                for (String s : split) {
-                    List<Coordinates> coordinatesList = this.getCoordinates(s);
-                    cooList.add(coordinatesList);
-                }
-            } else {
-                List<Coordinates> coordinatesList1 = this.getCoordinates(projectDto.getCoordinates());
-                cooList.add(coordinatesList1);
-            }
-        } else {
-            projectInfo.setCoordinates(new ArrayList<>());
-        }
-
-        mongoTemplate.save(projectInfo);
+    //新增
+    public boolean saveProject(Project project) {
+        project.setId(UUID.randomUUID().toString());
 
+        return  this.save(project);
 
     }
 
 
-    //修改
-    public void updateProject(ProjectDto projectDto) {
-        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.list();
-
-        ProjectInfo projectInfo = projectInfoService.getOneProjectInfoById(projectDto.getId());
+    //修改(mongo)
+//    public void updateProject(ProjectDto projectDto) {
+//        List<WindTowerInfo> windTowerInfoList = windTowerInfoService.list();
+//
+//        ProjectInfo projectInfo = projectInfoService.getOneProjectInfoById(projectDto.getId());
+//
+//        ProjectBasicInfo projectBasicInfo = projectInfo.getProjectBasicInfo();
+//        //组装基本信息
+//        this.getProjectBasicInfo(projectBasicInfo, projectDto);
+//
+//        if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
+//            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
+//            projectInfo.setEquipment(equipment);
+//        }
+//        ArrayList<List<Coordinates>> cooList = new ArrayList<>();
+//        if (projectDto.getCoordinates().contains("。")) {
+//            String[] split = projectDto.getCoordinates().split("。");
+//            for (String s : split) {
+//                List<Coordinates> coordinatesList = this.getCoordinates(s);
+//                cooList.add(coordinatesList);
+//            }
+//        } else {
+//            List<Coordinates> coordinatesList1 = this.getCoordinates(projectDto.getCoordinates());
+//            cooList.add(coordinatesList1);
+//        }
+//        mongoTemplate.save(projectInfo);
+//    }
 
-        ProjectBasicInfo projectBasicInfo = projectInfo.getProjectBasicInfo();
-        //组装基本信息
-        this.getProjectBasicInfo(projectBasicInfo, projectDto);
-
-        if (projectDto.getEquipment() != null && !projectDto.getEquipment().equals("")) {
-            List<Equipment> equipment = CalculationUtil.getEquipment(windTowerInfoList, projectDto.getEquipment());
-            projectInfo.setEquipment(equipment);
-        }
-        ArrayList<List<Coordinates>> cooList = new ArrayList<>();
-        if (projectDto.getCoordinates().contains("。")) {
-            String[] split = projectDto.getCoordinates().split("。");
-            for (String s : split) {
-                List<Coordinates> coordinatesList = this.getCoordinates(s);
-                cooList.add(coordinatesList);
-            }
-        } else {
-            List<Coordinates> coordinatesList1 = this.getCoordinates(projectDto.getCoordinates());
-            cooList.add(coordinatesList1);
-        }
-        mongoTemplate.save(projectInfo);
+    //修改
+    public boolean updateProject(Project project) {
+        return this.updateById(project);
     }