From ddb90cc393ab5b80ed58c99a16a78528588dd73c Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 11 Aug 2021 17:33:56 +0800 Subject: [PATCH] shanjifa --- zq-erp/src/main/resources/config/system.properties | 2 zq-erp/src/main/java/com/matrix/system/dataMove/SjfDataMoveServiceImpl.java | 70 +++++++++++++++++++++++++++++++++-- zq-erp/src/main/resources/config/application.yml | 11 ++--- zq-erp/src/test/java/com/matrix/SjfDataMoveTest.java | 6 +++ 4 files changed, 77 insertions(+), 12 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/dataMove/SjfDataMoveServiceImpl.java b/zq-erp/src/main/java/com/matrix/system/dataMove/SjfDataMoveServiceImpl.java index fdb70b6..ea66b66 100644 --- a/zq-erp/src/main/java/com/matrix/system/dataMove/SjfDataMoveServiceImpl.java +++ b/zq-erp/src/main/java/com/matrix/system/dataMove/SjfDataMoveServiceImpl.java @@ -2,14 +2,15 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.dynamic.datasource.annotation.DS; +import com.matrix.component.redis.RedisClient; +import com.matrix.core.tools.StringUtils; import com.matrix.system.shopXcx.bean.ShopProductAttribute; +import com.matrix.system.shopXcx.dao.ShopProductAttributeDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; +import java.util.*; /** * @author wzy @@ -21,6 +22,11 @@ @Autowired private JdbcTemplate jdbcTemplate; + @Autowired + private ShopProductAttributeDao shopProductAttributeDao; + + @Autowired + private RedisClient redisClient; public <T> List<T> mapsToListBean(List<Map<String, Object>> maps, Class<T> t) { List<T> list = new ArrayList<>(); @@ -37,9 +43,65 @@ return JSONObject.parseObject(s, t); } + private final Long companyId = 37L; + private final Long shopId = 53L; + @DS("slave") public List<ShopProductAttribute> oldProductAttr() { - return null; + List<Map<String, Object>> maps = jdbcTemplate.queryForList("select * from cere_product_classify where classify_pid=0"); + + List<ShopProductAttribute> list = new ArrayList<>(); + for (Map<String, Object> map : maps) { + Object classifyId = map.get("classify_id"); + + List<Map<String, Object>> subMaps = jdbcTemplate.queryForList("select * from cere_product_classify where classify_pid=" + classifyId.toString()); + + for (Map<String, Object> subMap : subMaps) { + ShopProductAttribute subAttr = new ShopProductAttribute(); + subAttr.setAttrId((int) Long.parseLong(subMap.get("classify_id").toString())); + subAttr.setParentId(Integer.parseInt(subMap.get("classify_pid").toString())); + String subName = subMap.get("classify_name").toString(); + subAttr.setAttrName(subName); + subAttr.setAttrCode(StringUtils.toHanyuPinyin(subName)); + + subAttr.setCreateBy("善吉凡"); + subAttr.setUpdateBy("善吉凡"); + subAttr.setCreateTime(new Date()); + subAttr.setUpdateTime(new Date()); + subAttr.setShopId(shopId); + subAttr.setCompanyId(companyId); + list.add(subAttr); + } + + ShopProductAttribute attr = new ShopProductAttribute(); + attr.setAttrId((int) Long.parseLong(map.get("classify_id").toString())); + attr.setParentId(Integer.parseInt(map.get("classify_pid").toString())); + String name = map.get("classify_name").toString(); + attr.setAttrName(name); + attr.setAttrCode(StringUtils.toHanyuPinyin(name)); + + attr.setCreateBy("善吉凡"); + attr.setUpdateBy("善吉凡"); + attr.setCreateTime(new Date()); + attr.setUpdateTime(new Date()); + attr.setShopId(shopId); + attr.setCompanyId(companyId); + list.add(attr); + + } + return list; + } + + public void productAttr(List<ShopProductAttribute> list) { + Map<Integer, Integer> map = new HashMap<>(); + for (ShopProductAttribute shopProductAttribute : list) { + Integer oldId = shopProductAttribute.getAttrId(); + shopProductAttribute.setAttrId(null); + shopProductAttributeDao.insert(shopProductAttribute); + map.put(oldId, shopProductAttribute.getAttrId()); + } + + redisClient.saveMapValue("attrIds", map); } } diff --git a/zq-erp/src/main/resources/config/application.yml b/zq-erp/src/main/resources/config/application.yml index fcb48e6..40c46a7 100644 --- a/zq-erp/src/main/resources/config/application.yml +++ b/zq-erp/src/main/resources/config/application.yml @@ -21,15 +21,12 @@ strict: false datasource: master: -# url: jdbc:mysql://47.111.134.136:3306/db_meidu_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 -# username: meidu_data -# password: meidu_4321#&@ - url: jdbc:mysql://159.75.200.233:3306/shanjifan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 - username: shanjifan - password: Shanjf123!@# + url: jdbc:mysql://124.70.222.34:3306/xc_shop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + username: xc_shop + password: xc_shop123!@# driver-class-name: com.mysql.jdbc.Driver slave: - url: jdbc:mysql://159.75.200.233:3306/shanjifan?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 + url: jdbc:mysql://159.75.200.233:3306/cereshop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8 username: shanjifan password: Shanjf123!@# driver-class-name: com.mysql.jdbc.Driver diff --git a/zq-erp/src/main/resources/config/system.properties b/zq-erp/src/main/resources/config/system.properties index 7cf26d8..eb6b320 100644 --- a/zq-erp/src/main/resources/config/system.properties +++ b/zq-erp/src/main/resources/config/system.properties @@ -30,7 +30,7 @@ redis.password=xcong123 #\u5BA2\u6237\u7AEF\u8D85\u65F6\u65F6\u95F4\u5355\u4F4D\u662F\u6BEB\u79D2 \u9ED8\u8BA4\u662F2000 redis.timeout=10000 -redis.database=1 +redis.database=6 redis_time_out=1800000 cookie_time_out=36000 diff --git a/zq-erp/src/test/java/com/matrix/SjfDataMoveTest.java b/zq-erp/src/test/java/com/matrix/SjfDataMoveTest.java index d69fd25..a3c5ed7 100644 --- a/zq-erp/src/test/java/com/matrix/SjfDataMoveTest.java +++ b/zq-erp/src/test/java/com/matrix/SjfDataMoveTest.java @@ -1,6 +1,7 @@ package com.matrix; import com.matrix.system.dataMove.SjfDataMoveServiceImpl; +import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -14,4 +15,9 @@ @Autowired private SjfDataMoveServiceImpl sjfDataMoveService; + + @Test + public void productAttrTest() { + sjfDataMoveService.productAttr(sjfDataMoveService.oldProductAttr()); + } } -- Gitblit v1.9.1