Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents 183ddd5f 50b6254e
Showing 14 changed files with 88 additions and 59 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/inspectionplan/vo/InspectionPlanSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanPageReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/maintainplan/vo/MaintainPlanSaveReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/road/RoadStreetController.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/controller/app/maintainplan/vo/AppMaintainPlanPageRoadRespVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/dataobject/inspectionplan/InspectionPlanDO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/dal/mysql/maintainplan/MaintainPlanInterceptMapper.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/enums/PlanConstants.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/inspectionplan/InspectionPlanServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/maintainplan/MaintainPlanDetailServiceImpl.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/road/RoadStreetServiceImpl.java
 package com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
 import com.fhs.core.trans.vo.VO;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
-import cn.idev.excel.annotation.*;
-
 @Schema(description = "管理后台 - 巡检计划汇总 Response VO")
 @Data
 @ExcelIgnoreUnannotated
@@ -86,11 +88,11 @@ public class InspectionPlanRespVO implements VO {
     @Schema(description = "开始时间")
     @ExcelProperty("开始时间")
-    private LocalDateTime beginTime;
+    private LocalDate beginTime;
     @Schema(description = "开始时间")
     @ExcelProperty("开始时间")
-    private LocalDateTime endTime;
+    private LocalDate endTime;
     @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "你说的对")
     @ExcelProperty("备注")
@@ -46,7 +46,7 @@ public class InspectionPlanSaveReqVO {
     @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "频次值不能为空")
-    @Size(max = 6)
+    @Size(max = 6 , message = "频次值长度不能大于6")
     private String rateValue;
     @Schema(description = "周期ID: 0:次；1:日/次；2:周/次；3:月/次；4:季/次；5:半年/次；6:年/次", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -33,6 +33,9 @@ public class MaintainPlanPageReqVO extends PageParam {
     @Schema(description = "归属(一级部门id)", example = "1713")
     private Long companyId;
+    @Schema(description = "部门id")
+    private Integer deptId;
+
     @Schema(description = "道路名称", example = "王五")
     private String roadName;
@@ -46,7 +46,7 @@ public class MaintainPlanSaveReqVO {
     @Schema(description = "频次值", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "频次值不能为空")
-    @Size(max = 6)
+    @Size(max = 6 , message = "频次值长度不能大于6")
     private String rateValue;
     @Schema(description = "周期ID: 1:日/次；2:周/次；3:月/次；4:年/次；5:按次；6:季度；7:半年", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@@ -82,10 +82,9 @@ public class RoadStreetController {
     @GetMapping("/list")
     @Operation(summary = "获得街道列表")
-    @Parameter(name = "busi_line", description = "业务线", required = true, example = "1024")
-//    @PreAuthorize("@ss.hasPermission('garden:road-street:query')")
-    public CommonResult<List<RoadStreetRespVO>> getRoadStreet(@RequestParam("busi_line") @NotBlank String busiLine) {
-        List<RoadStreetDO> roadStreet = roadStreetService.getRoadStreetList(busiLine);
+    @PreAuthorize("@ss.hasPermission('garden:road-street:query')")
+    public CommonResult<List<RoadStreetRespVO>> getRoadStreet() {
+        List<RoadStreetDO> roadStreet = roadStreetService.getRoadStreetList(null);
         return success(BeanUtils.toBean(roadStreet, RoadStreetRespVO.class));
     }
@@ -5,7 +5,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -37,11 +37,11 @@ public class AppInspectionPlanRespVO {
     @Schema(description = "执行开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime beginTime;
+    private LocalDate beginTime;
     @Schema(description = "执行时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime endTime;
+    private LocalDate endTime;
     @Schema(description = "完成状态 1:未完成;2:进行中;3:已完成", requiredMode = Schema.RequiredMode.REQUIRED)
     private Integer finishState;
 package com.zteits.urbanops.module.garden.controller.app.maintainplan.vo;
 import cn.idev.excel.annotation.ExcelProperty;
-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;
@@ -9,6 +8,7 @@ import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
@@ -52,10 +52,10 @@ public class AppMaintainPlanPageRoadRespVO{
     @Schema(description = "执行开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime beginTime;
+    private LocalDate beginTime;
     @Schema(description = "执行时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDateTime endTime;
+    private LocalDate endTime;
 }
 \ No newline at end of file
 package com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan;
-import lombok.*;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.zteits.urbanops.framework.mybatis.core.dataobject.BaseDO;
+import lombok.*;
+
+import java.time.LocalDate;
 /**
  * 巡检计划汇总 DO
@@ -89,11 +92,11 @@ public class InspectionPlanDO extends BaseDO {
     /**
      * 开始时间
      */
-    private LocalDateTime beginTime;
+    private LocalDate beginTime;
     /**
      * 开始时间
      */
-    private LocalDateTime endTime;
+    private LocalDate endTime;
     /**
      * 备注
      */
@@ -28,6 +28,8 @@ public interface MaintainPlanInterceptMapper extends BaseMapperX&lt;MaintainPlanDO&gt;
                 .likeIfPresent(MaintainPlanDO::getRoadName, reqVO.getRoadName())
                 .eqIfPresent(MaintainPlanDO::getFinishState, reqVO.getFinishState())
                 .eqIfPresent(MaintainPlanDO::getLevelId, reqVO.getLevelId())
+                .eqIfPresent(MaintainPlanDO::getCycleId, reqVO.getCycleId())
+                .eqIfPresent(MaintainPlanDO::getDeptId, reqVO.getDeptId())
                 .betweenIfPresent(MaintainPlanDO::getBeginTime, reqVO.getBeginTime())
                 .betweenIfPresent(MaintainPlanDO::getEndTime, reqVO.getEndTime())
                 .eq(MaintainPlanDO::getDeleted,0)
@@ -17,5 +17,8 @@ public class PlanConstants {
     /*养护类型-浇水-字典key*/
     public static final String MAINTAIN_TYPE = "maintain_type";
+    /*归属街道-字典key*/
+    public static final String STREET_BELONG = "street_belong";
+
 }
@@ -9,8 +9,6 @@ import com.zteits.urbanops.module.garden.controller.admin.inspectionplan.vo.Insp
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailReqVO;
 import com.zteits.urbanops.module.garden.controller.app.inspectionplan.vo.AppInspectionPlanDetailRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.inspectionplan.InspectionPlanDetailDO;
-import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDO;
-import com.zteits.urbanops.module.garden.dal.dataobject.maintainplan.MaintainPlanDetailDO;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanDetailMapper;
 import com.zteits.urbanops.module.garden.dal.mysql.inspectionplan.InspectionPlanRoleMapper;
 import com.zteits.urbanops.module.garden.enums.FinishStateEnum;
@@ -20,7 +18,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.List;
@@ -109,11 +109,11 @@ public class InspectionPlanDetailServiceImpl implements InspectionPlanDetailServ
     @Override
     public void updateExpiredInspectionPlanDetails() {
         // 更新过期的计划明细状态为过期(3)
-        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00
         LambdaUpdateWrapper<InspectionPlanDetailDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.lt(InspectionPlanDetailDO::getEndTime, now)
-                .ne(InspectionPlanDetailDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的
-                .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态
+        updateWrapper.lt(InspectionPlanDetailDO::getEndTime, localDateTime)
+                .set(InspectionPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
+                .eq(InspectionPlanDetailDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
         inspectionPlanDetailMapper.update(null, updateWrapper);
     }
@@ -415,9 +415,9 @@ public class InspectionPlanServiceImpl implements InspectionPlanService {
     @Override
     public void updateExpiredInspectionPlans() {
         // 更新过期的计划状态为过期(3)
-        LocalDateTime now = LocalDateTime.now();
+        LocalDate yesterday = LocalDate.now(); // 昨天日期
         LambdaUpdateWrapper<InspectionPlanDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.lt(InspectionPlanDO::getEndTime, now)
+        updateWrapper.lt(InspectionPlanDO::getEndTime, yesterday)
                 .ne(InspectionPlanDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的
                 .set(InspectionPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态
         inspectionPlanMapper.update(null, updateWrapper);
@@ -27,7 +27,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -157,23 +159,24 @@ public class MaintainPlanDetailServiceImpl implements MaintainPlanDetailService 
     @Override
     public void updateExpiredMaintainPlanDetails() {
         // 更新过期的计划明细状态为过期(3)
-        LocalDateTime now = LocalDateTime.now();
+        LocalDateTime localDateTime = LocalDate.now().atStartOfDay(); //00:00:00
         LambdaUpdateWrapper<MaintainPlanDetailDO> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.lt(MaintainPlanDetailDO::getEndTime, now)
-                .ne(MaintainPlanDetailDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的
-                .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态
-        maintainPlanDetailMapper.update(null, updateWrapper);
+        updateWrapper.lt(MaintainPlanDetailDO::getEndTime, localDateTime)
+                .set(MaintainPlanDetailDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
+                .eq(MaintainPlanDetailDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
+
+        maintainPlanDetailMapper.update(updateWrapper);
     }
     @Override
     public void updateExpiredMaintainPlans() {
         // 更新过期的计划状态为过期(3)
-        LocalDateTime now = LocalDateTime.now();
+        LocalDate now = LocalDate.now();
         LambdaUpdateWrapper<MaintainPlanDO> updateWrapper = new LambdaUpdateWrapper<>();
         updateWrapper.lt(MaintainPlanDO::getEndTime, now)
-                .ne(MaintainPlanDO::getFinishState, FinishStateEnum.FINISHED.getStatus()) // 排除已完成的
-                .set(MaintainPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()); // 设置为过期状态
-        maintainPlanMapper.update(null, updateWrapper);
+                .set(MaintainPlanDO::getFinishState, FinishStateEnum.EXPIRED.getStatus()) // 设置为过期状态
+                .eq(MaintainPlanDO::getFinishState,  FinishStateEnum.NOT_FINISHED.getStatus());
+        maintainPlanMapper.update(updateWrapper);
     }
 }
 package com.zteits.urbanops.module.garden.service.road;
-import cn.hutool.core.collection.CollUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import org.springframework.stereotype.Service;
-import jakarta.annotation.Resource;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-
-import com.zteits.urbanops.module.garden.controller.admin.road.vo.*;
-import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadStreetDO;
+import com.zteits.urbanops.framework.common.biz.system.dict.DictDataCommonApi;
+import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
 import com.zteits.urbanops.framework.common.pojo.PageResult;
-import com.zteits.urbanops.framework.common.pojo.PageParam;
 import com.zteits.urbanops.framework.common.util.object.BeanUtils;
-
+import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadStreetPageReqVO;
+import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadStreetSaveReqVO;
+import com.zteits.urbanops.module.garden.dal.dataobject.road.RoadStreetDO;
 import com.zteits.urbanops.module.garden.dal.mysql.road.RoadStreetMapper;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import java.util.ArrayList;
+import java.util.List;
-import static com.zteits.urbanops.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.convertList;
-import static com.zteits.urbanops.framework.common.util.collection.CollectionUtils.diffList;
-import static com.zteits.urbanops.module.garden.enums.ErrorCodeConstants.*;
+import static com.zteits.urbanops.module.garden.enums.PlanConstants.STREET_BELONG;
 /**
  * 街道 Service 实现类
@@ -34,6 +29,9 @@ public class RoadStreetServiceImpl implements RoadStreetService {
     @Resource
     private RoadStreetMapper roadStreetMapper;
+    @Resource
+    private DictDataCommonApi dictDataCommonApi;
+
     @Override
     public Long createRoadStreet(RoadStreetSaveReqVO createReqVO) {
         // 插入
@@ -86,9 +84,25 @@ public class RoadStreetServiceImpl implements RoadStreetService {
     @Override
     public List<RoadStreetDO> getRoadStreetList(String busiLine) {
-        QueryWrapper<RoadStreetDO> sql = new QueryWrapper<>();
-        sql.lambda().eq(RoadStreetDO::getBusiLine, busiLine).eq(RoadStreetDO::getDeleted,0);
-        return roadStreetMapper.selectList(sql);
+        List<RoadStreetDO> respList = new ArrayList<>();
+        //从数据字典中获取
+        List<DictDataRespDTO> dictDataList = dictDataCommonApi.getDictDataList(STREET_BELONG);
+        if(org.springframework.util.CollectionUtils.isEmpty(dictDataList)){
+            return respList;
+        }
+
+        dictDataList.forEach(dictData -> {
+            RoadStreetDO roadStreet = new RoadStreetDO();
+            roadStreet.setStreetId(dictData.getValue());
+            roadStreet.setStreetName(dictData.getLabel());
+            respList.add(roadStreet);
+        });
+
+//        QueryWrapper<RoadStreetDO> sql = new QueryWrapper<>();
+//        sql.lambda().eq(RoadStreetDO::getBusiLine, busiLine).eq(RoadStreetDO::getDeleted,0);
+//        return roadStreetMapper.selectList(sql);
+
+        return respList;
     }
 }
 \ No newline at end of file