zhanghl
2025-04-18 995cae8b52bf0836fa2b0d029404a7ad2ddc8bc0
work——order 同步接口更新
已修改4个文件
113 ■■■■■ 文件已修改
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java 104 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobMapper.java
@@ -63,4 +63,5 @@
    int batchInsertApsWorkOrderJob(List<ApsWorkOrderJob> jobs);
    int deleteWorkOrderJobByOrderIds(List<String> orderIds);
}
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -121,65 +121,71 @@
    }
    @Transactional
    @Override
    public void batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param) {
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
        /*根据参数中当前页面 和 要目标页面 进行循环*/
        for (int idx=param.getPageIndex(); idx<=param.getToPageIndex(); idx++){
            /*设置当前页面*/
            param.setPageIndex(idx);
            ApsWorkOrderJobLog log = new ApsWorkOrderJobLog();
            String requestString = JSONObject.toJSONString(param);
            HttpEntity<String> request = new HttpEntity<>(requestString, headers);
            ResponseEntity<String> response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
            log.setRequestData(requestString);
            log.setPageNum(Long.valueOf(param.getPageIndex()));
            log.setPageCount(Long.valueOf(param.getPageSize()));
            log.setCreateTime(DateUtils.getNowDate());
            log.setBizType("work_order");
            jobLogMapper.insertApsWorkOrderJobLog(log);
            if (response.getStatusCode().is2xxSuccessful()) {
                JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
                if ("200".equals(responseBodyJson.getString("status"))) {
                    JSONArray result = responseBodyJson.getJSONArray("data");
                    if (result != null&& !result.isEmpty()) {
                       int ct= batchSave(param, result);
                       if(ct>0){
                           log.setResult("ok save "+ct);
                           jobLogMapper.updateApsWorkOrderJobLog(log);
                           return;
                       }else{
                           log.setResult("ok save 0");
                           jobLogMapper.updateApsWorkOrderJobLog(log);
                           return;
                       }
                    }else {
                        log.setResult("ok receive 0");
                        jobLogMapper.updateApsWorkOrderJobLog(log);
                        return;
                    }
                } else {
                    log.setResponseData(response.getBody());
                    log.setResult("fail");
                    jobLogMapper.updateApsWorkOrderJobLog(log);
                    return;
                }
            } else {
                log.setResponseData(response.getBody());
                log.setResult("fail");
                jobLogMapper.updateApsWorkOrderJobLog(log);
            if (!batchSaveByPager(param)) {
                return;
            }
        }
    }
    @Transactional
    public int batchSave(ApsWorkOrderJobParam param, JSONArray result) {
    public boolean batchSaveByPager(ApsWorkOrderJobParam param) {
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
        /*设置当前页面*/
        ApsWorkOrderJobLog log = new ApsWorkOrderJobLog();
        String requestString = JSONObject.toJSONString(param);
        HttpEntity<String> request = new HttpEntity<>(requestString, headers);
        ResponseEntity<String> response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
        log.setRequestData(requestString);
        log.setPageNum(Long.valueOf(param.getPageIndex()));
        log.setPageCount(Long.valueOf(param.getPageSize()));
        log.setCreateTime(DateUtils.getNowDate());
        log.setBizType("work_order");
        jobLogMapper.insertApsWorkOrderJobLog(log);
        if (response.getStatusCode().is2xxSuccessful()) {
            JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
            if ("200".equals(responseBodyJson.getString("status"))) {
                JSONArray result = responseBodyJson.getJSONArray("data");
                if (result != null&& !result.isEmpty()) {
                   int ct= batchInsertApsWorkOrderJob(param, result);
                   if(ct>0){
                       log.setResult("ok save "+ct);
                       jobLogMapper.updateApsWorkOrderJobLog(log);
                   }else{
                       log.setResult("ok save 0");
                       jobLogMapper.updateApsWorkOrderJobLog(log);
                       return true;
                   }
                }else {
                    log.setResult("ok receive 0");
                    jobLogMapper.updateApsWorkOrderJobLog(log);
                    return true;
                }
            } else {
                log.setResponseData(response.getBody());
                log.setResult("fail");
                jobLogMapper.updateApsWorkOrderJobLog(log);
                return true;
            }
            return true;
        } else {
            log.setResponseData(response.getBody());
            log.setResult("fail");
            jobLogMapper.updateApsWorkOrderJobLog(log);
            return true;
        }
    }
    @Transactional
    public int batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param, JSONArray result) {
        List<ApsWorkOrderJob> jobs = new ArrayList<>();
        List<String> orderIds = new ArrayList<>();
        for (int i = 0; i < result.size(); i++) {
            ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
            JSONObject jsonObject = result.getJSONObject(i);
@@ -190,8 +196,10 @@
            order.setDelFlag("0");
            order.setProcessStatus("0");
            jobs.add(order);
            orderIds.add(order.getOrderId());
        }
      return   apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
        apsWorkOrderJobMapper.deleteWorkOrderJobByOrderIds(orderIds);
        return   apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
    }
}
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobLogMapper.xml
@@ -92,4 +92,5 @@
            #{id}
        </foreach>
    </delete>
</mapper>
aps-modules/aps-job/src/main/resources/mapper/job/ApsWorkOrderJobMapper.xml
@@ -275,5 +275,10 @@
            )
        </foreach>
    </insert>
    <delete id="deleteWorkOrderJobByOrderIds" parameterType="String">
        delete from aps_work_order_job where order_id in
        <foreach item="id" collection="orderIds" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>
</mapper>