Merge branch 'master' of https://git.njzscloud.com/lzq/njzscloud

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/operationManual/controller/OperationManualController.java

@@ -26,8 +26,8 @@ public class OperationManualController {
      * 新增
      */
     @PostMapping("/add")
-    public R<?> add(@RequestBody OperationManualEntity OperationManualEntity) {
+    public R<?> add(@RequestBody OperationManualEntity operationManualEntity) {
-        operationManualService.add(OperationManualEntity);
+        operationManualService.add(operationManualEntity);
         return R.success();
     }
 
@@ -35,8 +35,8 @@ public class OperationManualController {
      * 修改
      */
     @PostMapping("/modify")
-    public R<?> modify(@RequestBody OperationManualEntity OperationManualEntity) {
+    public R<?> modify(@RequestBody OperationManualEntity operationManualEntity) {
-        operationManualService.modify(OperationManualEntity);
+        operationManualService.modify(operationManualEntity);
         return R.success();
     }
 
@@ -61,8 +61,8 @@ public class OperationManualController {
      * 分页查询
      */
     @GetMapping("/paging")
-    public R<PageResult<OperationManualEntity>> paging(PageParam pageParam, OperationManualEntity OperationManualEntity) {
+    public R<PageResult<OperationManualEntity>> paging(PageParam pageParam, OperationManualEntity operationManualEntity) {
-        return R.success(operationManualService.paging(pageParam, OperationManualEntity));
+        return R.success(operationManualService.paging(pageParam, operationManualEntity));
     }
 
     /**
@@ -78,7 +78,7 @@ public class OperationManualController {
      * 操作手册查询
      */
     @GetMapping("/appShow")
-    public R<OperationManualEntity> appShow() {
+    public R<List<OperationManualEntity>> appShow() {
         return R.success(operationManualService.appShow());
     }
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/operationManual/pojo/OperationManualEntity.java

@@ -27,6 +27,11 @@ public class OperationManualEntity {
      */
     private String title;
 
+    /**
+     * 客户类型
+     */
+    private String bizObj;
+
     /**
      * pdf地址
      */

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/operationManual/service/OperationManualService.java

@@ -15,12 +15,12 @@ public interface OperationManualService extends IService<OperationManualEntity>
     /**
      * 新增
      */
-    void add(OperationManualEntity OperationManualEntity);
+    void add(OperationManualEntity operationManualEntity);
 
     /**
      * 修改
      */
-    void modify(OperationManualEntity OperationManualEntity);
+    void modify(OperationManualEntity operationManualEntity);
 
     /**
      * 删除
@@ -35,10 +35,10 @@ public interface OperationManualService extends IService<OperationManualEntity>
     /**
      * 分页查询
      */
-    PageResult<OperationManualEntity> paging(PageParam pageParam, OperationManualEntity OperationManualEntity);
+    PageResult<OperationManualEntity> paging(PageParam pageParam, OperationManualEntity operationManualEntity);
 
     void enabled(Long id, Boolean enable);
 
-    OperationManualEntity appShow();
+    List<OperationManualEntity> appShow();
 
 }

njzscloud-svr/src/main/java/com/njzscloud/supervisory/sys/operationManual/service/impl/OperationManualServiceImpl.java

@@ -3,6 +3,7 @@ package com.njzscloud.supervisory.sys.operationManual.service.impl;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njzscloud.common.core.ex.Exceptions;
 import com.njzscloud.common.mp.support.PageParam;
 import com.njzscloud.common.mp.support.PageResult;
 import com.njzscloud.supervisory.sys.operationManual.mapper.OperationManualMapper;
@@ -24,16 +25,27 @@ public class OperationManualServiceImpl extends ServiceImpl<OperationManualMappe
      * 新增
      */
     @Override
-    public void add(OperationManualEntity OperationManualEntity) {
+    public void add(OperationManualEntity operationManualEntity) {
-        this.save(OperationManualEntity);
+        isBizObj(operationManualEntity);
+        this.save(operationManualEntity);
     }
 
     /**
      * 修改
      */
     @Override
-    public void modify(OperationManualEntity OperationManualEntity) {
+    public void modify(OperationManualEntity operationManualEntity) {
-        this.updateById(OperationManualEntity);
+        this.updateById(operationManualEntity);
+    }
+
+    public void isBizObj(OperationManualEntity operationManualEntity) {
+        List<OperationManualEntity> list = this.list(Wrappers.lambdaQuery(OperationManualEntity.class)
+                .eq(OperationManualEntity::getBizObj, operationManualEntity.getBizObj())
+                .eq(OperationManualEntity::getEnabled, Boolean.TRUE)
+                .eq(OperationManualEntity::getDeleted, Boolean.FALSE));
+        if (null != list && list.size() > 0) {
+            throw Exceptions.exception("当前客户类型存在已启用的操作手册");
+        }
     }
 
     /**
@@ -76,16 +88,10 @@ public class OperationManualServiceImpl extends ServiceImpl<OperationManualMappe
     }
 
     @Override
-    public OperationManualEntity appShow() {
+    public List<OperationManualEntity> appShow() {
-        List<OperationManualEntity> list = this.list(Wrappers.lambdaQuery(OperationManualEntity.class)
+        return this.list(Wrappers.lambdaQuery(OperationManualEntity.class)
                 .eq(OperationManualEntity::getEnabled, Boolean.TRUE)
                 .eq(OperationManualEntity::getDeleted, Boolean.FALSE));
-        if (null != list && list.size() > 0) {
-            return list.get(0);
-        } else {
-            return new OperationManualEntity();
-        }
-
     }
 
 }