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

1.监督计划功能调整

Browse Source 
2.全过程功能调整
This commit is contained in:
chendaofei
2024-10-31 13:21:00 +08:00
parent fad0e10203
commit 35d05dd3ac
12 changed files with 177 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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;
}

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

@@ -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;
}

25
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/utils/TimestampAsLongSerializer.java Normal file
View File

@@ -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);
}
}
}

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

@@ -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<PmsTemProcessA
PmsTemProcessApproval pmsTemProcessApproval = new PmsTemProcessApproval();
BeanUtils.copyProperties(param,pmsTemProcessApproval);
pmsTemProcessApproval.setUploadStatus(DataStateEnum.DELETED.getCode());
if(StrUtil.isBlank(pmsTemProcessApproval.getObjId())){
pmsTemProcessApproval.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
}else {
pmsTemProcessApproval.setUpdateTime(new Timestamp(new Date().getTime()));
}
boolean b = this.saveOrUpdate(pmsTemProcessApproval);
return b;
}

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

@@ -25,6 +25,8 @@ import com.njcn.web.utils.GwSendUtil;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.sql.Timestamp;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -55,6 +57,8 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
pmsTemProcessTrackPO.setObjId(IdUtil.simpleUUID());
PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(param.getTempUserDossierId());
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
pmsTemProcessTrackPO.setUploadStatus(DataStateEnum.DELETED.getCode());
return this.save(pmsTemProcessTrackPO);
}
@@ -66,9 +70,7 @@ public class PmsTemProcessTrackServiceImpl extends ServiceImpl<PmsTemProcessTrac
BeanUtil.copyProperties(updatePmsTemProcessTrackParam, pmsTemProcessTrackPO);
PmsTemUserPO pmsTemUserPO = iPmsTemUserService.getById(updatePmsTemProcessTrackParam.getTempUserDossierId());
pmsTemProcessTrackPO.setTempUserDossierName(pmsTemUserPO.getConsName());
LambdaUpdateWrapper<PmsTemProcessTrackPO> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(PmsTemProcessTrackPO::getAllOvCountDay,updatePmsTemProcessTrackParam.getAllOvCountDay());
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.updateById(pmsTemProcessTrackPO);
}

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

@@ -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<PmsTemUserMapper, PmsTemU
BeanUtil.copyProperties(param, pmsTemUserPO);
assOrg(pmsTemUserPO);
pmsTemUserPO.setUploadStatus(DataStateEnum.DELETED.getCode());
pmsTemUserPO.setCreateTime(new Timestamp(new Date().getTime()));
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.save(pmsTemUserPO);
}
@@ -90,7 +95,7 @@ public class PmsTemUserServiceImpl extends ServiceImpl<PmsTemUserMapper, PmsTemU
updateWrapper.set(PmsTemProcessTrackPO::getTempUserDossierName,updatePmsTemUserParam.getConsName()).eq(PmsTemProcessTrackPO::getTempUserDossierId,result.getObjId());
pmsTemProcessTrackMapper.update(null,updateWrapper);
}
pmsTemUserPO.setUpdateTime(new Timestamp(new Date().getTime()));
return this.updateById(pmsTemUserPO);
}

28
pqs-process/process-api/src/main/java/com/njcn/process/utils/TimestampAsLongSerializer.java
View File

@@ -1,30 +1,26 @@
package com.njcn.process.utils;
import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.databind.SerializerProvider;
import com.fasterxml.jackson.databind.ser.std.StdSerializer;
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 extends StdSerializer<Timestamp> {
protected TimestampAsLongSerializer(Class<Timestamp> 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);
}
}
}

2
pqs-process/process-boot/Dockerfile
View File

@@ -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

2
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/SupvFileMapper.java
View File

@@ -21,4 +21,6 @@ public interface SupvFileMapper extends BaseMapper<SupvFile> {
List<SupvFile> selectPlanFile(@Param("param") SupvFileParam param);
List<SupvFile> selecProblemtFile(@Param("param") SupvFileParam param);
List<SupvFile> selectSimpleFile(@Param("param") SupvFileParam param);
}

21
pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/SupvFileMapper.xml
View File

@@ -47,4 +47,25 @@
</if>
</where>
</select>
<select id="selectSimpleFile" resultType="com.njcn.process.pojo.po.SupvFile">
select
sf.*
from
supv_file sf
<where>
<if test="param!=null and param.ids != null and param.ids.size > 0">
AND busi_Id IN
<foreach collection='param.ids' item='item' index="index" open='(' separator=',' close=')'>
#{item}
</foreach>
</if>
<if test="param!=null and param.type != null ">
AND sf.type = #{param.type}
</if>
<if test="param!=null and param.attachmentType != null and param.attachmentType != ''">
AND sf.attachment_Type = #{param.attachmentType}
</if>
</where>
</select>
</mapper>

6
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvFileServiceImpl.java
View File

@@ -91,8 +91,12 @@ public class SupvFileServiceImpl extends ServiceImpl<SupvFileMapper, SupvFile> i
public List<SupvFile> 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