#

vincentlu

3 天以前 b033217d3193b2f5ebabb43cce4c7cb2776df6ee

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

@@ -11,7 +11,9 @@
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.enums.StatusType;
import com.zy.acs.manager.manager.service.AgvModelService;
import com.zy.acs.manager.manager.service.impl.AgvModelServiceImpl;
import com.zy.acs.manager.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -70,11 +72,14 @@
                    .eq(AgvModel::getType, agvModel.getType())) > 0) {
                return R.error("this model type has already exist !");
            }
        }        agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        }
        Date now = new Date();
        agvModel.setUuid(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
        agvModel.setStatus(StatusType.ENABLE.val);
        agvModel.setCreateBy(getLoginUserId());
        agvModel.setCreateTime(new Date());
        agvModel.setCreateTime(now);
        agvModel.setUpdateBy(getLoginUserId());
        agvModel.setUpdateTime(new Date());
        agvModel.setUpdateTime(now);
        if (!agvModelService.save(agvModel)) {
            return R.error("Save Fail");
        }
@@ -101,6 +106,18 @@
        agvModel.setUpdateTime(new Date());
        if (!agvModelService.updateById(agvModel)) {
            return R.error("Update Fail");
        } else {
            // update cache
            for (Map.Entry<Long, AgvModel> entry : AgvModelServiceImpl.AGV_ID_MODEL_CACHE.entrySet()) {
                if (entry.getValue().getId().equals(agvModel.getId())) {
                    entry.setValue(agvModel);
                }
            }
            for (Map.Entry<String, AgvModel> entry : AgvModelServiceImpl.AGV_NO_MODEL_CACHE.entrySet()) {
                if (entry.getValue().getId().equals(agvModel.getId())) {
                    entry.setValue(agvModel);
                }
            }
        }
        return R.ok("Update Success").add(agvModel);
    }