From f32e22e52376cabe49e8c7d1f52adb4b1aebffd3 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 20 Nov 2019 17:15:08 +0800
Subject: [PATCH] update：移动到设备marker上实时显示因子数据
---
src/main/java/com/moral/service/impl/MenuServiceImpl.java | 36 ++++++++++--------------------------
1 files changed, 10 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/MenuServiceImpl.java b/src/main/java/com/moral/service/impl/MenuServiceImpl.java
index 507de82..0c5da0c 100644
--- a/src/main/java/com/moral/service/impl/MenuServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/MenuServiceImpl.java
@@ -8,6 +8,7 @@
import javax.annotation.Resource;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import com.github.pagehelper.PageHelper;
import com.moral.common.bean.Constants;
@@ -17,6 +18,7 @@
import com.moral.mapper.MenuMapper;
import com.moral.service.MenuService;
import com.moral.util.TkMybatisUtils;
+import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
import tk.mybatis.mapper.entity.Example;
@@ -29,8 +31,12 @@
private MenuMapper menuMapper;
@Override
+ @Transactional
public void addOrModify(Menu menu) {
try {
+ if(menu.getMenuParentId()==null){
+ menu.setMenuParentId(0);
+ }
menu.setUpdateTime(new Date());
menu.setUpdateUser(menu.getUpdateUser());
if (menu.getId() != null) {
@@ -44,6 +50,7 @@
menu.setId(menuResult.getId());
menuMapper.updateByPrimaryKeySelective(menu);
} else {
+ menu.setChannelId(menu.getChannelId());
menu.setIsDelete(Constants.IS_DELETE_FALSE);
menu.setCreateTime(new Date());
menu.setCreateUser(menu.getCreateUser());
@@ -53,31 +60,6 @@
} catch (Exception ex) {
throw ex;
}
- }
-
- @Override
- public PageBean queryByPageBean(PageBean pageBean) {
- Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
- List<Example.Criteria> criteriaList = example.getOredCriteria();
- if (criteriaList != null && criteriaList.size() > 0) {
- for (Example.Criteria cri : criteriaList) {
- cri.andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
- }
- } else {
- example.or().andNotEqualTo("isDelete", Constants.IS_DELETE_TRUE);
- }
- if (example.getOrderByClause() == null || example.getOrderByClause().isEmpty()) {
- example.setOrderByClause("menu_name asc");
- }
- List<Menu> menuList = menuMapper.selectWithMenuNameByExample(example);
- Iterator<Menu> iterator = menuList.iterator();
- while (iterator.hasNext()) {
- Menu menu = iterator.next();
- if (menu.getMenuParentId() == null) {
- iterator.remove();
- }
- }
- return new PageBean(menuList);
}
@Override
@@ -103,12 +85,13 @@
public int countByExample(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
TkMybatisUtils.addDeletesToExample(example);
- return menuMapper.selectCountByExample(example);
+ return menuMapper.countByExample(example);
}
@Override
public PageBean getMenuList(PageBean pageBean) {
Example example = ExampleUtil.generateExample(ENTITY_CLASS, pageBean);
+ TkMybatisUtils.addDeletesToExample(example);
if (pageBean.getPageSize() > 0) {
PageHelper.startPage(pageBean.getPageIndex(), pageBean.getPageSize());
}
@@ -123,6 +106,7 @@
}
@Override
+ @Transactional
public void deleteByIds(Integer[] ids) {
Menu menu = new Menu();
menu.setIsDelete(Constants.IS_DELETE_TRUE);
--
Gitblit v1.8.0