lzq
/
njzscloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: lzq:d9870b8eca702d15746a8e13bc088378a4c61352
Branches Tags
lzq:dev
lzq:master
lzq:localizer
..
compare: lzq:4c0e199490247d017b0ad3df9360510d9340938a
Branches Tags
lzq:dev
lzq:master
lzq:localizer

No commits in common. "d9870b8eca702d15746a8e13bc088378a4c61352" and "4c0e199490247d017b0ad3df9360510d9340938a" have entirely different histories.
d9870b8eca ... 4c0e199490

4 changed files with 23 additions and 34 deletions
Show Stats Expand all files Collapse all files

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

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

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

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

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

@ -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);
List<OperationManualEntity> appShow();
OperationManualEntity appShow();
}

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

@ -3,7 +3,6 @@ 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;
@ -25,27 +24,16 @@ public class OperationManualServiceImpl extends ServiceImpl<OperationManualMappe
* 新增
*/
@Override
public void add(OperationManualEntity operationManualEntity) {
isBizObj(operationManualEntity);
this.save(operationManualEntity);
public void add(OperationManualEntity OperationManualEntity) {
this.save(OperationManualEntity);
}
/**
* 修改
*/
@Override
public void modify(OperationManualEntity 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("当前客户类型存在已启用的操作手册");
}
public void modify(OperationManualEntity OperationManualEntity) {
this.updateById(OperationManualEntity);
}
/**
@ -88,10 +76,16 @@ public class OperationManualServiceImpl extends ServiceImpl<OperationManualMappe
}
@Override
public List<OperationManualEntity> appShow() {
return this.list(Wrappers.lambdaQuery(OperationManualEntity.class)
public OperationManualEntity appShow() {
List<OperationManualEntity> list = 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();
}
}
}