修改实体类

ruoyi-admin/src/main/resources/application-dev.yml

@@ -11,7 +11,7 @@ spring:
 #                username: root
 #                password: 123456
             master:
-                url: jdbc:mysql://192.168.111.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                url: jdbc:mysql://192.168.111.222:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
                 password: Klwlzhpzd@2024
             # 从库数据源

ruoyi-admin/src/main/resources/application-druid.yml

 # 数据源配置
 spring:
-    datasource:
-        type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-        druid:
-            # 主库数据源
-            master:
-                url: jdbc:mysql://192.168.111.222:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-                username: root
-                password: Klwlzhpzd@2024
-            # 从库数据源
-            slave:
-                # 从数据源开关/默认关闭
-                enabled: false
-                url:
-                username:
-                password:
-            # 初始连接数
-            initialSize: 5
-            # 最小连接池数量
-            minIdle: 10
-            # 最大连接池数量n
-            maxActive: 20
-            # 配置获取连接等待超时的时间
-            maxWait: 60000
-            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
-            timeBetweenEvictionRunsMillis: 60000
-            # 配置一个连接在池中最小生存的时间，单位是毫秒
-            minEvictableIdleTimeMillis: 300000
-            # 配置一个连接在池中最大生存的时间，单位是毫秒
-            maxEvictableIdleTimeMillis: 900000
-            # 配置检测连接是否有效
-            validationQuery: SELECT 1 FROM DUAL
-            testWhileIdle: true
-            testOnBorrow: false
-            testOnReturn: false
-            webStatFilter:
-                enabled: true
-            statViewServlet:
-                enabled: true
-                # 设置白名单，不填则允许所有访问
-                allow:
-                url-pattern: /druid/*
-                # 控制台管理用户名和密码
-                login-username: hbty
-                login-password: 888888
-            filter:
-                stat:
-                    enabled: true
-                    # 慢SQL记录
-                    log-slow-sql: true
-                    slow-sql-millis: 1000
-                    merge-sql: true
-                wall:
-                    config:
-                        multi-statement-allow: true
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        username: root
+        url: jdbc:mysql://192.168.111.227:3306/ry_vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        password: Klwlzhpzd@2024
+#        url: jdbc:mysql://192.168.111.228:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        password: wlzhpzd
+      # 从库数据源
+      slave:
+        # 从数据源开关/默认关闭
+        enabled: false
+        url:
+        username:
+        password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量n
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: hbty
+        login-password: 888888
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true

ruoyi-supplies/src/main/java/com/ruoyi/system/common/ReturnResult.java

 package com.ruoyi.system.common;
 
-
-
-
 import java.util.ArrayList;
 
-
 /**
  * @Author jiuli
  * @Date 2024/2/20

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActReadDataController.java

@@ -3,7 +3,6 @@ package com.ruoyi.system.controller;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.system.domain.ActMaterialModel;
 import com.ruoyi.system.service.ActReadDataService;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,7 +25,6 @@ public class ActReadDataController {
         if (bindingResult.hasErrors()){
             return AjaxResult.error(bindingResult.getFieldError().getDefaultMessage());
         }
-        AjaxResult read = actReadDataService.read(actMaterialModel.getMineId());
-        return read != null ? read : new AjaxResult(200, "清洗成功");
+        return actReadDataService.read(actMaterialModel.getMineId());
     }
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesAccountController.java

@@ -3,6 +3,7 @@ package com.ruoyi.system.controller;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.system.domain.ActDispensing;
+import com.ruoyi.system.domain.ActMaterialModel;
 import com.ruoyi.system.service.IActSuppliesAccountService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,6 +34,15 @@ public class ActSuppliesAccountController extends BaseController
 
     }
 
+    @PreAuthorize("@ss.hasPermi('ActSuppliesAccount:ActSuppliesAccount:options')")
+    @PostMapping("/newOptions")
+    public TableDataInfo getAccountFromYon(@RequestBody List<ActDispensing> actDispensings){
+
+        List<ActDispensing> options = actSuppliesAccountService.getAccountFromYon(actDispensings);
+        return getDataTable(options);
+
+    }
+
 
 //    /**
 //     * 查询物料总分类管理列表

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesAccountService.java

@@ -9,5 +9,5 @@ public interface IActSuppliesAccountService {
 
     List<ActDispensing> options(List<ActDispensing> actDispensings);
 
-
+    List<ActDispensing> getAccountFromYon(List<ActDispensing> actDispensings);
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActReadDataServiceImpl.java

@@ -32,10 +32,10 @@ public class ActReadDataServiceImpl implements ActReadDataService {
 
     @Override
     public AjaxResult read(String mineId) {
-        boolean b = MapTo.put("清洗", "0001");
-        if (!b){
-            return new AjaxResult(500, "不可重复点击");
-        }
+//        boolean b = MapTo.put("清洗", "0001");
+//        if (!b){
+//            return new AjaxResult(500, "不可重复点击");
+//        }
         int i = 0;
         while (true) {
             int count = actReadDataMapper.selectCleanToOne(mineId);

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesAccountServiceImpl.java

 package com.ruoyi.system.service.impl;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.system.common.ReturnResult;
 import com.ruoyi.system.domain.ActDispensing;
 import com.ruoyi.system.mapper.ActSuppliesAccountMapper;
 import com.ruoyi.system.service.IActSuppliesAccountService;
+import com.ruoyi.system.yyinterface.VoucherUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
+import static com.ruoyi.system.constant.ApiConstant.YFXM_URL;
 
 @Service
 public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService {
 
+    private Logger logger = LoggerFactory.getLogger(ActSuppliesAccountServiceImpl.class);
+
     @Autowired
     private ActSuppliesAccountMapper actSuppliesAccountMapper;
 
@@ -47,5 +61,56 @@ public class ActSuppliesAccountServiceImpl implements IActSuppliesAccountService
         return actDispensings;
     }
 
+    @Override
+    public List<ActDispensing> getAccountFromYon(List<ActDispensing> actDispensings) {
+        JSONObject httpBody = new JSONObject();
+        httpBody.put("code", actDispensings.get(0).getMining());
+        httpBody.put("pageIndex", 1);
+        httpBody.put("pageSize", 100000);
+        ReturnResult result = VoucherUtils.callVoucherQuery( httpBody , YFXM_URL);
+        JSONObject resultJsonObj = (JSONObject) result.getData().get(0);
+        JSONArray recordList = resultJsonObj.getJSONArray("recordList");
+        logger.info("recordList : "+ recordList.toJSONString());
+        Map<String, List<String>> resultMap = new LinkedHashMap<>();
+        recordList.forEach(item -> {
+            JSONObject object = (JSONObject) item;
+            String classifyIdName = object.getString("classifyid_name");
+            String name = object.getString("name");
+
+            resultMap.computeIfAbsent(classifyIdName, k -> new ArrayList<>()).add(name);
+        });
+
+
+//        for (int i=0;i<actDispensings.size();i++) {
+//            if (actDispensings.get(i).getDepartment().equals("")||actDispensings.get(i).getDepartment()==null){
+//                if (actDispensings.get(i)!=null && actDispensings.get(i).getName() != null){
+//                    String name = actDispensings.get(i).getName();
+//                    for (int t = 0; t < recordList.size(); t++) {
+//                        JSONObject object = recordList.getJSONObject(t);
+//                        if (name.equals(object.getString("classifyid_name"))){
+////                            actDispensings.get(i).setAccountingCode(object.getString());
+////                            actDispensings.get(i).setAccountingNameA(object.getString());
+////                            actDispensings.get(i).setAccountingNameB(object.getString());
+////                            actDispensings.get(i).setAccountingNameC(object.getString());
+//                        }
+//                    }
+//                }
+//            }else {
+//                ActDispensing actDispensing = actSuppliesAccountMapper.selectActSuppliesAccpuntByName(actDispensings.get(i).getName() + '-' + actDispensings.get(i).getDepartment() + '-' + actDispensings.get(i).getMaterial());
+//                if (actDispensing !=null){
+//                    actDispensings.get(i).setAccountingCode(actDispensing.getAccountingCode());
+//                    actDispensings.get(i).setAccountingNameA(actDispensing.getAccountingNameA()+','+actDispensing.getAccountingIdA());
+//                    actDispensings.get(i).setAccountingNameB(actDispensing.getAccountingNameB()+','+actDispensing.getAccountingIdB());
+//                    actDispensings.get(i).setAccountingNameC(actDispensing.getAccountingNameC()+','+actDispensing.getAccountingIdC());
+//                }
+//            }
+//        }
+//        for (int i = 0; i < recordList.size(); i++) {
+//            JSONObject object = recordList.getJSONObject(i);
+//
+//        }
+        return actDispensings;
+    }
+
 
 }

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/VoucherQueryServiceImpl.java

@@ -14,7 +14,7 @@ import com.ruoyi.system.model.voucher.VoucherBody;
 import com.ruoyi.system.model.voucher.VoucherImportModel;
 import com.ruoyi.system.service.VoucherQueryService;
 import com.ruoyi.system.support.VoucherQuerySupport;
-import com.ruoyi.system.utils.VoucherUtils;
+import com.ruoyi.system.yyinterface.VoucherUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;

ruoyi-supplies/src/main/java/com/ruoyi/system/utils/RequestTool.java → ruoyi-supplies/src/main/java/com/ruoyi/system/yyinterface/RequestTool.java

-package com.ruoyi.system.utils;
+package com.ruoyi.system.yyinterface;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

ruoyi-supplies/src/main/java/com/ruoyi/system/utils/TokenUtils.java → ruoyi-supplies/src/main/java/com/ruoyi/system/yyinterface/TokenUtils.java

-package com.ruoyi.system.utils;
+package com.ruoyi.system.yyinterface;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.ruoyi.system.response.AccessTokenResponse;
 import com.ruoyi.system.response.GenericResponse;
 import com.ruoyi.system.response.SignHelper;
-//import jdk.nashorn.internal.objects.annotations.Getter;
 import lombok.Getter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

ruoyi-supplies/src/main/java/com/ruoyi/system/utils/VoucherUtils.java → ruoyi-supplies/src/main/java/com/ruoyi/system/yyinterface/VoucherUtils.java

-package com.ruoyi.system.utils;
+package com.ruoyi.system.yyinterface;
 
 import com.alibaba.fastjson.JSON;
 import com.ruoyi.system.common.ReturnResult;