From 6e3a47706aadc1750814fea2f3f63f13b8320926 Mon Sep 17 00:00:00 2001 From: xiang2lin <251481237@qq.com> Date: Wed, 7 May 2025 14:28:48 +0800 Subject: [PATCH] =?UTF-8?q?crud=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/flow/entity/SysFlowClassEntity.xml | 54 +++---- .../frame/sys/flow/entity/SysFlowEntity.xml | 68 +++++---- .../flow/entity/SysFlowStepAccountEntity.xml | 2 +- .../flow/entity/SysFlowStepConfigBEntity.xml | 2 +- .../flow/entity/SysFlowStepConfigEntity.xml | 2 +- .../sys/flow/entity/SysFlowStepEntity.xml | 2 +- .../flow/entity/SysFlowStepRelationEntity.xml | 2 +- .../sys/flow/service/ISysFlowService.java | 37 +++++ .../flow/service/impl/SysFlowServiceImpl.java | 144 +++++++++++++++++- 9 files changed, 248 insertions(+), 65 deletions(-) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.xml index 7cdda3a1..0c6ab408 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowClassEntity.xml @@ -104,32 +104,34 @@ insert into sys_flow_class( - - id , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - name , - parent_id , - sorts, - sts, - - )values( - - #{id} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{name} , - #{parentId} , - COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_class a WHERE a.sts = 'Y' ),1), - 'Y', - - ) + + id , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + name , + parent_id , + sorts, + sts, + + )values( + + #{id} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{name} , + #{parentId} , + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_class a WHERE + a.sts = 'Y' ),1), + + 'Y', + + ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.xml index ff41d4bd..db8a222b 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowEntity.xml @@ -128,39 +128,41 @@ insert into sys_flow( - - id , - create_user_id , - create_time , - modify_user_id , - modify_time , - sts , - name , - status , - class_id , - trigger_mode_id , - nifi_group_id , - description , - sorts, - sts, - - )values( - - #{id} , - #{create_user_id} , - #{create_time} , - #{modify_user_id} , - #{modify_time} , - #{sts} , - #{name} , - #{classId} , - #{triggerModeId} , - #{nifiGroupId} , - #{description} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow a WHERE a.sts = 'Y' ), - 'Y', - - ) + + id , + create_user_id , + create_time , + modify_user_id , + modify_time , + sts , + name , + status , + class_id , + trigger_mode_id , + nifi_group_id , + description , + sorts, + sts, + + )values( + + #{id} , + #{create_user_id} , + #{create_time} , + #{modify_user_id} , + #{modify_time} , + #{sts} , + #{name} , + #{status} , + #{classId} , + #{triggerModeId} , + #{nifiGroupId} , + #{description} , + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow a WHERE a.sts = 'Y' ),1), + + 'Y', + + ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.xml index 777a9aaa..acf594f0 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepAccountEntity.xml @@ -198,7 +198,7 @@ #{appSecret} , #{corpid} , #{agentid} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_account a WHERE a.sts = 'Y' ), + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_account a WHERE a.sts = 'Y' ),1), 'Y', ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.xml index dece2c36..0af1386b 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigBEntity.xml @@ -198,7 +198,7 @@ #{sourceFieldName} , #{sourceFieldType} , #{sourceFieldDescription} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config_b a WHERE a.sts = 'Y' ), + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config_b a WHERE a.sts = 'Y' ),1), 'Y', ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.xml index 2316ff22..9137ef34 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepConfigEntity.xml @@ -206,7 +206,7 @@ #{createTableFlag} , #{writeType} , #{sqlStatement} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config a WHERE a.sts = 'Y' ), + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_config a WHERE a.sts = 'Y' ),1), 'Y', ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.xml index 814ec1d4..795c9c7a 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepEntity.xml @@ -190,7 +190,7 @@ #{nifiAppId} , #{nifiApiId} , #{sortMode} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step a WHERE a.sts = 'Y' ), + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step a WHERE a.sts = 'Y' ),1), 'Y', ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.xml b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.xml index c0a560fe..39e19cda 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.xml +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/entity/SysFlowStepRelationEntity.xml @@ -158,7 +158,7 @@ #{outputNifiAppId} , #{inputNifiApiId} , #{outputNifiApiId} , - (select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_relation a WHERE a.sts = 'Y' ), + COALESCE((select (max(IFNULL( a.sorts, 0 )) + 1) as sort from sys_flow_step_relation a WHERE a.sts = 'Y' ),1), 'Y', ) diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowService.java b/base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowService.java index 7f2f4af8..e2792bff 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowService.java +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/service/ISysFlowService.java @@ -1,7 +1,10 @@ package com.hzya.frame.sys.flow.service; +import com.alibaba.fastjson.JSONObject; import com.hzya.frame.sys.flow.entity.SysFlowEntity; import com.hzya.frame.basedao.service.IBaseService; +import com.hzya.frame.web.entity.JsonResultEntity; + /** * 流程主表;流程就是数环通的Linkup(SysFlow)表服务接口 * @@ -9,4 +12,38 @@ import com.hzya.frame.basedao.service.IBaseService; * @since 2025-04-29 10:16:24 */ public interface ISysFlowService extends IBaseService{ + /** + * 保存流程主表 + * @param object + * @return + */ + JsonResultEntity saveFlow(JSONObject object); + + /** + * 更新流程主表 + * @param object + * @return + */ + JsonResultEntity updateFlow(JSONObject object); + + /** + * 删除流程主表 + * @param object + * @return + */ + JsonResultEntity deleteFlow(JSONObject object); + + /** + * 列表查询 + * @param object + * @return + */ + JsonResultEntity queryFlowList(JSONObject object); + + /** + * 分页查询 + * @param object + * @return + */ + JsonResultEntity queryFlowPagedInfo(JSONObject object); } diff --git a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowServiceImpl.java b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowServiceImpl.java index 5a1a55e8..61531d47 100644 --- a/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowServiceImpl.java +++ b/base-service/src/main/java/com/hzya/frame/sys/flow/service/impl/SysFlowServiceImpl.java @@ -1,12 +1,23 @@ package com.hzya.frame.sys.flow.service.impl; +import cn.hutool.core.lang.Assert; +import com.alibaba.fastjson.JSONObject; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.hzya.frame.sys.flow.entity.SysFlowEntity; import com.hzya.frame.sys.flow.dao.ISysFlowDao; import com.hzya.frame.sys.flow.service.ISysFlowService; -import org.springframework.stereotype.Service; +import com.hzya.frame.web.entity.BaseResult; +import com.hzya.frame.web.entity.JsonResultEntity; +import com.hzya.frame.web.exception.BaseSystemException; +import org.apache.commons.collections.CollectionUtils; +import org.springframework.stereotype.Service; import org.springframework.beans.factory.annotation.Autowired; import javax.annotation.Resource; import com.hzya.frame.basedao.service.impl.BaseService; + +import java.util.List; + /** * 流程主表;流程就是数环通的Linkup(SysFlow)表服务实现类 * @@ -23,4 +34,135 @@ public class SysFlowServiceImpl extends BaseService imple this.sysFlowDao = dao; this.dao = dao; } + + /** + * 保存流程主表 + * + * @param object + * @return + */ + @Override + public JsonResultEntity saveFlow(JSONObject object) { + SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class); + try { + checkParams(flowEntity,"save"); + } catch (Exception e) { + return BaseResult.getFailureMessageEntity(e.getMessage()); + } + sysFlowDao.save(flowEntity); + return BaseResult.getSuccessMessageEntity("保存成功"); + } + + /** + * 更新流程主表 + * + * @param object + * @return + */ + @Override + public JsonResultEntity updateFlow(JSONObject object) { + SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class); + try { + checkParams(flowEntity,"update"); + } catch (Exception e) { + return BaseResult.getFailureMessageEntity(e.getMessage()); + } + sysFlowDao.update(flowEntity); + return BaseResult.getSuccessMessageEntity("更新成功"); + } + + /** + * 删除流程主表 + * + * @param object + * @return + */ + @Override + public JsonResultEntity deleteFlow(JSONObject object) { + SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class); + try { + checkParams(flowEntity,"delete"); + } catch (Exception e) { + return BaseResult.getFailureMessageEntity(e.getMessage()); + } + //删除主表 + sysFlowDao.logicRemove(flowEntity); + //删除子表 + return BaseResult.getSuccessMessageEntity("删除成功"); + } + + /** + * 列表查询 + * + * @param object + * @return + */ + @Override + public JsonResultEntity queryFlowList(JSONObject object) { + SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class); + try { + checkParams(flowEntity,"queryList"); + } catch (Exception e) { + return BaseResult.getFailureMessageEntity(e.getMessage()); + } + List list = sysFlowDao.query(flowEntity); + return BaseResult.getSuccessMessageEntity("查询数据成功",list); + } + + /** + * 分页查询 + * + * @param object + * @return + */ + @Override + public JsonResultEntity queryFlowPagedInfo(JSONObject object) { + SysFlowEntity flowEntity = getData("jsonStr",object,SysFlowEntity.class); + try { + checkParams(flowEntity,"queryPaged"); + } catch (Exception e) { + return BaseResult.getFailureMessageEntity(e.getMessage()); + } + PageHelper.startPage(flowEntity.getPageNum(),flowEntity.getPageSize()); + List queryByLike = sysFlowDao.queryByLike(flowEntity); + PageInfo pageInfo = new PageInfo(queryByLike); + return BaseResult.getSuccessMessageEntity("pageInfo",pageInfo); + } + + /** + * 参数检查 + * @param entity + * @param type + */ + private void checkParams(SysFlowEntity entity,String type){ + Assert.notNull(entity,"请求参数不能为空"); + if ("save".equals(type)){ + Assert.notEmpty(entity.getClassId(),"classId不能为空"); + Assert.notEmpty(entity.getName(),"name不能为空"); + SysFlowEntity flow = new SysFlowEntity(); + flow.setName(entity.getName()); + List flowList = sysFlowDao.query(flow); + if (CollectionUtils.isNotEmpty(flowList)){ + throw new BaseSystemException(entity.getName()+"重复"); + } + }else if("update".equals(type)){ + Assert.notEmpty(entity.getId(),"Id不能为空"); + SysFlowEntity flow = new SysFlowEntity(); + flow.setName(entity.getName()); + List flowList = sysFlowDao.query(flow); + if (CollectionUtils.isNotEmpty(flowList)){ + for (SysFlowEntity sysFlowEntity : flowList) { + if (!sysFlowEntity.getId().equals(entity.getId())){ + throw new BaseSystemException(entity.getName()+"重复"); + } + } + } + }else if ("delete".equals(type)){ + Assert.notEmpty(entity.getId(),"Id不能为空"); + + }else if ("queryPaged".equals(type)){ + Assert.notNull(entity.getPageNum(),"pageNum不能为空"); + Assert.notNull(entity.getPageSize(),"pageSize不能为空"); + } + } }