diff --git a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java index 3d741d5..1455c49 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/AccessConfig.java @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Import; import java.sql.*; import java.util.*; -import java.util.List; /** * 规则引擎客户端配置类 @@ -18,7 +17,7 @@ import java.util.List; @ComponentScan @Import(value = AccessConfigRunner.class) public class AccessConfig { - public List getRabdomData(Long id, String tableName,Integer ruleLevel) { + public List getRabdomData(Long id, String tableName, Integer ruleLevel) { List> listList = new ArrayList<>(); Connection connection = DataSourceConfig.getConnection(id); String sql = "select * from " + tableName; @@ -27,27 +26,27 @@ public class AccessConfig { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery(sql); PreparedStatement pst = connection.prepareStatement("select * from " + tableName); - log.info("元数据1:{}",resultSet); + log.info("元数据1:{}", resultSet); // ResultSet resultSet1 = pst.executeQuery(); //元数据信息 ResultSetMetaData metaData = pst.getMetaData(); //元数据数量 int columnCount = metaData.getColumnCount(); - while (resultSet.next()){ + while (resultSet.next()) { List list = new ArrayList<>(); for (int i = 1; i <= columnCount; i++) { String columnName = metaData.getColumnName(i); - log.info("字段名:{}",columnName); + log.info("字段名:{}", columnName); String tableName1 = metaData.getTableName(i); - log.info("表名:{}",tableName1); + log.info("表名:{}", tableName1); String columnClassName = metaData.getColumnClassName(i); - log.info("java类型:{}",columnClassName); + log.info("java类型:{}", columnClassName); String columnTypeName = metaData.getColumnTypeName(i); - log.info("原类型:{}",columnTypeName); + log.info("原类型:{}", columnTypeName); String catalogName = metaData.getCatalogName(i); - log.info("数据库名:{}",catalogName); + log.info("数据库名:{}", catalogName); Object object = resultSet.getObject(i); - log.info("字段值:{}",object); + log.info("字段值:{}", object); DataModel build = DataModel.builder() .key(columnName) .val(object) @@ -55,19 +54,19 @@ public class AccessConfig { .processType(columnClassName) .processClass(Class.forName(columnClassName)) .build(); - log.info("测试内容:{}",build); + log.info("测试内容:{}", build); list.add(build); } listList.add(list); - } + } } catch (SQLException e) { throw new RuntimeException(e); } catch (ClassNotFoundException e) { throw new RuntimeException(e); } - log.info("长度:{}",listList.size()); - log.info("列表:{}",listList); - if (listList.size() == 0){ + log.info("长度:{}", listList.size()); + log.info("列表:{}", listList); + if (listList.size() == 0) { return null; } for (List list : listList) { @@ -87,12 +86,12 @@ public class AccessConfig { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery(sql); PreparedStatement pst = connection.prepareStatement("select * from " + tableName); - log.info("元数据1:{}",resultSet); + log.info("元数据1:{}", resultSet); //元数据信息 ResultSetMetaData metaData = pst.getMetaData(); //元数据数量 int columnCount = metaData.getColumnCount(); - while (resultSet.next()){ + while (resultSet.next()) { List list = new ArrayList<>(); for (int i = 1; i <= columnCount; i++) { String columnName = metaData.getColumnName(i); @@ -118,6 +117,7 @@ public class AccessConfig { } return listList; } + private Map getColumnComments(DatabaseMetaData metaData, String typeName) { Map columnComents = new HashMap<>(); try (ResultSet colums = metaData.getColumns(null, null, typeName, null)) { diff --git a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/DataEditionConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/DataEditionConfig.java index 8c5ddbb..a81160b 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/DataEditionConfig.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/DataEditionConfig.java @@ -2,12 +2,8 @@ package muyu.data.test.clinet.config; import com.muyu.common.core.domain.Result; import com.muyu.common.core.exception.ServiceException; -import com.muyu.edition.constant.RuleOperationConstants; -import com.muyu.edition.domain.Config; import com.muyu.edition.domain.Edition; -import com.muyu.edition.domain.RuleEngine; import com.muyu.goods.edition.remote.EditionDataRemoteService; -import com.muyu.goods.edition.remote.RemoteDataManagerService; import lombok.extern.log4j.Log4j2; import muyu.data.test.clinet.config.runner.DataEditionConfigRunner; import muyu.data.test.common.context.DataModelContextHolder; @@ -37,8 +33,9 @@ import java.util.stream.Collectors; public class DataEditionConfig { @Autowired private EditionDataRemoteService editionDataRemoteService; + public Object setColumn(TestDataModelReq testDataModelReq) { - switch (testDataModelReq.getRuleLevel()){ + switch (testDataModelReq.getRuleLevel()) { case 2: //先获取一个记录列 List dataModels = new ArrayList<>(); @@ -90,7 +87,7 @@ public class DataEditionConfig { mainMethod.invoke(o); } catch (Exception e) { e.printStackTrace(); - throw new ServiceException("异常"+e.getMessage()); + throw new ServiceException("异常" + e.getMessage()); } return "正常,无需返回"; } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java index 709b2b3..68a29bf 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/AccessConfigRunner.java @@ -11,7 +11,6 @@ import org.springframework.boot.ApplicationRunner; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import java.sql.Connection; import java.util.HashMap; import java.util.List; @@ -31,7 +30,7 @@ public class AccessConfigRunner implements ApplicationRunner { Result> lists = remoteSystemManageService.lists(); // log.info("数据源调用状态:{}",lists); //判断非空 - if (lists.getData() == null || lists.getData().isEmpty()){ + if (lists.getData() == null || lists.getData().isEmpty()) { log.error("数据为空"); return; } @@ -43,11 +42,11 @@ public class AccessConfigRunner implements ApplicationRunner { HashMap frimaryVoHashMap = new HashMap<>(); //遍历循环存入map listResultData.forEach(res -> { - frimaryVoHashMap.put(res.getId(),res); + frimaryVoHashMap.put(res.getId(), res); }); //遍历添加到hashMap for (DataAccess listResultDatum : listResultData) { - if (listResultDatum.getType().equals("MySql")){ + if (listResultDatum.getType().equals("MySql")) { //记录线程池 DataSourceConfig.index(listResultDatum); } @@ -55,7 +54,4 @@ public class AccessConfigRunner implements ApplicationRunner { } - - - } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/DataEditionConfigRunner.java b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/DataEditionConfigRunner.java index ef7c83a..2c1ebc3 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/DataEditionConfigRunner.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-client/src/main/java/muyu/data/test/clinet/config/runner/DataEditionConfigRunner.java @@ -24,7 +24,7 @@ import java.util.stream.Collectors; @Log4j2 @Component @Configuration -public class DataEditionConfigRunner implements ApplicationRunner , ApplicationContextAware { +public class DataEditionConfigRunner implements ApplicationRunner, ApplicationContextAware { @Autowired private RemoteDataManagerService remoteDataManagerService; @Autowired @@ -32,6 +32,7 @@ public class DataEditionConfigRunner implements ApplicationRunner , ApplicationC /** * 根据环境变量来决定是否执行 + * * @param applicationContext the ApplicationContext object to be used by this object * @throws BeansException */ @@ -39,6 +40,7 @@ public class DataEditionConfigRunner implements ApplicationRunner , ApplicationC public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { System.out.println("1"); } + @Override public void run(ApplicationArguments args) throws Exception { //获取引擎 @@ -55,7 +57,7 @@ public class DataEditionConfigRunner implements ApplicationRunner , ApplicationC List editions = editionList.stream().filter(e -> e.getRuleId().equals(listResultDatum.getRuleId())).collect(Collectors.toList()); EditionSoutceConfig.indexByte(editions); for (Edition edition : editionList.stream().filter(e -> e.getRuleId().equals(listResultDatum.getRuleId())).collect(Collectors.toList())) { - EditionSoutceConfig.index(listResultDatum.getRuleId(),edition); + EditionSoutceConfig.index(listResultDatum.getRuleId(), edition); } } Long ruleId = listResultData.get(0).getRuleId(); @@ -65,8 +67,8 @@ public class DataEditionConfigRunner implements ApplicationRunner , ApplicationC HashMap> even = EditionSoutceConfig.even(); Map aByte = EditionSoutceConfig.getByte(id); - log.info("总表:{}",even); - log.info("第一个:{}",aByte); + log.info("总表:{}", even); + log.info("第一个:{}", aByte); String versionClass = editionList.get(0).getVersionClass(); byte[] bytes = aByte.get(versionClass); String s = new String(bytes); diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataModelContextHolder.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataModelContextHolder.java index cd6c5c2..8b5f66e 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataModelContextHolder.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataModelContextHolder.java @@ -7,18 +7,19 @@ import muyu.data.test.common.model.process.DataModelProcessModel; /** * 数据模型上下文 + * * @ClassName DataModelContextHolder * @Author 森静若林 */ @Data @SuperBuilder -public class DataModelContextHolder{ +public class DataModelContextHolder { - private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>(); + private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); private RecordContextHolder recordContextHolder; - public static DataModelContextHolder build(RecordContextHolder recordContextHolder){ + public static DataModelContextHolder build(RecordContextHolder recordContextHolder) { return DataModelContextHolder.builder() .recordContextHolder(recordContextHolder) .build(); diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataSetContextHolder.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataSetContextHolder.java index a25593a..67c970c 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataSetContextHolder.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/DataSetContextHolder.java @@ -6,18 +6,19 @@ import muyu.data.test.common.model.process.DataSetProcessModel; /** * 数据集上下文 + * * @ClassName DataSetContextHolder * @Author 森静若林 */ @Data @SuperBuilder -public class DataSetContextHolder{ +public class DataSetContextHolder { - private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>(); + private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); private TaskContextHolder taskContextHolder; - public static DataSetContextHolder build(TaskContextHolder taskContextHolder){ + public static DataSetContextHolder build(TaskContextHolder taskContextHolder) { return DataSetContextHolder.builder() .taskContextHolder(taskContextHolder) .build(); diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/RecordContextHolder.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/RecordContextHolder.java index eea2d2e..cd8967c 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/RecordContextHolder.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/RecordContextHolder.java @@ -6,18 +6,19 @@ import muyu.data.test.common.model.process.RecordProcessModel; /** * 记录上下文 + * * @ClassName RecordContextHolder * @Author 森静若林 */ @Data @SuperBuilder -public class RecordContextHolder{ +public class RecordContextHolder { - private static final ThreadLocal THREAD_LOCAL=new ThreadLocal<>(); + private static final ThreadLocal THREAD_LOCAL = new ThreadLocal<>(); private DataSetContextHolder dataSetContextHolder; - public static RecordContextHolder build(DataSetContextHolder dataSetContextHolder){ + public static RecordContextHolder build(DataSetContextHolder dataSetContextHolder) { return RecordContextHolder.builder() .dataSetContextHolder(dataSetContextHolder) .build(); diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/TaskContextHolder.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/TaskContextHolder.java index 5ab0639..5d57c29 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/TaskContextHolder.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/context/TaskContextHolder.java @@ -2,12 +2,13 @@ package muyu.data.test.common.context; /** * 任务上下文 + * * @ClassName TaskContextHolder * @Author 森静若林 */ public class TaskContextHolder { - public static TaskContextHolder build(){ + public static TaskContextHolder build() { return new TaskContextHolder(); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java index 4dd1bb1..9eee5ea 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/DataSourceConfig.java @@ -21,7 +21,8 @@ import java.util.HashMap; @Log4j2 public class DataSourceConfig { - private static HashMap hashMap = new HashMap<>(); + private static HashMap hashMap = new HashMap<>(); + /** * 添加线程池 * 线程池初始化 @@ -34,7 +35,7 @@ public class DataSourceConfig { //数据库名 String databaseName = dataAccess.getDatabaseName(); // url - String url = String.format("jdbc:mysql://"+ host+":"+port+"/"+databaseName); + String url = String.format("jdbc:mysql://" + host + ":" + port + "/" + databaseName); DruidDataSource dataSource = new DruidDataSource(); //初始化链接池数量 dataSource.setInitialSize(dataAccess.getInitNum().intValue()); @@ -51,14 +52,14 @@ public class DataSourceConfig { //数据库密码 dataSource.setPassword(dataAccess.getPassword()); dataSource.init();// 初始化 - hashMap.put(dataAccess.getId(),dataSource); + hashMap.put(dataAccess.getId(), dataSource); // log.info("储存线程池:{}",hashMap); } /** * 取出线程池 */ - public static Connection getConnection(Long key){ + public static Connection getConnection(Long key) { DruidDataSource dataSource = hashMap.get(key); try { DruidPooledConnection connection = dataSource.getConnection(); @@ -67,16 +68,18 @@ public class DataSourceConfig { throw new RuntimeException(e); } } + /** * 归还线程池 */ - public static void returnConnection(Connection connection){ + public static void returnConnection(Connection connection) { try { connection.close(); } catch (SQLException e) { throw new RuntimeException(e); } } + /** * 连接线程池 * 验证线程池 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/EditionSoutceConfig.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/EditionSoutceConfig.java index 3495e5a..5f8d2d6 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/EditionSoutceConfig.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/dataSoutce/EditionSoutceConfig.java @@ -1,13 +1,10 @@ package muyu.data.test.common.dataSoutce; -import com.alibaba.druid.pool.DruidDataSource; import com.muyu.edition.constant.RuleOperationConstants; import com.muyu.edition.domain.Edition; -import com.muyu.edition.domain.RuleEngine; import lombok.Data; import lombok.extern.log4j.Log4j2; import muyu.data.test.common.dymamicLoad.DynamicLoader; -import org.bouncycastle.pqc.crypto.newhope.NHSecretKeyProcessor; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; @@ -23,31 +20,31 @@ public class EditionSoutceConfig { private static HashMap> hashMap = new HashMap<>(); private static HashMap> longHashMapHashMap = new HashMap<>(); - public static void index(Long ruleId, Edition edition){ + public static void index(Long ruleId, Edition edition) { HashMap editionHashMap = new HashMap<>(); - editionHashMap.put(edition.getId(),edition); - hashMap.put(ruleId,editionHashMap); + editionHashMap.put(edition.getId(), edition); + hashMap.put(ruleId, editionHashMap); } - public static void indexByte(List list){ + public static void indexByte(List list) { list.stream().forEach(engine -> { //获取版本内容 String content = engine.getRuleContent().replaceAll("\r\n", ""); //编译生成class文件存放到Map中 - Map compile = DynamicLoader.compile( engine.getVersionClass() + RuleOperationConstants.FILE_SUFFIX, content); - longHashMapHashMap.put(engine.getId(),compile); + Map compile = DynamicLoader.compile(engine.getVersionClass() + RuleOperationConstants.FILE_SUFFIX, content); + longHashMapHashMap.put(engine.getId(), compile); }); } - public static HashMap get(Long ruleId){ + public static HashMap get(Long ruleId) { return hashMap.get(ruleId); } - public static Map getByte(Long id){ + public static Map getByte(Long id) { return longHashMapHashMap.get(id); } - public static HashMap> even(){ + public static HashMap> even() { return longHashMapHashMap; } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/model/DataSetModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/model/DataSetModel.java index f20212b..b4ec3f3 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/model/DataSetModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/domain/model/DataSetModel.java @@ -1,6 +1,5 @@ package muyu.data.test.common.domain.model; -import com.alibaba.nacos.api.annotation.NacosProperties; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/Engine.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/Engine.java index 711ab4d..1df1f12 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/Engine.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/Engine.java @@ -2,6 +2,7 @@ package muyu.data.test.common.engine; /** * 引擎 + * * @ClassName Engine * @Author: 森静若林 * @Date: 2024/5/6 13:48 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRecords.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRecords.java index 7da65c3..4e02f36 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRecords.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRecords.java @@ -6,6 +6,7 @@ import lombok.extern.log4j.Log4j2; /** * 记录动作 + * * @ClassName ActionRecords * @Author 森静若林 * @Date 2024/5/13 22:31 @@ -13,11 +14,11 @@ import lombok.extern.log4j.Log4j2; @Getter @Setter @Log4j2 -public class ActionRecords extends RuntimeException{ +public class ActionRecords extends RuntimeException { /** * 名称 */ - private String name="记录"; + private String name = "记录"; /** * 数据模型 @@ -28,7 +29,7 @@ public class ActionRecords extends RuntimeException{ this.object = object; } - public void records(){ - log.info("记录的数据是:{}",this.object); + public void records() { + log.info("记录的数据是:{}", this.object); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRemove.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRemove.java index 3e23168..bc2f48b 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRemove.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionRemove.java @@ -6,17 +6,18 @@ import lombok.Setter; /** * 移除动作 + * * @ClassName ActionRemove * @Author: 森静若林 * @Date: 2024/5/6 13:48 */ @Setter @Getter -public class ActionRemove extends RuntimeException{ +public class ActionRemove extends RuntimeException { /** * 名称 */ - private String name="移除"; + private String name = "移除"; /** * 数据模型 */ @@ -26,7 +27,7 @@ public class ActionRemove extends RuntimeException{ this.dataModel = dataModel; } - public void remove(){ + public void remove() { this.dataModel.setValue(null); } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionReplace.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionReplace.java index 44109e9..02af4cb 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionReplace.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/action/ActionReplace.java @@ -6,17 +6,18 @@ import lombok.Setter; /** * 替换动作 + * * @ClassName ActionReplace * @Author: 森静若林 * @Date: 2024/5/6 13:48 */ @Getter @Setter -public class ActionReplace extends RuntimeException{ +public class ActionReplace extends RuntimeException { /** * 名称 */ - private String name="替换"; + private String name = "替换"; /** * 新值 */ @@ -26,7 +27,7 @@ public class ActionReplace extends RuntimeException{ */ private DataModel dataModel; - public ActionReplace(String newValue,DataModel dataModel) { + public ActionReplace(String newValue, DataModel dataModel) { super(); this.newValue = newValue; this.dataModel = dataModel; @@ -36,7 +37,7 @@ public class ActionReplace extends RuntimeException{ super(); } - public void replace(){ + public void replace() { this.dataModel.setValue(this.newValue); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataModelEngine.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataModelEngine.java index 729a104..37847b6 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataModelEngine.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataModelEngine.java @@ -1,7 +1,6 @@ package muyu.data.test.common.engine.scope; - import muyu.data.test.common.context.DataModelContextHolder; import muyu.data.test.common.engine.Engine; import muyu.data.test.common.model.DataModel; @@ -9,6 +8,7 @@ import muyu.data.test.common.model.process.DataModelProcessModel; /** * 数据模型引擎 + * * @ClassName DataModelEngine * @Author: 森静若林 * @Date: 2024/5/6 13:48 @@ -16,32 +16,32 @@ import muyu.data.test.common.model.process.DataModelProcessModel; public abstract class DataModelEngine implements Engine { @Override - public DataModelProcessModel get (){ + public DataModelProcessModel get() { return DataModelContextHolder.get(); } - public DataModel getModel(){ + public DataModel getModel() { return get().getDataModel(); } - public String getKey () { + public String getKey() { return getModel().getKey(); } - public Object getValue () { + public Object getValue() { return getModel().getVal(); } - public String getSourceType () { + public String getSourceType() { return getModel().getSourceType(); } - public String getProcessType () { + public String getProcessType() { return getModel().getProcessType(); } - public Class getProcessClass () { + public Class getProcessClass() { return getModel().getProcessClass(); } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataSetEngine.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataSetEngine.java index 78648f3..5dc078f 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataSetEngine.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/DataSetEngine.java @@ -10,6 +10,7 @@ import java.util.List; /** * 数据集引擎 + * * @ClassName DataSetEngine * @Author: 森静若林 * @Date: 2024/5/6 13:48 @@ -17,15 +18,15 @@ import java.util.List; public abstract class DataSetEngine implements Engine { @Override - public DataSetProcessModel get (){ + public DataSetProcessModel get() { return DataSetContextHolder.get(); } - public DataSetModel getModel(){ + public DataSetModel getModel() { return get().getDataSetModel(); } - public List getRecordModels () { + public List getRecordModels() { return getModel().getRecordModels(); } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/RecordEngine.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/RecordEngine.java index 18a917a..28408fe 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/RecordEngine.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/engine/scope/RecordEngine.java @@ -1,7 +1,6 @@ package muyu.data.test.common.engine.scope; - import muyu.data.test.common.context.RecordContextHolder; import muyu.data.test.common.engine.Engine; import muyu.data.test.common.model.DataModel; @@ -12,6 +11,7 @@ import java.util.List; /** * 记录引擎 + * * @ClassName RecordEngine * @Author: 森静若林 * @Date: 2024/5/6 13:48 @@ -19,19 +19,19 @@ import java.util.List; public abstract class RecordEngine implements Engine { @Override - public RecordProcessModel get (){ + public RecordProcessModel get() { return RecordContextHolder.get(); } - public List getKeys(){ + public List getKeys() { return get().getKeys(); } - public RecordModel getModel(){ + public RecordModel getModel() { return get().getRecordModel(); } - public List getDataModels () { + public List getDataModels() { return getModel().getDataModels(); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataModel.java index 0ea66dd..7366a5f 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataModel.java @@ -7,6 +7,7 @@ import lombok.experimental.SuperBuilder; /** * 数据模型 + * * @ClassName DataModel * @Author 森静若林 * @Date 2024/5/5 18:48 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataSetModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataSetModel.java index bda22d3..2dfcf2a 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataSetModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/DataSetModel.java @@ -9,6 +9,7 @@ import java.util.List; /** * 数据集模型 + * * @ClassName DataSetModel * @Author 森静若林 * @Date 2024/5/5 18:48 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/RecordModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/RecordModel.java index 17d0ae6..f359e6a 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/RecordModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/RecordModel.java @@ -9,6 +9,7 @@ import java.util.List; /** * 记录模型 + * * @ClassName RecordModel * @Author 森静若林 * @Date 2024/5/5 18:48 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataModelProcessModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataModelProcessModel.java index 8f19bd2..96ca05c 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataModelProcessModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataModelProcessModel.java @@ -7,6 +7,7 @@ import muyu.data.test.common.model.DataModel; /** * 数据模型处理模型 + * * @ClassName DataModelProcessModel * @Author 森静若林 * @Date 2024/5/5 18:37 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataSetProcessModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataSetProcessModel.java index f2a5300..1da1acc 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataSetProcessModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/DataSetProcessModel.java @@ -7,6 +7,7 @@ import muyu.data.test.common.model.DataSetModel; /** * 数据集处理模型 + * * @ClassName DataSetProcessModel * @Author 森静若林 * @Date 2024/5/5 18:37 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/RecordProcessModel.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/RecordProcessModel.java index d99f327..b978261 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/RecordProcessModel.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/model/process/RecordProcessModel.java @@ -9,6 +9,7 @@ import java.util.List; /** * 记录处理模型 + * * @ClassName RecordProcessModel * @Author 森静若林 * @Date 2024/5/5 18:37 diff --git a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/req/TestDataModelReq.java b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/req/TestDataModelReq.java index ce9ebea..2f78b46 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/req/TestDataModelReq.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-common/src/main/java/muyu/data/test/common/req/TestDataModelReq.java @@ -5,7 +5,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import muyu.data.test.common.model.DataModel; -import org.w3c.dom.stylesheets.LinkStyle; import java.util.List; diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java index 2e371b8..3dcadd9 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/DataTestApplication.java @@ -5,7 +5,6 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import com.muyu.common.swagger.annotation.EnableCustomSwagger2; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.FeignClient; import org.springframework.scheduling.annotation.EnableAsync; @SpringBootApplication @@ -15,6 +14,6 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableAsync public class DataTestApplication { public static void main(String[] args) { - SpringApplication.run(DataTestApplication.class,args); + SpringApplication.run(DataTestApplication.class, args); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java index 180b78d..c58dee1 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/common/TestController.java @@ -5,12 +5,11 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import lombok.extern.log4j.Log4j2; import muyu.data.test.common.model.DataModel; -import muyu.data.test.common.model.DataModel; import muyu.data.test.common.req.TestDataModelReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.sql.*; +import java.sql.SQLException; import java.util.List; @Log4j2 @@ -19,18 +18,21 @@ import java.util.List; public class TestController extends BaseController { @Autowired private TestService service; + /** * 随机字段 + * * @param id * @return */ @GetMapping("getRabdomData") - public Result> getRabdomData(Long id, String tableName,Integer ruleLevel) throws SQLException { - return success(service.getRabdomData(id,tableName,ruleLevel)); + public Result> getRabdomData(Long id, String tableName, Integer ruleLevel) throws SQLException { + return success(service.getRabdomData(id, tableName, ruleLevel)); } /** * 展示队列 + * * @param id * @param tableName * @param ruleLevel @@ -39,16 +41,16 @@ public class TestController extends BaseController { */ @GetMapping("getColumn") public Result>> getColumn(Long id, String tableName, Integer ruleLevel) throws Exception { - return success(service.getColumn(id,tableName,ruleLevel)); + return success(service.getColumn(id, tableName, ruleLevel)); } @PostMapping("setColumn") - public Result setColumn(@RequestBody TestDataModelReq testDataModelReq){ + public Result setColumn(@RequestBody TestDataModelReq testDataModelReq) { return success(service.setColumn(testDataModelReq)); } @PostMapping("editionInitialize") - public void editionInitialize(){ + public void editionInitialize() { service.editionInitialize(); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mq/Consumer.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mq/Consumer.java index 0689b8b..9c4bef6 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mq/Consumer.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/mq/Consumer.java @@ -10,19 +10,20 @@ import org.springframework.stereotype.Component; @Component @Log4j2 public class Consumer { - @Autowired - private TestController testController; //队列名称 public static final String QueueName = "edition"; + @Autowired + private TestController testController; + /** * 监听队列 */ @RabbitListener(queuesToDeclare = {@Queue("edition")}) - public void testEdition(Integer id){ - if (id>0){ + public void testEdition(Integer id) { + if (id > 0) { testController.editionInitialize(); log.info("初始化"); - }else{ + } else { log.info("等待"); } } diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java index fc88892..4b6a773 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/TestService.java @@ -1,6 +1,5 @@ package com.data.test.server; -import com.muyu.common.core.domain.Result; import muyu.data.test.common.model.DataModel; import muyu.data.test.common.req.TestDataModelReq; @@ -8,7 +7,7 @@ import java.sql.SQLException; import java.util.List; public interface TestService { - List getRabdomData(Long id, String tableName,Integer ruleLevel) throws SQLException; + List getRabdomData(Long id, String tableName, Integer ruleLevel) throws SQLException; List> getColumn(Long id, String tableName, Integer ruleLevel); diff --git a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java index 65cb562..88e20ec 100644 --- a/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java +++ b/muyu-modules/muyu-data-test/muyu-data-test-server/src/main/java/com/data/test/server/impl/TestServiceImpl.java @@ -1,7 +1,6 @@ package com.data.test.server.impl; import com.data.test.server.TestService; -import com.muyu.common.core.domain.Result; import muyu.data.test.clinet.config.AccessConfig; import muyu.data.test.clinet.config.DataEditionConfig; import muyu.data.test.common.model.DataModel; @@ -18,14 +17,15 @@ public class TestServiceImpl implements TestService { private AccessConfig accessConfig; @Autowired private DataEditionConfig dataEditionConfig; + @Override public List getRabdomData(Long id, String tableName, Integer ruleLevel) throws SQLException { - return accessConfig.getRabdomData(id,tableName,ruleLevel); + return accessConfig.getRabdomData(id, tableName, ruleLevel); } @Override public List> getColumn(Long id, String tableName, Integer ruleLevel) { - return accessConfig.getColumn(id,tableName,ruleLevel); + return accessConfig.getColumn(id, tableName, ruleLevel); } @Override diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/pom.xml b/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/pom.xml index e75feac..2876792 100644 --- a/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/pom.xml +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-common/pom.xml @@ -29,5 +29,14 @@ compile + + org.projectlombok + lombok + + + + org.springframework.boot + spring-boot-starter-logging + diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/DCL/MDCTraceUtil.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/DCL/MDCTraceUtil.java new file mode 100644 index 0000000..0385819 --- /dev/null +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/DCL/MDCTraceUtil.java @@ -0,0 +1,55 @@ +package com.muyu.edition.DCL; + +import org.slf4j.MDC; +import java.util.UUID; + +public class MDCTraceUtil { + /** + * 追踪id的名称 + */ + public static final String KEY_TRACE_ID = "traceId"; + + /** + * 日志链路追踪id信息头 + */ + public static final String TRACE_ID_HEADER = "x-traceId-header"; + + + /** + * 创建traceId并赋值MDC + */ + public static void addTrace() { + String traceId = createTraceId(); + // MDC(Mapped Diagnostic Context)诊断上下文映射,是@Slf4j提供的一个支持动态打印日志信息的工具。 + MDC.put(KEY_TRACE_ID, traceId); + } + + /** + * 赋值MDC + */ + public static void putTrace(String traceId) { + MDC.put(KEY_TRACE_ID, traceId); + } + + /** + * 获取MDC中的traceId值 + */ + public static String getTraceId() { + return MDC.get(KEY_TRACE_ID); + } + + /** + * 清除MDC的值 + */ + public static void removeTrace() { + MDC.remove(KEY_TRACE_ID); + } + + /** + * 创建traceId + */ + public static String createTraceId() { + return UUID.randomUUID().toString().replace("-", ""); + } + +} diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/config/LogWebMvcConfig.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/config/LogWebMvcConfig.java new file mode 100644 index 0000000..9a7cc34 --- /dev/null +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/config/LogWebMvcConfig.java @@ -0,0 +1,26 @@ +package com.muyu.edition.config; + +import com.muyu.edition.config.LogInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.InterceptorRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + + +@Configuration +public class LogWebMvcConfig implements WebMvcConfigurer { + + @Override + public void addInterceptors(InterceptorRegistry registry) { + // 添加拦截器 + registry.addInterceptor(mvcInterceptor()) + // 拦截所有请求的路径 + .addPathPatterns("/**"); + } + + @Bean + public LogInterceptor mvcInterceptor() { + return new LogInterceptor(); + } + +} diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/interceptor/LogInterceptor.java b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/interceptor/LogInterceptor.java new file mode 100644 index 0000000..3db382a --- /dev/null +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/java/com/muyu/edition/interceptor/LogInterceptor.java @@ -0,0 +1,29 @@ +package com.muyu.edition.config; + +import com.alibaba.druid.util.StringUtils; +import com.muyu.edition.DCL.MDCTraceUtil; +import org.springframework.web.servlet.HandlerInterceptor; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public class LogInterceptor implements HandlerInterceptor { + + @Override + public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { + // 客户端可以传入链路ID,需要唯一性 + String traceId = request.getHeader(MDCTraceUtil.TRACE_ID_HEADER); + if (!StringUtils.isEmpty(traceId)) { + MDCTraceUtil.putTrace(request.getHeader(MDCTraceUtil.TRACE_ID_HEADER)); + } else { + MDCTraceUtil.addTrace(); + } + return true; + } + + + @Override + public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception { + MDCTraceUtil.removeTrace(); + } +} diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/bootstrap.yml b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/bootstrap.yml index 0ddd526..5761d28 100644 --- a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/bootstrap.yml +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/bootstrap.yml @@ -31,3 +31,4 @@ spring: logging: level: com.muyu.edition.mapper: DEBUG + config: classpath:logback-spring.xml diff --git a/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/logback-spring.xml b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/logback-spring.xml new file mode 100644 index 0000000..43fc1ac --- /dev/null +++ b/muyu-modules/muyu-goods-edition/muyu-goods-edition-server/src/main/resources/logback-spring.xml @@ -0,0 +1,58 @@ + + + + + + + logback + + + + + + + + + + + + + + + + debug + + + ${CONSOLE_LOG_PATTERN} + + UTF-8 + + + + + ${log.path}/log.log + + + + ${log.path}/log-%d{yyyy-MM-dd}.%i.log + + 10MB + + + 15 + + + ${PATTERN} + + + + + + + + + + diff --git a/muyu-modules/muyu-goods/src/main/java/Stream.java b/muyu-modules/muyu-goods/src/main/java/Stream.java new file mode 100644 index 0000000..33b2f4a --- /dev/null +++ b/muyu-modules/muyu-goods/src/main/java/Stream.java @@ -0,0 +1,39 @@ +import java.util.*; +import java.util.stream.Collectors; + +public class Stream { + private String name; + + public static void main(String[] args) { + List list = Arrays.asList("dsf", "psd", "qw3", "dfq332", "dgw4thn","dps","dps"); + //遍历转换成大写 + List collect1 = list.stream().map(String::toUpperCase).collect(Collectors.toList()); + System.out.println(collect1); + //过滤 + List collect2 = list.stream().filter(e -> !e.contains("d")).collect(Collectors.toList()); + System.out.println(collect2); + // 10个随机数 + Random random = new Random(); +// random.ints().limit(3).forEach(System.out::println); +// random.ints().limit(3).sorted().forEach(System.out::println); + //使用map输出元数对应的平方数且去重 + List integerList = Arrays.asList(1,3,5,7,9,2,4,6,8,10); + integerList.stream().map(i -> i * i).distinct().collect(Collectors.toList()); + //取集合数据 + List usersList = new ArrayList<>(); + usersList.add(new Users("张三","男",15)); + usersList.add(new Users("李四","男",23)); + usersList.add(new Users("王五","男",18)); + Map hashMap = new HashMap<>(); + List> list1 = new ArrayList<>(); + for (int i = 1; i <= usersList.size(); i++) { + hashMap.put(i+"",usersList.get(i-1)); + list1.add(hashMap); + } + System.out.println(list1); + List collect = list1.stream().map(item -> item.get("1")).collect(Collectors.toList()); + System.out.println(collect.get(0)); + //将一个对象的集合转换为另一个对象的集合 + + } +} diff --git a/muyu-modules/muyu-goods/src/main/java/Users.java b/muyu-modules/muyu-goods/src/main/java/Users.java new file mode 100644 index 0000000..424077f --- /dev/null +++ b/muyu-modules/muyu-goods/src/main/java/Users.java @@ -0,0 +1,45 @@ + +public class Users { + private String name; + private String sex; + private Integer age; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + @Override + public String toString() { + return "Users{" + + "name='" + name + '\'' + + ", sex='" + sex + '\'' + + ", age=" + age + + '}'; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + + public Users(String name, String sex, int age) { + this.name = name; + this.sex = sex; + this.age = age; + } +} diff --git a/pom.xml b/pom.xml index 1fc29eb..8f92ec4 100644 --- a/pom.xml +++ b/pom.xml @@ -206,7 +206,15 @@ ${muyu.version} + + + org.projectlombok + lombok + 1.18.28 + + +