1.新增系统参数查询接口

2.新增系统参数新增或修改接口
3.新增系统参数删除接口

portal-service-application/src/main/java/com/hfln/portal/application/controller/web/WebSystemController.java

@@ -5,11 +5,10 @@ import cn.hfln.framework.catchlog.CatchAndLog;
 import cn.hfln.framework.dto.ApiResult;
 import com.hfln.portal.common.dto.data.menu.MenuListDTO;
 import com.hfln.portal.common.dto.data.menu.MenuTreeDTO;
+import com.hfln.portal.common.dto.data.param.ParameterDTO;
 import com.hfln.portal.common.dto.data.role.RoleListDTO;
 import com.hfln.portal.common.dto.data.rolemenu.RoleMenuTreeDTO;
-import com.hfln.portal.common.request.web.AddMenuParam;
-import com.hfln.portal.common.request.web.AddRoleParam;
-import com.hfln.portal.common.request.web.UpdateMenuParam;
+import com.hfln.portal.common.request.web.*;
 import com.hfln.portal.domain.gateway.WebGateway;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -102,4 +101,24 @@ public class WebSystemController {
         webGateway.OTAUpload(file);
         return ApiResult.success();
     }
+
+    @PostMapping("/parameter/upsert")
+    @Operation(summary = "系统参数新增或修改")
+    public ApiResult<Void> upsertParameter(@RequestBody @Valid ParameterUpsertParam param) {
+        webGateway.upsertParameter(param);
+        return ApiResult.success();
+    }
+
+    @PostMapping("/parameter/delete")
+    @Operation(summary = "系统参数删除")
+    public ApiResult<Void> deleteParameter(@RequestParam Long paramId) {
+        webGateway.deleteParameter(paramId);
+        return ApiResult.success();
+    }
+
+    @PostMapping("/parameter/query")
+    @Operation(summary = "系统参数查询")
+    public ApiResult<List<ParameterDTO>> queryParameter(@RequestBody @Valid ParameterQueryParam param) {
+        return ApiResult.success(webGateway.queryParameter(param));
+    }
 }

portal-service-common/src/main/java/com/hfln/portal/common/request/web/ParameterQueryParam.java

@@ -0,0 +1,13 @@
+package com.hfln.portal.common.request.web;
+
+import com.hfln.portal.common.vo.BaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Data
+public class ParameterQueryParam extends BaseVO {
+
+    @Schema(description = "参数编码")
+    private String paramCode;
+
+}

portal-service-domain/src/main/java/com/hfln/portal/domain/gateway/WebGateway.java

@@ -11,6 +11,7 @@ import com.hfln.portal.common.request.web.*;
 import com.hfln.portal.common.response.admin.AdminLoginRes;
 import com.hfln.portal.common.vo.PageRecord;
 import com.hfln.portal.common.vo.UploadRes;
+import com.hfln.portal.common.dto.data.param.ParameterDTO;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -89,5 +90,14 @@ public interface WebGateway {
     void updateDicItem(UpdateDicItemParam param);
 
     void deleteDicItem(Long ItemId);
+
+    /**
+     * web 参数配置相关
+     */
+    void upsertParameter(ParameterUpsertParam param);
+
+    void deleteParameter(Long paramId);
+
+    List<ParameterDTO> queryParameter(ParameterQueryParam param);
 }
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/config/UserAuthService.java

@@ -35,11 +35,6 @@ public class UserAuthService {
 	@Autowired
 	private TblRoleService tblRoleService;
 
-	@Autowired
-	private RolePermissionService rolePermissionService;
-
-	@Autowired
-	private PermissionService permissionService;
 
 	@Autowired
 	private UserRoleService userRoleService;

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -16,6 +16,7 @@ import com.hfln.portal.common.dto.data.dic.DicDTO;
 import com.hfln.portal.common.dto.data.menu.MenuListDTO;
 import com.hfln.portal.common.dto.data.menu.MenuTreeDTO;
 import com.hfln.portal.common.dto.data.role.RoleListDTO;
+import com.hfln.portal.common.dto.data.param.ParameterDTO;
 import com.hfln.portal.common.dto.data.rolemenu.MenuSimpleTreeDTO;
 import com.hfln.portal.common.dto.data.rolemenu.RoleMenuTreeDTO;
 import com.hfln.portal.common.request.device.DeviceListQueryReq;
@@ -105,6 +106,54 @@ public class WebGatewayImpl implements WebGateway {
     @Autowired
     private OssClient ossClient;
 
+    @Autowired
+    private TblParameterService tblParameterService;
+
+    @Override
+    public void upsertParameter(ParameterUpsertParam param) {
+        // 如果有ID则更新，否则新增
+        if (param.getParamId() != null) {
+            TblParameter exist = tblParameterService.getById(param.getParamId());
+            if (exist == null) {
+                throw new BizException(ErrorEnum.DATA_NOT_EXISTS.getErrorCode(), ErrorEnum.DATA_NOT_EXISTS.getErrorMessage());
+            }
+            exist.setParamCode(param.getParamCode());
+            exist.setParamName(param.getParamName());
+            exist.setParamValue(param.getParamValue());
+            exist.setParamDesc(param.getParamDesc());
+            exist.setRemark(param.getRemark());
+            tblParameterService.updateById(exist);
+        } else {
+            TblParameter entity = new TblParameter();
+            entity.setParamCode(param.getParamCode());
+            entity.setParamName(param.getParamName());
+            entity.setParamValue(param.getParamValue());
+            entity.setParamDesc(param.getParamDesc());
+            entity.setRemark(param.getRemark());
+            entity.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);
+            tblParameterService.save(entity);
+        }
+    }
+
+    @Override
+    public void deleteParameter(Long paramId) {
+        TblParameter exist = tblParameterService.getById(paramId);
+        if (exist == null) {
+            throw new BizException(ErrorEnum.DATA_NOT_EXISTS.getErrorCode(), ErrorEnum.DATA_NOT_EXISTS.getErrorMessage());
+        }
+        exist.setIsDeleted(BasePO.DeleteFlag.DELETED);
+        tblParameterService.removeById(exist);
+    }
+
+    @Override
+    public List<ParameterDTO> queryParameter(ParameterQueryParam param) {
+        List<TblParameter> list = tblParameterService.lambdaQuery()
+                .eq(StringUtils.hasText(param.getParamCode()), TblParameter::getParamCode, param.getParamCode())
+                .eq(TblParameter::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED)
+                .list();
+        return CopyUtils.copyList(list, ParameterDTO.class);
+    }
+
     @Override
     public UploadRes uploadDev(MultipartFile file) throws IOException {
 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblPermissionMapper.java

@@ -1,12 +0,0 @@
-package com.hfln.portal.infrastructure.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hfln.portal.infrastructure.po.TblPermission;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 角色表 Mapper 接口
- */
-@Mapper
-public interface TblPermissionMapper extends BaseMapper<TblPermission> {
-} 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblRolePermissionMapper.java

@@ -1,12 +0,0 @@
-package com.hfln.portal.infrastructure.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hfln.portal.infrastructure.po.TblRolePermission;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 角色表 Mapper 接口
- */
-@Mapper
-public interface TblRolePermissionMapper extends BaseMapper<TblRolePermission> {
-} 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblPermission.java

@@ -1,37 +0,0 @@
-package com.hfln.portal.infrastructure.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 权限表
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("tbl_permission")
-public class TblPermission extends BasePO {
-
-    /**
-     * 主键 ID
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long permId;
-
-    /**
-     * 权限编码
-     */
-    private String permCode;
-
-    /**
-     * 权限名称
-     */
-    private String permName;
-
-    /**
-     * 权限描述
-     */
-    private String permDesc;
-} 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblRolePermission.java

@@ -1,33 +0,0 @@
-package com.hfln.portal.infrastructure.po;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 角色表
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("tbl_role_permission")
-public class TblRolePermission extends BasePO {
-
-    /**
-     * 主键 ID
-     */
-    @TableId(type = IdType.ASSIGN_ID)
-    private Long rolePermId;
-
-    /**
-     * 角色id
-     */
-    private Long roleId;
-
-    /**
-     * 权限id
-     */
-    private Long permId;
-
-} 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/PermissionService.java

@@ -1,12 +0,0 @@
-package com.hfln.portal.infrastructure.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hfln.portal.infrastructure.po.TblPermission;
-
-import java.util.List;
-
-public interface PermissionService extends IService<TblPermission> {
-
-
-    List<TblPermission> findAvailableByIds(List<Long> permIds);
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/RolePermissionService.java

@@ -1,12 +0,0 @@
-package com.hfln.portal.infrastructure.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hfln.portal.infrastructure.po.TblRolePermission;
-
-import java.util.List;
-
-public interface RolePermissionService extends IService<TblRolePermission> {
-
-
-    List<TblRolePermission> findByRoleIds(List<Long> roleIds);
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/PermissionServiceImpl.java

@@ -1,26 +0,0 @@
-package com.hfln.portal.infrastructure.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hfln.portal.infrastructure.mapper.TblPermissionMapper;
-import com.hfln.portal.infrastructure.po.BasePO;
-import com.hfln.portal.infrastructure.po.TblPermission;
-import com.hfln.portal.infrastructure.service.PermissionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-public class PermissionServiceImpl extends ServiceImpl<TblPermissionMapper, TblPermission> implements PermissionService {
-
-
-    @Override
-    public List<TblPermission> findAvailableByIds(List<Long> permIds) {
-        LambdaQueryWrapper<TblPermission> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(TblPermission::getPermId, permIds);
-        queryWrapper.eq(TblPermission::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
-        return this.baseMapper.selectList(queryWrapper);
-    }
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/RolePermissionServiceImpl.java

@@ -1,26 +0,0 @@
-package com.hfln.portal.infrastructure.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hfln.portal.infrastructure.mapper.TblRolePermissionMapper;
-import com.hfln.portal.infrastructure.po.BasePO;
-import com.hfln.portal.infrastructure.po.TblRolePermission;
-import com.hfln.portal.infrastructure.service.RolePermissionService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-public class RolePermissionServiceImpl extends ServiceImpl<TblRolePermissionMapper, TblRolePermission> implements RolePermissionService {
-
-
-    @Override
-    public List<TblRolePermission> findByRoleIds(List<Long> roleIds) {
-        LambdaQueryWrapper<TblRolePermission> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(TblRolePermission::getRoleId, roleIds);
-        queryWrapper.eq(TblRolePermission::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
-        return this.baseMapper.selectList(queryWrapper);
-    }
-}