Skip to content

M
mall-adapter
提交 28e848f5 authored 作者: inroi's avatar inroi
浏览文件
操作

微调

上级 81825ce1
隐藏空白字符变更
内嵌 并排
正在显示 包含 341 行增加 和 154 行删除
pom.xml
浏览文件 @ 28e848f5
......@@ -59,12 +59,6 @@
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-boot-starter</artifactId>
<version>${mybatis.version}</version>
......
src/main/java/com/system/api/CommonApi.java
浏览文件 @ 28e848f5
package com.system.api;
import com.system.constants.Constants;
import com.system.transfer.form.FormFieldMappingDetailOutVoRecords;
import com.system.transfer.form.MallFieldMappingListOutVoRecords;
import org.springframework.util.CollectionUtils;
import java.math.BigDecimal;
......@@ -15,13 +15,13 @@ import java.util.Map;
*/
public class CommonApi {
public static Map<String, Object> purchaseData(Map<String, String> config, List<Map<String, Object>> dataList, List<FormFieldMappingDetailOutVoRecords> fieldList) {
public static Map<String, Object> purchaseData(Map<String, String> config, List<Map<String, Object>> dataList, List<MallFieldMappingListOutVoRecords> fieldList) {
Map<String, Object> request = new LinkedHashMap<>(2);
List<Map<String, Object>> tempList = new ArrayList<>();
for (Map<String, Object> data : dataList) {
Map<String, Object> temp = new LinkedHashMap<>();
for (FormFieldMappingDetailOutVoRecords records : fieldList) {
if (Constants.IS_ENTRY_CODE.equals(records.getIsEntryField())) {
for (MallFieldMappingListOutVoRecords records : fieldList) {
if (Constants.SUCCESS_CODE.equals(records.getIsEntryField())) {
purchaseFieldData(data, temp, records);
} else {
purchaseFieldData(data, request, records);
......@@ -33,12 +33,12 @@ public class CommonApi {
}
if (!CollectionUtils.isEmpty(tempList)) {
request.put("children", tempList);
request.put(config.get("entryName"), tempList);
}
return request;
}
private static void purchaseFieldData(Map<String, Object> temp, Map<String, Object> data, FormFieldMappingDetailOutVoRecords records) {
private static void purchaseFieldData(Map<String, Object> temp, Map<String, Object> data, MallFieldMappingListOutVoRecords records) {
String fieldType = records.getFieldType();
String fieldBeforeMapping = records.getFieldBeforeMapping();
String fieldAfterMapping = records.getFieldAfterMapping();
......
src/main/java/com/system/api/CommonGetApi.java
浏览文件 @ 28e848f5
package com.system.api;
import com.system.constants.Constants;
import com.system.transfer.form.FormFieldMappingDetailOutVoRecords;
import com.system.utils.*;
import com.system.transfer.form.MallFieldMappingListOutVoRecords;
import com.system.utils.FormFieldMappingUtil;
import com.system.utils.HttpUtil;
import com.system.utils.JsonUtil;
import com.system.utils.ThirdPartyLogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -22,27 +25,33 @@ public class CommonGetApi {
private ThirdPartyLogUtil thirdPartyLogUtil;
public String commonGet(Map<String, String> config, String json, String queueId) {
public String commonGet(Map<String, String> config, Map<String, Object> data, String queueId) {
Map<String, Object> response = new HashMap<>(3);
List<MallFieldMappingListOutVoRecords> fieldList = FormFieldMappingUtil.purchaseMapping(config.get("formFieldMappingDetail"));
List<String> tempList = fieldList.stream().map(MallFieldMappingListOutVoRecords::getFieldBeforeMapping).collect(Collectors.toList());
Map<String, Object> request = new HashMap<>();
request.put("formId", config.get("docType"));
request.put("fields", String.join(",", tempList));
request.put("data", data);
String result = "";
try {
if (StringUtil.isNotBlank(json)) {
result = HttpUtil.httpPost(config.get("requestAddress"), json).getBody();
} else {
result = HttpUtil.httpGet(config.get("requestAddress")).getBody();
}
result = HttpUtil.httpPost(config.get("requestAddress"), JsonUtil.toString(request)).getBody();
} catch (Exception e) {
e.printStackTrace();
response.put("message", "Http请求异常");
response.put("success", false);
return JsonUtil.toString(response);
}
int flag = 0;
Map<String, Object> response = new HashMap<>(3);
Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
if (!CollectionUtils.isEmpty(map)) {
if (Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
List<Object> objectList = JsonUtil.toList(JsonUtil.toString(map.get("data")), Object.class);
List<Map<String, Object>> dataList = objectList.stream().map(m -> JsonUtil.toMap(JsonUtil.toString(m), String.class, Object.class)).collect(Collectors.toList());
List<FormFieldMappingDetailOutVoRecords> fieldList = FormFieldMappingUtil.purchaseMapping(config.get("formFieldMappingDetail"));
response.put("data", CommonApi.purchaseData(config, dataList, fieldList));
response.put("success", true);
flag = 1;
......@@ -55,8 +64,7 @@ public class CommonGetApi {
response.put("success", false);
}
System.out.println(response);
thirdPartyLogUtil.thirdPartyLogCreate(config.get("name"), config.get("docType"), queueId, config.get("configureDirection"), StringUtil.isNotBlank(json) ? json : config.get("requestAddress"), result, flag);
thirdPartyLogUtil.thirdPartyLogCreate(config.get("name"), config.get("docType"), queueId, config.get("configureDirection"), JsonUtil.toString(request), result, flag);
return JsonUtil.toString(response);
}
......
src/main/java/com/system/api/CommonPostApi.java
浏览文件 @ 28e848f5
package com.system.api;
import com.system.constants.Constants;
import com.system.transfer.form.FormFieldMappingDetailOutVoRecords;
import com.system.transfer.form.MallFieldMappingListOutVoRecords;
import com.system.utils.FormFieldMappingUtil;
import com.system.utils.HttpUtil;
import com.system.utils.JsonUtil;
......@@ -28,11 +28,13 @@ public class CommonPostApi {
Map<String, Object> response = new HashMap<>(3);
try {
List<FormFieldMappingDetailOutVoRecords> fieldList = FormFieldMappingUtil.purchaseMapping(config.get("formFieldMappingDetail"));
List<MallFieldMappingListOutVoRecords> fieldList = FormFieldMappingUtil.purchaseMapping(config.get("formFieldMappingDetail"));
Map<String, Object> data = CommonApi.purchaseData(config, dataList, fieldList);
String result = HttpUtil.httpPost(config.get(""), JsonUtil.toString(data)).getBody();
Map<String, Object> request = new HashMap<>();
request.put("formId", config.get("docType"));
request.put("model", data);
String result = HttpUtil.httpPost(config.get("requestAddress"), JsonUtil.toString(request)).getBody();
Map<String, Object> map = JsonUtil.toMap(result, String.class, Object.class);
if (!CollectionUtils.isEmpty(map)) {
if (Constants.SUCCESS_CODE.equals(String.valueOf(map.get(Constants.SUCCESS_NAME)))) {
......@@ -47,7 +49,7 @@ public class CommonPostApi {
response.put("success", false);
}
thirdPartyLogUtil.thirdPartyLogCreate(config.get("name"), config.get("docType"), queueId, config.get("configureDirection"), JsonUtil.toString(data), result, flag);
thirdPartyLogUtil.thirdPartyLogCreate(config.get("name"), config.get("docType"), queueId, config.get("configureDirection"), JsonUtil.toString(request), result, flag);
return JsonUtil.toString(response);
} catch (Exception e) {
response.put("message", e.getMessage());
......
src/main/java/com/system/constants/CommonGetConstants.java → src/main/java/com/system/constants/MallCommonGetConstants.java
浏览文件 @ 28e848f5
package com.system.constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.system.dao.CustomFormConfigMapper;
import com.system.transfer.form.CustomFormConfigListInVo;
import com.system.transfer.form.CustomFormConfigListOutVoRecords;
import com.system.dao.MallCommonConfigMapper;
import com.system.transfer.form.MallCommonConfigListInVo;
import com.system.transfer.form.MallCommonConfigListOutVoRecords;
import com.system.utils.JsonUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -13,24 +13,31 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author Inori
*/
@Component
public class CommonGetConstants {
public class MallCommonGetConstants {
private Map<String, Map<String, String>> map = new ConcurrentHashMap<>();
@Autowired
private CustomFormConfigMapper customFormConfigMapper;
private MallCommonConfigMapper mallCommonConfigMapper;
@PostConstruct
public void init() {
List<CustomFormConfigListOutVoRecords> recordsList = customFormConfigMapper.customFormConfigList(new Page<>(0, 10000), new CustomFormConfigListInVo(1));
for (CustomFormConfigListOutVoRecords records : recordsList) {
this.map.put(records.getDocType(), this.purchaseCustomFormConfig(records));
List<MallCommonConfigListOutVoRecords> recordsList = mallCommonConfigMapper.mallCommonConfigList(new MallCommonConfigListInVo(Stream.of(1, 3).collect(Collectors.toList())));
if (!CollectionUtils.isEmpty(recordsList)) {
List<Integer> idList = recordsList.stream().map(MallCommonConfigListOutVoRecords::getId).collect(Collectors.toList());
List<Map<String, Object>> fieldMappingList = mallCommonConfigMapper.mallFieldMappingList(idList);
for (MallCommonConfigListOutVoRecords records : recordsList) {
List<Map<String, Object>> tempList = fieldMappingList.stream().filter(m -> records.getId().equals(m.get("id"))).collect(Collectors.toList());
this.map.put(records.getDocType(), this.purchaseCustomFormConfig(records, tempList));
}
}
}
......@@ -44,15 +51,14 @@ public class CommonGetConstants {
/**
* 封装自定义表单配置
*/
private Map<String, String> purchaseCustomFormConfig(CustomFormConfigListOutVoRecords records) {
private Map<String, String> purchaseCustomFormConfig(MallCommonConfigListOutVoRecords records, List<Map<String, Object>> tempList) {
Map<String, String> result = new HashMap<>(10);
result.put("docType", records.getDocType());
result.put("name", records.getName());
result.put("configureDirection", records.getConfigureDirection());
result.put("operation", records.getOperation() == 1 ? "Get" : "Post");
result.put("operation", String.valueOf(records.getOperation()));
result.put("requestAddress", records.getRequestAddress());
result.put("customSql", records.getCustomSql());
result.put("formFieldMappingDetail", records.getFormFieldMappingDetail());
result.put("formFieldMappingDetail", JsonUtil.toString(tempList));
return result;
}
......
src/main/java/com/system/constants/CommonPostConstants.java → src/main/java/com/system/constants/MallCommonPostConstants.java
浏览文件 @ 28e848f5
package com.system.constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.system.dao.CustomFormConfigMapper;
import com.system.transfer.form.CustomFormConfigListInVo;
import com.system.transfer.form.CustomFormConfigListOutVoRecords;
import com.system.dao.MallCommonConfigMapper;
import com.system.transfer.form.MallCommonConfigListInVo;
import com.system.transfer.form.MallCommonConfigListOutVoRecords;
import com.system.utils.JsonUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
......@@ -13,24 +13,31 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
* @author Inori
*/
@Component
public class CommonPostConstants {
public class MallCommonPostConstants {
private Map<String, Map<String, String>> map = new ConcurrentHashMap<>();
@Autowired
private CustomFormConfigMapper customFormConfigMapper;
private MallCommonConfigMapper mallCommonConfigMapper;
@PostConstruct
public void init() {
List<CustomFormConfigListOutVoRecords> recordsList = customFormConfigMapper.customFormConfigList(new Page<>(0, 10000), new CustomFormConfigListInVo(2));
for (CustomFormConfigListOutVoRecords records : recordsList) {
this.map.put(records.getDocType(), this.purchaseCustomFormConfig(records));
List<MallCommonConfigListOutVoRecords> recordsList = mallCommonConfigMapper.mallCommonConfigList(new MallCommonConfigListInVo(Stream.of(2).collect(Collectors.toList())));
if (!CollectionUtils.isEmpty(recordsList)) {
List<Integer> idList = recordsList.stream().map(MallCommonConfigListOutVoRecords::getId).collect(Collectors.toList());
List<Map<String, Object>> fieldMappingList = mallCommonConfigMapper.mallFieldMappingList(idList);
for (MallCommonConfigListOutVoRecords records : recordsList) {
List<Map<String, Object>> tempList = fieldMappingList.stream().filter(m -> records.getId().equals(m.get("id"))).collect(Collectors.toList());
this.map.put(records.getDocType(), this.purchaseCustomFormConfig(records, tempList));
}
}
}
......@@ -44,14 +51,14 @@ public class CommonPostConstants {
/**
* 封装自定义表单配置
*/
private Map<String, String> purchaseCustomFormConfig(CustomFormConfigListOutVoRecords records) {
private Map<String, String> purchaseCustomFormConfig(MallCommonConfigListOutVoRecords records, List<Map<String, Object>> tempList) {
Map<String, String> result = new HashMap<>(10);
result.put("docType", records.getDocType());
result.put("name", records.getName());
result.put("operation", records.getOperation() == 1 ? "Get" : "Post");
result.put("configureDirection", records.getConfigureDirection());
result.put("requestAddress", records.getRequestAddress());
result.put("operation", String.valueOf(records.getOperation()));
result.put("customSql", records.getCustomSql());
result.put("formFieldMappingDetail", records.getFormFieldMappingDetail());
result.put("formFieldMappingDetail", JsonUtil.toString(tempList));
return result;
}
......
src/main/java/com/system/controller/MallCommonGetController.java 0 → 100644
浏览文件 @ 28e848f5
package com.system.controller;
import com.system.serivce.IMallCommonGetService;
import com.system.transfer.common.MallCommonGetInVo;
import com.system.transfer.response.RestResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* @author Inori
*/
@Api(tags = "通用查询")
@RestController
@RequestMapping("/api")
public class MallCommonGetController {
@Autowired
private IMallCommonGetService mallCommonGetService;
@ApiOperation("通用查询")
@PostMapping("/mall/common/get")
public RestResponse mallCommonGet(@RequestBody MallCommonGetInVo inVo) {
return mallCommonGetService.mallCommonGet(inVo);
}
}
src/main/java/com/system/dao/CustomFormConfigMapper.java deleted 100644 → 0
浏览文件 @ 81825ce1
package com.system.dao;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.system.transfer.form.CustomFormConfigListInVo;
import com.system.transfer.form.CustomFormConfigListOutVoRecords;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author Inori
*/
public interface CustomFormConfigMapper {
/**
* 自定义表单配置列表
*
* @param page 分页
* @param inVo 条件
* @return 列表
*/
List<CustomFormConfigListOutVoRecords> customFormConfigList(@Param("page") Page<CustomFormConfigListOutVoRecords> page, @Param("inVo") CustomFormConfigListInVo inVo);
}
src/main/java/com/system/dao/MallCommonConfigMapper.java 0 → 100644
浏览文件 @ 28e848f5
package com.system.dao;
import com.system.transfer.form.MallCommonConfigListInVo;
import com.system.transfer.form.MallCommonConfigListOutVoRecords;
import java.util.List;
import java.util.Map;
/**
* @author Inori
*/
public interface MallCommonConfigMapper {
/**
* 商城表单配置列表
*
* @param inVo 条件
* @return 列表
*/
List<MallCommonConfigListOutVoRecords> mallCommonConfigList(MallCommonConfigListInVo inVo);
/**
* 商城通用配置字段映射列表
*
* @param idList id列表
* @return 列表
*/
List<Map<String, Object>> mallFieldMappingList(List<Integer> idList);
}
src/main/java/com/system/dao/mapper/CustomFormConfigMapper.xml deleted 100644 → 0
浏览文件 @ 81825ce1
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.system.dao.CustomFormConfigMapper">
<select id="customFormConfigList" parameterType="com.system.transfer.form.CustomFormConfigListInVo" resultType="com.system.transfer.form.CustomFormConfigListOutVoRecords">
SELECT
id, doc_type, `name`, configure_direction, operation, request_address, custom_sql, form_field_mapping_detail, create_time
FROM tb_custom_form_config
</select>
</mapper>
src/main/java/com/system/dao/mapper/MallCommonConfigMapper.xml 0 → 100644
浏览文件 @ 28e848f5
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.system.dao.MallCommonConfigMapper">
<select id="mallCommonConfigList" parameterType="com.system.transfer.form.MallCommonConfigListInVo" resultType="com.system.transfer.form.MallCommonConfigListOutVoRecords">
SELECT
m1.id, m1.doc_type, m1.name, m1.request_address, m1.operation, m1.custom_sql, m1.create_time
FROM tb_mall_common_config AS m1 INNER JOIN (
SELECT
doc_type, MIN(operation) AS operation
FROM tb_mall_common_config
GROUP BY doc_type
) AS m2 ON m1.doc_type = m2.doc_type AND m1.operation = m2.operation
WHERE m1.operation IN
<foreach collection="operationList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
</select>
<select id="mallFieldMappingList" parameterType="java.util.List" resultType="java.util.Map">
SELECT
mall_common_config_id AS id, field_before_mapping AS fieldBeforeMapping, field_before_mapping_name AS fieldBeforeMappingName,
field_type AS fieldType, is_entry_field AS isEntryField, field_after_mapping AS fieldAfterMapping, field_after_mapping_name AS fieldAfterMappingName
FROM tb_mall_field_mapping WHERE mall_common_config_id IN
<foreach collection="idList" item="item" separator="," open="(" close=")">
#{item}
</foreach>
ORDER by id, sort_order ASC
</select>
</mapper>
src/main/java/com/system/dao/mapper/ThirdPartyLogMapper.xml
浏览文件 @ 28e848f5
......@@ -6,7 +6,7 @@
<select id="getThirdPartyLogByQueueId" parameterType="java.lang.String" resultType="java.lang.Integer">
SELECT COUNT(*) FROM tb_third_party_log WHERE queue_id = #{queueId} LIMIT 1
SELECT COUNT(*) FROM tb_mall_third_party_log WHERE queue_id = #{queueId} LIMIT 1
</select>
......@@ -14,7 +14,7 @@
<insert id="thirdPartyLogCreate" parameterType="com.system.transfer.log.ThirdPartyLogCreateInVo" useGeneratedKeys="true" keyProperty="id">
INSERT INTO tb_third_party_log (
INSERT INTO tb_mall_third_party_log (
`name`, code, queue_id, direction, request, flag, response, message
) VALUES (
#{name}, #{code}, #{queueId}, #{direction}, #{request}, #{flag}, #{response}, #{message}
......
src/main/java/com/system/serivce/IMallCommonGetService.java 0 → 100644
浏览文件 @ 28e848f5
package com.system.serivce;
import com.system.transfer.common.MallCommonGetInVo;
import com.system.transfer.response.RestResponse;
/**
* @author Inori
*/
public interface IMallCommonGetService {
/**
* 通用查询
*
* @param inVo 条件
* @return 结果
*/
RestResponse mallCommonGet(MallCommonGetInVo inVo);
}
src/main/java/com/system/serivce/impl/ICommonHttpServiceImpl.java
浏览文件 @ 28e848f5
......@@ -21,6 +21,7 @@ public class ICommonHttpServiceImpl implements ICommonHttpService {
@Override
public void dockingShoppingMallCommodity(PlatformDockingShoppingMallCommodityInVo inVo) {
System.out.println(inVo);
ResponseEntity<String> responseEntity = HttpUtil.httpPost("http://192.168.0.9:8089/api/dataSyn/getSyn", JsonUtil.toString(Stream.of(inVo.getId()).collect(Collectors.toList())));
System.out.println(responseEntity.getBody());
......
src/main/java/com/system/serivce/impl/MallCommonGetServiceImpl.java 0 → 100644
浏览文件 @ 28e848f5
package com.system.serivce.impl;
import com.system.api.CommonGetApi;
import com.system.constants.MallCommonGetConstants;
import com.system.serivce.IMallCommonGetService;
import com.system.transfer.common.MallCommonGetInVo;
import com.system.transfer.response.RestResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.Map;
/**
* @author Inori
*/
@Service
public class MallCommonGetServiceImpl implements IMallCommonGetService {
@Autowired
private CommonGetApi commonGetApi;
@Autowired
private MallCommonGetConstants mallCommonGetConstants;
@Override
public RestResponse mallCommonGet(MallCommonGetInVo inVo) {
Map<String, String> config = mallCommonGetConstants.get(inVo.getDocType());
if (CollectionUtils.isEmpty(config)) {
return RestResponse.fail("操作失败！第三方标识为: " + inVo.getDocType() + "的标识不存在");
}
String result = commonGetApi.commonGet(config, inVo.getData(), inVo.getQueueId());
return null;
}
}
src/main/java/com/system/serivce/impl/SynchronizationServiceImpl.java
浏览文件 @ 28e848f5
......@@ -2,7 +2,7 @@ package com.system.serivce.impl;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.system.api.CommonGetApi;
import com.system.constants.CommonGetConstants;
import com.system.constants.MallCommonGetConstants;
import com.system.serivce.ISynchronizationService;
import com.system.utils.HttpUtil;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -28,7 +28,7 @@ public class SynchronizationServiceImpl implements ISynchronizationService {
new ThreadPoolExecutor.AbortPolicy());
@Autowired
private CommonGetConstants commonGetConstants;
private MallCommonGetConstants mallCommonGetConstants;
@Autowired
private CommonGetApi commonGetApi;
......
src/main/java/com/system/transfer/common/MallCommonGetInVo.java 0 → 100644
浏览文件 @ 28e848f5
package com.system.transfer.common;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Map;
/**
* @author Inori
*/
@Data
public class MallCommonGetInVo {
/**
* 标识
*/
@NotBlank(message = "参数docType缺失")
private String docType;
/**
* 唯一标识
*/
private String queueId;
/**
* 查询参数
*/
@NotNull(message = "参数data缺失")
private Map<String, Object> data;
}
src/main/java/com/system/transfer/form/CustomFormConfigListInVo.java → src/main/java/com/system/transfer/form/MallCommonConfigListInVo.java
浏览文件 @ 28e848f5
......@@ -2,35 +2,25 @@ package com.system.transfer.form;
import lombok.Data;
import java.util.List;
/**
* @author Inori
*/
@Data
public class CustomFormConfigListInVo {
/**
* 操作(1-查询 2-创建)
*/
private Integer operation;
/**
* 页码
*/
private Integer pageNo = 1;
public class MallCommonConfigListInVo {
/**
* 每页数量
* 操作(1-查询 2-创建/更新 3-同步)
*/
private Integer pageSize = 20;
private List<Integer> operationList;
public CustomFormConfigListInVo() {
public MallCommonConfigListInVo() {
}
public CustomFormConfigListInVo(Integer operation) {
this.operation = operation;
public MallCommonConfigListInVo(List<Integer> operationList) {
this.operationList = operationList;
}
......
src/main/java/com/system/transfer/form/CustomFormConfigListOutVoRecords.java → src/main/java/com/system/transfer/form/MallCommonConfigListOutVoRecords.java
浏览文件 @ 28e848f5
......@@ -2,11 +2,14 @@ package com.system.transfer.form;
import lombok.Data;
import java.util.List;
import java.util.Map;
/**
* @author Inori
*/
@Data
public class CustomFormConfigListOutVoRecords {
public class MallCommonConfigListOutVoRecords {
/**
* ID
......@@ -27,39 +30,33 @@ public class CustomFormConfigListOutVoRecords {
/**
* 配置方向
* 请求地址
*/
private String configureDirection;
private String requestAddress;
/**
* 操作(1-查询 2-创建)
* 操作(1-查询 2-创建/更新 3-同步)
*/
private Integer operation;
/**
* 请求地址
*/
private String requestAddress;
/**
* 自定义Sql
*/
private String customSql;
/**
* 表单字段映射明细
* 创建时间
*/
private String formFieldMappingDetail;
private String createTime;
/**
* 创建时间
* 映射列表
*/
private String createTime;
private List<Map<String, Object>> mappingList;
}
src/main/java/com/system/transfer/form/FormFieldMappingDetailOutVoRecords.java → src/main/java/com/system/transfer/form/MallFieldMappingListOutVoRecords.java
浏览文件 @ 28e848f5
......@@ -6,7 +6,13 @@ import lombok.Data;
* @author Inori
*/
@Data
public class FormFieldMappingDetailOutVoRecords {
public class MallFieldMappingListOutVoRecords {
/**
* ID
*/
private Integer id;
/**
* 映射前字段
......@@ -29,7 +35,7 @@ public class FormFieldMappingDetailOutVoRecords {
/**
* 是否是分录字段
*/
private Integer isEntryField;
private String isEntryField;
/**
......
src/main/java/com/system/utils/FormFieldMappingUtil.java
浏览文件 @ 28e848f5
package com.system.utils;
import com.system.transfer.form.FormFieldMappingDetailOutVoRecords;
import com.system.transfer.form.MallFieldMappingListOutVoRecords;
import java.util.List;
import java.util.stream.Collectors;
......@@ -10,22 +10,10 @@ import java.util.stream.Collectors;
*/
public class FormFieldMappingUtil {
public static List<FormFieldMappingDetailOutVoRecords> purchaseMapping(String formFieldMappingDetail) {
public static List<MallFieldMappingListOutVoRecords> purchaseMapping(String formFieldMappingDetail) {
List<Object> objectList = JsonUtil.toList(formFieldMappingDetail, Object.class);
return objectList.stream().map(m -> JsonUtil.toBean(JsonUtil.toString(m), FormFieldMappingDetailOutVoRecords.class)).collect(Collectors.toList());
return objectList.stream().map(m -> JsonUtil.toBean(JsonUtil.toString(m), MallFieldMappingListOutVoRecords.class)).collect(Collectors.toList());
}
/*private static List<Map<String, Object>> recursively(List<Map<String, Object>> dataList, Map<String, Object> data) {
List<Map<String, Object>> tempList = dataList.stream().filter(m ->
m.get("pid").equals(data.get("id"))).collect(Collectors.toList()
);
for (Map<String, Object> temp : tempList) {
temp.put("children", recursively(dataList, temp));
}
return tempList;
}*/
}
src/main/resources/application-docker.yaml
浏览文件 @ 28e848f5
......@@ -11,11 +11,27 @@ spring:
name: @artifactId@
datasource:
url: jdbc:mysql://integrate-mysql:3306/db_shopping?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
url: jdbc:mysql://integrate-mysql:3306/db_integrate?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
username: root
password: gf^*i6%&9J83&(*kJ653F&L
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
type: com.zaxxer.hikari.HikariDataSource
hikari:
# 最小空闲连接数量
minimum-idle: 5
# 空闲连接存活最大时间，默认600000（10分钟）
idle-timeout: 180000
# 连接池最大连接数，默认是10
maximum-pool-size: 10
# 此属性控制从池返回的连接的默认自动提交行为,默认值：true
auto-commit: true
# 连接池名称
pool-name: MyHikariCP
# 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
max-lifetime: 1800000
# 数据库连接超时时间,默认30秒，即30000
connection-timeout: 30000
connection-test-query: SELECT 1
mvc:
static-path-pattern: /**
......
src/main/resources/application-test.yaml
浏览文件 @ 28e848f5
......@@ -11,11 +11,26 @@ spring:
name: @artifactId@
datasource:
url: jdbc:mysql://127.0.0.1:3306/db_shopping?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
url: jdbc:mysql://127.0.0.1:3306/db_integrate?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2B8&allowMultiQueries=true&allowPublicKeyRetrieval=true&useAffectedRows=true
username: inori
password: inori
driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource
type: com.zaxxer.hikari.HikariDataSource
hikari:
minimum-idle: 5
# 空闲连接存活最大时间，默认600000（10分钟）
idle-timeout: 180000
# 连接池最大连接数，默认是10
maximum-pool-size: 10
# 此属性控制从池返回的连接的默认自动提交行为,默认值：true
auto-commit: true
# 连接池名称
pool-name: MyHikariCP
# 此属性控制池中连接的最长生命周期，值0表示无限生命周期，默认1800000即30分钟
max-lifetime: 1800000
# 数据库连接超时时间,默认30秒，即30000
connection-timeout: 30000
connection-test-query: SELECT 1
mvc:
static-path-pattern: /**
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论