From 9fa6f058606be89ad735b404e01ac28d56012b44 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 17 Jan 2022 13:40:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=88=86=E7=B1=BB=E7=AE=A1?= =?UTF-8?q?=E7=90=86=EF=BC=8C=E5=B8=B8=E7=94=A8=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/AddOftenUseFunctionFormDTO.java | 26 ++++++++++ .../result/OftenUseFunctionListResultDTO.java | 41 +++++++++++++++ .../IcOftenUseFunctionController.java | 36 +++++++++---- .../com/epmet/dao/IcOftenUseFunctionDao.java | 23 ++++++++- .../service/IcOftenUseFunctionService.java | 30 ++++++----- .../impl/IcOftenUseFunctionServiceImpl.java | 43 +++++++++++++--- .../mapper/IcOftenUseFunctionDao.xml | 20 ++++++++ .../form/EditIndividualCategoryFormDTO.java | 26 ++++++++++ .../IndividualCategoryListResultDTO.java | 36 +++++++++++++ .../IcIndividualCategoryManageController.java | 36 +++++++++---- .../dao/IcIndividualCategoryManageDao.java | 23 ++++++++- .../IcIndividualCategoryManageService.java | 29 ++++++----- ...IcIndividualCategoryManageServiceImpl.java | 51 ++++++++++++------- .../mapper/IcIndividualCategoryManageDao.xml | 16 ++++++ 14 files changed, 360 insertions(+), 76 deletions(-) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AddOftenUseFunctionFormDTO.java create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/EditIndividualCategoryFormDTO.java create mode 100644 epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AddOftenUseFunctionFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AddOftenUseFunctionFormDTO.java new file mode 100644 index 0000000000..f03b2a2cf0 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/AddOftenUseFunctionFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/1/17 10:09 上午 + * @DESC + */ +@Data +public class AddOftenUseFunctionFormDTO implements Serializable { + + private static final long serialVersionUID = -8044386389656626183L; + + public interface AddOftenUseFunctionForm{} + + @NotBlank(message = "menuId不能为空", groups = AddOftenUseFunctionForm.class) + private String menuId; + + @NotNull(message = "sort不能为空", groups = AddOftenUseFunctionForm.class) + private Integer sort; +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java new file mode 100644 index 0000000000..73ff018a10 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/OftenUseFunctionListResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/1/17 9:41 上午 + * @DESC + */ +@Data +public class OftenUseFunctionListResultDTO implements Serializable { + + private static final long serialVersionUID = 8561818114575776804L; + + /** + * 跳转url + */ + private String url; + + /** + * 菜单ID + */ + private String menuId; + + /** + * 菜单名字 + */ + private String menuName; + + /** + * 图标 + */ + private String icon; + + /** + * 排序 + */ + private String sort; +} diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java index b852a732f2..07f036e90a 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/IcOftenUseFunctionController.java @@ -1,15 +1,21 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcOftenUseFunctionDTO; +import com.epmet.dto.form.AddOftenUseFunctionFormDTO; +import com.epmet.dto.result.OftenUseFunctionListResultDTO; import com.epmet.service.IcOftenUseFunctionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 常用功能 * @@ -23,19 +29,27 @@ public class IcOftenUseFunctionController { @Autowired private IcOftenUseFunctionService icOftenUseFunctionService; - @PostMapping - public Result save(@RequestBody IcOftenUseFunctionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icOftenUseFunctionService.save(dto); - return new Result(); + /** + * @Description 【社区查询】常用功能查询 + * @param tokenDto + * @author zxc + * @date 2022/1/17 9:47 上午 + */ + @PostMapping("oftenusefunctionlist") + public Result> oftenUseFunctionList(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icOftenUseFunctionService.oftenUseFunctionList(tokenDto)); } - @PutMapping - public Result update(@RequestBody IcOftenUseFunctionDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icOftenUseFunctionService.update(dto); + /** + * @Description 【社区查询】常用功能添加(就是修改) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:13 上午 + */ + @PostMapping("addoftenusefunction") + public Result addOftenUseFunction(@RequestBody List formDTOS, @LoginUser TokenDto tokenDto){ + icOftenUseFunctionService.addOftenUseFunction(formDTOS, tokenDto); return new Result(); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/IcOftenUseFunctionDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/IcOftenUseFunctionDao.java index 9c1a1e4a21..ee0cec00e9 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/IcOftenUseFunctionDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/IcOftenUseFunctionDao.java @@ -18,8 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.OftenUseFunctionListResultDTO; import com.epmet.entity.IcOftenUseFunctionEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 常用功能 @@ -29,5 +33,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcOftenUseFunctionDao extends BaseDao { - + + /** + * @Description 【社区查询】常用功能查询 + * @param userId + * @author zxc + * @date 2022/1/17 10:06 上午 + */ + List oftenUseFunctionList(@Param("userId")String userId); + + /** + * @Description 删除旧数据 + * @param userId + * @param customerId + * @author zxc + * @date 2022/1/17 10:25 上午 + */ + void deleteOldData(@Param("userId")String userId,@Param("customerId")String customerId); + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java index 440e229478..8d0c15b59c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/IcOftenUseFunctionService.java @@ -18,9 +18,14 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcOftenUseFunctionDTO; +import com.epmet.dto.form.AddOftenUseFunctionFormDTO; +import com.epmet.dto.result.OftenUseFunctionListResultDTO; import com.epmet.entity.IcOftenUseFunctionEntity; +import java.util.List; + /** * 常用功能 * @@ -30,22 +35,19 @@ import com.epmet.entity.IcOftenUseFunctionEntity; public interface IcOftenUseFunctionService extends BaseService { /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-01-17 + * @Description 【社区查询】常用功能查询 + * @param tokenDto + * @author zxc + * @date 2022/1/17 9:47 上午 */ - void save(IcOftenUseFunctionDTO dto); + List oftenUseFunctionList(TokenDto tokenDto); /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-01-17 + * @Description 【社区查询】常用功能添加(就是修改) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:13 上午 */ - void update(IcOftenUseFunctionDTO dto); + void addOftenUseFunction(List formDTOS, TokenDto tokenDto); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java index b695a925ff..f12a56feef 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/IcOftenUseFunctionServiceImpl.java @@ -18,14 +18,21 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.IcOftenUseFunctionDao; import com.epmet.dto.IcOftenUseFunctionDTO; +import com.epmet.dto.form.AddOftenUseFunctionFormDTO; +import com.epmet.dto.result.OftenUseFunctionListResultDTO; import com.epmet.entity.IcOftenUseFunctionEntity; import com.epmet.service.IcOftenUseFunctionService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; + /** * 常用功能 * @@ -35,18 +42,40 @@ import org.springframework.transaction.annotation.Transactional; @Service public class IcOftenUseFunctionServiceImpl extends BaseServiceImpl implements IcOftenUseFunctionService { + /** + * @Description 【社区查询】常用功能查询 + * @param tokenDto + * @author zxc + * @date 2022/1/17 9:47 上午 + */ @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcOftenUseFunctionDTO dto) { - IcOftenUseFunctionEntity entity = ConvertUtils.sourceToTarget(dto, IcOftenUseFunctionEntity.class); - insert(entity); + public List oftenUseFunctionList(TokenDto tokenDto) { + List result = baseDao.oftenUseFunctionList(tokenDto.getUserId()); + if (CollectionUtils.isNotEmpty(result)){ + return result; + } + return new ArrayList<>(); } + /** + * @Description 【社区查询】常用功能添加(就是修改) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:13 上午 + */ @Override @Transactional(rollbackFor = Exception.class) - public void update(IcOftenUseFunctionDTO dto) { - IcOftenUseFunctionEntity entity = ConvertUtils.sourceToTarget(dto, IcOftenUseFunctionEntity.class); - updateById(entity); + public void addOftenUseFunction(List formDTOS, TokenDto tokenDto) { + if (CollectionUtils.isNotEmpty(formDTOS)){ + baseDao.deleteOldData(tokenDto.getUserId(),tokenDto.getCustomerId()); + List entities = ConvertUtils.sourceToTarget(formDTOS, IcOftenUseFunctionEntity.class); + entities.forEach(e -> { + e.setCustomerId(tokenDto.getCustomerId()); + e.setUserId(tokenDto.getUserId()); + }); + insertBatch(entities); + } } } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml index 78574bd371..5f25af85fc 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/IcOftenUseFunctionDao.xml @@ -3,5 +3,25 @@ + + + DELETE FROM ic_often_use_function WHERE USER_ID = #{userId} AND CUSTOMER_ID = #{customerId} + + + \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/EditIndividualCategoryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/EditIndividualCategoryFormDTO.java new file mode 100644 index 0000000000..b41d1d04df --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/EditIndividualCategoryFormDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/1/17 10:59 上午 + * @DESC + */ +@Data +public class EditIndividualCategoryFormDTO implements Serializable { + + private static final long serialVersionUID = -3492393795553841513L; + + public interface EditIndividualCategoryForm{} + + @NotBlank(message = "columnId不能为空",groups = EditIndividualCategoryForm.class) + private String columnId; + + @NotNull(message = "sort不能为空",groups = EditIndividualCategoryForm.class) + private Integer sort; +} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java new file mode 100644 index 0000000000..4089a151df --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/1/17 10:52 上午 + * @DESC + */ +@Data +public class IndividualCategoryListResultDTO implements Serializable { + + private static final long serialVersionUID = -3294223041971531203L; + + /** + * 标签 + */ + private String label; + + /** + * 图片 + */ + private String managementIcon; + + /** + * 字段名 + */ + private String columnName; + + /** + * 排序 + */ + private Integer sort; +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java index 44fe329111..cd3122cd47 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java @@ -1,15 +1,21 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcIndividualCategoryManageDTO; +import com.epmet.dto.form.EditIndividualCategoryFormDTO; +import com.epmet.dto.result.IndividualCategoryListResultDTO; import com.epmet.service.IcIndividualCategoryManageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 个人分类管理 * @@ -23,19 +29,27 @@ public class IcIndividualCategoryManageController { @Autowired private IcIndividualCategoryManageService icIndividualCategoryManageService; - @PostMapping - public Result save(@RequestBody IcIndividualCategoryManageDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icIndividualCategoryManageService.save(dto); - return new Result(); + /** + * @Description 【人员分类管理】查询个人分类列表 + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:55 上午 + */ + @PostMapping("individualcategorylist") + public Result> individualCategoryList(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icIndividualCategoryManageService.individualCategoryList(tokenDto)); } - @PutMapping - public Result update(@RequestBody IcIndividualCategoryManageDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icIndividualCategoryManageService.update(dto); + /** + * @Description 【人员分类管理】个人分类修改(添加修改一个接口) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 11:04 上午 + */ + @PostMapping("editindividualcategory") + public Result editIndividualCategory(@RequestBody List formDTOS,@LoginUser TokenDto tokenDto){ + icIndividualCategoryManageService.editIndividualCategory(formDTOS,tokenDto); return new Result(); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcIndividualCategoryManageDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcIndividualCategoryManageDao.java index cdc466058b..772cfc7e73 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcIndividualCategoryManageDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcIndividualCategoryManageDao.java @@ -1,8 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.IndividualCategoryListResultDTO; import com.epmet.entity.IcIndividualCategoryManageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 个人分类管理 @@ -12,5 +16,22 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcIndividualCategoryManageDao extends BaseDao { - + + /** + * @Description 删除旧数据 + * @param userId + * @param customerId + * @author zxc + * @date 2022/1/17 11:10 上午 + */ + void deleteOldData(@Param("userId")String userId,@Param("customerId")String customerId); + + /** + * @Description 【人员分类管理】查询个人分类列表 + * @param userId + * @author zxc + * @date 2022/1/17 1:25 下午 + */ + List individualCategoryList(@Param("userId")String userId); + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java index e21285817c..4b15339377 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java @@ -2,7 +2,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcIndividualCategoryManageDTO; +import com.epmet.dto.form.EditIndividualCategoryFormDTO; +import com.epmet.dto.result.IndividualCategoryListResultDTO; import com.epmet.entity.IcIndividualCategoryManageEntity; import java.util.List; @@ -17,22 +20,20 @@ import java.util.Map; public interface IcIndividualCategoryManageService extends BaseService { /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-01-17 + * @Description 【人员分类管理】查询个人分类列表 + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:55 上午 */ - void save(IcIndividualCategoryManageDTO dto); + List individualCategoryList(TokenDto tokenDto); /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-01-17 + * @Description 【人员分类管理】个人分类修改(添加修改一个接口) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 11:04 上午 */ - void update(IcIndividualCategoryManageDTO dto); + void editIndividualCategory(List formDTOS, TokenDto tokenDto); + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java index 073cbc82b4..c684c8c36e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java @@ -1,23 +1,19 @@ package com.epmet.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.IcIndividualCategoryManageDao; -import com.epmet.dto.IcIndividualCategoryManageDTO; +import com.epmet.dto.form.EditIndividualCategoryFormDTO; +import com.epmet.dto.result.IndividualCategoryListResultDTO; import com.epmet.entity.IcIndividualCategoryManageEntity; import com.epmet.service.IcIndividualCategoryManageService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 个人分类管理 @@ -28,18 +24,39 @@ import java.util.Map; @Service public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl implements IcIndividualCategoryManageService { + /** + * @Description 【人员分类管理】查询个人分类列表 + * @param tokenDto + * @author zxc + * @date 2022/1/17 10:55 上午 + */ @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcIndividualCategoryManageDTO dto) { - IcIndividualCategoryManageEntity entity = ConvertUtils.sourceToTarget(dto, IcIndividualCategoryManageEntity.class); - insert(entity); + public List individualCategoryList(TokenDto tokenDto) { + List result = baseDao.individualCategoryList(tokenDto.getUserId()); + if (CollectionUtils.isNotEmpty(result)){ + return result; + } + return new ArrayList<>(); } + /** + * @Description 【人员分类管理】个人分类修改(添加修改一个接口) + * @param formDTOS + * @param tokenDto + * @author zxc + * @date 2022/1/17 11:04 上午 + */ @Override @Transactional(rollbackFor = Exception.class) - public void update(IcIndividualCategoryManageDTO dto) { - IcIndividualCategoryManageEntity entity = ConvertUtils.sourceToTarget(dto, IcIndividualCategoryManageEntity.class); - updateById(entity); + public void editIndividualCategory(List formDTOS, TokenDto tokenDto) { + if (CollectionUtils.isNotEmpty(formDTOS)){ + baseDao.deleteOldData(tokenDto.getUserId(),tokenDto.getCustomerId()); + List entities = ConvertUtils.sourceToTarget(formDTOS, IcIndividualCategoryManageEntity.class); + entities.forEach(e -> { + e.setCustomerId(tokenDto.getCustomerId()); + e.setUserId(tokenDto.getUserId()); + }); + insertBatch(entities); + } } - } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml index abb3d01e4a..926e0a8baf 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcIndividualCategoryManageDao.xml @@ -3,5 +3,21 @@ + + + DELETE FROM ic_individual_category_manage WHERE USER_ID = #{userId} AND CUSTOMER_ID = #{customerId} + + + \ No newline at end of file