diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java index 97ea6a7d..1d712c77 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/DepotController.java @@ -2,33 +2,34 @@ package com.jsh.erp.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.constants.BusinessConstants; -import com.jsh.erp.constants.ExceptionConstants; +import com.jsh.erp.base.BaseController; +import com.jsh.erp.base.TableDataInfo; import com.jsh.erp.datasource.entities.Depot; import com.jsh.erp.datasource.entities.DepotEx; -import com.jsh.erp.datasource.entities.MaterialCurrentStock; import com.jsh.erp.datasource.entities.MaterialInitialStock; -import com.jsh.erp.exception.BusinessRunTimeException; import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.service.material.MaterialService; -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.*; +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.dao.DataAccessException; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; -import java.io.IOException; import java.math.BigDecimal; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; +import static com.jsh.erp.utils.ResponseJsonUtil.returnStr; /** * @author ji sheng hua 752*718*920 @@ -36,7 +37,7 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/depot") @Api(tags = {"仓库管理"}) -public class DepotController { +public class DepotController extends BaseController { private Logger logger = LoggerFactory.getLogger(DepotController.class); @Resource @@ -48,6 +49,78 @@ public class DepotController { @Resource private MaterialService materialService; + + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Depot depot = depotService.getDepot(id); + Map objectMap = new HashMap<>(); + if(depot != null) { + objectMap.put("info", depot); + 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"); + Integer type = StringUtil.parseInteger(StringUtil.getInfo(search, "type")); + String remark = StringUtil.getInfo(search, "remark"); + List list = depotService.select(name, type, remark); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = depotService.insertDepot(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 = depotService.updateDepot(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 = depotService.deleteDepot(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 = depotService.batchDeleteDepot(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 = depotService.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/PersonController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java index 8e2bda90..f9d41b3c 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/PersonController.java @@ -2,10 +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.Person; import com.jsh.erp.service.person.PersonService; 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; @@ -19,6 +23,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 @@ -26,12 +31,83 @@ import static com.jsh.erp.utils.ResponseJsonUtil.returnJson; @RestController @RequestMapping(value = "/person") @Api(tags = {"经手人管理"}) -public class PersonController { +public class PersonController extends BaseController { private Logger logger = LoggerFactory.getLogger(PersonController.class); @Resource private PersonService personService; + + @GetMapping(value = "/info") + @ApiOperation(value = "根据id获取信息") + public String getList(@RequestParam("id") Long id, + HttpServletRequest request) throws Exception { + Person person = personService.getPerson(id); + Map objectMap = new HashMap<>(); + if(person != null) { + objectMap.put("info", person); + 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"); + String type = StringUtil.getInfo(search, "type"); + List list = personService.select(name, type); + return getDataTable(list); + } + + @PostMapping(value = "/add") + @ApiOperation(value = "新增") + public String addResource(@RequestBody JSONObject obj, HttpServletRequest request)throws Exception { + Map objectMap = new HashMap<>(); + int insert = personService.insertPerson(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 = personService.updatePerson(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 = personService.deletePerson(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 = personService.batchDeletePerson(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 = personService.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/datasource/mappers/DepotMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java index 42f58c39..9bc4b981 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/DepotMapperEx.java @@ -12,13 +12,6 @@ import java.util.Map; public interface DepotMapperEx { List selectByConditionDepot( - @Param("name") String name, - @Param("type") Integer type, - @Param("remark") String remark, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByDepot( @Param("name") String name, @Param("type") Integer type, @Param("remark") String remark); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java index 53928811..05c88b00 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/datasource/mappers/PersonMapperEx.java @@ -10,12 +10,6 @@ import java.util.List; public interface PersonMapperEx { List selectByConditionPerson( - @Param("name") String name, - @Param("type") String type, - @Param("offset") Integer offset, - @Param("rows") Integer rows); - - Long countsByPerson( @Param("name") String name, @Param("type") String type); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotComponent.java deleted file mode 100644 index e9de2f14..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotComponent.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.erp.service.depot; - -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 = "depot_component") -@DepotResource -public class DepotComponent implements ICommonQuery { - - @Resource - private DepotService depotService; - - @Override - public Object selectOne(Long id) throws Exception { - return depotService.getDepot(id); - } - - @Override - public List select(Map map)throws Exception { - return getDepotList(map); - } - - private List getDepotList(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 depotService.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 depotService.countDepot(name, type, remark); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request) throws Exception{ - return depotService.insertDepot(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return depotService.updateDepot(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return depotService.deleteDepot(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return depotService.batchDeleteDepot(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return depotService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotResource.java deleted file mode 100644 index fb8729f7..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.depot; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "depot") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface DepotResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java index 3f0c9c66..9846eafa 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depot/DepotService.java @@ -91,26 +91,16 @@ public class DepotService { return list; } - public List select(String name, Integer type, String remark, int offset, int rows)throws Exception { + public List select(String name, Integer type, String remark)throws Exception { List list=null; try{ - list=depotMapperEx.selectByConditionDepot(name, type, remark, offset, rows); + list=depotMapperEx.selectByConditionDepot(name, type, remark); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long countDepot(String name, Integer type, String remark)throws Exception { - Long result=null; - try{ - result=depotMapperEx.countsByDepot(name, type, remark); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertDepot(JSONObject obj, HttpServletRequest request)throws Exception { Depot depot = JSONObject.parseObject(obj.toJSONString(), Depot.class); diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java index f40d3f2a..107a56cb 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/material/MaterialComponent.java @@ -2,8 +2,6 @@ package com.jsh.erp.service.material; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.depot.DepotResource; -import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.StringUtil; diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonComponent.java b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonComponent.java deleted file mode 100644 index 7c70dd5a..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonComponent.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.jsh.erp.service.person; - -import com.alibaba.fastjson.JSONObject; -import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.depot.DepotResource; -import com.jsh.erp.service.depot.DepotService; -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 = "person_component") -@PersonResource -public class PersonComponent implements ICommonQuery { - - @Resource - private PersonService personService; - - @Override - public Object selectOne(Long id) throws Exception { - return personService.getPerson(id); - } - - @Override - public List select(Map map)throws Exception { - return getPersonList(map); - } - - private List getPersonList(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String type = StringUtil.getInfo(search, "type"); - String order = QueryUtils.order(map); - return personService.select(name, type, QueryUtils.offset(map), QueryUtils.rows(map)); - } - - @Override - public Long counts(Map map) throws Exception{ - String search = map.get(Constants.SEARCH); - String name = StringUtil.getInfo(search, "name"); - String type = StringUtil.getInfo(search, "type"); - return personService.countPerson(name, type); - } - - @Override - public int insert(JSONObject obj, HttpServletRequest request)throws Exception { - return personService.insertPerson(obj, request); - } - - @Override - public int update(JSONObject obj, HttpServletRequest request)throws Exception { - return personService.updatePerson(obj, request); - } - - @Override - public int delete(Long id, HttpServletRequest request)throws Exception { - return personService.deletePerson(id, request); - } - - @Override - public int deleteBatch(String ids, HttpServletRequest request)throws Exception { - return personService.batchDeletePerson(ids, request); - } - - @Override - public int checkIsNameExist(Long id, String name)throws Exception { - return personService.checkIsNameExist(id, name); - } - -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonResource.java b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonResource.java deleted file mode 100644 index df660e57..00000000 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonResource.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.jsh.erp.service.person; - -import com.jsh.erp.service.ResourceInfo; - -import java.lang.annotation.*; - -/** - * @author jishenghua qq752718920 2018-10-7 15:26:27 - */ -@ResourceInfo(value = "person") -@Inherited -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface PersonResource { -} diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java index 41cac6c4..0cc57d91 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/person/PersonService.java @@ -83,26 +83,16 @@ public class PersonService { return list; } - public List select(String name, String type, int offset, int rows)throws Exception { + public List select(String name, String type)throws Exception { List list=null; try{ - list=personMapperEx.selectByConditionPerson(name, type, offset, rows); + list=personMapperEx.selectByConditionPerson(name, type); }catch(Exception e){ JshException.readFail(logger, e); } return list; } - public Long countPerson(String name, String type)throws Exception { - Long result=null; - try{ - result=personMapperEx.countsByPerson(name, type); - }catch(Exception e){ - JshException.readFail(logger, e); - } - return result; - } - @Transactional(value = "transactionManager", rollbackFor = Exception.class) public int insertPerson(JSONObject obj, HttpServletRequest request)throws Exception { Person person = JSONObject.parseObject(obj.toJSONString(), Person.class); 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 index b17deb2e..c80055f6 100644 --- 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 @@ -2,8 +2,6 @@ package com.jsh.erp.service.supplier; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.depot.DepotResource; -import com.jsh.erp.service.depot.DepotService; import com.jsh.erp.utils.Constants; import com.jsh.erp.utils.QueryUtils; import com.jsh.erp.utils.StringUtil; 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 index acccebcd..08045328 100644 --- 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 @@ -3,11 +3,6 @@ package com.jsh.erp.service.userBusiness; import com.alibaba.fastjson.JSONObject; import com.jsh.erp.constants.BusinessConstants; import com.jsh.erp.service.ICommonQuery; -import com.jsh.erp.service.depot.DepotResource; -import com.jsh.erp.service.depot.DepotService; -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; diff --git a/jshERP-boot/src/main/resources/mapper_xml/DepotMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/DepotMapperEx.xml index a40d6991..483c3447 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/DepotMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/DepotMapperEx.xml @@ -23,28 +23,6 @@ and ifnull(dep.delete_Flag,'0') !='1' order by dep.sort asc, dep.id desc - - limit #{offset},#{rows} - - - diff --git a/jshERP-boot/src/main/resources/mapper_xml/PersonMapperEx.xml b/jshERP-boot/src/main/resources/mapper_xml/PersonMapperEx.xml index d3c56a2f..8fc0cd21 100644 --- a/jshERP-boot/src/main/resources/mapper_xml/PersonMapperEx.xml +++ b/jshERP-boot/src/main/resources/mapper_xml/PersonMapperEx.xml @@ -14,24 +14,8 @@ and ifnull(delete_flag,'0') !='1' order by sort asc, id desc - - limit #{offset},#{rows} - - - + update jsh_person set delete_flag='1'