changes

liuhaonan

2022-10-21 f214709cf1d896e7c9743f206b7a708f020e5322

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java

@@ -4,9 +4,11 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.WaterQualityEquipmentParam;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.WaterQualityEquipmentService;
import com.sandu.ximon.dao.bo.WaterQualityEquipmentBo;
import com.sandu.ximon.dao.domain.WaterQualityEquipment;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -20,6 +22,7 @@
@RequestMapping("/v1/admin/waterqualityequipment")
public class WaterQualityEquipmentController {
    private final WaterQualityEquipmentService waterQualityEquipmentService;
    private PermissionConfig permissionConfig;

    /**
     * 水质设备列表查询
@@ -27,18 +30,25 @@
     * @return
     */
    @GetMapping("/listWaterQualityEquipment")
    public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
    public ResponseVO<Object> listWaterQualityEquipment(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<WaterQualityEquipmentBo> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }

    /**
     * 删除水质设备
     *
     * @param id
     * @return
     */
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
        if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_DETELE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);
        if (result) {
            return ResponseUtil.success("成功删除水质设备");
@@ -49,6 +59,9 @@

    @PostMapping("/add")
    public ResponseVO<Object> addQualityEquipment(@RequestBody WaterQualityEquipment waterQualityEquipment) {
        if (!permissionConfig.check(MenuEnum.WATER_EQUIPMENT_ADD.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = waterQualityEquipmentService.addWaterQualityEquipment(waterQualityEquipment);
        if (result) {
            return ResponseUtil.success("成功添加水质设备");