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 9de4ff074..860ddb2f0 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 @@ -75,6 +75,7 @@ public class PmsTemUserServiceImpl extends ServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(PmsTemProcessTrackPO::getTempUserDossierName,updatePmsTemUserParam.getConsName()).eq(PmsTemProcessTrackPO::getTempUserDossierId,result.getObjId()); + pmsTemProcessTrackMapper.update(null,updateWrapper); + } + return this.updateById(pmsTemUserPO); } 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 312147c6a..728159769 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 @@ -1,5 +1,6 @@ package com.njcn.process.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; @@ -42,16 +43,28 @@ public class SupvPlanRel { private String relObjName; - @JsonSerialize(using = TimestampAsLongSerializer.class) - private Timestamp createTime; + private Timestamp createTimes; - @JsonSerialize(using = TimestampAsLongSerializer.class) - private Timestamp updateTime; + @TableField(exist = false) + private Long createTime; + + private Timestamp updateTimes; + @TableField(exist = false) + private Long updateTime; private String isDelete; - @JsonSerialize(using = TimestampAsLongSerializer.class) - private Timestamp deleteTime; + private Timestamp deleteTimes; + @TableField(exist = false) + private Long deleteTime; + + + + public void prepareForSerialization() { + this.createTime = (this.createTimes != null) ? this.createTimes.getTime() : null; + this.updateTime = (this.updateTimes != null) ? this.updateTimes.getTime() : null; + this.deleteTime = (this.deleteTimes != null) ? this.deleteTimes.getTime() : null; + } } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java index 0ec776de5..3c539d442 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java @@ -189,20 +189,9 @@ public class SupvPushGwServiceImpl implements SupvPushGwService { //电容器组需要上送对象 List supvPlanRelList = supvPlanRelMapper.selectList(new LambdaQueryWrapper().eq(SupvPlanRel::getPlanId,supvPlan.getPlanId())); if(CollUtil.isNotEmpty(supvPlanRelList)){ - System.out.println("njcnnjcnnjcn"); - ObjectMapper objectMapper = new ObjectMapper(); - supvPlanRelList.forEach(item -> { - String jsonString = null; - try { - jsonString = objectMapper.writeValueAsString(item); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - System.out.println(jsonString); - }); + supvPlanRelList.forEach(SupvPlanRel::prepareForSerialization); + supvPlan.setPlanRel(supvPlanRelList); } - supvPlan.setPlanRel(supvPlanRelList); - } //监督类型编码 @@ -272,6 +261,7 @@ public class SupvPushGwServiceImpl implements SupvPushGwService { SendParam param = new SendParam(); param.setStats(planVOS); param.setProvinceId(code); + String s = JSONObject.toJSONStringWithDateFormat(param, JSON.DEFFAULT_DATE_FORMAT); log.info(Thread.currentThread().getName() + "获取返回体 接收电能质量技术监督工作计划数据接口数据:" + s + "结束----!"); Map send = send(param, getUrl(1), "pqPlanCreate");