From e431c9071d534d0b8d135793feeab0c1e9176461 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 20 Feb 2025 14:56:46 +0800 Subject: [PATCH 1/3] calyrex 2.18 --- .../controller/CheckCarNumber_controller.java | 92 +++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java new file mode 100644 index 0000000..76a1a2b --- /dev/null +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java @@ -0,0 +1,92 @@ +package com.weaver.seconddev.interfaces.workflow.controller; + +import cn.hutool.json.JSONObject; +import com.weaver.common.base.entity.result.WeaResult; +import com.weaver.ebuilder.common.util.TenantContext; +import com.weaver.ebuilder.datasource.api.entity.ExecuteSqlEntity; +import com.weaver.ebuilder.datasource.api.enums.SourceType; +import com.weaver.ebuilder.datasource.api.service.DataSetService; +import com.weaver.framework.rpc.context.impl.TenantRpcContext; +import com.weaver.teams.api.tenant.Tenant; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; +import java.util.Map; + +/** + * @Author: calyrex + * @CreateTime: 2025-02-20 + * @Description: + */ + + +@Slf4j +@RestController +@RequestMapping({"/papi/secondev/workflow/controller" }) +public class CheckCarNumber_controller { + + + @Autowired + private DataSetService dataSetService; + @RequestMapping("/CheckCarNumber") + public WeaResult run(@RequestParam Map params) { + log.error("CheckCarNumber_controller execute start"); + log.error("CheckCarNumber_controller execute params : " + params); + JSONObject json = new JSONObject(); + try { + String applicant = null2String(params.get("applicant")); + String flag = "0"; + String sql = ""; + String sourceType = null2String(SourceType.LOGIC); + String groupId = "weaver-hr-service"; + Map datas = executeForQuery(sourceType, groupId, sql); + if(String.valueOf(datas.get("status")).equals("OK")){ + List> records = (List>)datas.get("records"); + if (records.size()>0){ + Map map = records.get(0); + json.put("flag",map.get("num")); + return WeaResult.success(json); + }else { + log.error("getCustomId 相关字段未找到"); + } + }else { + log.error("getUserId status-->"+ datas.get("status")); + } + }catch (Exception e){ + log.error("CheckCarNumber_controller execute error : " , e); + return WeaResult.fail(500, "getgsjc_controller execute error", e); + } + return WeaResult.success(json); + } + + public Map executeForQuery(String sourceType, String groupId, String sql) { +// log.error("executeForQuery sourceType-->" + sourceType + ",groupId-->" + groupId + ",sql-->" + sql); + final Tenant currentTenant = TenantContext.getCurrentTenant(); + TenantRpcContext.setTargetTenantKey(String.valueOf(currentTenant)); + ExecuteSqlEntity executeSqlEntity = new ExecuteSqlEntity(); + executeSqlEntity.setSql(cn.hutool.core.codec.Base64.encode(sql)); + executeSqlEntity.setGroupId(groupId); //groupid,可以访问 E10地址/api/datasource/ds/group?sourceType=LOGIC 获取 + executeSqlEntity.setSourceType(SourceType.valueOf(sourceType)); +// log.error("executeForQuery executeSqlEntity-->"+executeSqlEntity.getSql()+"-->"+executeSqlEntity.getGroupId()+"-->"+executeSqlEntity.getSourceType()); + Map datas = dataSetService.executeSql(executeSqlEntity); + log.error("executeForQuery datas-->" + datas); + TenantRpcContext.removeTargetTenantKey(); + return datas; + } + + public static String null2String(String s){ + return s == null ? "" : s; + } + + public static String null2String(Object o){ + return o == null ? "" : o.toString(); + } + + public static String null2String(String s1,String s2){ + return s1 == null ? (s2 == null ? "" : s2) : s1; + } +} From 6044cd965513fca88a02bc7012eb84f21ef3f0a7 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 20 Feb 2025 15:05:28 +0800 Subject: [PATCH 2/3] calyrex 2.18 --- .../workflow/controller/CheckCarNumber_controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java index 76a1a2b..ebc9765 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/controller/CheckCarNumber_controller.java @@ -20,7 +20,7 @@ import java.util.Map; /** * @Author: calyrex * @CreateTime: 2025-02-20 - * @Description: + * @Description: 需求变更已废弃 */ From d45160b0d40a117b4eea4945605866dae45d6f09 Mon Sep 17 00:00:00 2001 From: calyrex <2213354201@qq.com> Date: Thu, 20 Feb 2025 16:38:22 +0800 Subject: [PATCH 3/3] calyrex 2.18 --- .../ChangeInformationExpertsAction.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java index 0d401b4..28baaac 100644 --- a/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java +++ b/secondev-history-action/src/main/java/com/weaver/seconddev/interfaces/workflow/action/ChangeInformationExpertsAction.java @@ -114,16 +114,16 @@ public class ChangeInformationExpertsAction extends BaseBean implements Action, String poolname_k7 = CONN_TYPE.workflow.getType(); /* *TODO 检测到insert语句 -> E9插入sql迁移到E10需要特殊处理请参考文档进行调整 https://www.e-cology.com.cn/sp/doc/docShare/1027709301045985331?tenantKey=t7akvdnf84 TODO E10执行sql方法第二参数必须指定源，默认使用流程源，单体客户无需修改，微服务/组合客户需根据查询表所属服务切换源，或使用外部数据源*/ -// long generate = IdGenerator.generate(); -// rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate) - SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); - Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); - logger_750b7a22.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); - Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id - String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + roleid + ",resourceid=" + xm + ",rolelevel=2,resourcetype=1 where id = " + recodId + " and delete_type = 0 "; - boolean b1 = rs.executeSql(sql3, poolname); - logger_750b7a22.error("sql3 = " + sql3); - logger_750b7a22.error("添加 = " + b1); + long generate = IdGenerator.generate(); + rs.executeSql("insert into eteams.dbo.auth_user_role(roleid,resourceid,rolelevel,resourcetype) values(" + roleid + "," + xm + ",2,1)", poolname_k7,generate); +// SimpleEmployee currentEmployee = HrmContextUtil.getCurrentUser(); +// Long uf_CustomFlow_formId = commonDevUtil.getObjId("auth_user_role"); +// logger_750b7a22.error("uf_CustomFlow_formId = " + uf_CustomFlow_formId); +// Long recodId = ebFormDataDubboService.addEmptyData(uf_CustomFlow_formId, currentEmployee);// 获取插入的空的建模id +// String sql3 = "update e10_common.dbo.auth_user_role set roleid=" + roleid + ",resourceid=" + xm + ",rolelevel=2,resourcetype=1 where id = " + recodId + " and delete_type = 0 "; +// boolean b1 = rs.executeSql(sql3, poolname); +// logger_750b7a22.error("sql3 = " + sql3); +// logger_750b7a22.error("添加 = " + b1); } if ("0".equals(zjlx1)) { if ("".equals(xxhzj)) {