From 64a3f7370294e6877b8d732613bd5c588e8695a1 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 21 Jun 2021 10:25:23 +0800 Subject: [PATCH 1/5] =?UTF-8?q?add:=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SarStandProjectLibraryServiceImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index a55444bc..dd32986d 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; + /** *

* 服务实现类 @@ -21,7 +23,7 @@ import org.springframework.stereotype.Service; @Service public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements ISarStandProjectLibraryService { - @Autowired + @Resource private SarStandProjectLibraryDao sarStandProjectLibraryDao; @Override From ce74d69ed3bf8c18e023690f49fa471346252997 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 21 Jun 2021 10:26:25 +0800 Subject: [PATCH 2/5] =?UTF-8?q?add:=E7=82=B9=E5=87=BB=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/SarStandProjectLibraryDto.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java new file mode 100644 index 00000000..6f68f8ab --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/entity/SarStandProjectLibraryDto.java @@ -0,0 +1,38 @@ +package com.adc.da.slrs.sarStandProjectLibrary.entity; + + +import lombok.Data; + +import java.util.Date; + +/** + * //TODO + * + * @author 作者信息 + * @date 2021-06-16 + */ +@Data +public class SarStandProjectLibraryDto { + + private String projectPlatfor; + + private String projectNumber; + + private String projectName; + + private String projectClassification; + + private String projectStatus; + + private String projectGroup; + + private String projectStartDate; + + private String projectEndDate; + + private String currentNode; + + private String projectLevel; + + private String projectManager; +} From 41dd1bf6b96d20732aed2c93eeaa4a76e024d0f5 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 21 Jun 2021 10:44:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?add:=E8=BD=A6=E5=9E=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SarStandProjectLibraryController.java | 41 ++++--- .../ISarStandProjectLibraryService.java | 8 -- .../SarStandProjectLibraryService.java | 13 +++ .../SarStandProjectLibraryServiceImpl.java | 102 ++++++++++++++++-- 4 files changed, 138 insertions(+), 26 deletions(-) delete mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java create mode 100644 adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java index 1535b10a..e1669395 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/controller/SarStandProjectLibraryController.java @@ -3,6 +3,7 @@ package com.adc.da.slrs.sarStandProjectLibrary.controller; import com.adc.da.http.ResponseMessage; import com.adc.da.http.Result; +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; import com.adc.da.slrs.sarStandProjectLibrary.service.impl.SarStandProjectLibraryServiceImpl; import com.adc.da.slrs.sarStandWarning.entity.EarlyWarningEO; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -16,26 +17,42 @@ import org.springframework.web.bind.annotation.RestController; import com.adc.da.base.web.BaseController; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** -*

- * 前端控制器 - *

-* -* @author ZhangJin -* @since 2021-06-15 -*/ + *

+ * 前端控制器 + *

+ * + * @author ZhangJin + * @since 2021-06-15 + */ @RestController @Api(description = "|SarStandProjectLibrary|") -@RequestMapping("/sarStandProjectLibrary/sar-stand-project-library") +@RequestMapping("/api/sarStandProjectLibrary") public class SarStandProjectLibraryController extends BaseController { @Resource private SarStandProjectLibraryServiceImpl sarStandProjectLibraryService; - @GetMapping("/queryMaintenanceProject") - @ApiOperation("项目查询") - public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "newStandPage")int Page, @RequestParam(defaultValue = "10", value = "newStandPageSize") int PageSize) { - IPage list = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize); + + @GetMapping("/queryProject") + @ApiOperation("车型/项目库") + public ResponseMessage queryMaintenanceProject(@RequestParam(defaultValue = "1", value = "Page")int Page, @RequestParam(defaultValue = "10", value = "PageSize") int PageSize, + SarStandProjectLibraryDto sarDto) { + IPage MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto); + IPage notMaintenanceList = sarStandProjectLibraryService.queryNotMaintenanceProject(Page,PageSize,sarDto); + Map map = new HashMap(); + map.put("Maintenance",MaintenanceList); + map.put("notMaintenance",notMaintenanceList); + return Result.success("200",map); + } + @GetMapping("/api/queryById") + @ApiOperation("点击项目id查询") + public ResponseMessage queryByName(String id){ + List list = sarStandProjectLibraryService.queryById(id); return Result.success("200",list); } } + diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java deleted file mode 100644 index b6067834..00000000 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/ISarStandProjectLibraryService.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.adc.da.slrs.sarStandProjectLibrary.service; - -import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; -import com.baomidou.mybatisplus.core.metadata.IPage; - -public interface ISarStandProjectLibraryService { - IPage queryMaintenanceProject(int current, int pageSize); -} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java new file mode 100644 index 00000000..49eedc33 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/SarStandProjectLibraryService.java @@ -0,0 +1,13 @@ +package com.adc.da.slrs.sarStandProjectLibrary.service; + +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.baomidou.mybatisplus.core.metadata.IPage; + +import java.util.List; + +public interface SarStandProjectLibraryService { + IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto); + List queryById(String id); +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java index dd32986d..7ec7f63b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/service/impl/SarStandProjectLibraryServiceImpl.java @@ -2,15 +2,19 @@ package com.adc.da.slrs.sarStandProjectLibrary.service.impl; import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibrary; import com.adc.da.slrs.sarStandProjectLibrary.dao.SarStandProjectLibraryDao; -import com.adc.da.slrs.sarStandProjectLibrary.service.ISarStandProjectLibraryService; +import com.adc.da.slrs.sarStandProjectLibrary.entity.SarStandProjectLibraryDto; +import com.adc.da.slrs.sarStandProjectLibrary.service.SarStandProjectLibraryService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.List; /** *

@@ -21,15 +25,101 @@ import javax.annotation.Resource; * @since 2021-06-15 */ @Service -public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements ISarStandProjectLibraryService { +public class SarStandProjectLibraryServiceImpl extends ServiceImpl implements SarStandProjectLibraryService { @Resource private SarStandProjectLibraryDao sarStandProjectLibraryDao; + @Override - public IPage queryMaintenanceProject(int current,int pageSize) { - QueryWrapper wrapper= new QueryWrapper<>(); - wrapper.inSql("id", "select project_id from sar_stand_project_relation"); + public IPage queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + SarStandProjectLibrary sar = new SarStandProjectLibrary(); + sar.setProjectPlatfor(sarDto.getProjectPlatfor()); + sar.setProjectNumber(sarDto.getProjectNumber()); + sar.setProjectName(sarDto.getProjectName()); + sar.setProjectClassification(sarDto.getProjectClassification()); + sar.setProjectStatus(sarDto.getProjectStatus()); + sar.setProjectGroup(sarDto.getProjectGroup()); + sar.setCurrentNode(sarDto.getCurrentNode()); + sar.setProjectLevel(sar.getProjectLevel()); + sar.setProjectManager(sarDto.getProjectManager()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (sarDto.getProjectStartDate()!=null){ + sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate())); + } + if (sarDto.getProjectEndDate()!=null){ + sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.inSql("id", "select project_id from sar_stand_project_relation") + .like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor()) + .like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber()) + .like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName()) + .like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup()) + .like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification()) + .like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus()) + .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode()) + .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel()) + .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager()) + .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate()) + .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate()); + return getSarStandProjectLibraryIPage(current, pageSize, wrapper); + } + + @Override + public IPage queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto) { + SarStandProjectLibrary sar = new SarStandProjectLibrary(); + sar.setProjectPlatfor(sarDto.getProjectPlatfor()); + sar.setProjectNumber(sarDto.getProjectNumber()); + sar.setProjectName(sarDto.getProjectName()); + sar.setProjectClassification(sarDto.getProjectClassification()); + sar.setProjectStatus(sarDto.getProjectStatus()); + sar.setProjectGroup(sarDto.getProjectGroup()); + sar.setCurrentNode(sarDto.getCurrentNode()); + sar.setProjectLevel(sar.getProjectLevel()); + sar.setProjectManager(sarDto.getProjectManager()); + SimpleDateFormat formater = new SimpleDateFormat(); + formater.applyPattern("yyyy-MM-dd"); + try { + if (sarDto.getProjectStartDate()!=null){ + sar.setProjectStartDate(formater.parse(sarDto.getProjectStartDate())); + } + if (sarDto.getProjectEndDate()!=null){ + sar.setProjectEndDate(formater.parse(sarDto.getProjectEndDate())); + } + } catch (ParseException e) { + e.printStackTrace(); + } + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.notInSql("id", "select project_id from sar_stand_project_relation") + .like(StringUtils.isNotEmpty(sar.getProjectPlatfor()),"project_platfor",sar.getProjectPlatfor()) + .like(StringUtils.isNotEmpty(sar.getProjectNumber()),"project_number",sar.getProjectNumber()) + .like(StringUtils.isNotEmpty(sar.getProjectName()),"project_name",sar.getProjectName()) + .like(StringUtils.isNotEmpty(sar.getProjectGroup()),"project_group",sar.getProjectGroup()) + .like(StringUtils.isNotEmpty(sar.getProjectClassification()),"project_classification",sar.getProjectClassification()) + .like(StringUtils.isNotEmpty(sar.getProjectStatus()),"project_status",sar.getProjectStatus()) + .like(StringUtils.isNotEmpty(sar.getCurrentNode()),"current_node",sar.getCurrentNode()) + .like(StringUtils.isNotEmpty(sar.getProjectLevel()),"project_level",sar.getProjectLevel()) + .like(StringUtils.isNotEmpty(sar.getProjectManager()),"project_manager",sar.getProjectManager()) + .ge(sar.getProjectStartDate()!=null,"project_start_date",sar.getProjectStartDate()) + .le(sar.getProjectEndDate()!=null,"project_end_date",sar.getProjectEndDate()); + return getSarStandProjectLibraryIPage(current, pageSize, wrapper); + } + + @Override + public List queryById(String id) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq("id",id); + List list = sarStandProjectLibraryDao.selectList(wrapper); + return list; + } + + private IPage getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper wrapper) { Page page = new Page<>(current, pageSize); IPage userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper); System.out.println("总条数"+userIPage.getTotal()); From d5db8f8ccab0f1895606471409be0ed679ef705d Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 21 Jun 2021 10:51:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?add:=E8=BD=A6=E5=9E=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java | 1 + 1 file changed, 1 insertion(+) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index fae67684..ca1fb63b 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -13,4 +13,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarStandProjectLibraryDao extends BaseMapper { + } From ab8643873385218b6f8779599eef60f6a1a412f0 Mon Sep 17 00:00:00 2001 From: zj <1376702416@qq.com> Date: Mon, 21 Jun 2021 10:52:04 +0800 Subject: [PATCH 5/5] =?UTF-8?q?add:=E8=BD=A6=E5=9E=8B/=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java | 1 - 1 file changed, 1 deletion(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java index ca1fb63b..fae67684 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandProjectLibrary/dao/SarStandProjectLibraryDao.java @@ -13,5 +13,4 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface SarStandProjectLibraryDao extends BaseMapper { - }