diff --git a/.idea/artifacts/hrm_attendance.xml b/.idea/artifacts/hrm_attendance.xml new file mode 100644 index 0000000..41e0413 --- /dev/null +++ b/.idea/artifacts/hrm_attendance.xml @@ -0,0 +1,8 @@ + + + $PROJECT_DIR$/out/artifacts/hrm_attendance + + + + + \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index cf41ff0..8fde53a 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -2,6 +2,7 @@ + diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml new file mode 100644 index 0000000..e96534f --- /dev/null +++ b/.idea/uiDesigner.xml @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar new file mode 100644 index 0000000..7dcf697 Binary files /dev/null and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ diff --git a/src/com/api/attendance/common/CommonActionApi.java b/src/com/api/attendance/common/CommonActionApi.java new file mode 100644 index 0000000..9951e9e --- /dev/null +++ b/src/com/api/attendance/common/CommonActionApi.java @@ -0,0 +1,9 @@ +package com.api.attendance.common; + +import com.engine.common.web.CommonAction; + +import javax.ws.rs.Path; + +@Path("/operate/common") +public class CommonActionApi extends CommonAction{ +} diff --git a/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java b/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java new file mode 100644 index 0000000..039d41b --- /dev/null +++ b/src/com/api/attendance/persongroup/web/PersonGroupActionApi.java @@ -0,0 +1,11 @@ +package com.api.attendance.persongroup.web; + +import com.engine.attendance.persongroup.web.PersonGroupAction; +import lombok.extern.slf4j.Slf4j; + +import javax.ws.rs.Path; + +@Path("/attendance/persongroup") +@Slf4j +public class PersonGroupActionApi extends PersonGroupAction { +} diff --git a/src/com/attendance/engine/util/SendEmMessage.java b/src/com/attendance/engine/util/SendEmMessage.java deleted file mode 100644 index d4d5c04..0000000 --- a/src/com/attendance/engine/util/SendEmMessage.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.util; - -import com.cloudstore.dev.api.bean.MessageBean; -import com.cloudstore.dev.api.bean.MessageType; -import com.cloudstore.dev.api.util.Util_Message; -import com.engine.dto.BaseResult; -import com.google.common.collect.Maps; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import weaver.general.BaseBean; - -import java.io.IOException; -import java.lang.reflect.Type; -import java.util.Map; -import java.util.Set; - -/** - * 消息中心 - */ -@Slf4j -public class SendEmMessage { - - - /** - * - * @param userIdsSet 接收人id 必填 - * @param title 标题 - * @param context 内容 - * @param pcLinkUrl PC端链接 - * @param linkMobileUrl 移动端链接 - */ - public static void sendEmMessage(Set userIdsSet,int messageType,int creater, String title,String context,String pcLinkUrl,String linkMobileUrl){ - MessageType type = MessageType.newInstance(messageType); // 消息来源（见文档第四点补充 必填） - - try { - MessageBean messageBean = Util_Message.createMessage(type, userIdsSet, title, context, pcLinkUrl, linkMobileUrl); - messageBean.setCreater(creater);// 创建人id - - Util_Message.store(messageBean); - } catch (IOException e) { - log.error("sendEmMessage error: [{}]",e); - e.printStackTrace(); - } - } - - public static BaseResult sendWxMessage(String chatId,String messageContent){ - BaseBean baseBean = new BaseBean(); - //发送消息接口 - String sendMessageToWxGroupUrl = baseBean.getPropValue("weComConf","sendMessageToWxGroupUrl"); - Map sendMessageParamMap = Maps.newHashMap(); - sendMessageParamMap.put("chatid",chatId); - sendMessageParamMap.put("msgtype","markdown"); - Map content = Maps.newHashMap(); - content.put("content",messageContent); - sendMessageParamMap.put("markdown",content); - Gson gson = new Gson(); - BaseResult baseResult = gson.fromJson(TokenUtil.post(sendMessageToWxGroupUrl,gson.toJson(sendMessageParamMap)),(Type) BaseResult.class); - return baseResult; - } -} diff --git a/src/com/attendance/engine/util/TokenUtil.java b/src/com/attendance/engine/util/TokenUtil.java deleted file mode 100644 index 3b56deb..0000000 --- a/src/com/attendance/engine/util/TokenUtil.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.util; - -import com.cloudstore.dev.api.util.Util_DataCache; -import com.engine.dto.TokenResult; -import com.google.gson.Gson; -import lombok.extern.slf4j.Slf4j; -import weaver.general.BaseBean; -import weaver.general.Util; - -import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; - -@Slf4j -public class TokenUtil { - - private static final int timeOutSecond = 3600; - - /** - * 配置文件名称 - */ - private static final String confFileName = "weComConf"; - - private static BaseBean baseBean = new BaseBean(); - - private static Gson gson = new Gson(); - - public static final String TOKEN_URL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken"; - - private static String corpid = ""; - - private static String corpsecret = ""; - - static { - corpid = baseBean.getPropValue(confFileName,"corpid"); - corpsecret = baseBean.getPropValue(confFileName,"corpsecret"); -// Util_DataCache.setObjVal("corpid",corpid); -// Util_DataCache.setObjVal("corpsecret",corpsecret); - } - - public static String post(String url,String paramJson){ - String token = Util.null2String(Util_DataCache.getObjVal("wx_access_token")); - if ("".equals(token)){ - token = getAccessToken(); - Util_DataCache.setObjVal("wx_access_token",token); - } - url = url + "?access_token="+token; - return HttpRequestUtil.doPost(url,paramJson); - } - - - public static String getAccessToken(){ - Map map = new HashMap<>(); - map.put("corpid",corpid); - map.put("corpsecret",corpsecret); -// map.put("corpid","wx22cd58d9bee18c0f"); -// map.put("corpsecret","n4ueR_AnNWXtmYpwr01dRA6i2v9kephxRKbW23n_ZTM"); - - String response = HttpRequestUtil.doGet(TOKEN_URL,map); - TokenResult tokenResult = gson.fromJson(response,(Type) TokenResult.class); - if ("0".equals(tokenResult.getErrcode())){ - return tokenResult.getAccess_token(); - }else { - return ""; - } - } - -} diff --git a/src/com/engine/attendance/persongroup/service/PersonGroupService.java b/src/com/engine/attendance/persongroup/service/PersonGroupService.java new file mode 100644 index 0000000..a9b3af6 --- /dev/null +++ b/src/com/engine/attendance/persongroup/service/PersonGroupService.java @@ -0,0 +1,10 @@ +package com.engine.attendance.persongroup.service; + + +import weaver.hrm.User; + +import java.util.Map; + +public interface PersonGroupService { + Map getHrmCondition(Map params, User user); +} diff --git a/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java b/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java new file mode 100644 index 0000000..61df061 --- /dev/null +++ b/src/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.java @@ -0,0 +1,65 @@ +package com.engine.attendance.persongroup.service.impl; + + +import com.engine.attendance.persongroup.service.PersonGroupService; +import com.engine.common.util.DbTools; +import com.engine.core.impl.Service; +import com.google.common.collect.Maps; +import lombok.extern.slf4j.Slf4j; +import weaver.general.Util; +import weaver.hrm.User; +import weaver.systeminfo.SystemEnv; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + + +@Slf4j +public class PersonGroupServiceImpl extends Service implements PersonGroupService { + @Override + public Map getHrmCondition(Map params, User user) { + //获取字段类型 0:日期类型,1:下拉选择类型,2:手工自由输入类型 + String type = Util.null2String(params.get("fieldType")); + String condition = ""; + if ("0".equals(type)){ + condition = " and fieldhtmltype='3' and type=2 "; + }else if ("1".equals(type)){ + condition = " and fieldhtmltype = '5' "; + }else if ("2".equals(type)){ + condition = " and fieldhtmltype <> '3' and fieldhtmltype <> '5' "; + } + + Map data = Maps.newHashMap(); + String sql = "select * from (select t1.fieldid,t2.fieldname,t1.fieldlable,t1.ismand,t2.fielddbtype,t2.fieldhtmltype,t2.type, t1.dmlurl, t1.fieldorder, t1.isuse, t1.isModify,'1' as allowModify, t1.groupid, 1 as allowhide from cus_formfield t1, cus_formdict t2 where t1.fieldid=t2.id and t1.scope='HrmCustomFieldByInfoType' and (t1.scopeid='1' or t1.scopeid='-1' or t1.scopeid='3' ) " + + " UNION all " + + " select fieldid, fieldname, fieldlabel ,ismand ,fielddbtype ,fieldhtmltype ,type , dmlurl,fieldorder ,isuse ,isModify ,allowModify, groupid, allowhide from hrm_formfield) hrmallfield where groupid in (select id from hrm_fieldgroup where (grouptype = '1' or grouptype = '-1' or grouptype = '3')) "; + + sql = sql +condition+" order by hrmallfield.groupid, hrmallfield.fieldorder "; + log.info("sql :[{}]",sql); + List> dataList = DbTools.getSqlToList(sql); + sql = "select fieldid,selectvalue,selectname from hrm_selectitem"; + List> selectItemLists = DbTools.getSqlToList(sql); + Map>> selectItemMap = selectItemLists.stream().collect(Collectors.groupingBy(e -> e.get("fieldid").toString())); + log.info("selectItemMap : [{}]",selectItemMap); + + sql = "select type,linkurl from wf_browser_config group by type"; + List> browserTypeLists = DbTools.getSqlToList(sql); + Map browserTypeMaps = browserTypeLists.stream().collect(Collectors.toMap(e->e.get("type").toString(),e->e.get("linkurl").toString())); + log.info("browserTypeMaps : [{}]",browserTypeMaps); + + for (Map map :dataList){ + Integer fieldlable = Integer.valueOf(map.get("fieldlable").toString()); + String showName = SystemEnv.getHtmlLabelName(fieldlable, user.getLanguage()); + map.put("showName",showName); + map.put("linkurl",browserTypeMaps.get(map.get("type").toString())); + map.put("selectItems",selectItemMap.get(map.get("fieldid").toString())); + } + + data.put("data",dataList); + + return data; + } + + +} diff --git a/src/com/engine/attendance/persongroup/web/PersonGroupAction.java b/src/com/engine/attendance/persongroup/web/PersonGroupAction.java new file mode 100644 index 0000000..812188c --- /dev/null +++ b/src/com/engine/attendance/persongroup/web/PersonGroupAction.java @@ -0,0 +1,43 @@ +package com.engine.attendance.persongroup.web; + +import com.engine.attendance.persongroup.service.PersonGroupService; +import com.engine.attendance.persongroup.service.impl.PersonGroupServiceImpl; +import com.engine.common.util.ApiReturnTools; +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import lombok.extern.slf4j.Slf4j; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import java.util.Map; + +@Slf4j +public class PersonGroupAction { + + private PersonGroupService basicsetService = ServiceUtil.getService(PersonGroupServiceImpl.class); + + /** + * @return + */ + @GET + @Path("/getHrmCondition") + @Produces({"text/plain"}) + public String getHrmCondition(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request,response); + Map paramMap = ParamUtil.request2Map(request); + Map dataMap = basicsetService.getHrmCondition(paramMap,user); + return ApiReturnTools.success(dataMap); + }catch (Exception e){ + log.error("execute fail,catch error: [{}]",e); + return ApiReturnTools.error("500","getHrmCondition error"); + } + + } +} diff --git a/src/com/engine/common/cmd/QueryCommonCmd.java b/src/com/engine/common/cmd/QueryCommonCmd.java new file mode 100644 index 0000000..6f8b273 --- /dev/null +++ b/src/com/engine/common/cmd/QueryCommonCmd.java @@ -0,0 +1,57 @@ +package com.engine.common.cmd; + +import com.engine.common.biz.AbstractCommonCommand; +import com.engine.common.entity.BizLogContext; +import com.engine.common.util.DbTools; +import com.engine.core.interceptor.CommandContext; +import lombok.extern.slf4j.Slf4j; +import weaver.general.Util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@Slf4j +public class QueryCommonCmd extends AbstractCommonCommand> { + + public QueryCommonCmd(Map params){ + this.params=params; + } + @Override + public BizLogContext getLogContext() { + return null; + } + + @Override + public Map execute(CommandContext commandContext) { + Map resultMap = new HashMap<>(); + String tableName = Util.null2String(params.get("tableName")); + String columns = Util.null2String(params.get("columns")); + String conditions = Util.null2String(params.get("conditions")); + String orderby = Util.null2String(params.get("orderby")); + String limit = Util.null2String(params.get("limit")); + + tableName = tableName.replace("ｊｏｉｎ","join"); + conditions = conditions.replace("ｉｎ","in"); + String sql = "select "+columns +" from "+tableName; + if (!"".equals(conditions) ){ + conditions = conditions.replace(":","="); + if (conditions.indexOf("in")<0){ + conditions = conditions.replace(","," and "); + } + sql = sql + " where "+ conditions; + } + if (!"".equals(orderby)){ + sql = sql + orderby; + } + if (!"".equals(limit)){ + sql = sql + limit; + } + log.info("QueryCommonCmd sql :[{}]",sql); + + List> resultList = DbTools.getSqlToList(sql); + + resultMap.put("data",resultList); + return resultMap; + } +} diff --git a/src/com/engine/common/service/CommonService.java b/src/com/engine/common/service/CommonService.java new file mode 100644 index 0000000..8e9b356 --- /dev/null +++ b/src/com/engine/common/service/CommonService.java @@ -0,0 +1,13 @@ +package com.engine.common.service; + +import java.util.Map; + +public interface CommonService { + + Map queryCommon(Map param); + + + Map updateCommon(Map param); + + Map insertCommon(Map param); +} diff --git a/src/com/engine/common/service/impl/CommonServiceImpl.java b/src/com/engine/common/service/impl/CommonServiceImpl.java new file mode 100644 index 0000000..07849a2 --- /dev/null +++ b/src/com/engine/common/service/impl/CommonServiceImpl.java @@ -0,0 +1,46 @@ +package com.engine.common.service.impl; + +import com.engine.common.cmd.QueryCommonCmd; +import com.engine.common.service.CommonService; +import com.engine.common.util.CommonUtil; +import com.engine.common.util.DbTools; +import com.engine.common.util.Utils; +import com.engine.core.impl.Service; +import com.google.common.collect.Sets; +import lombok.extern.slf4j.Slf4j; +import weaver.general.Util; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +@Slf4j +public class CommonServiceImpl extends Service implements CommonService { + + @Override + public Map queryCommon(Map param) { + return commandExecutor.execute(new QueryCommonCmd(param)); + } + + + @Override + public Map updateCommon(Map param) { + Map result = new HashMap<>(); + log.info("updateCommon param:[{}]",param); + result.put("result", DbTools.update(CommonUtil.makeUpdateSql(Util.null2String(param.get("tableName")),Utils.resolveMap(Util.null2String(param.get("data"))),Utils.resolveMap(Util.null2String(param.get("condition")))))); + return result; + } + + @Override + public Map insertCommon(Map param) { + Map result = new HashMap<>(); + log.info("insertCommon param:[{}]",param); + Map params = Utils.resolveMap(Util.null2String(param.get("params"))); + String tableName = Util.null2String(params.get("tableName")); + params.remove("tableName"); + result.put("result", DbTools.update(CommonUtil.makeInsertSql(tableName,params))); + return result; + + } +} diff --git a/src/com/attendance/engine/util/ApiReturnTools.java b/src/com/engine/common/util/ApiReturnTools.java similarity index 95% rename from src/com/attendance/engine/util/ApiReturnTools.java rename to src/com/engine/common/util/ApiReturnTools.java index b2061cd..12c688c 100644 --- a/src/com/attendance/engine/util/ApiReturnTools.java +++ b/src/com/engine/common/util/ApiReturnTools.java @@ -1,4 +1,4 @@ -package com.util; +package com.engine.common.util; import com.google.gson.Gson; diff --git a/src/com/engine/common/util/CommonUtil.java b/src/com/engine/common/util/CommonUtil.java new file mode 100644 index 0000000..e7ce3f3 --- /dev/null +++ b/src/com/engine/common/util/CommonUtil.java @@ -0,0 +1,53 @@ +package com.engine.common.util; + +import lombok.extern.slf4j.Slf4j; + +import java.util.Map; + +@Slf4j +public class CommonUtil { + /** + * 组装insert的sql语句 + * @param tableName 表名 + * @param map 列名及对应值 + * @return + */ + public static String makeInsertSql(String tableName, Map map){ + String insertSql = "insert into "+tableName; + String key = "("; + String value = "("; + for (Map.Entry e : map.entrySet()){ + key = key + e.getKey() +","; + value = value + "'"+e.getValue()+"'" +","; + } + key = key.substring(0,key.length()-1) + ")"; + value = value.substring(0,value.length()-1)+")"; + insertSql = insertSql + key +" values "+value; + log.info("makeInsertSql :[{}]",insertSql); + return insertSql; + } + + /** + * 组装update的sql语句 + * @param tableName 表名 + * @param map 列名及对应值 + * @param condition 条件 + * @return + */ + public static String makeUpdateSql(String tableName, Map map,Map condition){ + String updateSql = "update "+tableName+" set "; + for (Map.Entry e : map.entrySet()){ + if (e.getValue() !=null && !"".equals(e.getValue())){ + updateSql = updateSql + e.getKey()+"='"+e.getValue().toString()+"',"; + } + } + updateSql = updateSql.substring(0,updateSql.length()-1) + " where 1=1"; + for (Map.Entry e : condition.entrySet()){ + updateSql = updateSql + " and "+ e.getKey()+"='"+e.getValue()+"'"; + } + log.info("makeUpdateSql : [{}]",updateSql); + + return updateSql; + + } +} diff --git a/src/com/attendance/engine/util/DateUtil.java b/src/com/engine/common/util/DateUtil.java similarity index 99% rename from src/com/attendance/engine/util/DateUtil.java rename to src/com/engine/common/util/DateUtil.java index ce7a91d..bb3a6af 100644 --- a/src/com/attendance/engine/util/DateUtil.java +++ b/src/com/engine/common/util/DateUtil.java @@ -1,4 +1,4 @@ -package com.util; +package com.engine.common.util; import java.time.Duration; import java.time.LocalDate; diff --git a/src/com/attendance/engine/util/DbTools.java b/src/com/engine/common/util/DbTools.java similarity index 89% rename from src/com/attendance/engine/util/DbTools.java rename to src/com/engine/common/util/DbTools.java index 19a3946..4562792 100644 --- a/src/com/attendance/engine/util/DbTools.java +++ b/src/com/engine/common/util/DbTools.java @@ -1,8 +1,7 @@ -package com.util; +package com.engine.common.util; import com.google.common.collect.Maps; import weaver.conn.RecordSet; -import weaver.conn.RecordSetDataSource; import java.util.ArrayList; import java.util.HashMap; @@ -80,4 +79,12 @@ public class DbTools { } } + public static boolean update(RecordSet rs,String sql,Object...value){ + if (value == null || value.length <=0 || "".equals(value)){ + return rs.executeUpdate(sql); + }else { + return rs.executeUpdate(sql,value); + } + } + } diff --git a/src/com/attendance/engine/util/HttpRequestUtil.java b/src/com/engine/common/util/HttpRequestUtil.java similarity index 98% rename from src/com/attendance/engine/util/HttpRequestUtil.java rename to src/com/engine/common/util/HttpRequestUtil.java index c69d14f..4c2216a 100644 --- a/src/com/attendance/engine/util/HttpRequestUtil.java +++ b/src/com/engine/common/util/HttpRequestUtil.java @@ -1,6 +1,5 @@ -package com.util; +package com.engine.common.util; -import com.sun.jersey.core.util.Base64; import okhttp3.*; import weaver.general.BaseBean; diff --git a/src/com/attendance/engine/util/PropBean.java b/src/com/engine/common/util/PropBean.java similarity index 98% rename from src/com/attendance/engine/util/PropBean.java rename to src/com/engine/common/util/PropBean.java index 61e8638..2ad6a80 100644 --- a/src/com/attendance/engine/util/PropBean.java +++ b/src/com/engine/common/util/PropBean.java @@ -1,4 +1,4 @@ -package com.util; +package com.engine.common.util; import org.apache.commons.lang.StringUtils; import weaver.conn.RecordSet; diff --git a/src/com/attendance/engine/util/Utils.java b/src/com/engine/common/util/Utils.java similarity index 96% rename from src/com/attendance/engine/util/Utils.java rename to src/com/engine/common/util/Utils.java index 9211c8a..796fb3d 100644 --- a/src/com/attendance/engine/util/Utils.java +++ b/src/com/engine/common/util/Utils.java @@ -1,4 +1,4 @@ -package com.util; +package com.engine.common.util; import com.google.common.reflect.TypeToken; import com.google.gson.Gson; diff --git a/src/com/engine/common/web/CommonAction.java b/src/com/engine/common/web/CommonAction.java new file mode 100644 index 0000000..82c38db --- /dev/null +++ b/src/com/engine/common/web/CommonAction.java @@ -0,0 +1,82 @@ +package com.engine.common.web; + + +import com.engine.common.service.CommonService; +import com.engine.common.service.impl.CommonServiceImpl; +import com.engine.common.util.ApiReturnTools; +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import lombok.extern.slf4j.Slf4j; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import java.util.Map; + +@Slf4j +public class CommonAction { + + + private CommonService basicsetService = ServiceUtil.getService(CommonServiceImpl.class); + + /** + * tableName 表名 + * columns 查询的列名 + * conditions 查询条件 + * orderby 排序及limit + * @return + */ +// @GET +// @Path("/queryCommon") +// @Produces({"text/plain"}) +// public String getBasicSetInformation(@Context HttpServletRequest request, @Context HttpServletResponse response) { +// try { +// Map paramMap = ParamUtil.request2Map(request); +// Map dataMap = basicsetService.queryCommon(paramMap); +// return ApiReturnTools.success(dataMap); +// }catch (Exception e){ +// log.error("sync fund status fail,catch error: [{}]",e); +// return ApiReturnTools.error("200","查询失败"); +// } +// } + +// /** +// * @return +// */ +// @POST +// @Path("/updateCommon") +// @Produces({"text/plain"}) +// public String updateCommon(@Context HttpServletRequest request, @Context HttpServletResponse response) { +// try { +// Map paramMap = ParamUtil.request2Map(request); +// Map dataMap = basicsetService.updateCommon(paramMap); +// return ApiReturnTools.success(dataMap); +// }catch (Exception e){ +// log.error("sync fund status fail,catch error: [{}]",e); +// return ApiReturnTools.error("500","修改失败"); +// } +// } + /** + * @return + */ + @POST + @Path("/insertCommon") + @Produces({"text/plain"}) + public String insertCommon(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + Map paramMap = ParamUtil.request2Map(request); + Map dataMap = basicsetService.insertCommon(paramMap); + return ApiReturnTools.success(dataMap); + }catch (Exception e){ + log.error("sync fund status fail,catch error: [{}]",e); + return ApiReturnTools.error("500","新增"); + } + } + + + +} diff --git a/target/classes/com/api/attendance/persongroup/web/PersonGroupActionApi.class b/target/classes/com/api/attendance/persongroup/web/PersonGroupActionApi.class new file mode 100644 index 0000000..6e436e6 Binary files /dev/null and b/target/classes/com/api/attendance/persongroup/web/PersonGroupActionApi.class differ diff --git a/target/classes/com/engine/attendance/persongroup/service/PersonGroupService.class b/target/classes/com/engine/attendance/persongroup/service/PersonGroupService.class new file mode 100644 index 0000000..c744e1d Binary files /dev/null and b/target/classes/com/engine/attendance/persongroup/service/PersonGroupService.class differ diff --git a/target/classes/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.class b/target/classes/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.class new file mode 100644 index 0000000..881a40c Binary files /dev/null and b/target/classes/com/engine/attendance/persongroup/service/impl/PersonGroupServiceImpl.class differ diff --git a/target/classes/com/engine/attendance/persongroup/web/PersonGroupAction.class b/target/classes/com/engine/attendance/persongroup/web/PersonGroupAction.class new file mode 100644 index 0000000..3b41893 Binary files /dev/null and b/target/classes/com/engine/attendance/persongroup/web/PersonGroupAction.class differ diff --git a/target/classes/com/engine/attendance/util/ApiReturnTools.class b/target/classes/com/engine/attendance/util/ApiReturnTools.class new file mode 100644 index 0000000..1f7cb7d Binary files /dev/null and b/target/classes/com/engine/attendance/util/ApiReturnTools.class differ diff --git a/target/classes/com/engine/attendance/util/DateUtil.class b/target/classes/com/engine/attendance/util/DateUtil.class new file mode 100644 index 0000000..1bab6a5 Binary files /dev/null and b/target/classes/com/engine/attendance/util/DateUtil.class differ diff --git a/target/classes/com/engine/attendance/util/DbTools.class b/target/classes/com/engine/attendance/util/DbTools.class new file mode 100644 index 0000000..86aebd1 Binary files /dev/null and b/target/classes/com/engine/attendance/util/DbTools.class differ diff --git a/target/classes/com/engine/attendance/util/HttpRequestUtil$OkhttpInterceptor.class b/target/classes/com/engine/attendance/util/HttpRequestUtil$OkhttpInterceptor.class new file mode 100644 index 0000000..24aff85 Binary files /dev/null and b/target/classes/com/engine/attendance/util/HttpRequestUtil$OkhttpInterceptor.class differ diff --git a/target/classes/com/engine/attendance/util/HttpRequestUtil.class b/target/classes/com/engine/attendance/util/HttpRequestUtil.class new file mode 100644 index 0000000..cee903a Binary files /dev/null and b/target/classes/com/engine/attendance/util/HttpRequestUtil.class differ diff --git a/target/classes/com/engine/attendance/util/PropBean.class b/target/classes/com/engine/attendance/util/PropBean.class new file mode 100644 index 0000000..4ed4f0b Binary files /dev/null and b/target/classes/com/engine/attendance/util/PropBean.class differ diff --git a/target/classes/com/engine/attendance/util/Utils$1.class b/target/classes/com/engine/attendance/util/Utils$1.class new file mode 100644 index 0000000..700e1f0 Binary files /dev/null and b/target/classes/com/engine/attendance/util/Utils$1.class differ diff --git a/target/classes/com/engine/attendance/util/Utils$2.class b/target/classes/com/engine/attendance/util/Utils$2.class new file mode 100644 index 0000000..2455bff Binary files /dev/null and b/target/classes/com/engine/attendance/util/Utils$2.class differ diff --git a/target/classes/com/engine/attendance/util/Utils.class b/target/classes/com/engine/attendance/util/Utils.class new file mode 100644 index 0000000..e9acba9 Binary files /dev/null and b/target/classes/com/engine/attendance/util/Utils.class differ