ljf
/
shuili
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: 调整更新时间创建时间逻辑

master_tdsql
hxh 1 year ago
parent
ce1e6d39f7
commit
a3b6e48da0
24 changed files with 112 additions and 464 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 55
      shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java
  2. 36
      shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java
  3. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java
  4. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java
  5. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java
  6. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java
  7. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java
  8. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java
  9. 30
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java
  10. 19
      shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java
  11. 5
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java
  12. 5
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
  13. 4
      shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
  14. 30
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java
  15. 30
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java
  16. 30
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java
  17. 29
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java
  18. 29
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java
  19. 29
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java
  20. 32
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java
  21. 19
      shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java
  22. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java
  23. 5
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java
  24. 4
      shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java

55
shuili-system/src/main/java/com/kms/yxgh/base/CreateAndUpdateMetaObjectHandler.java
View File

@ -0,0 +1,55 @@
package com.kms.yxgh.base;
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.kms.common.utils.BaseEntityUtils;
import com.shuili.common.exception.BaseException;
import java.util.Date;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Service;
/**
* MP注入处理器
*
* @author Lion Li
* @date 2021/4/25
*/
@Slf4j
@Service
public class CreateAndUpdateMetaObjectHandler implements MetaObjectHandler {
@Override
public void insertFill(MetaObject metaObject) {
try {
if (ObjectUtil.isNotNull(metaObject)
&& metaObject.getOriginalObject() instanceof SyBaseEntity) {
SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject();
Date current = ObjectUtil.isNotNull(baseEntity.getCreateTime())
? baseEntity.getCreateTime() : new Date();
baseEntity.setCreateTime(current);
baseEntity.setUpdateTime(current);
BaseEntityUtils.preInsert(baseEntity);
}
} catch (Exception e) {
throw new BaseException(e.getMessage());
}
}
@Override
public void updateFill(MetaObject metaObject) {
try {
if (ObjectUtil.isNotNull(metaObject)
&& metaObject.getOriginalObject() instanceof SyBaseEntity) {
SyBaseEntity baseEntity = (SyBaseEntity) metaObject.getOriginalObject();
Date current = new Date();
// 更新时间填充(不管为不为空)
baseEntity.setUpdateTime(current);
BaseEntityUtils.preUpdate(baseEntity);
}
} catch (Exception e) {
throw new BaseException(e.getMessage());
}
}
}

36
shuili-system/src/main/java/com/kms/yxgh/base/SyBaseEntity.java
View File

@ -2,7 +2,11 @@ package com.kms.yxgh.base;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.shuili.common.annotation.Excel;
import com.shuili.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
/**
@ -14,8 +18,38 @@ import lombok.Data;
*/
@Data
public class SyBaseEntity extends BaseEntity {
public abstract class SyBaseEntity extends BaseEntity {
@TableId(type = IdType.AUTO)
protected String id;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfChecking.java
View File

@ -37,34 +37,4 @@ public class DfChecking extends SyBaseEntity {
@ApiModelProperty("巡查类型")
private Long type;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfCheckingItem.java
View File

@ -44,34 +44,4 @@ public class DfCheckingItem extends SyBaseEntity {
@ApiModelProperty("检查内容")
private String content;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlan.java
View File

@ -73,34 +73,4 @@ public class DfPlan extends SyBaseEntity {
@ApiModelProperty("附加配置")
private String otherConfig;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPlanOperator.java
View File

@ -44,34 +44,4 @@ public class DfPlanOperator extends SyBaseEntity {
@ApiModelProperty("执行人名称")
private String operatorName;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfPoint.java
View File

@ -51,34 +51,4 @@ public class DfPoint extends SyBaseEntity {
@ApiModelProperty("海拔")
private Long altitude;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecord.java
View File

@ -44,34 +44,4 @@ public class DfRecord extends SyBaseEntity {
@ApiModelProperty("状态")
private Long status;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfRecordItem.java
View File

@ -58,34 +58,4 @@ public class DfRecordItem extends SyBaseEntity {
@ApiModelProperty("存在问题")
private String problem;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

19
shuili-system/src/main/java/com/kms/yxgh/df/domain/entity/DfTrace.java
View File

@ -1,5 +1,6 @@
package com.kms.yxgh.df.domain.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.base.SyBaseEntity;
@ -52,18 +53,20 @@ public class DfTrace extends SyBaseEntity {
private Long altitude;
/**
* 创建人
* 最近修改人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
@TableField(exist = false)
private String updateUid;
/**
* 创建时间
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
@TableField(exist = false)
private Date updateTime;
}

5
shuili-system/src/main/java/com/kms/yxgh/df/service/DfCheckingService.java
View File

@ -3,7 +3,6 @@ package com.kms.yxgh.df.service;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.yxgh.base.DfException;
import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto;
import com.kms.yxgh.df.domain.dto.DfCheckingDetailDto.DfCheckingItemDto;
@ -71,7 +70,6 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class);
if (checking != null) {
if (checkNameDistinct(checking.getId(), checking.getName())) {
BaseEntityUtils.preInsert(checking);
getBaseMapper().insert(checking);
String id = checking.getId();
if (CollectionUtil.isNotEmpty(dto.getItems())) {
@ -80,7 +78,6 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
item.setXcId(id);
item.setContent(o.getContent());
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
BaseEntityUtils.preInsert(item);
dfCheckingItemMapper.insert(item);
});
}
@ -99,7 +96,6 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
DfChecking checking = BeanCopyUtils.copy(dto, DfChecking.class);
if (checking != null) {
if (checkNameDistinct(checking.getId(), checking.getName())) {
BaseEntityUtils.preUpdate(checking);
getBaseMapper().updateById(checking);
String id = checking.getId();
deleteItems(id);
@ -109,7 +105,6 @@ public class DfCheckingService extends BaseService<DfCheckingMapper, DfChecking>
item.setXcId(id);
item.setContent(o.getContent());
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
BaseEntityUtils.preInsert(item);
dfCheckingItemMapper.insert(item);
});
}

5
shuili-system/src/main/java/com/kms/yxgh/df/service/DfPlanService.java
View File

@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.yxgh.base.DfException;
import com.kms.yxgh.df.domain.dto.DfPlanDetailDto;
import com.kms.yxgh.df.domain.dto.DfPlanDetailDto.OperatorDto;
@ -65,7 +64,6 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
if (dfPlan != null) {
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preInsert(dfPlan);
getBaseMapper().insert(dfPlan);
String id = dfPlan.getId();
if (CollectionUtil.isNotEmpty(dto.getOperators())) {
@ -86,7 +84,6 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
item.setPlanId(id);
item.setOperatorName(o.getName());
item.setOperatorUid(o.getUid());
BaseEntityUtils.preInsert(item);
dfPlanOperatorMapper.insert(item);
};
}
@ -98,7 +95,6 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
if (dfPlan != null) {
if (checkNameDistinct(dfPlan.getId(), dfPlan.getName())) {
dfPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preUpdate(dfPlan);
getBaseMapper().updateById(dfPlan);
String id = dfPlan.getId();
deleteItems(id);
@ -135,7 +131,6 @@ public class DfPlanService extends BaseService<DfPlanMapper, DfPlan> {
DfPoint point = BeanCopyUtils.copy(po, DfPoint.class);
if (point != null) {
point.setPlanId(id);
BaseEntityUtils.preInsert(point);
dfPointMapper.insert(point);
}
});

4
shuili-system/src/main/java/com/kms/yxgh/df/service/DfRecordService.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysUserService;
import com.kms.yxgh.base.enums.CheckingStatus;
import com.kms.yxgh.base.enums.RecordStatus;
@ -103,7 +102,6 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
record.setPlanId(startPlan.getPlanId());
record.setName(planDetailDto.getName() + DateUtils.dateTimeNow());
record.setStatus(RecordStatus.CHECKING.getValue());
BaseEntityUtils.preInsert(record);
String id = record.getId();
if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) {
checkingDetailDto.getItems().forEach(o -> {
@ -113,7 +111,6 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
item.setStatus(CheckingStatus.NORMAL.getValue());
item.setRecordId("");
BaseEntityUtils.preInsert(item);
dfRecordItemMapper.insert(item);
});
}
@ -157,7 +154,6 @@ public class DfRecordService extends BaseService<DfRecordMapper, DfRecord> {
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
item.setStatus(o.getStatus());
item.setProblem(o.getProblem());
BaseEntityUtils.preUpdate(item);
dfRecordItemMapper.updateById(item);
});
}

30
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzChecking.java
View File

@ -37,34 +37,4 @@ public class SzChecking extends SyBaseEntity {
@ApiModelProperty("巡查类型")
private Long type;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzCheckingItem.java
View File

@ -44,34 +44,4 @@ public class SzCheckingItem extends SyBaseEntity {
@ApiModelProperty("检查内容")
private String content;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

30
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlan.java
View File

@ -73,34 +73,4 @@ public class SzPlan extends SyBaseEntity {
@ApiModelProperty("附加配置")
private String otherConfig;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

29
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPlanOperator.java
View File

@ -44,34 +44,5 @@ public class SzPlanOperator extends SyBaseEntity {
@ApiModelProperty("执行人名称")
private String operatorName;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

29
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzPoint.java
View File

@ -51,34 +51,5 @@ public class SzPoint extends SyBaseEntity {
@ApiModelProperty("海拔")
private Long altitude;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

29
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecord.java
View File

@ -44,34 +44,5 @@ public class SzRecord extends SyBaseEntity {
@ApiModelProperty("状态")
private Long status;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

32
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzRecordItem.java
View File

@ -1,12 +1,10 @@
package com.kms.yxgh.sz.domain.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.base.SyBaseEntity;
import com.shuili.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.util.Date;
import lombok.Data;
@ -58,34 +56,4 @@ public class SzRecordItem extends SyBaseEntity {
@ApiModelProperty("存在问题")
private String problem;
/**
* 创建人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
/**
* 创建时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
/**
* 最近修改人
*/
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
private String updateUid;
/**
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
private Date updateTime;
}

19
shuili-system/src/main/java/com/kms/yxgh/sz/domain/entity/SzTrace.java
View File

@ -1,5 +1,6 @@
package com.kms.yxgh.sz.domain.entity;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.kms.yxgh.base.SyBaseEntity;
@ -52,18 +53,20 @@ public class SzTrace extends SyBaseEntity {
private Long altitude;
/**
* 创建人
* 最近修改人
*/
@Excel(name = "创建人")
@ApiModelProperty("创建人")
private String createUid;
@Excel(name = "最近修改人")
@ApiModelProperty("最近修改人")
@TableField(exist = false)
private String updateUid;
/**
* 创建时间
* 最近修改时间
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("创建时间")
private Date createTime;
@Excel(name = "最近修改时间", width = 30, dateFormat = "yyyy-MM-dd")
@ApiModelProperty("最近修改时间")
@TableField(exist = false)
private Date updateTime;
}

5
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzCheckingService.java
View File

@ -3,7 +3,6 @@ package com.kms.yxgh.sz.service;
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.yxgh.base.SzException;
import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto.SzCheckingItemDto;
import com.kms.yxgh.sz.domain.dto.SzCheckingDetailDto;
@ -71,7 +70,6 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class);
if (checking != null) {
if (checkNameDistinct(checking.getId(), checking.getName())) {
BaseEntityUtils.preInsert(checking);
getBaseMapper().insert(checking);
String id = checking.getId();
if (CollectionUtil.isNotEmpty(dto.getItems())) {
@ -80,7 +78,6 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
item.setXcId(id);
item.setContent(o.getContent());
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
BaseEntityUtils.preInsert(item);
SzCheckingItemMapper.insert(item);
});
}
@ -99,7 +96,6 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
SzChecking checking = BeanCopyUtils.copy(dto, SzChecking.class);
if (checking != null) {
if (checkNameDistinct(checking.getId(), checking.getName())) {
BaseEntityUtils.preUpdate(checking);
getBaseMapper().updateById(checking);
String id = checking.getId();
deleteItems(id);
@ -109,7 +105,6 @@ public class SzCheckingService extends BaseService<SzCheckingMapper, SzChecking>
item.setXcId(id);
item.setContent(o.getContent());
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
BaseEntityUtils.preInsert(item);
SzCheckingItemMapper.insert(item);
});
}

5
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzPlanService.java
View File

@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.yxgh.base.SzException;
import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto.OperatorDto;
import com.kms.yxgh.sz.domain.dto.SzPlanDetailDto;
@ -65,7 +64,6 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
if (SzPlan != null) {
if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) {
SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preInsert(SzPlan);
getBaseMapper().insert(SzPlan);
String id = SzPlan.getId();
if (CollectionUtil.isNotEmpty(dto.getOperators())) {
@ -86,7 +84,6 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
item.setPlanId(id);
item.setOperatorName(o.getName());
item.setOperatorUid(o.getUid());
BaseEntityUtils.preInsert(item);
SzPlanOperatorMapper.insert(item);
};
}
@ -98,7 +95,6 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
if (SzPlan != null) {
if (checkNameDistinct(SzPlan.getId(), SzPlan.getName())) {
SzPlan.setOtherConfig(JSON.toJSONString(dto.getOtherConfig()));
BaseEntityUtils.preUpdate(SzPlan);
getBaseMapper().updateById(SzPlan);
String id = SzPlan.getId();
deleteItems(id);
@ -135,7 +131,6 @@ public class SzPlanService extends BaseService<SzPlanMapper, SzPlan> {
SzPoint point = BeanCopyUtils.copy(po, SzPoint.class);
if (point != null) {
point.setPlanId(id);
BaseEntityUtils.preInsert(point);
SzPointMapper.insert(point);
}
});

4
shuili-system/src/main/java/com/kms/yxgh/sz/service/SzRecordService.java
View File

@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kms.common.utils.BaseEntityUtils;
import com.kms.system.service.SysUserService;
import com.kms.yxgh.base.enums.CheckingStatus;
import com.kms.yxgh.base.enums.RecordStatus;
@ -104,7 +103,6 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
record.setPlanId(startPlan.getPlanId());
record.setName(planDetailDto.getName() + DateUtils.dateTimeNow());
record.setStatus(RecordStatus.CHECKING.getValue());
BaseEntityUtils.preInsert(record);
String id = record.getId();
if (CollectionUtil.isNotEmpty(checkingDetailDto.getItems())) {
checkingDetailDto.getItems().forEach(o -> {
@ -114,7 +112,6 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
item.setStatus(CheckingStatus.NORMAL.getValue());
item.setRecordId("");
BaseEntityUtils.preInsert(item);
szRecordItemMapper.insert(item);
});
}
@ -158,7 +155,6 @@ public class SzRecordService extends BaseService<SzRecordMapper, SzRecord> {
item.setParts(String.join(PART_SEPARATOR, o.getParts()));
item.setStatus(o.getStatus());
item.setProblem(o.getProblem());
BaseEntityUtils.preUpdate(item);
szRecordItemMapper.updateById(item);
});
}

Write Preview
Loading…
Cancel
Save