From d7e63ec2d5dbe50e53905184b620634fbeda2312 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Thu, 31 Oct 2024 14:15:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E7=9B=91=E7=9D=A3=E8=AE=A1=E5=88=92=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E8=B0=83=E6=95=B4=202.=E5=85=A8=E8=BF=87=E7=A8=8B?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../upload/PmsTemProcessReportController.java | 9 ++-- .../upload/IPmsTemProcessReportService.java | 2 +- .../impl/PmsTemProcessReportServiceImpl.java | 9 ++-- .../com/njcn/process/pojo/po/SupvPlanRel.java | 2 +- .../utils/TimestampAsLongSerializer.java | 52 +++++++++---------- 5 files changed, 36 insertions(+), 38 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java index 8a70904df..e3ee462ab 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessReportController.java @@ -14,11 +14,8 @@ import com.njcn.harmonic.service.upload.IPmsTemProcessReportService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.*; -import org.springframework.web.bind.annotation.RestController; import com.njcn.web.controller.BaseController; import java.util.List; @@ -64,9 +61,9 @@ public class PmsTemProcessReportController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/dayCalReport") @ApiOperation("每日计算评估问题") - public HttpResult dayCalReport() { + public HttpResult dayCalReport(@RequestParam("date") String date) { String methodDescribe = getMethodDescribe("dayCalReport"); - iPmsTemProcessReportService.dayCalReport(); + iPmsTemProcessReportService.dayCalReport(date); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java index 2bd9dd503..03f7e0691 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/IPmsTemProcessReportService.java @@ -26,5 +26,5 @@ public interface IPmsTemProcessReportService extends IService getList(PmsTemUserParam.QueryPmsTemUserParam param); - Boolean dayCalReport(); + Boolean dayCalReport(String date); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java index ebd3e0f88..5f27d3918 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessReportServiceImpl.java @@ -100,11 +100,12 @@ public class PmsTemProcessReportServiceImpl extends ServiceImpl pmsTemProcessReportList = new ArrayList<>(); List data = deptFeignClient.allDeptList().getData(); diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanRel.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanRel.java index 728159769..e2c62ab79 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanRel.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlanRel.java @@ -11,7 +11,7 @@ import java.io.Serializable; import java.sql.Timestamp; import java.time.LocalDateTime; -import com.njcn.process.utils.TimestampAsLongSerializer; + import lombok.Data; import lombok.Getter; import lombok.Setter; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java b/pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java index 35759f5fe..aec8ddd21 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java @@ -1,26 +1,26 @@ -package com.njcn.process.utils; - -import com.alibaba.fastjson.serializer.JSONSerializer; -import com.alibaba.fastjson.serializer.ObjectSerializer; - -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.sql.Timestamp; - -@Component -public class TimestampAsLongSerializer implements ObjectSerializer { - - @Override - public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException { - if (object instanceof Timestamp) { - Timestamp timestamp = (Timestamp) object; - // 将Timestamp转换为时间戳（毫秒数） - long time = timestamp.getTime(); - serializer.write(time); - } else { - serializer.write(object); - } - } -} \ No newline at end of file +//package com.njcn.process.utils; +// +//import com.alibaba.fastjson.serializer.JSONSerializer; +//import com.alibaba.fastjson.serializer.ObjectSerializer; +// +//import org.springframework.stereotype.Component; +// +//import java.io.IOException; +//import java.lang.reflect.Type; +//import java.sql.Timestamp; +// +//@Component +//public class TimestampAsLongSerializer implements ObjectSerializer { +// +// @Override +// public void write(JSONSerializer serializer, Object object, Object fieldName, Type fieldType, int features) throws IOException { +// if (object instanceof Timestamp) { +// Timestamp timestamp = (Timestamp) object; +// // 将Timestamp转换为时间戳（毫秒数） +// long time = timestamp.getTime(); +// serializer.write(time); +// } else { +// serializer.write(object); +// } +// } +//} \ No newline at end of file