Browse Source

项目类别时限设置功能优化

feature/dangjian
yujintao 6 years ago
parent
commit
66f2e574ff
  1. 4
      esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java
  3. 44
      esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java
  4. 4
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java
  5. 14
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java
  6. 2
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java
  7. 4
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java
  8. 114
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java
  9. 20
      esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml

4
esua-epdc/epdc-admin/epdc-admin-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/UserSysDeptInfoFormDTO.java

@ -16,14 +16,10 @@ public class UserSysDeptInfoFormDTO implements Serializable {
/**
* 主键集合
*/
// @NotEmpty(message = "deptIdList不能为空")
// @Valid
private List<Long> deptIdList;
/**
* 部门类型键值
*/
// @NotEmpty(message = "部门类型不能为空")
// @Valid
private List<String> typeKeyList;
}

2
esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/category/result/CategoryInfoResultDTO.java

@ -34,5 +34,5 @@ public class CategoryInfoResultDTO implements Serializable {
/**
* 所有上级分类名称用逗号分开
*/
private List<String> parentNames;
private String parentNames;
}

44
esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/category/service/impl/CategoryServiceImpl.java

@ -17,12 +17,14 @@
package com.elink.esua.epdc.modules.category.service.impl;
import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.Constant;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.constant.StrConstant;
import com.elink.esua.epdc.commons.tools.exception.ErrorCode;
import com.elink.esua.epdc.commons.tools.exception.RenException;
import com.elink.esua.epdc.commons.tools.redis.RedisKeys;
@ -81,7 +83,6 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
public static int Guid = 100;//id自增值
private Logger logger = LoggerFactory.getLogger(getClass());
@Override
@ -413,6 +414,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
/**
* 获取单元格内容
*
* @param cell
* @return
*/
@ -432,6 +434,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
/**
* 获取19位随机数
*
* @return
*/
public Long getLongRandom() {
@ -451,6 +454,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
/**
* 拼接entity
*
* @param id ID
* @param pid 上级分类ID
* @param categoryName 分类名称
@ -482,6 +486,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
/**
* 获取excle版本
*
* @param mFile
* @return
*/
@ -504,6 +509,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
/**
* 验证EXCEL文件
*
* @param filePath
* @return
*/
@ -518,6 +524,7 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
public static boolean isExcel2003(String filePath) {
return filePath.matches("^.+\\.(?i)(xls)$");
}
// @描述:是否是2007的excel,返回true是2007
public static boolean isExcel2007(String filePath) {
return filePath.matches("^.+\\.(?i)(xlsx)$");
@ -550,24 +557,37 @@ public class CategoryServiceImpl extends BaseServiceImpl<CategoryDao, CategoryEn
**/
@Override
public List<CategoryInfoResultDTO> listCategoryInfo(CategoryInfoFormDTO formDTO) {
List<CategoryInfoResultDTO> categoryInfoResultDTOList = new ArrayList<>();
List<CategoryInfoResultDTO> result = Lists.newArrayList();
CategoryInfoResultDTO categoryInfoResult;
for (Long id : formDTO.getIds()) {
CategoryEntity entity = baseDao.getById(id);
if (null != entity) {
List<String> parentNameList = new ArrayList<>();
if (StringUtils.isNotBlank(entity.getPids())) {
String[] pidList = entity.getPids().split(",");
for (String pid : pidList) {
CategoryEntity parentEntity = baseDao.getById(Long.valueOf(pid));
if (null == entity) {
continue;
}
if(StringUtils.isBlank(entity.getPids())){
categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class);
result.add(categoryInfoResult);
continue;
}
List<String> parentNameList = Lists.newArrayList();
String[] pidList = entity.getPids().split(StrConstant.COMMA);
if (null != pidList && pidList.length > NumConstant.ZERO) {
CategoryEntity parentEntity;
for (int i = 0; i < pidList.length; i++) {
parentEntity = baseDao.getById(Long.valueOf(pidList[i]));
if (null != parentEntity) {
parentNameList.add(parentEntity.getCategoryName());
}
}
CategoryInfoResultDTO categoryInfoResultDTO = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class);
categoryInfoResultDTO.setParentNames(parentNameList);
categoryInfoResultDTOList.add(categoryInfoResultDTO);
}
categoryInfoResult = ConvertUtils.sourceToTarget(entity, CategoryInfoResultDTO.class);
if (CollUtil.isNotEmpty(parentNameList)) {
categoryInfoResult.setParentNames(StringUtils.join(parentNameList, StrConstant.HYPHEN));
}
result.add(categoryInfoResult);
}
return categoryInfoResultDTOList;
return result;
}
/**

4
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-client/src/main/java/com/elink/esua/epdc/dto/KpiTimeLimitItemDTO.java

@ -53,7 +53,7 @@ public class KpiTimeLimitItemDTO implements Serializable {
/**
* 项目类别id
*/
private String categoryId;
private Long categoryId;
/**
* 所有上级项目类别id
@ -108,6 +108,6 @@ public class KpiTimeLimitItemDTO implements Serializable {
/**
* 项目类别集合
*/
private List<String> categoryIds;
private List<Long[]> categoryIds;
}

14
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/dao/KpiTimeLimitItemDao.java

@ -20,6 +20,9 @@ package com.elink.esua.epdc.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* 项目响应时限
@ -30,4 +33,15 @@ import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface KpiTimeLimitItemDao extends BaseDao<KpiTimeLimitItemEntity> {
/**
* 按类别id批量删除配置
*
* @param categoryIds
* @return int
* @author work@yujt.net.cn
* @date 2019/12/16 19:19
*/
int deleteBatchByCategoryIds(@Param("categoryIds") List<Long> categoryIds);
}

2
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/entity/KpiTimeLimitItemEntity.java

@ -51,7 +51,7 @@ public class KpiTimeLimitItemEntity extends BaseEpdcEntity {
/**
* 项目类别id
*/
private String categoryId;
private Long categoryId;
/**
* 所有上级项目类别id

4
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/feign/EventFeignClient.java

@ -7,7 +7,7 @@ import com.elink.esua.epdc.dto.category.result.CategoryInfoResultDTO;
import com.elink.esua.epdc.feign.fallback.EventFeignClientFallback;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.GetMapping;
import java.util.List;
@ -26,6 +26,6 @@ public interface EventFeignClient {
* @Description 根据id查询事件分类基本信息
* @Date 2019/12/4 10:37
**/
@PostMapping(value = "events/category/queryCategoryInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
@GetMapping(value = "events/category/queryCategoryInfo", consumes = MediaType.APPLICATION_JSON_VALUE)
Result<List<CategoryInfoResultDTO>> queryCategoryInfo(CategoryInfoFormDTO categoryInfoFormDTO);
}

114
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/java/com/elink/esua/epdc/service/impl/KpiTimeLimitItemServiceImpl.java

@ -21,6 +21,8 @@ import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.NumConstant;
import com.elink.esua.epdc.commons.tools.constant.StrConstant;
import com.elink.esua.epdc.commons.tools.page.PageData;
import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
@ -33,6 +35,7 @@ import com.elink.esua.epdc.entity.KpiTimeLimitItemEntity;
import com.elink.esua.epdc.feign.EventFeignClient;
import com.elink.esua.epdc.redis.KpiTimeLimitItemRedis;
import com.elink.esua.epdc.service.KpiTimeLimitItemService;
import com.google.common.collect.Lists;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@ -55,8 +58,6 @@ import java.util.Map;
public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl<KpiTimeLimitItemDao, KpiTimeLimitItemEntity> implements KpiTimeLimitItemService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private KpiTimeLimitItemRedis kpiTimeLimitItemRedis;
@Autowired
private EventFeignClient eventFeignClient;
@ -98,47 +99,82 @@ public class KpiTimeLimitItemServiceImpl extends BaseServiceImpl<KpiTimeLimitIte
@Override
@Transactional(rollbackFor = Exception.class)
public Result save(KpiTimeLimitItemDTO dto) {
for (String categoryIds : dto.getCategoryIds()) {
categoryIds = categoryIds.replaceAll("\\[", "").replaceAll("\\]", "").replace("\"", "");
String[] categoryIdArray = categoryIds.split(",");
String categoryId = categoryIdArray[categoryIdArray.length - 1];
CategoryInfoFormDTO categoryInfoFormDTO = new CategoryInfoFormDTO();
Long[] ids = new Long[1];
ids[0] = Long.valueOf(categoryId);
categoryInfoFormDTO.setIds(ids);
Result<List<CategoryInfoResultDTO>> res = eventFeignClient.queryCategoryInfo(categoryInfoFormDTO);
if (res.getCode() != 0 || CollUtil.isEmpty(res.getData()) || res.getData().size() == 0) {
return new Result().error("查询分类详情失败" + res.getMsg());
}
String allCategoryNames = "";
String parentCategoryIds = "";
String parentCategoryNames = "";
CategoryInfoResultDTO categoryInfoResultDTO = res.getData().get(0);
for (String parentName : categoryInfoResultDTO.getParentNames()) {
parentCategoryNames += (parentName + "-");
}
//去除最后一个-
parentCategoryNames = parentCategoryNames.substring(0, parentCategoryNames.length() - 1);
allCategoryNames = parentCategoryNames + "-" + categoryInfoResultDTO.getCategoryName();
int index = categoryIds.lastIndexOf(",");
// logger.info("最后一个逗号所在的位置"+index);
parentCategoryIds = categoryIds.substring(0, index);
dto.setCategoryId(categoryId);
dto.setAllCategoryIds(categoryIds);
dto.setAllCategoryNames(allCategoryNames);
dto.setParentCategoryIds(parentCategoryIds);
dto.setParentCategoryNames(parentCategoryNames);
KpiTimeLimitItemEntity entity = ConvertUtils.sourceToTarget(dto, KpiTimeLimitItemEntity.class);
// 删除已存在的记录
QueryWrapper<KpiTimeLimitItemEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(categoryId), "CATEGORY_ID", categoryId);
baseDao.delete(wrapper);
//插入
insert(entity);
List<Long[]> selectedCategoryIds = dto.getCategoryIds();
// 用户选择的所有部门id(去重之后)
List<Long> distinctCategoryIds = Lists.newArrayList();
for (Long[] oneOptionCategoryIdArray : selectedCategoryIds) {
for (Long categoryId : oneOptionCategoryIdArray) {
if (!distinctCategoryIds.contains(categoryId)) {
distinctCategoryIds.add(categoryId);
}
}
}
CategoryInfoFormDTO categoryInfoFormDto = new CategoryInfoFormDTO();
categoryInfoFormDto.setIds(distinctCategoryIds.toArray(new Long[distinctCategoryIds.size()]));
Result<List<CategoryInfoResultDTO>> eventResult = eventFeignClient.queryCategoryInfo(categoryInfoFormDto);
if (!eventResult.success() || CollUtil.isEmpty(eventResult.getData())) {
return new Result().error();
}
List<CategoryInfoResultDTO> categoryInfoList = eventResult.getData();
KpiTimeLimitItemEntity timeLimit;
List<KpiTimeLimitItemEntity> entityList = Lists.newArrayList();
for (CategoryInfoResultDTO categoryInfo : categoryInfoList) {
delteTimeLimitByCategoryId(categoryInfo.getId());
timeLimit = new KpiTimeLimitItemEntity();
timeLimit.setValidCloseTime(dto.getValidCloseTime());
timeLimit.setValidRespondTime(dto.getValidRespondTime());
timeLimit.setCategoryId(categoryInfo.getId());
// 父id为根节点0,表示一级类别,不拼接根节点
if (categoryInfo.getPids().equals(NumConstant.ZERO_STR)) {
timeLimit.setAllCategoryIds(String.valueOf(categoryInfo.getId()));
timeLimit.setAllCategoryNames(categoryInfo.getCategoryName());
} else {
timeLimit.setAllCategoryIds(categoryInfo.getPids().concat(StrConstant.COMMA).concat(String.valueOf(categoryInfo.getId())));
timeLimit.setAllCategoryNames(categoryInfo.getParentNames().concat(StrConstant.HYPHEN.concat(categoryInfo.getCategoryName())));
}
timeLimit.setParentCategoryIds(categoryInfo.getPids());
timeLimit.setParentCategoryNames(categoryInfo.getParentNames());
entityList.add(timeLimit);
}
baseDao.deleteBatchByCategoryIds(distinctCategoryIds);
this.insertBatch(entityList, NumConstant.THIRTY);
return new Result();
}
/**
* 根据类别id删除类别设置
*
* @param categoryId
* @return int
* @author work@yujt.net.cn
* @date 2019/12/16 17:49
*/
private int delteTimeLimitByCategoryId(Long categoryId) {
QueryWrapper<KpiTimeLimitItemEntity> wrapper = new QueryWrapper<>();
wrapper.eq("CATEGORY_ID", categoryId);
return baseDao.delete(wrapper);
}
public static void main(String[] args) {
List<Long> aa = Lists.newArrayList();
aa.add(0L);
aa.add(1L);
Long[] bb = aa.toArray(new Long[aa.size()]);
for (Long aLong : bb) {
System.out.println(aLong);
}
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(KpiTimeLimitItemDTO dto) {

20
esua-epdc/epdc-module/epdc-kpi/epdc-kpi-server/src/main/resources/mapper/KpiTimeLimitItemDao.xml

@ -3,22 +3,10 @@
<mapper namespace="com.elink.esua.epdc.dao.KpiTimeLimitItemDao">
<resultMap type="com.elink.esua.epdc.entity.KpiTimeLimitItemEntity" id="kpiTimeLimitItemMap">
<result property="id" column="ID"/>
<result property="validRespondTime" column="VALID_RESPOND_TIME"/>
<result property="validCloseTime" column="VALID_CLOSE_TIME"/>
<result property="categoryId" column="CATEGORY_ID"/>
<result property="parentCategoryIds" column="PARENT_CATEGORY_IDS"/>
<result property="parentCategoryNames" column="PARENT_CATEGORY_NAMES"/>
<result property="allCategoryIds" column="ALL_CATEGORY_IDS"/>
<result property="allCategoryNames" column="ALL_CATEGORY_NAMES"/>
<result property="revision" column="REVISION"/>
<result property="createdBy" column="CREATED_BY"/>
<result property="createdTime" column="CREATED_TIME"/>
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
<result property="delFlag" column="DEL_FLAG"/>
</resultMap>
<delete id="deleteBatchByCategoryIds">
delete from epdc_kpi_time_limit_item where category_id in
<foreach collection="categoryIds" item="item" open="(" separator="," close=")">#{item}</foreach>
</delete>
</mapper>
Loading…
Cancel
Save