基础设置信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/clock/BasicInfoController.java

@@ -1,6 +1,7 @@
 package com.ruoyi.web.controller.clock;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.ruoyi.clock.domain.BasicInfo;
 import com.ruoyi.clock.domain.bo.BasicInfoBo;
 import com.ruoyi.clock.domain.vo.BasicInfoVo;
 import com.ruoyi.clock.service.IBasicInfoService;
@@ -18,6 +19,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -43,26 +45,14 @@ public class BasicInfoController extends BaseController {
 
     private final IBasicInfoService iBasicInfoService;
 
-    /**
-     * 分页查询基础设置列表
-     */
-    @ApiOperation("查询基础设置列表")
-    @SaCheckPermission("clock:basicInfo:list")
-    @GetMapping("/page")
-    public TableDataInfo<BasicInfoVo> page(@Validated(QueryGroup.class) BasicInfoBo bo, PageQuery pageQuery) {
-        return iBasicInfoService.queryPageList(bo, pageQuery);
-    }
-
     /**
      * 获取基础设置详细信息
+     * @return
      */
-    @ApiOperation("获取基础设置详细信息")
-    @SaCheckPermission("clock:basicInfo:query")
-    @GetMapping("/info/{basicId}")
-    public R<BasicInfoVo> getInfo(@ApiParam("主键")
-                                                  @NotNull(message = "主键不能为空")
-                                                  @PathVariable("basicId") Long basicId) {
-        return R.ok(iBasicInfoService.queryById(basicId));
+    @ApiOperation("用户协议配置-通过id查询")
+    @GetMapping(value = "/queryInfo")
+    public R<BasicInfo> queryInfo() {
+        return R.ok(iBasicInfoService.queryBasicInfo());
     }
 
     /**
@@ -74,44 +64,7 @@ public class BasicInfoController extends BaseController {
     @RepeatSubmit()
     @PostMapping("/add")
     public R<Void> add(@Validated(AddGroup.class) @RequestBody BasicInfoBo bo) {
-        return toAjax(iBasicInfoService.insertByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 修改基础设置
-     */
-    @ApiOperation("修改基础设置")
-    @SaCheckPermission("clock:basicInfo:edit")
-    @Log(title = "基础设置", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PostMapping("/edit")
-    public R<Void> edit(@Validated(EditGroup.class) @RequestBody BasicInfoBo bo) {
-        return toAjax(iBasicInfoService.updateByBo(bo) ? 1 : 0);
-    }
-
-    /**
-     * 删除基础设置
-     */
-    @ApiOperation("删除基础设置")
-    @SaCheckPermission("clock:basicInfo:remove")
-    @Log(title = "基础设置", businessType = BusinessType.DELETE)
-    @PostMapping("/del/{basicIds}")
-    public R<Void> remove(@ApiParam("主键串")
-                                       @NotEmpty(message = "主键不能为空")
-                                       @PathVariable Long[] basicIds) {
-        return toAjax(iBasicInfoService.deleteWithValidByIds(Arrays.asList(basicIds), true) ? 1 : 0);
-    }
-
-    /**
-     * 导出基础设置列表
-     */
-    @ApiOperation("导出基础设置列表")
-    @SaCheckPermission("clock:basicInfo:export")
-    @Log(title = "基础设置", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(@Validated BasicInfoBo bo, HttpServletResponse response) {
-        List<BasicInfoVo> list = iBasicInfoService.queryList(bo);
-        ExcelUtil.exportExcel(list, "基础设置", BasicInfoVo.class, response);
+        return toAjax(iBasicInfoService.saveBasicInfo(bo) ? 1 : 0);
     }
 
 }

ruoyi-system/src/main/java/com/ruoyi/clock/domain/bo/ProductBo.java

@@ -24,7 +24,8 @@ import com.ruoyi.common.core.domain.BaseEntity;
 @ApiModel("产品信息业务对象")
 public class ProductBo extends BaseEntity {
 
-
+    @ApiModelProperty(value = "产品id", required = true)
+    private Long productId;
     /**
      * 产品名称
      */

ruoyi-system/src/main/java/com/ruoyi/clock/service/IBasicInfoService.java

@@ -1,13 +1,8 @@
 package com.ruoyi.clock.service;
 
 import com.ruoyi.clock.domain.BasicInfo;
-import com.ruoyi.clock.domain.vo.BasicInfoVo;
 import com.ruoyi.clock.domain.bo.BasicInfoBo;
-import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.domain.PageQuery;
-
-import java.util.Collection;
-import java.util.List;
+import com.ruoyi.clock.domain.vo.BasicInfoVo;
 
 /**
  * 基础设置Service接口
@@ -18,60 +13,16 @@ import java.util.List;
 public interface IBasicInfoService {
 
     /**
-     * 查询基础设置分页
-     *
-     * @param bo 基础设置
-     * @return 基础设置集合
-     */
-    TableDataInfo<BasicInfoVo> queryPageList(BasicInfoBo bo, PageQuery pageQuery);
-
-    /**
-     * 查询基础设置列表
-     *
-     * @param bo 基础设置
-     * @return 基础设置集合
-     */
-    List<BasicInfoVo> queryList(BasicInfoBo bo);
-
-    /**
-     * 查询基础设置
-     *
-     * @param basicId 基础设置主键
+     * 查询基础设置*
      * @return 基础设置
      */
-    BasicInfoVo queryById(Long basicId);
-
-    /**
-     * 详情基础设置
-     *
-     * @param basicId 基础设置主键
-     * @return 基础设置
-     */
-    BasicInfo loadById(Long basicId, Boolean tw);
-
-    /**
-     * 新增基础设置
-     *
-     * @param bo 基础设置
-     * @return 结果
-     */
-    Boolean insertByBo(BasicInfoBo bo);
-
-    /**
-     * 修改基础设置
-     *
-     * @param bo 基础设置
-     * @return 结果
-     */
-    Boolean updateByBo(BasicInfoBo bo);
+    BasicInfo queryBasicInfo();
 
     /**
-     * 校验并批量删除基础设置信息
-     *
-     * @param ids 需要删除的基础设置主键集合
-     * @param isValid 是否校验,true-删除前校验,false-不校验
-     * @return 结果
+     * 保存基础设置
+     * @param bo
+     * @return
      */
-    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+    Boolean saveBasicInfo(BasicInfoBo bo);
 
 }

ruoyi-system/src/main/java/com/ruoyi/clock/service/impl/BasicInfoServiceImpl.java

@@ -36,116 +36,27 @@ public class BasicInfoServiceImpl implements IBasicInfoService {
     private final BasicInfoMapper baseMapper;
 
     /**
-     * 查询基础设置分页
-     *
-     * @param bo 基础设置
+     * 查询基础设置*
      * @return 基础设置
      */
     @Override
-    public TableDataInfo<BasicInfoVo> queryPageList(BasicInfoBo bo, PageQuery pageQuery) {
-        LambdaQueryWrapper<BasicInfo> lqw = buildQueryWrapper(bo);
-        Page<BasicInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        return TableDataInfo.build(result);
+    public BasicInfo queryBasicInfo(){
+        BasicInfo basicInfo = this.baseMapper.selectOne(new LambdaQueryWrapper<BasicInfo>()
+            .last(" limit 1 ")
+        );
+        return basicInfo;
     }
 
-    /**
-     * 查询基础设置列表
-     *
-     * @param bo 基础设置
-     * @return 基础设置
-     */
-    @Override
-    public List<BasicInfoVo> queryList(BasicInfoBo bo) {
-        LambdaQueryWrapper<BasicInfo> lqw = buildQueryWrapper(bo);
-        return baseMapper.selectVoList(lqw);
-    }
-
-    private LambdaQueryWrapper<BasicInfo> buildQueryWrapper(BasicInfoBo bo) {
-        Map<String, Object> params = bo.getParams();
-        LambdaQueryWrapper<BasicInfo> lqw = Wrappers.lambdaQuery();
-        lqw.eq(StringUtils.isNotBlank(bo.getAboutUs()), BasicInfo::getAboutUs, bo.getAboutUs());
-        lqw.eq(StringUtils.isNotBlank(bo.getProtocol()), BasicInfo::getProtocol, bo.getProtocol());
-        return lqw;
-    }
-
-    /**
-     * 查询基础设置
-     *
-     * @param basicId 基础设置主键
-     * @return 基础设置
-     */
-    @Override
-    public BasicInfoVo queryById(Long basicId){
-        return baseMapper.selectVoById(basicId);
-    }
-
-    /**
-     * 详情基础设置
-     *
-     * @param basicId 基础设置主键
-     * @return 基础设置
-     */
     @Override
-    public BasicInfo loadById(Long basicId, Boolean tw){
-        BasicInfo info = this.baseMapper.selectById(basicId);
-        if(ObjectUtil.isEmpty(info) && tw){
-            throw new ServiceException(BasicInfoExceptionEnum.BasicInfo_IS_NOT_EXISTS);
+    public Boolean saveBasicInfo(BasicInfoBo bo) {
+        BasicInfo basicInfo = this.queryBasicInfo();
+        if(ObjectUtil.isEmpty(basicInfo)){
+            this.baseMapper.insert(basicInfo);
+        } else {
+            basicInfo.setAboutUs(bo.getAboutUs());
+            basicInfo.setProtocol(bo.getProtocol());
+            this.baseMapper.updateById(basicInfo);
         }
-        return info;
+        return true;
     }
-
-    /**
-     * 新增基础设置
-     *
-     * @param bo 基础设置
-     * @return 结果
-     */
-    @Override
-    public Boolean insertByBo(BasicInfoBo bo) {
-        BasicInfo add = BeanUtil.toBean(bo, BasicInfo.class);
-        validEntityBeforeSave(add);
-        boolean flag = baseMapper.insert(add) > 0;
-        if (flag) {
-            bo.setBasicId(add.getBasicId());
-        }
-        return flag;
-    }
-
-    /**
-     * 修改基础设置
-     *
-     * @param bo 基础设置
-     * @return 结果
-     */
-    @Override
-    public Boolean updateByBo(BasicInfoBo bo) {
-        BasicInfo basicInfo = baseMapper.selectById(bo.getBasicId());
-        BasicInfo update = BeanCopyUtils.copy(bo, basicInfo);
-        validEntityBeforeSave(update);
-        return baseMapper.updateById(update) > 0;
-    }
-
-    /**
-     * 保存前的数据校验
-     *
-     * @param entity 实体类数据
-     */
-    private void validEntityBeforeSave(BasicInfo entity){
-        //TODO 做一些数据校验,如唯一约束
-    }
-
-    /**
-     * 批量删除基础设置
-     *
-     * @param ids 需要删除的基础设置主键
-     * @return 结果
-     */
-    @Override
-    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
-        if(isValid){
-            //TODO 做一些业务上的校验,判断是否需要校验
-        }
-        return baseMapper.deleteBatchIds(ids) > 0;
-    }
-
 }