From 171f5567cecda191f6b32e6c303c2bea9cd266f0 Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Tue, 01 Sep 2020 19:47:37 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
index 82797e4..213bb71 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SysProductServiceImpl.java
@@ -1,18 +1,24 @@
package com.kidgrow.oprationcenter.service.impl;
-import org.springframework.stereotype.Service;
-import com.kidgrow.common.model.PageResult;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.model.PageResult;
+import com.kidgrow.common.model.ResultBody;
+import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.service.impl.SuperServiceImpl;
+import com.kidgrow.common.utils.DateUtil;
+import com.kidgrow.oprationcenter.feign.RoleOrganizationService;
+import com.kidgrow.oprationcenter.mapper.SysProductMapper;
+import com.kidgrow.oprationcenter.model.SysProduct;
+import com.kidgrow.oprationcenter.service.ISysProductService;
+import com.kidgrow.oprationcenter.vo.ProductAllVo;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import java.util.Date;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
-import lombok.extern.slf4j.Slf4j;
-
-import com.kidgrow.oprationcenter.model.SysProduct;
-import com.kidgrow.oprationcenter.mapper.SysProductMapper;
-import com.kidgrow.oprationcenter.service.ISysProductService;
/**
* 石家庄喜高科技有限责任公司 版权所有 © Copyright 2020<br>
@@ -25,16 +31,51 @@
@Slf4j
@Service
public class SysProductServiceImpl extends SuperServiceImpl<SysProductMapper, SysProduct> implements ISysProductService {
+ @Autowired
+ private RoleOrganizationService roleOrganizationService;
+
/**
* 列表
* @param params
* @return
*/
@Override
- public PageResult<SysProduct> findList(Map<String, Object> params){
+ public PageResult<SysProduct> findList(Map<String, Object> params, SysUser sysUser){
Page<SysProduct> page = new Page<>(MapUtils.getInteger(params, "page"), MapUtils.getInteger(params, "limit"));
+ Map<String, Object> roleOrgMap = roleOrganizationService.getRoleOrgMap(sysUser.getRoles());
+ params.putAll(roleOrgMap);
List<SysProduct> list = baseMapper.findList(page, params);
return PageResult.<SysProduct>builder().data(list).code(0).count(page.getTotal()).build();
+ }
+ /**
+ * 列表
+ * @param params
+ * @return
+ */
+ @Override
+ public PageResult<ProductAllVo> findAllList(Map<String, Object> params, SysUser sysUser){
+ List<ProductAllVo> list = baseMapper.findAllList(params);
+ if (list != null) {
+ for (int i = 0; i <list.size() ; i++) {
+ list.get(i).setBeginTime(new Date());
+ switch (list.get(i).getProTimeUnit())
+ {
+ //天
+ case 0:
+ list.get(i).setEndTime(DateUtil.addDays(new Date(),list.get(i).getProTime()));
+ break;
+ //月
+ case 1:
+ list.get(i).setEndTime(DateUtil.addMonths(new Date(),list.get(i).getProTime()));
+ break;
+ //年
+ case 2:
+ list.get(i).setEndTime(DateUtil.addYears(new Date(),list.get(i).getProTime()));
+ break;
+ }
+ }
+ }
+ return PageResult.<ProductAllVo>builder().data(list).code(0).count(0L).build();
}
/**
@@ -46,4 +87,24 @@
public SysProduct findByObject(SysProduct sysProduct){
return baseMapper.findByObject(sysProduct);
}
+
+ /**
+ * 根据id和启用禁用值更新数据
+ * @param params
+ * @return ResultBody
+ */
+ @Override
+ public ResultBody updateEnabled(Map<String, Object> params) {
+ Long id = MapUtils.getLong(params, "id");
+ Boolean enabled = MapUtils.getBoolean(params, "enabled");
+
+ SysProduct sysProduct = baseMapper.selectById(id);
+ if (sysProduct == null) {
+ return ResultBody.failed("该数据不存在！");
+ }
+ sysProduct.setEnabled(enabled);
+ sysProduct.setUpdateTime(new Date());
+ int i = baseMapper.updateById(sysProduct);
+ return i > 0 ? ResultBody.ok().data(sysProduct).msg("更新成功") : ResultBody.failed("更新失败");
+ }
}
--
Gitblit v1.8.0