From 11000bf4837f245824d88fc786e0ec8991f46b9e Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 17 四月 2025 18:25:09 +0800
Subject: [PATCH] 增加日志表基础代码
---
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java | 61 +++++++
aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java | 4
aps-modules/aps-job/src/main/java/com/aps/job/param/ApsWorkOrderJobParam.java | 25 +++
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobLogServiceImpl.java | 93 +++++++++++
aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java | 5
aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java | 63 ++++---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJobLog.java | 127 +++++++++++++++
aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobLogMapper.java | 63 +++++++
8 files changed, 407 insertions(+), 34 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java b/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
index 3cb9d12..791a662 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/controller/ApsWorkOrderJobController.java
+++ b/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();
}
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJobLog.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJobLog.java
new file mode 100644
index 0000000..ceb892b
--- /dev/null
+++ b/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();
+ }
+}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobLogMapper.java b/aps-modules/aps-job/src/main/java/com/aps/job/mapper/ApsWorkOrderJobLogMapper.java
new file mode 100644
index 0000000..8faea87
--- /dev/null
+++ b/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);
+}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/param/ApsWorkOrderJobParam.java b/aps-modules/aps-job/src/main/java/com/aps/job/param/ApsWorkOrderJobParam.java
new file mode 100644
index 0000000..28799c0
--- /dev/null
+++ b/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;
+
+}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobLogService.java
new file mode 100644
index 0000000..d44ebb5
--- /dev/null
+++ b/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);
+}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
index f6efc6e..ad5c62a 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/IApsWorkOrderJobService.java
+++ b/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);
}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobLogServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobLogServiceImpl.java
new file mode 100644
index 0000000..d5d477f
--- /dev/null
+++ b/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);
+ }
+}
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java b/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
index 703500c..6ff0aa6 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/service/impl/ApsWorkOrderJobServiceImpl.java
+++ b/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);
}
}
- /* }*/
+
+ }
+
}
}
--
Gitblit v1.9.3