From 1f7e2be00d62f9401b5ad31a5d9f9d59862b28f5 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 8 Dec 2018 21:57:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=AD=89=E7=BA=A7=E4=BF=9D=E5=AD=98=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxLevelConfigController.java | 26 ++++------- .../iformall/domain/dto/WxLevelConfigDto.java | 45 ------------------- .../service/WxLevelConfigService.java | 10 ++++- .../impl/WxLevelConfigServiceImpl.java | 15 +++++++ 4 files changed, 32 insertions(+), 64 deletions(-) delete mode 100644 mallinkService/src/main/java/com/iformall/domain/dto/WxLevelConfigDto.java diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java index 16e3dc2fd..92255c819 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java @@ -1,5 +1,6 @@ package com.iformall.controller; +import com.iformall.common.ErrorCode; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -13,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxLevelConfigDto; import com.iformall.domain.po.WxLevelConfig; import com.iformall.service.WxLevelConfigService; @@ -22,6 +22,8 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import java.util.List; + @RestController @RequestMapping("wxLevelConfig") @Api(description="等级权益相关接口") @@ -47,26 +49,16 @@ public class WxLevelConfigController extends BaseController { @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxLevelConfigDto dto) { + public ResultData add(@RequestBody List levelConfigs) { logger.debug("[" + getIpAddr() + "] WxLevelConfigController::add"); //Assert.notNull(wxLevelConfig.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - String[] points = dto.getPoints().split("&"); - String[] level = dto.getLevel().split("&"); - String[] descs =dto.getDescription().split("&"); - if (points.length != level.length) { - return new ResultData(Result.ERROR, "请同时设置成长值和等级"); - } String tenantId = getTenantId(); - wxLevelConfigService.deleteAll(tenantId); - for(int i=0;i 0 && i < descs.length) - wxLevelConfig.setDescription(descs[i]); - wxLevelConfigService.saveOrUpdate(wxLevelConfig); + try { + wxLevelConfigService.batchSave(tenantId, levelConfigs); + } catch (Exception e) { + logger.error(e.getMessage()); + return new ResultData(ErrorCode.DB_FAIL); } return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/WxLevelConfigDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/WxLevelConfigDto.java deleted file mode 100644 index c132e73a7..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/dto/WxLevelConfigDto.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.iformall.domain.dto; - -import java.io.Serializable; -/** - * 等级权益dto - * @author jinguo - * - */ -public class WxLevelConfigDto implements Serializable{ - - /** - * - */ - private static final long serialVersionUID = -8155943956044066653L; - - /*成长值**/ - @io.swagger.annotations.ApiModelProperty(value="成长值",name="points") - private String points; - /*等级**/ - @io.swagger.annotations.ApiModelProperty(value="等级",name="level") - private String level; - /*描述**/ - @io.swagger.annotations.ApiModelProperty(value="描述",name="description") - private String description; - - public String getPoints() { - return points; - } - public void setPoints(String points) { - this.points = points; - } - public String getLevel() { - return level; - } - public void setLevel(String level) { - this.level = level; - } - public String getDescription() { - return description; - } - public void setDescription(String description) { - this.description = description; - } - -} diff --git a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java index b76b5f071..5bc16ea7c 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxLevelConfigService.java @@ -31,14 +31,20 @@ public interface WxLevelConfigService { * @return */ WxLevelConfig getById(Long id); - - /** + + /** * 保存或更新实体 * * @param record */ void saveOrUpdate(WxLevelConfig record); + /** + * 批量保存 + */ + void batchSave(String tenantId, List records); + + /** * 根据Id删除实体 * diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java index bfaff793c..361f55fd2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLevelConfigServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.common.IdWorker; +import java.util.Date; import java.util.List; @Service @@ -55,6 +56,20 @@ public class WxLevelConfigServiceImpl implements WxLevelConfigService { } } + @Override + public void batchSave(String tenantId, List records) { + final IdWorker idWorker = IdWorker.get(); + wxLevelConfigMapper.deleteAll(tenantId); + for(WxLevelConfig levelConfig: records) { + if(levelConfig.getId() == null) { + levelConfig.setId(idWorker.nextId()); + levelConfig.setCreateDate(new Date()); + } + levelConfig.setTenantId(tenantId); + } + wxLevelConfigMapper.insertList(records); + } + @Override public void deleteById(Long id) { wxLevelConfigMapper.deleteByPrimaryKey(id);