From 9685f03db453a7df0c630ecf1fc64bb8107833f5 Mon Sep 17 00:00:00 2001 From: MustangDeng <670124965@qq.com> Date: Tue, 1 Mar 2022 11:13:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4demoController=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 + src/com/api/salary/web/DemoController.java | 7 -- .../engine/salary/cmd/demo/DemoPageCmd.java | 47 ------------- src/com/engine/salary/mapper/DemoMapper.java | 24 ------- .../engine/salary/service/DemoService.java | 15 ---- .../salary/service/impl/DemoServiceImpl.java | 27 -------- .../engine/salary/util/SalaryPageUtil.java | 47 ------------- src/com/engine/salary/util/page/Column.java | 16 ----- .../engine/salary/util/page/DataSource.java | 9 --- src/com/engine/salary/util/page/PageInfo.java | 43 ------------ src/com/engine/salary/util/page/PageUtil.java | 48 ------------- src/com/engine/salary/web/DemoController.java | 69 ------------------- 12 files changed, 3 insertions(+), 352 deletions(-) create mode 100644 .gitignore delete mode 100644 src/com/api/salary/web/DemoController.java delete mode 100644 src/com/engine/salary/cmd/demo/DemoPageCmd.java delete mode 100644 src/com/engine/salary/mapper/DemoMapper.java delete mode 100644 src/com/engine/salary/service/DemoService.java delete mode 100644 src/com/engine/salary/service/impl/DemoServiceImpl.java delete mode 100644 src/com/engine/salary/util/SalaryPageUtil.java delete mode 100644 src/com/engine/salary/util/page/Column.java delete mode 100644 src/com/engine/salary/util/page/DataSource.java delete mode 100644 src/com/engine/salary/util/page/PageInfo.java delete mode 100644 src/com/engine/salary/util/page/PageUtil.java delete mode 100644 src/com/engine/salary/web/DemoController.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..90ff512b6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/weaver-hrm-salary.iml +/out/ +/.idea/ diff --git a/src/com/api/salary/web/DemoController.java b/src/com/api/salary/web/DemoController.java deleted file mode 100644 index 4b7179e8c..000000000 --- a/src/com/api/salary/web/DemoController.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.api.salary.web; - -import javax.ws.rs.Path; - -@Path("/bs/hrmsalary/demo") -public class DemoController extends com.engine.salary.web.DemoController{ -} diff --git a/src/com/engine/salary/cmd/demo/DemoPageCmd.java b/src/com/engine/salary/cmd/demo/DemoPageCmd.java deleted file mode 100644 index 575d6d15c..000000000 --- a/src/com/engine/salary/cmd/demo/DemoPageCmd.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.engine.salary.cmd.demo; - -import com.engine.common.biz.AbstractCommonCommand; -import com.engine.common.entity.BizLogContext; -import com.engine.core.interceptor.CommandContext; -import com.engine.salary.entity.DemoPo; -import com.engine.salary.mapper.DemoMapper; -import com.engine.salary.util.page.PageInfo; -import com.engine.salary.util.page.PageUtil; -import org.apache.commons.compress.utils.Lists; -import org.apache.ibatis.session.SqlSession; -import weaver.conn.mybatis.MyBatisFactory; -import weaver.hrm.User; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class DemoPageCmd extends AbstractCommonCommand> { - - public DemoPageCmd(Map params, User user) { - this.user = user; - this.params = params; - } - - @Override - public BizLogContext getLogContext() { - return null; - } - - @Override - public Map execute(CommandContext commandContext) { - Map apidatas = new HashMap(16); - SqlSession sqlSession = MyBatisFactory.sqlSessionFactory.openSession(); - try { - DemoMapper mapper = sqlSession.getMapper(DemoMapper.class); - PageUtil.start(params); - List page = mapper.page(); - PageInfo pageInfo = new PageInfo<>(page,DemoPo.class); - apidatas.put("pageInfo", pageInfo); - } finally { - sqlSession.close(); - } - return apidatas; - } -} diff --git a/src/com/engine/salary/mapper/DemoMapper.java b/src/com/engine/salary/mapper/DemoMapper.java deleted file mode 100644 index a91e33baf..000000000 --- a/src/com/engine/salary/mapper/DemoMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.engine.salary.mapper; - - -import com.engine.salary.entity.DemoPo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.apache.ibatis.annotations.Select; - -import java.util.List; -import java.util.Map; - -/** - * @Description: 个税扣缴义务人 - * @Author: wangxiangzhong - * @Date: 2021/10/29 16:55 - */ -@Mapper -public interface DemoMapper { - - @Select("SELECT * FROM hrsa_tax_rate_base") - List page(); - - -} diff --git a/src/com/engine/salary/service/DemoService.java b/src/com/engine/salary/service/DemoService.java deleted file mode 100644 index 07549f173..000000000 --- a/src/com/engine/salary/service/DemoService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.engine.salary.service; - -import java.util.Map; - -public interface DemoService { - - Map list(Map params); - - Map getForm(Map params); - - Map save(Map params); - - - -} diff --git a/src/com/engine/salary/service/impl/DemoServiceImpl.java b/src/com/engine/salary/service/impl/DemoServiceImpl.java deleted file mode 100644 index 74bfd2cf6..000000000 --- a/src/com/engine/salary/service/impl/DemoServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.engine.salary.service.impl; - -import com.engine.core.impl.Service; -import com.engine.salary.cmd.TaxAgent.TaxAgentGetFromCmd; -import com.engine.salary.cmd.TaxAgent.TaxAgentSaveCmd; -import com.engine.salary.cmd.demo.DemoPageCmd; -import com.engine.salary.service.DemoService; - -import java.util.Map; - -public class DemoServiceImpl extends Service implements DemoService { - - @Override - public Map list(Map params) { - return commandExecutor.execute(new DemoPageCmd(params,user)); - } - - @Override - public Map getForm(Map params) { - return commandExecutor.execute(new TaxAgentGetFromCmd(params,user)); - } - - @Override - public Map save(Map params) { - return commandExecutor.execute(new TaxAgentSaveCmd(params,user)); - } -} diff --git a/src/com/engine/salary/util/SalaryPageUtil.java b/src/com/engine/salary/util/SalaryPageUtil.java deleted file mode 100644 index 4b3331af6..000000000 --- a/src/com/engine/salary/util/SalaryPageUtil.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.engine.salary.util; - -import com.github.pagehelper.Page; -import org.apache.commons.collections4.CollectionUtils; - -import java.util.Collections; -import java.util.List; - -/** - * @description: 分页相关的工具类 - * @author: xiajun - * @modified By: xiajun - * @date: Created in 11/22/21 2:03 PM - * @version:v1.0 - */ -public class SalaryPageUtil { - - private SalaryPageUtil() { - throw new IllegalStateException("Utility class"); - } - - public static Page buildPage(Integer pageNo, Integer pageSize) { - pageNo = pageNo == null || pageNo <= 0 ? 1 : pageNo; - pageSize = pageSize == null || pageSize <= 0 ? 10 : pageSize; - return new Page(pageNo, pageSize, true); - } - - /** - * 分页 - * - * @param pageNo 页码（从1开始） - * @param pageSize 每页条数 - * @param source 待分页的数据 - * @param 范型制定类 - * @return - */ - public static List subList(int pageNo, int pageSize, List source) { - if (CollectionUtils.isEmpty(source)) { - return Collections.emptyList(); - } - int endIndex = pageNo * pageSize; - int startIndex = (pageNo - 1) * pageSize; - startIndex = startIndex < 0 ? 0 : startIndex; - return source.subList(startIndex > source.size() ? source.size() : startIndex, - endIndex > source.size() ? source.size() : endIndex); - } -} diff --git a/src/com/engine/salary/util/page/Column.java b/src/com/engine/salary/util/page/Column.java deleted file mode 100644 index 71dad2257..000000000 --- a/src/com/engine/salary/util/page/Column.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.engine.salary.util.page; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Column { - String title; - String dataIndex; - String key; -} diff --git a/src/com/engine/salary/util/page/DataSource.java b/src/com/engine/salary/util/page/DataSource.java deleted file mode 100644 index 379b99023..000000000 --- a/src/com/engine/salary/util/page/DataSource.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.engine.salary.util.page; - -import lombok.Data; - -@Data -public class DataSource { - String key; - String title; -} diff --git a/src/com/engine/salary/util/page/PageInfo.java b/src/com/engine/salary/util/page/PageInfo.java deleted file mode 100644 index af8d06447..000000000 --- a/src/com/engine/salary/util/page/PageInfo.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.engine.salary.util.page; - -import com.engine.salary.annotation.TableTitle; -import lombok.Data; -import lombok.ToString; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.List; - -@Data -@ToString -public class PageInfo extends com.github.pagehelper.PageInfo { - Class clazz; - List columns = new ArrayList<>(); - List dataSource = new ArrayList<>(); - - public PageInfo(List list) { - super(list); - } - - public PageInfo(List list, Class clazz) { - super(list); - this.clazz = clazz; - } - - - public List getColumns() { - Field[] fields = clazz.getDeclaredFields(); - for (Field f : fields) { - boolean isanno = f.isAnnotationPresent(TableTitle.class); - if (isanno) { - TableTitle annotation = f.getAnnotation(TableTitle.class); - String title = annotation.title(); - String dataIndex = annotation.dataIndex(); - String key = annotation.key(); - Column column = Column.builder().title(title).dataIndex(dataIndex).key(key).build(); - columns.add(column); - } - } - return columns; - } -} diff --git a/src/com/engine/salary/util/page/PageUtil.java b/src/com/engine/salary/util/page/PageUtil.java deleted file mode 100644 index 5cd29a5b2..000000000 --- a/src/com/engine/salary/util/page/PageUtil.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.engine.salary.util.page; - -import com.github.pagehelper.Page; -import com.github.pagehelper.PageHelper; -import org.apache.commons.collections4.CollectionUtils; -import weaver.general.Util; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - - -public class PageUtil { - - public static void start(Map params) { - int pageNum = Util.getIntValue(Util.null2String(params.get("pageNum"))); - int pageSize = Util.getIntValue(Util.null2String(params.get("pageSize"))); - pageNum = pageNum <= 0 ? 1 : pageNum; - pageSize = pageSize <= 0 ? 10 : pageSize; - PageHelper.startPage(pageNum, pageSize); - } - - public static Page buildPage(Integer pageNo, Integer pageSize) { - pageNo = pageNo == null || pageNo <= 0 ? 1 : pageNo; - pageSize = pageSize == null || pageSize <= 0 ? 10 : pageSize; - return new Page(pageNo, pageSize, true); - } - - /** - * 分页 - * - * @param pageNo 页码（从1开始） - * @param pageSize 每页条数 - * @param source 待分页的数据 - * @param 范型制定类 - * @return - */ - public static List subList(int pageNo, int pageSize, List source) { - if (CollectionUtils.isEmpty(source)) { - return Collections.emptyList(); - } - int endIndex = pageNo * pageSize; - int startIndex = (pageNo - 1) * pageSize; - startIndex = startIndex < 0 ? 0 : startIndex; - return source.subList(startIndex > source.size() ? source.size() : startIndex, - endIndex > source.size() ? source.size() : endIndex); - } -} diff --git a/src/com/engine/salary/web/DemoController.java b/src/com/engine/salary/web/DemoController.java deleted file mode 100644 index d3878ae11..000000000 --- a/src/com/engine/salary/web/DemoController.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.engine.salary.web; - -import com.engine.common.util.ParamUtil; -import com.engine.common.util.ServiceUtil; -import com.engine.salary.service.DemoService; -import com.engine.salary.service.TaxAgentService; -import com.engine.salary.service.impl.DemoServiceImpl; -import com.engine.salary.service.impl.TaxAgentServiceImpl; -import com.engine.salary.util.ResponseResult; -import weaver.general.BaseBean; -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.Enumeration; -import java.util.HashMap; -import java.util.Map; - -public class DemoController { - - private BaseBean logger = new BaseBean(); - - private DemoService getService(User user) { - return (DemoService) ServiceUtil.getService(DemoServiceImpl.class, user); - } - - @GET - @Path("/list") - @Produces(MediaType.TEXT_PLAIN) - public String list(@Context HttpServletRequest request, @Context HttpServletResponse response) { - User user = HrmUserVarify.getUser(request, response); - return ResponseResult.run(getService(user)::list, ParamUtil.request2Map(request)); - } - - @GET - @Path("/getForm") - @Produces(MediaType.TEXT_PLAIN) - public String getForm(@Context HttpServletRequest request, @Context HttpServletResponse response) { - User user = HrmUserVarify.getUser(request, response); - return ResponseResult.run(getService(user)::getForm, ParamUtil.request2Map(request)); - } - - @POST - @Path("/save") - @Produces(MediaType.TEXT_PLAIN) - public String getFrom(@Context HttpServletRequest request, @Context HttpServletResponse response) { - User user = HrmUserVarify.getUser(request, response); - return ResponseResult.run(getService(user)::save, getRequestParams(request,response)); - } - - - protected Map getRequestParams(HttpServletRequest request, HttpServletResponse response){ - Map params = new HashMap(); - Enumeration em = request.getParameterNames(); - while(em.hasMoreElements()){ - String paramname = em.nextElement(); - params.put(paramname, request.getParameter(paramname)); - } - params.put("param_ip", request.getRemoteAddr());//加入ip - return params; - } -}