diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java new file mode 100644 index 0000000..04ca721 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/AdminImgController.java @@ -0,0 +1,88 @@ +/** + * 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.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.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.AdminImgDTO; +import com.elink.esua.epdc.service.AdminImgService; +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-10 + */ +@RestController +@RequestMapping("adminimg") +public class AdminImgController { + + @Autowired + private AdminImgService adminImgService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = adminImgService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + AdminImgDTO data = adminImgService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody AdminImgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + adminImgService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody AdminImgDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + adminImgService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + adminImgService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java new file mode 100644 index 0000000..66189f9 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/controller/SysDeptInfoController.java @@ -0,0 +1,88 @@ +/** + * 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.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.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.service.SysDeptInfoService; +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-10 + */ +@RestController +@RequestMapping("sysdeptinfo") +public class SysDeptInfoController { + + @Autowired + private SysDeptInfoService sysDeptInfoService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = sysDeptInfoService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + SysDeptInfoDTO data = sysDeptInfoService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody SysDeptInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + sysDeptInfoService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody SysDeptInfoDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + sysDeptInfoService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + sysDeptInfoService.delete(ids); + return new Result(); + } + + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java new file mode 100644 index 0000000..7746cc1 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/AdminImgDao.java @@ -0,0 +1,33 @@ +/** + * 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.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.entity.AdminImgEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Mapper +public interface AdminImgDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java new file mode 100644 index 0000000..da3595b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/dao/SysDeptInfoDao.java @@ -0,0 +1,33 @@ +/** + * 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.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Mapper +public interface SysDeptInfoDao extends BaseDao { + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java new file mode 100644 index 0000000..774d088 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/AdminImgEntity.java @@ -0,0 +1,56 @@ +/** + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_admin_img") +public class AdminImgEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 引用ID + */ + private String referenceId; + + /** + * 图片地址 + */ + private String imgUrl; + + /** + * 图片类型lllll + */ + private String imgType; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java new file mode 100644 index 0000000..dbbd969 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/entity/SysDeptInfoEntity.java @@ -0,0 +1,86 @@ +/** + * 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.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("sys_dept_info") +public class SysDeptInfoEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 部门ID + */ + private Long deptId; + + /** + * 概况介绍 + */ + private String introduction; + + /** + * 社区数量 + */ + private Integer communityNum; + + /** + * 网格数量 + */ + private Integer gridNum; + + /** + * 网格员数量 + */ + private Integer gridmanNum; + + /** + * 党员数量 + */ + private Integer partyMemberNum; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; + + /** + * 辖区面积 + */ + private String acreage; + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java new file mode 100644 index 0000000..caac71b --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/AdminImgService.java @@ -0,0 +1,107 @@ +/** + * 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.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.AdminImgDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; + +import java.util.List; +import java.util.Map; + +/** + * 图片表 图片表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +public interface AdminImgService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-10 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-10 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return AdminImgDTO + * @author generator + * @date 2021-08-10 + */ + AdminImgDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void save(AdminImgDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void update(AdminImgDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-10 + */ + void delete(String[] ids); + + + + /*** + * 根据类型 +引用ID + * @param imgType + * @param referenceId + * @return com.elink.esua.epdc.dto.AdminImgDTO + * @author qushutong + * @date 2021/8/10 17:20 + */ + AdminImgDTO getDtoByReference(String imgType,String referenceId); +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java new file mode 100644 index 0000000..25c4054 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/SysDeptInfoService.java @@ -0,0 +1,106 @@ +/** + * 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.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; + +import java.util.List; +import java.util.Map; + +/** + * 部门信息表 组织信息表 + * + * @author qu qu@elink-cn.com + * @since v1.0.0 2021-08-10 + */ +public interface SysDeptInfoService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2021-08-10 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2021-08-10 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return SysDeptInfoDTO + * @author generator + * @date 2021-08-10 + */ + SysDeptInfoDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void save(SysDeptInfoDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2021-08-10 + */ + void update(SysDeptInfoDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2021-08-10 + */ + void delete(String[] ids); + + /** + * 根据关联deptID 查询 + * + * @param deptId + * @return SysDeptInfoDTO + * @author generator + * @date 2021-08-10 + */ + SysDeptInfoDTO getDeptInfoByDeptID(String deptId); + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.java new file mode 100644 index 0000000..503a409 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/AdminImgServiceImpl.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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.AdminImgDao; +import com.elink.esua.epdc.dto.AdminImgDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; +import com.elink.esua.epdc.service.AdminImgService; +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-10 + */ +@Service +public class AdminImgServiceImpl extends BaseServiceImpl implements AdminImgService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, AdminImgDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, AdminImgDTO.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 AdminImgDTO get(String id) { + AdminImgEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, AdminImgDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(AdminImgDTO dto) { + AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(AdminImgDTO dto) { + AdminImgEntity entity = ConvertUtils.sourceToTarget(dto, AdminImgEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public AdminImgDTO getDtoByReference(String imgType, String referenceId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(referenceId), FieldConstant.REFERENCE_ID, referenceId); + wrapper.eq(StringUtils.isNotBlank(imgType), FieldConstant.IMG_TYPE, imgType); + return ConvertUtils.sourceToTarget(baseDao.selectOne(wrapper),AdminImgDTO.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java new file mode 100644 index 0000000..1034986 --- /dev/null +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptInfoServiceImpl.java @@ -0,0 +1,109 @@ +/** + * 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.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.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.dao.SysDeptInfoDao; +import com.elink.esua.epdc.dto.SysDeptInfoDTO; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; +import com.elink.esua.epdc.service.SysDeptInfoService; +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-10 + */ +@Service +public class SysDeptInfoServiceImpl extends BaseServiceImpl implements SysDeptInfoService { + + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, SysDeptInfoDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, SysDeptInfoDTO.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 SysDeptInfoDTO get(String id) { + SysDeptInfoEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, SysDeptInfoDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(SysDeptInfoDTO dto) { + SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(SysDeptInfoDTO dto) { + SysDeptInfoEntity entity = ConvertUtils.sourceToTarget(dto, SysDeptInfoEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除(@TableLogic 注解) + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public SysDeptInfoDTO getDeptInfoByDeptID(String deptId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(deptId), FieldConstant.DEPT_ID, deptId); + SysDeptInfoEntity sysDeptInfoEntity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(sysDeptInfoEntity,SysDeptInfoDTO.class); + } + +} \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index a58f161..a7fcc98 100644 --- a/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/epdc-cloud-admin/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.utils.TreeUtils; +import com.elink.esua.epdc.constant.ImgConstant; import com.elink.esua.epdc.constant.RoleTypeKeyConstant; import com.elink.esua.epdc.dao.SysDeptDao; import com.elink.esua.epdc.dto.*; @@ -42,11 +43,15 @@ import com.elink.esua.epdc.dto.epdc.result.AreaCodeChildResultDTO; import com.elink.esua.epdc.dto.epdc.result.AreaCodeParentResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptAreaCodeResultDTO; import com.elink.esua.epdc.dto.epdc.result.UserSysDeptInfoResultDTO; +import com.elink.esua.epdc.entity.AdminImgEntity; import com.elink.esua.epdc.entity.SysDeptEntity; +import com.elink.esua.epdc.entity.SysDeptInfoEntity; import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.feign.GroupFeignClient; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.rocketmq.producer.OrganizationModifyProducer; +import com.elink.esua.epdc.service.AdminImgService; +import com.elink.esua.epdc.service.SysDeptInfoService; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; import com.elink.esua.epdc.utils.EpmetUtils; @@ -93,6 +98,12 @@ public class SysDeptServiceImpl extends BaseServiceImpl list(Map params) { //普通管理员,只能查询所属部门及子部门的数据 @@ -126,10 +137,35 @@ public class SysDeptServiceImpl extends BaseServiceImpl + * @return java.util.Map * @author work@yujt.net.cn * @date 2019/11/29 10:27 */ diff --git a/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml new file mode 100644 index 0000000..4a0cb37 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/AdminImgDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml new file mode 100644 index 0000000..a326a86 --- /dev/null +++ b/epdc-cloud-admin/src/main/resources/mapper/SysDeptInfoDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 5f37956..57330e4 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 5f3795652ce1dddd3bfced7410ffb36036ed5bbf +Subproject commit 57330e4f0947080d545ed8c2c1003636cd9be806 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index ffc7323..b2a4ab3 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit ffc7323ae85c274afed21d90e2cd744c2801a1a8 +Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734