Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.园区接口完成

Browse Source
This commit is contained in:
cdf
2024-06-24 14:37:04 +08:00
parent 0e1a10a860
commit ec9f32d0ad
18 changed files with 856 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/RUploadWorkOrderParam.java
View File

@@ -3,6 +3,7 @@ package com.njcn.harmonic.pojo.param.upload;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.web.pojo.param.BaseParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -174,8 +175,16 @@ public class RUploadWorkOrderParam {
@Data
@EqualsAndHashCode(callSuper = true)
public static class RUploadWorkOrderQuery extends BaseParam {
private String orderStatus;
/**
* 运维单位ID
*/
private String maintainerId;
}

13
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/RUploadWorkOrderPO.java
View File

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
import java.time.LocalDate;
import java.time.LocalDateTime;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;
import lombok.Setter;
@@ -97,26 +99,31 @@ public class RUploadWorkOrderPO {
/**
* 事件时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate eventTime;
/**
* 下发时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime distributeTime;
/**
* 闭环时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate closedLoopTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime ctime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime mtime;
/**
* 0.删除 1.正常
*/
private Boolean isDeleted;
private Integer isDeleted;
/**
* 3-省，4-市
@@ -136,6 +143,7 @@ public class RUploadWorkOrderPO {
/**
* 反馈时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate feedbackTime;
/**
@@ -146,6 +154,7 @@ public class RUploadWorkOrderPO {
/**
* 接收时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime receiveTime;
/**
@@ -161,6 +170,7 @@ public class RUploadWorkOrderPO {
/**
* 上报时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate uploadTime;
/**
@@ -171,6 +181,7 @@ public class RUploadWorkOrderPO {
/**
* 要求整改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private LocalDate planRectificationTime;

18
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/RUploadWorkOrderServiceImpl.java
View File

@@ -4,6 +4,7 @@ package com.njcn.harmonic.service.upload.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import com.njcn.harmonic.pojo.param.upload.RUploadWorkOrderParam;
import com.njcn.harmonic.pojo.po.upload.RUploadWorkOrderPO;
import com.njcn.harmonic.service.upload.IRUploadWorkOrderService;
import com.njcn.system.enums.DicDataEnum;
import com.njcn.user.api.DeptFeignClient;
import com.njcn.web.enums.GWSendEnum;
import com.njcn.web.factory.PageFactory;
import com.njcn.web.pojo.param.SendParam;
@@ -44,6 +46,8 @@ import java.util.stream.Collectors;
@RequiredArgsConstructor
public class RUploadWorkOrderServiceImpl extends ServiceImpl<RUploadWorkOrderMapper, RUploadWorkOrderPO> implements IRUploadWorkOrderService {
private final DeptFeignClient deptFeignClient;
@Override
public Boolean insertWorkorderDistributeSupervise(RUploadWorkOrderParam param) {
RUploadWorkOrderPO rUploadWorkOrderPO = new RUploadWorkOrderPO();
@@ -80,6 +84,10 @@ public class RUploadWorkOrderServiceImpl extends ServiceImpl<RUploadWorkOrderMap
RUploadWorkOrderPO newPo = new RUploadWorkOrderPO();
newPo.setObjId(rUploadWorkOrderPO.getObjId());
newPo.setFeedbackTime(LocalDate.now());
newPo.setUploadStatus("1");
newPo.setOrderStatus(DicDataEnum.WORK_ORDER_STATUS_HAS.getCode());
newPo.setUploadTime(LocalDate.now());
newPo.setIsFeedback("1");
newPoList.add(newPo);
}
this.updateBatchById(newPoList);
@@ -88,8 +96,16 @@ public class RUploadWorkOrderServiceImpl extends ServiceImpl<RUploadWorkOrderMap
@Override
public Page<RUploadWorkOrderPO> pageList(RUploadWorkOrderParam.RUploadWorkOrderQuery query) {
List<String> deptIds = deptFeignClient.getDepSonSelfCodetByDeptId(query.getMaintainerId()).getData();
LambdaQueryWrapper<RUploadWorkOrderPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.between(RUploadWorkOrderPO::getDistributeTime, DateUtil.beginOfDay(DateUtil.parse(query.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN)),DateUtil.endOfDay(DateUtil.parse(query.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN)));
lambdaQueryWrapper.between(RUploadWorkOrderPO::getDistributeTime, DateUtil.beginOfDay(DateUtil.parse(query.getSearchBeginTime(), DatePattern.NORM_DATE_PATTERN)),DateUtil.endOfDay(DateUtil.parse(query.getSearchEndTime(), DatePattern.NORM_DATE_PATTERN)))
.eq(StrUtil.isNotBlank(query.getOrderStatus()),RUploadWorkOrderPO::getOrderStatus,query.getOrderStatus())
.in(RUploadWorkOrderPO::getMaintainerId,deptIds)
;
return this.page(new Page<>(PageFactory.getPageNum(query),PageFactory.getPageSize(query)),lambdaQueryWrapper);
}