From 413783e53eb6124b379d0899a439ae50363cd451 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Mon, 8 Jun 2020 13:39:01 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AB=AF=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E5=90=8E=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/ResidentConfigDTO.java | 95 +++++++++++++ .../dto/result/ResidentConfigResultDTO.java | 27 ++++ .../ApiResidentConfigController.java | 32 +++++ .../controller/ResidentConfigController.java | 94 +++++++++++++ .../esua/epdc/dao/ResidentConfigDao.java | 63 +++++++++ .../epdc/entity/ResidentConfigEntity.java | 61 +++++++++ .../esua/epdc/excel/ResidentConfigExcel.java | 68 ++++++++++ .../esua/epdc/redis/ResidentConfigRedis.java | 47 +++++++ .../epdc/service/ResidentConfigService.java | 116 ++++++++++++++++ .../impl/ResidentConfigServiceImpl.java | 126 ++++++++++++++++++ .../resources/mapper/ResidentConfigDao.xml | 72 ++++++++++ 11 files changed, 801 insertions(+) create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ResidentConfigController.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ResidentConfigEntity.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ResidentConfigExcel.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ResidentConfigRedis.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java new file mode 100644 index 00000000..1d879780 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/ResidentConfigDTO.java @@ -0,0 +1,95 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +public class ResidentConfigDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 配置类型 + */ + private String residentType; + + /** + * 配置编码 + */ + private String residentCode; + + /** + * 配置内容 + */ + private String residentValue; + + /** + * 排序 + */ + private String sort; + + /** + * 删除标识 0：未删除，1：删除 + */ + private String delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java new file mode 100644 index 00000000..a89cd58e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-client/src/main/java/com/elink/esua/epdc/dto/result/ResidentConfigResultDTO.java @@ -0,0 +1,27 @@ +package com.elink.esua.epdc.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * APP 获取局面端配置 + * + * @author songyunpeng + * @date 2020/06/08 18:30 + */ +@Data +public class ResidentConfigResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 值 + */ + private String residentValue; + + /** + * 编码 + */ + private String residentCode; +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java new file mode 100644 index 00000000..bf6ce75d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; +import com.elink.esua.epdc.service.ResidentConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * APP 获取居民端配置 + * + * @author zhangyong + * @date 2020/05/27 18:30 + */ +@RestController +@RequestMapping("residentConfig") +public class ApiResidentConfigController { + + @Autowired + private ResidentConfigService residentConfigService; + + + @GetMapping("getResidentConfig/{residentType}") + public Result> getImgUrlList(@PathVariable("residentType") String residentType){ + return residentConfigService.listResidentConfig(residentType); + } +} diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ResidentConfigController.java new file mode 100644 index 00000000..ae7c6b3f --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ResidentConfigController.java @@ -0,0 +1,94 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.controller; + +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ExcelUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.commons.tools.validator.AssertUtils; +import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; +import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; +import com.elink.esua.epdc.dto.ResidentConfigDTO; +import com.elink.esua.epdc.excel.ResidentConfigExcel; +import com.elink.esua.epdc.service.ResidentConfigService; +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 elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@RestController +@RequestMapping("residentconfig") +public class ResidentConfigController { + + @Autowired + private ResidentConfigService residentConfigService; + + @GetMapping("page") + public Result> page(@RequestParam Map params){ + PageData page = residentConfigService.page(params); + return new Result>().ok(page); + } + + @GetMapping("{id}") + public Result get(@PathVariable("id") String id){ + ResidentConfigDTO data = residentConfigService.get(id); + return new Result().ok(data); + } + + @PostMapping + public Result save(@RequestBody ResidentConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); + residentConfigService.save(dto); + return new Result(); + } + + @PutMapping + public Result update(@RequestBody ResidentConfigDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + residentConfigService.update(dto); + return new Result(); + } + + @DeleteMapping + public Result delete(@RequestBody String[] ids){ + //效验数据 + AssertUtils.isArrayEmpty(ids, "id"); + residentConfigService.delete(ids); + return new Result(); + } + + @GetMapping("export") + public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { + List list = residentConfigService.list(params); + ExcelUtils.exportExcelToTarget(response, null, list, ResidentConfigExcel.class); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java new file mode 100644 index 00000000..61b8c3de --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java @@ -0,0 +1,63 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.ResidentConfigDTO; +import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; +import com.elink.esua.epdc.entity.ResidentConfigEntity; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; +import java.util.Map; + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Mapper +public interface ResidentConfigDao extends BaseDao { + /** + * @Description pc获取列表 + * @Author songyunpeng + * @Date 2020/6/8 + * @Param [params] + * @return java.util.List + **/ + List selectListResidentConfig(Map params); + + + /** + * @Description app根据类型获取居民配置列表 + * @Author songyunpeng + * @Date 2020/6/8 + * @Param [residentType] + * @return java.util.List + **/ + List selectListResidentConfigByResidentType(String residentType); + /** + * @Description 根据类型和编码获取配置 + * @Author songyunpeng + * @Date 2020/6/8 + * @Param [residentType, residentCode] + * @return com.elink.esua.epdc.dto.ResidentConfigDTO + **/ + ResidentConfigDTO selectResidentConfigDTOByTypeAndCode(String residentType, String residentCode); +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ResidentConfigEntity.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ResidentConfigEntity.java new file mode 100644 index 00000000..c0deebb2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/entity/ResidentConfigEntity.java @@ -0,0 +1,61 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("epdc_resident_config") +public class ResidentConfigEntity extends BaseEpdcEntity { + + private static final long serialVersionUID = 1L; + + /** + * 配置类型 + */ + private String residentType; + + /** + * 配置编码 + */ + private String residentCode; + + /** + * 配置内容 + */ + private String residentValue; + + /** + * 排序 + */ + private String sort; + /** + * 备注 + */ + private String remark; +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ResidentConfigExcel.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ResidentConfigExcel.java new file mode 100644 index 00000000..5239e47d --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/excel/ResidentConfigExcel.java @@ -0,0 +1,68 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.excel; + +import cn.afterturn.easypoi.excel.annotation.Excel; +import lombok.Data; + +import java.util.Date; + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Data +public class ResidentConfigExcel { + + @Excel(name = "主键") + private String id; + + @Excel(name = "配置类型") + private String residentType; + + @Excel(name = "配置编码") + private String residentCode; + + @Excel(name = "配置内容") + private String residentValue; + + @Excel(name = "排序") + private String sort; + + @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/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ResidentConfigRedis.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ResidentConfigRedis.java new file mode 100644 index 00000000..dd463a49 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/redis/ResidentConfigRedis.java @@ -0,0 +1,47 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.redis; + +import com.elink.esua.epdc.commons.tools.redis.RedisUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Component +public class ResidentConfigRedis { + @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/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java new file mode 100644 index 00000000..d53db97e --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java @@ -0,0 +1,116 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service; + +import com.elink.esua.epdc.commons.mybatis.service.BaseService; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.ResidentConfigDTO; +import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; +import com.elink.esua.epdc.entity.ResidentConfigEntity; + +import java.util.List; +import java.util.Map; + +/** + * 居民端配置表 + * + * @author elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +public interface ResidentConfigService extends BaseService { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-06-08 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-06-08 + */ + List list(Map params); + + /** + * 单条查询 + * + * @param id + * @return ResidentConfigDTO + * @author generator + * @date 2020-06-08 + */ + ResidentConfigDTO get(String id); + + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-06-08 + */ + void save(ResidentConfigDTO dto); + + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-06-08 + */ + void update(ResidentConfigDTO dto); + + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-06-08 + */ + void delete(String[] ids); + + /** + * app根据类型获取居民配置 + * + * @Author songyunpeng + * @Date 2020/6/8 + * @Param [residentType] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> listResidentConfig(String residentType); + /** + * @Description 根据类型和编码获取配置 + * @Author songyunpeng + * @Date 2020/6/8 + * @Param [residentType, residentCode] + * @return com.elink.esua.epdc.dto.ResidentConfigDTO + **/ + ResidentConfigDTO getResidentConfigDTOByTypeAndCode(String residentType,String residentCode); + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java new file mode 100644 index 00000000..f2ee5d99 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java @@ -0,0 +1,126 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; +import com.elink.esua.epdc.commons.tools.exception.RenException; +import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.ConvertUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dao.ResidentConfigDao; +import com.elink.esua.epdc.dto.ResidentConfigDTO; +import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; +import com.elink.esua.epdc.entity.ResidentConfigEntity; +import com.elink.esua.epdc.redis.ResidentConfigRedis; +import com.elink.esua.epdc.service.ResidentConfigService; +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 elink elink@elink-cn.com + * @since v1.0.0 2020-06-08 + */ +@Service +public class ResidentConfigServiceImpl extends BaseServiceImpl implements ResidentConfigService { + + @Autowired + private ResidentConfigRedis residentConfigRedis; + + @Override + public PageData page(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListResidentConfig(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, ResidentConfigDTO.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 ResidentConfigDTO get(String id) { + ResidentConfigEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, ResidentConfigDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(ResidentConfigDTO dto) { + //校验同意类型下 编码是否重复 + ResidentConfigDTO residentConfigDTOByTypeAndCode = getResidentConfigDTOByTypeAndCode(dto.getResidentType(), dto.getResidentCode()); + if(residentConfigDTOByTypeAndCode!=null){ + throw new RenException("同一类型下编码不能重复！"); + } + ResidentConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResidentConfigEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(ResidentConfigDTO dto) { + //校验同意类型下 编码是否重复 + ResidentConfigDTO residentConfigDTOByTypeAndCode = getResidentConfigDTOByTypeAndCode(dto.getResidentType(), dto.getResidentCode()); + //若是存在相同且ID不同的话代表编码重复！ + if(residentConfigDTOByTypeAndCode!=null && !residentConfigDTOByTypeAndCode.getId().equals(dto.getId())){ + throw new RenException("同一类型下编码不能重复！"); + } + ResidentConfigEntity entity = ConvertUtils.sourceToTarget(dto, ResidentConfigEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public Result> listResidentConfig(String residentType) { + return new Result>().ok(baseDao.selectListResidentConfigByResidentType(residentType)); + } + + @Override + public ResidentConfigDTO getResidentConfigDTOByTypeAndCode(String residentType, String residentCode) { + return baseDao.selectResidentConfigDTOByTypeAndCode(residentType,residentCode); + } + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml new file mode 100644 index 00000000..0a243b2c --- /dev/null +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From a37cf749bb3267f0a334cd125437b44e6018185f Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 9 Jun 2020 11:09:58 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiNewsController.java | 14 +- .../ApiResidentConfigController.java | 8 +- .../elink/esua/epdc/service/NewsService.java | 8 ++ .../epdc/service/impl/NewsServiceImpl.java | 8 ++ .../esua/epdc/mq/PointsModifyConsumer.java | 8 +- .../elink/esua/epdc/dto/UserPointsDTO.java | 128 ++++++++++++++++++ .../esua/epdc/controller/UserController.java | 8 ++ .../java/com/elink/esua/epdc/dao/UserDao.java | 9 ++ .../elink/esua/epdc/service/UserService.java | 17 +-- .../epdc/service/impl/UserServiceImpl.java | 9 ++ .../src/main/resources/mapper/UserDao.xml | 46 +++++++ 11 files changed, 247 insertions(+), 16 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java index 881b3533..ac6a32b1 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiNewsController.java @@ -151,11 +151,23 @@ public class ApiNewsController { * */ @PostMapping("news/browse") - @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") public Result modifyNewsBrowse(@LoginUser TokenDto userDetail,@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { ValidatorUtils.validateEntity(newsBrowseFromDTO); return newsService.modifyNewsBrowse(userDetail,newsBrowseFromDTO); } + /** + * @Description 新闻浏览有效加积分 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("news/browsePoints") + @RecordUserBehavior(behavior = BehaviorEnum.NEWS_BROWSE, referenceId = "#{newsBrowseFromDTO.getNewsId}", userId = "#{userDetail.getUserId}") + public Result browsePoints(@LoginUser TokenDto userDetail,@RequestBody EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + ValidatorUtils.validateEntity(newsBrowseFromDTO); + return newsService.browsePoints(userDetail,newsBrowseFromDTO); + } /** * 用户消息已读 diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index bf6ce75d..5f2759a2 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -24,7 +24,13 @@ public class ApiResidentConfigController { @Autowired private ResidentConfigService residentConfigService; - + /** + * @Description 新闻浏览积分有效浏览时长 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [residentType] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ @GetMapping("getResidentConfig/{residentType}") public Result> getImgUrlList(@PathVariable("residentType") String residentType){ return residentConfigService.listResidentConfig(residentType); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java index 24d25ddd..0b66eaa9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/NewsService.java @@ -144,4 +144,12 @@ public interface NewsService { * @Date 09:46 2020-05-19 **/ Result> listV2Notice(TokenDto userDetail, EpdcNoticeListV2FormDTO formDto); + /** + * @Description 新闻浏览有效时间内加积分接口 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [userDetail, newsBrowseFromDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java index 28872f6e..b527cd83 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/NewsServiceImpl.java @@ -111,4 +111,12 @@ public class NewsServiceImpl implements NewsService { formDto.setDeptId(userDetail.getGridId()); return newsFeignClient.listV2Notice(formDto); } + + @Override + public Result browsePoints(TokenDto userDetail, EpdcNewsBrowseFromDTO newsBrowseFromDTO) { + if(userDetail!=null){ + newsBrowseFromDTO.setUserId(userDetail.getUserId()); + } + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java index 78db59f7..01106fa3 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java @@ -21,13 +21,9 @@ import com.elink.esua.epdc.service.PointsRuleService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.message.MessageExt; -import org.apache.rocketmq.spring.annotation.MessageModel; -import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import java.util.Date; import java.util.List; /** @@ -37,8 +33,8 @@ import java.util.List; * @Date：2020/4/28 13:44 */ @Slf4j -@Component -@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) +//@Component +//@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) public class PointsModifyConsumer implements RocketMQListener { @Autowired diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java new file mode 100644 index 00000000..8702c590 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/UserPointsDTO.java @@ -0,0 +1,128 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto; + + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 用户信息表 + * + * @author songyunpeng + * @since v1.0.0 2019-09-02 + */ +@Data +public class UserPointsDTO implements Serializable { + + private static final long serialVersionUID = 915598602233599300L; + + /** + * 主键 + */ + private String id; + + /** + * 昵称 + */ + private String nickname; + + /** + * 手机号 + */ + private String mobile; + + /** + * 电话 + */ + private String telephone; + + + + /** + * 真实姓名 + */ + private String realName; + + + + /** + * 居民住址 + */ + private String address; + + + + /** + * 用户积分 + */ + private Integer points; + + /** + * 用户累计积分 + */ + private Integer pointsTotle; + + + /** + * 社区 + */ + private String communityName; + + /** + * 社区ID + */ + private Long communityId; + + /** + * 网格 + */ + private String gridName; + + /** + * 网格ID + */ + private Long gridId; + + /** + * 居住网格id + */ + private Long deptId; + + /** + * 父所有部门 + */ + private String parentDeptIds; + + /** + * 父所有部门 + */ + private String parentDeptNames; + + /** + * 所有部门ID + */ + private String allDeptIds; + + /** + * 所有部门名称 + */ + private String allDeptNames; +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 5ad1d17c..599b00e9 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -28,6 +28,7 @@ import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.enums.AppUserStatesEnum; import com.elink.esua.epdc.excel.UserExcel; @@ -178,4 +179,11 @@ public class UserController { return userService.handleUserPoints(formDTO); } + + @GetMapping("pageForPoints") + public Result> pageForPoints(@RequestParam Map params) { + PageData page = userService.pageForPoints(params); + return new Result>().ok(page); + } + } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java index 043cf3a7..38454599 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/dao/UserDao.java @@ -20,6 +20,7 @@ package com.elink.esua.epdc.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppUserRankingFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUnauthorizedAmountFromDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; @@ -215,4 +216,12 @@ public interface UserDao extends BaseDao { * @Date 14:56 2020-06-01 **/ EpdcAppRankingUserDTO selectCurrentUserRanking(EpdcAppUserRankingFormDTO formDto); + /** + * @Description 用户积分列表 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [params] + * @return java.util.List + **/ + List selectListUserPoints(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java index a9bcd2b8..bd445b0f 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/UserService.java @@ -22,16 +22,9 @@ import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CachingUserInfoDTO; import com.elink.esua.epdc.dto.UserDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserGroupInviteFormDTO; -import com.elink.esua.epdc.dto.epdc.form.EpdcUserRegistFormDTO; +import com.elink.esua.epdc.dto.UserPointsDTO; import com.elink.esua.epdc.dto.epdc.form.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcResidentDetailResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterInfoResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserInfoResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserRegisterAuditMsgResultDTO; -import com.elink.esua.epdc.dto.epdc.result.EpdcUserGroupInviteResultDTO; import com.elink.esua.epdc.dto.epdc.result.*; -import com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO; import com.elink.esua.epdc.entity.UserEntity; import com.elink.esua.epdc.rocketmq.dto.OrganizationModifyDTO; @@ -316,4 +309,12 @@ public interface UserService extends BaseService { * @Date 13:35 2020-06-01 **/ EpdcAppUserRankingResultDTO listUserPointsRanking(EpdcAppUserRankingFormDTO formDto); + /** + * @Description 积分模块用户列表 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [params] + * @return com.elink.esua.epdc.commons.tools.page.PageData + **/ + PageData pageForPoints(Map params); } diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java index 4ebf39b4..57b4bcd0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java @@ -1036,6 +1036,15 @@ public class UserServiceImpl extends BaseServiceImpl implem return rangking; } + @Override + public PageData pageForPoints(Map params) { + // 查询当前用户所具有的的数据权限 + List deptIdList = SecurityUser.getUser().getDeptIdList(); + params.put("deptIdList",deptIdList); + IPage page = getPage(params); + List list = baseDao.selectListUserPoints(params); + return new PageData<>(list, page.getTotal()); } + /** * 返回本次 积分排行 用户网格关系表中的用户id * @param formDto diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 89478077..2f4666d0 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -544,4 +544,50 @@ ) userRanking WHERE instr(userRanking.tjid , #{userId}) > 0 + From 305f6408d79a4087578f87e7dea78b029b8e93b2 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 9 Jun 2020 17:14:22 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/PointsLogsController.java | 13 +++ .../esua/epdc/mq/PointsModifyConsumer.java | 7 +- .../esua/epdc/service/PointsLogsService.java | 15 +++- .../service/impl/PointsLogsServiceImpl.java | 40 ++++++++-- .../epdc/dto/EpdcAdjustUserPointsDTO.java | 80 +++++++++++++++++++ .../esua/epdc/controller/UserController.java | 8 +- .../src/main/resources/mapper/UserDao.xml | 2 +- 7 files changed, 152 insertions(+), 13 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/EpdcAdjustUserPointsDTO.java diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index 55a15c0a..f98294cf 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; import com.elink.esua.epdc.excel.PointsLogsExcel; @@ -108,4 +109,16 @@ public class PointsLogsController { ValidatorUtils.validateEntity(formDto); return pointsLogsService.confirmAdjustPoint(formDto); } + /** + * @Description 积分管理-积分统计 -统计调整积分 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + @PostMapping("confirmUserAdjustPoint") + public Result confirmUserAdjustPoint(@RequestBody EpdcAdjustUserPointsDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return pointsLogsService.confirmUserAdjustPoint(formDto); + } } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java index 01106fa3..96cf8b2b 100644 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/mq/PointsModifyConsumer.java @@ -21,8 +21,11 @@ import com.elink.esua.epdc.service.PointsRuleService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.rocketmq.common.message.MessageExt; +import org.apache.rocketmq.spring.annotation.MessageModel; +import org.apache.rocketmq.spring.annotation.RocketMQMessageListener; import org.apache.rocketmq.spring.core.RocketMQListener; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; import java.util.List; @@ -33,8 +36,8 @@ import java.util.List; * @Date：2020/4/28 13:44 */ @Slf4j -//@Component -//@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) +@Component +@RocketMQMessageListener(topic = RocketMqConstant.MQ_TOPIC_POINTS, consumerGroup = "${rocketmq.consumer.points-group}", messageModel = MessageModel.BROADCASTING) public class PointsModifyConsumer implements RocketMQListener { @Autowired diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index ba47a78b..f0f98098 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -20,17 +20,16 @@ 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.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; -import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppPointsRecordResultDTO; +import com.elink.esua.epdc.dto.result.PointsLogsResultDTO; import com.elink.esua.epdc.entity.PointsLogsEntity; -import io.swagger.models.auth.In; import java.util.List; import java.util.Map; @@ -164,4 +163,12 @@ public interface PointsLogsService extends BaseService { * @Date: 2020-04-30 */ EpdcAppPointsRankingResultDTO listPointsRanking(EpdcAppPointsRankingFormDTO formDto); + /** + * @Description 积分管理-积分统计 -统计调整积分 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + **/ + Result confirmUserAdjustPoint(EpdcAdjustUserPointsDTO formDto); } diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 69abab12..aa7bbd56 100755 --- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -21,34 +21,33 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.elink.esua.epdc.async.NewsTask; import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl; +import com.elink.esua.epdc.commons.tools.constant.FieldConstant; import com.elink.esua.epdc.commons.tools.constant.NumConstant; import com.elink.esua.epdc.commons.tools.constant.PointsConstant; -import com.elink.esua.epdc.commons.tools.enums.BehaviorEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationEnum; import com.elink.esua.epdc.commons.tools.enums.pointsenum.PointsOperationModeEnum; import com.elink.esua.epdc.commons.tools.exception.RenException; 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.PointsLogsDao; +import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; import com.elink.esua.epdc.dto.constant.PointsNoticeConstant; import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcUserPointsFormDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAdjustVolunteerPointsDTO; -import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; -import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO; import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO; +import com.elink.esua.epdc.dto.form.PointsLogsFormDTO; +import com.elink.esua.epdc.dto.result.*; import com.elink.esua.epdc.entity.PointsLogsEntity; import com.elink.esua.epdc.feign.UsersFeignClient; import com.elink.esua.epdc.redis.PointsLogsRedis; import com.elink.esua.epdc.service.PointsBehaviorService; import com.elink.esua.epdc.service.PointsLogsService; import org.apache.commons.lang3.StringUtils; -import org.apache.poi.ss.formula.functions.Rank; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -253,6 +252,37 @@ public class PointsLogsServiceImpl extends BaseServiceImpl result = usersFeignClient.handleUserPoints(userPointsFormDTO); + if (!result.success()) { + return new Result().error("调整用户积分失败"); + } + //剩余积分 + pointsLogsEntity.setLavePoints(result.getData().getPoints()); + this.insert(pointsLogsEntity); + return new Result(); + } + /** * 获取【排好序】的排行榜数据 * @param formDto diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/EpdcAdjustUserPointsDTO.java b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/EpdcAdjustUserPointsDTO.java new file mode 100644 index 00000000..7e1bad91 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-client/src/main/java/com/elink/esua/epdc/dto/EpdcAdjustUserPointsDTO.java @@ -0,0 +1,80 @@ +package com.elink.esua.epdc.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + +/** + * @Description 用户积分调整入参DTO + * @Author + * @Date 2019/12/16 17:25 + */ +@Data +public class EpdcAdjustUserPointsDTO implements Serializable { + private static final long serialVersionUID = -2810969141214818209L; + + /** + * 用户ID + */ + @NotBlank(message = "用户不能为空") + private String id; + + + /** + * 姓名 + */ + private String realName; + + /** + * 用户昵称 + */ + private String nickname; + + /** + * 用户头像 + */ + private String faceImg; + + /** + * 性别(0-女，1-男) + */ + private String sex; + + /** + * 出生日期 + */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date birthday; + + /** + * 手机号 + */ + private String mobile; + + /** + * 用户当前积分 + */ + private Integer points; + + /** + * 调整原因 + */ + @NotBlank(message = "调整原因不能为空") + private String adjustReason; + + /** + * 积分操作类型 + */ + @NotBlank(message = "操作类型不能为空") + private String operationType; + + /** + * 积分调整值 + */ + private Integer operatePoints; + + +} diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java index 599b00e9..c4c2f190 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/controller/UserController.java @@ -179,7 +179,13 @@ public class UserController { return userService.handleUserPoints(formDTO); } - + /** + * @Description 用户积分统计列表 + * @Author songyunpeng + * @Date 2020/6/9 + * @Param [params] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ @GetMapping("pageForPoints") public Result> pageForPoints(@RequestParam Map params) { PageData page = userService.pageForPoints(params); diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index 2f4666d0..d6b6351a 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -565,7 +565,7 @@ LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID) ug ON u.ID = ug.USER_ID)ug where ug.del_flag = '0' - and ug.real_name like '%${realName}%' + and ug.real_name like '%${realName}%' or ug.nickname like '%${realName}%' and ug.mobile like '%${mobile}%' AND (find_in_set(#{streetId},ug.PARENT_DEPT_IDS) From 27d2e9dce019b804e5add501d578cd6171eee522 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 10 Jun 2020 09:25:13 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiResidentConfigController.java | 9 ++++----- .../java/com/elink/esua/epdc/dao/ResidentConfigDao.java | 2 +- .../elink/esua/epdc/service/ResidentConfigService.java | 2 +- .../epdc/service/impl/ResidentConfigServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ResidentConfigDao.xml | 1 - 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index 5f2759a2..5d224b5f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -5,7 +5,6 @@ import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; import com.elink.esua.epdc.service.ResidentConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,14 +24,14 @@ public class ApiResidentConfigController { private ResidentConfigService residentConfigService; /** - * @Description 新闻浏览积分有效浏览时长 + * @Description 获取所有居民端配置 * @Author songyunpeng * @Date 2020/6/9 * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping("getResidentConfig/{residentType}") - public Result> getImgUrlList(@PathVariable("residentType") String residentType){ - return residentConfigService.listResidentConfig(residentType); + @GetMapping("getResidentConfig") + public Result> getImgUrlList(){ + return residentConfigService.listResidentConfig(); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java index 61b8c3de..12523e4a 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java @@ -51,7 +51,7 @@ public interface ResidentConfigDao extends BaseDao { * @Param [residentType] * @return java.util.List **/ - List selectListResidentConfigByResidentType(String residentType); + List selectListResidentConfigByResidentType(); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java index d53db97e..1547779d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java @@ -103,7 +103,7 @@ public interface ResidentConfigService extends BaseService * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> listResidentConfig(String residentType); + Result> listResidentConfig(); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java index f2ee5d99..5aeda932 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java @@ -114,8 +114,8 @@ public class ResidentConfigServiceImpl extends BaseServiceImpl> listResidentConfig(String residentType) { - return new Result>().ok(baseDao.selectListResidentConfigByResidentType(residentType)); + public Result> listResidentConfig() { + return new Result>().ok(baseDao.selectListResidentConfigByResidentType()); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml index 0a243b2c..7a086af9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml @@ -48,7 +48,6 @@ FROM `epdc_resident_config` WHERE DEL_FLAG = 0 - AND RESIDENT_TYPE = #{residentType} ORDER BY SORT,CREATED_TIME DESC SELECT + RESIDENT_TYPE, RESIDENT_CODE, RESIDENT_VALUE FROM From 7d52cc782d9a4a38f2835cafec133ff58159d297 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 10 Jun 2020 09:59:31 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiResidentConfigController.java | 9 +++++---- .../java/com/elink/esua/epdc/dao/ResidentConfigDao.java | 2 +- .../elink/esua/epdc/service/ResidentConfigService.java | 2 +- .../epdc/service/impl/ResidentConfigServiceImpl.java | 4 ++-- .../src/main/resources/mapper/ResidentConfigDao.xml | 3 +++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index 5d224b5f..21291749 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -5,6 +5,7 @@ import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; import com.elink.esua.epdc.service.ResidentConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -24,14 +25,14 @@ public class ApiResidentConfigController { private ResidentConfigService residentConfigService; /** - * @Description 获取所有居民端配置 + * @Description 获取居民端配置 * @Author songyunpeng * @Date 2020/6/9 * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping("getResidentConfig") - public Result> getImgUrlList(){ - return residentConfigService.listResidentConfig(); + @GetMapping("getResidentConfig/{residentType}") + public Result> getImgUrlList(@PathVariable("residentType") String residentType){ + return residentConfigService.listResidentConfig(residentType); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java index 12523e4a..61b8c3de 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java @@ -51,7 +51,7 @@ public interface ResidentConfigDao extends BaseDao { * @Param [residentType] * @return java.util.List **/ - List selectListResidentConfigByResidentType(); + List selectListResidentConfigByResidentType(String residentType); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java index 1547779d..d53db97e 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/ResidentConfigService.java @@ -103,7 +103,7 @@ public interface ResidentConfigService extends BaseService * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> listResidentConfig(); + Result> listResidentConfig(String residentType); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java index 5aeda932..f2ee5d99 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/ResidentConfigServiceImpl.java @@ -114,8 +114,8 @@ public class ResidentConfigServiceImpl extends BaseServiceImpl> listResidentConfig() { - return new Result>().ok(baseDao.selectListResidentConfigByResidentType()); + public Result> listResidentConfig(String residentType) { + return new Result>().ok(baseDao.selectListResidentConfigByResidentType(residentType)); } @Override diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml index 3e825f8a..a3246a7b 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/mapper/ResidentConfigDao.xml @@ -49,6 +49,9 @@ FROM `epdc_resident_config` WHERE DEL_FLAG = 0 + + and RESIDENT_TYPE = #{residentType} + ORDER BY SORT,CREATED_TIME DESC + + From c8975b1010a618e338a8c31d53c9ed6550544d7a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Wed, 10 Jun 2020 10:48:52 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E6=8E=A5=E5=8F=A3bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiResidentConfigController.java | 5 ++--- .../main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java | 3 ++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java index 21291749..f923086d 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiResidentConfigController.java @@ -5,7 +5,6 @@ import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; import com.elink.esua.epdc.service.ResidentConfigService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -31,8 +30,8 @@ public class ApiResidentConfigController { * @Param [residentType] * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - @GetMapping("getResidentConfig/{residentType}") - public Result> getImgUrlList(@PathVariable("residentType") String residentType){ + @GetMapping("getResidentConfig") + public Result> getImgUrlList(String residentType){ return residentConfigService.listResidentConfig(residentType); } } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java index 61b8c3de..c87b05fc 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/dao/ResidentConfigDao.java @@ -22,6 +22,7 @@ import com.elink.esua.epdc.dto.ResidentConfigDTO; import com.elink.esua.epdc.dto.result.ResidentConfigResultDTO; import com.elink.esua.epdc.entity.ResidentConfigEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; import java.util.Map; @@ -51,7 +52,7 @@ public interface ResidentConfigDao extends BaseDao { * @Param [residentType] * @return java.util.List **/ - List selectListResidentConfigByResidentType(String residentType); + List selectListResidentConfigByResidentType(@Param(value = "residentType") String residentType); /** * @Description 根据类型和编码获取配置 * @Author songyunpeng From 33126dbe58da94b95f8338c66272107746831a0a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 11 Jun 2020 10:51:28 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E7=A7=AF=E5=88=86=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=A7=AF=E5=88=86=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-user-server/src/main/resources/mapper/UserDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml index fd5d8fd2..e76edea3 100644 --- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml +++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml @@ -652,6 +652,7 @@ GROUP BY ug.ID ORDER BY + ug.POINTS desc, ug.register_time desc + UPDATE epdc_party_topic SET COMMENT_NUM = COMMENT_NUM + #{num} WHERE ID = #{id} From 3bb11f5006e3dc6433d6bd273a0ee06b7eec9f93 Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 11 Jun 2020 17:29:44 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AF=9D=E9=A2=98?= =?UTF-8?q?=E5=88=97=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/PartyTopicDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml index 037965d3..cc7f29e8 100644 --- a/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml +++ b/esua-epdc/epdc-module/epdc-party-group/epdc-party-group-server/src/main/resources/mapper/PartyTopicDao.xml @@ -201,7 +201,7 @@ LIMIT #{pageIndex},#{pageSize}) tmp) order by t.CREATED_TIME desc,t3.CREATED_TIME - select t.ID, t.NICKNAME,