Browse Source

去掉无用代码、更新readme

liyuan 3 months ago
parent
commit
5a66f2856c

+ 18 - 17
README.md

@@ -9,27 +9,28 @@
 ### nacos配置
 > nacos配置信息在 LauncherConstant 类中,系统默认使用的命名空间为 gubersail
 ### 项目启动所需基本模块
-> blade-gateway、blade-auth、blade-system、blade-resource、blade-user、blade-client
+> tire-gateway、tire-auth、tire-system、tire-resource、tire-user、tire-client
 
 ### 模块介绍
 
-* blade-auth: 认证模块
+* tire-auth: 认证模块
 * bland-common: 通用模块
-* blade-gateway: 网关模块
-* blade-admin: 监控模块
-* blade-develop: 代码生成模块
-* blade-log: 日志模块
-* blade-report: 报表模块
-* blade-resource: 资源模块
-* blade-swagger: swagger模块
-* blade-xxljob: xxljob模块
-* blade-xxljob-admin: xxljob管理模块
-* blade-plugin: 插件模块
-* blade-service: 服务模块,所有业务相关都在这
-* blade-check: 审批流模块
-* blade-system: 系统模块
-* blade-user: 用户模块
-* blade-client: 客户端模块主要存放了一个消息通知
+* tire-gateway: 网关模块
+* tire-admin: 监控模块
+* tire-develop: 代码生成模块
+* tire-log: 日志模块
+* tire-report: 报表模块
+* tire-resource: 资源模块
+* tire-swagger: swagger模块
+* tire-xxljob: xxljob模块
+* tire-xxljob-admin: xxljob管理模块
+* tire-plugin: 插件模块
+* tire-service: 服务模块,所有业务相关都在这
+* tire-check: 审批流模块
+* tire-system: 系统模块
+* tire-user: 用户模块
+* tire-client: 客户端模块主要存放了一个消息通知
+* tire-dest: 公告、事务管理
 > 所有 -api的模块都是fegin接口
 
 ### 本地settings 文件新增配置

+ 0 - 10
tire-service/tire-desk/src/main/java/org/springblade/desk/controller/CheckController.java

@@ -38,14 +38,4 @@ public class CheckController extends BladeController implements CacheNames {
 		return R.data(detail);
 	}
 
-/*	*//**
-	 * 新增或修改
-	 *
-	 * @param leave 请假信息
-	 *//*
-	@PostMapping("start-process")
-	public R startProcess(@RequestBody ProcessLeave leave) {
-		return R.status(leaveService.startCheckProcess(leave));
-	}*/
-
 }

+ 0 - 8
tire-service/tire-desk/src/main/java/org/springblade/desk/service/ILeaveService.java

@@ -19,12 +19,4 @@ public interface ILeaveService extends BaseService<ProcessLeave> {
 	 */
 	boolean startProcess(ProcessLeave leave);
 
-	/**
-	 * 开启流程
-	 *
-	 * @param check
-	 * @return boolean
-	 */
-//	boolean startCheckProcess(ProcessLeave check);
-
 }

+ 0 - 45
tire-service/tire-desk/src/main/java/org/springblade/desk/service/impl/LeaveServiceImpl.java

@@ -35,8 +35,6 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 
 	private final IFlowClient flowClient;
 
-//	private final IProjectItemClient projectItemClient;
-
 	@Override
 	@Transactional(rollbackFor = Exception.class)
 	// @GlobalTransactional
@@ -67,47 +65,4 @@ public class LeaveServiceImpl extends BaseServiceImpl<LeaveMapper, ProcessLeave>
 		return true;
 	}
 
-/*	@Override
-	@GlobalTransactional
-	@Transactional
-	public boolean startCheckProcess(ProcessLeave check) {
-		ServiceProjectItem item = projectItemClient.findItemById(check.getItemId());
-		if (item.getStatus() > 0) {
-			throw new ServiceException("已请核的禁止重复提交");
-		}
-		R res = projectItemClient.check(check.getItemId(), 1, null, null, null, null);
-		if (!res.isSuccess()) {
-			throw new ServiceException("请求调用请核失败");
-		}
-		check.setTaskUser(String.valueOf(AuthUtil.getUserId()));
-		String businessTable = FlowUtil.getBusinessTable(ProcessConstant.LEAVE_KEY);
-		if (Func.isEmpty(check.getId())) {
-			// 保存leave
-			check.setApplyTime(DateUtil.now());
-			save(check);
-			// 启动流程
-			String CheckUser = TaskUtil.getTaskUser(check.getCheckUser());
-			String CheckSecondsUser = TaskUtil.getTaskUser(check.getCheckSecondsUser());
-			String applyUser = TaskUtil.getTaskUser(String.valueOf(AuthUtil.getUserId()));
-			Kv variables = Kv.create()
-				.set(ProcessConstant.TASK_VARIABLE_CREATE_USER, AuthUtil.getUserName())
-				.set("CheckUser", CheckUser)
-				.set("CheckSecondsUser", CheckSecondsUser)
-				.set("applyUser", applyUser);
-			R<BladeFlow> result = flowClient.startProcessInstanceById(check.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(check.getId())), variables);
-			if (result.isSuccess()) {
-				log.debug("流程已启动,流程ID:" + result.getData().getProcessInstanceId());
-				// 返回流程id写入leave
-				check.setProcessInstanceId(result.getData().getProcessInstanceId());
-				updateById(check);
-			} else {
-				throw new ServiceException("操作失败,请关闭页面再次尝试");
-			}
-		} else {
-
-			updateById(check);
-		}
-		return true;
-	}*/
-
 }