1.监督计划功能调整

pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPushGwServiceImpl.java

@@ -189,20 +189,9 @@ public class SupvPushGwServiceImpl implements SupvPushGwService {
                 //电容器组需要上送对象
                 List<SupvPlanRel> supvPlanRelList = supvPlanRelMapper.selectList(new LambdaQueryWrapper<SupvPlanRel>().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<String, String> send = send(param, getUrl(1), "pqPlanCreate");