DO单修改及优化

skyouc

7 天以前 06d7fb698ce6d0efc7ff4224c6b68d2f50feb716

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryController.java

@@ -11,7 +11,11 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.Delivery;
import com.vincent.rsf.server.manager.service.DeliveryService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.service.SerialRuleService;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +28,7 @@

    @Autowired
    private DeliveryService deliveryService;


    @PreAuthorize("hasAuthority('manager:delivery:list')")
    @PostMapping("/delivery/page")
@@ -56,9 +61,14 @@
    @PostMapping("/delivery/save")
    public R save(@RequestBody Delivery delivery) {
        delivery.setCreateBy(getLoginUserId());
        delivery.setCreateTime(new Date());
        delivery.setUpdateBy(getLoginUserId());
        delivery.setUpdateTime(new Date());
        if (Objects.isNull(delivery.getCode())) {
            String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_DELIVERY_RULE_CODE, delivery);
            if (Objects.isNull(ruleCode) || StringUtils.isBlank(ruleCode)) {
                return R.error("编码规则错误：编码「SYS_DELIVERY_RULE_CODE」是未设置成功！！");
            }
            delivery.setCode(ruleCode);
        }
        if (!deliveryService.save(delivery)) {
            return R.error("Save Fail");
        }