查询优化

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/VideoOpController.java

@@ -70,7 +70,7 @@ public class VideoOpController {
     public Result<String> previewURL(@ApiIgnore @RequestBody Map<String, Object> map) {
         Result<String> result = new Result<String>();
         result.setSuccess(true);
-        result.setResult(monitorApi.previewURLV1(map));
+        result.setResult(monitorApi.previewURL(map));
         return result;
     }
 

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovInvestmentContractController.java

@@ -2,6 +2,7 @@ package com.zhgd.xmgl.modules.basicdata.controller.government;
 
 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.zhgd.annotation.OperLog;
 import com.zhgd.jeecg.common.api.vo.Result;
@@ -100,6 +101,9 @@ public class GovInvestmentContractController {
     @PostMapping(value = "/page")
     public Result<IPage<InvestmentContract>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<InvestmentContract> queryWrapper = QueryGenerator.initPageQueryWrapper(InvestmentContract.class, map);
+        if(StringUtils.isNotBlank(MapUtils.getString(map, "projectSn"))) {
+            queryWrapper.lambda().eq(InvestmentContract::getEngineeringSn, "");
+        }
         Page<InvestmentContract> page = PageUtil.getPage(map);
         IPage<InvestmentContract> pageList = investmentContractService.page(page, queryWrapper);
         return Result.success(pageList);

src/main/java/com/zhgd/xmgl/modules/basicdata/controller/government/GovProjectNodePlanController.java

@@ -103,6 +103,9 @@ public class GovProjectNodePlanController {
     @PostMapping(value = "/page")
     public Result<IPage<ProjectNodePlan>> queryPageList(@ApiIgnore @RequestBody Map<String, Object> map) {
         QueryWrapper<ProjectNodePlan> queryWrapper = QueryGenerator.initPageQueryWrapper(ProjectNodePlan.class, map);
+        if(StringUtils.isNotBlank(MapUtils.getString(map, "projectSn"))) {
+            queryWrapper.lambda().eq(ProjectNodePlan::getEngineeringSn, "");
+        }
         Page<ProjectNodePlan> page = PageUtil.getPage(map);
         IPage<ProjectNodePlan> pageList = projectNodePlanService.pageList(page, queryWrapper);
         return Result.success(pageList);

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringServiceImpl.java

@@ -233,7 +233,7 @@ public class EngineeringServiceImpl extends ServiceImpl<EngineeringMapper, Engin
     @Override
     public List<Engineering> getList(Engineering engineering) {
         QueryWrapper<Engineering> queryWrapper = QueryGenerator.initQueryWrapper(engineering);
-        queryWrapper.eq("examine_state", 3);
+        queryWrapper.lambda().eq(Engineering::getExamineState, 3);
         List<Engineering> list = this.list(queryWrapper);
         for (Engineering eng : list) {
             // AI报警信息

src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemRoleServiceImpl.java

@@ -39,10 +39,10 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
     public Page<SystemRole> pageList(Map<String, Object> map) {
         SecurityUser user = SecurityUtil.getUser();
         QueryWrapper<SystemRole> queryWrapper = QueryGenerator.initPageQueryWrapper(SystemRole.class, map);
-        queryWrapper.eq("sn", user.getSn());
+        queryWrapper.lambda().eq(SystemRole::getSn, user.getSn());
-        queryWrapper.orderByAsc("priority");
+        queryWrapper.lambda().orderByAsc(SystemRole::getPriority);
         if (!user.isManager()) {
-            queryWrapper.eq("create_by", user.getUserId());
+            queryWrapper.lambda().eq(SystemRole::getCreateBy, user.getUserId());
         }
         Page<SystemRole> page = PageUtil.getPage(map);
         return baseMapper.selectPage(page, queryWrapper);
@@ -56,7 +56,7 @@ public class SystemRoleServiceImpl extends ServiceImpl<SystemRoleMapper, SystemR
             systemRole.setCreateBy(user.getUserId());
         }
         QueryWrapper<SystemRole> queryWrapper = QueryGenerator.initQueryWrapper(systemRole);
-        queryWrapper.orderByAsc("priority");
+        queryWrapper.lambda().orderByAsc(SystemRole::getPriority);
         return this.list(queryWrapper);
     }
 

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentApplyServiceImpl.java

@@ -54,7 +54,7 @@ public class InvestmentApplyServiceImpl extends ServiceImpl<InvestmentApplyMappe
             wrapper.like("a.name", name);
         }
         if (StringUtils.isNotBlank(projectSn)) {
-            wrapper.eq("a.project_sn", projectSn);
+            wrapper.eq("a.project_sn", projectSn).eq("a.engineering_sn", "");
         }
         Page<InvestmentApply> page = PageUtil.getPage(map);
         return baseMapper.pageList(page, wrapper);

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/InvestmentPaymentDetailServiceImpl.java

@@ -25,7 +25,7 @@ public class InvestmentPaymentDetailServiceImpl extends ServiceImpl<InvestmentPa
 
     @Override
     public Page<InvestmentPaymentDetailDto> pageList(Page page, QueryWrapper<InvestmentPaymentDetail> wrapper) {
-        wrapper.eq("parent_id", 0);
+        wrapper.lambda().eq(InvestmentPaymentDetail::getParentId, 0);
         Page<InvestmentPaymentDetailDto> pageList = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), InvestmentPaymentDetailDto.class);
         List<InvestmentPaymentDetailDto> records = pageList.getRecords();
         List<Long> ids = records.stream().map(r -> r.getId()).collect(Collectors.toList());

src/main/java/com/zhgd/xmgl/modules/safety/service/impl/ProjectSubItemServiceImpl.java

@@ -69,7 +69,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
 
     @Override
     public Page<ProjectSubItemDto> pageList(Page page, QueryWrapper<ProjectSubItem> wrapper) {
-        wrapper.eq("parent_id", 0);
+        wrapper.lambda().eq(ProjectSubItem::getParentId, 0);
         Page<ProjectSubItemDto> pageList = PageUtil.copyProperties(baseMapper.selectPage(page, wrapper), ProjectSubItemDto.class);
         List<ProjectSubItemDto> records = pageList.getRecords();
         build(records);
@@ -78,7 +78,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
 
     @Override
     public Page<ProjectSubItem> pageParentList(Page page, QueryWrapper<ProjectSubItem> wrapper) {
-        wrapper.eq("parent_id", 0);
+        wrapper.lambda().eq(ProjectSubItem::getParentId, 0);
         Page<ProjectSubItem> pageList = baseMapper.selectPage(page, wrapper);
         build1(pageList.getRecords());
         return pageList;
@@ -86,7 +86,7 @@ public class ProjectSubItemServiceImpl extends ServiceImpl<ProjectSubItemMapper,
 
     @Override
     public List<ProjectSubItemDto> getList(QueryWrapper<ProjectSubItem> wrapper) {
-        wrapper.eq("parent_id", 0);
+        wrapper.lambda().eq(ProjectSubItem::getParentId, 0);
         List<ProjectSubItemDto> records = PageUtil.copyProperties(baseMapper.selectList(wrapper), ProjectSubItemDto.class);
         build(records);
         return records;