权限修改

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/AlarmRecordController.java

@@ -13,7 +13,7 @@ import com.zd.common.core.web.controller.BaseController;
 import com.zd.common.core.web.page.TableDataInfo;
 import com.zd.common.log.annotation.Log;
 import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
+import com.zd.common.security.annotation.PreAuthorize;
 import com.zd.system.api.domain.InventoryTag;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -39,7 +39,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     /**
      * 查询报警记录列表
      */
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:list")
+    @PreAuthorize(hasPermi = "airbottle:alarm:record:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询报警记录列表")
     public TableDataInfo<AlarmRecordVo> list(AlarmRecord alarmRecord) {
@@ -67,7 +67,7 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
      * 导出报警记录列表
      */
     @ApiOperation(value = "导出报警记录列表")
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:export")
+    @PreAuthorize(hasPermi = "airbottle:alarm:record:export")
     @Log(title = "报警记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, AlarmRecord alarmRecord) throws IOException {
@@ -90,27 +90,6 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
     }
 
     /**
-     * 获取报警记录详细信息
-     */
-    @ApiOperation(value = "获取报警记录详细信息")
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:query")
-    @GetMapping(value = "/{id}")
-    public ResultData<AlarmRecord> getInfo(@PathVariable("id") Long id) {
-        return ResultData.success(alarmRecordService.selectAlarmRecordById(id));
-    }
-
-    /**
-     * 新增报警记录
-     */
-    @ApiOperation(value = "新增报警记录")
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:add")
-    @Log(title = "报警记录", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody AlarmRecord alarmRecord) {
-        return ResultData.result(alarmRecordService.insertAlarmRecord(alarmRecord));
-    }
-
-    /**
      * 识别器新增报警记录
      */
     @ApiOperation(value = "识别器新增报警记录")
@@ -120,26 +99,4 @@ public class AlarmRecordController extends BaseController<AlarmRecord> {
         alarmRecordService.remoteAdd(tag);
         return R.ok();
     }
-
-    /**
-     * 修改报警记录
-     */
-    @ApiOperation(value = "修改报警记录")
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:edit")
-    @Log(title = "报警记录", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody AlarmRecord alarmRecord) {
-        return ResultData.result(alarmRecordService.updateAlarmRecord(alarmRecord));
-    }
-
-    /**
-     * 删除报警记录
-     */
-    @ApiOperation(value = "删除报警记录")
-//    @PreAuthorize(hasPermi = "airbottle:alarm:record:remove")
-    @Log(title = "报警记录", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids) {
-        return ResultData.result(alarmRecordService.deleteAlarmRecordByIds(ids));
-    }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpAirBottleConfigController.java

@@ -1,107 +0,0 @@
-package com.zd.airbottle.controller;
-
-import com.zd.airbottle.domain.QpAirBottleConfig;
-import com.zd.airbottle.service.IQpAirBottleConfigService;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 气瓶配置Controller
- * 
- * @author zd
- * @date 2022-05-17
- */
-@RestController
-@Api(tags = "【气瓶配置】")
-@RequestMapping("/config")
-public class QpAirBottleConfigController extends BaseController
-{
-    @Autowired
-    private IQpAirBottleConfigService qpAirBottleConfigService;
-
-    /**
-     * 查询气瓶配置列表
-     */
-//    @PreAuthorize(hasPermi = "airbottle:config:list")
-    @GetMapping("/list")
-    @ApiOperation(value = "查询气瓶配置列表")
-    public TableDataInfo<QpAirBottleConfig> list(QpAirBottleConfig qpAirBottleConfig)
-    {
-        startPage();
-        List<QpAirBottleConfig> list = qpAirBottleConfigService.selectQpAirBottleConfigList(qpAirBottleConfig);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出气瓶配置列表
-     */
-    @ApiOperation(value = "导出气瓶配置列表")
-//    @PreAuthorize(hasPermi = "airbottle:config:export")
-    @Log(title = "气瓶配置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QpAirBottleConfig qpAirBottleConfig) throws IOException
-    {
-        List<QpAirBottleConfig> list = qpAirBottleConfigService.selectQpAirBottleConfigList(qpAirBottleConfig);
-        ExcelUtil<QpAirBottleConfig> util = new ExcelUtil<>(QpAirBottleConfig.class);
-        util.exportExcel(response, list, "气瓶配置数据");
-    }
-
-    /**
-     * 获取气瓶配置详细信息
-     */
-    @ApiOperation(value = "获取气瓶配置详细信息")
-//    @PreAuthorize(hasPermi = "airbottle:config:query")
-    @GetMapping(value = "/{id}")
-    public ResultData<QpAirBottleConfig> getInfo(@PathVariable("id") Long id)
-    {
-        return ResultData.success(qpAirBottleConfigService.selectQpAirBottleConfigById(id));
-    }
-
-    /**
-     * 新增气瓶配置
-     */
-    @ApiOperation(value = "新增气瓶配置")
-//    @PreAuthorize(hasPermi = "airbottle:config:add")
-    @Log(title = "气瓶配置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody QpAirBottleConfig qpAirBottleConfig)
-    {
-        return ResultData.result(qpAirBottleConfigService.insertQpAirBottleConfig(qpAirBottleConfig));
-    }
-
-    /**
-     * 修改气瓶配置
-     */
-    @ApiOperation(value = "修改气瓶配置")
-//    @PreAuthorize(hasPermi = "airbottle:config:edit")
-    @Log(title = "气瓶配置", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody QpAirBottleConfig qpAirBottleConfig)
-    {
-        return  ResultData.result(qpAirBottleConfigService.updateQpAirBottleConfig(qpAirBottleConfig));
-    }
-
-    /**
-     * 删除气瓶配置
-     */
-    @ApiOperation(value = "删除气瓶配置")
-//    @PreAuthorize(hasPermi = "airbottle:config:remove")
-    @Log(title = "气瓶配置", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids)
-    {
-        return ResultData.result(qpAirBottleConfigService.deleteQpAirBottleConfigByIds(ids));
-    }
-}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpAirBottleController.java

@@ -33,6 +33,7 @@ public class QpAirBottleController extends BaseController<QpAirBottle> {
      * 查询气瓶列表
      */
     @GetMapping("/list")
+    @PreAuthorize(hasPermi = "airbottle:bottle:list")
     @ApiOperation(value = "查询气瓶列表")
     public TableDataInfo<QpAirBottleRVo> list(QpAirBottle qpAirBottle) {
         startPage("create_time", "descending");

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpAirGoodsConfigController.java

@@ -4,15 +4,14 @@ import com.zd.airbottle.domain.QpAirGoodsConfig;
 import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
 import com.zd.airbottle.service.IQpAirGoodsConfigService;
 import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
 import com.zd.common.response.ResultData;
-import com.zd.common.security.annotation.PreAuthorize;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+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 java.util.List;
 
@@ -30,18 +29,6 @@ public class QpAirGoodsConfigController extends BaseController<QpAirGoodsConfig>
     private IQpAirGoodsConfigService qpAirGoodsConfigService;
 
     /**
-     * 查询货物配置列表
-     */
-    @PreAuthorize(hasPermi = "airbottle:goods:list")
-    @GetMapping("/list")
-    @ApiOperation(value = "查询货物配置列表")
-    public TableDataInfo<QpAirGoodsConfig> list(QpAirGoodsConfig qpAirGoodsConfig) {
-        startPage();
-        List<QpAirGoodsConfig> list = qpAirGoodsConfigService.selectQpAirGoodsConfigList(qpAirGoodsConfig);
-        return getDataTable(list);
-    }
-
-    /**
      * 获取货物配置详细信息
      */
     @ApiOperation(value = "获取货物配置详细信息")
@@ -49,37 +36,4 @@ public class QpAirGoodsConfigController extends BaseController<QpAirGoodsConfig>
     public ResultData<List<QpAirGoodsConfigVo>> getInfo(@PathVariable("id") Long goodsId) {
         return ResultData.success(qpAirGoodsConfigService.getGoodsInfo(goodsId));
     }
-
-    /**
-     * 新增货物配置
-     */
-    @ApiOperation(value = "新增货物配置")
-    @PreAuthorize(hasPermi = "airbottle:goods:add")
-    @Log(title = "货物配置", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody QpAirGoodsConfig qpAirGoodsConfig) {
-        return ResultData.result(qpAirGoodsConfigService.insertQpAirGoodsConfig(qpAirGoodsConfig));
-    }
-
-    /**
-     * 修改货物配置
-     */
-    @ApiOperation(value = "修改货物配置")
-    @PreAuthorize(hasPermi = "airbottle:goods:edit")
-    @Log(title = "货物配置", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody QpAirGoodsConfig qpAirGoodsConfig) {
-        return ResultData.result(qpAirGoodsConfigService.updateQpAirGoodsConfig(qpAirGoodsConfig));
-    }
-
-    /**
-     * 删除货物配置
-     */
-    @ApiOperation(value = "删除货物配置")
-    @PreAuthorize(hasPermi = "airbottle:goods:remove")
-    @Log(title = "货物配置", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids) {
-        return ResultData.result(qpAirGoodsConfigService.deleteQpAirGoodsConfigByIds(ids));
-    }
 }

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpSpecificationDetailController.java

@@ -1,108 +0,0 @@
-package com.zd.airbottle.controller;
-
-import com.zd.airbottle.domain.QpSpecificationDetail;
-import com.zd.airbottle.service.IQpSpecificationDetailService;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
-import com.zd.common.security.annotation.PreAuthorize;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 气瓶规格详情Controller
- * 
- * @author zd
- * @date 2022-05-17
- */
-@RestController
-@Api(tags = "【气瓶规格详情】")
-@RequestMapping("/specification/detail")
-public class QpSpecificationDetailController extends BaseController<QpSpecificationDetail>
-{
-    @Autowired
-    private IQpSpecificationDetailService qpSpecificationDetailService;
-
-    /**
-     * 查询气瓶规格详情列表
-     */
-    @PreAuthorize(hasPermi = "airbottle:specification:list")
-    @GetMapping("/list")
-    @ApiOperation(value = "查询气瓶规格详情列表")
-    public TableDataInfo<QpSpecificationDetail> list(QpSpecificationDetail qpSpecificationDetail)
-    {
-        startPage();
-        List<QpSpecificationDetail> list = qpSpecificationDetailService.selectQpSpecificationDetailList(qpSpecificationDetail);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出气瓶规格详情列表
-     */
-    @ApiOperation(value = "导出气瓶规格详情列表")
-    @PreAuthorize(hasPermi = "airbottle:specification:export")
-    @Log(title = "气瓶规格详情", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QpSpecificationDetail qpSpecificationDetail) throws IOException
-    {
-        List<QpSpecificationDetail> list = qpSpecificationDetailService.selectQpSpecificationDetailList(qpSpecificationDetail);
-        ExcelUtil<QpSpecificationDetail> util = new ExcelUtil<>(QpSpecificationDetail.class);
-        util.exportExcel(response, list, "气瓶规格详情数据");
-    }
-
-    /**
-     * 获取气瓶规格详情详细信息
-     */
-    @ApiOperation(value = "获取气瓶规格详情详细信息")
-    @PreAuthorize(hasPermi = "airbottle:specification:query")
-    @GetMapping(value = "/{id}")
-    public ResultData<QpSpecificationDetail> getInfo(@PathVariable("id") Long id)
-    {
-        return ResultData.success(qpSpecificationDetailService.selectQpSpecificationDetailById(id));
-    }
-
-    /**
-     * 新增气瓶规格详情
-     */
-    @ApiOperation(value = "新增气瓶规格详情")
-    @PreAuthorize(hasPermi = "airbottle:specification:add")
-    @Log(title = "气瓶规格详情", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody QpSpecificationDetail qpSpecificationDetail)
-    {
-        return ResultData.result(qpSpecificationDetailService.insertQpSpecificationDetail(qpSpecificationDetail));
-    }
-
-    /**
-     * 修改气瓶规格详情
-     */
-    @ApiOperation(value = "修改气瓶规格详情")
-    @PreAuthorize(hasPermi = "airbottle:specification:edit")
-    @Log(title = "气瓶规格详情", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody QpSpecificationDetail qpSpecificationDetail)
-    {
-        return  ResultData.result(qpSpecificationDetailService.updateQpSpecificationDetail(qpSpecificationDetail));
-    }
-
-    /**
-     * 删除气瓶规格详情
-     */
-    @ApiOperation(value = "删除气瓶规格详情")
-    @PreAuthorize(hasPermi = "airbottle:specification:remove")
-    @Log(title = "气瓶规格详情", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids)
-    {
-        return ResultData.result(qpSpecificationDetailService.deleteQpSpecificationDetailByIds(ids));
-    }
-}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpSupplierController.java

@@ -45,7 +45,7 @@ public class QpSupplierController extends BaseController<QpSupplier> {
     /**
      * 查询供应商列表
      */
-//    @PreAuthorize(hasPermi = "airbottle:supplier:list",hasAnyPermi = "system:user:query")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询供应商列表", notes = "此接口默认查询审核通过的供应商，若需查询待审核供应商，请传参数 state=1，, 权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER + PerFun.LIST)
     public TableDataInfo<QpSupplierVo> list(QpSupplier qpSupplier) {
@@ -70,7 +70,7 @@ public class QpSupplierController extends BaseController<QpSupplier> {
     /**
      * 查询供应商待审核列表
      */
-//    @PreAuthorize(hasPermi = "airbottle:supplier:list",hasAnyPermi = "system:user:query")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @GetMapping("/checkList")
     @ApiOperation(value = "查询供应商待审核列表", notes = "权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER + PerFun.LIST)
     public TableDataInfo<QpSupplier> checkList(QpSupplier qpSupplier) {
@@ -84,7 +84,7 @@ public class QpSupplierController extends BaseController<QpSupplier> {
      * 导出供应商列表
      */
     @ApiOperation(value = "导出供应商列表", notes = "权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER + PerFun.EXPORT)
-//    @PreAuthorize(hasPermi = "airbottle:supplier:export",hasAnyPermi = "system:user:query")
+    @PreAuthorize(hasPermi = "airbottle:supplier:export")
     @Log(title = "供应商", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, QpSupplier qpSupplier) throws IOException {
@@ -162,7 +162,7 @@ public class QpSupplierController extends BaseController<QpSupplier> {
      * 小程序修改供应商
      */
     @ApiOperation(value = "小程序修改供应商", notes = "权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER + PerFun.EDIT)
-//    @PreAuthorize(hasPermi = "airbottle:supplier:edit",hasAnyPermi = "system:user:query")
+    @PreAuthorize(hasPermi = "airbottle:supplier:edit")
     @Log(title = "供应商", businessType = BusinessType.UPDATE)
     @PutMapping
     public ResultData<Boolean> edit(@RequestBody @Valid QpSupplierDto qpSupplierDto) {
@@ -195,7 +195,7 @@ public class QpSupplierController extends BaseController<QpSupplier> {
      * 删除供应商
      */
     @ApiOperation(value = "删除供应商", notes = "权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER + PerFun.REMOVE)
-//    @PreAuthorize(hasPermi = "airbottle:supplier:remove",hasAnyPermi = "system:user:query")
+    @PreAuthorize(hasPermi = "airbottle:supplier:remove")
     @Log(title = "供应商", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public ResultData<Boolean> remove(@PathVariable Long[] ids) {

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpSupplierSyntheticalAuditController.java

@@ -35,7 +35,7 @@ public class QpSupplierSyntheticalAuditController extends BaseController<QpSuppl
     /**
      * 查询供应商综合审核列表
      */
-//    @PreAuthorize(hasPermi = "airbottle:supplier:list")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @GetMapping("/list")
     @ApiOperation(value = "查询供应商综合审核列表", notes = "权限字符：" + PerPrefix.MODULE_AIRBOTTLE + PerPrefix.BUSINESS_SUPPLIER_AUDIT + PerFun.LIST)
     public TableDataInfo<QpSupplierSyntheticalAuditVo> list(QpSupplierSyntheticalAudit qpSupplierSyntheticalAudit) {

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTransportCarController.java

@@ -32,6 +32,7 @@ public class QpTransportCarController extends BaseController<QpTransportCar> {
      * 查询运输车辆列表
      */
     @GetMapping("/list")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @ApiOperation(value = "查询运输车辆列表")
     public ResultData<List<QpTransportCarVo>> list(QpTransportCar qpTransportCar) {
         return ResultData.success(qpTransportCarService.getCarList(qpTransportCar));
@@ -41,6 +42,7 @@ public class QpTransportCarController extends BaseController<QpTransportCar> {
      * 供应商端运输车辆列表
      */
     @GetMapping("/supplier/list")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @ApiOperation(value = "供应商端运输车辆列表")
     public ResultData<List<QpTransportCarVo>> supplierList(QpTransportCar qpTransportCar) {
         return ResultData.success(qpTransportCarService.getSupplierCarList(qpTransportCar));
@@ -50,6 +52,7 @@ public class QpTransportCarController extends BaseController<QpTransportCar> {
      * 待审核运输车辆列表
      */
     @GetMapping("/checkList")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @ApiOperation(value = "待审核运输车辆列表")
     public TableDataInfo<QpTransportCarVo> checkList(QpTransportCar transportCar) {
         startPage("create_time", null);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTransportCarCredentialsController.java

@@ -1,100 +0,0 @@
-package com.zd.airbottle.controller;
-
-import com.zd.airbottle.domain.QpTransportCarCredentials;
-import com.zd.airbottle.service.IQpTransportCarCredentialsService;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
-import com.zd.common.security.annotation.PreAuthorize;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 运输车辆证件Controller
- *
- * @author zd
- * @date 2022-05-12
- */
-@RestController
-@Api(tags = "【运输车辆证件】")
-@RequestMapping("/carCredentials")
-public class QpTransportCarCredentialsController extends BaseController<QpTransportCarCredentials> {
-    @Autowired
-    private IQpTransportCarCredentialsService qpTransportCarCredentialsService;
-
-    /**
-     * 查询运输车辆证件列表
-     */
-    @PreAuthorize(hasPermi = "airbottle:supplier:list")
-    @GetMapping("/list")
-    @ApiOperation(value = "查询运输车辆证件列表")
-    public TableDataInfo<QpTransportCarCredentials> list(QpTransportCarCredentials qpTransportCarCredentials) {
-        startPage();
-        return getDataTable(qpTransportCarCredentialsService.selectQpTransportCarCredentialsList(qpTransportCarCredentials));
-    }
-
-    /**
-     * 导出运输车辆证件列表
-     */
-    @ApiOperation(value = "导出运输车辆证件列表")
-    @PreAuthorize(hasPermi = "airbottle:supplier:export")
-    @Log(title = "运输车辆证件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QpTransportCarCredentials qpTransportCarCredentials) throws IOException {
-        List<QpTransportCarCredentials> list = qpTransportCarCredentialsService.selectQpTransportCarCredentialsList(qpTransportCarCredentials);
-        ExcelUtil<QpTransportCarCredentials> util = new ExcelUtil<>(QpTransportCarCredentials.class);
-        util.exportExcel(response, list, "运输车辆证件数据");
-    }
-
-    /**
-     * 获取运输车辆证件详细信息
-     */
-    @ApiOperation(value = "获取运输车辆证件详细信息")
-    @PreAuthorize(hasPermi = "airbottle:supplier:query")
-    @GetMapping(value = "/{id}")
-    public ResultData<QpTransportCarCredentials> getInfo(@PathVariable("id") Long id) {
-        return ResultData.success(qpTransportCarCredentialsService.selectQpTransportCarCredentialsById(id));
-    }
-
-    /**
-     * 新增运输车辆证件
-     */
-    @ApiOperation(value = "新增运输车辆证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:add")
-    @Log(title = "运输车辆证件", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody QpTransportCarCredentials qpTransportCarCredentials) {
-        return ResultData.result(qpTransportCarCredentialsService.insertQpTransportCarCredentials(qpTransportCarCredentials));
-    }
-
-    /**
-     * 修改运输车辆证件
-     */
-    @ApiOperation(value = "修改运输车辆证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:edit")
-    @Log(title = "运输车辆证件", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody QpTransportCarCredentials qpTransportCarCredentials) {
-        return ResultData.result(qpTransportCarCredentialsService.updateQpTransportCarCredentials(qpTransportCarCredentials));
-    }
-
-    /**
-     * 删除运输车辆证件
-     */
-    @ApiOperation(value = "删除运输车辆证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:remove")
-    @Log(title = "运输车辆证件", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids) {
-        return ResultData.result(qpTransportCarCredentialsService.deleteQpTransportCarCredentialsByIds(ids));
-    }
-}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTransportUserController.java

@@ -32,6 +32,7 @@ public class QpTransportUserController extends BaseController<QpTransportUser> {
      * 查询运输人员列表
      */
     @GetMapping("/list")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @ApiOperation(value = "查询运输人员列表")
     public ResultData<List<QpTransportUserVo>> list(QpTransportUser qpTransportUser) {
         return ResultData.success(qpTransportUserService.getTransportUserList(qpTransportUser));
@@ -50,6 +51,7 @@ public class QpTransportUserController extends BaseController<QpTransportUser> {
      * 审核运输人员列表
      */
     @GetMapping("/checkList")
+    @PreAuthorize(hasPermi = "airbottle:supplier:list")
     @ApiOperation(value = "审核运输人员列表")
     public TableDataInfo<QpTransportUserVo> checkList(QpTransportUser transportUser) {
         startPage("create_time", null);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/controller/QpTransportUserCredentialsController.java

@@ -1,101 +0,0 @@
-package com.zd.airbottle.controller;
-
-import com.zd.airbottle.domain.QpTransportUserCredentials;
-import com.zd.airbottle.service.IQpTransportUserCredentialsService;
-import com.zd.common.core.utils.poi.ExcelUtil;
-import com.zd.common.core.web.controller.BaseController;
-import com.zd.common.core.web.page.TableDataInfo;
-import com.zd.common.log.annotation.Log;
-import com.zd.common.log.enums.BusinessType;
-import com.zd.common.response.ResultData;
-import com.zd.common.security.annotation.PreAuthorize;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
-import java.util.List;
-
-/**
- * 运输人员证件Controller
- *
- * @author zd
- * @date 2022-05-12
- */
-@RestController
-@Api(tags = "【运输人员证件】")
-@RequestMapping("/userCredentials")
-public class QpTransportUserCredentialsController extends BaseController<QpTransportUserCredentials> {
-    @Autowired
-    private IQpTransportUserCredentialsService qpTransportUserCredentialsService;
-
-    /**
-     * 查询运输人员证件列表
-     */
-    @PreAuthorize(hasPermi = "airbottle:supplier:list")
-    @GetMapping("/list")
-    @ApiOperation(value = "查询运输人员证件列表")
-    public TableDataInfo<QpTransportUserCredentials> list(QpTransportUserCredentials qpTransportUserCredentials) {
-        startPage();
-        List<QpTransportUserCredentials> list = qpTransportUserCredentialsService.selectQpTransportUserCredentialsList(qpTransportUserCredentials);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出运输人员证件列表
-     */
-    @ApiOperation(value = "导出运输人员证件列表")
-    @PreAuthorize(hasPermi = "airbottle:supplier:export")
-    @Log(title = "运输人员证件", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, QpTransportUserCredentials qpTransportUserCredentials) throws IOException {
-        List<QpTransportUserCredentials> list = qpTransportUserCredentialsService.selectQpTransportUserCredentialsList(qpTransportUserCredentials);
-        ExcelUtil<QpTransportUserCredentials> util = new ExcelUtil<>(QpTransportUserCredentials.class);
-        util.exportExcel(response, list, "运输人员证件数据");
-    }
-
-    /**
-     * 获取运输人员证件详细信息
-     */
-    @ApiOperation(value = "获取运输人员证件详细信息")
-    @PreAuthorize(hasPermi = "airbottle:supplier:query")
-    @GetMapping(value = "/{id}")
-    public ResultData<QpTransportUserCredentials> getInfo(@PathVariable("id") Long id) {
-        return ResultData.success(qpTransportUserCredentialsService.selectQpTransportUserCredentialsById(id));
-    }
-
-    /**
-     * 新增运输人员证件
-     */
-    @ApiOperation(value = "新增运输人员证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:add")
-    @Log(title = "运输人员证件", businessType = BusinessType.INSERT)
-    @PostMapping
-    public ResultData<Boolean> add(@RequestBody QpTransportUserCredentials qpTransportUserCredentials) {
-        return ResultData.result(qpTransportUserCredentialsService.insertQpTransportUserCredentials(qpTransportUserCredentials));
-    }
-
-    /**
-     * 修改运输人员证件
-     */
-    @ApiOperation(value = "修改运输人员证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:edit")
-    @Log(title = "运输人员证件", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public ResultData<Boolean> edit(@RequestBody QpTransportUserCredentials qpTransportUserCredentials) {
-        return ResultData.result(qpTransportUserCredentialsService.updateQpTransportUserCredentials(qpTransportUserCredentials));
-    }
-
-    /**
-     * 删除运输人员证件
-     */
-    @ApiOperation(value = "删除运输人员证件")
-    @PreAuthorize(hasPermi = "airbottle:supplier:remove")
-    @Log(title = "运输人员证件", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public ResultData<Boolean> remove(@PathVariable Long[] ids) {
-        return ResultData.result(qpTransportUserCredentialsService.deleteQpTransportUserCredentialsByIds(ids));
-    }
-}

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IAlarmRecordService.java

@@ -10,19 +10,10 @@ import java.util.List;
 /**
  * 报警记录Service接口
  */
-public interface IAlarmRecordService 
-{
-    /**
-     * 查询报警记录
-     * 
-     * @param id 报警记录主键
-     * @return 报警记录
-     */
-    AlarmRecord selectAlarmRecordById(Long id);
-
+public interface IAlarmRecordService {
     /**
      * 查询报警记录列表
-     * 
+     *
      * @param alarmRecord 报警记录
      * @return 报警记录集合
      */
@@ -38,44 +29,22 @@ public interface IAlarmRecordService
 
     /**
      * 新增报警记录
-     * 
+     *
      * @param alarmRecord 报警记录
      * @return 结果
      */
     int insertAlarmRecord(AlarmRecord alarmRecord);
 
     /**
-     * 修改报警记录
-     * 
-     * @param alarmRecord 报警记录
-     * @return 结果
-     */
-    int updateAlarmRecord(AlarmRecord alarmRecord);
-
-    /**
-     * 批量删除报警记录
-     * 
-     * @param ids 需要删除的报警记录主键集合
-     * @return 结果
-     */
-    int deleteAlarmRecordByIds(Long[] ids);
-
-    /**
-     * 删除报警记录信息
-     * 
-     * @param id 报警记录主键
-     * @return 结果
-     */
-    int deleteAlarmRecordById(Long id);
-
-    /**
      * 获取拓展信息
+     *
      * @param recordVos 数据源
      */
     void getRecordInfo(List<AlarmRecordVo> recordVos);
 
     /**
      * 远程调用信息报警记录
+     *
      * @param tag 标签值
      */
     void remoteAdd(InventoryTag tag);

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/IQpAirGoodsConfigService.java

@@ -9,15 +9,14 @@ import com.zd.airbottle.domain.vo.QpAirGoodsConfigVo;
 
 /**
  * 货物配置Service接口
- * 
+ *
  * @author zd
  * @date 2022-05-17
  */
-public interface IQpAirGoodsConfigService 
-{
+public interface IQpAirGoodsConfigService {
     /**
      * 查询货物配置
-     * 
+     *
      * @param id 货物配置主键
      * @return 货物配置
      */
@@ -25,7 +24,7 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 查询货物配置列表
-     * 
+     *
      * @param qpAirGoodsConfig 货物配置
      * @return 货物配置集合
      */
@@ -33,7 +32,7 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 新增货物配置
-     * 
+     *
      * @param qpAirGoodsConfig 货物配置
      * @return 结果
      */
@@ -41,7 +40,7 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 修改货物配置
-     * 
+     *
      * @param qpAirGoodsConfig 货物配置
      * @return 结果
      */
@@ -49,7 +48,7 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 批量删除货物配置
-     * 
+     *
      * @param ids 需要删除的货物配置主键集合
      * @return 结果
      */
@@ -64,15 +63,8 @@ public interface IQpAirGoodsConfigService
     int deleteByGoogsIds(Long[] ids);
 
     /**
-     * 删除货物配置信息
-     * 
-     * @param id 货物配置主键
-     * @return 结果
-     */
-    int deleteQpAirGoodsConfigById(Long id);
-
-    /**
      * 根据货品ID集合查询货品配置
+     *
      * @param googsIds 货品ID集合
      * @return 货品配置集合
      */
@@ -80,20 +72,20 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 根据配置ID查找其所有上级及其本身，此处待优化，尚未想到合理的方式可以根据配置ID集合批量逆向查询其所有上级
+     *
      * @param configIds 配置ID集合
      * @return 以配置ID为key的map集合
      */
-    Map<Long,QpAirGoodsConfigVo> getInfoByConfigIds(List<Long> configIds);
+    Map<Long, QpAirGoodsConfigVo> getInfoByConfigIds(List<Long> configIds);
 
     /***
      * 查询供应商配置的气瓶
-     * @param relationVo
-     * @return
      */
     List<QpAirGoodsConfigRelationVo> selectQpAirGoodsConfigRelationList(QpAirGoodsConfigRelationVo relationVo);
 
     /**
      * 获取货物配置信息
+     *
      * @param goodsId 货物ID
      * @return 货物配置
      */
@@ -101,6 +93,7 @@ public interface IQpAirGoodsConfigService
 
     /**
      * 根据ID集合查询货品配置
+     *
      * @param ids 货品ID集合
      * @return 货品配置集合
      */

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/AlarmRecordServiceImpl.java

@@ -65,17 +65,6 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
     private static final String FRID_CODE = "FRID:";
 
     /**
-     * 查询报警记录
-     *
-     * @param id 报警记录主键
-     * @return 报警记录
-     */
-    @Override
-    public AlarmRecord selectAlarmRecordById(Long id) {
-        return alarmRecordMapper.selectAlarmRecordById(id);
-    }
-
-    /**
      * 查询报警记录列表
      *
      * @param alarmRecord 报警记录
@@ -208,42 +197,6 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         }
     }
 
-    /**
-     * 修改报警记录
-     *
-     * @param alarmRecord 报警记录
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int updateAlarmRecord(AlarmRecord alarmRecord) {
-        return alarmRecordMapper.updateAlarmRecord(alarmRecord);
-    }
-
-    /**
-     * 批量删除报警记录
-     *
-     * @param ids 需要删除的报警记录主键
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteAlarmRecordByIds(Long[] ids) {
-        return alarmRecordMapper.deleteAlarmRecordByIds(ids);
-    }
-
-    /**
-     * 删除报警记录信息
-     *
-     * @param id 报警记录主键
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteAlarmRecordById(Long id) {
-        return alarmRecordMapper.deleteAlarmRecordById(id);
-    }
-
     @Override
     public void getRecordInfo(List<AlarmRecordVo> recordVos) {
         List<Long> masterIds = recordVos.stream().filter(alarmRecordVo -> alarmRecordVo.getProductType() == 1).map(AlarmRecordVo::getMasterId).collect(Collectors.toList());

zd-modules/zd-airbottle/src/main/java/com/zd/airbottle/service/impl/QpAirGoodsConfigServiceImpl.java

@@ -89,18 +89,6 @@ public class QpAirGoodsConfigServiceImpl implements IQpAirGoodsConfigService {
         return qpAirGoodsConfigMapper.deleteByGoogsIds(googsIds);
     }
 
-    /**
-     * 删除货物配置信息
-     *
-     * @param id 货物配置主键
-     * @return 结果
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public int deleteQpAirGoodsConfigById(Long id) {
-        return qpAirGoodsConfigMapper.deleteQpAirGoodsConfigById(id);
-    }
-
     @Override
     public List<QpAirGoodsConfig> getListByGoogsIds(List<Long> googsIds) {
         return qpAirGoodsConfigMapper.getListByGoogsIds(googsIds);