优化

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/controller/BjTrackShipCompanyController.java

@@ -5,16 +5,17 @@ import com.ruoyi.business.service.IBjTrackShipCompanyService;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 重点跟踪航运公司查询
@@ -55,4 +56,39 @@ public class BjTrackShipCompanyController extends BaseController {
         return success(bjTrackShipCompanyService.queryById(trackShipCompanyId));
     }
 
+    /**
+     * 新增重点跟踪航运公司
+     */
+    @Operation(summary = "新增重点跟踪航运公司")
+//    @RequiresPermissions("business:trackShipCompany:add")
+    @Log(title = "重点跟踪航运公司", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public AjaxResult add(@RequestBody BjTrackShipCompanyBo bo) {
+        return toAjax(bjTrackShipCompanyService.insertByBo(bo));
+    }
+
+    /**
+     * 修改重点跟踪航运公司
+     */
+    @Operation(summary = "修改重点跟踪航运公司")
+//    @RequiresPermissions("business:trackShipCompany:edit")
+    @Log(title = "重点跟踪航运公司", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult edit(@RequestBody BjTrackShipCompanyBo bo) {
+        return toAjax(bjTrackShipCompanyService.updateByBo(bo));
+    }
+
+    /**
+     * 删除重点跟踪航运公司
+     *
+     * @param trackShipCompanyId 主键串
+     */
+    @Operation(summary = "删除重点跟踪航运公司")
+//    @RequiresPermissions("business:trackShipCompany:remove")
+    @Log(title = "重点跟踪航运公司", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{trackShipCompanyId}")
+    public AjaxResult remove(@PathVariable("trackShipCompanyId") String[] trackShipCompanyId) {
+        return toAjax(bjTrackShipCompanyService.deleteWithValidByIds(List.of(trackShipCompanyId), true));
+    }
+
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/BjTrackShipCompany.java

@@ -27,7 +27,7 @@ public class BjTrackShipCompany extends BaseEntity {
      * 重点跟踪航运公司ID
      */
     @TableId("track_ship_company_id")
-    private Long trackShipCompanyId;
+    private String trackShipCompanyId;
 
     /**
      * 发布单位

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/bo/BjTrackShipCompanyBo.java

@@ -25,7 +25,7 @@ public class BjTrackShipCompanyBo extends BaseEntity {
     /**
      * 重点跟踪航运公司ID
      */
-    private Long trackShipCompanyId;
+    private String trackShipCompanyId;
 
     /**
      * 发布单位

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BjTrackShipCompanyVo.java

@@ -24,7 +24,7 @@ public class BjTrackShipCompanyVo implements Serializable {
     /**
      * 重点跟踪航运公司ID
      */
-    private Long trackShipCompanyId;
+    private String trackShipCompanyId;
 
     /**
      * 发布单位

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/IBjTrackShipCompanyService.java

@@ -1,9 +1,9 @@
 package com.ruoyi.business.service;
 
 import com.ruoyi.business.domain.bo.BjTrackShipCompanyBo;
-import com.ruoyi.business.domain.bo.BjTrackShipsBo;
 import com.ruoyi.business.domain.vo.BjTrackShipCompanyVo;
 
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -29,4 +29,29 @@ public interface IBjTrackShipCompanyService {
      * @return 重点跟踪航运公司信息查询分页列表
      */
     List<BjTrackShipCompanyVo> queryPageList(BjTrackShipCompanyBo bo);
+
+    /**
+     * 新增重点跟踪航运公司
+     *
+     * @param bo 重点跟踪航运公司
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(BjTrackShipCompanyBo bo);
+
+    /**
+     * 修改重点跟踪航运公司
+     *
+     * @param bo 重点跟踪航运公司
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(BjTrackShipCompanyBo bo);
+
+    /**
+     * 校验并批量删除重点跟踪航运公司信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
 }

ruoyi-modules/ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BjTrackShipCompanyServiceImpl.java

@@ -1,6 +1,7 @@
 package com.ruoyi.business.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.IdUtil;
 import com.ruoyi.business.domain.BjTrackShipCompany;
 import com.ruoyi.business.domain.bo.BjTrackShipCompanyBo;
 import com.ruoyi.business.domain.vo.BjTrackShipCompanyVo;
@@ -9,8 +10,10 @@ import com.ruoyi.business.service.IBjTrackShipCompanyService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -49,4 +52,59 @@ public class BjTrackShipCompanyServiceImpl implements IBjTrackShipCompanyService
     public List<BjTrackShipCompanyVo> queryPageList(BjTrackShipCompanyBo bo) {
         return baseMapper.queryTrackShipCompanyList(bo);
     }
+
+    /**
+     * 新增重点跟踪航运公司
+     *
+     * @param bo 重点跟踪航运公司
+     * @return 是否新增成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean insertByBo(BjTrackShipCompanyBo bo) {
+        BjTrackShipCompany add = BeanUtil.copyProperties(bo, BjTrackShipCompany.class);
+        String trackShipCompanyId = IdUtil.simpleUUID();
+        if (add != null) {
+            add.setTrackShipCompanyId(trackShipCompanyId);
+        }
+        validEntityBeforeSave(add);
+        return baseMapper.insert(add) > 0;
+    }
+
+    /**
+     * 修改重点跟踪航运公司
+     *
+     * @param bo 重点跟踪航运公司
+     * @return 是否修改成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean updateByBo(BjTrackShipCompanyBo bo) {
+        BjTrackShipCompany update = BeanUtil.copyProperties(bo, BjTrackShipCompany.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(BjTrackShipCompany entity) {
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除重点跟踪航运公司信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
+        if (isValid) {
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
 }