zhanghl
2025-04-17 11000bf4837f245824d88fc786e0ec8991f46b9e
增加日志表基础代码
已修改3个文件
已添加5个文件
441 ■■■■■ 文件已修改
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJobLog.java 127 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobLogMapper.java 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/param/ApsWorkOrderJobParam.java 25 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java 61 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobLogServiceImpl.java 93 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
@@ -3,6 +3,7 @@
import java.util.List;
import java.io.IOException;
import com.aps.job.param.ApsWorkOrderJobParam;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -106,9 +107,9 @@
    @PostMapping("/batchInsertApsWorkOrderJob")
    public AjaxResult batchInsertApsWorkOrderJob()
    public AjaxResult batchInsertApsWorkOrderJob(@RequestBody ApsWorkOrderJobParam param)
    {
        apsWorkOrderJobService.batchInsertApsWorkOrderJob();
        apsWorkOrderJobService.batchInsertApsWorkOrderJob(param);
        return success();
    }
}
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJobLog.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
package com.aps.job.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
/**
 * å·¥å•同步日志对象 aps_work_order_job_log
 *
 * @author zhl
 * @date 2025-04-17
 */
public class ApsWorkOrderJobLog extends BaseEntity
{
    private static final long serialVersionUID = 1L;
    /** ä¸»é”® */
    private Long id;
    /** é¡µæ•° */
    @Excel(name = "页数")
    private Long pageNum;
    /** æ•°æ®æ¡æ•° */
    @Excel(name = "数据条数")
    private Long pageCount;
    /** json格式数据 */
    @Excel(name = "json格式数据")
    private String responseData;
    /** ä¿å­˜ç»“æžœ */
    @Excel(name = "保存结果")
    private String result;
    /** åŒæ­¥ä¸»é”® */
    @Excel(name = "同步主键")
    private String orderId;
    /** è¯·æ±‚数据 */
    @Excel(name = "请求数据")
    private String requestData;
    public void setId(Long id)
    {
        this.id = id;
    }
    public Long getId()
    {
        return id;
    }
    public void setPageNum(Long pageNum)
    {
        this.pageNum = pageNum;
    }
    public Long getPageNum()
    {
        return pageNum;
    }
    public void setPageCount(Long pageCount)
    {
        this.pageCount = pageCount;
    }
    public Long getPageCount()
    {
        return pageCount;
    }
    public void setResponseData(String responseData)
    {
        this.responseData = responseData;
    }
    public String getResponseData()
    {
        return responseData;
    }
    public void setResult(String result)
    {
        this.result = result;
    }
    public String getResult()
    {
        return result;
    }
    public void setOrderId(String orderId)
    {
        this.orderId = orderId;
    }
    public String getOrderId()
    {
        return orderId;
    }
    public void setRequestData(String requestData)
    {
        this.requestData = requestData;
    }
    public String getRequestData()
    {
        return requestData;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("id", getId())
            .append("pageNum", getPageNum())
            .append("pageCount", getPageCount())
            .append("responseData", getResponseData())
            .append("result", getResult())
            .append("orderId", getOrderId())
            .append("requestData", getRequestData())
            .toString();
    }
}
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobLogMapper.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
package com.aps.job.mapper;
import java.util.List;
import com.aps.job.domain.ApsWorkOrderJobLog;
import org.apache.ibatis.annotations.Mapper;
/**
 * å·¥å•同步日志Mapper接口
 *
 * @author zhl
 * @date 2025-04-17
 */
@Mapper
public interface ApsWorkOrderJobLogMapper
{
    /**
     * æŸ¥è¯¢å·¥å•同步日志
     *
     * @param id å·¥å•同步日志主键
     * @return å·¥å•同步日志
     */
    public ApsWorkOrderJobLog selectApsWorkOrderJobLogById(Long id);
    /**
     * æŸ¥è¯¢å·¥å•同步日志列表
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return å·¥å•同步日志集合
     */
    public List<ApsWorkOrderJobLog> selectApsWorkOrderJobLogList(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * æ–°å¢žå·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    public int insertApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * ä¿®æ”¹å·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    public int updateApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * åˆ é™¤å·¥å•同步日志
     *
     * @param id å·¥å•同步日志主键
     * @return ç»“æžœ
     */
    public int deleteApsWorkOrderJobLogById(Long id);
    /**
     * æ‰¹é‡åˆ é™¤å·¥å•同步日志
     *
     * @param ids éœ€è¦åˆ é™¤çš„æ•°æ®ä¸»é”®é›†åˆ
     * @return ç»“æžœ
     */
    public int deleteApsWorkOrderJobLogByIds(Long[] ids);
}
aps-modules/aps-job/src/main/java/com/aps/job/param/ApsWorkOrderJobParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.aps.job.param;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
import java.util.List;
@Data
public class ApsWorkOrderJobParam {
    @JsonProperty("PageIndex")
    private String pageIndex;
    @JsonProperty("PageSize")
    private String pageSize;
    @JsonProperty("DocList")
    private List<String> docList;
    @JsonProperty("ItemType")
    private List<String> itemType;
    @JsonProperty("OrgCode")
    private String orgCode;
    @JsonProperty("BeginDate")
    private String beginDate;
    @JsonProperty("EndDate")
    private String endDate;
}
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,61 @@
package com.aps.job.service;
import java.util.List;
import com.aps.job.domain.ApsWorkOrderJobLog;
/**
 * å·¥å•同步日志Service接口
 *
 * @author zhl
 * @date 2025-04-17
 */
public interface IApsWorkOrderJobLogService
{
    /**
     * æŸ¥è¯¢å·¥å•同步日志
     *
     * @param id å·¥å•同步日志主键
     * @return å·¥å•同步日志
     */
    public ApsWorkOrderJobLog selectApsWorkOrderJobLogById(Long id);
    /**
     * æŸ¥è¯¢å·¥å•同步日志列表
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return å·¥å•同步日志集合
     */
    public List<ApsWorkOrderJobLog> selectApsWorkOrderJobLogList(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * æ–°å¢žå·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    public int insertApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * ä¿®æ”¹å·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    public int updateApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog);
    /**
     * æ‰¹é‡åˆ é™¤å·¥å•同步日志
     *
     * @param ids éœ€è¦åˆ é™¤çš„工单同步日志主键集合
     * @return ç»“æžœ
     */
    public int deleteApsWorkOrderJobLogByIds(Long[] ids);
    /**
     * åˆ é™¤å·¥å•同步日志信息
     *
     * @param id å·¥å•同步日志主键
     * @return ç»“æžœ
     */
    public int deleteApsWorkOrderJobLogById(Long id);
}
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
@@ -2,6 +2,7 @@
import java.util.List;
import com.aps.job.domain.ApsWorkOrderJob;
import com.aps.job.param.ApsWorkOrderJobParam;
/**
 * å·¥å•同步Service接口
@@ -59,5 +60,6 @@
     */
    public int deleteApsWorkOrderJobById(Long id);
    void batchInsertApsWorkOrderJob();
    void batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param);
}
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobLogServiceImpl.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.aps.job.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.domain.ApsWorkOrderJobLog;
import com.aps.job.service.IApsWorkOrderJobLogService;
/**
 * å·¥å•同步日志Service业务层处理
 *
 * @author zhl
 * @date 2025-04-17
 */
@Service
public class ApsWorkOrderJobLogServiceImpl implements IApsWorkOrderJobLogService
{
    @Autowired
    private ApsWorkOrderJobLogMapper apsWorkOrderJobLogMapper;
    /**
     * æŸ¥è¯¢å·¥å•同步日志
     *
     * @param id å·¥å•同步日志主键
     * @return å·¥å•同步日志
     */
    @Override
    public ApsWorkOrderJobLog selectApsWorkOrderJobLogById(Long id)
    {
        return apsWorkOrderJobLogMapper.selectApsWorkOrderJobLogById(id);
    }
    /**
     * æŸ¥è¯¢å·¥å•同步日志列表
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return å·¥å•同步日志
     */
    @Override
    public List<ApsWorkOrderJobLog> selectApsWorkOrderJobLogList(ApsWorkOrderJobLog apsWorkOrderJobLog)
    {
        return apsWorkOrderJobLogMapper.selectApsWorkOrderJobLogList(apsWorkOrderJobLog);
    }
    /**
     * æ–°å¢žå·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    @Override
    public int insertApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog)
    {
        return apsWorkOrderJobLogMapper.insertApsWorkOrderJobLog(apsWorkOrderJobLog);
    }
    /**
     * ä¿®æ”¹å·¥å•同步日志
     *
     * @param apsWorkOrderJobLog å·¥å•同步日志
     * @return ç»“æžœ
     */
    @Override
    public int updateApsWorkOrderJobLog(ApsWorkOrderJobLog apsWorkOrderJobLog)
    {
        return apsWorkOrderJobLogMapper.updateApsWorkOrderJobLog(apsWorkOrderJobLog);
    }
    /**
     * æ‰¹é‡åˆ é™¤å·¥å•同步日志
     *
     * @param ids éœ€è¦åˆ é™¤çš„工单同步日志主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWorkOrderJobLogByIds(Long[] ids)
    {
        return apsWorkOrderJobLogMapper.deleteApsWorkOrderJobLogByIds(ids);
    }
    /**
     * åˆ é™¤å·¥å•同步日志信息
     *
     * @param id å·¥å•同步日志主键
     * @return ç»“æžœ
     */
    @Override
    public int deleteApsWorkOrderJobLogById(Long id)
    {
        return apsWorkOrderJobLogMapper.deleteApsWorkOrderJobLogById(id);
    }
}
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
@@ -6,8 +6,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.StringUtils;
import jakarta.annotation.Resource;
import com.aps.job.mapper.ApsWorkOrderJobLogMapper;
import com.aps.job.param.ApsWorkOrderJobParam;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpEntity;
@@ -41,6 +41,8 @@
    @Autowired
    private RestTemplate restTemplate;
    @Autowired
    private ApsWorkOrderJobLogMapper jobLogMapper;
    /**
     * æŸ¥è¯¢å·¥å•同步
@@ -118,41 +120,40 @@
    @Override
    public void batchInsertApsWorkOrderJob() {
    public void batchInsertApsWorkOrderJob(ApsWorkOrderJobParam param) {
        HttpHeaders headers = new HttpHeaders();
        headers.setContentType(MediaType.APPLICATION_JSON);
        Integer PageIndex=1;
        Integer PageSize=500;
        Boolean continueFlag=true;
      /*  while (continueFlag){*/
            JSONObject requestBody = new JSONObject();
            requestBody.put("PageIndex", PageIndex);
            requestBody.put("PageSize", PageSize);
            HttpEntity<String> request = new HttpEntity<>(requestBody.toJSONString(), headers);
            ResponseEntity<String> response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
            if (response.getStatusCode().is2xxSuccessful()) {
                JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
                if("200".equals(responseBodyJson.getString("status"))){
                    JSONArray result = responseBodyJson.getJSONArray("data");
                    if (result!=null){
                        List<ApsWorkOrderJob> jobs = new ArrayList<>();
                        for (int i = 0; i < result.size(); i++) {
                            ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
                            JSONObject jsonObject = result.getJSONObject(i);
                            order.setOrderId(jsonObject.get("ID").toString());
                            order.setCreateTime(DateUtils.getNowDate());
                            order.setPageIndex(i);
                            order.setPageNum(PageIndex);
                            order.setDelFlag("0");
                            jobs.add(order);
                        }
                        apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
        Integer PageIndex = 1;
        Integer PageSize = 500;
        Boolean continueFlag = true;
        /*  while (continueFlag){*/
        String requestString = JSONObject.toJSONString(param);
        HttpEntity<String> request = new HttpEntity<>(requestString, headers);
        ResponseEntity<String> response = restTemplate.postForEntity(getWorkOrderUrl, request, String.class);
        if (response.getStatusCode().is2xxSuccessful()) {
            JSONObject responseBodyJson = JSONObject.parseObject(response.getBody());
            if ("200".equals(responseBodyJson.getString("status"))) {
                JSONArray result = responseBodyJson.getJSONArray("data");
                if (result != null) {
                    List<ApsWorkOrderJob> jobs = new ArrayList<>();
                    for (int i = 0; i < result.size(); i++) {
                        ApsWorkOrderJob order = result.getObject(i, ApsWorkOrderJob.class);
                        JSONObject jsonObject = result.getJSONObject(i);
                        order.setOrderId(jsonObject.get("ID").toString());
                        order.setCreateTime(DateUtils.getNowDate());
                        order.setPageIndex(i);
                        order.setPageNum(PageIndex);
                        order.setDelFlag("0");
                        order.setProcessStatus("0");
                        jobs.add(order);
                    }
                    apsWorkOrderJobMapper.batchInsertApsWorkOrderJob(jobs);
                }
            }
       /* }*/
        }
    }
}