提交 fd686a62 编写于 作者: ibizdev's avatar ibizdev

tony001 部署微服务接口 [后台服务,接口示例]

上级 2541d6f6
...@@ -37,6 +37,11 @@ ...@@ -37,6 +37,11 @@
git clone -b master $para2 demosys/ git clone -b master $para2 demosys/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd demosys/ cd demosys/
mvn clean package -Pdemoapi
cd demo-provider/demo-provider-demoapi
mvn -Pdemoapi docker:build
mvn -Pdemoapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/demo-provider-demoapi.yaml iBizDemo --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -101,6 +101,14 @@ public class IBIZTASK extends EntityMP implements Serializable { ...@@ -101,6 +101,14 @@ public class IBIZTASK extends EntityMP implements Serializable {
private String taskteam; private String taskteam;
/**
* 任务团队
*/
@JsonIgnore
@JSONField(serialize = false)
@TableField(exist = false)
private List<cn.ibizlab.core.sample.domain.IBIZTASKTEAM> ibiztaskteam;
/** /**
* 设置 [任务名称] * 设置 [任务名称]
......
...@@ -39,6 +39,7 @@ public interface IIBIZTASKTEAMService extends IService<IBIZTASKTEAM> { ...@@ -39,6 +39,7 @@ public interface IIBIZTASKTEAMService extends IService<IBIZTASKTEAM> {
Page<IBIZTASKTEAM> searchDefault(IBIZTASKTEAMSearchContext context); Page<IBIZTASKTEAM> searchDefault(IBIZTASKTEAMSearchContext context);
List<IBIZTASKTEAM> selectByRoot(String ibiztaskid); List<IBIZTASKTEAM> selectByRoot(String ibiztaskid);
void removeByRoot(String ibiztaskid); void removeByRoot(String ibiztaskid);
void saveByRoot(String ibiztaskid, List<IBIZTASKTEAM> list) ;
/** /**
*自定义查询SQL *自定义查询SQL
* @param sql select * from table where id =#{et.param} * @param sql select * from table where id =#{et.param}
......
...@@ -60,6 +60,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i ...@@ -60,6 +60,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i
if(!this.retBool(this.baseMapper.insert(et))) { if(!this.retBool(this.baseMapper.insert(et))) {
return false; return false;
} }
ibiztaskteamService.saveByRoot(et.getIbiztaskid(), et.getIbiztaskteam());
CachedBeanCopier.copy(get(et.getIbiztaskid()), et); CachedBeanCopier.copy(get(et.getIbiztaskid()), et);
return true; return true;
} }
...@@ -76,6 +77,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i ...@@ -76,6 +77,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i
if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("ibiztaskid", et.getIbiztaskid()))) { if(!update(et, (Wrapper) et.getUpdateWrapper(true).eq("ibiztaskid", et.getIbiztaskid()))) {
return false; return false;
} }
ibiztaskteamService.saveByRoot(et.getIbiztaskid(), et.getIbiztaskteam());
CachedBeanCopier.copy(get(et.getIbiztaskid()), et); CachedBeanCopier.copy(get(et.getIbiztaskid()), et);
return true; return true;
} }
...@@ -89,6 +91,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i ...@@ -89,6 +91,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i
@Override @Override
@Transactional @Transactional
public boolean remove(String key) { public boolean remove(String key) {
ibiztaskteamService.removeByRoot(key) ;
boolean result = removeById(key); boolean result = removeById(key);
return result ; return result ;
} }
...@@ -108,6 +111,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i ...@@ -108,6 +111,7 @@ public class IBIZTASKServiceImpl extends ServiceImpl<IBIZTASKMapper, IBIZTASK> i
et.setIbiztaskid(key); et.setIbiztaskid(key);
} }
else { else {
et.setIbiztaskteam(ibiztaskteamService.selectByRoot(key));
} }
return et; return et;
} }
......
...@@ -163,6 +163,38 @@ public class IBIZTASKTEAMServiceImpl extends ServiceImpl<IBIZTASKTEAMMapper, IBI ...@@ -163,6 +163,38 @@ public class IBIZTASKTEAMServiceImpl extends ServiceImpl<IBIZTASKTEAMMapper, IBI
this.remove(new QueryWrapper<IBIZTASKTEAM>().eq("root",ibiztaskid)); this.remove(new QueryWrapper<IBIZTASKTEAM>().eq("root",ibiztaskid));
} }
@Autowired
@Lazy
IIBIZTASKTEAMService proxyService;
@Override
public void saveByRoot(String ibiztaskid,List<IBIZTASKTEAM> list) {
if(list==null)
return;
Set<String> delIds=new HashSet<String>();
List<IBIZTASKTEAM> _update=new ArrayList<IBIZTASKTEAM>();
List<IBIZTASKTEAM> _create=new ArrayList<IBIZTASKTEAM>();
for(IBIZTASKTEAM before:selectByRoot(ibiztaskid)){
delIds.add(before.getIbiztaskteamid());
}
for(IBIZTASKTEAM sub:list) {
sub.setRoot(ibiztaskid);
if(ObjectUtils.isEmpty(sub.getIbiztaskteamid()))
sub.setIbiztaskteamid((String)sub.getDefaultKey(true));
if(delIds.contains(sub.getIbiztaskteamid())) {
delIds.remove(sub.getIbiztaskteamid());
_update.add(sub);
}
else
_create.add(sub);
}
if(_update.size()>0)
proxyService.updateBatch(_update);
if(_create.size()>0)
proxyService.createBatch(_create);
if(delIds.size()>0)
proxyService.removeBatch(delIds);
}
/** /**
* 查询集合 数据集 * 查询集合 数据集
......
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /demo-provider-demoapi.jar
EXPOSE 8081 EXPOSE 51000
ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar ADD demo-provider-demoapi.jar /demo-provider-demoapi.jar
...@@ -3,9 +3,24 @@ services: ...@@ -3,9 +3,24 @@ services:
demo-provider-demoapi: demo-provider-demoapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/demo-provider-demoapi:latest
ports: ports:
- "8081:8081" - "51000:51000"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=51000
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.240.110
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_df847bdfd
- SPRING_DATASOURCE_PASSWORD=3d6@460A
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_df847bdfd?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_df847bdfd
- NACOS=172.16.240.110:8848
- SEATA_REGISTRY_NACOS_SERVER-ADDR=172.16.240.110:8848
- SEATA_ENABLED=true
deploy: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册