app巡查汇总查询提交

王富生
1 parent e86c4eda
Showing 12 changed files with 304 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/AppInspectionPlanDetailController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/inspectionplan/vo/AppInspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/inspectionplan/InspectionPlanMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanService.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/resources/mapper/inspectionplan/InspectionPlanMapper.xml
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApi.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/api/permission/RoleApiImpl.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/permission/RoleService.java
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/service/permission/RoleServiceImpl.java
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan;
+
+import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.InspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import static com.zteits.urbanops.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "App管理 - 巡检计划汇总")
+@RestController
+@RequestMapping("/app/garden/inspection-plan")
+@Validated
+@Slf4j
+public class AppInspectionPlanController {
+
+    @Resource
+    private InspectionPlanService inspectionPlanService;
+
+
+    @GetMapping("/page")
+    @Operation(summary = "app-巡检计划汇总分页")
+    @PreAuthorize("@ss.hasPermission('app:garden:inspection-plan:query')")
+    public CommonResult<PageResult<AppInspectionPlanRespVO>> getInspectionPlanAppPage(@Valid AppInspectionPlanPageReqVO pageReqVO) {
+        PageResult<AppInspectionPlanRespVO> pageResult = inspectionPlanService.getInspectionPlanAppPage(pageReqVO);
+        return success(pageResult);
+    }
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan;
+
+import com.zteits.urbanops.module.garden.service.inspectionplan.InspectionPlanDetailService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+@Tag(name = "APP管理 - 巡检计划")
+@RestController
+@RequestMapping("/app/garden/inspection-plan-detail")
+@Validated
+public class AppInspectionPlanDetailController {
+
+    @Resource
+    private InspectionPlanDetailService inspectionPlanDetailService;
+
+
+
+}
 \ No newline at end of file
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
+
+import com.zteits.urbanops.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Schema(description = "App管理 - 巡检计划汇总新增/修改 Request VO")
+@Data
+public class AppInspectionPlanPageReqVO extends PageParam {
+
+    @Schema(description = "道路名称", example = "赵六")
+    private String roadName;
+
+    @Schema(description = "状态 1:未完成;3:已完成;4:已失效")
+    @NotNull
+    @Min(value = 1, message = "状态最小为1")
+    @Max(value = 4, message = "状态不能大于4")
+    private Integer finishState;
+
+    @Schema(description = "公司ID")
+    private Long companyId;
+
+    @Schema(description = "角色IDS")
+    private List<Long> roleIds;
+
+    @Schema(description = "业务线")
+    private List<String> busiLineList;
+
+    @Schema(description = "系统时间")
+    private LocalDate localDate;
+}
+package com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "App管理 - 巡检计划 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class AppInspectionPlanRespVO {
+
+
+    @Schema(description = "道路ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadId;
+
+    @Schema(description = "道路名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "32704")
+    private Long roadName;
+
+    @Schema(description = "街道ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "8439")
+    private String streetId;
+
+    @Schema(description = "街道名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "芋艿")
+    private String streetName;
+
+    @Schema(description = "养护级别: 10:特级；11:一级：12:二级;13:三级", requiredMode = Schema.RequiredMode.REQUIRED, example = "8588")
+    private Integer levelId;
+
+    @Schema(description = "养护类型：2001:浇水;2002:施肥;2003:有害生物防治;2004:修剪;2005:中耕除草;2006:打孔梳草;2007:绿地保洁;2008:园林废弃物收集运输  ;2009:补植;3001:绿地巡视;", requiredMode = Schema.RequiredMode.REQUIRED, example = "24742")
+    private Integer planTypeId;
+
+    @Schema(description = "执行开始时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime beginTime;
+
+    @Schema(description = "执行时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDateTime endTime;
+
+    @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
+    private Integer finishState;
+
+}
 package com.zteits.urbanops.module.garden.dal.mysql.inspectionplan;
  
  
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import org.apache.ibatis.annotations.Mapper;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
@@ -33,4 +36,14 @@ public interface InspectionPlanMapper extends BaseMapperX&lt;InspectionPlanDO&gt; {
  
     int deleteByBatchNo(@Param("batchNo") String batchNo);
  
+    /**
+     * 获取巡检计划列表-app
+     *
+     * @param page
+     * @param req
+     * @return 列表
+     */
+    IPage<AppInspectionPlanRespVO> getInspectionPlanAppPage(@Param("page") IPage<AppInspectionPlanRespVO> page, @Param("req") AppInspectionPlanPageReqVO req);
+
+
 }
 \ No newline at end of file
@@ -3,6 +3,8 @@ package com.zteits.urbanops.module.garden.service.inspectionplan;
 import java.util.*;
  
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
 import jakarta.validation.*;
 import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
@@ -72,4 +74,11 @@ public interface InspectionPlanService {
      */
     void stopPlanInspectionPlan(String batchNo);
  
+    /**
+     * app-获取巡检计划列表
+     * @param pageReqVO 分页查询
+     * @return 巡检计划列表
+     */
+    PageResult<AppInspectionPlanRespVO> getInspectionPlanAppPage(AppInspectionPlanPageReqVO pageReqVO);
+
 }
 \ No newline at end of file
@@ -3,14 +3,25 @@ package com.zteits.urbanops.module.garden.service.inspectionplan;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.zteits.urbanops.framework.common.pojo.CommonResult;
+import com.zteits.urbanops.framework.common.pojo.PageResult;
+import com.zteits.urbanops.framework.common.util.object.BeanUtils;
 import com.zteits.urbanops.framework.dict.core.DictFrameworkUtils;
+import com.zteits.urbanops.framework.mybatis.core.util.MyBatisUtils;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
+import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanPageReqVO;
+import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanRoleDO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadDO;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanInterceptMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper;
+import com.zteits.urbanops.module.garden.dal.mysql.road.RoadMapper;
 import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
 import com.zteits.urbanops.module.garden.enums.PlanConstants;
 import com.zteits.urbanops.module.garden.util.timeinterval.PeriodResult;
@@ -19,10 +30,11 @@ import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import com.zteits.urbanops.module.system.api.permission.RoleApi;
 import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO;
+import jakarta.annotation.Resource;
 import jodd.util.StringUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
@@ -32,13 +44,6 @@ import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
  
-import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDO;
-import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
-import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanMapper;
-
 import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
  
@@ -65,11 +70,18 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     private InspectionPlanRoleMapper inspectionPlanRoleMapper;
  
     @Resource
+    private RoadMapper roadMapper;
+
+
+    @Resource
     private DeptApi deptApi;
  
     @Resource
     private RoleApi roleApi;
  
+    @Resource
+    private RoleApi poleApi;
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public CommonResult<Integer> createInspectionPlan(InspectionPlanSaveReqVO createReqVO) {
@@ -310,4 +322,44 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
         inspectionPlanRoleMapper.delete(InspectionPlanRoleDO::getBatchNo, batchNo);
     }
  
+    @Override
+    public PageResult<AppInspectionPlanRespVO> getInspectionPlanAppPage(AppInspectionPlanPageReqVO pageReqVO) {
+        String busiLine = SecurityFrameworkUtils.getBusiLine();
+        Long companyId = SecurityFrameworkUtils.getCompanyId();
+        if (StringUtils.isNotEmpty(busiLine)) {
+            pageReqVO.setBusiLineList(Arrays.asList(busiLine.split(",")));
+        }
+        pageReqVO.setCompanyId(companyId);
+
+        /*1.查询登录用户角色*/
+        List<Long> roleIds = poleApi.getRoleIdsByUserId(SecurityFrameworkUtils.getLoginUserId());
+        pageReqVO.setRoleIds(roleIds);
+        /*2.分页*/
+        IPage<AppInspectionPlanRespVO> mpPage = MyBatisUtils.buildPage(pageReqVO);
+        IPage<AppInspectionPlanRespVO> page = inspectionPlanMapper.getInspectionPlanAppPage(mpPage, pageReqVO);
+        addStreetInfo(page.getRecords());
+        // 转换返回
+        return new PageResult<>(page.getRecords(), page.getTotal());
+    }
+
+    private void addStreetInfo(List<AppInspectionPlanRespVO> list){
+        if(CollectionUtils.isEmpty(list)){
+            return ;
+        }
+        Set<Long> roadIds = list.stream().map(AppInspectionPlanRespVO::getRoadId).collect(Collectors.toSet());
+
+
+        List<RoadDO> roadList = roadMapper.selectList(new QueryWrapper<RoadDO>().lambda().in(RoadDO::getId, roadIds));
+        //list转map
+        Map<Long, RoadDO> roadMap = roadList.stream().collect(Collectors.toMap(RoadDO::getId, road -> road));
+
+        list.forEach(plan -> {
+            RoadDO road = roadMap.get(plan.getRoadId());
+            if(road != null){
+                plan.setStreetId(road.getStreetId());
+                plan.setStreetName(road.getStreetName());
+            }
+        });
+    }
+
 }
 \ No newline at end of file
@@ -13,4 +13,48 @@
         delete from garden_inspection_plan where batch_no =#{batchNo}
     </delete>
  
+    <select id="getInspectionPlanAppPage" resultType="com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanRespVO">
+        SELECT
+            a.road_id,
+            a.road_name,
+            a.plan_type_id,
+            a.level_id,
+            a.begin_time,
+            a.end_time
+        FROM
+            garden_inspection_plan a,
+            garden_inspection_plan_role b
+        WHERE
+            a.batch_no = b.batch_no
+           AND a.company_id = #{req.companyId}
+          <if test="req.roadName != null and req.roadName !=''">
+            AND a.road_name LIKE CONCAT('%',#{req.roadName},'%')
+          </if>
+        <if test="req.roleIds != null and req.roleIds.size() > 0">
+            AND b.role_id IN
+            <foreach collection="req.roleIds" item="roleId" open="(" separator="," close=")">
+                #{roleId}
+            </foreach>
+        </if>
+        <if test="req.busiLineList != null and req.busiLineList.size() > 0">
+            AND a.busi_line IN
+            <foreach collection="req.busiLineList" item="busiLine" open="(" separator="," close=")">
+                #{busiLine}
+            </foreach>
+        </if>
+        <!--状态 1:未完成;3:已完成;4:已失效-->
+        <if test="req.finishState == 4">
+            <![CDATA[and a.end_time < #{req.localDate}]]>
+        </if>
+        <if test="req.finishState == 3 or req.finishState == 1">
+            and a.finish_state = #{req.finishState}
+        </if>
+        GROUP BY
+        a.road_id,
+        a.road_name,
+        a.plan_type_id,
+        a.level_id,
+        a.begin_time,
+        a.end_time
+    </select>
 </mapper>
 \ No newline at end of file
@@ -36,4 +36,12 @@ public interface RoleApi {
      * @return
      */
     List<RoleRespVO> getRoleListByBusiLine(String busiLine);
+
+    /**
+     * 通过用户编号，获得角色ID列表
+     *
+     * @param userId 用户编号
+     * @return 角色ID列表
+     */
+    List<Long> getRoleIdsByUserId(Long userId);
 }
@@ -34,4 +34,9 @@ public class RoleApiImpl implements RoleApi {
     public List<RoleRespVO> getRoleListByBusiLine(String busiLine) {
        return roleService.getRoleListByBusiLine(busiLine);
     }
+
+    @Override
+    public List<Long> getRoleIdsByUserId(Long userId) {
+        return roleService.getRoleIdsByUserId(userId);
+    }
 }
@@ -135,4 +135,9 @@ public interface RoleService {
      * @return
      */
     List<RoleRespVO> getRoleListByBusiLine(String busiLine);
+
+    /**
+     * 通过用户编号，获得角色列表
+     */
+    List<Long> getRoleIdsByUserId(Long userId);
 }
@@ -14,7 +14,9 @@ import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.Rol
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleRespVO;
 import com.zteits.urbanops.module.system.controller.admin.permission.vo.role.RoleSaveReqVO;
 import com.zteits.urbanops.module.system.dal.dataobject.permission.RoleDO;
+import com.zteits.urbanops.module.system.dal.dataobject.permission.UserRoleDO;
 import com.zteits.urbanops.module.system.dal.mysql.permission.RoleMapper;
+import com.zteits.urbanops.module.system.dal.mysql.permission.UserRoleMapper;
 import com.zteits.urbanops.module.system.dal.redis.RedisKeyConstants;
 import com.zteits.urbanops.module.system.enums.permission.DataScopeEnum;
 import com.zteits.urbanops.module.system.enums.permission.RoleCodeEnum;
@@ -53,6 +55,9 @@ public class RoleServiceImpl implements RoleService {
     @Resource
     private RoleMapper roleMapper;
  
+    @Resource
+    private UserRoleMapper userRoleMapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     @LogRecord(type = SYSTEM_ROLE_TYPE, subType = SYSTEM_ROLE_CREATE_SUB_TYPE, bizNo = "{{#role.id}}",
@@ -272,6 +277,17 @@ public class RoleServiceImpl implements RoleService {
         return BeanUtils.toBean(roleDOS, RoleRespVO.class);
     }
  
+    @Override
+    public List<Long> getRoleIdsByUserId(Long userId) {
+        QueryWrapper<UserRoleDO> sql = new QueryWrapper<>();
+        sql.select("role_id");
+        List<UserRoleDO> list = userRoleMapper.selectList(sql.lambda().eq(UserRoleDO::getUserId, userId));
+        if (CollectionUtil.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(UserRoleDO::getRoleId).toList();
+    }
+
     /**
      * 获得自身的代理对象，解决 AOP 生效问题
      *