diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 3566279fa..0152f6419 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 3566279fa375baeebfef61119d41f0f0f56fc594 +Subproject commit 0152f6419f9cceb38cc52dbffdaaab518893ce0a diff --git a/esua-epdc/epdc-cloud-gateway-shibei b/esua-epdc/epdc-cloud-gateway-shibei index f7908baa7..d9805b690 160000 --- a/esua-epdc/epdc-cloud-gateway-shibei +++ b/esua-epdc/epdc-cloud-gateway-shibei @@ -1 +1 @@ -Subproject commit f7908baa725ff36dce7c14eb184647c7253d7176 +Subproject commit d9805b690901f7e64cc8cd820fd96ea6e4aa8b87 diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java new file mode 100644 index 000000000..5c3a48f1e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/SysSimpleDictDTO.java @@ -0,0 +1,27 @@ + +package com.elink.esua.epdc.dto; + +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 数据字典简要信息 + * + * @author yujintao + * @date 2019/7/15 09:29 + */ +@Data +public class SysSimpleDictDTO implements Serializable { + + private static final long serialVersionUID = -4827806651372425347L; + + @NotBlank(message = "{sysdict.name.require}", groups = DefaultGroup.class) + private String dictName; + + private String dictValue; + + private String remark; +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointLogFormDTO.java b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointLogFormDTO.java new file mode 100644 index 000000000..eb6620980 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-client/src/main/java/com/elink/esua/epdc/dto/form/PointLogFormDTO.java @@ -0,0 +1,28 @@ +package com.elink.esua.epdc.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author: qushutong + * @Date: 2021/9/26 15:00 + * @Description: + */ +@Data +public class PointLogFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 用户id + */ + private String userId; + + + /** + * 积分类型 + */ + private String type; +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java new file mode 100644 index 000000000..d2f145767 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -0,0 +1,33 @@ +package com.elink.esua.epdc.feign; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2021/9/24 15:28 + * @Description: + */ +@FeignClient(name = ServiceConstant.EPDC_ADMIN_SERVER, fallback = AdminFeignClientFallback.class) +public interface AdminFeignClient { + + /*** + * 根据数据字典类型获取简版数据字典列表 + * @param dictType + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author qushutong + * @date 2021/9/24 15:31 + */ + @GetMapping("/sys/dict/listSimple/{dictType}") + Result> listSimpleDictInfo(@PathVariable("dictType") String dictType); + + +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java new file mode 100644 index 000000000..f903cc390 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -0,0 +1,26 @@ +package com.elink.esua.epdc.feign.fallback; + +import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; +import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.feign.AdminFeignClient; +import org.springframework.stereotype.Component; + +import java.util.List; + + +/** + * @author: qushutong + * @Date: 2021/9/24 15:33 + * @Description: + */ +@Component +public class AdminFeignClientFallback implements AdminFeignClient { + + + @Override + public Result> listSimpleDictInfo(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ADMIN_SERVER, "listSimpleDictInfo", dictType); + } +} diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java index 46034e279..b1c333ad6 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/ActivePointLogService.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.mybatis.service.BaseService; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.dto.ActivePointLogDTO; +import com.elink.esua.epdc.dto.form.PointLogFormDTO; import com.elink.esua.epdc.entity.ActivePointLogEntity; import java.util.List; @@ -92,4 +93,13 @@ public interface ActivePointLogService extends BaseService * @date 2021-09-23 */ void delete(String[] ids); + + /*** + * 加减积分 + * @param formDTO + * @return void + * @author qushutong + * @date 2021/9/24 17:19 + */ + void updataPoint(PointLogFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java index 4f2eaff7d..bb51f9cb1 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/ActivePointLogServiceImpl.java @@ -20,12 +20,17 @@ package com.elink.esua.epdc.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.PointsConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dao.ActivePointLogDao; import com.elink.esua.epdc.dto.ActivePointLogDTO; +import com.elink.esua.epdc.dto.SysSimpleDictDTO; +import com.elink.esua.epdc.dto.form.PointLogFormDTO; import com.elink.esua.epdc.entity.ActivePointLogEntity; +import com.elink.esua.epdc.feign.AdminFeignClient; import com.elink.esua.epdc.redis.ActivePointLogRedis; import com.elink.esua.epdc.service.ActivePointLogService; import org.apache.commons.lang3.StringUtils; @@ -38,7 +43,7 @@ import java.util.List; import java.util.Map; /** - * 积分记录表 + * 积分记录表 * * @author elink elink@elink-cn.com * @since v1.0.0 2021-09-23 @@ -49,6 +54,9 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -65,8 +73,8 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -101,4 +109,28 @@ public class ActivePointLogServiceImpl extends BaseServiceImpl> listResult = adminFeignClient.listSimpleDictInfo(formDTO.getType()); + List dictList = listResult.getData(); + String points, limit, time, priod; + for (int i = 0; i < dictList.size(); i++) { + if (dictList.get(i).getDictName().equals(PointsConstant.POINTS)) { + points = dictList.get(i).getDictValue(); + } + if (dictList.get(i).getDictName().equals(PointsConstant.LIMIT)) { + limit = dictList.get(i).getDictValue(); + } + if (dictList.get(i).getDictName().equals(PointsConstant.TIME)) { + time = dictList.get(i).getDictValue(); + } + if (dictList.get(i).getDictName().equals(PointsConstant.PERIOD)) { + priod = dictList.get(i).getDictValue(); + } + } + + + } + } \ No newline at end of file