#

luxiaotao1123

2024-09-20 8b2b469e519a95717603f0344e6928809a7bbe58

#

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/AgvModelController.java

@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.acs.framework.common.Cools;
import com.zy.acs.framework.common.R;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.framework.common.SnowflakeIdWorker;
import com.zy.acs.manager.common.annotation.OperationLog;
import com.zy.acs.manager.common.domain.BaseParam;
import com.zy.acs.manager.common.domain.KeyValVo;
import com.zy.acs.manager.common.domain.PageParam;
import com.zy.acs.manager.common.utils.ExcelUtil;
import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.system.controller.BaseController;
@@ -25,6 +26,8 @@

    @Autowired
    private AgvModelService agvModelService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @PreAuthorize("hasAuthority('manager:agvModel:list')")
    @PostMapping("/agvModel/page")
@@ -56,6 +59,18 @@
    @OperationLog("Create AgvModel")
    @PostMapping("/agvModel/save")
    public R save(@RequestBody AgvModel agvModel) {
        if (!Cools.isEmpty(agvModel.getName())) {
            if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
                    .eq(AgvModel::getName, agvModel.getName())) > 0) {
                return R.error("this model name has already exist !");
            }
        }
        if (!Cools.isEmpty(agvModel.getType())) {
            if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
                    .eq(AgvModel::getType, agvModel.getType())) > 0) {
                return R.error("this model type has already exist !");
            }
        }        agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        agvModel.setCreateBy(getLoginUserId());
        agvModel.setCreateTime(new Date());
        agvModel.setUpdateBy(getLoginUserId());
@@ -70,6 +85,18 @@
    @OperationLog("Update AgvModel")
    @PostMapping("/agvModel/update")
    public R update(@RequestBody AgvModel agvModel) {
        if (!Cools.isEmpty(agvModel.getName())) {
            if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
                    .eq(AgvModel::getName, agvModel.getName()).ne(AgvModel::getId, agvModel.getId())) > 0) {
                return R.error("this model name has already exist !");
            }
        }
        if (!Cools.isEmpty(agvModel.getType())) {
            if (agvModelService.count(new LambdaQueryWrapper<AgvModel>()
                    .eq(AgvModel::getType, agvModel.getType()).ne(AgvModel::getId, agvModel.getId())) > 0) {
                return R.error("this model type has already exist !");
            }
        }
        agvModel.setUpdateBy(getLoginUserId());
        agvModel.setUpdateTime(new Date());
        if (!agvModelService.updateById(agvModel)) {