Bladeren bron

聚能肽

xmy 1 week geleden
bovenliggende
commit
b962d90b22

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

@@ -0,0 +1,75 @@
+package com.malk.junengtai.controller;
+
+import com.malk.junengtai.service.PurchaseService;
+import com.malk.server.common.McException;
+import com.malk.server.common.McR;
+import com.malk.utils.UtilMap;
+import com.malk.utils.UtilServlet;
+import lombok.SneakyThrows;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Map;
+
+@RestController
+@Slf4j
+@RequestMapping("/Purchase")
+public class PurchaseController {
+    @Autowired
+    private PurchaseService purchaseService;
+
+    /*todo:手动同步档案表*/
+    @SneakyThrows
+    @PostMapping("/synchronizedArchiveTable")
+    McR synchronizedArchiveTable(@RequestParam String name){
+        return McR.success(purchaseService.synchronizedArchiveTable(name));
+    }
+
+    /*todo:组件信息手动同步接口*/
+    @SneakyThrows
+    @PostMapping("/componentInfo")
+    McR ComponentInformation(){
+        log.info("----------开始全量同步组件信息----------");
+        purchaseService.ComponentInformation();
+        log.info("-----------组件信息已同步完成-----------");
+        return McR.success();
+    }
+
+    /*todo:供应商信息同步接口*/
+    @SneakyThrows
+    @PostMapping("/supplierInfo")
+    McR supplierInformation(){
+        log.info("---------开始全量同步供应商信息---------");
+        purchaseService.supplierInformation();
+        log.info("---------供应商信息同步完成-------------");
+        return McR.success();
+    }
+
+    /*todo:查询库存信息接口*/
+    @SneakyThrows
+    @PostMapping("/queryInventory")
+    McR queryInventory(@RequestBody Map<String,String> body){
+        return McR.success(purchaseService.queryInventory(body));
+    }
+
+    /*todo:创建采购订单接口*/
+    @SneakyThrows
+    @PostMapping("/purchaseOrder")
+    McR purchaseOrder(HttpServletRequest request){
+        Map<String, ?> data = UtilServlet.getParamMap(request);
+        log.info("采购订单, {}", data);
+        McException.assertParamException_Null(data, "instanceId");
+        return purchaseService.purchaseOrder(UtilMap.getString(data,"instanceId"));
+    }
+
+    /*todo:拣货单接口*/
+    @SneakyThrows
+    @PostMapping("/pickingList")
+    McR pickingList(@RequestBody Map<String,String> body){
+        log.info("开始查询拣货单明细");
+        return McR.success(purchaseService.pickingList(body));
+    }
+
+}

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

@@ -0,0 +1,50 @@
+package com.malk.junengtai.schedule;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.malk.junengtai.service.PurchaseService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+
+/**
+ * @EnableScheduling 开启定时任务 [配置参考McScheduleTask]
+ */
+@Slf4j
+@Configuration
+@EnableScheduling
+@ConditionalOnProperty(name = {"enable.scheduling"})
+public class Schedule {
+    @Autowired
+    private PurchaseService purchaseService;
+
+    /*组件信息定时器*/
+    @Scheduled(cron = "0 0 22 * * ?")
+    public void purchaseList(){
+        log.info("开始同步组件信息");
+        try {
+            purchaseService.ComponentInformation();
+            System.out.println("同步组件信息完成");
+        } catch (JacksonException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /*供应商信息定时器*/
+    @Scheduled(cron = "0 0 23 * * ?")
+    public void supplierInformation(){
+        log.info("开始同步供应商信息");
+        try {
+            purchaseService.supplierInformation();
+            System.out.println("同步供应商信息完成");
+        } catch (JacksonException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+
+
+}

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

@@ -0,0 +1,303 @@
+package com.malk.junengtai.service.Impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fasterxml.jackson.core.JacksonException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.malk.junengtai.service.PurchaseService;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.common.McR;
+import com.malk.server.dingtalk.DDConf;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilHttp;
+import com.malk.utils.UtilMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+@Service
+public class PurchaseServiceImpl implements PurchaseService {
+
+    @Autowired
+    private YDClient ydClient;
+    @Autowired
+    private YDConf ydConf;
+    @Autowired
+    private DDConf ddConf;
+
+    @Override
+    public McR synchronizedArchiveTable(String name) throws JacksonException {
+        if(name.equals("组件信息")){
+            log.info("开始同步组件信息");
+            ComponentInformation();
+        } else if (name.equals("供应商信息")) {
+            log.info("开始同步供应商信息");
+            supplierInformation();
+        }
+        return McR.success();
+    }
+
+    @Override
+    public McR ComponentInformation() throws JacksonException {
+        HashMap head = new HashMap();
+        head.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
+
+        HashMap<String,Object> body = new HashMap();
+        List<Map<String, String>> partsList = new ArrayList<>();
+
+        Map<String, String> part1 = new HashMap<>();
+        part1.put("PartNumber", "SSF0009");
+        partsList.add(part1);
+
+        body.put("Parts", partsList);
+
+        String dd = UtilHttp.doPost("http://192.168.3.80:10001/api/public/GetAllParts", head, null, body);
+
+        ObjectMapper objectMapper  = new ObjectMapper();
+        JsonNode rootNode = objectMapper.readTree(dd);
+        JsonNode partsNode = rootNode.get("parts");
+        List<Map<String, String>> List = new ArrayList<>();
+        Map<String, Map<String, String>> partsMap = new ConcurrentHashMap<>();
+        if (partsNode != null && partsNode.isArray()) {
+            for (JsonNode partNode : partsNode) {
+                Map<String, String> partData = new HashMap<>();
+                partData.put("partNumber", partNode.get("partNumber").asText());
+                partData.put("description", partNode.get("description").asText());
+                partData.put("unit", partNode.get("unit").asText());
+                partData.put("module",partNode.get("module").isNull() ? "" : partNode.get("module").asText());
+                partData.put("spec",partNode.get("spec").isNull() ? "" : partNode.get("spec").asText());
+                partData.put("mark",partNode.get("mark").isNull() ? "" : partNode.get("mark").asText());
+                partData.put("createDate",partNode.get("createDate").isNull() ? "" : partNode.get("createDate").asText());
+                List.add(partData);
+                partsMap.put(partNode.get("partNumber").asText(), partData);
+            }
+        }
+        System.out.println("\n=== 遍历所有零件 ===个数:"+List.size());
+        int i = 0;
+        for (Map<String, String> part : List) {
+            i++;
+            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)){
+                //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():"数据库此字段为空";
+                String description = part.get("description").toString()!=null?part.get("description").toString():"数据库此字段为空";
+                String unit = part.get("unit").toString()!=null?part.get("unit").toString():"数据库此字段为空";
+                String module = part.get("module").toString()!=null?part.get("module").toString():"数据库此字段为空";
+                String spec = part.get("spec").toString()!=null?part.get("spec").toString():"数据库此字段为空";
+                String mark = part.get("mark").toString()!=null?part.get("mark").toString():"数据库此字段为空";
+                List<Map> conditions = Arrays.asList(  YDConf.searchCondition_TextFiled("textField_logkj6a6", part.get("partNumber"), "eq"));
+                List<Map> list  = (List<Map>) ydClient.queryData(YDParam.builder()
+                                .formUuid("FORM-4D1B011EF0CC4CB8A5272BE0B5C4D073FKK8")
+                                .searchCondition(JSONObject.toJSONString(conditions))
+                                .build()
+                        ,YDConf.FORM_QUERY.retrieve_list).getData();
+                Map formData = UtilMap.map(sc,partNumber,description,unit,module,spec,mark);
+                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-4D1B011EF0CC4CB8A5272BE0B5C4D073FKK8")
+                            .formDataJson(JSONObject.toJSONString(formData))
+                            .build(), YDConf.FORM_OPERATION.create).toString();
+                }
+            }
+
+
+        }
+        return McR.success();
+    }
+
+    @Override
+    public McR supplierInformation() throws JacksonException {
+        HashMap head = new HashMap();
+        head.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
+
+        HashMap<String,Object> body = new HashMap();
+        ArrayList<Map<String,String>> partsList = new ArrayList<>();
+
+        HashMap<String, Object> part1 = new HashMap<>();
+        part1.put("supplierCode","");
+        part1.put("name","");
+
+        body.put("suppliers",partsList);
+
+        String dd = UtilHttp.doPost("http://192.168.3.80:10001/api/public/GetAllSuppliers", head, null, body);
+
+        ObjectMapper objectMapper  = new ObjectMapper();
+        JsonNode rootNode = objectMapper.readTree(dd);
+        JsonNode partsNode = rootNode.get("suppliers");
+        List<Map<String, String>> List = new ArrayList<>();
+        Map<String, Map<String, String>> partsMap = new ConcurrentHashMap<>();
+        if (partsNode != null && partsNode.isArray()) {
+            for (JsonNode partNode : partsNode) {
+                Map<String, String> partData = new HashMap<>();
+                partData.put("supplierCode", partNode.get("supplierCode").asText());
+                partData.put("name", partNode.get("name").asText());
+
+                List.add(partData);
+                partsMap.put(partNode.get("supplierCode").asText(), partData);
+            }
+        }
+        System.out.println("\n=== 遍历所有供应商 ===个数:"+List.size());
+        int i = 0;
+        for (Map<String, String> part : List) {
+            i++;
+            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()
+                            .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();
+            }
+
+        }
+
+        return McR.success();
+    }
+
+    @Override
+    public McR queryInventory(Map<String,String> boddy) throws JacksonException {
+        HashMap header = new HashMap();
+        header.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
+        HashMap body = new HashMap();
+        body.put("PartNumber",boddy.get("PartNumber").toString());
+        String dd = UtilHttp.doPost("http://192.168.3.80:10001/api/public/GetPartLocationInfos", header, null, body);
+
+        HashMap map = new HashMap();
+        ObjectMapper mapper = new ObjectMapper();
+        JsonNode rootNode = mapper.readTree(dd);
+        JsonNode warehouses = rootNode.path("waresehouses");
+        String warehouseName,partLocationName = "";//仓库:warehouseName   库位:partLocationName
+        double partLocationBalance;//库存余额:partLocationBalance
+        for (JsonNode warehouse : warehouses) {
+            warehouseName = warehouse.path("warehouseName").asText();
+            JsonNode partLocations = warehouse.path("partLocations");
+            for (JsonNode location : partLocations) {
+                partLocationName = location.path("partLocationName").asText();
+                partLocationBalance = location.path("partLocationBalance").asDouble();
+                map.put("warehouseName",warehouseName);
+                map.put("partLocationName",partLocationName);
+                map.put("partLocationBalance",partLocationBalance);
+            }
+        }
+        return McR.success(map);
+    }
+
+    @Override
+    public McR purchaseOrder(String instanceId) throws JacksonException {
+        Map data = (Map) ydClient.queryData(YDParam.builder().formInstId(instanceId)
+                .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
+                .userId(ddConf.getOperator()).build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
+        System.out.println(data);
+        HashMap header = new HashMap();
+        header.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
+        //创建主map
+        HashMap purchaseOrder  = new HashMap();
+        purchaseOrder.put("PurchaseOrderNumber",data.get("serialNumberField_mk21zzwk").toString());//采购订单编号
+        purchaseOrder.put("SupplierCode",data.get("textField_mhd2mu8c").toString());//供应商编码
+        purchaseOrder.put("OrderType",data.get("textField_mhd2mu8d").toString());//订单类型
+        purchaseOrder.put("Warehouse",data.get("selectField_mhd3jyfb").toString());//仓库
+        purchaseOrder.put("BusinessContactOrderNumber","");//采购合同编码
+        purchaseOrder.put("OurReference","");//我方联系人
+        purchaseOrder.put("GoodsLabel","");//行货物标签(不传)
+        purchaseOrder.put("Currency","元");//货币
+        // 创建Rows数组
+        List<Map<String, Object>> rows = new ArrayList<>();
+        List<Map> jsonString = (List<Map>)data.get("tableField_logke6sx");
+        for (Map map : jsonString){
+            HashMap rowItem = new HashMap();
+            rowItem.put("PartNumber",map.get("textField_logkj6au").toString());//组件号
+
+            String purchaseNum = new BigDecimal(map.get("numberField_logke6t1").toString())
+                    .setScale(2,BigDecimal.ROUND_HALF_UP).toString();
+            rowItem.put("OrderedQuantity",purchaseNum);//采购数量
+
+            String price = new BigDecimal(map.get("numberField_mh9x8r54").toString())
+                    .setScale(2,BigDecimal.ROUND_HALF_UP).toString();
+            rowItem.put("Price",price);//单价
+
+            rowItem.put("Unit",map.get("selectField_logkj6ak").toString().equals("") ? "" : map.get("selectField_logkj6ak").toString());//单位
+
+            long time = (long)data.get("dateField_loglna5u");
+            String utc = convertTimestampToDateString(time, "UTC", "yyyy-MM-dd");
+            rowItem.put("RequirementDate",utc);//交货日期
+
+            String vat = new BigDecimal(map.get("numberField_mhj15z8w").toString())
+                    .setScale(2,BigDecimal.ROUND_HALF_UP).toString();
+            rowItem.put("Vat",vat);
+
+            rows.add(rowItem);
+        }
+        purchaseOrder.put("Rows", rows);
+        System.out.println(purchaseOrder);
+        //调用接口
+        String dd = UtilHttp.doPost("http://192.168.3.80:10001/api/public/CreatePurchaseOrder", header, null, purchaseOrder);
+        System.out.println(dd);
+        return McR.success(dd);
+    }
+
+    @Override
+    public Map pickingList(Map<String,String> boddy) throws JacksonException {
+        HashMap header = new HashMap();
+        header.put("Authorization","ccd9220f-db1d-4aa1-aa1d-8a2c9180f801");
+        HashMap body = new HashMap();
+        body.put("PLNumber",boddy.get("PLNumber").toString());
+        String dd = UtilHttp.doPost("http://192.168.3.80:10001/api/public/GetPickingListInfos", header, null, body);
+        ObjectMapper mapper =new ObjectMapper();
+        Map node =mapper.readValue(dd,Map.class);
+        System.out.println("返回值:"+node);
+        return node;
+    }
+
+    public  String convertTimestampToDateString(long timestamp, String timeZone, String pattern) {
+        // 将时间戳转换为Instant
+        Instant instant = Instant.ofEpochMilli(timestamp);
+        // 将Instant转换为指定时区的日期
+        LocalDate date = instant.atZone(ZoneId.of(timeZone)).toLocalDate();
+        date = date.plusDays(1);
+        // 创建一个DateTimeFormatter来格式化日期
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        // 格式化LocalDate为字符串
+        String formattedDate = date.format(formatter);
+        // 返回格式化后的日期字符串
+        return formattedDate;
+    }
+
+}

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

@@ -0,0 +1,27 @@
+package com.malk.junengtai.service;
+
+import com.fasterxml.jackson.core.JacksonException;
+import com.malk.server.common.McR;
+
+import java.util.Map;
+
+public interface PurchaseService {
+
+    /*手动同步档案表数据*/
+    McR synchronizedArchiveTable(String name) throws JacksonException;
+
+    /*同步组件信息*/
+    McR ComponentInformation() throws JacksonException;
+
+    /*供应商信息*/
+    McR supplierInformation() throws  JacksonException;
+
+    /*查询库存信息*/
+    McR queryInventory(Map<String,String> body) throws JacksonException;
+
+    /*创建采购订单接口*/
+    McR purchaseOrder(String instanceId) throws  JacksonException;
+
+    /*查询拣货单接口*/
+    Map pickingList(Map<String,String> body) throws JacksonException;
+}

+ 85 - 0
mjava-junengtai/src/main/java/com/malk/junengtai/test/test.java

@@ -0,0 +1,85 @@
+package com.malk.junengtai.test;
+
+import com.alibaba.fastjson.JSONObject;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.aliwork.YDSearch;
+import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@Slf4j
+@RequestMapping("/test")
+public class test {
+    @Autowired
+    private YDClient ydClient;
+    @Autowired
+    private YDConf ydConf;
+
+    @PostMapping("/test1")
+    McR test1(){
+        System.out.println("接口正常!");
+        return McR.success("接口正常!");
+    }
+
+    /*批量修改数据*/
+    @PostMapping("/test2")
+    McR test2(){
+        //1、查询所有的收票数据
+        String instanceId = "FORM-27421C0D0ACA41DFB85D05A9878161B1SDCE";
+        YDParam ydParam = YDParam.builder().formUuid(instanceId).build();
+        ydParam.setPageSize(1);
+        long totalCount = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getTotalCount();
+        System.out.println(totalCount);
+
+        List<Map> dataList = new ArrayList<>();
+        ydParam.setCurrentPage(1);
+        ydParam.setPageSize(100);
+        for (int page = 1; page <= (Math.ceil(totalCount / 100 )!=0?Math.ceil(totalCount / 100 + 1):1); page++) {
+            ydParam.setCurrentPage(page);
+            dataList.addAll((List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData());
+        }
+        //2、遍历收票数据
+        int i = 0;
+        for(Map li: dataList){
+            i ++ ;
+            String currentInstanceId = (String) li.get("formInstanceId");
+            System.out.println(currentInstanceId);
+            //3、遍历子表单,求和明细数据
+            Map data =ydClient.queryData(YDParam.builder().formInstId(currentInstanceId)
+                    .appType(ydConf.getAppType()).systemToken(ydConf.getSystemToken())
+                    .userId("332051151139376769").build(), YDConf.FORM_QUERY.retrieve_id).getFormData();
+            Double A_total = 0.0;
+            List<Map> jsonString = (List<Map>)data.get("tableField_m8oaxbru");
+            for (Map map1 : jsonString) {
+                Object o = map1.get("numberField_m8oaxbry");
+                System.out.println(o);
+                double d = ((Number) o).doubleValue();
+                System.out.println(d);
+                A_total = A_total + d;
+            }
+            System.out.println("总金额:" + A_total);
+            //4、更新发票汇总字段
+            ydClient.operateData(YDParam.builder()
+                    .appType(ydConf.getAppType())
+                    .systemToken(ydConf.getSystemToken())
+                    .formInstanceId(currentInstanceId)
+                    .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("numberField_mkax9d6k",A_total)))
+                    .build(), YDConf.FORM_OPERATION.update);
+            log.info("{}/{}",i,dataList.size());
+        }
+        return McR.success();
+    }
+
+}

+ 88 - 0
mjava-junengtai/src/main/resources/application-dev.yml

@@ -0,0 +1,88 @@
+# 环境配置
+server:
+  port: 8086
+  servlet:
+    context-path: /api/junengtai
+
+# condition
+spel:
+  scheduling: false        # 定时任务是否执行
+  multiSource: false       # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+#      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: ounuo_user
+    password: OUNUO123!
+    url: jdbc:mysql://ounuo.raresoft.net:33306/TASK
+  jpa:
+    hibernate:
+      ddl-auto: none
+    show-sql: true
+    database: oracle
+  hikari:
+    pool-name: DateHikariCP
+    minimum-idle: 0
+    maximum-pool-size: 10
+    idle-timeout: 30000
+    max-lifetime: 120000          # 小于数据库超时大于业务执行返回时间[hikari默认30m, mysql默认10m]
+    connection-timeout: 30000     # 数据库连接超时时间,默认30秒,即30000
+
+
+
+  #    # 主库
+#    primary:
+#      username: root
+#      password: mu123
+#      jdbc-url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+#    # 从库
+#    slave:
+#      username: root
+#      password: mu123
+#      jdbc-url: jdbc:mysql://127.0.0.1:3306/mjava_slave?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+#  jpa:
+#    hibernate:
+#      ddl-auto: none      # JPA对表没有任何操作
+#    show-sql: true
+#    database: ORACLE
+#    database-platform: org.hibernate.dialect.Oracle12cDialect
+
+# filepath
+file:
+  path:
+    file: /Users/malk/server/_Tool/var/mjava/tmp/file/
+    image: /Users/malk/server/_Tool/var/mjava/tmp/image/
+    tmp: /Users/malk/server/_Tool/var/mjava/tmp/
+  source:
+    fonts: /Users/malk/server/_Tool/fonts/simsun.ttc
+logging:
+  file:
+    path: /Users/malk/server/_Tool/var/mjava/log
+
+# dingtalk 钉钉
+dingtalk:
+  agentId: 4074144499
+  appKey: ding21enhh8fzggqyuwu
+  appSecret: PemxcBGHaEa083YRQt_q2jjGIYBATmw9ddXr6bYtFEkuBHTdqOD5NbYDj12b9-ua
+  corpId: dingfa48ac9cae50fe6ba1320dcb25e91351
+  aesKey:
+  token:
+  operator: 33205115111170152911   # OA管理员账号:鲜明阳 [0开头需要转一下字符串]
+
+# aliwork 宜搭
+aliwork:
+  appType: APP_NJPKQLYOZNQ7P3JNCW6T
+  systemToken: S4E66I8119TYN5WO6MISKDTDJV5C2FWX24FFM0I
+
+# MyBatis配置
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.malk.junengtai.entity
+  configuration:
+    map-underscore-to-camel-case: true
+
+#定时器
+enable:
+  scheduling: true

+ 76 - 0
mjava-junengtai/src/main/resources/application-prod.yml

@@ -0,0 +1,76 @@
+# 环境配置
+server:
+  port: 9001
+  servlet:
+    context-path: /api/junengtai
+
+# condition
+spel:
+  scheduling: false        # 定时任务是否执行
+  multiSource: false       # 是否多数据源配置
+
+spring:
+  # database
+  datasource:
+    hikari:
+    #      connection-init-sql: SET NAMES utf8mb4 COLLATE utf8mb4_unicode_ci           # SqlServer, Oracle 无需设置类型
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    username: ounuo_user
+    password: OUNUO123!
+    url: jdbc:mysql://ounuo.raresoft.net:33306/TASK
+
+
+  #    # 主库
+  #    primary:
+  #      username: root
+  #      password: mu123
+  #      jdbc-url: jdbc:mysql://127.0.0.1:3306/mjava?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+  #    # 从库
+  #    slave:
+  #      username: root
+  #      password: mu123
+  #      jdbc-url: jdbc:mysql://127.0.0.1:3306/mjava_slave?serverTimezone=Asia/Shanghai&useUnicode=yes&characterEncoding=UTF-8&useSSL=true
+  jpa:
+    hibernate:
+      ddl-auto: none      # JPA对表没有任何操作
+    show-sql: true
+    database: ORACLE
+    database-platform: org.hibernate.dialect.Oracle12cDialect
+
+# filepath
+file:
+  path:
+    file: /Users/malk/server/_Tool/var/mjava/tmp/file/
+    image: /Users/malk/server/_Tool/var/mjava/tmp/image/
+    tmp: /Users/malk/server/_Tool/var/mjava/tmp/
+  source:
+    fonts: /Users/malk/server/_Tool/fonts/simsun.ttc
+logging:
+  file:
+    path: /Users/malk/server/_Tool/var/mjava/log
+
+# dingtalk 钉钉
+dingtalk:
+  agentId: 4074144499
+  appKey: ding21enhh8fzggqyuwu
+  appSecret: PemxcBGHaEa083YRQt_q2jjGIYBATmw9ddXr6bYtFEkuBHTdqOD5NbYDj12b9-ua
+  corpId: dingfa48ac9cae50fe6ba1320dcb25e91351
+  aesKey:
+  token:
+  operator: 33205115111170152911   # OA管理员账号:鲜明阳 [0开头需要转一下字符串]
+
+# aliwork 宜搭
+aliwork:
+  appType: APP_NJPKQLYOZNQ7P3JNCW6T
+  systemToken: S4E66I8119TYN5WO6MISKDTDJV5C2FWX24FFM0I
+
+# MyBatis配置
+mybatis:
+  mapper-locations: classpath:mapper/*.xml
+  type-aliases-package: com.malk.junengtai.entity
+  configuration:
+    map-underscore-to-camel-case: true
+
+#定时器
+enable:
+  scheduling: true

+ 3 - 0
mjava-junengtai/src/main/resources/application.yml

@@ -0,0 +1,3 @@
+spring:
+  profiles:
+    active: dev