diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java index d05d5979f..635c0bd43 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java @@ -1,11 +1,14 @@ package com.njcn.harmonic.pojo.po.upload; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; +import java.sql.Timestamp; import java.time.LocalDateTime; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; +import com.njcn.harmonic.utils.TimestampAsLongSerializer; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -22,7 +25,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName(value = "pms_tem_process_approval") -public class PmsTemProcessApproval extends BaseEntity { +public class PmsTemProcessApproval { /** * 主键 */ @@ -79,7 +82,8 @@ public class PmsTemProcessApproval extends BaseEntity { */ @TableField(value = "rectification_time",updateStrategy = FieldStrategy.IGNORED) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime rectificationTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp rectificationTime; /** * 整改人 @@ -101,4 +105,20 @@ public class PmsTemProcessApproval extends BaseEntity { private Integer uploadStatus; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp updateTime; + } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java index 5d78e07b6..051f66771 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessTrackPO.java @@ -1,11 +1,15 @@ package com.njcn.harmonic.pojo.po.upload; +import com.alibaba.fastjson.annotation.JSONField; import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; import com.njcn.db.bo.BaseEntity; +import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalDateTime; + +import com.njcn.harmonic.utils.TimestampAsLongSerializer; import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ import lombok.Setter; @Getter @Setter @TableName("pms_tem_process_track") -public class PmsTemProcessTrackPO extends BaseEntity { +public class PmsTemProcessTrackPO{ private static final long serialVersionUID = 1L; @@ -71,7 +75,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime auditTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp auditTime; /** * 竣工验收-验收状态 @@ -98,7 +103,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime approvalTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp approvalTime; /** * 营销用户编号 @@ -152,7 +158,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime auditFinalTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp auditFinalTime; /** * 审查出具单位名称 @@ -179,7 +186,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime approvalFinalTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp approvalFinalTime; /** * 遗留问题 @@ -201,7 +209,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime relConsTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp relConsTime; /** * 操作人名称 @@ -228,7 +237,8 @@ public class PmsTemProcessTrackPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime monitorDate; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp monitorDate; /** * 用户id @@ -238,4 +248,21 @@ public class PmsTemProcessTrackPO extends BaseEntity { private Integer uploadStatus; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp updateTime; + + } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java index d6a8b89bd..b3c323c77 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java @@ -1,14 +1,20 @@ package com.njcn.harmonic.pojo.po.upload; -import com.baomidou.mybatisplus.annotation.FieldStrategy; -import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; +import com.alibaba.fastjson.annotation.JSONField; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.deser.std.DateDeserializers; +import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer; +import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer; import com.njcn.db.bo.BaseEntity; +import java.sql.Timestamp; import java.time.LocalDate; import java.time.LocalDateTime; + +import com.njcn.harmonic.utils.TimestampAsLongSerializer; import lombok.Getter; import lombok.Setter; @@ -23,7 +29,7 @@ import lombok.Setter; @Getter @Setter @TableName("pms_tem_user") -public class PmsTemUserPO extends BaseEntity { +public class PmsTemUserPO { private static final long serialVersionUID = 1L; @@ -128,7 +134,10 @@ public class PmsTemUserPO extends BaseEntity { /** * 删除时间 */ - private LocalDateTime deleteTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @TableField(updateStrategy = FieldStrategy.IGNORED) + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp deleteTime; /** * 发布人 @@ -152,7 +161,8 @@ public class PmsTemUserPO extends BaseEntity { */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @TableField(updateStrategy = FieldStrategy.IGNORED) - private LocalDateTime releaseTime; + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp releaseTime; /** * 营销用户编号 @@ -167,4 +177,21 @@ public class PmsTemUserPO extends BaseEntity { private Integer uploadStatus; + /** + * 创建时间 + */ + @TableField(fill = FieldFill.INSERT) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp createTime; + + /** + * 更新时间 + */ + @TableField(fill = FieldFill.INSERT_UPDATE) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JSONField(serializeUsing = TimestampAsLongSerializer.class) + private Timestamp updateTime; + + } diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/TimestampAsLongSerializer.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/TimestampAsLongSerializer.java new file mode 100644 index 000000000..bdd57fef9 --- /dev/null +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/TimestampAsLongSerializer.java @@ -0,0 +1,25 @@ +package com.njcn.harmonic.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 diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java index 5aff54244..4c2ea9e68 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemProcessApprovalServiceImpl.java @@ -1,6 +1,7 @@ package com.njcn.harmonic.service.upload.impl; import cn.hutool.core.collection.CollUtil; +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; @@ -20,6 +21,9 @@ import org.apache.commons.lang.StringUtils; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; + +import java.sql.Timestamp; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -49,7 +53,12 @@ public class PmsTemProcessApprovalServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(PmsTemProcessTrackPO::getAllOvCountDay,updatePmsTemProcessTrackParam.getAllOvCountDay()); + pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime())); return this.updateById(pmsTemProcessTrackPO); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java index 860ddb2f0..49a543979 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/PmsTemUserServiceImpl.java @@ -37,7 +37,10 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.sql.Timestamp; +import java.time.LocalDateTime; import java.util.Collections; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -71,6 +74,8 @@ public class PmsTemUserServiceImpl extends ServiceImpl { - - protected TimestampAsLongSerializer(Class t) { - super(t); - } - public TimestampAsLongSerializer() { - this(null); - } - +public class TimestampAsLongSerializer implements ObjectSerializer { @Override - public void serialize(Timestamp value, JsonGenerator gen, SerializerProvider serializers) throws IOException { - if (value != null) { - gen.writeNumber(value.getTime()); + 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 { - gen.writeNull(); + serializer.write(object); } } } \ No newline at end of file diff --git a/pqs-process/process-boot/Dockerfile b/pqs-process/process-boot/Dockerfile index c542f6c44..780a84b12 100644 --- a/pqs-process/process-boot/Dockerfile +++ b/pqs-process/process-boot/Dockerfile @@ -1,5 +1,5 @@ FROM openjdk:8-jdk-alpine ADD target/processboot.jar processboot.jar -ENTRYPOINT ["java","-jar","/processboot.jar"] +ENTRYPOINT ["/bin/sh", "-c" , "echo 25.36.214.50 dwzyywzt-pms3-proxy.com >> /etc/hosts && echo 25.36.227.20 pms.pms30.com.cn >> /etc/hosts && echo 25.36.181.69 8d051549520e423ab8dccf8b3d457c74.apigw.he-region-2.sgic.sgcc.com.cn >> /etc/hosts && exec java -jar processboot.jar" ] EXPOSE 10222 RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \&& echo 'Asia/Shanghai' >/etc/timezone diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java index 310e8a3bd..675dfb30c 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java @@ -21,4 +21,6 @@ public interface SupvFileMapper extends BaseMapper { List selectPlanFile(@Param("param") SupvFileParam param); List selecProblemtFile(@Param("param") SupvFileParam param); + + List selectSimpleFile(@Param("param") SupvFileParam param); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml index e3504fdc8..9497515e6 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml @@ -47,4 +47,25 @@ + + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java index c6fab0f7e..c65467b95 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java @@ -91,8 +91,12 @@ public class SupvFileServiceImpl extends ServiceImpl i public List listFile(SupvFileParam param) { if (param.getType()==0){ return this.baseMapper.selectPlanFile(param); + }else if(param.getType()==1){ + return this.baseMapper.selecProblemtFile(param); + }else { + return this.baseMapper.selectSimpleFile(param); } - return this.baseMapper.selecProblemtFile(param); + } @Override