From 032ea192ee90eb52863808a70ab257b5615e77f7 Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Tue, 11 Mar 2025 19:04:52 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/artifacts/weaver_develop_jar.xml | 2 +- .../controller/HrmCustomTemplateAction.java | 13 +++ .../api/qzsecond/web/HrmResourceAction.java | 13 --- .../controller/HrmCustomTemplateAction.java | 108 ++++++++++++++++++ .../engine/qz/entity/CustomTemplateVo.java | 33 ++++++ .../qz/entity/CustomTranscerDataVo.java | 29 +++++ .../engine/qz/entity/TemplateFieldsPo.java | 28 +++++ .../qz/service/HrmCustomTemplateService.java | 55 +++++++++ .../impl/HrmCustomTemplateServiceImpl.java | 70 ++++++++++++ .../qzsecond/service/HrmResourceService.java | 21 ---- .../service/impl/HrmResourceServiceImpl.java | 26 ----- .../qzsecond/web/HrmResourceAction.java | 53 --------- 12 files changed, 337 insertions(+), 114 deletions(-) create mode 100644 src/com/api/qz/controller/HrmCustomTemplateAction.java delete mode 100644 src/com/api/qzsecond/web/HrmResourceAction.java create mode 100644 src/com/engine/qz/controller/HrmCustomTemplateAction.java create mode 100644 src/com/engine/qz/entity/CustomTemplateVo.java create mode 100644 src/com/engine/qz/entity/CustomTranscerDataVo.java create mode 100644 src/com/engine/qz/entity/TemplateFieldsPo.java create mode 100644 src/com/engine/qz/service/HrmCustomTemplateService.java create mode 100644 src/com/engine/qz/service/impl/HrmCustomTemplateServiceImpl.java delete mode 100644 src/com/engine/qzsecond/service/HrmResourceService.java delete mode 100644 src/com/engine/qzsecond/service/impl/HrmResourceServiceImpl.java delete mode 100644 src/com/engine/qzsecond/web/HrmResourceAction.java diff --git a/.idea/artifacts/weaver_develop_jar.xml b/.idea/artifacts/weaver_develop_jar.xml index 6258dfe..2aff103 100644 --- a/.idea/artifacts/weaver_develop_jar.xml +++ b/.idea/artifacts/weaver_develop_jar.xml @@ -1,6 +1,6 @@ - $PROJECT_DIR$/out/artifacts/weaver_develop_jar + $PROJECT_DIR$/../../../../weaver/ecology/WEB-INF/lib diff --git a/src/com/api/qz/controller/HrmCustomTemplateAction.java b/src/com/api/qz/controller/HrmCustomTemplateAction.java new file mode 100644 index 0000000..90c3d71 --- /dev/null +++ b/src/com/api/qz/controller/HrmCustomTemplateAction.java @@ -0,0 +1,13 @@ +package com.api.qz.controller; + +import javax.ws.rs.Path; + +/** + * @Author Apple + * @Date 2025/2/24 11:08 + * @Description: + * @Version 1.0 + */ +@Path("/qz/hrm/resource") +public class HrmCustomTemplateAction extends com.engine.qz.controller.HrmCustomTemplateAction { +} diff --git a/src/com/api/qzsecond/web/HrmResourceAction.java b/src/com/api/qzsecond/web/HrmResourceAction.java deleted file mode 100644 index b54ec4e..0000000 --- a/src/com/api/qzsecond/web/HrmResourceAction.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.api.qzsecond.web; - -import javax.ws.rs.Path; - -/** - * @Author liang.cheng - * @Date 2025/2/24 11:07 - * @Description: - * @Version 1.0 - */ -@Path("/qz/hrm/resource") -public class HrmResourceAction extends com.engine.qzsecond.web.HrmResourceAction { -} diff --git a/src/com/engine/qz/controller/HrmCustomTemplateAction.java b/src/com/engine/qz/controller/HrmCustomTemplateAction.java new file mode 100644 index 0000000..b93a80f --- /dev/null +++ b/src/com/engine/qz/controller/HrmCustomTemplateAction.java @@ -0,0 +1,108 @@ +package com.engine.qz.controller; + +import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson.serializer.SerializerFeature; +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; + +import com.engine.qz.service.HrmCustomTemplateService; + + +import com.engine.qz.service.impl.HrmCustomTemplateServiceImpl; +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.POST; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.HashMap; +import java.util.Map; + +/** + * @Author Apple + * @Date 2025/2/24 11:07 + * @Description: 钱智定制化花名册 + * @Version 1.0 + */ +public class HrmCustomTemplateAction { + + private HrmCustomTemplateService getService(User user) { + return ServiceUtil.getService(HrmCustomTemplateServiceImpl.class,user); + } + + + @GET + @Path("/getCustomTransferData") + @Produces(MediaType.TEXT_PLAIN) + public String getCustomTransferData(@Context HttpServletRequest request, @Context HttpServletResponse response){ + Map data = new HashMap<>(8); + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + data.put("result",getService(user).getCustomTransferData(map)); + data.put("api_status", true); + } catch (Exception e) { + data.put("api_status", false); + data.put("msg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); + } + + + @GET + @Path("/getCustomTemplate") + @Produces(MediaType.TEXT_PLAIN) + public String getCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response){ + Map data = new HashMap<>(8); + try { + User user = HrmUserVarify.getUser(request, response); + data.put("result",getService(user).getCustomTemplate()); + data.put("api_status", true); + } catch (Exception e) { + data.put("api_status", false); + data.put("msg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); + } + + + @POST + @Path("/addCustomTemplate") + @Produces(MediaType.TEXT_PLAIN) + public String updateCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response){ + Map data = new HashMap<>(8); + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + data.putAll(getService(user).addCustomTemplate(map)); + data.put("api_status", true); + } catch (Exception e) { + data.put("api_status", false); + data.put("msg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); + } + + @POST + @Path("/updateCustomTemplateFields") + @Produces(MediaType.TEXT_PLAIN) + public String updateCustomTemplateFields(@Context HttpServletRequest request, @Context HttpServletResponse response){ + Map data = new HashMap<>(8); + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + data.putAll(getService(user).updateCustomTemplateFields(map)); + data.put("api_status", true); + } catch (Exception e) { + data.put("api_status", false); + data.put("msg", "catch exception : " + e.getMessage()); + } + return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); + } + +} diff --git a/src/com/engine/qz/entity/CustomTemplateVo.java b/src/com/engine/qz/entity/CustomTemplateVo.java new file mode 100644 index 0000000..4f99514 --- /dev/null +++ b/src/com/engine/qz/entity/CustomTemplateVo.java @@ -0,0 +1,33 @@ +package com.engine.qz.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author Apple + * @Date 2025/3/11 13:50 + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CustomTemplateVo { + + private String key; + + private String showname; + + private String templateFields; + + private Integer isused; + + private Integer belongto; + + + +} diff --git a/src/com/engine/qz/entity/CustomTranscerDataVo.java b/src/com/engine/qz/entity/CustomTranscerDataVo.java new file mode 100644 index 0000000..a45c8f9 --- /dev/null +++ b/src/com/engine/qz/entity/CustomTranscerDataVo.java @@ -0,0 +1,29 @@ +package com.engine.qz.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.LinkedList; + +/** + * @Author Apple + * @Date 2025/3/11 13:50 + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class CustomTranscerDataVo { + + private Integer templateId; + + private LinkedList transferDatas; + + private LinkedList transferKeys; + +} diff --git a/src/com/engine/qz/entity/TemplateFieldsPo.java b/src/com/engine/qz/entity/TemplateFieldsPo.java new file mode 100644 index 0000000..500be43 --- /dev/null +++ b/src/com/engine/qz/entity/TemplateFieldsPo.java @@ -0,0 +1,28 @@ +package com.engine.qz.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author Apple + * @Date 2025/3/11 13:50 + * @Description: TODO + * @Version 1.0 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class TemplateFieldsPo { + + private Integer id; + + private String fieldName; + + private String fieldDataName; + + +} diff --git a/src/com/engine/qz/service/HrmCustomTemplateService.java b/src/com/engine/qz/service/HrmCustomTemplateService.java new file mode 100644 index 0000000..cdc1a27 --- /dev/null +++ b/src/com/engine/qz/service/HrmCustomTemplateService.java @@ -0,0 +1,55 @@ +package com.engine.qz.service; + +import com.engine.qz.entity.CustomTemplateVo; +import com.engine.qz.entity.CustomTranscerDataVo; + +import java.util.LinkedList; +import java.util.Map; + +/** + * @Author Apple + * @Date 2025/2/24 11:08 + * @Description: + * @Version 1.0 + */ +public interface HrmCustomTemplateService { + + + /** + * @Description: 列定制内容查询 + * @Author: Apple + * @param: [params] + * @return: CustomTranscerDataVo + */ + CustomTranscerDataVo getCustomTransferData(Map params); + + /** + * @Description: 列定制模板查询 + * @Author: Apple + * @Date: 2025/3/11 13:49 + * @param: [params] + * @return: java.util.Map + */ + LinkedList getCustomTemplate(); + + /** + * @Description: 列定制增加模板 + * @Author: Apple + * @Date: 2025/3/11 13:49 + * @param: [params] + * @return: java.util.Map + */ + Map addCustomTemplate(Map params); + + /** + * @Description: 列定制模板字段更新 + * @Author: Apple + * @Date: 2025/3/11 13:49 + * @param: [params] + * @return: java.util.Map + */ + Map updateCustomTemplateFields(Map params); + + + +} diff --git a/src/com/engine/qz/service/impl/HrmCustomTemplateServiceImpl.java b/src/com/engine/qz/service/impl/HrmCustomTemplateServiceImpl.java new file mode 100644 index 0000000..6c30976 --- /dev/null +++ b/src/com/engine/qz/service/impl/HrmCustomTemplateServiceImpl.java @@ -0,0 +1,70 @@ +package com.engine.qz.service.impl; + +import com.engine.core.impl.Service; +import com.engine.qz.entity.CustomTemplateVo; +import com.engine.qz.entity.CustomTranscerDataVo; + +import com.engine.qz.service.HrmCustomTemplateService; +import com.weaver.general.Util; +import weaver.conn.RecordSet; + +import java.util.LinkedList; +import java.util.Map; + +/** + * @Author Apple + * @Date 2025/2/24 11:08 + * @Description: + * @Version 1.0 + */ +public class HrmCustomTemplateServiceImpl extends Service implements HrmCustomTemplateService { + + + @Override + public CustomTranscerDataVo getCustomTransferData(Map params) { + + //1.所有可查看字段 + + //2.存在模板 且已经选择的字段 + + + + + return null; + } + + @Override + public LinkedList getCustomTemplate() { + + RecordSet rs = new RecordSet(); + LinkedList customTemplateVos = new LinkedList<>(); + rs.executeQuery("select id,templateName,templateFields,isused,belongto from uf_custom_template \n" + + "where belongto = ? order by id asc",user.getUID()); + + while (rs.next()) { + customTemplateVos.add(CustomTemplateVo.builder() + .key(Util.null2String(rs.getString("id"))) + .showname(Util.null2String(rs.getString("templateName"))) + .templateFields(Util.null2String(rs.getString("templateFields"))) + .isused(Util.getIntValue(rs.getString("isused"))) + .belongto(Util.getIntValue(rs.getString("belongto"))) + .build()); + } + + //todo 没有模板或者模版都没启用 + + return customTemplateVos; + } + + @Override + public Map addCustomTemplate(Map params) { + return null; + } + + @Override + public Map updateCustomTemplateFields(Map params) { + return null; + } + + +} diff --git a/src/com/engine/qzsecond/service/HrmResourceService.java b/src/com/engine/qzsecond/service/HrmResourceService.java deleted file mode 100644 index 3a892db..0000000 --- a/src/com/engine/qzsecond/service/HrmResourceService.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.engine.qzsecond.service; - -import java.util.Map; - -/** - * @Author liang.cheng - * @Date 2025/2/24 11:08 - * @Description: - * @Version 1.0 - */ -public interface HrmResourceService { - - /** - * @Description: table列表 - * @Author: liang.cheng - * @Date: 2025/2/24 11:22 - * @param: [params] - * @return: java.util.Map - */ - Map listPage(Map params); -} diff --git a/src/com/engine/qzsecond/service/impl/HrmResourceServiceImpl.java b/src/com/engine/qzsecond/service/impl/HrmResourceServiceImpl.java deleted file mode 100644 index 980049a..0000000 --- a/src/com/engine/qzsecond/service/impl/HrmResourceServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.engine.qzsecond.service.impl; - -import com.engine.core.impl.Service; -import com.engine.qzsecond.service.HrmResourceService; - -import java.util.Map; - -/** - * @Author liang.cheng - * @Date 2025/2/24 11:08 - * @Description: - * @Version 1.0 - */ -public class HrmResourceServiceImpl extends Service implements HrmResourceService { - - - @Override - public Map listPage(Map params) { - - //1.标准table(增加字段权限过滤) - - - - return null; - } -} diff --git a/src/com/engine/qzsecond/web/HrmResourceAction.java b/src/com/engine/qzsecond/web/HrmResourceAction.java deleted file mode 100644 index 82f4ca9..0000000 --- a/src/com/engine/qzsecond/web/HrmResourceAction.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.engine.qzsecond.web; - -import com.alibaba.fastjson.JSONObject; -import com.alibaba.fastjson.serializer.SerializerFeature; -import com.engine.common.util.ParamUtil; -import com.engine.common.util.ServiceUtil; -import com.engine.qzsecond.service.HrmResourceService; -import com.engine.qzsecond.service.impl.HrmResourceServiceImpl; - -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 javax.ws.rs.core.MediaType; -import java.util.HashMap; -import java.util.Map; - -/** - * @Author liang.cheng - * @Date 2025/2/24 11:07 - * @Description: 钱智定制化花名册 - * @Version 1.0 - */ -public class HrmResourceAction { - - private HrmResourceService getService(User user) { - return ServiceUtil.getService(HrmResourceServiceImpl.class,user); - } - - - @GET - @Path("/listPage") - @Produces(MediaType.TEXT_PLAIN) - public String listPage(@Context HttpServletRequest request, @Context HttpServletResponse response){ - Map data = new HashMap<>(8); - try { - User user = HrmUserVarify.getUser(request, response); - Map map = ParamUtil.request2Map(request); - data.putAll(getService(user).listPage(map)); - data.put("api_status", true); - } catch (Exception e) { - data.put("api_status", false); - data.put("msg", "catch exception : " + e.getMessage()); - } - return JSONObject.toJSONString(data, SerializerFeature.DisableCircularReferenceDetect); - } - -}