From 53004b1fa56fe800e1d98a57d1f6debe4986b481 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Fri, 21 Feb 2025 01:28:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A6=E6=88=B7=E5=92=8C?= =?UTF-8?q?=E7=A7=9F=E6=88=B7=E4=B8=A4=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsh/erp/controller/AccountController.java | 109 ++++++++++++++++-- .../erp/controller/ResourceController.java | 40 ++----- .../controller/SerialNumberController.java | 11 +- .../jsh/erp/controller/TenantController.java | 108 +++++++++++++++-- .../jsh/erp/controller/UserController.java | 2 +- .../datasource/mappers/AccountMapperEx.java | 15 +-- .../datasource/mappers/TenantMapperEx.java | 13 +-- .../service/{account => }/AccountService.java | 53 +++------ .../service/{tenant => }/TenantService.java | 28 ++--- .../erp/service/account/AccountComponent.java | 75 ------------ .../erp/service/account/AccountResource.java | 15 --- .../service/depotHead/DepotHeadService.java | 2 +- .../erp/service/tenant/TenantComponent.java | 78 ------------- .../erp/service/tenant/TenantResource.java | 15 --- .../com/jsh/erp/service/user/UserService.java | 2 +- .../com/jsh/erp/utils/ResponseJsonUtil.java | 39 ++----- .../java/com/jsh/erp/utils/StringUtil.java | 3 + .../resources/mapper_xml/AccountMapperEx.xml | 23 ---- .../resources/mapper_xml/TenantMapperEx.xml | 24 ---- 19 files changed, 263 insertions(+), 392 deletions(-) rename jshERP-boot/src/main/java/com/jsh/erp/service/{account => }/AccountService.java (94%) rename jshERP-boot/src/main/java/com/jsh/erp/service/{tenant => }/TenantService.java (89%) delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantResource.java diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java index f9433e86..4a0a1a9e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountController.java @@ -2,14 +2,15 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Account; import com.jsh.erp.datasource.vo.AccountVo4InOutList; import com.jsh.erp.datasource.vo.AccountVo4List; -import com.jsh.erp.service.account.AccountService; +import com.jsh.erp.service.AccountService; import com.jsh.erp.service.systemConfig.SystemConfigService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; -import com.jsh.erp.utils.StringUtil; +import com.jsh.erp.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -19,11 +20,13 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * @author jishenghua 75271*8920 @@ -40,6 +43,94 @@ public class AccountController { @Resource private SystemConfigService systemConfigService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Account account = accountService.getAccount(id); + Map objectMap = new HashMap<>(); + if(account != null) { + objectMap.put("info", account); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "获取信息列表") + public String getList(@RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, + @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, + @RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + if (pageSize != null && pageSize <= 0) { + pageSize = 10; + } + String name = StringUtil.getInfo(search, "name"); + String serialNo = StringUtil.getInfo(search, "serialNo"); + String remark = StringUtil.getInfo(search, "remark"); + IPage page = new Page<>(); + page.setCurrent(currentPage); + page.setSize(pageSize); + IPage list = accountService.select(page, name, serialNo, remark); + if (list != null) { + objectMap.put("total", list.getTotal()); + objectMap.put("rows", list.getRecords()); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + objectMap.put("total", BusinessConstants.DEFAULT_LIST_NULL_NUMBER); + objectMap.put("rows", new ArrayList()); + return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); + } + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = accountService.insertAccount(obj, request); + return returnStr(objectMap, insert); + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改") + public String updateResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int update = accountService.updateAccount(obj, request); + return returnStr(objectMap, update); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除") + public String deleteResource(@RequestParam("id") Long id, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = accountService.deleteAccount(id, request); + return returnStr(objectMap, delete); + } + + @DeleteMapping(value = "/deleteBatch") + @ApiOperation(value = "批量删除") + public String batchDeleteResource(@RequestParam("ids") String ids, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = accountService.batchDeleteAccount(ids, request); + return returnStr(objectMap, delete); + } + + @GetMapping(value = "/checkIsNameExist") + @ApiOperation(value = "检查名称是否存在") + public String checkIsNameExist(@RequestParam Long id, @RequestParam(value ="name", required = false) String name, + HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int exist = accountService.checkIsNameExist(id, name); + if(exist > 0) { + objectMap.put("status", true); + } else { + objectMap.put("status", false); + } + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } + /** * 查找结算账户信息-下拉框 * @param request @@ -184,10 +275,12 @@ public class AccountController { BaseResponseInfo res = new BaseResponseInfo(); try { Map map = new HashMap<>(); - List list = accountService.listWithBalance(StringUtil.toNull(name), StringUtil.toNull(serialNo), (currentPage-1)*pageSize, pageSize); - Long count = accountService.listWithBalanceCount(StringUtil.toNull(name), StringUtil.toNull(serialNo)); - map.put("rows", list); - map.put("total", count); + IPage page = new Page<>(); + page.setCurrent(currentPage); + page.setSize(pageSize); + IPage list = accountService.listWithBalance(page, StringUtil.toNull(name), StringUtil.toNull(serialNo)); + map.put("rows", list.getRecords()); + map.put("total", list.getTotal()); res.code = 200; res.data = map; } catch(Exception e){ diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java index f6e05c27..df835562 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java @@ -3,11 +3,12 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.service.CommonQueryManager; -import com.jsh.erp.utils.*; +import com.jsh.erp.utils.Constants; +import com.jsh.erp.utils.ErpInfo; +import com.jsh.erp.utils.ParamUtils; +import com.jsh.erp.utils.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -18,6 +19,7 @@ import java.util.List; import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * by jishenghua 2018-9-12 23:58:10 管伊佳erp @@ -79,13 +81,7 @@ public class ResourceController { @RequestBody JSONObject obj, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int insert = configResourceManager.insert(apiName, obj, request); - if(insert > 0) { - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else if(insert == -1) { - return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } + return returnStr(objectMap, insert); } @PutMapping(value = "/{apiName}/update", produces = {"application/javascript", "application/json"}) @@ -94,13 +90,7 @@ public class ResourceController { @RequestBody JSONObject obj, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int update = configResourceManager.update(apiName, obj, request); - if(update > 0) { - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else if(update == -1) { - return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } + return returnStr(objectMap, update); } @DeleteMapping(value = "/{apiName}/delete", produces = {"application/javascript", "application/json"}) @@ -109,13 +99,7 @@ public class ResourceController { @RequestParam("id") Long id, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int delete = configResourceManager.delete(apiName, id, request); - if(delete > 0) { - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else if(delete == -1) { - return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } + return returnStr(objectMap, delete); } @DeleteMapping(value = "/{apiName}/deleteBatch", produces = {"application/javascript", "application/json"}) @@ -124,13 +108,7 @@ public class ResourceController { @RequestParam("ids") String ids, HttpServletRequest request)throws Exception { Map objectMap = new HashMap(); int delete = configResourceManager.deleteBatch(apiName, ids, request); - if(delete > 0) { - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else if(delete == -1) { - return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } + return returnStr(objectMap, delete); } @GetMapping(value = "/{apiName}/checkIsNameExist") diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java index e606fa47..cf1d8fbe 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SerialNumberController.java @@ -7,7 +7,6 @@ import com.jsh.erp.service.depotHead.DepotHeadService; import com.jsh.erp.service.depotItem.DepotItemService; import com.jsh.erp.service.serialNumber.SerialNumberService; import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; import com.jsh.erp.utils.Tools; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,7 +20,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * Description @@ -62,13 +61,7 @@ public class SerialNumberController { Integer batAddTotal = jsonObject.getInteger("batAddTotal"); String remark = jsonObject.getString("remark"); int insert = serialNumberService.batAddSerialNumber(materialCode,serialNumberPrefix,batAddTotal,remark); - if(insert > 0) { - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else if(insert == -1) { - return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } + return returnStr(objectMap, insert); } /** diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java index 015d3faf..8984f705 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/TenantController.java @@ -1,23 +1,27 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.tenant.TenantService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jsh.erp.constants.BusinessConstants; +import com.jsh.erp.datasource.entities.Tenant; +import com.jsh.erp.datasource.entities.TenantEx; +import com.jsh.erp.service.TenantService; +import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.ErpInfo; +import com.jsh.erp.utils.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.ArrayList; import java.util.HashMap; import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * @author ji_sheng_hua 管伊佳erp @@ -26,11 +30,99 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RequestMapping(value = "/tenant") @Api(tags = {"租户管理"}) public class TenantController { - private Logger logger = LoggerFactory.getLogger(TenantController.class); @Resource private TenantService tenantService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Tenant tenant = tenantService.getTenant(id); + Map objectMap = new HashMap<>(); + if(tenant != null) { + objectMap.put("info", tenant); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } + + @GetMapping(value = "/list") + @ApiOperation(value = "获取信息列表") + public String getList(@RequestParam(value = Constants.PAGE_SIZE, required = false) Integer pageSize, + @RequestParam(value = Constants.CURRENT_PAGE, required = false) Integer currentPage, + @RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + if (pageSize != null && pageSize <= 0) { + pageSize = 10; + } + String loginName = StringUtil.getInfo(search, "loginName"); + String type = StringUtil.getInfo(search, "type"); + String enabled = StringUtil.getInfo(search, "enabled"); + String remark = StringUtil.getInfo(search, "remark"); + IPage page = new Page<>(); + page.setCurrent(currentPage); + page.setSize(pageSize); + IPage list = tenantService.select(page, loginName, type, enabled, remark); + if (list != null) { + objectMap.put("rows", list.getRecords()); + objectMap.put("total", list.getTotal()); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + objectMap.put("rows", new ArrayList()); + objectMap.put("total", BusinessConstants.DEFAULT_LIST_NULL_NUMBER); + return returnJson(objectMap, "查找不到数据", ErpInfo.OK.code); + } + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = tenantService.insertTenant(obj, request); + return returnStr(objectMap, insert); + } + + @PutMapping(value = "/update") + @ApiOperation(value = "修改") + public String updateResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int update = tenantService.updateTenant(obj, request); + return returnStr(objectMap, update); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除") + public String deleteResource(@RequestParam("id") Long id, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = tenantService.deleteTenant(id, request); + return returnStr(objectMap, delete); + } + + @DeleteMapping(value = "/deleteBatch") + @ApiOperation(value = "批量删除") + public String batchDeleteResource(@RequestParam("ids") String ids, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = tenantService.batchDeleteTenant(ids, request); + return returnStr(objectMap, delete); + } + + @GetMapping(value = "/checkIsNameExist") + @ApiOperation(value = "检查名称是否存在") + public String checkIsNameExist(@RequestParam Long id, @RequestParam(value ="name", required = false) String name, + HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int exist = tenantService.checkIsNameExist(id, name); + if(exist > 0) { + objectMap.put("status", true); + } else { + objectMap.put("status", false); + } + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } + /** * 批量设置状态-启用或者禁用 * @param jsonObject diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java index e071ff98..68560093 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java @@ -13,7 +13,7 @@ import com.jsh.erp.exception.BusinessParamCheckingException; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.redis.RedisService; import com.jsh.erp.service.role.RoleService; -import com.jsh.erp.service.tenant.TenantService; +import com.jsh.erp.service.TenantService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.utils.BaseResponseInfo; import com.jsh.erp.utils.ErpInfo; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java index 55ffe7b8..efb20e79 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountMapperEx.java @@ -1,5 +1,6 @@ package com.jsh.erp.datasource.mappers; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jsh.erp.datasource.entities.Account; import com.jsh.erp.datasource.entities.AccountVo4Sum; import com.jsh.erp.datasource.entities.DepotHead; @@ -17,14 +18,8 @@ public interface AccountMapperEx { @Param("name") String name, @Param("serialNo") String serialNo); - List selectByConditionAccount( - @Param("name") String name, - @Param("serialNo") String serialNo, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByAccount( + IPage selectByConditionAccount( + IPage page, @Param("name") String name, @Param("serialNo") String serialNo, @Param("remark") String remark); @@ -59,8 +54,8 @@ public interface AccountMapperEx { @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("forceFlag") Boolean forceFlag, - @Param("offset") Integer offset, - @Param("rows") Integer rows); + @Param("offset") Long offset, + @Param("rows") Long rows); List getManyAccountSumByParam( @Param("beginTime") String beginTime, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java index fbb8748f..5d025df1 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/TenantMapperEx.java @@ -1,6 +1,6 @@ package com.jsh.erp.datasource.mappers; -import com.jsh.erp.datasource.entities.Tenant; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jsh.erp.datasource.entities.TenantEx; import org.apache.ibatis.annotations.Param; @@ -8,15 +8,8 @@ import java.util.List; public interface TenantMapperEx { - List selectByConditionTenant( - @Param("loginName") String loginName, - @Param("type") String type, - @Param("enabled") String enabled, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByTenant( + IPage selectByConditionTenant( + IPage page, @Param("loginName") String loginName, @Param("type") String type, @Param("enabled") String enabled, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java similarity index 94% rename from jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java rename to jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java index c98ca5d8..9a64f7cc 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountService.java @@ -1,6 +1,7 @@ -package com.jsh.erp.service.account; +package com.jsh.erp.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.*; @@ -98,10 +99,10 @@ public class AccountService { return list; } - public List select(String name, String serialNo, String remark, int offset, int rows) throws Exception{ - List resList = new ArrayList<>(); + public IPage select(IPage page, String name, String serialNo, String remark) throws Exception{ + IPage iPage = null; try{ - List list = accountMapperEx.selectByConditionAccount(name, serialNo, remark, offset, rows); + iPage = accountMapperEx.selectByConditionAccount(page, name, serialNo, remark); String timeStr = Tools.getCurrentMonth(); String bTime = Tools.firstDayOfMonth(timeStr) + BusinessConstants.DAY_FIRST_TIME; String eTime = Tools.lastDayOfMonth(timeStr) + BusinessConstants.DAY_LAST_TIME; @@ -112,6 +113,8 @@ public class AccountService { Map currentAccountSumMap = new HashMap<>(); Map currentAccountSumByHeadMap = new HashMap<>(); Map currentAccountSumByDetailMap = new HashMap<>(); + long offset = (page.getCurrent() - 1) * page.getSize(); + long rows = page.getSize(); List thisMonthAmountList = accountMapperEx.getAccountSumByParam(name, serialNo, bTime, eTime, forceFlag, offset, rows); List currentAmountList = accountMapperEx.getAccountSumByParam(name, serialNo, null, null, forceFlag, offset, rows); List thisMonthManyAmountList = accountMapperEx.getManyAccountSumByParam(bTime, eTime, forceFlag); @@ -126,8 +129,8 @@ public class AccountService { currentAccountSumByHeadMap.put(currentAmount.getId(), currentAmount.getAccountSumByHead()); currentAccountSumByDetailMap.put(currentAmount.getId(), currentAmount.getAccountSumByDetail()); } - if (null != list) { - for (AccountVo4List al : list) { + if (null != iPage.getRecords()) { + for (AccountVo4List al : iPage.getRecords()) { DecimalFormat df = new DecimalFormat(".##"); BigDecimal thisMonthAmount = thisMonthAccountSumMap.get(al.getId()) .add(thisMonthAccountSumByHeadMap.get(al.getId())) @@ -144,23 +147,12 @@ public class AccountService { .add(getManyAccountSumParse(al.getId(), currentManyAmountList)) .add(al.getInitialAmount()) ; al.setCurrentAmount(currentAmount); - resList.add(al); } } } catch(Exception e){ JshException.readFail(logger, e); } - return resList; - } - - public Long countAccount(String name, String serialNo, String remark)throws Exception { - Long result = null; - try{ - result = accountMapperEx.countsByAccount(name, serialNo, remark); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return iPage; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) @@ -444,10 +436,10 @@ public class AccountService { return sb.toString(); } - public List listWithBalance(String name, String serialNo, Integer offset, Integer rows) throws Exception { - List resList = new ArrayList<>(); + public IPage listWithBalance(IPage page, String name, String serialNo) throws Exception { + IPage iPage = null; try{ - List list = accountMapperEx.selectByConditionAccount(name, serialNo, null, offset, rows); + iPage = accountMapperEx.selectByConditionAccount(page, name, serialNo, null); String timeStr = Tools.getCurrentMonth(); String bTime = Tools.firstDayOfMonth(timeStr) + BusinessConstants.DAY_FIRST_TIME; String eTime = Tools.lastDayOfMonth(timeStr) + BusinessConstants.DAY_LAST_TIME; @@ -458,6 +450,8 @@ public class AccountService { Map currentAccountSumMap = new HashMap<>(); Map currentAccountSumByHeadMap = new HashMap<>(); Map currentAccountSumByDetailMap = new HashMap<>(); + long offset = (page.getCurrent() - 1) * page.getSize(); + long rows = page.getSize(); List thisMonthAmountList = accountMapperEx.getAccountSumByParam(name, serialNo, bTime, eTime, forceFlag, offset, rows); List currentAmountList = accountMapperEx.getAccountSumByParam(name, serialNo, null, null, forceFlag, offset, rows); List thisMonthManyAmountList = accountMapperEx.getManyAccountSumByParam(bTime, eTime, forceFlag); @@ -472,8 +466,8 @@ public class AccountService { currentAccountSumByHeadMap.put(currentAmount.getId(), currentAmount.getAccountSumByHead()); currentAccountSumByDetailMap.put(currentAmount.getId(), currentAmount.getAccountSumByDetail()); } - if (null != list) { - for (AccountVo4List al : list) { + if (null != iPage.getRecords()) { + for (AccountVo4List al : iPage.getRecords()) { DecimalFormat df = new DecimalFormat(".##"); BigDecimal thisMonthAmount = thisMonthAccountSumMap.get(al.getId()) .add(thisMonthAccountSumByHeadMap.get(al.getId())) @@ -490,23 +484,12 @@ public class AccountService { .add(getManyAccountSumParse(al.getId(), currentManyAmountList)) .add(al.getInitialAmount()); al.setCurrentAmount(currentAmount); - resList.add(al); } } } catch(Exception e){ JshException.readFail(logger, e); } - return resList; - } - - public Long listWithBalanceCount(String name, String serialNo) { - Long result = null; - try{ - result = accountMapperEx.countsByAccount(name, serialNo, null); - } catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return iPage; } public Map getStatistics(String name, String serialNo) { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java similarity index 89% rename from jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java rename to jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java index a41c4085..1137ba7b 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/TenantService.java @@ -1,6 +1,7 @@ -package com.jsh.erp.service.tenant; +package com.jsh.erp.service; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Tenant; import com.jsh.erp.datasource.entities.TenantEx; @@ -10,6 +11,7 @@ import com.jsh.erp.datasource.mappers.TenantMapper; import com.jsh.erp.datasource.mappers.TenantMapperEx; import com.jsh.erp.datasource.mappers.UserBusinessMapperEx; import com.jsh.erp.datasource.mappers.UserMapperEx; +import com.jsh.erp.datasource.vo.AccountVo4List; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.user.UserService; @@ -75,13 +77,13 @@ public class TenantService { return list; } - public List select(String loginName, String type, String enabled, String remark, int offset, int rows)throws Exception { - List list= new ArrayList<>(); + public IPage select(IPage page, String loginName, String type, String enabled, String remark)throws Exception { + IPage iPage = null; try{ if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) { - list = tenantMapperEx.selectByConditionTenant(loginName, type, enabled, remark, offset, rows); - if (null != list) { - for (TenantEx tenantEx : list) { + iPage = tenantMapperEx.selectByConditionTenant(page, loginName, type, enabled, remark); + if (null != iPage.getRecords()) { + for (TenantEx tenantEx : iPage.getRecords()) { tenantEx.setCreateTimeStr(Tools.getCenternTime(tenantEx.getCreateTime())); tenantEx.setExpireTimeStr(Tools.getCenternTime(tenantEx.getExpireTime())); } @@ -90,19 +92,7 @@ public class TenantService { }catch(Exception e){ JshException.readFail(logger, e); } - return list; - } - - public Long countTenant(String loginName, String type, String enabled, String remark)throws Exception { - Long result=null; - try{ - if(BusinessConstants.DEFAULT_MANAGER.equals(userService.getCurrentUser().getLoginName())) { - result = tenantMapperEx.countsByTenant(loginName, type, enabled, remark); - } - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return iPage; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountComponent.java deleted file mode 100644 index 1b155c3f..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountComponent.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.erp.service.account; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.utils.Constants; -import com.jsh.erp.utils.QueryUtils; -import com.jsh.erp.utils.StringUtil; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@Service(value = "account_component") -@AccountResource -public class AccountComponent implements ICommonQuery { - - @Resource - private AccountService accountService; - - @Override - public Object selectOne(Long id) throws Exception { - return accountService.getAccount(id); - } - - @Override - public List select(Map map)throws Exception { - return getAccountList(map); - } - - private List getAccountList(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String serialNo = StringUtil.getInfo(search, "serialNo"); - String remark = StringUtil.getInfo(search, "remark"); - String order = QueryUtils.order(map); - return accountService.select(name, serialNo, remark, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String serialNo = StringUtil.getInfo(search, "serialNo"); - String remark = StringUtil.getInfo(search, "remark"); - return accountService.countAccount(name, serialNo, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception{ - return accountService.insertAccount(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return accountService.updateAccount(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return accountService.deleteAccount(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return accountService.batchDeleteAccount(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return accountService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountResource.java deleted file mode 100644 index 15c5786f..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/account/AccountResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.account; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "account") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface AccountResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 9b4ba96a..3b5b3b5a 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -11,7 +11,7 @@ import com.jsh.erp.datasource.mappers.DepotItemMapperEx; import com.jsh.erp.datasource.vo.*; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; -import com.jsh.erp.service.account.AccountService; +import com.jsh.erp.service.AccountService; import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.service.accountItem.AccountItemService; import com.jsh.erp.service.depot.DepotService; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java deleted file mode 100644 index 470a65e4..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantComponent.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.jsh.erp.service.tenant; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.user.UserResource; -import com.jsh.erp.service.user.UserService; -import com.jsh.erp.utils.Constants; -import com.jsh.erp.utils.QueryUtils; -import com.jsh.erp.utils.StringUtil; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@Service(value = "tenant_component") -@TenantResource -public class TenantComponent implements ICommonQuery { - - @Resource - private TenantService tenantService; - - @Override - public Object selectOne(Long id) throws Exception { - return tenantService.getTenant(id); - } - - @Override - public List select(Map map)throws Exception { - return getTenantList(map); - } - - private List getTenantList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String loginName = StringUtil.getInfo(search, "loginName"); - String type = StringUtil.getInfo(search, "type"); - String enabled = StringUtil.getInfo(search, "enabled"); - String remark = StringUtil.getInfo(search, "remark"); - return tenantService.select(loginName, type, enabled, remark, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String loginName = StringUtil.getInfo(search, "loginName"); - String type = StringUtil.getInfo(search, "type"); - String enabled = StringUtil.getInfo(search, "enabled"); - String remark = StringUtil.getInfo(search, "remark"); - return tenantService.countTenant(loginName, type, enabled, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return tenantService.insertTenant(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return tenantService.updateTenant(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return tenantService.deleteTenant(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return tenantService.batchDeleteTenant(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return tenantService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantResource.java deleted file mode 100644 index 159e4e4b..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/tenant/TenantResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.tenant; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2019-6-27 22:56:56 - */ -@ResourceInfo(value = "tenant") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface TenantResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java index e8b01909..60cacbf3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserService.java @@ -20,7 +20,7 @@ import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.orgaUserRel.OrgaUserRelService; -import com.jsh.erp.service.tenant.TenantService; +import com.jsh.erp.service.TenantService; import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.utils.ExceptionCodeConstants; import com.jsh.erp.utils.StringUtil; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java index 2f7fee30..a5786ccf 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/ResponseJsonUtil.java @@ -33,35 +33,6 @@ public class ResponseJsonUtil { } } - /** - * - * @param responseCode - * @return - */ - public static String backJson4HttpApi(ResponseCode responseCode) { - if (responseCode != null) { - String result = JSON.toJSONString(responseCode, new ResponseFilter(), - SerializerFeature.DisableCircularReferenceDetect, - SerializerFeature.WriteNonStringKeyAsString); - result = result.replaceFirst("\"data\":\\{", ""); - return result.substring(0, result.length() - 1); - } - return null; - } - - /** - * 验证失败的json串 - * @param code - * @return - */ - public static String backJson4VerifyFailure(int code) { - Map map = new HashMap(); - map.put("message", "未通过验证"); - return JSON.toJSONString(new ResponseCode(code, map), new ResponseFilter(), - SerializerFeature.DisableCircularReferenceDetect, - SerializerFeature.WriteNonStringKeyAsString); - } - /** * 成功的json串 * @param responseCode @@ -80,4 +51,14 @@ public class ResponseJsonUtil { map.put("message", message); return backJson(new ResponseCode(code, map)); } + + public static String returnStr(Map objectMap, int res) { + if(res > 0) { + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else if(res == -1) { + return returnJson(objectMap, ErpInfo.TEST_USER.name, ErpInfo.TEST_USER.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } } diff --git a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java index 7937e318..d935d8bd 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/utils/StringUtil.java @@ -28,6 +28,9 @@ public class StringUtil { "| grant | grant|grant | execute | execute|execute | exec | exec|exec | xp_cmdshell | xp_cmdshell|xp_cmdshell " + "| call | call|call | declare | declare|declare | source | source|source | sql | sql|sql "; + /** 下划线 */ + private static final char SEPARATOR = '_'; + public static String filterNull(String str) { if (str == null) { return ""; diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml index b5ba9bba..3350a695 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountMapperEx.xml @@ -49,29 +49,6 @@ and ifnull(delete_flag,'0') !='1' order by sort asc, id desc - - limit #{offset},#{rows} - - - - - \ No newline at end of file