# app version

whycq

2024-03-24 00985eabb51145130d4fa253b153aaeeec3a957a

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

@@ -10,29 +10,27 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.AgvLocMast;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.AgvLockMastService;
import com.zy.asrs.service.AgvLocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.Date;
import java.util.List;
import java.util.Map;

@RestController
@RequestMapping("/agv")
public class AgvLocMastController extends BaseController {

    @Autowired
    private AgvLockMastService agvLockMastService;
    private AgvLocMastService agvLockMastService;

    @RequestMapping(value = "/agvLocMast/list/auth")
    @RequestMapping(value = "/locMast/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -46,7 +44,7 @@
        return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
    }

    @RequestMapping(value = "/avgLocMast/add/auth")
    @RequestMapping(value = "/locMast/add/auth")
    @ManagerAuth(memo = "库位添加")
    public R add(AgvLocMast agvLocMast) {
        agvLocMast.setModiUser(getUserId());
@@ -57,7 +55,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/agvLocMast/update/auth")
    @RequestMapping(value = "/locMast/update/auth")
    @ManagerAuth(memo = "库位修改")
    @Transactional
    public R update(LocMast locMast){
@@ -65,7 +63,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/agvLocMast/delete/auth")
    @RequestMapping(value = "/locMast/delete/auth")
    @ManagerAuth(memo = "库位删除")
    public R delete(@RequestParam String param){
        List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
@@ -78,7 +76,7 @@
        return R.ok();
    }

    @RequestMapping(value = "/agvLocMast/export/auth")
    @RequestMapping(value = "/locMast/export/auth")
    @ManagerAuth(memo = "库位导出")
    public R export(@RequestBody JSONObject param){
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
@@ -89,7 +87,7 @@
        return R.ok(exportSupport(list, fields));
    }

    @RequestMapping(value = "/agvLocMast/check/column/auth")
    @RequestMapping(value = "/locMast/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<AgvLocMast> wrapper = new EntityWrapper<AgvLocMast>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
@@ -99,13 +97,23 @@
        return R.ok();
    }

    @RequestMapping(value = "/AgvLocMast/init/auth")
    @RequestMapping(value = "/locMast/init/auth")
    @ManagerAuth(memo = "初始化库位")
//    @Transactional
    public R init(LocMastInitParam param) {
        //to do
        //清空原有库位
        //agvLockMastService.clearLoc();
        //初始化一楼站点
        agvLockMastService.initLocFloor1();
        //初始化三楼站点
        //agvLockMastService.initLocFloor3();

        return null;
        return R.ok();
    }

    @RequestMapping(value = "/locMast/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(agvLockMastService.selectById(String.valueOf(id)));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){