Просмотр исходного кода

[招商]adjust

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
a69e6601d9
9 измененных файлов: 44 добавлений и 5 удалений
  1. +9
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java
  2. +3
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java
  4. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java
  5. +6
    -3
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  6. +2
    -0
      mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java
  7. +1
    -1
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java
  8. +10
    -0
      mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java
  9. +7
    -0
      mallinkService/src/main/resources/mapper/MallPermissionMapper.xml

+ 9
- 0
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java Просмотреть файл

@@ -85,4 +85,13 @@ public class InvestRemindController extends InvestBaseController {
return execute(ids, p -> investRemindService.removeByIds(Arrays.asList(p)));
}

/**
* 删除登录用户全部提醒
*/
@SystemServiceLog
@PostMapping("/deleteAll")
public InvestResultData deleteAll() {
return execute(null, p -> investRemindService.removeAll());
}

}

+ 3
- 1
mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java Просмотреть файл

@@ -9,6 +9,7 @@ import com.iformall.service.invest.InvestTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -35,9 +36,10 @@ public class InvestTaskController extends InvestBaseController {
/**
* 分页列表
*/
//@RequiresPermissions("InvestTaskQuery")
@SystemServiceLog
@ApiOperation("分页列表接口")
@GetMapping("/list")
@PostMapping("/list")
public InvestResultData<InvestPageResult<InvestTaskVo>> list(InvestTaskQuery params) {
return execute(params, p -> bizService.queryPageTask(p));
}


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/MallPermission.java Просмотреть файл

@@ -69,4 +69,8 @@ public class MallPermission extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value="子菜单",name="children")
private List<?> children;

@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="页面按钮",name="btnChildren")
private List<?> btnChildren;

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/MallPermissionMapper.java Просмотреть файл

@@ -12,6 +12,8 @@ public interface MallPermissionMapper extends CommonMapper<MallPermission, Strin

List<MallPermission> queryListParentId(Long parentId);

List<MallPermission> queryBtnListByParentId(Long parentId);

List<MallPermission> queryNotButtonList();



+ 6
- 3
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Просмотреть файл

@@ -16,13 +16,13 @@ import com.iformall.mapper.MallPermissionMapper;
import com.iformall.mapper.MallUserInfoMapper;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.MallPermissionService;
import org.apache.commons.collections.CollectionUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.List;
import java.util.*;

@Service
public class MallPermissionServiceImpl implements MallPermissionService {
@@ -137,13 +137,16 @@ public class MallPermissionServiceImpl implements MallPermissionService {
if(entity.getResourceType().equals(EnumPermissionType.CATALOG.getCode())){
entity.setChildren(getMenuTreeList(queryListParentId(entity.getId(), menuIdList, boolNav), menuIdList, boolNav));
}
List<MallPermission> btnList = mallPermissionMapper.queryBtnListByParentId(entity.getId());
if (CollectionUtils.isNotEmpty(btnList)) {
entity.setBtnChildren(btnList);
}
subMenuList.add(entity);
}

return subMenuList;
}


@Override
public PageInfo<MallPermission> listAsPage(MallPermission record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> mallPermissionMapper.findList(record));


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/invest/InvestRemindService.java Просмотреть файл

@@ -15,5 +15,7 @@ import com.iformall.domain.vo.invest.InvestPageResult;
public interface InvestRemindService extends IService<InvestRemindEntity>,InvestBaseService<InvestRemindEntity> {

InvestPageResult<InvestRemindEntity> queryPage(InvestPageQuery<InvestRemindEntity> params);

boolean removeAll() ;
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestFollowRecordServiceImpl.java Просмотреть файл

@@ -29,7 +29,7 @@ public class InvestFollowRecordServiceImpl extends InvestBaseServiceImpl<InvestF
public InvestPageResult<InvestFollowRecordEntity> queryPage(InvestPageQuery<InvestFollowRecordEntity> params) {
InvestFollowRecordEntity queryData = params.getQueryData();
InvestHelper.notNull(queryData);
InvestHelper.notNull(queryData.getFollowId(), "followId");
//InvestHelper.notNull(queryData.getFollowId(), "followId");
InvestHelper.notNull(queryData.getType(), "type");
return super.queryPage(params);
}


+ 10
- 0
mallinkService/src/main/java/com/iformall/service/invest/impl/InvestRemindServiceImpl.java Просмотреть файл

@@ -1,6 +1,8 @@
package com.iformall.service.invest.impl;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.iformall.domain.po.invest.InvestRemindEntity;
import com.iformall.domain.vo.invest.InvestUserContext;
import com.iformall.mapper.InvestRemindDao;
@@ -33,6 +35,14 @@ public class InvestRemindServiceImpl extends InvestBaseServiceImpl<InvestRemindD
return super.updateByIdAction(entity, this::checkBeforeSaveOrUpdate);
}

@Override
public boolean removeAll() {
LambdaUpdateWrapper<InvestRemindEntity> wrapper = new LambdaUpdateWrapper<>();
wrapper.eq(InvestRemindEntity::getTenantId, InvestUserContext.getUser().getTenantId());
wrapper.eq(InvestRemindEntity::getOwner, InvestUserContext.getUserId());
return super.remove(wrapper);
}

private void checkBeforeSaveOrUpdate(InvestRemindEntity input) {
input.setOwner(InvestUserContext.getUserId());
if (Objects.nonNull(input.getContent())) {


+ 7
- 0
mallinkService/src/main/resources/mapper/MallPermissionMapper.xml Просмотреть файл

@@ -96,6 +96,13 @@
where 1=1 and `parent_id` = #{value} and available = 'Y' order by sort asc
</select>

<select id="queryBtnListByParentId" parameterType="long" resultMap="BaseResultMap">
select
<include refid="allColumns"/>
from mall_permission
where `parent_id` = #{value} and available = 'Y' and `resource_type` = 2 order by sort asc
</select>

<select id="queryNotButtonList" resultMap="BaseResultMap">
select
<include refid="allColumns"/>


Загрузка…
Отмена
Сохранить