update 物料定时任务、存储数据

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/RemoteMaterialInfoService.java

@@ -1,6 +1,6 @@
 package org.dromara.mes.api;
 
-import org.dromara.mes.api.domain.bo.BaseMaterialInfoBo;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
 
 import java.util.List;
 

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/BaseMaterialInfo.java

@@ -1,17 +1,19 @@
-package org.dromara.mes.api.domain;
+package org.dromara.mes.api.model;
 
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 import java.io.Serial;
-import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 物料信息对象 base_material_info
  *
+ * @author zangch
+ * @date 2025-01-07
  */
 @Data
-public class BaseMaterialInfo implements Serializable {
+public class BaseMaterialInfo {
 
     @Serial
     private static final long serialVersionUID = 1L;

ruoyi-api/hwmom-api-mes/src/main/java/org/dromara/mes/api/model/bo/BaseMaterialInfoBo.java

@@ -1,4 +1,4 @@
-package org.dromara.mes.api.domain.bo;
+package org.dromara.mes.api.model.bo;
 
 import lombok.Data;
 

ruoyi-modules/hwmom-api/pom.xml

@@ -103,14 +103,17 @@
             <groupId>org.dromara</groupId>
             <artifactId>ruoyi-api-resource</artifactId>
         </dependency>
+
 <!--        <dependency>-->
 <!--            <groupId>com.mysql</groupId>-->
 <!--            <artifactId>mysql-connector-j</artifactId>-->
 <!--        </dependency>-->
+
         <dependency>
             <groupId>com.microsoft.sqlserver</groupId>
             <artifactId>mssql-jdbc</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.dromara</groupId>
             <artifactId>hwmom-api-mes</artifactId>
@@ -118,6 +121,11 @@
             <scope>compile</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.dromara</groupId>
+            <artifactId>ruoyi-common-job</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/SAPPortDto.java

@@ -0,0 +1,56 @@
+package org.dromara.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * @Author YinQ
+ * @create 2023-09-26 14:46
+ */
+public class SAPPortDto {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 开始时间
+     */
+    @JsonProperty(value = "NDATE")
+    private String startDate;
+
+    /**
+     * 结束时间
+     */
+    @JsonProperty(value = "EDATE")
+    private String endDate;
+
+
+    /**
+     * 工厂编号
+     */
+    @JsonProperty(value = "WERKS")
+    private WERKSDto factoryCodes;
+
+
+    public String getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(String startDate) {
+        this.startDate = startDate;
+    }
+
+    public String getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(String endDate) {
+        this.endDate = endDate;
+    }
+
+    public WERKSDto getFactoryCodes() {
+        return factoryCodes;
+    }
+
+    public void setFactoryCodes(WERKSDto factoryCodes) {
+        this.factoryCodes = factoryCodes;
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/WERKSDto.java

@@ -0,0 +1,33 @@
+package org.dromara.api.domain;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @Author YinQ
+ * @create 2023-09-26 15:13
+ */
+public class WERKSDto {
+
+
+    /**
+     * 工厂请求Map
+     */
+    List<HashMap<String, String>> item;
+
+
+    public List<HashMap<String, String>> getItem() {
+        return item;
+    }
+
+    public void setItem(List<HashMap<String, String>> item) {
+        this.item = item;
+    }
+
+    @Override
+    public String toString() {
+        return "WERKSDto{" +
+                "item=" + item +
+                '}';
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/domain/vo/SAPResultVo.java

@@ -0,0 +1,61 @@
+package org.dromara.api.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.dromara.api.domain.WERKSDto;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * 物料主数据
+ *
+ * @Author YinQ
+ * @create 2023-09-27 13:37
+ */
+public class SAPResultVo {
+
+    @JsonProperty(value = "O_TAB")
+    private HashMap<String,  List<HashMap<String, String>>> O_TAB;
+
+    @JsonProperty(value = "WERKS")
+    private WERKSDto WERKS;
+
+    @JsonProperty(value = "O_RETURN")
+    private WERKSDto O_RETURN;
+
+    public HashMap<String, List<HashMap<String, String>>> getO_TAB() {
+        return O_TAB;
+    }
+
+    public void setO_TAB(HashMap<String, List<HashMap<String, String>>> o_TAB) {
+        O_TAB = o_TAB;
+    }
+
+    public WERKSDto getWERKS() {
+        return WERKS;
+    }
+
+    public void setWERKS(WERKSDto WERKS) {
+        this.WERKS = WERKS;
+    }
+
+    public WERKSDto getO_RETURN() {
+        return O_RETURN;
+    }
+
+    public void setO_RETURN(WERKSDto o_RETURN) {
+        O_RETURN = o_RETURN;
+    }
+
+    public SAPResultVo() {
+    }
+
+    @Override
+    public String toString() {
+        return "SAPResultVo{" +
+                "O_TAB=" + O_TAB +
+                ", WERKS='" + WERKS + '\'' +
+                ", O_RETURN=" + O_RETURN +
+                '}';
+    }
+}

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/IBaseMaterialInfoApiService.java

@@ -2,7 +2,7 @@ package org.dromara.api.service;
 
 
 /**
- * 车间信息Service接口
+ * API物料Service接口
  *
  * @author Yinq
  * @date 2025-01-02

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/service/impl/BaseMaterialInfoApiServiceImpl.java

@@ -1,18 +1,22 @@
 package org.dromara.api.service.impl;
 
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.api.domain.SAPPortDto;
+import org.dromara.api.domain.vo.SAPResultVo;
 import org.dromara.api.service.IBaseMaterialInfoApiService;
 
 import lombok.RequiredArgsConstructor;
 import org.dromara.mes.api.RemoteMaterialInfoService;
-import org.dromara.mes.api.domain.bo.BaseMaterialInfoBo;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
- * Service业务层处理
+ * API物料Service业务层处理
  *
  * @author Yinq
  * @date 2025-01-02
@@ -26,8 +30,36 @@ public class BaseMaterialInfoApiServiceImpl implements IBaseMaterialInfoApiServi
 
     @Override
     public String insertApi(String requestBody) {
-        List<BaseMaterialInfoBo> list = new ArrayList<>();
+        SAPPortDto sapPortDto = new SAPPortDto();
-        Boolean aBoolean = remoteMaterialInfoService.remoteInsertBaseMaterialInfo(list);
+        //请求API接口，获取数据
-        return null;
+        List<BaseMaterialInfoBo> list = getMaterialData(sapPortDto);
+        //解析数据，存储实体类
+
+        remoteMaterialInfoService.remoteInsertBaseMaterialInfo(list);
+        return "success";
+    }
+
+    public List<BaseMaterialInfoBo> getMaterialData(SAPPortDto sapPortDto) {
+        List<BaseMaterialInfoBo> materialVos = new ArrayList<>();
+        String requestParam = null;
+        String result = null;
+        // 创建ObjectMapper实例 对象转JSON字符串
+        ObjectMapper objectMapper = new ObjectMapper();
+        // 格式化输出
+        // objectMapper.configure(SerializationFeature.INDENT_OUTPUT, true);
+//        requestParam = objectMapper.writeValueAsString(sapPortDto);
+//        result = ApiUtils.sendSAPHttpPost(SAPConstants.SAP_PREFIX_URL + SAPConstants.MATERIAL_URL, requestParam);
+        try {
+            // 处理接口返回消息
+            ObjectMapper resultMapper = new ObjectMapper();
+            // 将 JSON 字符串 转换为 Java 对象
+            SAPResultVo resultVo = resultMapper.readValue(result, SAPResultVo.class);
+            //转物料实体类 保存数据
+//            materialVos = storageService.insertSAPMaterialInfo(resultVo);
+        } catch (JsonProcessingException e) {
+            e.printStackTrace();
+        }
+        return materialVos;
     }
+
 }

ruoyi-modules/hwmom-api/src/main/java/org/dromara/api/snailjob/MaterialInfoJobExecutor.java

@@ -0,0 +1,30 @@
+package org.dromara.api.snailjob;
+
+import com.aizuda.snailjob.client.job.core.annotation.JobExecutor;
+import com.aizuda.snailjob.client.job.core.dto.JobArgs;
+import com.aizuda.snailjob.client.model.ExecuteResult;
+import com.aizuda.snailjob.common.core.util.JsonUtil;
+import com.aizuda.snailjob.common.log.SnailJobLog;
+import org.dromara.api.service.IBaseMaterialInfoApiService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author opensnail
+ * @date 2024-05-17
+ */
+@Component
+@JobExecutor(name = "materialInfoJobExecutor")
+public class MaterialInfoJobExecutor {
+
+    @Autowired
+    IBaseMaterialInfoApiService baseMaterialInfoApiService;
+
+    public ExecuteResult jobExecute(JobArgs jobArgs) {
+        String jobParams = String.valueOf(jobArgs.getJobParams());
+        String result = baseMaterialInfoApiService.insertApi(jobParams);
+        SnailJobLog.LOCAL.info("materialInfoJobExecutor.jobArgs:{}", JsonUtil.toJsonString(jobArgs));
+        return ExecuteResult.success(result);
+    }
+
+}

ruoyi-modules/hwmom-mes/src/main/java/org/dromara/mes/dubbo/RemoteMaterialInfoServiceImpl.java

@@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.dubbo.config.annotation.DubboService;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.mes.api.RemoteMaterialInfoService;
-import org.dromara.mes.api.domain.bo.BaseMaterialInfoBo;
+import org.dromara.mes.api.model.bo.BaseMaterialInfoBo;
 import org.dromara.mes.domain.BaseMaterialInfo;
 import org.dromara.mes.mapper.BaseMaterialInfoMapper;
 import org.springframework.stereotype.Service;

ruoyi-visual/ruoyi-snailjob-server/pom.xml

@@ -40,6 +40,12 @@
             <artifactId>spring-boot-admin-starter-client</artifactId>
             <version>${spring-boot-admin.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.microsoft.sqlserver</groupId>
+            <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>