zhengsl/WholeProcessPlatform
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: 过鱼设施优化

Browse Source
This commit is contained in:
tangwei 2026-07-21 16:11:50 +08:00
parent c5b181f29a
commit 35dfd82e8d
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/com/yfd/platform/qgc_base/domain/SdFpssBH.java
View File

@ -41,6 +41,7 @@ public class SdFpssBH implements Serializable {
/** /**
* 数据时间 * 数据时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date tm; private Date tm;
/** /**
@ -103,6 +104,7 @@ public class SdFpssBH implements Serializable {
/** /**
* 数据接入时间 * 数据接入时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dtinTm; private Date dtinTm;
/** /**
@ -121,31 +123,37 @@ public class SdFpssBH implements Serializable {
/** /**
* 规划设计日期 * 规划设计日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date stdsdt; private Date stdsdt;
/** /**
* 计划开工日期 * 计划开工日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date pststdt; private Date pststdt;
/** /**
* 计划完工日期 * 计划完工日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date pesstdt; private Date pesstdt;
/** /**
* 开工日期 * 开工日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date swdt; private Date swdt;
/** /**
* 建成日期 * 建成日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date jcdt; private Date jcdt;
/** /**
* 退役/拆除日期 * 退役/拆除日期
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date wddt; private Date wddt;
/** /**
@ -425,6 +433,7 @@ public class SdFpssBH implements Serializable {
/** /**
* 数据来源时间 * 数据来源时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date vlsrTm; private Date vlsrTm;
/** /**

5
backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/controller/MsThreedRoamMController.java
View File

@ -4,6 +4,7 @@ import cn.hutool.core.util.StrUtil;
import com.yfd.platform.common.DataSourceRequest; import com.yfd.platform.common.DataSourceRequest;
import com.yfd.platform.common.DataSourceResult; import com.yfd.platform.common.DataSourceResult;
import com.yfd.platform.common.exception.BizException; import com.yfd.platform.common.exception.BizException;
import com.yfd.platform.common.utils.UserNameFillHelper;
import com.yfd.platform.config.ResponseResult; import com.yfd.platform.config.ResponseResult;
import com.yfd.platform.qgc_sys.threedRoam.domain.MsThreedRoamMEntity; import com.yfd.platform.qgc_sys.threedRoam.domain.MsThreedRoamMEntity;
import com.yfd.platform.qgc_sys.threedRoam.dto.MsThreedRoamBVO; import com.yfd.platform.qgc_sys.threedRoam.dto.MsThreedRoamBVO;
@ -35,10 +36,14 @@ public class MsThreedRoamMController {
@Resource @Resource
private IMsThreedRoamMService msThreedRoamMService; private IMsThreedRoamMService msThreedRoamMService;
@Resource
private UserNameFillHelper userNameFillHelper;
@PostMapping("/GetKendoListCust") @PostMapping("/GetKendoListCust")
@Operation(summary = "条件过滤数据列表") @Operation(summary = "条件过滤数据列表")
public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) { public ResponseResult getKendoListCust(@RequestBody DataSourceRequest dataSourceRequest) {
DataSourceResult<MsThreedRoamMEntity> result = msThreedRoamMService.getKendoListCustReturn(dataSourceRequest); DataSourceResult<MsThreedRoamMEntity> result = msThreedRoamMService.getKendoListCustReturn(dataSourceRequest);
userNameFillHelper.fillUserNames(result.getData());
return ResponseResult.successData(result); return ResponseResult.successData(result);
} }

7
backend/src/main/java/com/yfd/platform/qgc_sys/threedRoam/domain/MsThreedRoamMEntity.java
View File

@ -1,6 +1,8 @@
package com.yfd.platform.qgc_sys.threedRoam.domain; package com.yfd.platform.qgc_sys.threedRoam.domain;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;
import com.yfd.platform.annotation.UserIdField;
import com.yfd.platform.annotation.UserNameField;
import lombok.Data; import lombok.Data;
import java.io.Serializable; import java.io.Serializable;
@ -34,8 +36,13 @@ public class MsThreedRoamMEntity implements Serializable {
private String remark; private String remark;
@TableField(value = "RECORD_USER",fill = FieldFill.INSERT) @TableField(value = "RECORD_USER",fill = FieldFill.INSERT)
@UserIdField
private String recordUser; private String recordUser;
@TableField(exist = false)
@UserNameField
private String recordUserName;
@TableField(value = "RECORD_TIME",fill = FieldFill.INSERT) @TableField(value = "RECORD_TIME",fill = FieldFill.INSERT)
private Date recordTime; private Date recordTime;