shilei
/
E10-secondev-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#E10-26# 自主服务初始化接口优化

Browse Source
main
shilei 1 year ago
parent 2d1ce4ce72
commit 86f712144e
6 changed files with 210 additions and 89 deletions
Show Stats Download Patch File Download Diff File

107
src/main/java/com/weaver/seconddev/jcldoor/cmd/SelfServiceInfoCmd.java
Unescape Escape View File

@ -2,13 +2,11 @@ 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.obj.Obj;
import com.weaver.seconddev.jcldoor.util.DatabaseUtils;
import com.weaver.seconddev.jcldoor.util.JucailinPortalUtils;
import com.weaver.teams.domain.user.SimpleEmployee;
import com.weaver.teams.security.context.UserContext;
import org.apache.commons.lang3.StringUtils;
import org.apache.tools.ant.types.selectors.modifiedselector.Cache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -324,19 +322,18 @@ public class SelfServiceInfoCmd {
*/
public Map<String,Object> initSelfServiceData(String employeeId){
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
Map<String,Object> recordMap = new HashMap<String,Object>();
String pkey = "uf_zzfwcsh.taby.fieldId";
String field_id = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwcsh.taby.url";
String taburl = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
pkey = "uf_zzfwrktaby.qy.value";
String uf_zzfwrktaby_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String uf_zzfwrktaby_qy = "977701948757786627";
String uf_zzfwrkpz_qy = "977704104898478082";
pkey = "uf_zzfwrkpz.qy.value";
String uf_zzfwrkpz_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
try{
String sql = " select distinct taby from uf_zzfwrkpz where ry=? and qy is not null and taby is not null and delete_type=0 and tenant_key =?";
@ -402,7 +399,7 @@ public class SelfServiceInfoCmd {
String code = insertTabData(employeeId,name,i+"",groupId,sourceType,uf_zzfwrktaby_qy);
if("200".equals(code)){
tabid = getTabId(employeeId,name,groupId,sourceType,uf_zzfwrktaby_qy);
log.error("tabid:"+tabid);
log.error("tabid2:"+tabid);
if(StringUtils.isNotBlank(tabid)){
int count = initCustomServiceDataByType(employeeId,groupId,sourceType,taby,tabid,uf_zzfwrkpz_qy);
if(count>0){
@ -459,18 +456,21 @@ public class SelfServiceInfoCmd {
log.error("sql:"+sql);
Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, Object> next = iterator.next();
log.error("insertTabData--key="+next.getKey()+" value="+String.valueOf(next.getValue()));
}
if(result.containsKey("code")){
code = String.valueOf(result.get("code"));
}
}catch (Exception e){
code = "-200";
log.error("insertTabData-e:"+e);
}
log.error("insertTabData-code:"+code);
return code;
}
@ -592,7 +592,7 @@ public class SelfServiceInfoCmd {
String sql =" insert into uf_zzfwrkpz(id,ry,fwmc,fwdz,fwtb,taby,qy,xssx,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type,updater,name,is_flow,data_status) " +
" values("+generate+","+employeeId+",'"+name+"','"+fwdz+"','"+fwtb+"','"+tabid+"',"+uf_zzfwrktaby_qy+",'"+xssx+"',"+generate+",0,now(),now(),'"+tenant_key+"',0,"+employeeId+",0,"+employeeId+",'"+name+"',0,1)";
Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
@ -600,19 +600,10 @@ public class SelfServiceInfoCmd {
log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue()));
}
for(int i=0;i<recordList.size();i++){
Map<String,Object> map = recordList.get(i);
for (String key:map.keySet()){
log.error("insertCustomServiceData22--key= "+key+" and value= "+String.valueOf(map.get(key)));
}
if(result.containsKey("code")){
code = String.valueOf(result.get("code"));
}
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
}
}catch (Exception e){
e.printStackTrace();
log.error("insertCustomServiceData-e:"+e);
@ -623,4 +614,60 @@ public class SelfServiceInfoCmd {
return code ;
}
/***
*
* @param employeeId
* @return
*/
public Map<String,Object> updateSelfServiceData(String employeeId){
String groupId = "weaver-ebuilder-form-service";
String sourceType = "LOGIC";
Map<String,Object> recordMap = new HashMap<String,Object>();
String pkey = "uf_zzfwrktaby.qy.value";
String uf_zzfwrktaby_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
pkey = "uf_zzfwrkpz.qy.value";
String uf_zzfwrkpz_qy = jucailinPortalUtils.getUfPropData(pkey,tenant_key);
String code1 = "" ;
String code2 = "" ;
try{
String sql1 =" update uf_zzfwrktaby set qy="+uf_zzfwrktaby_qy+",updater ="+employeeId+",is_flow=0,data_status =1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 ";
Map<String, Object> result1 = databaseUtils.execute(sourceType, groupId, sql1);
Iterator<Map.Entry<String, Object>> iterator1 = result1.entrySet().iterator();
while (iterator1.hasNext()){
Map.Entry<String, Object> next = iterator1.next();
log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue()));
}
if(result1.containsKey("code")){
code1 = String.valueOf(result1.get("code"));
}
String sql2 =" update uf_zzfwrkpz set qy="+uf_zzfwrkpz_qy+",updater ="+employeeId+",is_flow=0,data_status =1 where ry ="+employeeId+" and tenant_key='"+tenant_key+"' and delete_type = 0 ";
Map<String, Object> result2 = databaseUtils.execute(sourceType, groupId, sql2);
Iterator<Map.Entry<String, Object>> iterator2 = result2.entrySet().iterator();
while (iterator2.hasNext()){
Map.Entry<String, Object> next = iterator2.next();
log.error("insertCustomServiceData--key="+next.getKey()+" value="+String.valueOf(next.getValue()));
}
if(result2.containsKey("code")){
code2 = String.valueOf(result2.get("code"));
}
}catch (Exception e){
log.error("testSapi51-Exception:"+e.getMessage());
recordMap.put("code","-200");
}
recordMap.put("code1",code1);
recordMap.put("code2",code2);
return recordMap;
}
}

27
src/main/java/com/weaver/seconddev/jcldoor/controller/JucailinPortalController.java
Unescape Escape View File

@ -647,6 +647,33 @@ public class JucailinPortalController {
}
/**
* 自助服务(新增点击次数接口)
* @param request
* @return
*/
@GetMapping("/updateSelfServiceData")
@WeaPermission(publicPermission = true)
public WeaResult<Object> updateSelfServiceData(HttpServletRequest request){
log.error("initSelfServiceData");
Map<String, Object> dataMap = new HashMap<String, Object>();
try{
SimpleEmployee employee = UserContext.getCurrentUser();
String employeeId = request.getParameter("employeeId");
if(StringUtils.isBlank(employeeId)){
employeeId = String.valueOf(employee.getEmployeeId());
}
log.error("employeeId:"+employeeId);
dataMap = jucailinPortalService.updateSelfServiceData(employeeId);
}catch (Exception e){
log.error("addSelfServiceCount-Exception:"+e.getMessage());
}
return WeaResult.success(dataMap);
}

2
src/main/java/com/weaver/seconddev/jcldoor/service/JucailinPortalService.java
Unescape Escape View File

@ -56,4 +56,6 @@ public interface JucailinPortalService {
public Map<String, Object> initSelfServiceData(String employeeId);
public Map<String, Object> updateSelfServiceData(String employeeId);
}

7
src/main/java/com/weaver/seconddev/jcldoor/service/impl/JucailinPortalServiceImpl.java
Unescape Escape View File

@ -337,4 +337,11 @@ public class JucailinPortalServiceImpl implements JucailinPortalService {
return dataMap;
}
@Override
public Map<String, Object> updateSelfServiceData(String employeeId) {
Map<String,Object> dataMap = selfServiceInfoCmd.updateSelfServiceData(employeeId);
return dataMap;
}
}

65
src/main/java/com/weaver/seconddev/jcldoor/util/ChatDayUtils.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.weaver.common.distribution.genid.IdGenerator;
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.lang3.StringUtils;
@ -29,6 +30,8 @@ public class ChatDayUtils {
@Autowired
private DatabaseUtils databaseUtils;
@Autowired
private HrmCommonRpcUtil hrmCommonRpcUtil;
public Map<String,Object> getChatDay(String tenant_key, String tablename,String pageSize,String pageNum){
Map<String,Object> dataMap = new HashMap<String,Object>();
@ -113,7 +116,7 @@ public class ChatDayUtils {
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty()){
log.error("getChatDay--!isEmpty");
updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename);
updateChatDayDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId);
}else{
log.error("getChatDay--isEmpty");
insertChatDayDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
@ -144,22 +147,35 @@ public class ChatDayUtils {
*/
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);
String sql =" insert into "+tablename+"(id,ry,amount,form_data_id,data_index,create_time,update_time,tenant_key,is_delete,creator,delete_type) " +
" values (" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)";
SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(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<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, Object> 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);
@ -176,8 +192,10 @@ public class ChatDayUtils {
* @param groupId
* @param tenant_key
*/
public String updateChatDayDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){
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);
@ -198,16 +216,27 @@ public class ChatDayUtils {
// sqlparam.add(sqlParamEntity);
// Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(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 );
String sql =" update "+tablename+" set amount='"+amount+"',update_time=now() where ry = "+userid+" and tenant_key= '"+tenant_key+"' and delete_type=0 ";
log.error("insertChatDayDate-sql:"+sql + " amount:"+amount+" userid:"+userid);
Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, Object> 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();

91
src/main/java/com/weaver/seconddev/jcldoor/util/ChatGroupUtils.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.weaver.ebuilder.datasource.api.enums.SqlParamType;
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.lang3.StringUtils;
@ -33,6 +34,9 @@ public class ChatGroupUtils {
@Autowired
private DatabaseUtils databaseUtils;
@Autowired
private HrmCommonRpcUtil hrmCommonRpcUtil;
/***
*
*
@ -119,12 +123,13 @@ public class ChatGroupUtils {
// sqlParamEntity.setValue(tenant_key+"");
// sqlparam.add(sqlParamEntity);
// Map<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
Map<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty()){
log.error("getChatGroup--!isEmpty");
updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename);
updateChatGroupDate(userid,amount,sourceType,groupId,tenant_key,tablename,employeeId);
}else{
log.error("getChatGroup--isEmpty");
insertChatGroupDate(userid,amount,employeeId,sourceType,groupId,tenant_key,tablename);
@ -156,33 +161,40 @@ public class ChatGroupUtils {
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 = this.hrmCommonRpcUtil.getSimpleEmployee(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) " +
" values(" + generate + "," + userid + ",'"+amount+"'," + generate + ",0,now(),now(),'"+tenant_key+"',0," + employeeId + ",0)";
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<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
// Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
// while (iterator.hasNext()){
// Map.Entry<String, Object> next = iterator.next();
// log.error("insertChatGroupDate--key="+next.getKey()+" value="+String.valueOf(next.getValue()));
// }
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, Object> 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 ;
}
@ -194,35 +206,32 @@ public class ChatGroupUtils {
* @param groupId
* @param tenant_key
*/
public String updateChatGroupDate(String userid,String amount,String sourceType,String groupId,String tenant_key,String tablename){
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 {
String sql =" update "+tablename+" set amount='"+amount+"',update_time=now() where ry="+userid+" and tenant_key='"+tenant_key+"' and delete_type=0 ";
log.error("updateChatGroupDate-sql:"+sql+" amount:"+amount+" userid:"+userid);
List<SqlParamEntity> sqlparam = new ArrayList<SqlParamEntity>();
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<String, Object> result = databaseUtils.executeForQuery(sourceType, groupId, sql,sqlparam);
List<Map<String,Object>> recordList = databaseUtils.getDataSourceList(result);
if(!recordList.isEmpty() && recordList.size()>0){
Map<String,Object> recordMap = recordList.get(0);
if(recordMap.containsKey("code")){
code = String.valueOf(recordMap.get("code"));
}
SimpleEmployee user = this.hrmCommonRpcUtil.getSimpleEmployee(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<String, Object> result = databaseUtils.execute(sourceType, groupId, sql);
Iterator<Map.Entry<String, Object>> iterator = result.entrySet().iterator();
while (iterator.hasNext()){
Map.Entry<String, Object> 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){

Write Preview
Loading…
Cancel
Save