From 58e0dc7588936ec80392de104233884a636e575a Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 15 Jun 2022 09:48:18 +0800 Subject: [PATCH 01/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/PointAdditiveRuleDTO.java | 100 +++++++++++++++++ .../java/com/epmet/dto/PointRewardDTO.java | 104 ++++++++++++++++++ .../com/epmet/dto/PointRewardRuleDTO.java | 69 ++++++++++++ .../PointAdditiveRuleController.java | 82 ++++++++++++++ .../controller/PointRewardController.java | 82 ++++++++++++++ .../controller/PointRewardRuleController.java | 82 ++++++++++++++ .../com/epmet/dao/PointAdditiveRuleDao.java | 16 +++ .../java/com/epmet/dao/PointRewardDao.java | 16 +++ .../com/epmet/dao/PointRewardRuleDao.java | 16 +++ .../epmet/entity/PointAdditiveRuleEntity.java | 69 ++++++++++++ .../com/epmet/entity/PointRewardEntity.java | 74 +++++++++++++ .../epmet/entity/PointRewardRuleEntity.java | 39 +++++++ .../epmet/excel/PointAdditiveRuleExcel.java | 66 +++++++++++ .../com/epmet/excel/PointRewardExcel.java | 69 ++++++++++++ .../com/epmet/excel/PointRewardRuleExcel.java | 48 ++++++++ .../epmet/redis/PointAdditiveRuleRedis.java | 30 +++++ .../com/epmet/redis/PointRewardRedis.java | 30 +++++ .../com/epmet/redis/PointRewardRuleRedis.java | 30 +++++ .../service/PointAdditiveRuleService.java | 78 +++++++++++++ .../epmet/service/PointRewardRuleService.java | 78 +++++++++++++ .../com/epmet/service/PointRewardService.java | 78 +++++++++++++ .../impl/PointAdditiveRuleServiceImpl.java | 87 +++++++++++++++ .../impl/PointRewardRuleServiceImpl.java | 87 +++++++++++++++ .../service/impl/PointRewardServiceImpl.java | 87 +++++++++++++++ .../resources/mapper/PointAdditiveRuleDao.xml | 26 +++++ .../main/resources/mapper/PointRewardDao.xml | 27 +++++ .../resources/mapper/PointRewardRuleDao.xml | 20 ++++ 27 files changed, 1590 insertions(+) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java new file mode 100644 index 0000000000..3171aa9566 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java @@ -0,0 +1,100 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointAdditiveRuleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + /** + * 积分类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + private String pid; + + /** + * 上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0 + */ + private String pids; + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java new file mode 100644 index 0000000000..3602e3a5cb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardDTO.java @@ -0,0 +1,104 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointRewardDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * 组织ID路径 + */ + private String agencyPids; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 工作人员ID + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 操作类型;积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + + /** + * 备注说明;200字内 + */ + private String statement; + + /** + * 奖扣总分值 + */ + private Integer pointValue; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java new file mode 100644 index 0000000000..d3cac0024d --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointRewardRuleDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointRewardRuleDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户ID + */ + private String customerId; + + /** + * 奖扣ID + */ + private String rewardId; + + /** + * 规则ID + */ + private String ruleId; + + /** + * 删除标识;0.未删除 1.已删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java new file mode 100644 index 0000000000..2e0e82bb8f --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.PointAdditiveRuleDTO; +import com.epmet.excel.PointAdditiveRuleExcel; +import com.epmet.service.PointAdditiveRuleService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("pointAdditiveRule") +public class PointAdditiveRuleController { + + @Autowired + private PointAdditiveRuleService pointAdditiveRuleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointAdditiveRuleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointAdditiveRuleDTO data = pointAdditiveRuleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointAdditiveRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointAdditiveRuleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointAdditiveRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointAdditiveRuleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointAdditiveRuleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointAdditiveRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointAdditiveRuleExcel.class); + } + + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java new file mode 100644 index 0000000000..f5c802c4eb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.PointRewardDTO; +import com.epmet.excel.PointRewardExcel; +import com.epmet.service.PointRewardService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("pointReward") +public class PointRewardController { + + @Autowired + private PointRewardService pointRewardService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointRewardService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointRewardDTO data = pointRewardService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointRewardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointRewardService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointRewardDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointRewardService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointRewardService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointRewardService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointRewardExcel.class); + } + + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java new file mode 100644 index 0000000000..9ee5a025e8 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardRuleController.java @@ -0,0 +1,82 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.AssertUtils; +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.PointRewardRuleDTO; +import com.epmet.excel.PointRewardRuleExcel; +import com.epmet.service.PointRewardRuleService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@RestController +@RequestMapping("pointRewardRule") +public class PointRewardRuleController { + + @Autowired + private PointRewardRuleService pointRewardRuleService; + + @RequestMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = pointRewardRuleService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + PointRewardRuleDTO data = pointRewardRuleService.get(id); + return new Result().ok(data); + } + + @NoRepeatSubmit + @PostMapping("save") + public Result save(@RequestBody PointRewardRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + pointRewardRuleService.save(dto); + return new Result(); + } + + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody PointRewardRuleDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + pointRewardRuleService.update(dto); + return new Result(); + } + + @PostMapping("delete") + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + pointRewardRuleService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = pointRewardRuleService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, PointRewardRuleExcel.class); + } + + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java new file mode 100644 index 0000000000..2729a86c27 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointAdditiveRuleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointAdditiveRuleDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java new file mode 100644 index 0000000000..ce5566f4fe --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointRewardEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointRewardDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java new file mode 100644 index 0000000000..99f2d046bf --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardRuleDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.PointRewardRuleEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Mapper +public interface PointRewardRuleDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java new file mode 100644 index 0000000000..fbd1ebbdf5 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRuleEntity.java @@ -0,0 +1,69 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_additive_rule") +public class PointAdditiveRuleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + /** + * 积分类别编码;德育积分moral_education；党建积分party_building + */ + private String categoryCode; + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + private String pid; + + /** + * 上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0 + */ + private String pids; + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java new file mode 100644 index 0000000000..b1b1c8dbcf --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardEntity.java @@ -0,0 +1,74 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_reward") +public class PointRewardEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 组织ID + */ + private String agencyId; + + /** + * 组织ID路径 + */ + private String agencyPids; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 房屋名称;完整拼接的名称 + */ + private String houseAllName; + + /** + * 工作人员ID + */ + private String staffId; + + /** + * 工作人员姓名 + */ + private String staffName; + + /** + * 操作类型;积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + + /** + * 备注说明;200字内 + */ + private String statement; + + /** + * 奖扣总分值 + */ + private Integer pointValue; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java new file mode 100644 index 0000000000..d32582f876 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointRewardRuleEntity.java @@ -0,0 +1,39 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; + +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("point_reward_rule") +public class PointRewardRuleEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户ID + */ + private String customerId; + + /** + * 奖扣ID + */ + private String rewardId; + + /** + * 规则ID + */ + private String ruleId; + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java new file mode 100644 index 0000000000..b87cae4a7e --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointAdditiveRuleExcel.java @@ -0,0 +1,66 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointAdditiveRuleExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "记录类型;分类:category；规则:rule") + private String type; + + @Excel(name = "允许申请标记;允许0（type = category时，强制赋值为0），禁止1。") + private String applyFlag; + + @Excel(name = "积分类别编码;德育积分moral_education；党建积分party_building") + private String categoryCode; + + @Excel(name = "积分类别名称;type=category时必填") + private String categoryName; + + @Excel(name = "积分规则名称;type=rule时必填") + private String ruleName; + + @Excel(name = "上级节点ID;上级分类ID，顶级分类的PID为0") + private String pid; + + @Excel(name = "上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0") + private String pids; + + @Excel(name = "分值;正数加分，负数减分；type=rule时必填") + private Integer pointValue; + + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java new file mode 100644 index 0000000000..e4b3857ddc --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardExcel.java @@ -0,0 +1,69 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointRewardExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "组织ID") + private String agencyId; + + @Excel(name = "组织ID路径") + private String agencyPids; + + @Excel(name = "房屋ID") + private String houseId; + + @Excel(name = "房屋名称;完整拼接的名称") + private String houseAllName; + + @Excel(name = "工作人员ID") + private String staffId; + + @Excel(name = "工作人员姓名") + private String staffName; + + @Excel(name = "操作类型;积分奖励point_reward；积分扣罚point_fine") + private String businessCode; + + @Excel(name = "备注说明;200字内") + private String statement; + + @Excel(name = "奖扣总分值") + private Integer pointValue; + + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java new file mode 100644 index 0000000000..cf300c2f43 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/excel/PointRewardRuleExcel.java @@ -0,0 +1,48 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Data +public class PointRewardRuleExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "客户ID") + private String customerId; + + @Excel(name = "奖扣ID") + private String rewardId; + + @Excel(name = "规则ID") + private String ruleId; + + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java new file mode 100644 index 0000000000..b8345af3c2 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointAdditiveRuleRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Component +public class PointAdditiveRuleRedis { + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java new file mode 100644 index 0000000000..dbf8ec87da --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Component +public class PointRewardRedis { + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java new file mode 100644 index 0000000000..1742b32ad0 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/redis/PointRewardRuleRedis.java @@ -0,0 +1,30 @@ +package com.epmet.redis; + +import com.epmet.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Component +public class PointRewardRuleRedis { + @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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java new file mode 100644 index 0000000000..34fe5a1186 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.entity.PointAdditiveRuleEntity; + +import java.util.List; +import java.util.Map; + +/** + * 附加积分规则 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointAdditiveRuleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointAdditiveRuleDTO + * @author generator + * @date 2022-06-15 + */ + PointAdditiveRuleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointAdditiveRuleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointAdditiveRuleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java new file mode 100644 index 0000000000..182ac69e74 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.entity.PointRewardRuleEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣明细 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointRewardRuleService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointRewardRuleDTO + * @author generator + * @date 2022-06-15 + */ + PointRewardRuleDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointRewardRuleDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointRewardRuleDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java new file mode 100644 index 0000000000..0faafbdf1a --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardService.java @@ -0,0 +1,78 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.PointRewardDTO; +import com.epmet.entity.PointRewardEntity; + +import java.util.List; +import java.util.Map; + +/** + * 积分奖扣 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +public interface PointRewardService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2022-06-15 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2022-06-15 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return PointRewardDTO + * @author generator + * @date 2022-06-15 + */ + PointRewardDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void save(PointRewardDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2022-06-15 + */ + void update(PointRewardDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2022-06-15 + */ + void delete(String[] ids); +} \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java new file mode 100644 index 0000000000..fa426708a5 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -0,0 +1,87 @@ +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.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointAdditiveRuleDao; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.entity.PointAdditiveRuleEntity; +import com.epmet.redis.PointAdditiveRuleRedis; +import com.epmet.service.PointAdditiveRuleService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointAdditiveRuleServiceImpl extends BaseServiceImpl implements PointAdditiveRuleService { + + @Autowired + private PointAdditiveRuleRedis pointAdditiveRuleRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveRuleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveRuleDTO.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 PointAdditiveRuleDTO get(String id) { + PointAdditiveRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveRuleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAdditiveRuleDTO dto) { + PointAdditiveRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRuleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAdditiveRuleDTO dto) { + PointAdditiveRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRuleEntity.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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java new file mode 100644 index 0000000000..080aac9ea0 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardRuleServiceImpl.java @@ -0,0 +1,87 @@ +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.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointRewardRuleDao; +import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.entity.PointRewardRuleEntity; +import com.epmet.redis.PointRewardRuleRedis; +import com.epmet.service.PointRewardRuleService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointRewardRuleServiceImpl extends BaseServiceImpl implements PointRewardRuleService { + + @Autowired + private PointRewardRuleRedis pointRewardRuleRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointRewardRuleDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointRewardRuleDTO.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 PointRewardRuleDTO get(String id) { + PointRewardRuleEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointRewardRuleDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointRewardRuleDTO dto) { + PointRewardRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardRuleEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointRewardRuleDTO dto) { + PointRewardRuleEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardRuleEntity.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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java new file mode 100644 index 0000000000..45c4fbcbf8 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java @@ -0,0 +1,87 @@ +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.utils.ConvertUtils; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.dao.PointRewardDao; +import com.epmet.dto.PointRewardDTO; +import com.epmet.entity.PointRewardEntity; +import com.epmet.redis.PointRewardRedis; +import com.epmet.service.PointRewardService; +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 generator generator@elink-cn.com + * @since v1.0.0 2022-06-15 + */ +@Service +public class PointRewardServiceImpl extends BaseServiceImpl implements PointRewardService { + + @Autowired + private PointRewardRedis pointRewardRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointRewardDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointRewardDTO.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 PointRewardDTO get(String id) { + PointRewardEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointRewardDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointRewardDTO dto) { + PointRewardEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointRewardDTO dto) { + PointRewardEntity entity = ConvertUtils.sourceToTarget(dto, PointRewardEntity.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/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml new file mode 100644 index 0000000000..c490e974b4 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml new file mode 100644 index 0000000000..ed5a138721 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml new file mode 100644 index 0000000000..e0fb760bd7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardRuleDao.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 25e9ef1dc5426e9dec990dcf0b1d248db3ce278c Mon Sep 17 00:00:00 2001 From: YUJT Date: Wed, 15 Jun 2022 13:50:06 +0800 Subject: [PATCH 02/43] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E8=BF=9B=E8=A1=8C?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/security/config/WebMvcConfig.java | 49 +++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index 1d201149f4..0e7b26138a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -1,8 +1,8 @@ /** * Copyright (c) 2018 人人开源 All rights reserved. - * + *

* https://www.renren.io - * + *

* 版权所有，侵权必究！ */ @@ -11,10 +11,14 @@ package com.epmet.commons.tools.security.config; import com.epmet.commons.tools.security.resolver.LoginUserHandlerMethodArgumentResolver; import com.epmet.commons.tools.security.resolver.UserDetailHandlerMethodArgumentResolver; import com.epmet.commons.tools.utils.DateUtils; +import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonSerializer; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -27,9 +31,10 @@ import org.springframework.http.converter.support.AllEncompassingFormHttpMessage import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.io.IOException; +import java.lang.reflect.Field; import java.text.SimpleDateFormat; -import java.util.List; -import java.util.TimeZone; +import java.util.*; /** * MVC配置 @@ -43,6 +48,7 @@ public class WebMvcConfig implements WebMvcConfigurer { private UserDetailHandlerMethodArgumentResolver userDetailHandlerMethodArgumentResolver; @Autowired private LoginUserHandlerMethodArgumentResolver loginUserHandlerMethodArgumentResolver; + @Override public void addArgumentResolvers(List argumentResolvers) { argumentResolvers.add(loginUserHandlerMethodArgumentResolver); @@ -75,6 +81,41 @@ public class WebMvcConfig implements WebMvcConfigurer { simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); mapper.registerModule(simpleModule); + mapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer() { + @Override + public void serialize(Object value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { + + String fieldName = jsonGenerator.getOutputContext().getCurrentName(); + Field field = null; + try { + //反射获取字段类型 + field = jsonGenerator.getCurrentValue().getClass().getDeclaredField(fieldName); + } catch (NoSuchFieldException e) { + e.printStackTrace(); + } + + if (null != field) { + if (Objects.equals(field.getType(), String.class)) { + // 字符串型空值"" + jsonGenerator.writeString(StringUtils.EMPTY); + return; + } else if (Objects.equals(field.getType(), List.class)) { + // 列表型空值返回[] + jsonGenerator.writeStartArray(); + jsonGenerator.writeEndArray(); + return; + } else if (Objects.equals(field.getType(), Map.class)) { + // map型空值返回{} + jsonGenerator.writeStartObject(); + jsonGenerator.writeEndObject(); + return; + } + } + + // 默认返回"" + jsonGenerator.writeString(StringUtils.EMPTY); + } + }); converter.setObjectMapper(mapper); return converter; } From a2eb09de03e47e6f57115169a04452efe31dddf3 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 15 Jun 2022 16:48:15 +0800 Subject: [PATCH 03/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/CategorydetailResultDTO.java | 45 ++++++++++ .../epmet/dto/form/AddcategoryFormDTO.java | 32 +++++++ .../com/epmet/dto/form/AddruleFormDTO.java | 44 ++++++++++ .../com/epmet/dto/form/List4applyFormDTO.java | 36 ++++++++ .../com/epmet/dto/form/List4treeFormDTO.java | 27 ++++++ .../epmet/common/enu/PointAddRuleEnum.java | 41 +++++++++ .../PointAdditiveRuleController.java | 87 ++++++++++++++++++- .../com/epmet/dao/PointAdditiveRuleDao.java | 46 +++++++++- .../service/PointAdditiveRuleService.java | 62 ++++++++++++- .../impl/PointAdditiveRuleServiceImpl.java | 70 ++++++++++++++- .../resources/mapper/PointAdditiveRuleDao.xml | 56 +++++++++++- 11 files changed, 539 insertions(+), 7 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java new file mode 100644 index 0000000000..61bfbc41c6 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/CategorydetailResultDTO.java @@ -0,0 +1,45 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 10:44 + **/ +@Data +public class CategorydetailResultDTO implements Serializable { + + /** + *类别ID + */ + private String id; + + /** + *类别名 + */ + private String categoryName; + + /** + *上级类别ID + */ + private String pid; + + /** + *上级类别名 + */ + private String parentCategoryName; + + /** + *创建时间 + */ + private String createdTime; + + /** + *修改时间 + */ + private String updatedTime; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java new file mode 100644 index 0000000000..41aecae242 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddcategoryFormDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 11:12 + **/ +@Data +public class AddcategoryFormDTO implements Serializable { + + /** + *类别名称 + */ + @NotNull(message = "类别名称不可为空") + private String categoryName; + + /** + *上级类别ID + */ + @NotNull(message = "上级类别不可为空") + private String pid; + + private String customerId; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java new file mode 100644 index 0000000000..53dd15ca35 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/AddruleFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 11:12 + **/ +@Data +public class AddruleFormDTO implements Serializable { + + /** + *积分规则名称 + */ + @NotNull(message = "积分规则名称不可为空") + private String ruleName; + + /** + *上级类别ID + */ + @NotNull(message = "上级类别不可为空") + private String pid; + + /** + *分值，整数，可以为负数(表示减分) + */ + @NotNull(message = "分值不可为空") + private Integer pointValue; + + /** + *允许申请0，不允许申请1 + */ + @NotNull(message = "申请标记不可为空") + private String applyFlag; + + private String customerId; + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java new file mode 100644 index 0000000000..441bf8d353 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java @@ -0,0 +1,36 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 16:23 + **/ +@Data +public class List4applyFormDTO implements Serializable { + + /** + *允许申请0，不允许申请1 + */ + private String applyFlag; + + /** + *类别 + */ + @NotNull(message = "类别不可为空") + private String categoryCode; + + /** + * 记录类型;分类:category；规则:rule + */ + private String type; + + + + private String customerId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java new file mode 100644 index 0000000000..2f3e912649 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4treeFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 10:10 + **/ +@Data +public class List4treeFormDTO implements Serializable { + + /** + * 类别名称 + */ + private String categoryName; + + /** + * 规则名称 + */ + private String ruleName; + + private String customerId; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java new file mode 100644 index 0000000000..91ced60017 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/PointAddRuleEnum.java @@ -0,0 +1,41 @@ +package com.epmet.common.enu; + +/** +* @describe: 积分规则枚举类 +* @author wangtong +* @date 2022/6/15 13:54 +*/ +public enum PointAddRuleEnum { + CATEGORY_TYPE("category", "分类"), + RULE_TYPE("rule", "规则"), + APPLY_ALLOW("0", "允许"), + APPLY_BAN("1", "禁止"), + ; + + private String code; + private String desc; + + + PointAddRuleEnum(String code, String name) { + this.code = code; + this.desc = name; + } + + public static PointAddRuleEnum getEnum(String code) { + PointAddRuleEnum[] values = PointAddRuleEnum.values(); + for (PointAddRuleEnum value : values) { + if (code != null && value.getCode().equals(code)) { + return value; + } + } + return null; + } + + public String getCode() { + return code; + } + + public String getDesc() { + return desc; + } +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java index 2e0e82bb8f..d5e75497d9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -1,15 +1,22 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; 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.commons.tools.validator.group.UpdateGroup; +import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.AddcategoryFormDTO; +import com.epmet.dto.form.AddruleFormDTO; +import com.epmet.dto.form.List4applyFormDTO; +import com.epmet.dto.form.List4treeFormDTO; import com.epmet.excel.PointAdditiveRuleExcel; import com.epmet.service.PointAdditiveRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +34,7 @@ import java.util.Map; * @since v1.0.0 2022-06-15 */ @RestController -@RequestMapping("pointAdditiveRule") +@RequestMapping("additiverule") public class PointAdditiveRuleController { @Autowired @@ -77,6 +84,82 @@ public class PointAdditiveRuleController { ExcelUtils.exportExcelToTarget(response, null, list, PointAdditiveRuleExcel.class); } + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 10:11 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("list4tree") + public Result> list4tree(@LoginUser TokenDto tokenDto, @RequestBody List4treeFormDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.list4tree(dto); + } + + /** + * @describe: 查询下级类别简要信息 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("subcategory/listbrief/{categoryId}") + public Result> listbrief(@PathVariable("categoryId") String categoryId){ + return pointAdditiveRuleService.listbrief(categoryId); + } + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("categorydetail/{categoryId}") + public Result categorydetail(@PathVariable("categoryId") String categoryId){ + return pointAdditiveRuleService.categorydetail(categoryId); + } + /** + * @describe: 添加积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("addcategory") + public Result addcategory(@LoginUser TokenDto tokenDto,@RequestBody AddcategoryFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.addcategory(dto); + } + + /** + * @describe: 添加积分规则 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("addrule") + public Result addrule(@LoginUser TokenDto tokenDto,@RequestBody AddruleFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.addrule(dto); + } + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("list4apply") + public Result> list4apply(@LoginUser TokenDto tokenDto,@RequestBody List4applyFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.list4apply(dto); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 2729a86c27..9d4da90278 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -1,8 +1,15 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.CategorydetailResultDTO; +import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.List4applyFormDTO; +import com.epmet.dto.form.List4treeFormDTO; import com.epmet.entity.PointAdditiveRuleEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 附加积分规则 @@ -12,5 +19,40 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointAdditiveRuleDao extends BaseDao { - -} \ No newline at end of file + + /** + * @describe: 查询下级类别简要信息 + * @author wangtong + * @date 2022/6/15 10:30 + * @params [categoryId] + * @return java.util.List + */ + List selectListbrief(@Param("categoryId") String categoryId); + + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:52 + * @params [categoryId] + * @return com.epmet.dto.CategorydetailResultDTO + */ + CategorydetailResultDTO selectCategorydetail(@Param("categoryId") String categoryId); + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 16:29 + * @params [dto] + * @return java.util.List + */ + List selectList4apply(List4applyFormDTO dto); + + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 16:43 + * @params [dto] + * @return java.util.List + */ + List selectList4tree(List4treeFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java index 34fe5a1186..27f0546f84 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -2,7 +2,13 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.AddcategoryFormDTO; +import com.epmet.dto.form.AddruleFormDTO; +import com.epmet.dto.form.List4applyFormDTO; +import com.epmet.dto.form.List4treeFormDTO; import com.epmet.entity.PointAdditiveRuleEntity; import java.util.List; @@ -75,4 +81,58 @@ public interface PointAdditiveRuleService extends BaseService> + */ + Result> listbrief(String categoryId); + + /** + * @describe: 查询积分类别详情 + * @author wangtong + * @date 2022/6/15 10:49 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + Result categorydetail(String categoryId); + + /** + * @describe: 添加积分类别 + * @author wangtong + * @date 2022/6/15 11:14 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result addcategory(AddcategoryFormDTO dto); + + /** + * @describe: 添加积分规则 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + Result addrule(AddruleFormDTO dto); + + /** + * @describe: [附加积分]获取允许申请的积分类别 + * @author wangtong + * @date 2022/6/15 10:23 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result> + */ + Result> list4apply(List4applyFormDTO dto); + + /** + * @describe: 查询积分类别规则列表 + * @author wangtong + * @date 2022/6/15 10:11 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result> list4tree(List4treeFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index fa426708a5..bae799657f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -2,12 +2,20 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.enu.PointAddRuleEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveRuleDao; +import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; +import com.epmet.dto.form.AddcategoryFormDTO; +import com.epmet.dto.form.AddruleFormDTO; +import com.epmet.dto.form.List4applyFormDTO; +import com.epmet.dto.form.List4treeFormDTO; import com.epmet.entity.PointAdditiveRuleEntity; import com.epmet.redis.PointAdditiveRuleRedis; import com.epmet.service.PointAdditiveRuleService; @@ -84,4 +92,64 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl> listbrief(String categoryId) { + List result = baseDao.selectListbrief(categoryId); + return new Result>().ok(result); + } + + @Override + public Result categorydetail(String categoryId) { + CategorydetailResultDTO result = baseDao.selectCategorydetail(categoryId); + return new Result().ok(result); + } + + @Override + public Result addcategory(AddcategoryFormDTO dto) { + PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode()); + entity.setApplyFlag(PointAddRuleEnum.APPLY_ALLOW.getCode()); + entity.setCategoryName(dto.getCategoryName()); + entity.setPid(dto.getPid()); + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + entity.setCategoryCode(parentEntity.getCategoryCode()); + } + insert(entity); + return new Result().ok("新增成功！"); + } + + @Override + public Result addrule(AddruleFormDTO dto) { + PointAdditiveRuleEntity entity = new PointAdditiveRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setType(PointAddRuleEnum.RULE_TYPE.getCode()); + entity.setRuleName(dto.getRuleName()); + entity.setApplyFlag(dto.getApplyFlag()); + entity.setPointValue(dto.getPointValue()); + entity.setPid(dto.getPid()); + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + entity.setCategoryCode(parentEntity.getCategoryCode()); + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + } + insert(entity); + return new Result().ok("新增成功！"); + } + + @Override + public Result> list4apply(List4applyFormDTO dto) { + dto.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode()); + List result = baseDao.selectList4apply(dto); + return new Result>().ok(result); + } + + @Override + public Result> list4tree(List4treeFormDTO dto) { + List result = baseDao.selectList4tree(dto); + return new Result>().ok(result); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index c490e974b4..78d24c5da2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -21,6 +21,60 @@ + + + + - \ No newline at end of file + From 95fc72ad2c8991a8c54875d13c479ce6da16620e Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 15 Jun 2022 17:46:50 +0800 Subject: [PATCH 04/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/feign/CommonUserFeignClient.java | 20 +++ .../CommonUserFeignClientFallBackFactory.java | 24 ++++ .../CommonUserFeignClientFallback.java | 23 ++++ .../redis/common/CustomerResiUserRedis.java | 90 +++++++++++++ .../java/com/epmet/dto/PointApplyDTO.java | 11 +- .../epmet/dto/form/CommonPageUserFormDTO.java | 2 + .../epmet/dto/form/PointApplyPageFormDTO.java | 44 +++++++ .../com/epmet/dto/form/PointAuditFormDTO.java | 20 +++ .../result/PointAditiveRecordDailyDTO.java | 43 +++++++ .../result/PointAditiveRecordResultDTO.java | 21 +++ .../com/epmet/common/enu/ApplyStatusEnum.java | 2 +- .../controller/PointApplyController.java | 20 ++- .../epmet/controller/ResiPointController.java | 25 +++- .../com/epmet/dao/PointAditiveRecordDao.java | 16 ++- .../java/com/epmet/dao/PointApplyDao.java | 24 ++++ .../service/PointAditiveRecordService.java | 12 ++ .../com/epmet/service/PointApplyService.java | 16 ++- .../impl/PointAditiveRecordServiceImpl.java | 65 +++++++++- .../service/impl/PointApplyServiceImpl.java | 121 ++++++++++++++++-- .../mapper/PointAditiveRecordDao.xml | 23 ++++ .../main/resources/mapper/PointApplyDao.xml | 87 +++++++++++++ .../controller/UserBaseInfoController.java | 6 + .../epmet/service/UserBaseInfoService.java | 10 ++ .../service/impl/UserBaseInfoServiceImpl.java | 15 +++ 24 files changed, 713 insertions(+), 27 deletions(-) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java new file mode 100644 index 0000000000..0f8f937a8a --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/CommonUserFeignClient.java @@ -0,0 +1,20 @@ +package com.epmet.commons.tools.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.fallback.CommonUserFeignClientFallBackFactory; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.Result; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:42 下午 + * @DESC + */ +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = CommonUserFeignClientFallBackFactory.class) +public interface CommonUserFeignClient { + @PostMapping("/epmetuser/userbaseinfo/getUserInfo/{userId}") + Result getUserInfo(@PathVariable("userId") String userId); +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java new file mode 100644 index 0000000000..269ee6d985 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallBackFactory.java @@ -0,0 +1,24 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import feign.hystrix.FallbackFactory; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +/** + * @Author zqf + * @DateTime 2022/3/17 1:46 下午 + * @DESC + */ +@Slf4j +@Component +public class CommonUserFeignClientFallBackFactory implements FallbackFactory { + private CommonUserFeignClientFallback fallback = new CommonUserFeignClientFallback(); + @Override + public CommonUserFeignClient create(Throwable cause) { + log.error(String.format("FeignClient调用发生异常,异常信息:%s", ExceptionUtils.getThrowableErrorStackTrace(cause))); + return fallback; + } + +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java new file mode 100644 index 0000000000..8cd5660484 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/fallback/CommonUserFeignClientFallback.java @@ -0,0 +1,23 @@ +package com.epmet.commons.tools.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import org.springframework.stereotype.Component; + +/** + * 调用政府端权限 + * @Author zqf + * @Description + * @Date 2020/4/24 11:17 + **/ +@Component +public class CommonUserFeignClientFallback implements CommonUserFeignClient { + + @Override + public Result getUserInfo(String userId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserInfo", userId); + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java new file mode 100644 index 0000000000..5b34fcdee7 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/CustomerResiUserRedis.java @@ -0,0 +1,90 @@ +package com.epmet.commons.tools.redis.common; + +import cn.hutool.core.bean.BeanUtil; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.CommonUserFeignClient; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.jetbrains.annotations.Nullable; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import javax.annotation.PostConstruct; +import javax.annotation.Resource; +import java.util.Map; + +/** + * 居民缓存通用类 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-22 + */ +@Slf4j +@Component +public class CustomerResiUserRedis { + @Resource + private RedisUtils redisUtils; + @Resource + private CommonUserFeignClient commonUserFeignClient; + + private static CustomerResiUserRedis customerResiUserRedis; + private static final String ROLE_MAP_KEY = "roleMap"; + + @PostConstruct + public void init() { + customerResiUserRedis = this; + customerResiUserRedis.redisUtils = this.redisUtils; + customerResiUserRedis.commonUserFeignClient = this.commonUserFeignClient; + } + + /** + * desc: 获取居民缓存 + * + * @param userId + * @return com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache + * @author LiuJanJun + * @date 2021/8/19 10:29 下午 + * @remark 此方法仅用于 获取某个工作人员的信息，不用于获取客户下所有工作人员信息 + */ + public static ResiUserInfoCache getUserBaseInfo(String userId) { + if (StringUtils.isBlank(userId)){ + log.warn("getUserBaseInfo param is blank,userId:{}",userId); + return null; + } + String key = RedisKeys.getResiUserKey(userId); + Map map = customerResiUserRedis.redisUtils.hGetAll(key); + if (!CollectionUtils.isEmpty(map)) { + return ConvertUtils.mapToEntity(map, ResiUserInfoCache.class); + } + + ResiUserInfoCache resultData = reloadStaffCache(userId, key); + if (resultData == null) { + return null; + } + + return resultData; + } + + @Nullable + private static ResiUserInfoCache reloadStaffCache(String userId, String key) { + Result result = customerResiUserRedis.commonUserFeignClient.getUserInfo(userId); + if (result == null || !result.success()) { + throw new RenException("获取居民信息失败"); + } + ResiUserInfoCache resultData = result.getData(); + if (null == resultData) { + log.warn("居民信息为空,userId:{}", userId); + return null; + } + + Map map = BeanUtil.beanToMap(resultData, false, true); + customerResiUserRedis.redisUtils.hMSet(key, map); + return resultData; + } + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java index 459447f84c..1cd7fc89e5 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointApplyDTO.java @@ -1,8 +1,11 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; +import java.util.List; /** @@ -115,7 +118,7 @@ public class PointApplyDTO implements Serializable { * 昵称 */ private String nickname; - + private String showName; /** * 性别;未知0；男1；女2 */ @@ -141,6 +144,9 @@ public class PointApplyDTO implements Serializable { */ private String remark; + private List annexList; + private Integer pointValue; + /** * 删除标识;0.未删除 1.已删除 */ @@ -159,6 +165,7 @@ public class PointApplyDTO implements Serializable { /** * 创建时间 */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8") private Date createdTime; /** diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java index 6ccb0b2a51..d76f874e4c 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/CommonPageUserFormDTO.java @@ -29,4 +29,6 @@ public class CommonPageUserFormDTO implements Serializable { @NotBlank(message = "获取不到客户Id" , groups = PageUserGroup.class) private String customerId; + + private String categoryCode; } diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java new file mode 100644 index 0000000000..13a1581e06 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointApplyPageFormDTO.java @@ -0,0 +1,44 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 14:57 + */ +@Data +public class PointApplyPageFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -2274024797424706386L; + /** + * 姓名 + */ + private String name; + /** + * 身份证 + */ + private String idCard; + /** + * 手机号 + */ + private String mobile; + /** + * 申请状态;0已提交；1已驳回；2已通过 + */ + private String status; + /** + * 开始时间 + */ + private String startTime; + /** + * 结束时间 + */ + private String endTime; + + private String categoryCode; + + private String agencyId; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java new file mode 100644 index 0000000000..6acae8a5af --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointAuditFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 15:18 + */ +@Data +public class PointAuditFormDTO implements Serializable { + private static final long serialVersionUID = -2470114698294263404L; + private String id; + private String status; + private String remark; + private List ids; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java new file mode 100644 index 0000000000..91df1f3397 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java @@ -0,0 +1,43 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 9:47 + */ +@Data +public class PointAditiveRecordDailyDTO implements Serializable { + private static final long serialVersionUID = -239326201168528901L; + /** + * 日期yyyy-MM-dd + */ + private String dateStr; + /** + * 时间hh:mm + */ + private String timeStr; + /** + * 标题 + */ + private String title; + /** + * 积分说明 + */ + private String statement; + /** + * 积分值 + */ + private String pointValue; + /** + * 业务主键 + */ + private String businessId; + /** + * 业务类型 积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject + */ + private String businessCode; +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java new file mode 100644 index 0000000000..5ba929dfeb --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/6/15 9:46 + */ +@Data +public class PointAditiveRecordResultDTO implements Serializable { + private static final long serialVersionUID = -1498111500078847600L; + /** + * 日期yyyy-MM-dd + */ + private String dateStr; + private List recordList; +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java index 5db66d452b..855dcaf599 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/enu/ApplyStatusEnum.java @@ -9,7 +9,7 @@ import java.util.Objects; public enum ApplyStatusEnum { //审核状态 AUDITING("0", "未审核"), - REJECT("1", "未通过"), + REJECT("1", "已驳回"), PASSED("2", "已通过"); private String code; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java index 4f7ba03a07..f446225764 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointApplyController.java @@ -12,12 +12,12 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PointApplyDTO; import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; +import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.service.PointApplyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * 积分申请 @@ -32,13 +32,13 @@ public class PointApplyController { @Autowired private PointApplyService pointApplyService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = pointApplyService.page(params); + @RequestMapping("listall") + public Result> page(@RequestBody PointApplyPageFormDTO formDTO){ + PageData page = pointApplyService.page(formDTO); return new Result>().ok(page); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + @RequestMapping(value = "detail/{id}",method = {RequestMethod.POST,RequestMethod.GET}) public Result get(@PathVariable("id") String id){ PointApplyDTO data = pointApplyService.get(id); return new Result().ok(data); @@ -81,4 +81,12 @@ public class PointApplyController { return new Result(); } + @NoRepeatSubmit + @PostMapping("examine/submit") + public Result audit(@LoginUser TokenDto tokenDto, @RequestBody PointAuditFormDTO formDTO){ + //效验数据 + pointApplyService.audit(tokenDto, formDTO); + return new Result(); + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 05b37956d2..2969519951 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -8,10 +8,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.service.PointVerificationLogService; -import com.epmet.service.UserPointActionLogService; -import com.epmet.service.UserPointStatisticalDailyService; -import com.epmet.service.UserPointTotalService; +import com.epmet.service.*; import com.epmet.utils.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +17,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; /** @@ -39,6 +37,8 @@ public class ResiPointController { private PointVerificationLogService pointVerificationLogService; @Autowired private UserPointActionLogService pointActionLogService; + @Resource + private PointAditiveRecordService pointAditiveRecordService; /** * @Description 获取指定居民的积分信息 @@ -237,5 +237,20 @@ public class ResiPointController { return new Result>().ok(userPointTotalService.totalPoint(tokenDto)); } - + /** + * 德育积分/党建积分的积分记录 + * + * @Param dto + * @Param pageUserParam + * @Return {@link Result>} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + @PostMapping("aditiverecordlist") + public Result> aditiveRecords(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){ + pageUserParam.setUserId(dto.getCustomerId()); + pageUserParam.setUserId(dto.getUserId()); + ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); + return new Result>().ok(pointAditiveRecordService.getRecords(pageUserParam)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java index cf95a4367c..83c06481b5 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java @@ -1,8 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.PointAditiveRecordDailyDTO; import com.epmet.entity.PointAditiveRecordEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 附加积分记录 @@ -12,5 +16,15 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointAditiveRecordDao extends BaseDao { - + /** + * 积分记录 + * + * @Param customerId + * @Param categoryCode + * @Param subjectId + * @Return {@link List< PointAditiveRecordDailyDTO>} + * @Author zhaoqifeng + * @Date 2022/6/15 10:12 + */ + List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java index 29fd3d8c90..809226c58d 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointApplyDao.java @@ -1,8 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PointApplyDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; import com.epmet.entity.PointApplyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 积分申请 @@ -12,5 +17,24 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointApplyDao extends BaseDao { + + /** + * 获取积分申请详情 + * + * @Param id + * @Return {@link PointApplyDTO} + * @Author zhaoqifeng + * @Date 2022/6/15 14:31 + */ + PointApplyDTO getDetail(@Param("id") String id); + + /** + * 申请列表 + * @Param formDTO + * @Return {@link List< PointApplyDTO>} + * @Author zhaoqifeng + * @Date 2022/6/15 15:01 + */ + List getList(PointApplyPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java index 857d5b797d..77f576d718 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveRecordService.java @@ -3,6 +3,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointAditiveRecordDTO; +import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.result.PointAditiveRecordResultDTO; import com.epmet.entity.PointAditiveRecordEntity; import java.util.List; @@ -75,4 +77,14 @@ public interface PointAditiveRecordService extends BaseService} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + List getRecords(CommonPageUserFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java index 7988b94f26..74160b5099 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointApplyService.java @@ -2,8 +2,11 @@ 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.PointApplyDTO; import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; +import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.entity.PointApplyEntity; import java.util.List; @@ -25,7 +28,7 @@ public interface PointApplyService extends BaseService { * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(PointApplyPageFormDTO formDTO); /** * 默认查询 @@ -85,4 +88,15 @@ public interface PointApplyService extends BaseService { * @Date 2022/6/14 14:14 */ void submit(PointApplyFormDTO formDTO); + + /** + * 审核 + * + * @Param tokenDto + * @Param formDTO + * @Return + * @Author zhaoqifeng + * @Date 2022/6/15 15:20 + */ + void audit(TokenDto tokenDto, PointAuditFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java index 6ca0fb5f22..fb98405897 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java @@ -2,22 +2,34 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.epmet.common.CommonConstant; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAditiveRecordDao; import com.epmet.dto.PointAditiveRecordDTO; +import com.epmet.dto.form.CommonPageUserFormDTO; +import com.epmet.dto.result.*; import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.PointAditiveRecordService; +import com.github.pagehelper.PageHelper; +import com.google.common.collect.Maps; +import org.apache.commons.collections4.CollectionUtils; 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 javax.annotation.Resource; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; /** * 附加积分记录 @@ -28,6 +40,8 @@ import java.util.Map; @Service public class PointAditiveRecordServiceImpl extends BaseServiceImpl implements PointAditiveRecordService { + @Resource + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override public PageData page(Map params) { @@ -81,4 +95,51 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl} + * @Author zhaoqifeng + * @Date 2022/6/15 9:55 + */ + @Override + public List getRecords(CommonPageUserFormDTO formDTO) { + List list = new ArrayList<>(); + String subjectId; + //如果申请类型为德育积分，需要获取用户所在房屋 + if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) { + Result result = epmetUserOpenFeignClient.getHomeInfo(); + if (!result.success() || null == result.getData()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取居民所在家庭信息失败", "获取居民所在家庭信息失败"); + } + if (StringUtils.isBlank(result.getData().getHouseId())) { + return list; + } + subjectId = result.getData().getHouseId(); + } else { + subjectId = formDTO.getUserId(); + } + + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); + + if(CollectionUtils.isNotEmpty(recordList)){ + Map> map = + recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDateStr)); + + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); + sortedMap.forEach((key, value) -> { + PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO(); + o.setDateStr(key); + o.setRecordList(value); + list.add(o); + }); + + } + return list; + } + } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 4827ab4d2d..51588a6586 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -1,28 +1,40 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.common.CommonConstant; import com.epmet.common.enu.ApplyStatusEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.enums.GenderEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAditiveCalcDao; +import com.epmet.dao.PointAditiveRecordDao; import com.epmet.dao.PointAnnexDao; import com.epmet.dao.PointApplyDao; import com.epmet.dto.PointApplyDTO; import com.epmet.dto.form.PointApplyFormDTO; +import com.epmet.dto.form.PointApplyPageFormDTO; +import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.dto.result.HomeInfoResultDTO; +import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.entity.PointAditiveRecordEntity; import com.epmet.entity.PointAnnexEntity; import com.epmet.entity.PointApplyEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.PointApplyService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -47,14 +59,29 @@ public class PointApplyServiceImpl extends BaseServiceImpl page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointApplyDTO.class); + public PageData page(PointApplyPageFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + if (CollectionUtils.isNotEmpty(list)) { + list.forEach(item -> { + //获取居民信息 + ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(item.getUserId()); + if (null != userInfo) { + item.setHeadImgUrl(userInfo.getHeadImgUrl()); + item.setGender(GenderEnum.getName(userInfo.getGender())); + item.setShowName(userInfo.getShowName()); + item.setStatus(ApplyStatusEnum.getName(item.getStatus())); + } + }); + } + return new PageData<>(list, pageInfo.getTotal()); } @Override @@ -75,8 +102,18 @@ public class PointApplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); + if (null != calc) { + calc.setUpdatedBy(null); + calc.setUpdatedTime(null); + calc.setTotal(calc.getTotal() + dto.getPointValue()); + pointAditiveCalcDao.updateById(calc); + } else { + calc = new PointAditiveCalcEntity(); + calc.setCustomerId(tokenDto.getCustomerId()); + calc.setCategoryCode(dto.getCategoryCode()); + calc.setSubjectId(subjectId); + calc.setSpend(NumConstant.ZERO); + calc.setTotal(dto.getPointValue()); + pointAditiveCalcDao.insert(calc); + } + } + } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml index 4839dd26fa..872a2734ff 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml @@ -20,6 +20,29 @@ + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 6daa8936d8..0efdbe3eb7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -37,5 +37,92 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java index adc98f7a08..a60efed8cc 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserBaseInfoController.java @@ -19,6 +19,7 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; @@ -215,5 +216,10 @@ public class UserBaseInfoController { public Result resiRelationInfo(@RequestParam("userId")String userId){ return new Result().ok(userBaseInfoService.resiRelationInfo(userId)); } + + @PostMapping("getUserInfo/{userId}") + public Result getUserInfo(@PathVariable("userId") String userId){ + return new Result().ok(userBaseInfoService.getUserInfo(userId)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java index 01bac74fc2..f66453c243 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserBaseInfoService.java @@ -19,6 +19,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.UserBaseInfoDTO; @@ -203,4 +204,13 @@ public interface UserBaseInfoService extends BaseService { * @date 2021/12/30 3:12 下午 */ RegisterRelationDTO resiRelationInfo(String userId); + + /** + * 获取用户缓存信息 + * @Param userId + * @Return {@link UserBaseInfoResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/15 16:09 + */ + ResiUserInfoCache getUserInfo(String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 898a7735d2..5970d78788 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.*; @@ -504,4 +505,18 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl Date: Wed, 15 Jun 2022 19:43:42 +0800 Subject: [PATCH 05/43] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/security/config/WebMvcConfig.java | 35 ------------------- 1 file changed, 35 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java index 0e7b26138a..b6d1f518a1 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/security/config/WebMvcConfig.java @@ -81,41 +81,6 @@ public class WebMvcConfig implements WebMvcConfigurer { simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance); mapper.registerModule(simpleModule); - mapper.getSerializerProvider().setNullValueSerializer(new JsonSerializer() { - @Override - public void serialize(Object value, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException { - - String fieldName = jsonGenerator.getOutputContext().getCurrentName(); - Field field = null; - try { - //反射获取字段类型 - field = jsonGenerator.getCurrentValue().getClass().getDeclaredField(fieldName); - } catch (NoSuchFieldException e) { - e.printStackTrace(); - } - - if (null != field) { - if (Objects.equals(field.getType(), String.class)) { - // 字符串型空值"" - jsonGenerator.writeString(StringUtils.EMPTY); - return; - } else if (Objects.equals(field.getType(), List.class)) { - // 列表型空值返回[] - jsonGenerator.writeStartArray(); - jsonGenerator.writeEndArray(); - return; - } else if (Objects.equals(field.getType(), Map.class)) { - // map型空值返回{} - jsonGenerator.writeStartObject(); - jsonGenerator.writeEndObject(); - return; - } - } - - // 默认返回"" - jsonGenerator.writeString(StringUtils.EMPTY); - } - }); converter.setObjectMapper(mapper); return converter; } From 5e368852b611bd9d02afda7563340375a2751009 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 16 Jun 2022 15:45:22 +0800 Subject: [PATCH 06/43] =?UTF-8?q?=E9=99=84=E5=8A=A0=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E5=A5=96=E6=89=A3=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/RecordRewardFormDTO.java | 37 ++++++++++++ .../epmet/dto/form/SubmitRewardFormDTO.java | 51 ++++++++++++++++ .../controller/PointRewardController.java | 35 ++++++++++- .../com/epmet/dao/PointAdditiveRuleDao.java | 10 ++++ .../java/com/epmet/dao/PointRewardDao.java | 16 ++++- .../com/epmet/service/PointAnnexService.java | 12 +++- .../epmet/service/PointRewardRuleService.java | 12 +++- .../com/epmet/service/PointRewardService.java | 23 +++++++- .../service/impl/PointAnnexServiceImpl.java | 23 +++++++- .../impl/PointRewardRuleServiceImpl.java | 15 ++++- .../service/impl/PointRewardServiceImpl.java | 59 ++++++++++++++++++- .../resources/mapper/PointAdditiveRuleDao.xml | 12 ++++ .../main/resources/mapper/PointRewardDao.xml | 18 +++++- 13 files changed, 309 insertions(+), 14 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java new file mode 100644 index 0000000000..f01fe59676 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/RecordRewardFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class RecordRewardFormDTO extends PageFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + @NotNull(message = "业务编码不可为空") + private String businessCode; + + + + +} diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java new file mode 100644 index 0000000000..27b112f0f7 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/SubmitRewardFormDTO.java @@ -0,0 +1,51 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-15 17:21 + **/ +@Data +public class SubmitRewardFormDTO implements Serializable { + + /** + * 客户ID + */ + private String customerId; + + /** + * 工作人员ID + */ + private String staffId; + + /** + *积分申请房屋ID + */ + private String houseId; + + /** + *业务编码：积分奖励point_reward；积分扣罚point_fine + */ + private String businessCode; + /** + *规则ID集合 + */ + private List ruleIdList; + + /** + *附件url集合 + */ + private List annexList; + /** + *备注说明 + */ + private String statement; + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java index f5c802c4eb..4ee6c98f37 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointRewardController.java @@ -1,15 +1,19 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; 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.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.excel.PointRewardExcel; import com.epmet.service.PointRewardService; import org.springframework.beans.factory.annotation.Autowired; @@ -27,7 +31,7 @@ import java.util.Map; * @since v1.0.0 2022-06-15 */ @RestController -@RequestMapping("pointReward") +@RequestMapping("reward") public class PointRewardController { @Autowired @@ -77,6 +81,33 @@ public class PointRewardController { ExcelUtils.exportExcelToTarget(response, null, list, PointRewardExcel.class); } + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("submit") + public Result submit(@LoginUser TokenDto tokenDto, @RequestBody SubmitRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + dto.setStaffId(tokenDto.getUserId()); + return pointRewardService.submit(dto); + } + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + @PostMapping("record") + public Result> record(@LoginUser TokenDto tokenDto, @RequestBody RecordRewardFormDTO dto){ + ValidatorUtils.validateEntity(dto); + dto.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(pointRewardService.record(dto)); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 9d4da90278..7ac3325052 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -5,6 +5,7 @@ import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAdditiveRuleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -55,4 +56,13 @@ public interface PointAdditiveRuleDao extends BaseDao { * @return java.util.List */ List selectList4tree(List4treeFormDTO dto); + + /** + * @describe: 根据规则查询积分总值 + * @author wangtong + * @date 2022/6/16 10:43 + * @params [dto] + * @return java.lang.Integer + */ + Integer selectPointTotalByIds(SubmitRewardFormDTO dto); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java index ce5566f4fe..6ff72ba2a4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointRewardDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; import com.epmet.entity.PointRewardEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 积分奖扣 * @@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface PointRewardDao extends BaseDao { - -} \ No newline at end of file + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:29 + * @params [dto] + * @return java.util.List + */ + List selectRewardRecord(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java index f2c7cdb49e..c9aea552f1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAnnexService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import java.util.List; @@ -75,4 +76,13 @@ public interface PointAnnexService extends BaseService { * @date 2022-06-14 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/16 9:27 + * @params [id, dto] + * @return void + */ + void insertBatchPoint(String rewardId, SubmitRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java index 182ac69e74..4dac4bfd97 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointRewardRuleService.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.PointRewardRuleDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointRewardRuleEntity; import java.util.List; @@ -75,4 +76,13 @@ public interface PointRewardRuleService extends BaseService { * @date 2022-06-15 */ void delete(String[] ids); -} \ No newline at end of file + + /** + * @describe: 提交积分奖扣 + * @author wangtong + * @date 2022/6/15 17:30 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result submit(SubmitRewardFormDTO dto); + + /** + * @describe: 查询积分奖扣记录 + * @author wangtong + * @date 2022/6/16 14:21 + * @params [tokenDto, dto] + * @return com.epmet.commons.tools.utils.Result>> + */ + PageData record(RecordRewardFormDTO dto); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java index fdfd83e9fd..d7f0ff9ea7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAnnexServiceImpl.java @@ -3,15 +3,15 @@ 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.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.dao.PointAnnexDao; import com.epmet.dto.PointAnnexDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointAnnexEntity; import com.epmet.service.PointAnnexService; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -80,4 +80,21 @@ public class PointAnnexServiceImpl extends BaseServiceImpl{ + PointRewardRuleEntity entity = new PointRewardRuleEntity(); + entity.setCustomerId(dto.getCustomerId()); + entity.setRewardId(rewardId); + entity.setRuleId(ruleId); + insert(entity); + }); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java index 45c4fbcbf8..3e33eed966 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointRewardServiceImpl.java @@ -3,14 +3,26 @@ 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.constant.FieldConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dao.PointAdditiveRuleDao; import com.epmet.dao.PointRewardDao; import com.epmet.dto.PointRewardDTO; +import com.epmet.dto.form.RecordRewardFormDTO; +import com.epmet.dto.form.SubmitRewardFormDTO; import com.epmet.entity.PointRewardEntity; import com.epmet.redis.PointRewardRedis; +import com.epmet.service.PointAnnexService; +import com.epmet.service.PointRewardRuleService; import com.epmet.service.PointRewardService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -32,6 +44,15 @@ public class PointRewardServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -84,4 +105,38 @@ public class PointRewardServiceImpl extends BaseServiceImpl record(RecordRewardFormDTO dto) { + PageHelper.startPage(dto.getPageNo(), dto.getPageSize()); + List list = baseDao.selectRewardRecord(dto); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 78d24c5da2..e07cd82e5f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -75,6 +75,18 @@ and CUSTOMER_ID=#{customerId} order by UPDATED_TIME desc + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml index ed5a138721..98f794dcea 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointRewardDao.xml @@ -22,6 +22,22 @@ + - \ No newline at end of file + From ccd4eb9dc0585334ee266a045ae6cd48560d3c30 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Thu, 16 Jun 2022 17:47:54 +0800 Subject: [PATCH 07/43] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99pids?= =?UTF-8?q?=E7=BB=84=E8=A3=85=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PointAdditiveRuleServiceImpl.java | 22 ++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index bae799657f..daffeca2fc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -4,10 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.common.enu.PointAddRuleEnum; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveRuleDao; import com.epmet.dto.CategorydetailResultDTO; @@ -114,7 +116,14 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl Date: Fri, 17 Jun 2022 09:34:17 +0800 Subject: [PATCH 08/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/controller/ResiPointController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 2969519951..6166f4b592 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -248,7 +248,7 @@ public class ResiPointController { */ @PostMapping("aditiverecordlist") public Result> aditiveRecords(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){ - pageUserParam.setUserId(dto.getCustomerId()); + pageUserParam.setCustomerId(dto.getCustomerId()); pageUserParam.setUserId(dto.getUserId()); ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); return new Result>().ok(pointAditiveRecordService.getRecords(pageUserParam)); From dd11282ad9ade22a824f185a6f5e570b85eb5115 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 10:07:05 +0800 Subject: [PATCH 09/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/MyTotalPointResultDTO.java | 4 - .../java/com/epmet/common/CommonConstant.java | 4 + .../epmet/controller/ResiPointController.java | 6 +- .../epmet/service/UserPointTotalService.java | 6 +- .../impl/UserPointTotalServiceImpl.java | 109 +++++++++++++----- 5 files changed, 90 insertions(+), 39 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java index 81d70ffd3c..050416dd08 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/MyTotalPointResultDTO.java @@ -12,10 +12,6 @@ import java.io.Serializable; @Data public class MyTotalPointResultDTO implements Serializable { private static final long serialVersionUID = 15299506166024546L; - /** - * 德育积分moral_education；党建积分party_building；活跃积分active - */ - private String categoryCode; /** * 总积分 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java index 9f8a8786d9..50cccad0ec 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java @@ -29,6 +29,10 @@ public interface CommonConstant extends Constant { * 活跃积分 */ String ACTIVE = "active"; + /** + * 活跃积分 + */ + String TOTAL = "total"; /** * 积分申请 */ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 6166f4b592..5a393cc871 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -233,8 +233,10 @@ public class ResiPointController { } @PostMapping("total") - public Result> totalPoint(@LoginUser TokenDto tokenDto) { - return new Result>().ok(userPointTotalService.totalPoint(tokenDto)); + public Result totalPoint(@LoginUser TokenDto tokenDto, @RequestBody CommonPageUserFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(userPointTotalService.totalPoint(formDTO)); } /** diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java index 07bc0b77e1..43302c3948 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/UserPointTotalService.java @@ -18,7 +18,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.MyTotalPointResultDTO; @@ -75,10 +75,10 @@ public interface UserPointTotalService extends BaseService /** * 积分总分 * - * @Param tokenDto + * @Param formDTO * @Return {@link MyTotalPointResultDTO} * @Author zhaoqifeng * @Date 2022/6/14 15:46 */ - List totalPoint(TokenDto tokenDto); + MyTotalPointResultDTO totalPoint(CommonPageUserFormDTO formDTO); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 4dbda58db2..66afc5150e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -24,11 +24,11 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAditiveCalcDao; import com.epmet.dao.UserPointTotalDao; +import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; @@ -215,28 +215,53 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl totalPoint(TokenDto tokenDto) { - List list = new ArrayList(); - //活跃度积分 - MyTotalPointResultDTO active = new MyTotalPointResultDTO(); - active.setCategoryCode(CommonConstant.ACTIVE); - ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(tokenDto.getUserId(), tokenDto.getCustomerId()); - if (null != activeTotal) { - active.setTotal(activeTotal.getAccumulatedPoint()); - active.setUsable(activeTotal.getUsablePoint()); - active.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint()); + public MyTotalPointResultDTO totalPoint(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); + switch (formDTO.getCategoryCode()) { + case CommonConstant.MORAL_EDUCATION: + //德育积分 + resultDTO = getEducationTotal(formDTO); + break; + case CommonConstant.PARTY_BUILDING: + //党建积分 + resultDTO = getPartyTotal(formDTO); + break; + case CommonConstant.ACTIVE: + //活跃度积分 + resultDTO = getActiveTotal(formDTO); + break; + case CommonConstant.TOTAL: + MyTotalPointResultDTO education = getEducationTotal(formDTO); + MyTotalPointResultDTO party = getPartyTotal(formDTO); + MyTotalPointResultDTO active = getActiveTotal(formDTO); + resultDTO.setTotal(education.getTotal() + party.getTotal() + active.getTotal()); + resultDTO.setSpend(education.getSpend() + party.getSpend() + active.getSpend()); + resultDTO.setUsable(education.getUsable() + party.getUsable() + active.getUsable()); + break; + default: + break; } - list.add(active); + + return resultDTO; + } + + /** + * 德育积分 + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getEducationTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); //德育积分 - MyTotalPointResultDTO education = new MyTotalPointResultDTO(); - education.setCategoryCode(CommonConstant.MORAL_EDUCATION); //获取居民绑定的家庭 Result result = epmetUserOpenFeignClient.getHomeInfo(); if (!result.success() || null == result.getData()) { @@ -244,34 +269,58 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId()); wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); if (null != entity) { - education.setTotal(entity.getTotal()); - education.setSpend(entity.getSpend()); - education.setUsable(entity.getTotal() - entity.getSpend()); + resultDTO.setTotal(entity.getTotal()); + resultDTO.setSpend(entity.getSpend()); + resultDTO.setUsable(entity.getTotal() - entity.getSpend()); } } - list.add(education); + return resultDTO; + } - //党建积分 - MyTotalPointResultDTO party = new MyTotalPointResultDTO(); - party.setCategoryCode(CommonConstant.PARTY_BUILDING); + /** + * 党建积分 + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getPartyTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, tokenDto.getUserId()); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, formDTO.getUserId()); wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); if (null != entity) { - party.setTotal(entity.getTotal()); - party.setSpend(entity.getSpend()); - party.setUsable(entity.getTotal() - entity.getSpend()); + resultDTO.setTotal(entity.getTotal()); + resultDTO.setSpend(entity.getSpend()); + resultDTO.setUsable(entity.getTotal() - entity.getSpend()); } - list.add(party); + return resultDTO; + } - return list; + /** + * 活跃积分 + * + * @Param formDTO + * @Return {@link MyTotalPointResultDTO} + * @Author zhaoqifeng + * @Date 2022/6/17 9:58 + */ + private MyTotalPointResultDTO getActiveTotal(CommonPageUserFormDTO formDTO) { + MyTotalPointResultDTO resultDTO = new MyTotalPointResultDTO(); + ResiPointDetailResultDTO activeTotal = baseDao.selectPointByCustomerUserId(formDTO.getUserId(), formDTO.getCustomerId()); + if (null != activeTotal) { + resultDTO.setTotal(activeTotal.getAccumulatedPoint()); + resultDTO.setUsable(activeTotal.getUsablePoint()); + resultDTO.setSpend(activeTotal.getAccumulatedPoint() - activeTotal.getUsablePoint()); + } + return resultDTO; } } From db80b2a401b96d48911a8e069fba45e216fd0652 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 17 Jun 2022 10:18:45 +0800 Subject: [PATCH 10/43] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/PointAdditiveRuleDao.java | 11 +++++++++++ .../service/impl/PointAdditiveRuleServiceImpl.java | 10 +++++++++- .../main/resources/mapper/PointAdditiveRuleDao.xml | 12 ++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 7ac3325052..187a8b24ce 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -65,4 +65,15 @@ public interface PointAdditiveRuleDao extends BaseDao { * @return java.lang.Integer */ Integer selectPointTotalByIds(SubmitRewardFormDTO dto); + + /** + * @describe: 通过名称查询 + * @author wangtong + * @date 2022/6/17 9:37 + * @params [customerId, categoryName] + * @return com.epmet.entity.PointAdditiveRuleEntity + */ + PointAdditiveRuleEntity selectEntityByName(@Param("customerId") String customerId, + @Param("categoryName") String categoryName, + @Param("ruleName") String ruleName); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index daffeca2fc..2c6f51d850 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -108,6 +108,10 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl> list4apply(List4applyFormDTO dto) { - dto.setType(PointAddRuleEnum.CATEGORY_TYPE.getCode()); + dto.setType(PointAddRuleEnum.RULE_TYPE.getCode()); List result = baseDao.selectList4apply(dto); return new Result>().ok(result); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index e07cd82e5f..d5324372a2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -87,6 +87,18 @@ + From f5799b38a00fa01c240e1a273b9eba226254ebdf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 10:19:53 +0800 Subject: [PATCH 11/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PointApplyDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 0efdbe3eb7..6519dd756f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -72,11 +72,11 @@ a.HOUSE_ID, a.CREATED_TIME, b.RULE_NAME, - b.POINT, + b.POINT_VALUE, c.URL FROM point_apply a - INNER JOIN point_rule b ON a.RULE_ID = b.ID AND a.CUSTOMER_ID = b.CUSTOMER_ID + INNER JOIN point_additive_rule b ON a.RULE_ID = b.ID AND a.CUSTOMER_ID = b.CUSTOMER_ID LEFT JOIN point_annex c ON a.ID = c.BUSINESS_ID AND c.DEL_FLAG = 0 WHERE a.DEL_FLAG = 0 @@ -96,10 +96,10 @@ a.CATEGORY_CODE, a.CREATED_TIME, b.RULE_NAME, - b.POINT + b.POINT_VALUE FROM point_apply a - INNER JOIN point_rule b ON a.RULE_ID = b.ID AND a.CUSTOMER_ID = b.CUSTOMER_ID + INNER JOIN point_additive_rule b ON a.RULE_ID = b.ID AND a.CUSTOMER_ID = b.CUSTOMER_ID WHERE a.DEL_FLAG = 0 AND a.AGENCY_ID = #{agencyId} From ee7b027e205d8f2007fb112a4de501955a5f2263 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 10:36:12 +0800 Subject: [PATCH 12/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PointAditiveRecordDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml index 872a2734ff..7b699f3a82 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml @@ -27,7 +27,7 @@ CASE POINT_VALUE WHEN POINT_VALUE > 0 THEN - concat( '+', pointValue ) ELSE POINT_VALUE + concat( '+', POINT_VALUE ) ELSE POINT_VALUE END AS POINT_VALUE, BUSINESS_ID, BUSINESS_CODE, From 28b8db3932d84724c892a468229013bbf6a710be Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 11:09:05 +0800 Subject: [PATCH 13/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/PointAditiveRecordDailyDTO.java | 8 ++++---- .../result/PointAditiveRecordResultDTO.java | 4 ++-- .../impl/PointAditiveRecordServiceImpl.java | 6 +++--- .../impl/UserPointTotalServiceImpl.java | 18 ++++++++++++------ .../resources/mapper/PointAditiveRecordDao.xml | 8 ++++---- 5 files changed, 25 insertions(+), 19 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java index 91df1f3397..56b54fd318 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java @@ -15,11 +15,11 @@ public class PointAditiveRecordDailyDTO implements Serializable { /** * 日期yyyy-MM-dd */ - private String dateStr; + private String date; /** * 时间hh:mm */ - private String timeStr; + private String time; /** * 标题 */ @@ -27,11 +27,11 @@ public class PointAditiveRecordDailyDTO implements Serializable { /** * 积分说明 */ - private String statement; + private String remark; /** * 积分值 */ - private String pointValue; + private String point; /** * 业务主键 */ diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java index 5ba929dfeb..c56cbeaade 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java @@ -16,6 +16,6 @@ public class PointAditiveRecordResultDTO implements Serializable { /** * 日期yyyy-MM-dd */ - private String dateStr; - private List recordList; + private String date; + private List dailyList; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java index fb98405897..fbc96f0faf 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java @@ -126,15 +126,15 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl> map = - recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDateStr)); + recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate)); Map> sortedMap = Maps.newLinkedHashMap(); map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); sortedMap.forEach((key, value) -> { PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO(); - o.setDateStr(key); - o.setRecordList(value); + o.setDate(key); + o.setDailyList(value); list.add(o); }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index 66afc5150e..aa400d8f7a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -71,12 +71,18 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl SELECT TITLE, - STATEMENT, + STATEMENT AS remark, CASE POINT_VALUE WHEN POINT_VALUE > 0 THEN concat( '+', POINT_VALUE ) ELSE POINT_VALUE - END AS POINT_VALUE, + END AS point, BUSINESS_ID, BUSINESS_CODE, - DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS dateStr, - DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS timeStr + DATE_FORMAT( CREATED_TIME, '%Y-%m-%d' ) AS date, + DATE_FORMAT( CREATED_TIME, '%H:%i' ) AS time FROM point_aditive_record WHERE From fb2c04a06d15bb90bdf62e9a63817c6a17d70005 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 17 Jun 2022 11:10:19 +0800 Subject: [PATCH 14/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E6=A0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/List4ApplyResultDTO.java | 27 +++++++++++++ .../PointAdditiveRuleController.java | 3 +- .../com/epmet/dao/PointAdditiveRuleDao.java | 3 +- .../service/PointAdditiveRuleService.java | 3 +- .../impl/PointAdditiveRuleServiceImpl.java | 40 +++++++++++++++---- .../resources/mapper/PointAdditiveRuleDao.xml | 10 ++--- 6 files changed, 71 insertions(+), 15 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java new file mode 100644 index 0000000000..49fdc3844b --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-17 10:50 + **/ +@Data +public class List4ApplyResultDTO implements Serializable { + + private String id; + + private String name; + + private String pid; + + private Integer pointValue; + + private List children = new ArrayList<>(); +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java index d5e75497d9..6d1f168b1f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -17,6 +17,7 @@ import com.epmet.dto.form.AddcategoryFormDTO; import com.epmet.dto.form.AddruleFormDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.excel.PointAdditiveRuleExcel; import com.epmet.service.PointAdditiveRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -157,7 +158,7 @@ public class PointAdditiveRuleController { * @return com.epmet.commons.tools.utils.Result> */ @PostMapping("list4apply") - public Result> list4apply(@LoginUser TokenDto tokenDto,@RequestBody List4applyFormDTO dto){ + public Result> list4apply(@LoginUser TokenDto tokenDto, @RequestBody List4applyFormDTO dto){ ValidatorUtils.validateEntity(dto); dto.setCustomerId(tokenDto.getCustomerId()); return pointAdditiveRuleService.list4apply(dto); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 187a8b24ce..5affc6761f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -6,6 +6,7 @@ import com.epmet.dto.PointAdditiveRuleDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; import com.epmet.dto.form.SubmitRewardFormDTO; +import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -46,7 +47,7 @@ public interface PointAdditiveRuleDao extends BaseDao { * @params [dto] * @return java.util.List */ - List selectList4apply(List4applyFormDTO dto); + List selectList4apply(List4applyFormDTO dto); /** * @describe: 查询积分类别规则列表 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java index 27f0546f84..62bb880715 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -9,6 +9,7 @@ import com.epmet.dto.form.AddcategoryFormDTO; import com.epmet.dto.form.AddruleFormDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; import java.util.List; @@ -125,7 +126,7 @@ public interface PointAdditiveRuleService extends BaseService> */ - Result> list4apply(List4applyFormDTO dto); + Result> list4apply(List4applyFormDTO dto); /** * @describe: 查询积分类别规则列表 diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 2c6f51d850..9301f4fb7c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -18,17 +18,17 @@ import com.epmet.dto.form.AddcategoryFormDTO; import com.epmet.dto.form.AddruleFormDTO; import com.epmet.dto.form.List4applyFormDTO; import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; import com.epmet.redis.PointAdditiveRuleRedis; import com.epmet.service.PointAdditiveRuleService; +import org.apache.commons.collections4.CollectionUtils; 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; +import java.util.*; /** * 附加积分规则 @@ -164,10 +164,36 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl> list4apply(List4applyFormDTO dto) { - dto.setType(PointAddRuleEnum.RULE_TYPE.getCode()); - List result = baseDao.selectList4apply(dto); - return new Result>().ok(result); + public Result> list4apply(List4applyFormDTO dto) { + List list = baseDao.selectList4apply(dto); + List result = build(list); + result.removeIf(category ->CollectionUtils.isEmpty(category.getChildren())); + return new Result>().ok(result); + } + + /** + * 构建树节点 + */ + public static List build(List treeNodes) { + List result = new ArrayList<>(); + + //list转map + Map nodeMap = new LinkedHashMap<>(treeNodes.size()); + for(List4ApplyResultDTO treeNode : treeNodes){ + nodeMap.put(treeNode.getId(), treeNode); + } + + for(List4ApplyResultDTO node : nodeMap.values()) { + List4ApplyResultDTO parent = nodeMap.get(node.getPid()); + if(parent != null && !(node.getId().equals(parent.getId()))){ + parent.getChildren().add(node); + continue; + } + + result.add(node); + } + + return result; } @Override diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index d5324372a2..229184ac62 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -43,17 +43,17 @@ and c.DEL_FLAG='0' and c.id = #{categoryId} - + select id, + if(CATEGORY_NAME is null,RULE_NAME,CATEGORY_NAME) as name, + pid, + POINT_VALUE from point_additive_rule where DEL_FLAG='0' and CATEGORY_CODE=#{categoryCode} and APPLY_FLAG= #{applyFlag} - and TYPE=#{type} and CUSTOMER_ID=#{customerId} order by UPDATED_TIME desc From 150061c68cc84b795b24295a68a91c9230b19321 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 17 Jun 2022 14:40:00 +0800 Subject: [PATCH 15/43] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/List4applyFormDTO.java | 6 ++++++ .../src/main/resources/mapper/PointAdditiveRuleDao.xml | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java index 441bf8d353..b9fd87d5b2 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/List4applyFormDTO.java @@ -30,6 +30,12 @@ public class List4applyFormDTO implements Serializable { */ private String type; + /** + *积分奖励point_reward；积分扣罚point_fine + */ + @NotNull(message = "奖罚编码不可为空") + private String businessCode; + private String customerId; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 229184ac62..5bfb46e1d4 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -53,12 +53,19 @@ and CATEGORY_CODE=#{categoryCode} and APPLY_FLAG= #{applyFlag} + + + and (( type='rule' and POINT_VALUE < 0 )or TYPE='category') + + + and (( type='rule' and POINT_VALUE > 0 )or TYPE='category') and CUSTOMER_ID=#{customerId} order by UPDATED_TIME desc SELECT a.ID, + a.GRID_ID, a.TITLE, a.STATEMENT, a.STATUS, From 9c72469971ac1ddb2c5242937e84fa67391228c7 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 15:47:30 +0800 Subject: [PATCH 18/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PointApplyServiceImpl.java | 49 +++++++++++-------- .../main/resources/mapper/PointApplyDao.xml | 2 +- 2 files changed, 30 insertions(+), 21 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 33065999d5..692b626c02 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -154,6 +154,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); - PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); - if (null != calc) { - calc.setUpdatedBy(null); - calc.setUpdatedTime(null); - calc.setTotal(calc.getTotal() + dto.getPointValue()); - pointAditiveCalcDao.updateById(calc); - } else { - calc = new PointAditiveCalcEntity(); - calc.setCustomerId(tokenDto.getCustomerId()); - calc.setCategoryCode(dto.getCategoryCode()); - calc.setSubjectId(subjectId); - calc.setSpend(NumConstant.ZERO); - calc.setTotal(dto.getPointValue()); - pointAditiveCalcDao.insert(calc); + if (NumConstant.TWO_STR.equals(formDTO.getStatus())) { + //重新计算总分 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); + if (null != calc) { + calc.setUpdatedBy(null); + calc.setUpdatedTime(null); + calc.setTotal(calc.getTotal() + dto.getPointValue()); + pointAditiveCalcDao.updateById(calc); + } else { + calc = new PointAditiveCalcEntity(); + calc.setCustomerId(tokenDto.getCustomerId()); + calc.setCategoryCode(dto.getCategoryCode()); + calc.setSubjectId(subjectId); + calc.setSpend(NumConstant.ZERO); + calc.setTotal(dto.getPointValue()); + pointAditiveCalcDao.insert(calc); + } } } }); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 8aa8e7989a..08ca82bcf0 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -51,7 +51,7 @@ - + From 9bc3c0706143ffedfcae21c40f3060b1dba136ba Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 17 Jun 2022 16:00:24 +0800 Subject: [PATCH 19/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/PointApplyServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 692b626c02..89c0538736 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -78,7 +78,6 @@ public class PointApplyServiceImpl extends BaseServiceImpl Date: Fri, 17 Jun 2022 16:41:51 +0800 Subject: [PATCH 20/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/PointApplyServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 89c0538736..2f1cdc5f90 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -119,6 +119,12 @@ public class PointApplyServiceImpl extends BaseServiceImpl Date: Fri, 17 Jun 2022 16:52:47 +0800 Subject: [PATCH 21/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/common/CommonConstant.java | 4 ++++ .../java/com/epmet/service/impl/PointApplyServiceImpl.java | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java index 50cccad0ec..b57d39a273 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/common/CommonConstant.java @@ -49,4 +49,8 @@ public interface CommonConstant extends Constant { * 积分花费 */ String POINT_COST = "point_cost"; + /** + * 驳回积分申请 + */ + String POINT_REJECT = "point_reject"; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index 2f1cdc5f90..a0cf8c4dda 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -254,13 +254,15 @@ public class PointApplyServiceImpl extends BaseServiceImpl Date: Fri, 17 Jun 2022 18:07:22 +0800 Subject: [PATCH 22/43] =?UTF-8?q?=E8=A1=A5=E5=85=85PC=E7=AB=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/PointAdditiveRuleDTO.java | 2 + .../epmet/dto/form/PointModifyFormDTO.java | 63 +++++++++++++++++++ .../PointAdditiveRuleController.java | 30 +++++++-- .../com/epmet/dao/PointAdditiveRuleDao.java | 9 +++ .../service/PointAdditiveRuleService.java | 23 +++++-- .../impl/PointAdditiveRuleServiceImpl.java | 51 +++++++++++++-- .../resources/mapper/PointAdditiveRuleDao.xml | 13 ++++ 7 files changed, 179 insertions(+), 12 deletions(-) create mode 100644 epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java index 3171aa9566..750bdaf71b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRuleDTO.java @@ -37,6 +37,8 @@ public class PointAdditiveRuleDTO implements Serializable { */ private String applyFlag; + private String applyFlagName; + /** * 积分类别编码;德育积分moral_education；党建积分party_building */ diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java new file mode 100644 index 0000000000..71cff835cd --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/form/PointModifyFormDTO.java @@ -0,0 +1,63 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-17 17:48 + **/ +@Data +public class PointModifyFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @NotNull(message = "id不可为空") + private String id; + + private String customerId; + + + /** + * 记录类型;分类:category；规则:rule + */ + @NotNull(message = "类型不可为空") + private String type; + + /** + * 允许申请标记;允许0（type = category时，强制赋值为0），禁止1。 + */ + private String applyFlag; + + + /** + * 积分类别名称;type=category时必填 + */ + private String categoryName; + + /** + * 积分规则名称;type=rule时必填 + */ + private String ruleName; + + /** + * 上级节点ID;上级分类ID，顶级分类的PID为0 + */ + @NotNull(message = "pid不可为空") + private String pid; + + + /** + * 分值;正数加分，负数减分；type=rule时必填 + */ + private Integer pointValue; + + +} diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java index 6d1f168b1f..3f780d3ff9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/PointAdditiveRuleController.java @@ -13,10 +13,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; -import com.epmet.dto.form.AddcategoryFormDTO; -import com.epmet.dto.form.AddruleFormDTO; -import com.epmet.dto.form.List4applyFormDTO; -import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.excel.PointAdditiveRuleExcel; import com.epmet.service.PointAdditiveRuleService; @@ -163,4 +160,29 @@ public class PointAdditiveRuleController { dto.setCustomerId(tokenDto.getCustomerId()); return pointAdditiveRuleService.list4apply(dto); } + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:36 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("ruledetail/{ruleId}") + public Result ruledetail(@PathVariable("ruleId") String ruleId){ + return pointAdditiveRuleService.ruledetail(ruleId); + } + + /** + * @describe: 修改积分分类/规则 + * @author wangtong + * @date 2022/6/17 17:51 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + @PostMapping("modify") + public Result modify(@LoginUser TokenDto tokenDto,@RequestBody PointModifyFormDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + return pointAdditiveRuleService.modify(dto); + } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 5affc6761f..9e67740ec3 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -77,4 +77,13 @@ public interface PointAdditiveRuleDao extends BaseDao { PointAdditiveRuleEntity selectEntityByName(@Param("customerId") String customerId, @Param("categoryName") String categoryName, @Param("ruleName") String ruleName); + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:40 + * @params [categoryId] + * @return com.epmet.dto.PointAdditiveRuleDTO + */ + PointAdditiveRuleDTO selectRuledetail(@Param("ruleId") String ruleId); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java index 62bb880715..4f9995158e 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveRuleService.java @@ -5,10 +5,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; -import com.epmet.dto.form.AddcategoryFormDTO; -import com.epmet.dto.form.AddruleFormDTO; -import com.epmet.dto.form.List4applyFormDTO; -import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; @@ -136,4 +133,22 @@ public interface PointAdditiveRuleService extends BaseService> list4tree(List4treeFormDTO dto); + + /** + * @describe: 查询积分规则详情 + * @author wangtong + * @date 2022/6/17 17:36 + * @params [categoryId] + * @return com.epmet.commons.tools.utils.Result + */ + Result ruledetail(String ruleId); + + /** + * @describe: 修改积分分类/规则 + * @author wangtong + * @date 2022/6/17 17:51 + * @params [dto] + * @return com.epmet.commons.tools.utils.Result + */ + Result modify(PointModifyFormDTO dto); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 9301f4fb7c..6a2607ed2f 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -14,10 +14,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveRuleDao; import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; -import com.epmet.dto.form.AddcategoryFormDTO; -import com.epmet.dto.form.AddruleFormDTO; -import com.epmet.dto.form.List4applyFormDTO; -import com.epmet.dto.form.List4treeFormDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; import com.epmet.redis.PointAdditiveRuleRedis; @@ -202,4 +199,50 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl>().ok(result); } + @Override + public Result ruledetail(String ruleId) { + PointAdditiveRuleDTO result = baseDao.selectRuledetail(ruleId); + return new Result().ok(result); + } + + @Override + public Result modify(PointModifyFormDTO dto) { + PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId()); + + if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){ + //类别 + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + entity.setCategoryName(dto.getCategoryName()); + }else if(PointAddRuleEnum.RULE_TYPE.getCode().equals(dto.getType())){ + //规则 + PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),null,dto.getRuleName()); + if(isExist != null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该名称已存在","该名称已存在"); + } + entity.setRuleName(dto.getRuleName()); + entity.setPointValue(dto.getPointValue()); + entity.setApplyFlag(dto.getApplyFlag()); + }else{ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "type类型有误","type类型有误"); + } + + if(!NumConstant.ZERO_STR.equals(dto.getPid())){ + PointAdditiveRuleEntity parentEntity = baseDao.selectById(dto.getPid()); + if(null == parentEntity){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到父节点信息","未查到父节点信息"); + } + entity.setPid(dto.getPid()); + if(StringUtils.isBlank(parentEntity.getPids())){ + entity.setPids(parentEntity.getId()); + }else{ + entity.setPids(parentEntity.getPids()+":"+parentEntity.getId()); + } + } + updateById(entity); + return new Result().ok("修改成功！"); + } + } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 5bfb46e1d4..4b3c086d91 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -106,6 +106,19 @@ and RULE_NAME= #{ruleName} + From d93a346ee8696e2bd560cd0c303dc89ea3f9ab6d Mon Sep 17 00:00:00 2001 From: Jackwang Date: Fri, 17 Jun 2022 18:24:36 +0800 Subject: [PATCH 23/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=AF=E5=88=86?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/PointAdditiveRuleServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 6a2607ed2f..706f572a52 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -205,10 +205,13 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl().ok(result); } + @Transactional(rollbackFor = Exception.class) @Override public Result modify(PointModifyFormDTO dto) { PointAdditiveRuleEntity entity = baseDao.selectById(dto.getId()); - + if(entity == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未查到相关信息","未查到相关信息"); + } if(PointAddRuleEnum.CATEGORY_TYPE.getCode().equals(dto.getType())){ //类别 PointAdditiveRuleEntity isExist = baseDao.selectEntityByName(dto.getCustomerId(),dto.getCategoryName(),null); @@ -216,6 +219,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl Date: Mon, 20 Jun 2022 09:51:12 +0800 Subject: [PATCH 24/43] =?UTF-8?q?=E8=8E=B7=E5=8F=96openId=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/WxmpMessageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java index 81edf12a9a..5a4b39f502 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/WxmpMessageServiceImpl.java @@ -544,7 +544,7 @@ public class WxmpMessageServiceImpl implements WxmpMessageService { throw new WxSubscribeException("clientType有误", "", openId); } } catch (Exception e) { - log.error("method exception", e); + log.warn("method exception,msg:{}", e.getMessage()); throw new WxSubscribeException("获取openId失败:" + e.getMessage(), "", ""); } return openId; From 52ce1ee256f8c207cd8dce25dc05b672cd50d110 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 20 Jun 2022 09:51:46 +0800 Subject: [PATCH 25/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=90=8D?= =?UTF-8?q?=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...CalcDTO.java => PointAdditiveCalcDTO.java} | 2 +- ...rdDTO.java => PointAdditiveRecordDTO.java} | 2 +- ....java => PointAdditiveRecordDailyDTO.java} | 2 +- ...java => PointAdditiveRecordResultDTO.java} | 4 +- .../epmet/controller/ResiPointController.java | 10 +- ...CalcDao.java => PointAdditiveCalcDao.java} | 4 +- ...rdDao.java => PointAdditiveRecordDao.java} | 10 +- ...tity.java => PointAdditiveCalcEntity.java} | 4 +- ...ty.java => PointAdditiveRecordEntity.java} | 4 +- ...ice.java => PointAdditiveCalcService.java} | 22 +-- ...e.java => PointAdditiveRecordService.java} | 28 ++-- .../impl/PointAdditiveCalcServiceImpl.java | 82 ++++++++++ ...va => PointAdditiveRecordServiceImpl.java} | 58 +++---- .../impl/PointAditiveCalcServiceImpl.java | 82 ---------- .../service/impl/PointApplyServiceImpl.java | 32 ++-- .../impl/UserPointTotalServiceImpl.java | 26 ++-- .../db/migration/V0.0.11__pointAdditive.sql | 146 ++++++++++++++++++ .../resources/mapper/PointAdditiveCalcDao.xml | 8 + .../mapper/PointAdditiveRecordDao.xml | 31 ++++ .../resources/mapper/PointAditiveCalcDao.xml | 22 --- .../mapper/PointAditiveRecordDao.xml | 48 ------ 21 files changed, 371 insertions(+), 256 deletions(-) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/{PointAditiveCalcDTO.java => PointAdditiveCalcDTO.java} (94%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/{PointAditiveRecordDTO.java => PointAdditiveRecordDTO.java} (95%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/{PointAditiveRecordDailyDTO.java => PointAdditiveRecordDailyDTO.java} (92%) rename epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/{PointAditiveRecordResultDTO.java => PointAdditiveRecordResultDTO.java} (71%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/{PointAditiveCalcDao.java => PointAdditiveCalcDao.java} (63%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/{PointAditiveRecordDao.java => PointAdditiveRecordDao.java} (52%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/{PointAditiveCalcEntity.java => PointAdditiveCalcEntity.java} (89%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/{PointAditiveRecordEntity.java => PointAdditiveRecordEntity.java} (92%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/{PointAditiveCalcService.java => PointAdditiveCalcService.java} (64%) rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/{PointAditiveRecordService.java => PointAdditiveRecordService.java} (60%) create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java rename epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/{PointAditiveRecordServiceImpl.java => PointAdditiveRecordServiceImpl.java} (61%) delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml create mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml delete mode 100644 epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java similarity index 94% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java index dd61db0db7..5a86dff31b 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveCalcDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveCalcDTO.java @@ -12,7 +12,7 @@ import lombok.Data; * @since v1.0.0 2022-06-14 */ @Data -public class PointAditiveCalcDTO implements Serializable { +public class PointAdditiveCalcDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java similarity index 95% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java index b72fe77a08..68c899bed8 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAditiveRecordDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/PointAdditiveRecordDTO.java @@ -13,7 +13,7 @@ import java.util.Date; * @since v1.0.0 2022-06-14 */ @Data -public class PointAditiveRecordDTO implements Serializable { +public class PointAdditiveRecordDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java similarity index 92% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java index 56b54fd318..1f51bc9928 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordDailyDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordDailyDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * @Date 2022/6/15 9:47 */ @Data -public class PointAditiveRecordDailyDTO implements Serializable { +public class PointAdditiveRecordDailyDTO implements Serializable { private static final long serialVersionUID = -239326201168528901L; /** * 日期yyyy-MM-dd diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java similarity index 71% rename from epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java rename to epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java index c56cbeaade..096b585417 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAditiveRecordResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/PointAdditiveRecordResultDTO.java @@ -11,11 +11,11 @@ import java.util.List; * @Date 2022/6/15 9:46 */ @Data -public class PointAditiveRecordResultDTO implements Serializable { +public class PointAdditiveRecordResultDTO implements Serializable { private static final long serialVersionUID = -1498111500078847600L; /** * 日期yyyy-MM-dd */ private String date; - private List dailyList; + private List dailyList; } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java index 5a393cc871..885910a843 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/controller/ResiPointController.java @@ -38,7 +38,7 @@ public class ResiPointController { @Autowired private UserPointActionLogService pointActionLogService; @Resource - private PointAditiveRecordService pointAditiveRecordService; + private PointAdditiveRecordService pointAdditiveRecordService; /** * @Description 获取指定居民的积分信息 @@ -244,15 +244,15 @@ public class ResiPointController { * * @Param dto * @Param pageUserParam - * @Return {@link Result>} + * @Return {@link Result>} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ - @PostMapping("aditiverecordlist") - public Result> aditiveRecords(@LoginUser TokenDto dto,@RequestBody CommonPageUserFormDTO pageUserParam){ + @PostMapping("additiverecordlist") + public Result> additiveRecords(@LoginUser TokenDto dto, @RequestBody CommonPageUserFormDTO pageUserParam){ pageUserParam.setCustomerId(dto.getCustomerId()); pageUserParam.setUserId(dto.getUserId()); ValidatorUtils.validateEntity(pageUserParam, CommonPageUserFormDTO.PageUserGroup.class); - return new Result>().ok(pointAditiveRecordService.getRecords(pageUserParam)); + return new Result>().ok(pointAdditiveRecordService.getRecords(pageUserParam)); } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java similarity index 63% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java index b5410693e5..ca55b3d103 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveCalcDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveCalcDao.java @@ -1,7 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.entity.PointAdditiveCalcEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2022-06-14 */ @Mapper -public interface PointAditiveCalcDao extends BaseDao { +public interface PointAdditiveCalcDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java similarity index 52% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java index 83c06481b5..e1a5638f48 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAditiveRecordDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRecordDao.java @@ -1,8 +1,8 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.PointAditiveRecordDailyDTO; -import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.dto.result.PointAdditiveRecordDailyDTO; +import com.epmet.entity.PointAdditiveRecordEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -15,16 +15,16 @@ import java.util.List; * @since v1.0.0 2022-06-14 */ @Mapper -public interface PointAditiveRecordDao extends BaseDao { +public interface PointAdditiveRecordDao extends BaseDao { /** * 积分记录 * * @Param customerId * @Param categoryCode * @Param subjectId - * @Return {@link List< PointAditiveRecordDailyDTO>} + * @Return {@link List< PointAdditiveRecordDailyDTO >} * @Author zhaoqifeng * @Date 2022/6/15 10:12 */ - List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); + List selectRecordList(@Param("customerId") String customerId, @Param("categoryCode") String categoryCode, @Param("subjectId") String subjectId); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java similarity index 89% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java index 552b9e5dea..53c4939cf8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveCalcEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveCalcEntity.java @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("point_aditive_calc") -public class PointAditiveCalcEntity extends BaseEpmetEntity { +@TableName("point_additive_calc") +public class PointAdditiveCalcEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java similarity index 92% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java index 1a3ad83056..cc30d1fb85 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAditiveRecordEntity.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/entity/PointAdditiveRecordEntity.java @@ -13,8 +13,8 @@ import lombok.EqualsAndHashCode; */ @Data @EqualsAndHashCode(callSuper=false) -@TableName("point_aditive_record") -public class PointAditiveRecordEntity extends BaseEpmetEntity { +@TableName("point_additive_record") +public class PointAdditiveRecordEntity extends BaseEpmetEntity { private static final long serialVersionUID = 1L; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java similarity index 64% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java index 6b87e5cefc..74ac718ccb 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAditiveCalcService.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/PointAdditiveCalcService.java @@ -2,8 +2,8 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.PointAditiveCalcDTO; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.dto.PointAdditiveCalcDTO; +import com.epmet.entity.PointAdditiveCalcEntity; import java.util.List; import java.util.Map; @@ -14,37 +14,37 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2022-06-14 */ -public interface PointAditiveCalcService extends BaseService { +public interface PointAdditiveCalcService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return PointAditiveCalcDTO + * @return PointAdditiveCalcDTO * @author generator * @date 2022-06-14 */ - PointAditiveCalcDTO get(String id); + PointAdditiveCalcDTO get(String id); /** * 默认保存 @@ -54,7 +54,7 @@ public interface PointAditiveCalcService extends BaseService { +public interface PointAdditiveRecordService extends BaseService { /** * 默认分页 * * @param params - * @return PageData + * @return PageData * @author generator * @date 2022-06-14 */ - PageData page(Map params); + PageData page(Map params); /** * 默认查询 * * @param params - * @return java.util.List + * @return java.util.List * @author generator * @date 2022-06-14 */ - List list(Map params); + List list(Map params); /** * 单条查询 * * @param id - * @return PointAditiveRecordDTO + * @return PointAdditiveRecordDTO * @author generator * @date 2022-06-14 */ - PointAditiveRecordDTO get(String id); + PointAdditiveRecordDTO get(String id); /** * 默认保存 @@ -56,7 +56,7 @@ public interface PointAditiveRecordService extends BaseService} + * @Return {@link List< PointAdditiveRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ - List getRecords(CommonPageUserFormDTO formDTO); + List getRecords(CommonPageUserFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java new file mode 100644 index 0000000000..ca319c7b6f --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveCalcServiceImpl.java @@ -0,0 +1,82 @@ +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.constant.FieldConstant; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.PointAdditiveCalcDao; +import com.epmet.dto.PointAdditiveCalcDTO; +import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.service.PointAdditiveCalcService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; + +/** + * 附加积分计算 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-06-14 + */ +@Service +public class PointAdditiveCalcServiceImpl extends BaseServiceImpl implements PointAdditiveCalcService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PointAdditiveCalcDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PointAdditiveCalcDTO.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 PointAdditiveCalcDTO get(String id) { + PointAdditiveCalcEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveCalcDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PointAdditiveCalcDTO dto) { + PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PointAdditiveCalcDTO dto) { + PointAdditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveCalcEntity.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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java similarity index 61% rename from epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java rename to epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java index fbc96f0faf..4845b1193c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveRecordServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRecordServiceImpl.java @@ -10,13 +10,13 @@ import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.PointAditiveRecordDao; -import com.epmet.dto.PointAditiveRecordDTO; +import com.epmet.dao.PointAdditiveRecordDao; +import com.epmet.dto.PointAdditiveRecordDTO; import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.result.*; -import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.entity.PointAdditiveRecordEntity; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.service.PointAditiveRecordService; +import com.epmet.service.PointAdditiveRecordService; import com.github.pagehelper.PageHelper; import com.google.common.collect.Maps; import org.apache.commons.collections4.CollectionUtils; @@ -38,53 +38,53 @@ import java.util.stream.Collectors; * @since v1.0.0 2022-06-14 */ @Service -public class PointAditiveRecordServiceImpl extends BaseServiceImpl implements PointAditiveRecordService { +public class PointAdditiveRecordServiceImpl extends BaseServiceImpl implements PointAdditiveRecordService { @Resource private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( + public PageData page(Map params) { + IPage page = baseDao.selectPage( getPage(params, FieldConstant.CREATED_TIME, false), getWrapper(params) ); - return getPageData(page, PointAditiveRecordDTO.class); + return getPageData(page, PointAdditiveRecordDTO.class); } @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); - return ConvertUtils.sourceToTarget(entityList, PointAditiveRecordDTO.class); + return ConvertUtils.sourceToTarget(entityList, PointAdditiveRecordDTO.class); } - private QueryWrapper getWrapper(Map params){ + private QueryWrapper getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); - QueryWrapper wrapper = new QueryWrapper<>(); + QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); return wrapper; } @Override - public PointAditiveRecordDTO get(String id) { - PointAditiveRecordEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PointAditiveRecordDTO.class); + public PointAdditiveRecordDTO get(String id) { + PointAdditiveRecordEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PointAdditiveRecordDTO.class); } @Override @Transactional(rollbackFor = Exception.class) - public void save(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + public void save(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); insert(entity); } @Override @Transactional(rollbackFor = Exception.class) - public void update(PointAditiveRecordDTO dto) { - PointAditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveRecordEntity.class); + public void update(PointAdditiveRecordDTO dto) { + PointAdditiveRecordEntity entity = ConvertUtils.sourceToTarget(dto, PointAdditiveRecordEntity.class); updateById(entity); } @@ -99,13 +99,13 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl} + * @Return {@link List< PointAdditiveRecordResultDTO >} * @Author zhaoqifeng * @Date 2022/6/15 9:55 */ @Override - public List getRecords(CommonPageUserFormDTO formDTO) { - List list = new ArrayList<>(); + public List getRecords(CommonPageUserFormDTO formDTO) { + List list = new ArrayList<>(); String subjectId; //如果申请类型为德育积分，需要获取用户所在房屋 if (CommonConstant.MORAL_EDUCATION.equals(formDTO.getCategoryCode())) { @@ -122,17 +122,17 @@ public class PointAditiveRecordServiceImpl extends BaseServiceImpl recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); + List recordList = baseDao.selectRecordList(formDTO.getCustomerId(), formDTO.getCategoryCode(), subjectId); if(CollectionUtils.isNotEmpty(recordList)){ - Map> map = - recordList.stream().collect(Collectors.groupingBy(PointAditiveRecordDailyDTO::getDate)); + Map> map = + recordList.stream().collect(Collectors.groupingBy(PointAdditiveRecordDailyDTO::getDate)); - Map> sortedMap = Maps.newLinkedHashMap(); - map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) + Map> sortedMap = Maps.newLinkedHashMap(); + map.entrySet().stream().sorted(Map.Entry.>comparingByKey().reversed()) .forEachOrdered(e -> sortedMap.put(e.getKey(), e.getValue())); sortedMap.forEach((key, value) -> { - PointAditiveRecordResultDTO o = new PointAditiveRecordResultDTO(); + PointAdditiveRecordResultDTO o = new PointAdditiveRecordResultDTO(); o.setDate(key); o.setDailyList(value); list.add(o); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java deleted file mode 100644 index 2b8bc7ed16..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAditiveCalcServiceImpl.java +++ /dev/null @@ -1,82 +0,0 @@ -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.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.dao.PointAditiveCalcDao; -import com.epmet.dto.PointAditiveCalcDTO; -import com.epmet.entity.PointAditiveCalcEntity; -import com.epmet.service.PointAditiveCalcService; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; - -/** - * 附加积分计算 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-06-14 - */ -@Service -public class PointAditiveCalcServiceImpl extends BaseServiceImpl implements PointAditiveCalcService { - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PointAditiveCalcDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PointAditiveCalcDTO.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 PointAditiveCalcDTO get(String id) { - PointAditiveCalcEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PointAditiveCalcDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(PointAditiveCalcDTO dto) { - PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PointAditiveCalcDTO dto) { - PointAditiveCalcEntity entity = ConvertUtils.sourceToTarget(dto, PointAditiveCalcEntity.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/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java index a0cf8c4dda..67e870c8d2 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointApplyServiceImpl.java @@ -18,8 +18,8 @@ import com.epmet.commons.tools.redis.common.bean.ResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.PointAditiveCalcDao; -import com.epmet.dao.PointAditiveRecordDao; +import com.epmet.dao.PointAdditiveCalcDao; +import com.epmet.dao.PointAdditiveRecordDao; import com.epmet.dao.PointAnnexDao; import com.epmet.dao.PointApplyDao; import com.epmet.dto.PointApplyDTO; @@ -27,8 +27,8 @@ import com.epmet.dto.form.PointApplyFormDTO; import com.epmet.dto.form.PointApplyPageFormDTO; import com.epmet.dto.form.PointAuditFormDTO; import com.epmet.dto.result.HomeInfoResultDTO; -import com.epmet.entity.PointAditiveCalcEntity; -import com.epmet.entity.PointAditiveRecordEntity; +import com.epmet.entity.PointAdditiveCalcEntity; +import com.epmet.entity.PointAdditiveRecordEntity; import com.epmet.entity.PointAnnexEntity; import com.epmet.entity.PointApplyEntity; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -61,9 +61,9 @@ public class PointApplyServiceImpl extends BaseServiceImpl page(PointApplyPageFormDTO formDTO) { @@ -248,7 +248,7 @@ public class PointApplyServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, subjectId); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); - PointAditiveCalcEntity calc = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, subjectId); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, dto.getCategoryCode()); + PointAdditiveCalcEntity calc = pointAdditiveCalcDao.selectOne(wrapper); if (null != calc) { calc.setUpdatedBy(null); calc.setUpdatedTime(null); calc.setTotal(calc.getTotal() + dto.getPointValue()); - pointAditiveCalcDao.updateById(calc); + pointAdditiveCalcDao.updateById(calc); } else { - calc = new PointAditiveCalcEntity(); + calc = new PointAdditiveCalcEntity(); calc.setCustomerId(tokenDto.getCustomerId()); calc.setCategoryCode(dto.getCategoryCode()); calc.setSubjectId(subjectId); calc.setSpend(NumConstant.ZERO); calc.setTotal(dto.getPointValue()); - pointAditiveCalcDao.insert(calc); + pointAdditiveCalcDao.insert(calc); } } } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java index aa400d8f7a..e9ff35e4bc 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/UserPointTotalServiceImpl.java @@ -26,13 +26,13 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.PointAditiveCalcDao; +import com.epmet.dao.PointAdditiveCalcDao; import com.epmet.dao.UserPointTotalDao; import com.epmet.dto.form.CommonPageUserFormDTO; import com.epmet.dto.form.CommonUserFormDTO; import com.epmet.dto.form.ResiPointRankFormDTO; import com.epmet.dto.result.*; -import com.epmet.entity.PointAditiveCalcEntity; +import com.epmet.entity.PointAdditiveCalcEntity; import com.epmet.entity.UserPointTotalEntity; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.UserPointTotalService; @@ -60,7 +60,7 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, result.getData().getHouseId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, result.getData().getHouseId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.MORAL_EDUCATION); + PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper); if (null != entity) { resultDTO.setTotal(entity.getTotal()); resultDTO.setSpend(entity.getSpend()); @@ -297,11 +297,11 @@ public class UserPointTotalServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(PointAditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); - wrapper.eq(PointAditiveCalcEntity::getSubjectId, formDTO.getUserId()); - wrapper.eq(PointAditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); - PointAditiveCalcEntity entity = pointAditiveCalcDao.selectOne(wrapper); + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(PointAdditiveCalcEntity::getCustomerId, formDTO.getCustomerId()); + wrapper.eq(PointAdditiveCalcEntity::getSubjectId, formDTO.getUserId()); + wrapper.eq(PointAdditiveCalcEntity::getCategoryCode, CommonConstant.PARTY_BUILDING); + PointAdditiveCalcEntity entity = pointAdditiveCalcDao.selectOne(wrapper); if (null != entity) { resultDTO.setTotal(entity.getTotal()); resultDTO.setSpend(entity.getSpend()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql new file mode 100644 index 0000000000..db75bc8fcf --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql @@ -0,0 +1,146 @@ +DROP TABLE IF EXISTS point_additive_rule; +CREATE TABLE point_additive_rule( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + TYPE VARCHAR(32) NOT NULL COMMENT '记录类型;分类:category；规则:rule' , + APPLY_FLAG VARCHAR(1) COMMENT '允许申请标记;允许0（type = category时，强制赋值为0），禁止1。' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别编码;德育积分moral_education；党建积分party_building' , + CATEGORY_NAME VARCHAR(128) COMMENT '积分类别名称;type=category时必填' , + RULE_NAME VARCHAR(512) COMMENT '积分规则名称;type=rule时必填' , + PID VARCHAR(64) COMMENT '上级节点ID;上级分类ID，顶级分类的PID为0' , + PIDS VARCHAR(512) COMMENT '上级节点ID路径;所有上级节点以英文冒号(:)拼接；不必拼接0' , + POINT_VALUE INT(10) COMMENT '分值;正数加分，负数减分；type=rule时必填' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分规则'; + +DROP TABLE IF EXISTS point_additive_record; +CREATE TABLE point_additive_record( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + TITLE VARCHAR(512) COMMENT '标题;积分变动标题或业务场景标题' , + STATEMENT VARCHAR(3072) COMMENT '说明;积分变动的说明' , + POINT_VALUE INT(10) COMMENT '分值' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别;德育积分moral_education；党建积分party_building' , + SUBJECT_ID VARCHAR(64) COMMENT '积分主体ID;居民端用户ID或房屋ID' , + BUSINESS_ID VARCHAR(64) COMMENT '业务主键' , + BUSINESS_CODE VARCHAR(32) COMMENT '业务编码;积分申请point_apply；积分奖励point_reward；积分扣罚point_fine；积分花费point_cost；驳回积分申请point_reject' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分记录'; + +DROP TABLE IF EXISTS point_additive_calc; +CREATE TABLE point_additive_calc( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + CATEGORY_CODE VARCHAR(32) COMMENT '积分类别;德育积分moral_education；党建积分party_building' , + SUBJECT_ID VARCHAR(64) COMMENT '积分主体ID;居民端用户ID或房屋ID' , + SPEND INT(10) DEFAULT 0 COMMENT '已用积分;累计已花费' , + TOTAL INT(10) DEFAULT 0 COMMENT '总分;累计积分' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '附加积分计算'; + +DROP TABLE IF EXISTS point_apply; +CREATE TABLE point_apply( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + CATEGORY_ID VARCHAR(64) COMMENT '类别ID' , + CATEGORY_NAME VARCHAR(90) COMMENT '类别名称' , + CATEGORY_CODE VARCHAR(32) COMMENT '类别编码;德育积分moral_education；党建积分party_building' , + RULE_ID VARCHAR(64) NOT NULL COMMENT '积分规则ID' , + RULE_NAME VARCHAR(512) COMMENT '积分规则名称' , + TITLE VARCHAR(128) COMMENT '申请标题;30字内' , + STATEMENT VARCHAR(3072) COMMENT '申请内容说明;1000字内' , + STATUS VARCHAR(1) NOT NULL DEFAULT '0' COMMENT '申请状态;0已提交；1已驳回；2已通过' , + GRID_NAME VARCHAR(32) COMMENT '申请人所属网格名称' , + GRID_ID VARCHAR(64) NOT NULL COMMENT '申请人所属网格ID' , + AGENCY_ID VARCHAR(64) NOT NULL COMMENT '申请人所属组织ID' , + AGENCY_PIDS VARCHAR(512) COMMENT '上级组织ID路径' , + USER_ID VARCHAR(64) COMMENT '用户ID;申请人ID（居民端用户ID）' , + IC_RESI_USER VARCHAR(64) COMMENT '居民ID;申请人居民ID（IC_RESI_USER表主键）' , + HOUSE_ID VARCHAR(64) COMMENT '房屋ID;房屋或家庭ID' , + HOUSE_ALL_NAME VARCHAR(512) COMMENT '房屋名称;完整拼接的名称' , + HEAD_IMG_URL VARCHAR(512) COMMENT '头像' , + NICKNAME VARCHAR(90) COMMENT '昵称' , + GENDER VARCHAR(1) COMMENT '性别;未知0；男1；女2' , + NAME VARCHAR(90) COMMENT '姓名' , + ID_CARD VARCHAR(32) COMMENT '身份证号' , + MOBILE VARCHAR(32) COMMENT '手机号' , + REMARK VARCHAR(512) COMMENT '审核备注' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分申请'; + +DROP TABLE IF EXISTS point_reward; +CREATE TABLE point_reward( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + AGENCY_ID VARCHAR(32) NOT NULL COMMENT '组织ID' , + AGENCY_PIDS VARCHAR(512) COMMENT '组织ID路径' , + HOUSE_ID VARCHAR(64) COMMENT '房屋ID' , + HOUSE_ALL_NAME VARCHAR(512) COMMENT '房屋名称;完整拼接的名称' , + STAFF_ID VARCHAR(64) COMMENT '工作人员ID' , + STAFF_NAME VARCHAR(90) COMMENT '工作人员姓名' , + BUSINESS_CODE VARCHAR(32) COMMENT '操作类型;积分奖励point_reward；积分扣罚point_fine' , + STATEMENT VARCHAR(3072) COMMENT '备注说明;200字内' , + POINT_VALUE INT(10) COMMENT '奖扣总分值' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分奖扣'; + +DROP TABLE IF EXISTS point_reward_rule; +CREATE TABLE point_reward_rule( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + REWARD_ID VARCHAR(64) COMMENT '奖扣ID' , + RULE_ID VARCHAR(64) COMMENT '规则ID' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分奖扣明细'; + +DROP TABLE IF EXISTS point_annex; +CREATE TABLE point_annex( + ID VARCHAR(64) NOT NULL COMMENT '主键' , + CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , + BUSINESS_ID VARCHAR(64) COMMENT '业务ID;业务主键，包括积分申请、奖扣等业务' , + BUSINESS_CODE VARCHAR(32) COMMENT '业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost' , + URL VARCHAR(512) COMMENT '附件访问地址' , + DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , + REVISION INT(10) COMMENT '乐观锁' , + CREATED_BY VARCHAR(64) COMMENT '创建人' , + CREATED_TIME DATETIME COMMENT '创建时间' , + UPDATED_BY VARCHAR(64) COMMENT '更新人' , + UPDATED_TIME DATETIME COMMENT '更新时间' , + PRIMARY KEY (ID) +) COMMENT = '积分相关附件表'; diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml new file mode 100644 index 0000000000..dc41cb4988 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveCalcDao.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml new file mode 100644 index 0000000000..b491f35e25 --- /dev/null +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRecordDao.xml @@ -0,0 +1,31 @@ + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml deleted file mode 100644 index c015362019..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveCalcDao.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml deleted file mode 100644 index d56f192143..0000000000 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAditiveRecordDao.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 3dde82f44ef2c8e78f012b0f338d3f8da5e4c5c2 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 20 Jun 2022 10:04:21 +0800 Subject: [PATCH 26/43] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.11__pointAdditive.sql | 97 ++++++++++--------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql index db75bc8fcf..9e69ec4907 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/db/migration/V0.0.11__pointAdditive.sql @@ -57,40 +57,40 @@ CREATE TABLE point_additive_calc( ) COMMENT = '附加积分计算'; DROP TABLE IF EXISTS point_apply; -CREATE TABLE point_apply( - ID VARCHAR(64) NOT NULL COMMENT '主键' , - CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , - CATEGORY_ID VARCHAR(64) COMMENT '类别ID' , - CATEGORY_NAME VARCHAR(90) COMMENT '类别名称' , - CATEGORY_CODE VARCHAR(32) COMMENT '类别编码;德育积分moral_education；党建积分party_building' , - RULE_ID VARCHAR(64) NOT NULL COMMENT '积分规则ID' , - RULE_NAME VARCHAR(512) COMMENT '积分规则名称' , - TITLE VARCHAR(128) COMMENT '申请标题;30字内' , - STATEMENT VARCHAR(3072) COMMENT '申请内容说明;1000字内' , - STATUS VARCHAR(1) NOT NULL DEFAULT '0' COMMENT '申请状态;0已提交；1已驳回；2已通过' , - GRID_NAME VARCHAR(32) COMMENT '申请人所属网格名称' , - GRID_ID VARCHAR(64) NOT NULL COMMENT '申请人所属网格ID' , - AGENCY_ID VARCHAR(64) NOT NULL COMMENT '申请人所属组织ID' , - AGENCY_PIDS VARCHAR(512) COMMENT '上级组织ID路径' , - USER_ID VARCHAR(64) COMMENT '用户ID;申请人ID（居民端用户ID）' , - IC_RESI_USER VARCHAR(64) COMMENT '居民ID;申请人居民ID（IC_RESI_USER表主键）' , - HOUSE_ID VARCHAR(64) COMMENT '房屋ID;房屋或家庭ID' , - HOUSE_ALL_NAME VARCHAR(512) COMMENT '房屋名称;完整拼接的名称' , - HEAD_IMG_URL VARCHAR(512) COMMENT '头像' , - NICKNAME VARCHAR(90) COMMENT '昵称' , - GENDER VARCHAR(1) COMMENT '性别;未知0；男1；女2' , - NAME VARCHAR(90) COMMENT '姓名' , - ID_CARD VARCHAR(32) COMMENT '身份证号' , - MOBILE VARCHAR(32) COMMENT '手机号' , - REMARK VARCHAR(512) COMMENT '审核备注' , - DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , - REVISION INT(10) COMMENT '乐观锁' , - CREATED_BY VARCHAR(64) COMMENT '创建人' , - CREATED_TIME DATETIME COMMENT '创建时间' , - UPDATED_BY VARCHAR(64) COMMENT '更新人' , - UPDATED_TIME DATETIME COMMENT '更新时间' , - PRIMARY KEY (ID) -) COMMENT = '积分申请'; +CREATE TABLE `point_apply` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '申请人所属组织ID', + `AGENCY_PIDS` varchar(512) DEFAULT NULL COMMENT '上级组织ID路径', + `GRID_ID` varchar(64) NOT NULL COMMENT '申请人所属网格ID', + `GRID_NAME` varchar(32) DEFAULT NULL COMMENT '申请人所属网格名称', + `CATEGORY_ID` varchar(64) DEFAULT NULL COMMENT '类别ID', + `CATEGORY_NAME` varchar(90) DEFAULT NULL COMMENT '类别名称', + `CATEGORY_CODE` varchar(32) DEFAULT NULL COMMENT '类别编码;德育积分moral_education；党建积分party_building', + `RULE_ID` varchar(64) NOT NULL COMMENT '积分规则ID', + `RULE_NAME` varchar(512) DEFAULT NULL COMMENT '积分规则名称', + `TITLE` varchar(128) DEFAULT NULL COMMENT '申请标题;30字内', + `STATEMENT` varchar(3072) DEFAULT NULL COMMENT '申请内容说明;1000字内', + `STATUS` varchar(1) NOT NULL DEFAULT '0' COMMENT '申请状态;0已提交；1已驳回；2已通过', + `USER_ID` varchar(64) DEFAULT NULL COMMENT '用户ID;申请人ID（居民端用户ID）', + `IC_RESI_USER` varchar(64) DEFAULT NULL COMMENT '居民ID;申请人居民ID（IC_RESI_USER表主键）', + `HOUSE_ID` varchar(64) DEFAULT NULL COMMENT '房屋ID;房屋或家庭ID', + `HOUSE_ALL_NAME` varchar(512) DEFAULT NULL COMMENT '房屋名称;完整拼接的名称', + `HEAD_IMG_URL` varchar(512) DEFAULT NULL COMMENT '头像', + `NICKNAME` varchar(90) DEFAULT NULL COMMENT '昵称', + `GENDER` varchar(1) DEFAULT NULL COMMENT '性别;未知0；男1；女2', + `NAME` varchar(90) DEFAULT NULL COMMENT '姓名', + `ID_CARD` varchar(32) DEFAULT NULL COMMENT '身份证号', + `MOBILE` varchar(32) DEFAULT NULL COMMENT '手机号', + `REMARK` varchar(512) DEFAULT NULL COMMENT '审核备注', + `DEL_FLAG` varchar(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分申请'; DROP TABLE IF EXISTS point_reward; CREATE TABLE point_reward( @@ -130,17 +130,18 @@ CREATE TABLE point_reward_rule( ) COMMENT = '积分奖扣明细'; DROP TABLE IF EXISTS point_annex; -CREATE TABLE point_annex( - ID VARCHAR(64) NOT NULL COMMENT '主键' , - CUSTOMER_ID VARCHAR(64) NOT NULL COMMENT '客户ID' , - BUSINESS_ID VARCHAR(64) COMMENT '业务ID;业务主键，包括积分申请、奖扣等业务' , - BUSINESS_CODE VARCHAR(32) COMMENT '业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost' , - URL VARCHAR(512) COMMENT '附件访问地址' , - DEL_FLAG VARCHAR(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除' , - REVISION INT(10) COMMENT '乐观锁' , - CREATED_BY VARCHAR(64) COMMENT '创建人' , - CREATED_TIME DATETIME COMMENT '创建时间' , - UPDATED_BY VARCHAR(64) COMMENT '更新人' , - UPDATED_TIME DATETIME COMMENT '更新时间' , - PRIMARY KEY (ID) -) COMMENT = '积分相关附件表'; +CREATE TABLE `point_annex` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) DEFAULT NULL COMMENT '业务ID;业务主键，包括积分申请、奖扣等业务', + `BUSINESS_CODE` varchar(32) DEFAULT NULL COMMENT '业务编码;积分申请point_apply，积分奖励point_reward，积分扣罚point_fine，积分花费point_cost', + `URL` varchar(512) DEFAULT NULL COMMENT '附件访问地址', + `SORT` int(10) DEFAULT NULL COMMENT '排序', + `DEL_FLAG` varchar(1) DEFAULT '0' COMMENT '删除标识;0.未删除 1.已删除', + `REVISION` int(10) DEFAULT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) DEFAULT NULL COMMENT '创建人', + `CREATED_TIME` datetime DEFAULT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) DEFAULT NULL COMMENT '更新人', + `UPDATED_TIME` datetime DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='积分相关附件表'; From e74792fd5884a63df84ec6aeb788662add010414 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 20 Jun 2022 11:07:08 +0800 Subject: [PATCH 27/43] =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/PointAdditiveRuleDao.java | 3 ++- .../epmet/service/impl/PointAdditiveRuleServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/PointAdditiveRuleDao.xml | 3 +++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java index 9e67740ec3..8b39e7d65b 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/dao/PointAdditiveRuleDao.java @@ -74,7 +74,8 @@ public interface PointAdditiveRuleDao extends BaseDao { * @params [customerId, categoryName] * @return com.epmet.entity.PointAdditiveRuleEntity */ - PointAdditiveRuleEntity selectEntityByName(@Param("customerId") String customerId, + PointAdditiveRuleEntity selectEntityByName(@Param("id") String id, + @Param("customerId") String customerId, @Param("categoryName") String categoryName, @Param("ruleName") String ruleName); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 706f572a52..d65d63dd92 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -105,7 +105,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl + and id= #{id} + and CATEGORY_NAME= #{categoryName} From 9d22cd7ac2513b89bac829dd513fb113387e395b Mon Sep 17 00:00:00 2001 From: Jackwang Date: Mon, 20 Jun 2022 14:41:19 +0800 Subject: [PATCH 28/43] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=9B=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PointAdditiveRuleServiceImpl.java | 44 ++++++++++++++++++- .../resources/mapper/PointAdditiveRuleDao.xml | 2 +- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index d65d63dd92..81790a602c 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -12,11 +12,13 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.PointAdditiveRuleDao; +import com.epmet.dao.PointApplyDao; import com.epmet.dto.CategorydetailResultDTO; import com.epmet.dto.PointAdditiveRuleDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.List4ApplyResultDTO; import com.epmet.entity.PointAdditiveRuleEntity; +import com.epmet.entity.PointApplyEntity; import com.epmet.redis.PointAdditiveRuleRedis; import com.epmet.service.PointAdditiveRuleService; import org.apache.commons.collections4.CollectionUtils; @@ -39,6 +41,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -88,6 +93,31 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(queryData); + List applyList = baseDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "请先删除下级的积分规则。","请先删除下级的积分规则。"); + } + }else{ + //判断其规则下面是否有待审核的积分申请，如果有则不允许修改/删除 + PointApplyEntity queryData = new PointApplyEntity(); + queryData.setRuleId(entity.getId()); + QueryWrapper wrapper = new QueryWrapper<>(queryData); + List applyList = pointApplyDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该规则下有积分申请尚未完成，请处理完成后再执行该操作。","该规则下有积分申请尚未完成，请处理完成后再执行该操作。"); + } + } + } baseDao.deleteBatchIds(Arrays.asList(ids)); } @@ -214,7 +244,7 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(queryData); + List applyList = pointApplyDao.selectList(wrapper); + if(CollectionUtils.isNotEmpty(applyList)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "该规则下有积分申请尚未完成，请处理完成后再执行该操作。","该规则下有积分申请尚未完成，请处理完成后再执行该操作。"); + } + entity.setRuleName(dto.getRuleName()); entity.setPointValue(dto.getPointValue()); entity.setApplyFlag(dto.getApplyFlag()); diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 958888b414..058d6db765 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -100,7 +100,7 @@ where DEL_FLAG='0' and CUSTOMER_ID=#{customerId} - and id= #{id} + and id != #{id} and CATEGORY_NAME= #{categoryName} From 3378796d56ccc17c594e619300e5b790b251eadf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 20 Jun 2022 15:04:04 +0800 Subject: [PATCH 29/43] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=A5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/project/ProjectProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index a1e6a233d0..2ee065b4b5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -4,7 +4,7 @@ From de6ff34324ed8c36da40e4f9cba03e03402a77f4 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 22 Jun 2022 14:29:05 +0800 Subject: [PATCH 36/43] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=83=AD=E7=BA=BF?= =?UTF-8?q?=E4=B8=AD=E5=89=94=E9=99=A4=E5=B7=B2=E8=A2=AB=E7=A6=81=E7=94=A8?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/CustomerStaffDao.java | 4 +++- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 9 +++------ .../src/main/resources/mapper/CustomerStaffDao.xml | 3 +++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index f877b1e50b..725a456b46 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -127,7 +127,9 @@ public interface CustomerStaffDao extends BaseDao { * @Author sun * @Description 根据staffId集合查询工作人员基础信息 **/ - List selectStaffByIds(@Param("staffIdList") List staffIdList); + List selectStaffByIds(@Param("staffIdList") List staffIdList, + @Param("enableFlag") String enableFlag); + /** * @param staffId diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 0d768140d9..6829a6eee9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -22,10 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.constant.*; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ExceptionUtils; @@ -512,7 +509,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList) { //1:批量查询人员基本信息 - List staffList = baseDao.selectStaffByIds(staffIdList); + List staffList = baseDao.selectStaffByIds(staffIdList,null); //2:批量查询人员拥有的所有角色信息 List roleList = staffRoleDao.selectStaffRoleList(staffIdList); CustomerStaffListResultDTO list = new CustomerStaffListResultDTO(); @@ -843,7 +840,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList()); staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - List list = baseDao.selectStaffByIds(staffIdList); + List list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //4.封装数据并返回 resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index f441f419af..10965b93ce 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -191,6 +191,9 @@ customer_staff WHERE del_flag = '0' + + and ENABLE_FLAG = #{enableFlag} + user_id = #{userId} From 31934197e605222f04f043ff951c687b1fb7660f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 22 Jun 2022 14:37:47 +0800 Subject: [PATCH 37/43] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=BC=BA=E5=B0=91=E5=A4=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PointApplyDao.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml index 500b87339d..4eff87f9b8 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointApplyDao.xml @@ -52,6 +52,7 @@ + @@ -73,7 +74,8 @@ a.CREATED_TIME, b.RULE_NAME, b.POINT_VALUE, - c.URL + c.URL, + a.REMARK FROM point_apply a INNER JOIN point_additive_rule b ON a.RULE_ID = b.ID AND a.CUSTOMER_ID = b.CUSTOMER_ID From 57a8d2d7d7dc2207e143c26256a3d3e97b53ecc9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 22 Jun 2022 14:44:28 +0800 Subject: [PATCH 38/43] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E5=BF=85=E8=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/UserBadgeServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index a808b172e7..a9bf66fbd7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -402,11 +402,10 @@ public class UserBadgeServiceImpl implements UserBadgeService { public void reloadCustomerBadge(String customerId){ userBadgeRedis.delCustomerBadge(customerId); List userBadgeListResultDTOS = userBadgeDao.selectAllBadge(customerId); - if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ - throw new RenException("客户徽章缓存初始化未查到数据"); + if (!CollectionUtils.isEmpty(userBadgeListResultDTOS)){ + userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } userBadgeRedis.batchClearUserBadgeCache(customerId); - userBadgeRedis.setCustomerBadge(userBadgeListResultDTOS, customerId); } /** From 2ee8c2512bf4222265a0e6a3aba8ecbd8f10de5c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 15:10:30 +0800 Subject: [PATCH 39/43] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/CollectListMemberExcelResultDTO.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java index 34efe5d146..85208ba924 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListMemberExcelResultDTO.java @@ -56,4 +56,10 @@ public class CollectListMemberExcelResultDTO implements Serializable { */ @Excel(name = "单位或学校", width = 60) private String workPlace; + + /** + * 备注 + */ + @Excel(name = "备注", width = 60) + private String remark; } From 9bd9d76aa5ab36eaec3f2014d78cb74a6493e2ee Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 22 Jun 2022 15:14:43 +0800 Subject: [PATCH 40/43] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E7=8A=B6=E6=80=811=EF=BC=9A=E5=87=BA=E7=A7=9F=200=EF=BC=9A?= =?UTF-8?q?=E8=87=AA=E4=BD=8F=20=202=EF=BC=9A=E9=97=B2=E7=BD=AE=203?= =?UTF-8?q?=EF=BC=9A=E6=9C=AA=E5=94=AE=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/CollectListExcelResultDTO.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java index b98e4489bd..04a34bb814 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListExcelResultDTO.java @@ -31,8 +31,9 @@ public class CollectListExcelResultDTO implements Serializable { /** * 房屋类型，1:自有, 0:租住 + * 房屋状态1：出租 0：自住 2：闲置 3：未售出 */ - @Excel(name = "房屋类型",replace = { "自有_1", "租住_0"}, width = 30, needMerge = true) + @Excel(name = "房屋状态",replace = { "出租_1", "自住_0","闲置_2","未售出_3"}, width = 30, needMerge = true) private String houseType; /** From d1e785cf354b2deee8a5333fdb0b9c018d3eef98 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 22 Jun 2022 15:42:44 +0800 Subject: [PATCH 41/43] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=85=81=E8=AE=B8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=9A=84=E7=A7=AF=E5=88=86=E7=B1=BB=E5=88=AB?= =?UTF-8?q?-=E8=BF=94=E5=9B=9E=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/List4ApplyResultDTO.java | 6 ++-- .../impl/PointAdditiveRuleServiceImpl.java | 28 +------------------ .../resources/mapper/PointAdditiveRuleDao.xml | 8 +++--- 3 files changed, 7 insertions(+), 35 deletions(-) diff --git a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java index 49fdc3844b..0d74a3fdf2 100644 --- a/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java +++ b/epmet-module/epmet-point/epmet-point-client/src/main/java/com/epmet/dto/result/List4ApplyResultDTO.java @@ -3,8 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; /** * @program: epmet-cloud @@ -19,9 +17,9 @@ public class List4ApplyResultDTO implements Serializable { private String name; - private String pid; +// private String pid; private Integer pointValue; - private List children = new ArrayList<>(); +// private List children = new ArrayList<>(); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java index 371c861773..7146f105f1 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/PointAdditiveRuleServiceImpl.java @@ -194,35 +194,9 @@ public class PointAdditiveRuleServiceImpl extends BaseServiceImpl> list4apply(List4applyFormDTO dto) { List list = baseDao.selectList4apply(dto); - List result = build(list); - result.removeIf(category ->CollectionUtils.isEmpty(category.getChildren())); - return new Result>().ok(result); + return new Result>().ok(list); } - /** - * 构建树节点 - */ - public static List build(List treeNodes) { - List result = new ArrayList<>(); - - //list转map - Map nodeMap = new LinkedHashMap<>(treeNodes.size()); - for(List4ApplyResultDTO treeNode : treeNodes){ - nodeMap.put(treeNode.getId(), treeNode); - } - - for(List4ApplyResultDTO node : nodeMap.values()) { - List4ApplyResultDTO parent = nodeMap.get(node.getPid()); - if(parent != null && !(node.getId().equals(parent.getId()))){ - parent.getChildren().add(node); - continue; - } - - result.add(node); - } - - return result; - } @Override public Result> list4tree(List4treeFormDTO dto) { diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml index 058d6db765..84a26d63e7 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/mapper/PointAdditiveRuleDao.xml @@ -45,8 +45,7 @@ From 3e43624e11e13c8d06ca5852f68a068ab17da260 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 22 Jun 2022 15:50:04 +0800 Subject: [PATCH 42/43] badge --- .../main/java/com/epmet/service/impl/UserBadgeServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index a9bf66fbd7..3c5d684601 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -81,6 +81,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { this.reloadCustomerBadge(userBadgeListFormDTO.getCustomerId()); userBadge = userBadgeRedis.getCustomerBadge(userBadgeListFormDTO.getCustomerId()); } + if (null == userBadge){ + return new ArrayList<>(); + } List redisUserBadgeList = JSON.parseArray(userBadge.toString(), UserBadgeListResultDTO.class); List userBadgeListResultDTOS = userBadgeDao.selectBadgeList(userBadgeListFormDTO); if (CollectionUtils.isEmpty(userBadgeListResultDTOS)){ From 46d85234e439674c67379951b21c5afb14300c09 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 22 Jun 2022 16:02:26 +0800 Subject: [PATCH 43/43] badge --- .../main/java/com/epmet/service/impl/UserBadgeServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java index 3c5d684601..f36dffda3f 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java @@ -119,6 +119,9 @@ public class UserBadgeServiceImpl implements UserBadgeService { public List selectOperList(UserOperListFormDTO userOperListFormDTO) { List userAuthBadgeList = userBadgeDao.selectAuthRecord(userOperListFormDTO.getUserId()); Object userBadge = userBadgeRedis.getCustomerBadge(userOperListFormDTO.getCustomerId()); + if (null == userBadge){ + return new ArrayList<>(); + } List userOperListResultDTOS = JSON.parseArray(userBadge.toString(), UserOperListResultDTO.class); // 没有任何记录 if (CollectionUtils.isEmpty(userAuthBadgeList)){