From 4dbc4cb5e5ff30854f49adc4def55a81fc94cdc0 Mon Sep 17 00:00:00 2001 From: shilei <798989044@qq.com> Date: Fri, 19 Apr 2024 18:44:00 +0800 Subject: [PATCH] =?UTF-8?q?#E10-28#=20=E5=BB=BA=E6=A8=A1=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E4=BD=BF=E7=94=A8rpc=E6=8E=A5=E5=8F=A3=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96,=E5=A4=84=E7=90=86=E7=BE=A4=E8=81=8A?= =?UTF-8?q?=E3=80=81=E8=87=AA=E5=8A=A9=E6=9C=8D=E5=8A=A1=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jcldoor/cmd/SelfServiceInfoCmd.java | 1 - .../controller/HrmSelfHelpController.java | 86 +++++- .../seconddev/jcldoor/util/ChatDayUtils.java | 251 ++++++++++-------- .../jcldoor/util/ChatGroupUtils.java | 218 ++++++++------- .../jcldoor/util/JucailinPortalUtils.java | 13 +- 5 files changed, 343 insertions(+), 226 deletions(-) diff --git a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java index afb17b6..0688759 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java @@ -1,6 +1,5 @@ package com.weaver.seconddev.jcldoor.cmd; -import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto; import com.weaver.ebuilder.form.client.entity.data.EBDataReqDto; diff --git a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java index 5ce7a5f..7e8a13e 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/controller/HrmSelfHelpController.java @@ -6,6 +6,8 @@ import com.weaver.common.authority.annotation.WeaPermission; import com.weaver.common.base.entity.result.WeaResult; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDto; import com.weaver.framework.remote.client.rest.RestClient; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.mc.api.async.AsyncSystemMessageRest; @@ -25,6 +27,7 @@ import com.weaver.workflow.common.entity.list.api.RequestListConditionApiEntity; import com.weaver.workflow.common.entity.list.api.publicapi.RequestCountInfoPAEntity; import com.weaver.workflow.list.api.rest.publicapi.WflRequestListRest; import com.weaver.workrelate.performance.api.rest.RemotePerformanceService; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1336,6 +1339,10 @@ public class HrmSelfHelpController { @WeaPermission(publicPermission = true) public WeaResult testSapi8(HttpServletRequest request){ + String field_ry = "985460777098248194" ; + String field_amount = "985460777098248195"; + String objId = "985460643895541762"; + //com.weaver.workrelate.performance.api.rest.RemotePerformanceService#queryFlowData log.error("testSapi8"); String groupId = "weaver-ebuilder-form-service"; @@ -1358,6 +1365,10 @@ public class HrmSelfHelpController { JSONObject dataObject = dataJson.getJSONObject("data"); if(dataObject.containsKey("data")){ JSONArray dataArray = dataObject.getJSONArray("data"); + + List insertEbDataReqDtoList = Lists.newArrayList(); + List updateEbDataReqDtoList = Lists.newArrayList(); + for(int i=0;i result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ - log.error("!recordList.isEmpty()"); - chatGroupUtils.updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); + + log.error("getChatGroup--!isEmpty"); + String id = String.valueOf(recordList.get(0).get("id")); + log.error("id:"+id); + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + // 设置更新id + mainData.add(new EBDataReqDetailDto("id", id)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + updateEbDataReqDtoList.add(ebDataReqDto); + }else{ - log.error("recordList.isEmpty()"); - chatGroupUtils.insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + log.error("getChatGroup--isEmpty"); + + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + mainData.add(new EBDataReqDetailDto(field_ry, userid)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + insertEbDataReqDtoList.add(ebDataReqDto); } } } + + log.error("getChatDay-insertEbDataReqDtoList:"+insertEbDataReqDtoList.size()); + if(insertEbDataReqDtoList !=null && insertEbDataReqDtoList.size()>0){ + jucailinPortalUtils.saveModeData(objId,employeeId+"",tenant_key,insertEbDataReqDtoList); + } + + log.error("getChatDay-updateEbDataReqDtoList:"+updateEbDataReqDtoList.size()); + if(updateEbDataReqDtoList !=null && updateEbDataReqDtoList.size()>0){ + jucailinPortalUtils.updateModeDataById(objId,employeeId+"",tenant_key,updateEbDataReqDtoList,false); + } + } } } @@ -1409,6 +1447,11 @@ public class HrmSelfHelpController { Long cid = employee.getCid(); long employeeId = employee.getEmployeeId(); + + String field_ry = "985461236726857729" ; + String field_amount = "985461236726857730"; + String objId = "985461167965437954"; + Map dataMap = new HashMap(); dataMap.put("test","testSapi9"); String tablename = "uf_nj_pjmrdlhhsl" ; @@ -1423,6 +1466,10 @@ public class HrmSelfHelpController { JSONObject dataObject = dataJson.getJSONObject("data"); if(dataObject.containsKey("data")){ JSONArray dataArray = dataObject.getJSONArray("data"); + + List insertEbDataReqDtoList = Lists.newArrayList(); + List updateEbDataReqDtoList = Lists.newArrayList(); + for(int i=0;i result = databaseUtils.execute(sourceType, groupId, sql); List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ + log.error("getChatDay--!isEmpty"); + String id = String.valueOf(recordList.get(0).get("id")); + log.error("id:"+id); + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + // 设置更新id + mainData.add(new EBDataReqDetailDto("id", id)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + updateEbDataReqDtoList.add(ebDataReqDto); - chatDayUtils.updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); }else{ - chatDayUtils.insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + log.error("getChatDay--isEmpty"); + + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + mainData.add(new EBDataReqDetailDto(field_ry, userid)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + insertEbDataReqDtoList.add(ebDataReqDto); } + } + } + + log.error("getChatDay-insertEbDataReqDtoList:"+insertEbDataReqDtoList.size()); + if(insertEbDataReqDtoList !=null && insertEbDataReqDtoList.size()>0){ + jucailinPortalUtils.saveModeData(objId,employeeId+"",tenant_key,insertEbDataReqDtoList); + } + log.error("getChatDay-updateEbDataReqDtoList:"+updateEbDataReqDtoList.size()); + if(updateEbDataReqDtoList !=null && updateEbDataReqDtoList.size()>0){ + jucailinPortalUtils.updateModeDataById(objId,employeeId+"",tenant_key,updateEbDataReqDtoList,false); } + } } } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java index 55c0d37..e151286 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java @@ -3,12 +3,15 @@ package com.weaver.seconddev.jcldoor.util; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.weaver.common.distribution.genid.IdGenerator; +//import com.weaver.common.distribution.genid.IdGenerator; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDto; import com.weaver.em.msg.api.entity.Request; import com.weaver.em.msg.api.entity.Response; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.security.context.UserContext; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,6 +43,11 @@ public class ChatDayUtils { String sourceType = "LOGIC"; try { + + String field_ry = "985461236726857729" ; + String field_amount = "985461236726857730"; + String objId = "985461167965437954"; + SimpleEmployee employee = UserContext.getCurrentUser(); String startDate = "2001-01-01"; @@ -92,6 +100,8 @@ public class ChatDayUtils { JSONArray dataArray = dataObject.getJSONArray("data"); log.error("getChatDay--dataArray"+dataArray.size()); + List insertEbDataReqDtoList = Lists.newArrayList(); + List updateEbDataReqDtoList = Lists.newArrayList(); for(int i=0;i sqlparam = new ArrayList(); -// SqlParamEntity sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(userid+""); -// sqlparam.add(sqlParamEntity); -// sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(tenant_key+""); -// sqlparam.add(sqlParamEntity); -// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); -// + Map result = databaseUtils.execute(sourceType, groupId, sql); List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ log.error("getChatDay--!isEmpty"); - updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); + String id = String.valueOf(recordList.get(0).get("id")); + log.error("id:"+id); + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + // 设置更新id + mainData.add(new EBDataReqDetailDto("id", id)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + updateEbDataReqDtoList.add(ebDataReqDto); + }else{ log.error("getChatDay--isEmpty"); - insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + mainData.add(new EBDataReqDetailDto(field_ry, userid)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + insertEbDataReqDtoList.add(ebDataReqDto); + } } + + log.error("getChatDay-insertEbDataReqDtoList:"+insertEbDataReqDtoList.size()); + if(insertEbDataReqDtoList !=null && insertEbDataReqDtoList.size()>0){ + jucailinPortalUtils.saveModeData(objId,employeeId+"",tenant_key,insertEbDataReqDtoList); + } + + log.error("getChatDay-updateEbDataReqDtoList:"+updateEbDataReqDtoList.size()); + if(updateEbDataReqDtoList !=null && updateEbDataReqDtoList.size()>0){ + jucailinPortalUtils.updateModeDataById(objId,employeeId+"",tenant_key,updateEbDataReqDtoList,false); + } + } } } @@ -144,105 +171,105 @@ public class ChatDayUtils { * @param groupId * @param tenant_key */ - public void insertChatDayDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ - String code = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - long generate = IdGenerator.generate(); - log.error("insertChatDayDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId); - - SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); - String username = user.getUsername(); - String name = user.getName(); - log.error("username:"+username); - log.error("name:"+name); - - String modename = "平均每日单聊会话数量-"+username+" "+sdf.format(new Date()); - - String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type,updater,name,is_flow,data_status) " + - " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0,"+employeeId+",'"+modename+"',0,1)"; - - log.error("insertChatDayDate-sql:"+sql); - Map result = databaseUtils.execute(sourceType, groupId, sql); - - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - if(result.containsKey("code")){ - code = String.valueOf(result.get("code")); - } - - }catch (Exception e){ - e.printStackTrace(); - log.error("insertChatDayDate:"+e); - code = "-100"; - } - log.error("insertChatDayDate-code:"+code); - } - - /*** - * - * @param userid - * @param amount - * @param sourceType - * @param groupId - * @param tenant_key - */ - public String updateChatDayDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename,long employeeId){ - String code = "" ; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { -// String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; -// log.error("insertChatDayDate-sql:"+sql + " amount:"+amount+" userid:"+userid); -// List sqlparam = new ArrayList(); -// SqlParamEntity sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(amount+""); -// sqlparam.add(sqlParamEntity); +// public void insertChatDayDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ +// String code = ""; +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// try { +// long generate = IdGenerator.generate(); +// log.error("insertChatDayDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId); // -// sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(userid+""); -// sqlparam.add(sqlParamEntity); +// SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); +// String username = user.getUsername(); +// String name = user.getName(); +// log.error("username:"+username); +// log.error("name:"+name); // -// sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(tenant_key); -// sqlparam.add(sqlParamEntity); -// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); - - SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); - String username = user.getUsername(); - String name = user.getName(); - log.error("username:"+username); - log.error("name:"+name); - - String modename = "平均每日单聊会话数量-"+username+" "+sdf.format(new Date()); - - String sql =" update "+tablename+" set amount='"+amount+"',updater="+employeeId+",update_time=now(),is_flow=0,data_status=1,modename='"+modename+"' where ry = "+userid+" and tenant_key= '"+tenant_key+"' and delete_type=0 "; - log.error("insertChatDayDate-sql:"+sql ); - - - Map result = databaseUtils.execute(sourceType, groupId, sql); - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("updateChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - if(result.containsKey("code")){ - code = String.valueOf(result.get("code")); - } - }catch (Exception e){ - e.printStackTrace(); - log.error("insertChatDayDate:"+e); - code = "-100"; - } - return code; - } +// String modename = "平均每日单聊会话数量-"+username+" "+sdf.format(new Date()); +// +// String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type,updater,name,is_flow,data_status) " + +// " values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0,"+employeeId+",'"+modename+"',0,1)"; +// +// log.error("insertChatDayDate-sql:"+sql); +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// if(result.containsKey("code")){ +// code = String.valueOf(result.get("code")); +// } +// +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("insertChatDayDate:"+e); +// code = "-100"; +// } +// log.error("insertChatDayDate-code:"+code); +// } +// +// /*** +// * +// * @param userid +// * @param amount +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public String updateChatDayDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename,long employeeId){ +// String code = "" ; +// +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// try { +//// String sql =" update "+tablename+" set amount=?,update_time=now() where ry = ? and tenant_key= ? and delete_type=0 "; +//// log.error("insertChatDayDate-sql:"+sql + " amount:"+amount+" userid:"+userid); +//// List sqlparam = new ArrayList(); +//// SqlParamEntity sqlParamEntity = new SqlParamEntity(); +//// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +//// sqlParamEntity.setValue(amount+""); +//// sqlparam.add(sqlParamEntity); +//// +//// sqlParamEntity = new SqlParamEntity(); +//// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +//// sqlParamEntity.setValue(userid+""); +//// sqlparam.add(sqlParamEntity); +//// +//// sqlParamEntity = new SqlParamEntity(); +//// sqlParamEntity.setParamType(SqlParamType.VARCHAR); +//// sqlParamEntity.setValue(tenant_key); +//// sqlparam.add(sqlParamEntity); +//// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); +// +// SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); +// String username = user.getUsername(); +// String name = user.getName(); +// log.error("username:"+username); +// log.error("name:"+name); +// +// String modename = "平均每日单聊会话数量-"+username+" "+sdf.format(new Date()); +// +// String sql =" update "+tablename+" set amount='"+amount+"',updater="+employeeId+",update_time=now(),is_flow=0,data_status=1,modename='"+modename+"' where ry = "+userid+" and tenant_key= '"+tenant_key+"' and delete_type=0 "; +// log.error("insertChatDayDate-sql:"+sql ); +// +// +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("updateChatDayDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// if(result.containsKey("code")){ +// code = String.valueOf(result.get("code")); +// } +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("insertChatDayDate:"+e); +// code = "-100"; +// } +// return code; +// } } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java index 5869855..9df9445 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java @@ -6,12 +6,15 @@ import com.alibaba.fastjson.JSONObject; import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDetailDto; +import com.weaver.ebuilder.form.client.entity.data.EBDataReqDto; import com.weaver.em.msg.api.entity.Request; import com.weaver.em.msg.api.entity.Response; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.seconddev.cm.rpcutil.HrmCommonRpcUtil; import com.weaver.teams.domain.user.SimpleEmployee; import com.weaver.teams.security.context.UserContext; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,6 +53,10 @@ public class ChatGroupUtils { try { + String field_ry = "985460777098248194" ; + String field_amount = "985460777098248195"; + String objId = "985460643895541762"; + String startDate = "2001-01-01"; //设置当前时间 @@ -105,6 +112,9 @@ public class ChatGroupUtils { log.error("getChatGroup--dataArray"+dataArray.size()); + List insertEbDataReqDtoList = Lists.newArrayList(); + List updateEbDataReqDtoList = Lists.newArrayList(); + for(int i=0;i sqlparam = new ArrayList(); -// SqlParamEntity sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(userid+""); -// sqlparam.add(sqlParamEntity); -// sqlParamEntity = new SqlParamEntity(); -// sqlParamEntity.setParamType(SqlParamType.VARCHAR); -// sqlParamEntity.setValue(tenant_key+""); -// sqlparam.add(sqlParamEntity); -// Map result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam); Map result = databaseUtils.execute(sourceType, groupId, sql); List> recordList = databaseUtils.getDataSourceList(result); if(!recordList.isEmpty()){ log.error("getChatGroup--!isEmpty"); - updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId); + String id = String.valueOf(recordList.get(0).get("id")); + log.error("id:"+id); + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + // 设置更新id + mainData.add(new EBDataReqDetailDto("id", id)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + updateEbDataReqDtoList.add(ebDataReqDto); + }else{ log.error("getChatGroup--isEmpty"); - insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename); + + EBDataReqDto ebDataReqDto = new EBDataReqDto(); + List mainData = Lists.newArrayList(); + mainData.add(new EBDataReqDetailDto(field_ry, userid)); + mainData.add(new EBDataReqDetailDto(field_amount, amount)); + ebDataReqDto.setMainDatas(mainData); + insertEbDataReqDtoList.add(ebDataReqDto); } } + + log.error("getChatDay-insertEbDataReqDtoList:"+insertEbDataReqDtoList.size()); + if(insertEbDataReqDtoList !=null && insertEbDataReqDtoList.size()>0){ + jucailinPortalUtils.saveModeData(objId,employeeId+"",tenant_key,insertEbDataReqDtoList); + } + + log.error("getChatDay-updateEbDataReqDtoList:"+updateEbDataReqDtoList.size()); + if(updateEbDataReqDtoList !=null && updateEbDataReqDtoList.size()>0){ + jucailinPortalUtils.updateModeDataById(objId,employeeId+"",tenant_key,updateEbDataReqDtoList,false); + } + } } } @@ -158,89 +184,89 @@ public class ChatGroupUtils { * @param groupId * @param tenant_key */ - public String insertChatGroupDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ - - String code = ""; - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - - SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); - String username = user.getUsername(); - String name = user.getName(); - log.error("username:"+username); - log.error("name:"+name); - String modename = "参与群聊统计表-"+username+" "+sdf.format(new Date()); - - long generate = IdGenerator.generate(); - log.error("insertChatGroupDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId); - - String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type,updater,name,is_flow,data_status) " + - " values(" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0,"+employeeId+",'"+modename+"',0,1)"; - - log.error("insertChatGroupDate-sql:"+sql); - Map result = databaseUtils.execute(sourceType, groupId, sql); - - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("insertChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - if(result.containsKey("code")){ - code = String.valueOf(result.get("code")); - } - - }catch (Exception e){ - e.printStackTrace(); - log.error("insertChatGroupDate:"+e); - } - log.error("insertChatGroupDate-code:"+code); - return code ; - } - - /*** - * - * @param userid - * @param amount - * @param sourceType - * @param groupId - * @param tenant_key - */ - public String updateChatGroupDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename,long employeeId){ - - String code = ""; - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - try { - - SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); - String username = user.getUsername(); - String name = user.getName(); - log.error("username:"+username); - log.error("name:"+name); - String modename = "参与群聊统计表-"+username+" "+sdf.format(new Date()); - - String sql =" update "+tablename+" set amount='"+amount+"',updater="+employeeId+",update_time=now(),is_flow=0,data_status=1,modename='"+modename+"' where ry = "+userid+" and tenant_key= '"+tenant_key+"' and delete_type=0 "; - log.error("updateChatGroupDate-sql:"+sql); - - Map result = databaseUtils.execute(sourceType, groupId, sql); - Iterator> iterator = result.entrySet().iterator(); - while (iterator.hasNext()){ - Map.Entry next = iterator.next(); - log.error("updateChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); - } - - if(result.containsKey("code")){ - code = String.valueOf(result.get("code")); - } - - }catch (Exception e){ - e.printStackTrace(); - log.error("updateChatGroupDate:"+e); - code = "-200"; - } - - return code ; - } +// public String insertChatGroupDate(String userid,String amount,long employeeId,String sourceType,String groupId,String tenant_key,String tablename){ +// +// String code = ""; +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// try { +// +// SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); +// String username = user.getUsername(); +// String name = user.getName(); +// log.error("username:"+username); +// log.error("name:"+name); +// String modename = "参与群聊统计表-"+username+" "+sdf.format(new Date()); +// +// long generate = IdGenerator.generate(); +// log.error("insertChatGroupDate-generate:"+generate+" userid:"+userid+" amount"+amount+" employeeId:"+employeeId); +// +// String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type,updater,name,is_flow,data_status) " + +// " values(" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0,"+employeeId+",'"+modename+"',0,1)"; +// +// log.error("insertChatGroupDate-sql:"+sql); +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("insertChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// if(result.containsKey("code")){ +// code = String.valueOf(result.get("code")); +// } +// +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("insertChatGroupDate:"+e); +// } +// log.error("insertChatGroupDate-code:"+code); +// return code ; +// } +// +// /*** +// * +// * @param userid +// * @param amount +// * @param sourceType +// * @param groupId +// * @param tenant_key +// */ +// public String updateChatGroupDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename,long employeeId){ +// +// String code = ""; +// +// SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// try { +// +// SimpleEmployee user = jucailinPortalUtils.getSimpleEmployee(Long.parseLong(userid)); +// String username = user.getUsername(); +// String name = user.getName(); +// log.error("username:"+username); +// log.error("name:"+name); +// String modename = "参与群聊统计表-"+username+" "+sdf.format(new Date()); +// +// String sql =" update "+tablename+" set amount='"+amount+"',updater="+employeeId+",update_time=now(),is_flow=0,data_status=1,modename='"+modename+"' where ry = "+userid+" and tenant_key= '"+tenant_key+"' and delete_type=0 "; +// log.error("updateChatGroupDate-sql:"+sql); +// +// Map result = databaseUtils.execute(sourceType, groupId, sql); +// Iterator> iterator = result.entrySet().iterator(); +// while (iterator.hasNext()){ +// Map.Entry next = iterator.next(); +// log.error("updateChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue())); +// } +// +// if(result.containsKey("code")){ +// code = String.valueOf(result.get("code")); +// } +// +// }catch (Exception e){ +// e.printStackTrace(); +// log.error("updateChatGroupDate:"+e); +// code = "-200"; +// } +// +// return code ; +// } } diff --git a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java index 80b8663..f9ef01d 100644 --- a/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java +++ b/src/main/java/com/weaver/seconddev/jcldoor/util/JucailinPortalUtils.java @@ -1,22 +1,14 @@ package com.weaver.seconddev.jcldoor.util; -import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; -import com.alibaba.fastjson.JSONObject; -import com.weaver.common.distribution.genid.IdGenerator; import com.weaver.common.hrm.entity.employee.HrmEmployee; import com.weaver.common.hrm.service.HrmCommonEmployeePlusService; import com.weaver.common.hrm.util.HrmCommonUtil; import com.weaver.ebuilder.datasource.api.entity.SqlParamEntity; import com.weaver.ebuilder.datasource.api.enums.SqlParamType; import com.weaver.ebuilder.form.client.entity.data.*; -import com.weaver.em.msg.api.entity.Request; -import com.weaver.em.msg.api.entity.Response; import com.weaver.framework.rpc.annotation.RpcReference; import com.weaver.teams.domain.user.SimpleEmployee; -import com.weaver.teams.security.context.UserContext; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,7 +17,6 @@ import org.springframework.stereotype.Component; import com.weaver.ebuilder.form.client.service.data.RemoteSimpleDataService; import javax.servlet.http.HttpServletRequest; -import java.text.SimpleDateFormat; import java.util.*; @@ -620,6 +611,7 @@ public class JucailinPortalUtils { EBDataChangeReqDto ebDataChangeReqDto = new EBDataChangeReqDto(); // 构建基础参数; objId 表单id, operator 操作人, tenantKey 租户 ebDataChangeReqDto.setHeader(new EBDataReqHeader(objId, operator,tenant_key)); + // List datas = Lists.newArrayList(); //// 数据1 // EBDataReqDto ebDataReqDto1 = new EBDataReqDto(); @@ -630,7 +622,6 @@ public class JucailinPortalUtils { // mainData1.add(new EBDataReqDetailDto("845949549147324419", "选项1", true)); // ebDataReqDto1.setMainDatas(mainData1); // -// //// 数据2 // EBDataReqDto ebDataReqDto2 = new EBDataReqDto(); // List mainData2 = Lists.newArrayList(); @@ -639,7 +630,6 @@ public class JucailinPortalUtils { //// 选择框根据选项key赋值 // mainData2.add(new EBDataReqDetailDto("845949549147324419", "845949643627814915", false)); // ebDataReqDto2.setMainDatas(mainData2); -// // datas.add(ebDataReqDto1); // datas.add(ebDataReqDto2); @@ -699,6 +689,7 @@ public class JucailinPortalUtils { ebDataChangeReqDto.setDatas(datas); EBDataChangeResult updateEbDataChangeResult = remoteSimpleDataService.updateFormData(ebDataChangeReqDto); + log.error("updateEbDataChangeResult:"+updateEbDataChangeResult.getMessage()); log.error("updateEbDataChangeResult:"+updateEbDataChangeResult.toString()); log.error("updateEbDataChangeResult:"+updateEbDataChangeResult.getStatus());