From 112259877125bb65e0c93543294a05ffd7ac3fa4 Mon Sep 17 00:00:00 2001 From: jishenghua <752718920@qq.com> Date: Mon, 24 Feb 2025 00:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=8D=95=E6=8D=AE=E7=AD=89=E5=85=B6?= =?UTF-8?q?=E5=AE=83=E6=A8=A1=E5=9D=97=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../erp/controller/AccountHeadController.java | 60 +++++++- .../erp/controller/DepotHeadController.java | 60 +++++++- .../erp/controller/ResourceController.java | 130 ----------------- .../jsh/erp/controller/RoleController.java | 3 - .../controller/SerialNumberController.java | 12 +- .../erp/controller/SupplierController.java | 81 ++++++++++- .../controller/SystemConfigController.java | 93 ++++++++++-- .../jsh/erp/controller/UnitController.java | 79 +++++++++- .../controller/UserBusinessController.java | 61 ++++++++ .../jsh/erp/controller/UserController.java | 85 +++++++++-- .../mappers/AccountHeadMapperEx.java | 16 -- .../datasource/mappers/DepotHeadMapperEx.java | 23 --- .../mappers/SerialNumberMapperEx.java | 2 - .../datasource/mappers/SupplierMapperEx.java | 9 -- .../mappers/SystemConfigMapperEx.java | 5 - .../erp/datasource/mappers/UnitMapperEx.java | 5 - .../erp/datasource/mappers/UserMapperEx.java | 4 +- .../jsh/erp/service/CommonQueryManager.java | 137 ------------------ .../com/jsh/erp/service/ICommonQuery.java | 80 ---------- .../jsh/erp/service/InterfaceContainer.java | 31 ---- .../com/jsh/erp/service/ResourceInfo.java | 14 -- .../accountHead/AccountHeadComponent.java | 92 ------------ .../accountHead/AccountHeadResource.java | 15 -- .../accountHead/AccountHeadService.java | 32 +--- .../accountItem/AccountItemComponent.java | 75 ---------- .../accountItem/AccountItemResource.java | 15 -- .../accountItem/AccountItemService.java | 75 ---------- .../service/depotHead/DepotHeadComponent.java | 102 ------------- .../service/depotHead/DepotHeadResource.java | 15 -- .../service/depotHead/DepotHeadService.java | 37 +---- .../service/depotItem/DepotItemComponent.java | 75 ---------- .../service/depotItem/DepotItemResource.java | 15 -- .../erp/service/material/MaterialService.java | 8 +- .../orgaUserRel/OrgaUserRelComponent.java | 65 --------- .../orgaUserRel/OrgaUserRelResource.java | 19 --- .../service/sequence/SequenceComponent.java | 74 ---------- .../service/sequence/SequenceResource.java | 18 --- .../serialNumber/SerialNumberComponent.java | 76 ---------- .../serialNumber/SerialNumberResource.java | 18 --- .../serialNumber/SerialNumberService.java | 122 +--------------- .../service/supplier/SupplierComponent.java | 76 ---------- .../service/supplier/SupplierResource.java | 15 -- .../erp/service/supplier/SupplierService.java | 30 +--- .../systemConfig/SystemConfigComponent.java | 73 ---------- .../systemConfig/SystemConfigResource.java | 15 -- .../systemConfig/SystemConfigService.java | 21 +-- .../jsh/erp/service/unit/UnitComponent.java | 71 --------- .../jsh/erp/service/unit/UnitResource.java | 15 -- .../com/jsh/erp/service/unit/UnitService.java | 16 +- .../jsh/erp/service/user/UserComponent.java | 73 ---------- .../jsh/erp/service/user/UserResource.java | 15 -- .../com/jsh/erp/service/user/UserService.java | 49 +------ .../userBusiness/UserBusinessComponent.java | 64 -------- .../userBusiness/UserBusinessResource.java | 15 -- .../mapper_xml/AccountHeadMapperEx.xml | 62 -------- .../mapper_xml/DepotHeadMapperEx.xml | 104 +------------ .../mapper_xml/MaterialAttributeMapperEx.xml | 3 - .../mapper_xml/SerialNumberMapperEx.xml | 10 -- .../resources/mapper_xml/SupplierMapperEx.xml | 32 ---- .../mapper_xml/SystemConfigMapperEx.xml | 15 +- .../resources/mapper_xml/UnitMapperEx.xml | 15 +- .../resources/mapper_xml/UserMapperEx.xml | 4 +- jshERP-web/src/api/api.js | 6 - 63 files changed, 540 insertions(+), 2197 deletions(-) delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/ICommonQuery.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/InterfaceContainer.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/ResourceInfo.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/user/UserComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/user/UserResource.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java delete mode 100644 jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessResource.java diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java index 30d368d66..37ab599a3 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/AccountHeadController.java @@ -1,27 +1,31 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.BusinessConstants; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.AccountHead; import com.jsh.erp.datasource.entities.AccountHeadVo4Body; import com.jsh.erp.datasource.entities.AccountHeadVo4ListEx; import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.utils.BaseResponseInfo; +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.*; + import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.math.BigDecimal; 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 752*718*920 @@ -29,12 +33,62 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/accountHead") @Api(tags = {"财务管理"}) -public class AccountHeadController { +public class AccountHeadController extends BaseController { private Logger logger = LoggerFactory.getLogger(AccountHeadController.class); @Resource private AccountHeadService accountHeadService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + AccountHead accountHead = accountHeadService.getAccountHead(id); + Map objectMap = new HashMap<>(); + if(accountHead != null) { + objectMap.put("info", accountHead); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String type = StringUtil.getInfo(search, "type"); + String billNo = StringUtil.getInfo(search, "billNo"); + String beginTime = StringUtil.getInfo(search, "beginTime"); + String endTime = StringUtil.getInfo(search, "endTime"); + Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); + Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); + Long handsPersonId = StringUtil.parseStrLong(StringUtil.getInfo(search, "handsPersonId")); + Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); + String status = StringUtil.getInfo(search, "status"); + String remark = StringUtil.getInfo(search, "remark"); + String number = StringUtil.getInfo(search, "number"); + List list = accountHeadService.select(type, billNo, beginTime, endTime, organId, creator, + handsPersonId, accountId, status, remark, number); + return getDataTable(list); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除") + public String deleteResource(@RequestParam("id") Long id, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = accountHeadService.deleteAccountHead(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 = accountHeadService.batchDeleteAccountHead(ids, request); + return returnStr(objectMap, delete); + } + /** * 批量设置状态-审核或者反审核 * @param jsonObject diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java index 00bedf74f..a0b4bc8b5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotHeadController.java @@ -2,6 +2,8 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.DepotHead; @@ -32,6 +34,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; /** * @author ji-sheng-hua 752*718*920 @@ -39,7 +42,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/depotHead") @Api(tags = {"单据管理"}) -public class DepotHeadController { +public class DepotHeadController extends BaseController { private Logger logger = LoggerFactory.getLogger(DepotHeadController.class); @Resource @@ -57,6 +60,61 @@ public class DepotHeadController { @Resource private UserService userService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + DepotHead depotHead = depotHeadService.getDepotHead(id); + Map objectMap = new HashMap<>(); + if(depotHead != null) { + objectMap.put("info", depotHead); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String type = StringUtil.getInfo(search, "type"); + String subType = StringUtil.getInfo(search, "subType"); + String hasDebt = StringUtil.getInfo(search, "hasDebt"); + String status = StringUtil.getInfo(search, "status"); + String purchaseStatus = StringUtil.getInfo(search, "purchaseStatus"); + String number = StringUtil.getInfo(search, "number"); + String linkApply = StringUtil.getInfo(search, "linkApply"); + String linkNumber = StringUtil.getInfo(search, "linkNumber"); + String beginTime = StringUtil.getInfo(search, "beginTime"); + String endTime = StringUtil.getInfo(search, "endTime"); + String materialParam = StringUtil.getInfo(search, "materialParam"); + Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); + Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); + Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); + Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); + String remark = StringUtil.getInfo(search, "remark"); + List list = depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, + beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark); + return getDataTable(list); + } + + @DeleteMapping(value = "/delete") + @ApiOperation(value = "删除") + public String deleteResource(@RequestParam("id") Long id, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int delete = depotHeadService.deleteDepotHead(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 = depotHeadService.batchDeleteDepotHead(ids, request); + return returnStr(objectMap, delete); + } + /** * 批量设置状态-审核或者反审核 * @param jsonObject 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 deleted file mode 100644 index df835562e..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/ResourceController.java +++ /dev/null @@ -1,130 +0,0 @@ -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.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.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -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; - -/** - * by jishenghua 2018-9-12 23:58:10 管伊佳erp - */ -@RestController -@Api(tags = {"资源接口"}) -public class ResourceController { - - @Resource - private CommonQueryManager configResourceManager; - - @GetMapping(value = "/{apiName}/info") - @ApiOperation(value = "根据id获取信息") - public String getList(@PathVariable("apiName") String apiName, - @RequestParam("id") Long id, - HttpServletRequest request) throws Exception { - Object obj = configResourceManager.selectOne(apiName, id); - Map objectMap = new HashMap(); - if(obj != null) { - objectMap.put("info", obj); - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } else { - return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); - } - } - - @GetMapping(value = "/{apiName}/list") - @ApiOperation(value = "获取信息列表") - public String getList(@PathVariable("apiName") String apiName, - @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 parameterMap = ParamUtils.requestToMap(request); - parameterMap.put(Constants.SEARCH, search); - Map objectMap = new HashMap(); - if (pageSize != null && pageSize <= 0) { - pageSize = 10; - } - String offset = ParamUtils.getPageOffset(currentPage, pageSize); - if (StringUtil.isNotEmpty(offset)) { - parameterMap.put(Constants.OFFSET, offset); - } - List list = configResourceManager.select(apiName, parameterMap); - if (list != null) { - objectMap.put("total", configResourceManager.counts(apiName, parameterMap)); - objectMap.put("rows", list); - 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 = "/{apiName}/add", produces = {"application/javascript", "application/json"}) - @ApiOperation(value = "新增") - public String addResource(@PathVariable("apiName") String apiName, - @RequestBody JSONObject obj, HttpServletRequest request)throws Exception { - Map objectMap = new HashMap(); - int insert = configResourceManager.insert(apiName, obj, request); - return returnStr(objectMap, insert); - } - - @PutMapping(value = "/{apiName}/update", produces = {"application/javascript", "application/json"}) - @ApiOperation(value = "修改") - public String updateResource(@PathVariable("apiName") String apiName, - @RequestBody JSONObject obj, HttpServletRequest request)throws Exception { - Map objectMap = new HashMap(); - int update = configResourceManager.update(apiName, obj, request); - return returnStr(objectMap, update); - } - - @DeleteMapping(value = "/{apiName}/delete", produces = {"application/javascript", "application/json"}) - @ApiOperation(value = "删除") - public String deleteResource(@PathVariable("apiName") String apiName, - @RequestParam("id") Long id, HttpServletRequest request)throws Exception { - Map objectMap = new HashMap(); - int delete = configResourceManager.delete(apiName, id, request); - return returnStr(objectMap, delete); - } - - @DeleteMapping(value = "/{apiName}/deleteBatch", produces = {"application/javascript", "application/json"}) - @ApiOperation(value = "批量删除") - public String batchDeleteResource(@PathVariable("apiName") String apiName, - @RequestParam("ids") String ids, HttpServletRequest request)throws Exception { - Map objectMap = new HashMap(); - int delete = configResourceManager.deleteBatch(apiName, ids, request); - return returnStr(objectMap, delete); - } - - @GetMapping(value = "/{apiName}/checkIsNameExist") - @ApiOperation(value = "检查名称是否存在") - public String checkIsNameExist(@PathVariable("apiName") String apiName, - @RequestParam Long id, @RequestParam(value ="name", required = false) String name, - HttpServletRequest request)throws Exception { - Map objectMap = new HashMap(); - int exist = configResourceManager.checkIsNameExist(apiName, id, name); - if(exist > 0) { - objectMap.put("status", true); - } else { - objectMap.put("status", false); - } - return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); - } - - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java index edc05e072..7f1e16fc4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/RoleController.java @@ -4,14 +4,12 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.base.BaseController; import com.jsh.erp.base.TableDataInfo; -import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Role; import com.jsh.erp.datasource.entities.RoleEx; import com.jsh.erp.service.role.RoleService; import com.jsh.erp.service.userBusiness.UserBusinessService; 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; @@ -21,7 +19,6 @@ 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.List; import java.util.Map; 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 cf1d8fbe7..b922a888f 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 @@ -24,8 +24,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * Description - * - * @Author: cjl + * @Author: jsh * @Date: 2019/1/22 10:29 */ @RestController @@ -42,14 +41,7 @@ public class SerialNumberController { private DepotItemService depotItemService; /** - * create by: cjl - * description: - *批量添加序列号 - * create time: 2019/1/29 15:11 - * @Param: materialName - * @Param: serialNumberPrefix - * @Param: batAddTotal - * @Param: remark + * create by: jsh * @return java.lang.Object */ @PostMapping("/batAddSerialNumber") diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java index ccd8ca1bd..69bb542d0 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SupplierController.java @@ -2,14 +2,14 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; import com.jsh.erp.datasource.entities.Supplier; import com.jsh.erp.service.supplier.SupplierService; import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; -import com.jsh.erp.utils.ExcelUtils; +import com.jsh.erp.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -26,6 +26,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; /** * @author ji|sheng|hua 管伊佳erp @@ -33,7 +34,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/supplier") @Api(tags = {"商家管理"}) -public class SupplierController { +public class SupplierController extends BaseController { private Logger logger = LoggerFactory.getLogger(SupplierController.class); @Resource @@ -48,6 +49,78 @@ public class SupplierController { @Resource private UserService userService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Supplier supplier = supplierService.getSupplier(id); + Map objectMap = new HashMap<>(); + if(supplier != null) { + objectMap.put("info", supplier); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String supplier = StringUtil.getInfo(search, "supplier"); + String type = StringUtil.getInfo(search, "type"); + String phonenum = StringUtil.getInfo(search, "phonenum"); + String telephone = StringUtil.getInfo(search, "telephone"); + List list = supplierService.select(supplier, type, phonenum, telephone); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = supplierService.insertSupplier(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 = supplierService.updateSupplier(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 = supplierService.deleteSupplier(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 = supplierService.batchDeleteSupplier(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 = supplierService.checkIsNameExist(id, name); + if(exist > 0) { + objectMap.put("status", true); + } else { + objectMap.put("status", false); + } + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } + @GetMapping(value = "/checkIsNameAndTypeExist") @ApiOperation(value = "检查名称和类型是否存在") public String checkIsNameAndTypeExist(@RequestParam Long id, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java index 5c62848f8..f535605f4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/SystemConfigController.java @@ -2,14 +2,15 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.SystemConfig; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.FileUtils; -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; @@ -29,7 +30,13 @@ import java.awt.image.BufferedImage; import java.io.*; import java.net.HttpURLConnection; import java.net.URL; +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; /** * Description @@ -39,18 +46,9 @@ import java.util.List; @RestController @RequestMapping(value = "/systemConfig") @Api(tags = {"系统参数"}) -public class SystemConfigController { +public class SystemConfigController extends BaseController { private Logger logger = LoggerFactory.getLogger(SystemConfigController.class); - @Resource - private UserService userService; - - @Resource - private DepotService depotService; - - @Resource - private UserBusinessService userBusinessService; - @Resource private SystemConfigService systemConfigService; @@ -66,6 +64,75 @@ public class SystemConfigController { @Value(value="${spring.servlet.multipart.max-request-size}") private Long maxRequestSize; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + SystemConfig systemConfig = systemConfigService.getSystemConfig(id); + Map objectMap = new HashMap<>(); + if(systemConfig != null) { + objectMap.put("info", systemConfig); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String companyName = StringUtil.getInfo(search, "companyName"); + List list = systemConfigService.select(companyName); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = systemConfigService.insertSystemConfig(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 = systemConfigService.updateSystemConfig(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 = systemConfigService.deleteSystemConfig(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 = systemConfigService.batchDeleteSystemConfig(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 = systemConfigService.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 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UnitController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UnitController.java index c5cd21c86..cc81da8f4 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UnitController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UnitController.java @@ -1,10 +1,12 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; +import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.Unit; import com.jsh.erp.service.unit.UnitService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; +import com.jsh.erp.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -13,11 +15,13 @@ 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.List; import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * Description @@ -28,12 +32,81 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/unit") @Api(tags = {"单位管理"}) -public class UnitController { +public class UnitController extends BaseController { private Logger logger = LoggerFactory.getLogger(UnitController.class); @Resource private UnitService unitService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Unit unit = unitService.getUnit(id); + Map objectMap = new HashMap<>(); + if(unit != null) { + objectMap.put("info", unit); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String name = StringUtil.getInfo(search, "name"); + List list = unitService.select(name); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = unitService.insertUnit(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 = unitService.updateUnit(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 = unitService.deleteUnit(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 = unitService.batchDeleteUnit(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 = unitService.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 diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java index 8fcfc3da2..38bd4b5a2 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserBusinessController.java @@ -18,6 +18,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; /** * @author ji_sheng_hua jshERP @@ -31,6 +32,66 @@ public class UserBusinessController { @Resource private UserBusinessService userBusinessService; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + UserBusiness userBusiness = userBusinessService.getUserBusiness(id); + Map objectMap = new HashMap<>(); + if(userBusiness != null) { + objectMap.put("info", userBusiness); + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } else { + return returnJson(objectMap, ErpInfo.ERROR.name, ErpInfo.ERROR.code); + } + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = userBusinessService.insertUserBusiness(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 = userBusinessService.updateUserBusiness(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 = userBusinessService.deleteUserBusiness(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 = userBusinessService.batchDeleteUserBusiness(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 = userBusinessService.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 keyId 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 e071ff986..da484601c 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 @@ -3,6 +3,8 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.constants.ExceptionConstants; import com.jsh.erp.datasource.entities.Tenant; @@ -15,10 +17,7 @@ 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.user.UserService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ErpInfo; -import com.jsh.erp.utils.RandImageUtil; -import com.jsh.erp.utils.Tools; +import com.jsh.erp.utils.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -29,12 +28,10 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * @author ji_sheng_hua 管伊佳erp @@ -42,7 +39,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/user") @Api(tags = {"用户管理"}) -public class UserController { +public class UserController extends BaseController { private Logger logger = LoggerFactory.getLogger(UserController.class); @Value("${manage.roleId}") @@ -63,6 +60,76 @@ public class UserController { private static String SUCCESS = "操作成功"; private static String ERROR = "操作失败"; + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + User user = userService.getUser(id); + Map objectMap = new HashMap<>(); + if(user != null) { + objectMap.put("info", user); + 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 TableDataInfo getList(@RequestParam(value = Constants.SEARCH, required = false) String search, + HttpServletRequest request)throws Exception { + String userName = StringUtil.getInfo(search, "userName"); + String loginName = StringUtil.getInfo(search, "loginName"); + List list = userService.select(userName, loginName); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = userService.insertUser(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 = userService.updateUser(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 = userService.deleteUser(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 = userService.batchDeleteUser(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 = userService.checkIsNameExist(id, name); + if(exist > 0) { + objectMap.put("status", true); + } else { + objectMap.put("status", false); + } + return returnJson(objectMap, ErpInfo.OK.name, ErpInfo.OK.code); + } + @PostMapping(value = "/login") @ApiOperation(value = "登录") public BaseResponseInfo login(@RequestBody UserEx userParam, HttpServletRequest request)throws Exception { diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java index de5106ecb..41e6a11e6 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/AccountHeadMapperEx.java @@ -13,22 +13,6 @@ import java.util.List; public interface AccountHeadMapperEx { List selectByConditionAccountHead( - @Param("type") String type, - @Param("creatorArray") String[] creatorArray, - @Param("billNo") String billNo, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime, - @Param("organId") Long organId, - @Param("creator") Long creator, - @Param("handsPersonId") Long handsPersonId, - @Param("accountId") Long accountId, - @Param("status") String status, - @Param("remark") String remark, - @Param("number") String number, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByAccountHead( @Param("type") String type, @Param("creatorArray") String[] creatorArray, @Param("billNo") String billNo, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java index 8e2e4f863..a5d800c01 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotHeadMapperEx.java @@ -16,29 +16,6 @@ import java.util.List; */ public interface DepotHeadMapperEx { List selectByConditionDepotHead( - @Param("type") String type, - @Param("subType") String subType, - @Param("creatorArray") String[] creatorArray, - @Param("hasDebt") String hasDebt, - @Param("statusArray") String[] statusArray, - @Param("purchaseStatusArray") String[] purchaseStatusArray, - @Param("number") String number, - @Param("linkApply") String linkApply, - @Param("linkNumber") String linkNumber, - @Param("beginTime") String beginTime, - @Param("endTime") String endTime, - @Param("materialParam") String materialParam, - @Param("organId") Long organId, - @Param("organArray") String[] organArray, - @Param("creator") Long creator, - @Param("depotId") Long depotId, - @Param("depotArray") String[] depotArray, - @Param("accountId") Long accountId, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByDepotHead( @Param("type") String type, @Param("subType") String subType, @Param("creatorArray") String[] creatorArray, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java index 0766498c1..012693dec 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SerialNumberMapperEx.java @@ -42,8 +42,6 @@ public interface SerialNumberMapperEx { * */ int batAddSerialNumber(@Param("list") List list); - int batchDeleteSerialNumberByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); - List getEnableSerialNumberList(@Param("number") String number, @Param("name") String name, @Param("depotId") Long depotId, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java index 96726101b..0cc35603e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SupplierMapperEx.java @@ -10,15 +10,6 @@ import java.util.List; public interface SupplierMapperEx { List selectByConditionSupplier( - @Param("supplier") String supplier, - @Param("type") String type, - @Param("phonenum") String phonenum, - @Param("telephone") String telephone, - @Param("creatorArray") String[] creatorArray, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsBySupplier( @Param("supplier") String supplier, @Param("type") String type, @Param("phonenum") String phonenum, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java index e4903cef2..143bf9249 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/SystemConfigMapperEx.java @@ -10,11 +10,6 @@ import java.util.List; public interface SystemConfigMapperEx { List selectByConditionSystemConfig( - @Param("companyName") String companyName, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsBySystemConfig( @Param("companyName") String companyName); int batchDeleteSystemConfigByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java index 2b5ffe630..0a40e99b5 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UnitMapperEx.java @@ -10,11 +10,6 @@ import java.util.List; public interface UnitMapperEx { List selectByConditionUnit( - @Param("name") String name, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByUnit( @Param("name") String name); int batchDeleteUnitByIds(@Param("updateTime") Date updateTime, @Param("updater") Long updater, @Param("ids") String ids[]); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java index 734526624..4f8679f19 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/UserMapperEx.java @@ -15,9 +15,7 @@ public interface UserMapperEx { List selectByConditionUser( @Param("userName") String userName, - @Param("loginName") String loginName, - @Param("offset") Integer offset, - @Param("rows") Integer rows); + @Param("loginName") String loginName); Long countsByUser( @Param("userName") String userName, diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java b/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java deleted file mode 100644 index b78590c44..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/CommonQueryManager.java +++ /dev/null @@ -1,137 +0,0 @@ -package com.jsh.erp.service; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.BusinessConstants; -import com.jsh.erp.service.log.LogService; -import com.jsh.erp.utils.StringUtil; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * @author jishenghua 752718920 2018-10-7 15:25:58 - */ -@Service -public class CommonQueryManager { - - @Resource - private InterfaceContainer container; - - @Resource - private LogService logService; - - /** - * 查询单条 - * - * @param apiName 接口名称 - * @param id ID - */ - public Object selectOne(String apiName, Long id) throws Exception { - if (StringUtil.isNotEmpty(apiName) && id!=null) { - return container.getCommonQuery(apiName).selectOne(id); - } - return null; - } - - /** - * 查询 - * @param apiName - * @param parameterMap - * @return - */ - public List select(String apiName, Map parameterMap)throws Exception { - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).select(parameterMap); - } - return new ArrayList(); - } - - /** - * 计数 - * @param apiName - * @param parameterMap - * @return - */ - public Long counts(String apiName, Map parameterMap)throws Exception { - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).counts(parameterMap); - } - return BusinessConstants.DEFAULT_LIST_NULL_NUMBER; - } - - /** - * 插入 - * @param apiName - * @param obj - * @return - */ - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insert(String apiName, JSONObject obj, HttpServletRequest request) throws Exception{ - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).insert(obj, request); - } - return 0; - } - - /** - * 更新 - * @param apiName - * @param obj - * @return - */ - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int update(String apiName, JSONObject obj, HttpServletRequest request)throws Exception { - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).update(obj, request); - } - return 0; - } - - /** - * 删除 - * @param apiName - * @param id - * @return - */ - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int delete(String apiName, Long id, HttpServletRequest request)throws Exception { - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).delete(id, request); - } - return 0; - } - - /** - * 批量删除 - * @param apiName - * @param ids - * @return - */ - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int deleteBatch(String apiName, String ids, HttpServletRequest request)throws Exception { - if (StringUtil.isNotEmpty(apiName)) { - return container.getCommonQuery(apiName).deleteBatch(ids, request); - } - return 0; - } - - /** - * 判断是否存在 - * @param apiName - * @param id - * @param name - * @return - */ - public int checkIsNameExist(String apiName, Long id, String name) throws Exception{ - if (StringUtil.isNotEmpty(apiName) && name!=null) { - return container.getCommonQuery(apiName).checkIsNameExist(id, name); - } - return 0; - } - -} \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/ICommonQuery.java b/jshERP-boot/src/main/java/com/jsh/erp/service/ICommonQuery.java deleted file mode 100644 index 64756ca85..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/ICommonQuery.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.jsh.erp.service; - -import com.alibaba.fastjson.JSONObject; - -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -/** - * 通用查询接口 - * 功能：1、单条查询 2、分页+搜索 3、查询数量 - * - * @author jishenghua - * @version 1.0 - */ -public interface ICommonQuery { - /** - * 根据id查询明细。 - * - * @param id 资源id - * @return 资源 - */ - Object selectOne(Long id) throws Exception; - - /** - * 自定义查询 - * - * @param parameterMap 查询参数 - * @return 查询结果 - */ - List select(Map parameterMap) throws Exception; - - /** - * 查询数量 - * - * @param parameterMap 查询参数 - * @return 查询结果 - */ - Long counts(Map parameterMap) throws Exception; - - /** - * 新增数据 - * - * @param obj - * @return - */ - int insert(JSONObject obj, HttpServletRequest request) throws Exception; - - /** - * 更新数据 - * - * @param obj - * @return - */ - int update(JSONObject obj, HttpServletRequest request) throws Exception; - - /** - * 删除数据 - * - * @param id - * @return - */ - int delete(Long id, HttpServletRequest request) throws Exception; - - /** - * 批量删除数据 - * - * @param ids - * @return - */ - int deleteBatch(String ids, HttpServletRequest request) throws Exception; - - /** - * 查询名称是否存在 - * - * @param id - * @return - */ - int checkIsNameExist(Long id, String name) throws Exception; -} \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/InterfaceContainer.java b/jshERP-boot/src/main/java/com/jsh/erp/service/InterfaceContainer.java deleted file mode 100644 index a0cadfbb0..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/InterfaceContainer.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.jsh.erp.service; - -import com.jsh.erp.utils.AnnotationUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author jishenghua 2018-10-7 15:25:09 - */ -@Service -public class InterfaceContainer { - private final Map configComponentMap = new HashMap<>(); - - @Autowired(required = false) - private synchronized void init(ICommonQuery[] configComponents) { - for (ICommonQuery configComponent : configComponents) { - ResourceInfo info = AnnotationUtils.getAnnotation(configComponent, ResourceInfo.class); - if (info != null) { - configComponentMap.put(info.value(), configComponent); - } - } - } - - public ICommonQuery getCommonQuery(String apiName) { - return configComponentMap.get(apiName); - } -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/ResourceInfo.java b/jshERP-boot/src/main/java/com/jsh/erp/service/ResourceInfo.java deleted file mode 100644 index 3b0c185df..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/ResourceInfo.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.jsh.erp.service; - -import java.lang.annotation.*; - -/** - * @author jishenghua 2018-10-7 15:25:39 - */ -@Target({ElementType.TYPE, ElementType.ANNOTATION_TYPE}) -@Retention(RetentionPolicy.RUNTIME) -@Inherited -@Documented -public @interface ResourceInfo { - String value(); -} \ No newline at end of file diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java deleted file mode 100644 index 0732ae00e..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadComponent.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.jsh.erp.service.accountHead; - -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 = "accountHead_component") -@AccountHeadResource -public class AccountHeadComponent implements ICommonQuery { - - @Resource - private AccountHeadService accountHeadService; - - @Override - public Object selectOne(Long id) throws Exception { - return accountHeadService.getAccountHead(id); - } - - @Override - public List select(Map map)throws Exception { - return getAccountHeadList(map); - } - - private List getAccountHeadList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String type = StringUtil.getInfo(search, "type"); - String billNo = StringUtil.getInfo(search, "billNo"); - String beginTime = StringUtil.getInfo(search, "beginTime"); - String endTime = StringUtil.getInfo(search, "endTime"); - Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); - Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); - Long handsPersonId = StringUtil.parseStrLong(StringUtil.getInfo(search, "handsPersonId")); - Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); - String status = StringUtil.getInfo(search, "status"); - String remark = StringUtil.getInfo(search, "remark"); - String number = StringUtil.getInfo(search, "number"); - return accountHeadService.select(type, billNo, beginTime, endTime, organId, creator, handsPersonId, - accountId, status, remark, number, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String type = StringUtil.getInfo(search, "type"); - String billNo = StringUtil.getInfo(search, "billNo"); - String beginTime = StringUtil.getInfo(search, "beginTime"); - String endTime = StringUtil.getInfo(search, "endTime"); - Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); - Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); - Long handsPersonId = StringUtil.parseStrLong(StringUtil.getInfo(search, "handsPersonId")); - Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); - String status = StringUtil.getInfo(search, "status"); - String remark = StringUtil.getInfo(search, "remark"); - String number = StringUtil.getInfo(search, "number"); - return accountHeadService.countAccountHead(type, billNo, beginTime, endTime, organId, creator, handsPersonId, - accountId, status, remark, number); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception{ - return accountHeadService.insertAccountHead(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return accountHeadService.updateAccountHead(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return accountHeadService.deleteAccountHead(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return accountHeadService.batchDeleteAccountHead(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return 0; - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadResource.java deleted file mode 100644 index 85609a1a8..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.accountHead; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "accountHead") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface AccountHeadResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java index 4399814ca..25beabd36 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountHead/AccountHeadService.java @@ -12,12 +12,12 @@ import com.jsh.erp.datasource.mappers.AccountMapper; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; import com.jsh.erp.service.accountItem.AccountItemService; -import com.jsh.erp.service.depotHead.DepotHeadService; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.orgaUserRel.OrgaUserRelService; import com.jsh.erp.service.supplier.SupplierService; import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; +import com.jsh.erp.utils.PageUtils; import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.Tools; import org.slf4j.Logger; @@ -96,14 +96,15 @@ public class AccountHeadService { public List select(String type, String billNo, String beginTime, String endTime, Long organId, Long creator, Long handsPersonId, Long accountId, String status, - String remark, String number, int offset, int rows) throws Exception{ - List resList = new ArrayList<>(); + String remark, String number) throws Exception{ + List list = new ArrayList<>(); try{ String [] creatorArray = getCreatorArray(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, - beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number, offset, rows); + PageUtils.startPage(); + list = accountHeadMapperEx.selectByConditionAccountHead(type, creatorArray, billNo, + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number); if (null != list) { for (AccountHeadVo4ListEx ah : list) { if(ah.getChangeAmount() != null) { @@ -127,29 +128,12 @@ public class AccountHeadService { if(ah.getBillTime() !=null) { ah.setBillTimeStr(getCenternTime(ah.getBillTime())); } - resList.add(ah); } } - }catch(Exception e){ + } catch(Exception e){ JshException.readFail(logger, e); } - return resList; - } - - public Long countAccountHead(String type, String billNo, String beginTime, String endTime, - Long organId, Long creator, Long handsPersonId, Long accountId, String status, - String remark, String number) throws Exception{ - Long result=null; - try{ - String [] creatorArray = getCreatorArray(); - beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); - endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, - beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return list; } /** diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java deleted file mode 100644 index f5d22ffbd..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemComponent.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.erp.service.accountItem; - -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 = "accountItem_component") -@AccountItemResource -public class AccountItemComponent implements ICommonQuery { - - @Resource - private AccountItemService accountItemService; - - @Override - public Object selectOne(Long id) throws Exception { - return accountItemService.getAccountItem(id); - } - - @Override - public List select(Map map)throws Exception { - return getAccountItemList(map); - } - - private List getAccountItemList(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); - String remark = StringUtil.getInfo(search, "remark"); - String order = QueryUtils.order(map); - return accountItemService.select(name, type, 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"); - Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); - String remark = StringUtil.getInfo(search, "remark"); - return accountItemService.countAccountItem(name, type, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception{ - return accountItemService.insertAccountItem(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return accountItemService.updateAccountItem(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return accountItemService.deleteAccountItem(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return accountItemService.batchDeleteAccountItem(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return accountItemService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemResource.java deleted file mode 100644 index e0c446c48..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.accountItem; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "accountItem") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface AccountItemResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java index 3f55594c4..325dc1517 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/accountItem/AccountItemService.java @@ -46,16 +46,6 @@ public class AccountItemService { @Resource private DepotHeadService depotHeadService; - public AccountItem getAccountItem(long id)throws Exception { - AccountItem result=null; - try{ - result=accountItemMapper.selectByPrimaryKey(id); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - public List getAccountItem()throws Exception { AccountItemExample example = new AccountItemExample(); example.createCriteria().andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); @@ -78,71 +68,6 @@ public class AccountItemService { return list; } - public Long countAccountItem(String name, Integer type, String remark)throws Exception { - Long result=null; - try{ - result = accountItemMapperEx.countsByAccountItem(name, type, remark); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int insertAccountItem(JSONObject obj, HttpServletRequest request) throws Exception{ - AccountItem accountItem = JSONObject.parseObject(obj.toJSONString(), AccountItem.class); - int result=0; - try{ - result = accountItemMapper.insertSelective(accountItem); - logService.insertLog("财务明细", BusinessConstants.LOG_OPERATION_TYPE_ADD, request); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int updateAccountItem(JSONObject obj, HttpServletRequest request)throws Exception { - AccountItem accountItem = JSONObject.parseObject(obj.toJSONString(), AccountItem.class); - int result=0; - try{ - result = accountItemMapper.updateByPrimaryKeySelective(accountItem); - logService.insertLog("财务明细", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(accountItem.getId()).toString(), request); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int deleteAccountItem(Long id, HttpServletRequest request)throws Exception { - int result=0; - try{ - result = accountItemMapper.deleteByPrimaryKey(id); - logService.insertLog("财务明细", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_DELETE).append(id).toString(), request); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDeleteAccountItem(String ids, HttpServletRequest request)throws Exception { - List idList = StringUtil.strToLongList(ids); - AccountItemExample example = new AccountItemExample(); - example.createCriteria().andIdIn(idList); - int result=0; - try{ - result = accountItemMapper.deleteByExample(example); - logService.insertLog("财务明细", "批量删除,id集:" + ids, request); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; - } - public int checkIsNameExist(Long id, String name)throws Exception { AccountItemExample example = new AccountItemExample(); example.createCriteria().andIdNotEqualTo(id).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java deleted file mode 100644 index 0e024094c..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadComponent.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.jsh.erp.service.depotHead; - -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 = "depotHead_component") -@DepotHeadResource -public class DepotHeadComponent implements ICommonQuery { - - @Resource - private DepotHeadService depotHeadService; - - @Override - public Object selectOne(Long id) throws Exception { - return depotHeadService.getDepotHead(id); - } - - @Override - public List select(Map map)throws Exception { - return getDepotHeadList(map); - } - - private List getDepotHeadList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String type = StringUtil.getInfo(search, "type"); - String subType = StringUtil.getInfo(search, "subType"); - String hasDebt = StringUtil.getInfo(search, "hasDebt"); - String status = StringUtil.getInfo(search, "status"); - String purchaseStatus = StringUtil.getInfo(search, "purchaseStatus"); - String number = StringUtil.getInfo(search, "number"); - String linkApply = StringUtil.getInfo(search, "linkApply"); - String linkNumber = StringUtil.getInfo(search, "linkNumber"); - String beginTime = StringUtil.getInfo(search, "beginTime"); - String endTime = StringUtil.getInfo(search, "endTime"); - String materialParam = StringUtil.getInfo(search, "materialParam"); - Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); - Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); - Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); - Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); - String remark = StringUtil.getInfo(search, "remark"); - return depotHeadService.select(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, - beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String type = StringUtil.getInfo(search, "type"); - String subType = StringUtil.getInfo(search, "subType"); - String hasDebt = StringUtil.getInfo(search, "hasDebt"); - String status = StringUtil.getInfo(search, "status"); - String purchaseStatus = StringUtil.getInfo(search, "purchaseStatus"); - String number = StringUtil.getInfo(search, "number"); - String linkApply = StringUtil.getInfo(search, "linkApply"); - String linkNumber = StringUtil.getInfo(search, "linkNumber"); - String beginTime = StringUtil.getInfo(search, "beginTime"); - String endTime = StringUtil.getInfo(search, "endTime"); - String materialParam = StringUtil.getInfo(search, "materialParam"); - Long organId = StringUtil.parseStrLong(StringUtil.getInfo(search, "organId")); - Long creator = StringUtil.parseStrLong(StringUtil.getInfo(search, "creator")); - Long depotId = StringUtil.parseStrLong(StringUtil.getInfo(search, "depotId")); - Long accountId = StringUtil.parseStrLong(StringUtil.getInfo(search, "accountId")); - String remark = StringUtil.getInfo(search, "remark"); - return depotHeadService.countDepotHead(type, subType, hasDebt, status, purchaseStatus, number, linkApply, linkNumber, - beginTime, endTime, materialParam, organId, creator, depotId, accountId, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception{ - return depotHeadService.insertDepotHead(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return depotHeadService.updateDepotHead(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return depotHeadService.deleteDepotHead(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return depotHeadService.batchDeleteDepotHead(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return 0; - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadResource.java deleted file mode 100644 index 8b51f5273..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.depotHead; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "depotHead") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface DepotHeadResource { -} 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 9b4ba96a3..89894f2c6 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 @@ -27,6 +27,7 @@ import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; import com.jsh.erp.utils.ExcelUtils; +import com.jsh.erp.utils.PageUtils; import com.jsh.erp.utils.StringUtil; import com.jsh.erp.utils.Tools; import jxl.Workbook; @@ -114,8 +115,8 @@ public class DepotHeadService { } public List select(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, - String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark, int offset, int rows) throws Exception { - List resList = new ArrayList<>(); + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception { + List list = new ArrayList<>(); try{ HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); Long userId = userService.getUserId(request); @@ -132,9 +133,10 @@ public class DepotHeadService { Map accountMap = accountService.getAccountMap(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - List list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, + PageUtils.startPage(); + list = depotHeadMapperEx.selectByConditionDepotHead(type, subType, creatorArray, hasDebt, statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, - materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark, offset, rows); + materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark); if (null != list) { List idList = new ArrayList<>(); List numberList = new ArrayList<>(); @@ -221,35 +223,12 @@ public class DepotHeadService { dh.setTotalPrice(null); dh.setDiscountLastMoney(null); } - resList.add(dh); } } - }catch(Exception e){ + } catch(Exception e){ JshException.readFail(logger, e); } - return resList; - } - - public Long countDepotHead(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, - String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception{ - Long result=null; - try{ - String [] depotArray = getDepotArray(subType); - String [] creatorArray = getCreatorArray(); - String [] statusArray = StringUtil.isNotEmpty(status) ? status.split(",") : null; - String [] purchaseStatusArray = StringUtil.isNotEmpty(purchaseStatus) ? purchaseStatus.split(",") : null; - String [] organArray = getOrganArray(subType, purchaseStatus); - //以销定购，查看全部数据 - creatorArray = StringUtil.isNotEmpty(purchaseStatus) ? null: creatorArray; - beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); - endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); - result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, hasDebt, - statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, - materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return list; } /** diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java deleted file mode 100644 index 8fe8713d4..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemComponent.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.erp.service.depotItem; - -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 = "depotItem_component") -@DepotItemResource -public class DepotItemComponent implements ICommonQuery { - - @Resource - private DepotItemService depotItemService; - - @Override - public Object selectOne(Long id) throws Exception { - return depotItemService.getDepotItem(id); - } - - @Override - public List select(Map map)throws Exception { - return getDepotItemList(map); - } - - private List getDepotItemList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); - String remark = StringUtil.getInfo(search, "remark"); - String order = QueryUtils.order(map); - return depotItemService.select(name, type, 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"); - Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); - String remark = StringUtil.getInfo(search, "remark"); - return depotItemService.countDepotItem(name, type, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return depotItemService.insertDepotItem(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return depotItemService.updateDepotItem(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return depotItemService.deleteDepotItem(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return depotItemService.batchDeleteDepotItem(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return depotItemService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemResource.java deleted file mode 100644 index 6bdad6e1c..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotItem/DepotItemResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.depotItem; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "depotItem") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface DepotItemResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java index 7511112e9..294847a10 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialService.java @@ -125,8 +125,7 @@ public class MaterialService { if(StringUtil.isNotEmpty(mpList)){ mpArr= mpList.split(","); } - List resList = new ArrayList<>(); - List list =null; + List list = new ArrayList<>(); try{ List idList = new ArrayList<>(); if(StringUtil.isNotEmpty(categoryId)){ @@ -148,13 +147,12 @@ public class MaterialService { m.setBigUnitInitialStock(getBigUnitStock(m.getInitialStock(), m.getUnitId())); m.setStock(currentStockMap.get(m.getId())!=null? currentStockMap.get(m.getId()): BigDecimal.ZERO); m.setBigUnitStock(getBigUnitStock(m.getStock(), m.getUnitId())); - resList.add(m); } } - }catch(Exception e){ + } catch(Exception e){ JshException.readFail(logger, e); } - return resList; + return list; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java deleted file mode 100644 index 489a59c73..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelComponent.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.jsh.erp.service.orgaUserRel; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.ICommonQuery; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -/** - * Description - * - * @Author: cjl - * @Date: 2019/3/11 18:10 - */ -@Service(value = "orgaUserRel_component") -@OrgaUserRelResource -public class OrgaUserRelComponent implements ICommonQuery { - @Resource - private OrgaUserRelService orgaUserRelService; - - @Override - public Object selectOne(Long id) throws Exception { - return orgaUserRelService.getOrgaUserRel(id); - } - - @Override - public List select(Map parameterMap)throws Exception { - return getOrgaUserRelList(parameterMap); - } - private List getOrgaUserRelList(Map map)throws Exception { - return null; - } - @Override - public Long counts(Map parameterMap)throws Exception { - return null; - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return orgaUserRelService.insertOrgaUserRel(obj,request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return orgaUserRelService.updateOrgaUserRel(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return orgaUserRelService.deleteOrgaUserRel(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return orgaUserRelService.batchDeleteOrgaUserRel(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return 0; - } -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelResource.java deleted file mode 100644 index a12ce1f7b..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/orgaUserRel/OrgaUserRelResource.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.jsh.erp.service.orgaUserRel; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * Description - * 机构用户关系 - * @Author: cjl - * @Date: 2019/3/11 18:11 - */ -@ResourceInfo(value = "orgaUserRel") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface OrgaUserRelResource { - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceComponent.java deleted file mode 100644 index 85abd740b..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceComponent.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.jsh.erp.service.sequence; - -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; - -/** - * Description - * - * @Author: jishenghua - * @Date: 2021/3/16 16:33 - */ -@Service(value = "sequence_component") -@SequenceResource -public class SequenceComponent implements ICommonQuery { - @Resource - private SequenceService sequenceService; - - @Override - public Object selectOne(Long id) throws Exception { - return sequenceService.getSequence(id); - } - - @Override - public List select(Map map)throws Exception { - return getSequenceList(map); - } - - private List getSequenceList(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - return sequenceService.select(name,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"); - return sequenceService.countSequence(name); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return sequenceService.insertSequence(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return sequenceService.updateSequence(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return sequenceService.deleteSequence(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return sequenceService.batchDeleteSequence(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name) throws Exception{ - return sequenceService.checkIsNameExist(id, name); - } -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceResource.java deleted file mode 100644 index 21e62c419..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/sequence/SequenceResource.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jsh.erp.service.sequence; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * Description - * - * @Author: jishenghua - * @Date: 2021/3/16 16:33 - */ -@ResourceInfo(value = "sequence") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface SequenceResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java deleted file mode 100644 index 9e412e08d..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberComponent.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.jsh.erp.service.serialNumber; - -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; - -/** - * Description - * - * @Author: cjl - * @Date: 2019/1/21 16:33 - */ -@Service(value = "serialNumber_component") -@SerialNumberResource -public class SerialNumberComponent implements ICommonQuery { - @Resource - private SerialNumberService serialNumberService; - - @Override - public Object selectOne(Long id) throws Exception { - return serialNumberService.getSerialNumber(id); - } - - @Override - public List select(Map map)throws Exception { - return getSerialNumberList(map); - } - - private List getSerialNumberList(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String serialNumber = StringUtil.getInfo(search, "serialNumber"); - String materialName = StringUtil.getInfo(search, "materialName"); - return serialNumberService.select(serialNumber,materialName,QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String serialNumber = StringUtil.getInfo(search, "serialNumber"); - String materialName = StringUtil.getInfo(search, "materialName"); - return serialNumberService.countSerialNumber(serialNumber, materialName); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return serialNumberService.insertSerialNumber(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return serialNumberService.updateSerialNumber(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return serialNumberService.deleteSerialNumber(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return serialNumberService.batchDeleteSerialNumber(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String serialNumber) throws Exception{ - return serialNumberService.checkIsNameExist(id, serialNumber); - } -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberResource.java deleted file mode 100644 index 210df4150..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberResource.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.jsh.erp.service.serialNumber; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * Description - * - * @Author: jishenghua - * @Date: 2019/1/21 16:33 - */ -@ResourceInfo(value = "serialNumber") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface SerialNumberResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java index dc532b81b..b15f6e7b0 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java @@ -42,7 +42,6 @@ public class SerialNumberService { @Resource private LogService logService; - public SerialNumber getSerialNumber(long id)throws Exception { SerialNumber result=null; try{ @@ -79,141 +78,30 @@ public class SerialNumberService { public List select(String serialNumber, String materialName, Integer offset, Integer rows)throws Exception { return null; - - } - - public Long countSerialNumber(String serialNumber,String materialName)throws Exception { - return null; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertSerialNumber(JSONObject obj, HttpServletRequest request)throws Exception { - int result=0; - try{ - SerialNumberEx serialNumberEx = JSONObject.parseObject(obj.toJSONString(), SerialNumberEx.class); - /**处理商品id*/ - serialNumberEx.setMaterialId(getSerialNumberMaterialIdByBarCode(serialNumberEx.getMaterialCode())); - //删除标记,默认未删除 - serialNumberEx.setDeleteFlag(BusinessConstants.DELETE_FLAG_EXISTS); - //已卖出，默认未否 - serialNumberEx.setIsSell(BusinessConstants.IS_SELL_HOLD); - Date date=new Date(); - serialNumberEx.setCreateTime(date); - serialNumberEx.setUpdateTime(date); - User userInfo=userService.getCurrentUser(); - serialNumberEx.setCreator(userInfo==null?null:userInfo.getId()); - serialNumberEx.setUpdater(userInfo==null?null:userInfo.getId()); - result = serialNumberMapperEx.addSerialNumber(serialNumberEx); - logService.insertLog("序列号",BusinessConstants.LOG_OPERATION_TYPE_ADD, - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; + return 0; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateSerialNumber(JSONObject obj, HttpServletRequest request) throws Exception{ - SerialNumberEx serialNumberEx = JSONObject.parseObject(obj.toJSONString(), SerialNumberEx.class); - int result=0; - try{ - serialNumberEx.setMaterialId(getSerialNumberMaterialIdByBarCode(serialNumberEx.getMaterialCode())); - Date date=new Date(); - serialNumberEx.setUpdateTime(date); - User userInfo=userService.getCurrentUser(); - serialNumberEx.setUpdater(userInfo==null?null:userInfo.getId()); - result = serialNumberMapperEx.updateSerialNumber(serialNumberEx); - logService.insertLog("序列号", - new StringBuffer(BusinessConstants.LOG_OPERATION_TYPE_EDIT).append(serialNumberEx.getId()).toString(), - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; + return 0; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int deleteSerialNumber(Long id, HttpServletRequest request)throws Exception { - return batchDeleteSerialNumberByIds(id.toString()); + return 0; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int batchDeleteSerialNumber(String ids, HttpServletRequest request)throws Exception { - return batchDeleteSerialNumberByIds(ids); - } - - /** - * 逻辑删除序列号信息 - * create time: 2019/3/27 17:43 - * @Param: ids - * @return - */ - @Transactional(value = "transactionManager", rollbackFor = Exception.class) - public int batchDeleteSerialNumberByIds(String ids) throws Exception{ - StringBuffer sb = new StringBuffer(); - sb.append(BusinessConstants.LOG_OPERATION_TYPE_DELETE); - List list = getSerialNumberListByIds(ids); - for(SerialNumber serialNumber: list){ - sb.append("[").append(serialNumber.getSerialNumber()).append("]"); - } - logService.insertLog("序列号", sb.toString(), - ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest()); - User userInfo=userService.getCurrentUser(); - String [] idArray=ids.split(","); - int result=0; - try{ - result = serialNumberMapperEx.batchDeleteSerialNumberByIds(new Date(),userInfo==null?null:userInfo.getId(),idArray); - }catch(Exception e){ - JshException.writeFail(logger, e); - } - return result; + return 0; } public int checkIsNameExist(Long id, String serialNumber)throws Exception { - SerialNumberExample example = new SerialNumberExample(); - example.createCriteria().andIdNotEqualTo(id).andSerialNumberEqualTo(serialNumber).andDeleteFlagNotEqualTo(BusinessConstants.DELETE_FLAG_DELETED); - List list=null; - try{ - list=serialNumberMapper.selectByExample(example); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return list==null?0:list.size(); - } - - /** - * 根据商品名称判断商品名称是否有效 - * @Param: materialName - * @return Long 满足使用条件的商品的id - */ - public Long checkMaterialName(String materialName)throws Exception{ - if(StringUtil.isNotEmpty(materialName)) { - List mlist=null; - try{ - mlist = materialMapperEx.findByMaterialName(materialName); - }catch(Exception e){ - JshException.readFail(logger, e); - } - if (mlist == null || mlist.size() < 1) { - //商品名称不存在 - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_EXISTS_CODE, - ExceptionConstants.MATERIAL_NOT_EXISTS_MSG); - } - if (mlist.size() > 1) { - //商品信息不唯一 - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ONLY_CODE, - ExceptionConstants.MATERIAL_NOT_ONLY_MSG); - - } - //获得唯一商品 - if (BusinessConstants.ENABLE_SERIAL_NUMBER_NOT_ENABLED.equals(mlist.get(0).getEnableSerialNumber())) { - //商品未开启序列号 - throw new BusinessRunTimeException(ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_CODE, - ExceptionConstants.MATERIAL_NOT_ENABLE_SERIAL_NUMBER_MSG); - } - return mlist.get(0).getId(); - } - return null; + return 0; } /** diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java deleted file mode 100644 index c80055f62..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierComponent.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.jsh.erp.service.supplier; - -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 = "supplier_component") -@SupplierResource -public class SupplierComponent implements ICommonQuery { - - @Resource - private SupplierService supplierService; - - @Override - public Object selectOne(Long id) throws Exception { - return supplierService.getSupplier(id); - } - - @Override - public List select(Map map)throws Exception { - return getSupplierList(map); - } - - private List getSupplierList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String supplier = StringUtil.getInfo(search, "supplier"); - String type = StringUtil.getInfo(search, "type"); - String phonenum = StringUtil.getInfo(search, "phonenum"); - String telephone = StringUtil.getInfo(search, "telephone"); - return supplierService.select(supplier, type, phonenum, telephone, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String supplier = StringUtil.getInfo(search, "supplier"); - String type = StringUtil.getInfo(search, "type"); - String phonenum = StringUtil.getInfo(search, "phonenum"); - String telephone = StringUtil.getInfo(search, "telephone"); - return supplierService.countSupplier(supplier, type, phonenum, telephone); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return supplierService.insertSupplier(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return supplierService.updateSupplier(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return supplierService.deleteSupplier(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return supplierService.batchDeleteSupplier(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return supplierService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierResource.java deleted file mode 100644 index 03f06d40a..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.supplier; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "supplier") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface SupplierResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java index f6b21eaac..48b7705d9 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/supplier/SupplierService.java @@ -8,16 +8,11 @@ import com.jsh.erp.datasource.mappers.*; import com.jsh.erp.datasource.vo.DepotHeadVo4StatementAccount; import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.exception.JshException; -import com.jsh.erp.service.accountHead.AccountHeadService; import com.jsh.erp.service.depotHead.DepotHeadService; import com.jsh.erp.service.log.LogService; -import com.jsh.erp.service.systemConfig.SystemConfigService; import com.jsh.erp.service.user.UserService; import com.jsh.erp.service.userBusiness.UserBusinessService; -import com.jsh.erp.utils.BaseResponseInfo; -import com.jsh.erp.utils.ExcelUtils; -import com.jsh.erp.utils.StringUtil; -import com.jsh.erp.utils.Tools; +import com.jsh.erp.utils.*; import jxl.Sheet; import jxl.Workbook; import org.slf4j.Logger; @@ -96,11 +91,12 @@ public class SupplierService { return list; } - public List select(String supplier, String type, String phonenum, String telephone, int offset, int rows) throws Exception{ - List resList = new ArrayList(); + public List select(String supplier, String type, String phonenum, String telephone) throws Exception{ + List list = new ArrayList<>(); try{ String [] creatorArray = depotHeadService.getCreatorArray(); - List list = supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, creatorArray, offset, rows); + PageUtils.startPage(); + list = supplierMapperEx.selectByConditionSupplier(supplier, type, phonenum, telephone, creatorArray); for(Supplier s : list) { Integer supplierId = s.getId().intValue(); String beginTime = Tools.getYearBegin(); @@ -144,23 +140,11 @@ public class SupplierService { } else if(("供应商").equals(s.getType())) { s.setAllNeedPay(sum); } - resList.add(s); } - }catch(Exception e){ + } catch(Exception e){ JshException.readFail(logger, e); } - return resList; - } - - public Long countSupplier(String supplier, String type, String phonenum, String telephone) throws Exception{ - Long result=null; - try{ - String [] creatorArray = depotHeadService.getCreatorArray(); - result=supplierMapperEx.countsBySupplier(supplier, type, phonenum, telephone, creatorArray); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; + return list; } @Transactional(value = "transactionManager", rollbackFor = Exception.class) diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java deleted file mode 100644 index 9da7ee44e..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigComponent.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.jsh.erp.service.systemConfig; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.systemConfig.SystemConfigResource; -import com.jsh.erp.service.systemConfig.SystemConfigService; -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 = "systemConfig_component") -@SystemConfigResource -public class SystemConfigComponent implements ICommonQuery { - - @Resource - private SystemConfigService systemConfigService; - - @Override - public Object selectOne(Long id) throws Exception { - return systemConfigService.getSystemConfig(id); - } - - @Override - public List select(Map map)throws Exception { - return getSystemConfigList(map); - } - - private List getSystemConfigList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String companyName = StringUtil.getInfo(search, "companyName"); - String order = QueryUtils.order(map); - return systemConfigService.select(companyName, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String companyName = StringUtil.getInfo(search, "companyName"); - return systemConfigService.countSystemConfig(companyName); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return systemConfigService.insertSystemConfig(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return systemConfigService.updateSystemConfig(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return systemConfigService.deleteSystemConfig(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return systemConfigService.batchDeleteSystemConfig(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return systemConfigService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigResource.java deleted file mode 100644 index b3720fb2b..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.systemConfig; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "systemConfig") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface SystemConfigResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java index 7ec3edbee..5ac90ec18 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/systemConfig/SystemConfigService.java @@ -8,7 +8,6 @@ import com.aliyun.oss.OSSClientBuilder; import com.aliyun.oss.OSSException; import com.aliyun.oss.model.CopyObjectResult; import com.aliyun.oss.model.PutObjectRequest; -import com.aliyun.oss.model.PutObjectResult; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.datasource.entities.SystemConfig; import com.jsh.erp.datasource.entities.SystemConfigExample; @@ -19,10 +18,7 @@ import com.jsh.erp.exception.JshException; import com.jsh.erp.service.log.LogService; import com.jsh.erp.service.platformConfig.PlatformConfigService; import com.jsh.erp.service.user.UserService; -import com.jsh.erp.utils.ExcelUtils; -import com.jsh.erp.utils.FileUtils; -import com.jsh.erp.utils.StringUtil; -import com.jsh.erp.utils.Tools; +import com.jsh.erp.utils.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -92,26 +88,17 @@ public class SystemConfigService { } return list; } - public List select(String companyName, int offset, int rows)throws Exception { + public List select(String companyName)throws Exception { List list=null; try{ - list=systemConfigMapperEx.selectByConditionSystemConfig(companyName, offset, rows); + PageUtils.startPage(); + list=systemConfigMapperEx.selectByConditionSystemConfig(companyName); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long countSystemConfig(String companyName)throws Exception { - Long result=null; - try{ - result=systemConfigMapperEx.countsBySystemConfig(companyName); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertSystemConfig(JSONObject obj, HttpServletRequest request) throws Exception{ SystemConfig systemConfig = JSONObject.parseObject(obj.toJSONString(), SystemConfig.class); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitComponent.java deleted file mode 100644 index 591a5a0a4..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitComponent.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.jsh.erp.service.unit; - -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 = "unit_component") -@UnitResource -public class UnitComponent implements ICommonQuery { - - @Resource - private UnitService unitService; - - @Override - public Object selectOne(Long id) throws Exception { - return unitService.getUnit(id); - } - - @Override - public List select(Map map)throws Exception { - return getUnitList(map); - } - - private List getUnitList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String order = QueryUtils.order(map); - return unitService.select(name, 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"); - return unitService.countUnit(name); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return unitService.insertUnit(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return unitService.updateUnit(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return unitService.deleteUnit(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return unitService.batchDeleteUnit(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return unitService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitResource.java deleted file mode 100644 index db70e4e0c..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.unit; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "unit") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface UnitResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java index e66e12ffd..e007e9d07 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/unit/UnitService.java @@ -14,6 +14,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.user.UserService; +import com.jsh.erp.utils.PageUtils; import com.jsh.erp.utils.StringUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,26 +81,17 @@ public class UnitService { return list; } - public List select(String name, int offset, int rows)throws Exception { + public List select(String name)throws Exception { List list=null; try{ - list=unitMapperEx.selectByConditionUnit(name, offset, rows); + PageUtils.startPage(); + list=unitMapperEx.selectByConditionUnit(name); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long countUnit(String name)throws Exception { - Long result=null; - try{ - result=unitMapperEx.countsByUnit(name); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertUnit(JSONObject obj, HttpServletRequest request)throws Exception { Unit unit = JSONObject.parseObject(obj.toJSONString(), Unit.class); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserComponent.java deleted file mode 100644 index 4203ac6ad..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserComponent.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.jsh.erp.service.user; - -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.*; - -@Service(value = "user_component") -@UserResource -public class UserComponent implements ICommonQuery { - - @Resource - private UserService userService; - - @Override - public Object selectOne(Long id) throws Exception { - return userService.getUser(id); - } - - @Override - public List select(Map map)throws Exception { - return getUserList(map); - } - - private List getUserList(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String userName = StringUtil.getInfo(search, "userName"); - String loginName = StringUtil.getInfo(search, "loginName"); - String order = QueryUtils.order(map); - String filter = QueryUtils.filter(map); - return userService.select(userName, loginName, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map)throws Exception { - String search = map.get(Constants.SEARCH); - String userName = StringUtil.getInfo(search, "userName"); - String loginName = StringUtil.getInfo(search, "loginName"); - return userService.countUser(userName, loginName); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return userService.insertUser(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return userService.updateUser(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return userService.deleteUser(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return userService.batchDeleteUser(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return userService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserResource.java deleted file mode 100644 index ae36e44ae..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/user/UserResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.user; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "user") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface UserResource { -} 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 e8b01909a..cf1acbdd1 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 @@ -7,7 +7,7 @@ import com.jsh.erp.service.functions.FunctionService; import com.jsh.erp.service.platformConfig.PlatformConfigService; import com.jsh.erp.service.redis.RedisService; import com.jsh.erp.service.role.RoleService; -import com.jsh.erp.utils.HttpClient; +import com.jsh.erp.utils.*; import org.springframework.util.StringUtils; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -22,9 +22,6 @@ 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.userBusiness.UserBusinessService; -import com.jsh.erp.utils.ExceptionCodeConstants; -import com.jsh.erp.utils.StringUtil; -import com.jsh.erp.utils.Tools; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; @@ -112,14 +109,15 @@ public class UserService { return list; } - public List select(String userName, String loginName, int offset, int rows)throws Exception { + public List select(String userName, String loginName)throws Exception { List list=null; try { //先校验是否登录，然后才能查询用户数据 HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest(); Long userId = this.getUserId(request); if(userId!=null) { - list = userMapperEx.selectByConditionUser(userName, loginName, offset, rows); + PageUtils.startPage(); + list = userMapperEx.selectByConditionUser(userName, loginName); for (UserEx ue : list) { String userType = ""; if (ue.getId().equals(ue.getTenantId())) { @@ -155,15 +153,7 @@ public class UserService { } return result; } - /** - * create by: cjl - * description: - * 添加事务控制 - * create time: 2019/1/11 14:30 - * @Param: beanJson -  * @Param: request - * @return int - */ + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertUser(JSONObject obj, HttpServletRequest request)throws Exception { User user = JSONObject.parseObject(obj.toJSONString(), User.class); @@ -185,15 +175,7 @@ public class UserService { } return result; } - /** - * create by: cjl - * description: - * 添加事务控制 - * create time: 2019/1/11 14:31 - * @Param: beanJson -  * @Param: id - * @return int - */ + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateUser(JSONObject obj, HttpServletRequest request) throws Exception{ User user = JSONObject.parseObject(obj.toJSONString(), User.class); @@ -207,14 +189,7 @@ public class UserService { } return result; } - /** - * create by: cjl - * description: - * 添加事务控制 - * create time: 2019/1/11 14:32 - * @Param: user - * @return int - */ + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int updateUserByObj(User user) throws Exception{ logService.insertLog("用户", @@ -228,15 +203,7 @@ public class UserService { } return result; } - /** - * create by: cjl - * description: - * 添加事务控制 - * create time: 2019/1/11 14:33 - * @Param: md5Pwd -  * @Param: id - * @return int - */ + @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int resetPwd(String md5Pwd, Long id) throws Exception{ int result=0; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java deleted file mode 100644 index 080453282..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessComponent.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.jsh.erp.service.userBusiness; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.BusinessConstants; -import com.jsh.erp.service.ICommonQuery; -import org.springframework.stereotype.Service; - -import javax.annotation.Resource; -import javax.servlet.http.HttpServletRequest; -import java.util.List; -import java.util.Map; - -@Service(value = "userBusiness_component") -@UserBusinessResource -public class UserBusinessComponent implements ICommonQuery { - - @Resource - private UserBusinessService userBusinessService; - - @Override - public Object selectOne(Long id) throws Exception { - return userBusinessService.getUserBusiness(id); - } - - @Override - public List select(Map map)throws Exception { - return getUserBusinessList(map); - } - - private List getUserBusinessList(Map map)throws Exception { - return null; - } - - @Override - public Long counts(Map map)throws Exception { - return BusinessConstants.DEFAULT_LIST_NULL_NUMBER; - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception { - return userBusinessService.insertUserBusiness(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return userBusinessService.updateUserBusiness(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return userBusinessService.deleteUserBusiness(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return userBusinessService.batchDeleteUserBusiness(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return userBusinessService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessResource.java deleted file mode 100644 index 7939a359e..000000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/userBusiness/UserBusinessResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.userBusiness; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "userBusiness") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface UserBusinessResource { -} diff --git a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml index 9877d9de6..241cf0c95 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/AccountHeadMapperEx.xml @@ -69,68 +69,6 @@ and ifnull(ah.delete_flag,'0') !='1' order by ah.id desc - - limit #{offset},#{rows} - - - - - - - diff --git a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml index e4912f899..4491b99cb 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/SerialNumberMapperEx.xml @@ -147,16 +147,6 @@ ) - - update jsh_serial_number - set update_time=#{updateTime},updater=#{updater},delete_flag='1' - where 1=1 - and id in ( - - #{id} - - ) - - - + update jsh_system_config set delete_flag='1' diff --git a/jshERP-boot/src/main/resources/mapper_xml/UnitMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/UnitMapperEx.xml index f82817600..0bc15f879 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/UnitMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/UnitMapperEx.xml @@ -11,21 +11,8 @@ and ifnull(delete_flag,'0') !='1' order by id desc - - limit #{offset},#{rows} - - - + update jsh_unit set delete_flag='1' diff --git a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml index 1fcc1b680..45c29077d 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/UserMapperEx.xml @@ -36,11 +36,9 @@ and user.login_name like #{bindLoginName} order by rel.user_blng_orga_dspl_seq,user.id desc - - limit #{offset},#{rows} - ) tb +