Merge remote-tracking branch 'origin/develop_sync_1' into develop_2

2021-06-22 17:22:00 +08:00
parent 907a54c3a9 90b6714345
commit 08525ab186
8 changed files with 188 additions and 29 deletions
@@ -1,6 +1,9 @@
 package com.adc.da.slrs.sarMenu.entity;

 import com.adc.da.base.entity.BaseEntity;
+import com.adc.da.utils.treetool.annotation.TreeNodeId;
+import com.adc.da.utils.treetool.annotation.TreeNodeName;
+import com.adc.da.utils.treetool.annotation.TreeNodeParentId;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -30,6 +33,8 @@ public class SarMenu extends BaseEntity {

    private static final long serialVersionUID = 1L;

+
+    @TreeNodeId
    @ApiModelProperty(value = "主键")
    @TableId("ID")
    private String id;
@@ -38,10 +43,12 @@ public class SarMenu extends BaseEntity {
    @TableField("SOR_DIVIDE")
    private String sorDivide;

+    @TreeNodeName
    @ApiModelProperty(value = "目录名称")
    @TableField("MENU_NAME")
    private String menuName;

+    @TreeNodeParentId
    @ApiModelProperty(value = "父级ID")
    @TableField("PARENT_ID")
    private String parentId;
@@ -140,7 +140,7 @@ public class SarMenuServiceImpl extends ServiceImpl<SarMenuDao, SarMenu> impleme
    public List<String> getChildMenuList (String menuId) {
        List<String> menuIds = new ArrayList<>();
        if (StringUtils.isNotEmpty(menuId)) {
-            List<SarMenu> SarMenuList = dao.selectList(new QueryWrapper<>());
+            List<SarMenu> SarMenuList = dao.selectList(new QueryWrapper<SarMenu>().eq("ID",menuId));
            Tree tree = new Tree(SarMenuList);
            TreeNode treeNode = tree.getTreeNode(menuId);
            if (treeNode != null) {
@@ -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;

 /**
-* <p>
-    *  前端控制器
-    * </p>
-*
-* @author ZhangJin
-* @since 2021-06-15
-*/
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author ZhangJin
+ * @since 2021-06-15
+ */
@RestController
@Api(description = "|SarStandProjectLibrary|")
-@RequestMapping("/sarStandProjectLibrary/sar-stand-project-library")
+@RequestMapping("/api/sarStandProjectLibrary")
 public class SarStandProjectLibraryController extends BaseController<SarStandProjectLibrary> {
    @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<SarStandProjectLibrary> 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<SarStandProjectLibrary> MaintenanceList = sarStandProjectLibraryService.queryMaintenanceProject(Page,PageSize,sarDto);
+        IPage<SarStandProjectLibrary> notMaintenanceList = sarStandProjectLibraryService.queryNotMaintenanceProject(Page,PageSize,sarDto);
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("Maintenance",MaintenanceList);
+        map.put("notMaintenance",notMaintenanceList);
+        return Result.success("200",map);
+    }
+    @GetMapping("/api/queryById")
+    @ApiOperation("点击项目id查询")
+    public ResponseMessage queryByName(String id){
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryService.queryById(id);
        return Result.success("200",list);
    }

 }
+
@@ -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;
+}
@@ -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<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize);
-}
@@ -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<SarStandProjectLibrary> queryMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    IPage<SarStandProjectLibrary> queryNotMaintenanceProject(int current, int pageSize, SarStandProjectLibraryDto sarDto);
+    List<SarStandProjectLibrary> queryById(String id);
+}
@@ -2,14 +2,20 @@ 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;
+
 /**
 * <p>
 *  服务实现类
@@ -19,15 +25,101 @@ import org.springframework.stereotype.Service;
 * @since 2021-06-15
 */
@Service
-public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProjectLibraryDao, SarStandProjectLibrary> implements ISarStandProjectLibraryService {
+public class SarStandProjectLibraryServiceImpl extends ServiceImpl<SarStandProjectLibraryDao, SarStandProjectLibrary> implements SarStandProjectLibraryService {

-    @Autowired
+    @Resource
    private SarStandProjectLibraryDao sarStandProjectLibraryDao;

+
    @Override
-    public IPage<SarStandProjectLibrary> queryMaintenanceProject(int current,int pageSize) {
-        QueryWrapper<SarStandProjectLibrary> wrapper= new QueryWrapper<>();
-        wrapper.inSql("id", "select project_id from sar_stand_project_relation");
+    public IPage<SarStandProjectLibrary> 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<SarStandProjectLibrary> 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<SarStandProjectLibrary> 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<SarStandProjectLibrary> 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<SarStandProjectLibrary> queryById(String id) {
+        QueryWrapper<SarStandProjectLibrary> wrapper = new QueryWrapper<>();
+        wrapper.eq("id",id);
+        List<SarStandProjectLibrary> list = sarStandProjectLibraryDao.selectList(wrapper);
+        return list;
+    }
+
+    private IPage<SarStandProjectLibrary> getSarStandProjectLibraryIPage(int current, int pageSize, QueryWrapper<SarStandProjectLibrary> wrapper) {
        Page<SarStandProjectLibrary> page = new Page<>(current, pageSize);
        IPage<SarStandProjectLibrary> userIPage = sarStandProjectLibraryDao.selectPage(page, wrapper);
        System.out.println("总条数"+userIPage.getTotal());
@@ -35,7 +35,7 @@ import java.util.regex.Pattern;

@RestController
@RequestMapping("/${restPath}/att/attFile")
-@Api(description = "|AttFileEO|文件上传")
+@Api(tags = "|AttFileEO|文件上传")
 public class AttFileEOController {

    private static final Logger logger = LoggerFactory.getLogger(AttFileEOController.class);