数据导入

sd-business/src/main/java/com/sd/business/entity/department/po/Department.java

@@ -34,7 +34,7 @@ public class Department extends BasePo {
     private String adminPassword;
 
     /**
-     * 事业部
+     * 事业部名称
      */
     @NotBlank(message = "事业部名称不能为空")
     private String name;

sd-business/src/main/java/com/sd/business/service/department/impl/DepartmentServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.annotation.TenantIgnore;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.exception.ServiceException;
@@ -65,10 +66,10 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         return result;
     }
 
+    @TenantIgnore
     @DSTransactional
     @Override
     public synchronized void add(DepartmentDto departmentDto) {
-        String username = SecurityUtils.getUsername();
         Date date = new Date();
         String tenantId = "000000";
         String name = departmentDto.getName();
@@ -88,7 +89,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         sysDept.setStatus("0");
         sysDept.setType(0);
         sysDept.setTenantId(tenantId);
-        sysDept.setCreateBy(username);
+        sysDept.setCreateBy("admin");
         sysDept.setCreateTime(date);
         sysDeptService.save(sysDept);
 
@@ -99,7 +100,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         sysUser.setPassword(SecurityUtils.encryptPassword(adminPassword));
         sysUser.setStatus("0");
         sysUser.setTenantId(tenantId);
-        sysUser.setCreateBy(username);
+        sysUser.setCreateBy("admin");
         sysUser.setCreateTime(date);
         sysUserService.save(sysUser);
 

sd-starter/src/test/java/SyncBomTest.java → sd-starter/src/test/java/A1_SyncBomTest.java

@@ -35,9 +35,12 @@ import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
+/**
+ * 同步bom
+ */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SdApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class SyncBomTest {
+public class A1_SyncBomTest {
     private static final Map<String, Long> classifyIdMap = new HashMap<>();
     private static final String oldUrlPrefix = "http://www.printmat.cn:8181/file/";
 

sd-starter/src/test/java/SyncSkuTest.java → sd-starter/src/test/java/A2_SyncSkuTest.java

@@ -21,9 +21,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+/**
+ * 同步sku关联主材
+ */
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = SdApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class SyncSkuTest {
+public class A2_SyncSkuTest {
 
     @Autowired
     private DataSource dataSource;
@@ -35,6 +38,7 @@ public class SyncSkuTest {
     @DSTransactional
     @Test
     public void test() {
+
         DynamicRoutingDataSource dynamicRoutingDataSource = (DynamicRoutingDataSource) dataSource;
         DataSource sdDataSource = dynamicRoutingDataSource.getDataSource("business");
 

sd-starter/src/test/java/A3_SyncDetpTest.java

@@ -0,0 +1,68 @@
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.DynamicRoutingDataSource;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.sd.SdApplication;
+import com.sd.business.entity.department.dto.DepartmentDto;
+import com.sd.business.entity.department.po.Department;
+import com.sd.business.service.department.DepartmentService;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import javax.sql.DataSource;
+import java.util.List;
+import java.util.Map;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest(classes = SdApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+public class A3_SyncDetpTest {
+
+    @Autowired
+    private DepartmentService departmentService;
+
+    @Autowired
+    private DataSource dataSource;
+
+    @DSTransactional
+    @Test
+    public void test() {
+
+        departmentService.remove(q -> q.isNotNull(Department::getOldId));
+
+        DynamicRoutingDataSource dynamicRoutingDataSource = (DynamicRoutingDataSource) dataSource;
+        DataSource sdDataSource = dynamicRoutingDataSource.getDataSource("business");
+
+        String sql = "SELECT\n" +
+                "\tid oldId,\n" +
+                "\taccount_number adminUsername,\n" +
+                "\t'123456' `adminPassword`,\n" +
+                "\tNAME `name`,\n" +
+                "\tphone telephone,\n" +
+                "\taddress address,\n" +
+                "\tcontacts contactPerson,\n" +
+                "\tcontact_phone contactNumber,\n" +
+                "\torder_mode orderMode,\n" +
+                "\tSTATUS `status`,\n" +
+                "\tcredit_limit lineCredit,\n" +
+                "\tused_credit_limit usedCredit,\n" +
+                "\twarehouse_code wlnWarehouseCode,\n" +
+                "\tbrand_name wlnBrand\n" +
+                "\t\n" +
+                "FROM\n" +
+                "\tt_sd_subsidiary";
+
+        List<Map<String, Object>> list = new JdbcTemplate(sdDataSource).queryForList(sql);
+
+        List<DepartmentDto> departmentList = BeanUtil.copyToList(list, DepartmentDto.class);
+
+        for (DepartmentDto departmentDto : departmentList) {
+            departmentService.add(departmentDto);
+        }
+
+    }
+
+
+}

sd-starter/src/test/java/SyncDetpTest.java

@@ -1,11 +0,0 @@
-import com.sd.SdApplication;
-import org.junit.runner.RunWith;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = SdApplication.class, webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
-public class SyncDetpTest {
-
-
-}