diff --git a/epdc-cloud-analysis/pom.xml b/epdc-cloud-analysis/pom.xml index f400f5d..4f3bf7f 100644 --- a/epdc-cloud-analysis/pom.xml +++ b/epdc-cloud-analysis/pom.xml @@ -134,16 +134,16 @@ 9060 - 9 - 114.215.125.123 - 9603 - epdc!redis@master1405 + 8 + r-m5eh5czgb1nucti6azpd.redis.rds.aliyuncs.com + 10001 + elink!888 - + - epdcyushan - elink833066 + yushan_epdc_test + elink-epdc@yushan false 47.104.224.45:8848 diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemDifficultConfigController.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemDifficultConfigController.java new file mode 100644 index 0000000..c0939e4 --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemDifficultConfigController.java @@ -0,0 +1,93 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.item.ItemDifficultConfigDTO; +import com.elink.esua.epdc.modules.item.excel.ItemDifficultConfigExcel; +import com.elink.esua.epdc.modules.item.service.ItemDifficultConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; + + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@RestController +@RequestMapping("itemdifficultconfig") +public class ItemDifficultConfigController { + + @Autowired + private ItemDifficultConfigService itemDifficultConfigService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = itemDifficultConfigService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + ItemDifficultConfigDTO data = itemDifficultConfigService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody ItemDifficultConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + return itemDifficultConfigService.save(dto); + } + + @PutMapping + public Result update(@RequestBody ItemDifficultConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + itemDifficultConfigService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + itemDifficultConfigService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = itemDifficultConfigService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, ItemDifficultConfigExcel.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDifficultConfigDao.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDifficultConfigDao.java new file mode 100644 index 0000000..3506feb --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDifficultConfigDao.java @@ -0,0 +1,41 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.item.entity.ItemDifficultConfigEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@Mapper +public interface ItemDifficultConfigDao extends BaseDao { + + /** + * @describe: 查询数量 + * @author wangtong + * @date 2021/8/12 16:01 + * @params [] + * @return int + */ + int selectConfigCount(); +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemDifficultConfigEntity.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemDifficultConfigEntity.java new file mode 100644 index 0000000..ae60130 --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemDifficultConfigEntity.java @@ -0,0 +1,53 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_item_difficult_config") +public class ItemDifficultConfigEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 最小耗时 单位:小时 + */ + private Integer minSpendTime; + + /** + * 最小处理次数 + */ + private Integer minHandleTotal; + + /** + * 最小涉及部门 + */ + private Integer minDeptTotal; + +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemDifficultConfigExcel.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemDifficultConfigExcel.java new file mode 100644 index 0000000..ce3b30d --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/excel/ItemDifficultConfigExcel.java @@ -0,0 +1,65 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@Data +public class ItemDifficultConfigExcel { + + @Excel(name = "标识号") + private String id; + + @Excel(name = "最小耗时 单位:小时") + private Integer minSpendTime; + + @Excel(name = "最小处理次数") + private Integer minHandleTotal; + + @Excel(name = "最小涉及部门") + private Integer minDeptTotal; + + @Excel(name = "删除标识 0-否,1-是") + private String delFlag; + + @Excel(name = "乐观锁") + private Integer revision; + + @Excel(name = "创建人") + private String createdBy; + + @Excel(name = "创建时间") + private Date createdTime; + + @Excel(name = "更新人") + private String updatedBy; + + @Excel(name = "更新时间") + private Date updatedTime; + + +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemDifficultConfigRedis.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemDifficultConfigRedis.java new file mode 100644 index 0000000..067c188 --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/redis/ItemDifficultConfigRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@Component +public class ItemDifficultConfigRedis { + @Autowired + private RedisUtils redisUtils; + + public void delete(Object[] ids) { + + } + + public void set(){ + + } + + public String get(String id){ + return null; + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/ItemDifficultConfigService.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/ItemDifficultConfigService.java new file mode 100644 index 0000000..276ba9c --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/ItemDifficultConfigService.java @@ -0,0 +1,96 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.item.ItemDifficultConfigDTO; +import com.elink.esua.epdc.modules.item.entity.ItemDifficultConfigEntity; + +import java.util.List; +import java.util.Map; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +public interface ItemDifficultConfigService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-12 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-12 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return ItemDifficultConfigDTO + * @author generator + * @date 2021-08-12 + */ + ItemDifficultConfigDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-12 + */ + Result save(ItemDifficultConfigDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-12 + */ + void update(ItemDifficultConfigDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-12 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDifficultConfigServiceImpl.java b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDifficultConfigServiceImpl.java new file mode 100644 index 0000000..986c2af --- /dev/null +++ b/epdc-cloud-analysis/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDifficultConfigServiceImpl.java @@ -0,0 +1,110 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.item.service.impl; + +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.FieldConstant; +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.utils.Result; +import com.elink.esua.epdc.dto.item.ItemDifficultConfigDTO; +import com.elink.esua.epdc.modules.item.dao.ItemDifficultConfigDao; +import com.elink.esua.epdc.modules.item.entity.ItemDifficultConfigEntity; +import com.elink.esua.epdc.modules.item.redis.ItemDifficultConfigRedis; +import com.elink.esua.epdc.modules.item.service.ItemDifficultConfigService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 项目难点堵点配置表 项目难点堵点配置表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-12 + */ +@Service +public class ItemDifficultConfigServiceImpl extends BaseServiceImpl implements ItemDifficultConfigService { + + @Autowired + private ItemDifficultConfigRedis itemDifficultConfigRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, ItemDifficultConfigDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, ItemDifficultConfigDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public ItemDifficultConfigDTO get(String id) { + ItemDifficultConfigEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ItemDifficultConfigDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public Result save(ItemDifficultConfigDTO dto) { + int result = baseDao.selectConfigCount(); + if(result>0){ + return new Result().error("已经在相关配置,不可重复添加"); + } + ItemDifficultConfigEntity entity = ConvertUtils.sourceToTarget(dto, ItemDifficultConfigEntity.class); + insert(entity); + return new Result().ok("新增成功"); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ItemDifficultConfigDTO dto) { + ItemDifficultConfigEntity entity = ConvertUtils.sourceToTarget(dto, ItemDifficultConfigEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + +} \ No newline at end of file diff --git a/epdc-cloud-analysis/src/main/resources/mapper/item/ItemDifficultConfigDao.xml b/epdc-cloud-analysis/src/main/resources/mapper/item/ItemDifficultConfigDao.xml new file mode 100644 index 0000000..de46432 --- /dev/null +++ b/epdc-cloud-analysis/src/main/resources/mapper/item/ItemDifficultConfigDao.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file