1、删除无用demo代码
2、添加主数据模块项目
This commit is contained in:
@ -34,6 +34,36 @@
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.geg</groupId>
|
||||
<artifactId>itc-ms-system-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.geg</groupId>
|
||||
<artifactId>itc-ms-facade-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.geg</groupId>
|
||||
<artifactId>itc-ms-common-service</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.geg</groupId>
|
||||
<artifactId>itc-ms-workflow-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.geg</groupId>
|
||||
<artifactId>itc-ms-user-api</artifactId>
|
||||
<version>${revision}</version>
|
||||
</dependency>
|
||||
|
||||
</dependencies>
|
||||
<build>
|
||||
<finalName>app</finalName>
|
||||
|
||||
@ -1,23 +1,12 @@
|
||||
package com.xjrsoft.module.dev.dto;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import java.io.Serializable;
|
||||
|
||||
import java.time.LocalTime;
|
||||
import java.time.LocalDateTime;
|
||||
import java.math.BigDecimal;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import java.util.List;
|
||||
|
||||
|
||||
import com.pictc.annotations.datalog.LogTable;
|
||||
import com.pictc.annotations.datalog.LogField;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
import com.pictc.annotations.datalog.LogJoinColumn;
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.ValueDirectionType;
|
||||
|
||||
|
||||
|
||||
|
||||
@ -0,0 +1,36 @@
|
||||
package com.xjrsoft.module.dev.rules;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.pictc.constant.ContractLiteflowRule;
|
||||
import com.xjrsoft.module.liteflow.client.ILiteFlowChainClient;
|
||||
import com.xjrsoft.module.liteflow.dto.LiteflowChainDto;
|
||||
import com.yomahub.liteflow.core.FlowExecutor;
|
||||
import com.yomahub.liteflow.flow.LiteflowResponse;
|
||||
|
||||
import shade.powerjob.com.google.common.collect.Maps;
|
||||
|
||||
@Component
|
||||
public class RuleDemo {
|
||||
|
||||
@Autowired
|
||||
private FlowExecutor flowExecutor;
|
||||
|
||||
@Autowired
|
||||
private ILiteFlowChainClient liteflow;
|
||||
|
||||
/**
|
||||
* @Description: 执行规则
|
||||
* @return void 返回类型
|
||||
*/
|
||||
public void testConfig(){
|
||||
Map<String,Object> params = Maps.newHashMap();
|
||||
LiteflowChainDto dto = liteflow.getByName(ContractLiteflowRule.RULE_TEST);
|
||||
LiteflowResponse liteflowResponse = flowExecutor.execute2Resp(dto.getChainName(),params);
|
||||
System.out.println(liteflowResponse.isSuccess());
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.xjrsoft.module.dev.rules;
|
||||
|
||||
import com.pictc.constant.ContractLiteflowRule;
|
||||
import com.yomahub.liteflow.annotation.LiteflowComponent;
|
||||
import com.yomahub.liteflow.core.NodeComponent;
|
||||
|
||||
@LiteflowComponent(ContractLiteflowRule.RULE_TEST_NODEA)
|
||||
public class TestNodeA extends NodeComponent {
|
||||
|
||||
@Override
|
||||
public void process() throws Exception {
|
||||
//TODO 节点A 业务
|
||||
System.out.println("执行节点A");
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package com.xjrsoft.module.dev.rules;
|
||||
|
||||
import com.pictc.constant.ContractLiteflowRule;
|
||||
import com.yomahub.liteflow.annotation.LiteflowComponent;
|
||||
import com.yomahub.liteflow.core.NodeComponent;
|
||||
|
||||
@LiteflowComponent(ContractLiteflowRule.RULE_TEST_NODEB)
|
||||
public class TestNodeB extends NodeComponent {
|
||||
|
||||
@Override
|
||||
public void process() throws Exception {
|
||||
//TODO 节点B 业务
|
||||
System.out.println("执行节点B");
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,11 +1,14 @@
|
||||
package com.xjrsoft.module.dev.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
|
||||
import com.github.yulichang.base.MPJBaseService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJDeepService;
|
||||
import com.github.yulichang.extension.mapping.base.MPJRelationService;
|
||||
import com.xjrsoft.module.dev.entity.Testfrom3;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
@ -16,4 +19,6 @@ import java.util.List;
|
||||
*/
|
||||
|
||||
public interface ITestfrom3Service extends IService<Testfrom3> {
|
||||
|
||||
void addTestfrom3(Testfrom3 data);
|
||||
}
|
||||
|
||||
@ -2,6 +2,11 @@ package com.xjrsoft.module.dev.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.github.yulichang.base.MPJBaseServiceImpl;
|
||||
import com.pictc.enums.BusinessCode;
|
||||
import com.pictc.enums.ExceptionCommonCode;
|
||||
import com.pictc.utils.StringUtils;
|
||||
import com.xjrsoft.common.enums.ResponseCode;
|
||||
import com.xjrsoft.common.exception.BusinessException;
|
||||
import com.xjrsoft.module.dev.entity.Testfrom3;
|
||||
import com.xjrsoft.module.dev.mapper.Testfrom3Mapper;
|
||||
import com.xjrsoft.module.dev.service.ITestfrom3Service;
|
||||
@ -11,6 +16,8 @@ import org.springframework.transaction.annotation.Transactional;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
|
||||
/**
|
||||
@ -22,4 +29,27 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
@Service
|
||||
@AllArgsConstructor
|
||||
public class Testfrom3ServiceImpl extends ServiceImpl<Testfrom3Mapper, Testfrom3> implements ITestfrom3Service {
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
@Override
|
||||
public void addTestfrom3(Testfrom3 data) {
|
||||
if (!StringUtils.isEmpty(data.getDanXingWenBen5097())) {
|
||||
throw new BusinessException(ResponseCode.PARAM_MISS);
|
||||
}
|
||||
if(StringUtils.isNotEmpty(data.getDanXingWenBen5097())){
|
||||
Long nameCount = findNameCount(data.getDanXingWenBen5097());
|
||||
if(nameCount!=null && nameCount.intValue() > 0) {
|
||||
throw new BusinessException(BusinessCode.ofArgs(ExceptionCommonCode.DATA_FIELD_DUPLICATION,"规则名称"));
|
||||
}
|
||||
}
|
||||
baseMapper.insert(data);
|
||||
}
|
||||
|
||||
private Long findNameCount(String name) {
|
||||
LambdaQueryWrapper<Testfrom3> queryWrapper = Wrappers.lambdaQuery(Testfrom3.class);
|
||||
queryWrapper.eq(Testfrom3::getDanXingWenBen5097,name);
|
||||
return baseMapper.selectCount(queryWrapper);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
package com.xjrsoft.module.prdManage.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.github.yulichang.autoconfigure.conditional.JoinSqlInjectorCondition;
|
||||
import com.baomidou.mybatisplus.annotation.Version;
|
||||
import com.pictc.annotations.datalog.JoinCaseType;
|
||||
import com.pictc.annotations.datalog.JoinType;
|
||||
import com.pictc.annotations.datalog.LogJoin;
|
||||
@ -37,11 +37,20 @@ public class Testfrom2 extends BaseMasterEntity {
|
||||
*/
|
||||
@ApiModelProperty("单行文本")
|
||||
private String danXingWenBen9043;
|
||||
|
||||
/**
|
||||
* 单行文本
|
||||
*/
|
||||
@ApiModelProperty("家电")
|
||||
private String applianceId;
|
||||
|
||||
@LogJoin(name = "",
|
||||
@LogJoin(name = "家电管理",
|
||||
columns = {
|
||||
@LogJoinColumn(field = "",relatedField = "", valueDirection = ValueDirectionType.RIGHT)
|
||||
}, caseType = JoinCaseType.FULL, target = DemoAppliance.class, type = JoinType.MANY)
|
||||
@LogJoinColumn(field = "applianceId",relatedField = "id", valueDirection = ValueDirectionType.LEFT)
|
||||
}, caseType = JoinCaseType.NONE, target = DemoAppliance.class, type = JoinType.ONE)
|
||||
private DemoAppliance appliance;
|
||||
|
||||
@Version
|
||||
private Integer dataVersion; //类型建议为 Integer/Long
|
||||
|
||||
}
|
||||
@ -0,0 +1,4 @@
|
||||
# 应用名称(在 SkyWalking UI 中显示的服务名)
|
||||
agent.service_name=your-springboot-app
|
||||
# SkyWalking OAP 服务地址(默认本地)
|
||||
collector.backend_service=localhost:11800
|
||||
@ -0,0 +1,6 @@
|
||||
██████╗ ███████╗ ██████╗ ██╗████████╗ ██████╗
|
||||
██╔════╝ ██╔════╝██╔════╝ ██║╚══██╔══╝██╔════╝
|
||||
██║ ███╗█████╗ ██║ ███╗█████╗██║ ██║ ██║
|
||||
██║ ██║██╔══╝ ██║ ██║╚════╝██║ ██║ ██║
|
||||
╚██████╔╝███████╗╚██████╔╝ ██║ ██║ ╚██████╗
|
||||
╚═════╝ ╚══════╝ ╚═════╝ ╚═╝ ╚═╝ ╚═════╝
|
||||
@ -0,0 +1,49 @@
|
||||
spring:
|
||||
cloud:
|
||||
nacos: #nacos监控
|
||||
config:
|
||||
server-addr: 127.0.0.1:8848 # nacos 配置中心地址
|
||||
namespace: ITC-MS
|
||||
group: DNE
|
||||
username: nacos
|
||||
password: nacos
|
||||
extension-configs:
|
||||
- data-id: global-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: discovery-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: datasource-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: seata-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: redis-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: magic-api.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: sa-token.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: camunda.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: sentinel-local.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
datalog:
|
||||
db:
|
||||
url: jdbc:kingbase8://127.0.0.1:54321/itc?currentSchema=dne_log_sit
|
||||
@ -0,0 +1,56 @@
|
||||
server:
|
||||
port: 8099
|
||||
|
||||
spring:
|
||||
application:
|
||||
name: demo-service
|
||||
main:
|
||||
allow-bean-definition-overriding: true
|
||||
profiles:
|
||||
active: dev
|
||||
cloud:
|
||||
nacos: #nacos监控
|
||||
config:
|
||||
server-addr: 10.0.252.1:8848 # nacos 配置中心地址
|
||||
namespace: ITC-MS
|
||||
group: DNE
|
||||
username: nacos
|
||||
password: Yudean@2025
|
||||
file-extension: yml # 默认配置 ${spring.application.name}-${spring.profiles.active}.${file-extension}
|
||||
refresh-enabled: true
|
||||
extension-configs:
|
||||
- data-id: global.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: discovery.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: datasource.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: seata.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: redis.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: magic-api.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: sa-token.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: camunda.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
|
||||
- data-id: sentinel.yml
|
||||
refresh: true
|
||||
group: DNE
|
||||
@ -0,0 +1,50 @@
|
||||
#!/bin/sh
|
||||
#cp /etc/hosts /etc/hosts.temp
|
||||
|
||||
# 初始化环境变量(设置默认值,避免空变量)
|
||||
APP_NAME=${APP_NAME:-"default-springboot-app"} # 默认服务名
|
||||
SKYWALKING_SERVER=${SKYWALKING_SERVER:-"localhost:11800"} # 默认SkyWalking服务地址
|
||||
ENV_APP_PRO_FILE=${ENV_APP_PRO_FILE:-"test"} # 默认环境为test
|
||||
|
||||
# 初始化Java启动参数(包含是否使用-server模式)
|
||||
java_base="java -javaagent:/opt/agent/skywalking-agent.jar -Dskywalking.agent.service_name=$APP_NAME"
|
||||
export java_base="$java_base -Dskywalking.collector.backend_service=$SKYWALKING_SERVER"
|
||||
|
||||
java_start="$java_base -jar"
|
||||
|
||||
# 根据环境变量区分开发/生产环境配置
|
||||
if [ "$ENV_APP_PRO_FILE" = "prod" ]; then
|
||||
# 生产环境JVM参数
|
||||
export JAVA_OPTS="-Xms1024m -Xmx4096m -Xmn512m -Xss512k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:+UseG1GC -XX:G1HeapRegionSize=32m -XX:G1ReservePercent=20"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:MaxGCPauseMillis=500 -XX:G1MixedGCCountTarget=10"
|
||||
|
||||
export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:/var/log/app/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10 -XX:GCLogFileSize=100M"
|
||||
|
||||
# 生产环境使用-server模式
|
||||
java_start="$java_base -jar -server"
|
||||
else
|
||||
# 开发环境JVM参数
|
||||
export JAVA_OPTS="-Xms512m -Xmx2048m -Xmn256m -Xss512k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:+UseConcMarkSweepGC -XX:+UseParNewGC"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:+CMSParallelRemarkEnabled -XX:+CMSClassUnloadingEnabled -XX:CMSMaxAbortablePrecleanTime=5000"
|
||||
export JAVA_OPTS="$JAVA_OPTS -XX:CMSInitiatingOccupancyFraction=80 -XX:+UseCMSInitiatingOccupancyOnly"
|
||||
export JAVA_OPTS="$JAVA_OPTS -verbose:gc -Xloggc:./logs/gc.log -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -XX:+PrintGCDateStamps"
|
||||
# 开发环境开启远程调试
|
||||
export JAVA_OPTS="$JAVA_OPTS -Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005"
|
||||
fi
|
||||
|
||||
# 公共配置(编码、时区等)
|
||||
export JAVA_OPTS="$JAVA_OPTS -Dfile.encoding=UTF-8 -Dconsole.encoding=UTF-8"
|
||||
export JAVA_OPTS="$JAVA_OPTS -Djava.awt.headless=true"
|
||||
export JAVA_OPTS="$JAVA_OPTS -Duser.language=zh -Duser.country=CN -Duser.timezone=Asia/Shanghai"
|
||||
|
||||
# SpringBoot 环境配置
|
||||
export JAVA_OPTS="$JAVA_OPTS -Dspring.profiles.active=$ENV_APP_PRO_FILE"
|
||||
|
||||
# 输出启动参数
|
||||
echo "启动参数:$java_start $JAVA_OPTS $ENV_APP_FILE_PATH"
|
||||
|
||||
# 执行启动命令(用双引号包裹每个变量)
|
||||
exec $java_start $JAVA_OPTS $ENV_APP_FILE_PATH
|
||||
Reference in New Issue
Block a user