标准wms2.0

zhang

4 天以前 a1dbd2d060deebb453049b34f720274a34e487c7

 src/main/java/com/zy/asrs/controller/LocOwnerController.java

@@ -34,21 +34,23 @@

    @RequestMapping(value = "/locOwner/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        return R.ok(locOwnerService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping("/turn/over/take/site")
    @ManagerAuth()
    public R availableTakeSite(){
    public R availableTakeSite() {
        List<Map<String, Object>> result = new ArrayList<>();
        List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<>());
        for (LocOwner owner : locOwners) {
@@ -60,10 +62,10 @@
        return R.ok().add(result);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
        for (Map.Entry<String, Object> entry : map.entrySet()) {
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -82,8 +84,8 @@

    @RequestMapping(value = "/locOwner/update/auth")
    @ManagerAuth
    public R update(LocOwner locOwner){
        if (Cools.isEmpty(locOwner) || null==locOwner.getId()){
    public R update(LocOwner locOwner) {
        if (Cools.isEmpty(locOwner) || null == locOwner.getId()) {
            return R.error();
        }
        locOwnerService.updateById(locOwner);
@@ -92,8 +94,8 @@

    @RequestMapping(value = "/locOwner/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Integer[] ids){
        for (Integer id : ids){
    public R delete(@RequestParam(value = "ids[]") Integer[] ids) {
        for (Integer id : ids) {
            locOwnerService.deleteById(id);
        }
        return R.ok();
@@ -101,7 +103,7 @@

    @RequestMapping(value = "/locOwner/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<LocOwner> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("locOwner"));
@@ -117,7 +119,7 @@
        wrapper.like("id", condition);
        Page<LocOwner> page = locOwnerService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocOwner locOwner : page.getRecords()){
        for (LocOwner locOwner : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", locOwner.getId());
            map.put("value", locOwner.getId());
@@ -130,7 +132,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocOwner> wrapper = new EntityWrapper<LocOwner>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locOwnerService.selectOne(wrapper)){
        if (null != locOwnerService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(LocOwner.class, String.valueOf(param.get("key"))));
        }
        return R.ok();