聚能钛

mjava-junengtai/pom.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.malk</groupId>
+    <artifactId>junengtai</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>mjava-junengtai</name>
+    <description>mjava-junengtai</description>
+
+    <!-- ✅ 使用统一的 parent -->
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.7.18</version>
+        <relativePath/>
+    </parent>
+
+    <properties>
+        <java.version>1.8</java.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.83</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>3.14.9</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.malk</groupId>
+            <artifactId>base</artifactId>
+            <version>1.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- MyBatis Starter -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
+            <version>2.2.2</version>
+        </dependency>
+        <!-- MySQL驱动 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+            <version>8.0.28</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>junengtai</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <executable>true</executable>
+                    <includeSystemScope>true</includeSystemScope>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

mjava-junengtai/src/main/java/com/malk/junengtai/MjavaJunengtaiApplication.java

@@ -0,0 +1,14 @@
+package com.malk.junengtai;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication(scanBasePackages = {"com.malk"})
+public class MjavaJunengtaiApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(MjavaJunengtaiApplication.class, args);
+        System.out.println("Junengtai项目启动-----------");
+    }
+
+}

mjava-junengtai/src/main/java/com/malk/junengtai/controller/PurchaseController.java

@@ -23,16 +23,19 @@ public class PurchaseController {
     /*todo:手动同步档案表*/
     @SneakyThrows
     @PostMapping("/synchronizedArchiveTable")
-    McR synchronizedArchiveTable(@RequestParam String name){
-        return McR.success(purchaseService.synchronizedArchiveTable(name));
+    McR synchronizedArchiveTable(@RequestParam String name,@RequestParam String date){
+        log.info("开始同步,{}",name);
+        purchaseService.synchronizedArchiveTable(name,date);
+        log.info("同步完成");
+        return McR.success();
     }
 
     /*todo：组件信息手动同步接口*/
     @SneakyThrows
     @PostMapping("/componentInfo")
-    McR ComponentInformation(){
+    McR ComponentInformation(@RequestParam String date){
         log.info("----------开始全量同步组件信息----------");
-        purchaseService.ComponentInformation();
+        purchaseService.ComponentInformation(date);
         log.info("-----------组件信息已同步完成-----------");
         return McR.success();
     }
@@ -40,9 +43,9 @@ public class PurchaseController {
     /*todo:供应商信息同步接口*/
     @SneakyThrows
     @PostMapping("/supplierInfo")
-    McR supplierInformation(){
+    McR supplierInformation(@RequestParam String dateString1){
         log.info("---------开始全量同步供应商信息---------");
-        purchaseService.supplierInformation();
+        purchaseService.supplierInformation(dateString1);
         log.info("---------供应商信息同步完成-------------");
         return McR.success();
     }

mjava-junengtai/src/main/java/com/malk/junengtai/schedule/Schedule.java

@@ -9,6 +9,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
 
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+
 /**
  * @EnableScheduling 开启定时任务 [配置参考McScheduleTask]
  */
@@ -25,7 +28,10 @@ public class Schedule {
     public void purchaseList(){
         log.info("开始同步组件信息");
         try {
-            purchaseService.ComponentInformation();
+            LocalDate today = LocalDate.now(); // 获取当前日期（基于系统默认时区）
+            String dateString = today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            System.out.println("当前时间：" + dateString);
+            purchaseService.ComponentInformation(dateString);
             System.out.println("同步组件信息完成");
         } catch (JacksonException e) {
             throw new RuntimeException(e);
@@ -37,7 +43,10 @@ public class Schedule {
     public void supplierInformation(){
         log.info("开始同步供应商信息");
         try {
-            purchaseService.supplierInformation();
+            LocalDate today = LocalDate.now(); // 获取当前日期（基于系统默认时区）
+            String dateString1 = today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            System.out.println("当前时间：" + dateString1);
+            purchaseService.supplierInformation(dateString1);
             System.out.println("同步供应商信息完成");
         } catch (JacksonException e) {
             throw new RuntimeException(e);

mjava-junengtai/src/main/java/com/malk/junengtai/service/Impl/PurchaseServiceImpl.java

@@ -36,19 +36,19 @@ public class PurchaseServiceImpl implements PurchaseService {
     private DDConf ddConf;
 
     @Override
-    public McR synchronizedArchiveTable(String name) throws JacksonException {
+    public McR synchronizedArchiveTable(String name,String date) throws JacksonException {
         if(name.equals("组件信息")){
             log.info("开始同步组件信息");
-            ComponentInformation();
+            ComponentInformation(date);
         } else if (name.equals("供应商信息")) {
             log.info("开始同步供应商信息");
-            supplierInformation();
+            supplierInformation(date);
         }
         return McR.success();
     }
 
     @Override
-    public McR ComponentInformation() throws JacksonException {
+    public McR ComponentInformation(String date) throws JacksonException {
         HashMap head = new HashMap();
         head.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
 
@@ -89,11 +89,9 @@ public class PurchaseServiceImpl implements PurchaseService {
             System.out.println(i +"/" + List.size() + "   零件编号: " + part.get("partNumber") +
                     ", 描述: " + part.get("description") +
                     ", 单位: " + part.get("unit") +", 型号: " + part.get("module") + ", 规格: " + part.get("spec") + ", 牌号:" + part.get("mark"));
-            String createDate = part.get("createDate").toString();
-            LocalDate today = LocalDate.now(); // 获取当前日期（基于系统默认时区）
-            String dateString = today.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-            System.out.println("当前时间：" + dateString);
-            if(part.get("createDate").toString().equals(dateString)){
+
+            //传过来的date数据
+            if(part.get("createDate").toString().equals(date)){
                 //TODO:向宜搭插入数据
                 String sc = "textField_logkj6a6, textField_logkj6ai, textField_logkj6aj, textField_mh4k26k6, textField_mh4k26k5, textField_mh4k26k7";//组件号 组件名称 单位 型号 规格 牌号
                 String partNumber = part.get("partNumber").toString()!= null?part.get("partNumber").toString():"数据库此字段为空";
@@ -128,7 +126,7 @@ public class PurchaseServiceImpl implements PurchaseService {
     }
 
     @Override
-    public McR supplierInformation() throws JacksonException {
+    public McR supplierInformation(String dateString1) throws JacksonException {
         HashMap head = new HashMap();
         head.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
 
@@ -165,26 +163,29 @@ public class PurchaseServiceImpl implements PurchaseService {
             System.out.println(i +"/" + List.size() + "   供应商编码: " + part.get("supplierCode") +
                     ", 供应商名称: " + part.get("name"));
             //TODO:向宜搭插入数据
-            String sc = "textField_loggfrvk, textField_loggfrvp";//供应商编码 供应商名称
-            String supplierCode = part.get("supplierCode").toString()!= null?part.get("supplierCode").toString():"数据库此字段为空";
-            String name = part.get("name").toString()!=null?part.get("name").toString():"数据库此字段为空";
-            List<Map> conditions = Arrays.asList(  YDConf.searchCondition_TextFiled("textField_loggfrvk", part.get("supplierCode"), "eq"));
-            List<Map> list  = (List<Map>) ydClient.queryData(YDParam.builder()
+            //传过来的date数据
+            if(part.get("createDate").toString().equals(dateString1)){
+                String sc = "textField_loggfrvk, textField_loggfrvp";//供应商编码 供应商名称
+                String supplierCode = part.get("supplierCode").toString()!= null?part.get("supplierCode").toString():"数据库此字段为空";
+                String name = part.get("name").toString()!=null?part.get("name").toString():"数据库此字段为空";
+                List<Map> conditions = Arrays.asList(  YDConf.searchCondition_TextFiled("textField_loggfrvk", part.get("supplierCode"), "eq"));
+                List<Map> list  = (List<Map>) ydClient.queryData(YDParam.builder()
+                                .formUuid("FORM-A9A0154249F940268F7313DDEC33925CFNPI")
+                                .searchCondition(JSONObject.toJSONString(conditions))
+                                .build()
+                        ,YDConf.FORM_QUERY.retrieve_list).getData();
+                Map formData = UtilMap.map(sc,supplierCode,name);
+                if(!list.isEmpty()){
+                    ydClient.operateData(YDParam.builder()
+                            .formInstanceId(UtilMap.getString(list.get(0),"formInstanceId"))
+                            .updateFormDataJson(JSONObject.toJSONString(formData))
+                            .build(),YDConf.FORM_OPERATION.update);
+                }else{
+                    ydClient.operateData(YDParam.builder()
                             .formUuid("FORM-A9A0154249F940268F7313DDEC33925CFNPI")
-                            .searchCondition(JSONObject.toJSONString(conditions))
-                            .build()
-                    ,YDConf.FORM_QUERY.retrieve_list).getData();
-            Map formData = UtilMap.map(sc,supplierCode,name);
-            if(!list.isEmpty()){
-                ydClient.operateData(YDParam.builder()
-                        .formInstanceId(UtilMap.getString(list.get(0),"formInstanceId"))
-                        .updateFormDataJson(JSONObject.toJSONString(formData))
-                        .build(),YDConf.FORM_OPERATION.update);
-            }else{
-                ydClient.operateData(YDParam.builder()
-                        .formUuid("FORM-A9A0154249F940268F7313DDEC33925CFNPI")
-                        .formDataJson(JSONObject.toJSONString(formData))
-                        .build(), YDConf.FORM_OPERATION.create).toString();
+                            .formDataJson(JSONObject.toJSONString(formData))
+                            .build(), YDConf.FORM_OPERATION.create).toString();
+                }
             }
 
         }

mjava-junengtai/src/main/java/com/malk/junengtai/service/PurchaseService.java

@@ -8,13 +8,13 @@ import java.util.Map;
 public interface PurchaseService {
 
     /*手动同步档案表数据*/
-    McR synchronizedArchiveTable(String name) throws JacksonException;
+    McR synchronizedArchiveTable(String name,String date) throws JacksonException;
 
     /*同步组件信息*/
-    McR ComponentInformation() throws JacksonException;
+    McR ComponentInformation(String date) throws JacksonException;
 
     /*供应商信息*/
-    McR supplierInformation() throws  JacksonException;
+    McR supplierInformation(String dateString1) throws  JacksonException;
 
     /*查询库存信息*/
     McR queryInventory(Map<String,String> body) throws JacksonException;

mjava-junengtai/src/test/java/com/malk/junengtai/MjavaJunengtaiApplicationTests.java

@@ -0,0 +1,13 @@
+package com.malk.junengtai;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class MjavaJunengtaiApplicationTests {
+
+    @Test
+    void contextLoads() {
+    }
+
+}