diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiController.java b/measurement/src/main/java/com/ruoyi/webApi/ApiController.java index 73d2170..ddc50fa 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiController.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiController.java @@ -25,6 +25,7 @@ import java.io.IOException; /** * @author 16358 * @date 2025/6/3 + * 对外提供接口 */ @RequestMapping("/openApi") @RestController diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java index cf42945..6efdd91 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiPostBack.java @@ -5,9 +5,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.ruoyi.bill.domain.PoundBill; import com.ruoyi.bill.service.IPoundBillService; import com.ruoyi.system.service.ISysConfigService; -import com.ruoyi.webApi.billHandlerUtil.BillHandler; -import com.ruoyi.webApi.billHandlerUtil.BillHandlers; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandlers; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandler; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandlers; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -37,12 +40,13 @@ public class ApiPostBack { private static final ObjectMapper objectMapper = new ObjectMapper(); + //单据保存（更新） public String makePoundBillFormData(String id) throws IOException { PoundBill poundBill = poundBillService.selectPoundBillById(id); if (poundBill == null) throw new RuntimeException("磅单不存在!"); String url = sysConfigService.selectConfigByKey("OA_Url") + - "/k3cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.save.common.kdsvc"; + "/k3cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc"; BillHandler handler = BillHandlers.getHandler(poundBill.getSrcblltype()); DynamicFormRequest request = handler.buildRequest(poundBill); @@ -57,6 +61,27 @@ public class ApiPostBack { return sendPostRequest(url, jsonInputString); } + //单据下推 + public String pushPoundBillFormData(String id) throws IOException { + PoundBill poundBill = poundBillService.selectPoundBillById(id); + if (poundBill == null) throw new RuntimeException("磅单不存在!"); + + String url = sysConfigService.selectConfigByKey("OA_Url") + + "/k3cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push.common.kdsvc"; + + PushBillHandler handler = PushBillHandlers.getHandler(poundBill.getSrcblltype()); + DynamicFormPushRequest request = handler.buildRequest(poundBill); + + String jsonInputString; + try { + jsonInputString = objectMapper.writeValueAsString(request); + } catch (JsonProcessingException e) { + return "JSON序列化失败：" + e.getMessage(); + } + + return sendPostRequest(url, jsonInputString); + } + private String sendPostRequest(String url, String jsonBody) throws IOException { StringBuilder errorLog = new StringBuilder(); try { diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiRequestBody.java b/measurement/src/main/java/com/ruoyi/webApi/ApiRequestBody.java index 96c5b19..b5da509 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiRequestBody.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiRequestBody.java @@ -7,7 +7,7 @@ import java.util.Map; /** * @author 16358 * @date 2025/6/5 - * 接口接取参数body + * 对外接口接取参数body */ public class ApiRequestBody { diff --git a/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java b/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java index dec9dc9..3702e02 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java +++ b/measurement/src/main/java/com/ruoyi/webApi/ApiTask.java @@ -28,6 +28,7 @@ import java.util.UUID; /** * @author 16358 * @date 2025/6/5 + * 拉取星空数据接口 */ @Component("apiTask") public class ApiTask { diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandler.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandler.java new file mode 100644 index 0000000..ae6dd56 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandler.java @@ -0,0 +1,12 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil; + +import com.ruoyi.bill.domain.PoundBill; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; + +/** + * @author 16358 + * @date 2025/6/18 + */ +public interface PushBillHandler { + DynamicFormPushRequest buildRequest(PoundBill bill); +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandlers.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandlers.java new file mode 100644 index 0000000..de3b4e5 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/PushBillHandlers.java @@ -0,0 +1,51 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil; + + +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl.PURPushHandler; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl.SALPushHandler; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl.SPPushHandler; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl.STKPushHandler; + +public enum PushBillHandlers { + SAL_DELIVERYNOTICE { + @Override + public PushBillHandler getHandler() { + return new SALPushHandler(); + } + }, + PUR_ReceiveBill { + @Override + public PushBillHandler getHandler() { + return new PURPushHandler(); + } + }, + STK_TRANSFERAPPLY { + @Override + public PushBillHandler getHandler() { + return new STKPushHandler(); + } + }, + SP_InStock { + @Override + public PushBillHandler getHandler() { + return new SPPushHandler(); + } + }; + + public abstract PushBillHandler getHandler(); + + public static PushBillHandler getHandler(String type) { + switch (type) { + case "SAL_DELIVERYNOTICE": + return SAL_DELIVERYNOTICE.getHandler(); + case "PUR_ReceiveBill": + return PUR_ReceiveBill.getHandler(); + case "STK_TRANSFERAPPLY": + return STK_TRANSFERAPPLY.getHandler(); + case "SP_InStock": + return SP_InStock.getHandler(); + default: + throw new IllegalArgumentException("不支持的单据类型: " + type); + } + } +} diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/PURPushHandler.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/PURPushHandler.java new file mode 100644 index 0000000..bef8970 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/PURPushHandler.java @@ -0,0 +1,21 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl; + +import com.ruoyi.bill.domain.PoundBill; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandler; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; +import com.ruoyi.webApi.pushRequestBody.requestbody.PushRequestData; + +/** + * @author 16358 + * @date 2025/6/18 + * 收料通知单 + */ +public class PURPushHandler implements PushBillHandler { + @Override + public DynamicFormPushRequest buildRequest(PoundBill bill) { + DynamicFormPushRequest request = new DynamicFormPushRequest("PUR_ReceiveBill"); + PushRequestData data = new PushRequestData(bill,"PUR_ReceiveBill-STK_InStock"); + request.setData(data); + return request; + } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SALPushHandler.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SALPushHandler.java new file mode 100644 index 0000000..b8d5c4e --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SALPushHandler.java @@ -0,0 +1,21 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl; + +import com.ruoyi.bill.domain.PoundBill; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandler; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; +import com.ruoyi.webApi.pushRequestBody.requestbody.PushRequestData; + +/** + * @author 16358 + * @date 2025/6/18 + * 发货通知单 + */ +public class SALPushHandler implements PushBillHandler { + @Override + public DynamicFormPushRequest buildRequest(PoundBill bill) { + DynamicFormPushRequest request = new DynamicFormPushRequest("SAL_DELIVERYNOTICE"); + PushRequestData data = new PushRequestData(bill,"DeliveryNotice-OutStock"); + request.setData(data); + return request; + } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SPPushHandler.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SPPushHandler.java new file mode 100644 index 0000000..eb1e9a6 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/SPPushHandler.java @@ -0,0 +1,22 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl; + +import com.ruoyi.bill.domain.PoundBill; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandler; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; +import com.ruoyi.webApi.pushRequestBody.requestbody.PushRequestData; + +/** + * @author 16358 + * @date 2025/6/18 + * 简单生产入库单 + * FIXME：简单生产入库单未提供下推接口！！（暂时废弃） + */ +public class SPPushHandler implements PushBillHandler { + @Override + public DynamicFormPushRequest buildRequest(PoundBill bill) { + DynamicFormPushRequest request = new DynamicFormPushRequest("SP_InStock"); + PushRequestData data = new PushRequestData(bill,"!!!!!"); + request.setData(data); + return request; + } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/STKPushHandler.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/STKPushHandler.java new file mode 100644 index 0000000..262a48e --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/billHandlerUtil/impl/STKPushHandler.java @@ -0,0 +1,21 @@ +package com.ruoyi.webApi.pushRequestBody.billHandlerUtil.impl; + +import com.ruoyi.bill.domain.PoundBill; +import com.ruoyi.webApi.pushRequestBody.billHandlerUtil.PushBillHandler; +import com.ruoyi.webApi.pushRequestBody.requestbody.DynamicFormPushRequest; +import com.ruoyi.webApi.pushRequestBody.requestbody.PushRequestData; + +/** + * @author 16358 + * @date 2025/6/18 + * 调拨申请单 + */ +public class STKPushHandler implements PushBillHandler { + @Override + public DynamicFormPushRequest buildRequest(PoundBill bill) { + DynamicFormPushRequest request = new DynamicFormPushRequest("STK_TRANSFERAPPLY"); + PushRequestData data = new PushRequestData(bill,"StkTransferApply-StkTransferDirect"); + request.setData(data); + return request; + } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/DynamicFormPushRequest.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/DynamicFormPushRequest.java new file mode 100644 index 0000000..feccaa1 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/DynamicFormPushRequest.java @@ -0,0 +1,19 @@ +package com.ruoyi.webApi.pushRequestBody.requestbody; + +import com.fasterxml.jackson.annotation.JsonInclude; + +@JsonInclude(JsonInclude.Include.NON_NULL) +public class DynamicFormPushRequest { + private String Formid; + private PushRequestData data; + + public DynamicFormPushRequest(String formId) { + this.Formid = formId; + } + + // Getters and setters + public String getFormid() { return Formid; } + public void setFormid(String formid) { Formid = formid; } + public PushRequestData getData() { return data; } + public void setData(PushRequestData data) { this.data = data; } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/PushRequestData.java b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/PushRequestData.java new file mode 100644 index 0000000..9b4f396 --- /dev/null +++ b/measurement/src/main/java/com/ruoyi/webApi/pushRequestBody/requestbody/PushRequestData.java @@ -0,0 +1,112 @@ +package com.ruoyi.webApi.pushRequestBody.requestbody; + +import com.ruoyi.bill.domain.PoundBill; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @author 16358 + * @date 2025/6/18 + */ +public class PushRequestData { + private String Ids = ""; + private ArrayList Numbers = new ArrayList<>(); + private String EntryIds = ""; + private String RuleId; + private String TargetBillTypeId = ""; + private int TargetOrgId = 0; + private String TargetFormId = ""; + private String IsEnableDefaultRule = "false"; + private String IsDraftWhenSaveFail = "false"; + private Map CustomParams; + + public PushRequestData(PoundBill bill, String ruleId) { + setIds(bill.getFid()); + setEntryIds(bill.getFentity_fentryid()); + setRuleId(ruleId); + } + + public PushRequestData(){}; + + public String getIds() { + return Ids; + } + + public void setIds(String ids) { + Ids = ids; + } + + public ArrayList getNumbers() { + return Numbers; + } + + public void setNumbers(ArrayList numbers) { + Numbers = numbers; + } + + public String getEntryIds() { + return EntryIds; + } + + public void setEntryIds(String entryIds) { + EntryIds = entryIds; + } + + public String getRuleId() { + return RuleId; + } + + public void setRuleId(String ruleId) { + RuleId = ruleId; + } + + public String getTargetBillTypeId() { + return TargetBillTypeId; + } + + public void setTargetBillTypeId(String targetBillTypeId) { + TargetBillTypeId = targetBillTypeId; + } + + public int getTargetOrgId() { + return TargetOrgId; + } + + public void setTargetOrgId(int targetOrgId) { + TargetOrgId = targetOrgId; + } + + public String getTargetFormId() { + return TargetFormId; + } + + public void setTargetFormId(String targetFormId) { + TargetFormId = targetFormId; + } + + public String getIsEnableDefaultRule() { + return IsEnableDefaultRule; + } + + public void setIsEnableDefaultRule(String isEnableDefaultRule) { + IsEnableDefaultRule = isEnableDefaultRule; + } + + public String getIsDraftWhenSaveFail() { + return IsDraftWhenSaveFail; + } + + public void setIsDraftWhenSaveFail(String isDraftWhenSaveFail) { + IsDraftWhenSaveFail = isDraftWhenSaveFail; + } + + public Map getCustomParams() { + return CustomParams; + } + + public void setCustomParams(Map customParams) { + CustomParams = customParams; + } +} \ No newline at end of file diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandler.java similarity index 56% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandler.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandler.java index b98e62a..a92363a 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandler.java @@ -1,7 +1,7 @@ -package com.ruoyi.webApi.billHandlerUtil; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandlers.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandlers.java similarity index 77% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandlers.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandlers.java index 3911068..c9113b7 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/BillHandlers.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/BillHandlers.java @@ -1,9 +1,9 @@ -package com.ruoyi.webApi.billHandlerUtil; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil; -import com.ruoyi.webApi.billHandlerUtil.impl.PURHandler; -import com.ruoyi.webApi.billHandlerUtil.impl.SALHandler; -import com.ruoyi.webApi.billHandlerUtil.impl.SPHandler; -import com.ruoyi.webApi.billHandlerUtil.impl.STKHandler; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl.PURHandler; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl.SALHandler; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl.SPHandler; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl.STKHandler; public enum BillHandlers { SAL_DELIVERYNOTICE { diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/PURHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java similarity index 59% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/PURHandler.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java index 1d92c47..773acea 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/PURHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/PURHandler.java @@ -1,10 +1,10 @@ -package com.ruoyi.webApi.billHandlerUtil.impl; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.billHandlerUtil.BillHandler; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; -import com.ruoyi.webApi.requestbody.RequestData; -import com.ruoyi.webApi.requestbody.model.PURModel; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; +import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SALHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java similarity index 59% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SALHandler.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java index 0250fe9..45b9bcb 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SALHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SALHandler.java @@ -1,10 +1,10 @@ -package com.ruoyi.webApi.billHandlerUtil.impl; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.billHandlerUtil.BillHandler; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; -import com.ruoyi.webApi.requestbody.RequestData; -import com.ruoyi.webApi.requestbody.model.SALModel; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; +import com.ruoyi.webApi.saveRequestBody.requestbody.model.SALModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SPHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java similarity index 54% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SPHandler.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java index 26590f0..281a2cc 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/SPHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/SPHandler.java @@ -1,10 +1,11 @@ -package com.ruoyi.webApi.billHandlerUtil.impl; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.billHandlerUtil.BillHandler; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; -import com.ruoyi.webApi.requestbody.RequestData; -import com.ruoyi.webApi.requestbody.model.SPModel; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; +import com.ruoyi.webApi.saveRequestBody.requestbody.model.PURModel; +import com.ruoyi.webApi.saveRequestBody.requestbody.model.SPModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/STKHandler.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java similarity index 59% rename from measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/STKHandler.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java index e9f62af..3b783f8 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/billHandlerUtil/impl/STKHandler.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/billHandlerUtil/impl/STKHandler.java @@ -1,10 +1,10 @@ -package com.ruoyi.webApi.billHandlerUtil.impl; +package com.ruoyi.webApi.saveRequestBody.billHandlerUtil.impl; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.billHandlerUtil.BillHandler; -import com.ruoyi.webApi.requestbody.DynamicFormRequest; -import com.ruoyi.webApi.requestbody.RequestData; -import com.ruoyi.webApi.requestbody.model.STKModel; +import com.ruoyi.webApi.saveRequestBody.billHandlerUtil.BillHandler; +import com.ruoyi.webApi.saveRequestBody.requestbody.DynamicFormRequest; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestData; +import com.ruoyi.webApi.saveRequestBody.requestbody.model.STKModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/DynamicFormRequest.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/DynamicFormRequest.java similarity index 90% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/DynamicFormRequest.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/DynamicFormRequest.java index 3b954c2..86de53d 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/DynamicFormRequest.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/DynamicFormRequest.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody; +package com.ruoyi.webApi.saveRequestBody.requestbody; import com.fasterxml.jackson.annotation.JsonInclude; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestData.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java similarity index 96% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestData.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java index 69d7a32..d99d12a 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestData.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestData.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody; +package com.ruoyi.webApi.saveRequestBody.requestbody; import java.util.ArrayList; import java.util.List; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestModel.java similarity index 94% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestModel.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestModel.java index 947c3e6..148f0d0 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/RequestModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/RequestModel.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody; +package com.ruoyi.webApi.saveRequestBody.requestbody; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/PUREntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/PUREntity.java similarity index 95% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/PUREntity.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/PUREntity.java index 87a9a1f..0bbc56c 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/PUREntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/PUREntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody.entity; +package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import java.math.BigDecimal; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SALEntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SALEntity.java similarity index 95% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SALEntity.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SALEntity.java index 8cc8c6e..712e5c2 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SALEntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SALEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody.entity; +package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import java.math.BigDecimal; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SPEntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java similarity index 98% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SPEntity.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java index b94e43e..74f663c 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/SPEntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/SPEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody.entity; +package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import java.math.BigDecimal; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/STKEntity.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKEntity.java similarity index 91% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/STKEntity.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKEntity.java index 71ed52b..eb93521 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/entity/STKEntity.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/entity/STKEntity.java @@ -1,4 +1,4 @@ -package com.ruoyi.webApi.requestbody.entity; +package com.ruoyi.webApi.saveRequestBody.requestbody.entity; import java.math.BigDecimal; diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/PURModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java similarity index 83% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/model/PURModel.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java index 12a44bf..830496a 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/PURModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/PURModel.java @@ -1,8 +1,8 @@ -package com.ruoyi.webApi.requestbody.model; +package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.requestbody.entity.PUREntity; -import com.ruoyi.webApi.requestbody.RequestModel; +import com.ruoyi.webApi.saveRequestBody.requestbody.entity.PUREntity; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SALModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java similarity index 82% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SALModel.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java index 3ace633..3a83d98 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SALModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SALModel.java @@ -1,8 +1,8 @@ -package com.ruoyi.webApi.requestbody.model; +package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.requestbody.entity.SALEntity; -import com.ruoyi.webApi.requestbody.RequestModel; +import com.ruoyi.webApi.saveRequestBody.requestbody.entity.SALEntity; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SPModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java similarity index 87% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SPModel.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java index 9f8963a..d741666 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/SPModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/SPModel.java @@ -1,10 +1,8 @@ -package com.ruoyi.webApi.requestbody.model; +package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.requestbody.entity.SPEntity; -import com.ruoyi.webApi.requestbody.RequestModel; -import com.ruoyi.webApi.requestbody.entity.SPEntity.Ref; -import com.ruoyi.webApi.requestbody.entity.SPEntity.FNumberRef; +import com.ruoyi.webApi.saveRequestBody.requestbody.entity.SPEntity; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; /** * @author 16358 diff --git a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/STKModel.java b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKModel.java similarity index 82% rename from measurement/src/main/java/com/ruoyi/webApi/requestbody/model/STKModel.java rename to measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKModel.java index c97fe4a..c9e2db5 100644 --- a/measurement/src/main/java/com/ruoyi/webApi/requestbody/model/STKModel.java +++ b/measurement/src/main/java/com/ruoyi/webApi/saveRequestBody/requestbody/model/STKModel.java @@ -1,8 +1,8 @@ -package com.ruoyi.webApi.requestbody.model; +package com.ruoyi.webApi.saveRequestBody.requestbody.model; import com.ruoyi.bill.domain.PoundBill; -import com.ruoyi.webApi.requestbody.entity.STKEntity; -import com.ruoyi.webApi.requestbody.RequestModel; +import com.ruoyi.webApi.saveRequestBody.requestbody.entity.STKEntity; +import com.ruoyi.webApi.saveRequestBody.requestbody.RequestModel; /** * @author 16358