From f40fa190df1886fd13288c49f847a00b52024805 Mon Sep 17 00:00:00 2001 From: Burce Date: Sun, 29 Sep 2019 17:50:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=9B=E5=95=86]=E4=B9=90=E8=A7=82=E9=94=81?= =?UTF-8?q?=E3=80=81=E7=94=A8=E6=88=B7=E4=B8=8A=E4=B8=8B=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/config/MyBatisConfiguration.java | 6 + .../invest/InvestDemandController.java | 127 +++++++++--------- .../invest/InvestRemindController.java | 7 +- .../domain/po/InvestCustomerEntity.java | 14 ++ .../domain/po/InvestDemandEntity.java | 16 ++- .../iformall/domain/po/InvestTaskEntity.java | 14 ++ .../iformall/service/invest/InvestHelper.java | 5 + .../impl/InvestCustomerServiceImpl.java | 13 +- .../invest/impl/InvestDemandServiceImpl.java | 16 ++- .../impl/InvestFollowRecordServiceImpl.java | 13 +- .../invest/impl/InvestRemindServiceImpl.java | 3 +- .../invest/impl/InvestTaskServiceImpl.java | 19 ++- 12 files changed, 158 insertions(+), 95 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java index 7a6706938..c3e9acb90 100644 --- a/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java +++ b/mallinkAdmin/src/main/java/com/iformall/config/MyBatisConfiguration.java @@ -1,5 +1,6 @@ package com.iformall.config; +import com.baomidou.mybatisplus.extension.plugins.OptimisticLockerInterceptor; import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import com.iformall.plugin.MultiTenancy; import org.springframework.context.annotation.Bean; @@ -30,4 +31,9 @@ public class MyBatisConfiguration { page.setDialectType("mysql"); return page; } + + @Bean + public OptimisticLockerInterceptor optimisticLockerInterceptor() { + return new OptimisticLockerInterceptor(); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 5120ff211..dc787e2bd 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -19,7 +19,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; - /** * 需求管理 * @@ -32,70 +31,70 @@ import io.swagger.annotations.ApiOperation; @RequestMapping("invest/demand") @Api(tags = "需求管理") public class InvestDemandController { - @Autowired - private InvestDemandService investDemandService; - - /** - * 分页列表 - */ - @SystemServiceLog - @ApiOperation(value = "分页列表接口") - @GetMapping("/list") - public InvestResultData> list(InvestPageQuery params) { - try { - InvestPageResult page = investDemandService.queryPage(params); - return new InvestResultData(page); - } catch (MallinkException e) { - log.error("list error", e); - return new InvestResultData(e.getErrorCode(), e.getMessage()); - } catch (Exception e) { - log.error("list error", e); - return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); - } - } - - - /** - * 信息 - */ - @SystemServiceLog - @GetMapping("/info/{id}") - public InvestResultData info(@PathVariable("id") Long id){ - InvestDemandVo investDemand = investDemandService.findById(id); - - return new InvestResultData(investDemand); - } - - /** - * 保存 - */ - @SystemServiceLog - @PostMapping("/save") - public ResultData save(InvestDemandVo investDemand) { - investDemandService.saveCustomerAndDemand(investDemand); - - return new ResultData(); - } - - /** - * 修改 - */ - @SystemServiceLog - @PostMapping("/update") - public ResultData update(InvestDemandVo investDemand) { - investDemandService.updateCustomerAndDemand(investDemand); - - return new ResultData(); - } - - /** - * 删除 - */ - //@GetMapping("/delete") - public ResultData delete(Long[] ids) { + @Autowired + private InvestDemandService investDemandService; + + /** + * 分页列表 + */ + @SystemServiceLog + @ApiOperation(value = "分页列表接口") + @GetMapping("/list") + public InvestResultData> list(InvestPageQuery params) { + try { + InvestPageResult page = investDemandService.queryPage(params); + return new InvestResultData(page); + } catch (MallinkException e) { + log.error("list error", e); + return new InvestResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + log.error("list error", e); + return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + } + + + /** + * 信息 + */ + @SystemServiceLog + @GetMapping("/info/{id}") + public InvestResultData info(@PathVariable("id") Long id) { + InvestDemandVo investDemand = investDemandService.findById(id); + + return new InvestResultData(investDemand); + } + + /** + * 保存 + */ + @SystemServiceLog + @PostMapping("/save") + public ResultData save(InvestDemandVo investDemand) { + investDemandService.saveCustomerAndDemand(investDemand); + + return new ResultData(); + } + + /** + * 修改 + */ + @SystemServiceLog + @PostMapping("/update") + public ResultData update(InvestDemandVo investDemand) { + investDemandService.updateCustomerAndDemand(investDemand); + + return new ResultData(); + } + + /** + * 删除 + */ + //@GetMapping("/delete") + public ResultData delete(Long[] ids) { investDemandService.removeByIds(Arrays.asList(ids)); - return new ResultData(); - } + return new ResultData(); + } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java index 763d2ea0d..729716a08 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestRemindController.java @@ -6,10 +6,12 @@ import java.util.List; import com.iformall.common.ErrorCode; import com.iformall.common.InvestResultData; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.InvestOperateRecordEntity; import com.iformall.domain.po.InvestRemindEntity; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; +import com.iformall.domain.vo.invest.InvestUserContext; import com.iformall.exception.MallinkException; import com.iformall.service.invest.InvestRemindService; import lombok.extern.slf4j.Slf4j; @@ -32,7 +34,7 @@ import io.swagger.annotations.ApiOperation; @RestController @RequestMapping("invest/remind") @Api(tags = "招商提醒") -public class InvestRemindController { +public class InvestRemindController extends BaseController { @Autowired private InvestRemindService investRemindService; @@ -43,6 +45,7 @@ public class InvestRemindController { @GetMapping("/list") public InvestResultData> list(InvestPageQuery params) { try { + InvestUserContext.setUser(getUser()); InvestPageResult page = investRemindService.queryPage(params); return new InvestResultData(page); } catch (MallinkException e) { @@ -51,6 +54,8 @@ public class InvestRemindController { } catch (Exception e) { log.error("list error", e); return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } finally { + InvestUserContext.remove(); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java index 4418b8069..87e4829b0 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestCustomerEntity.java @@ -3,11 +3,16 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.enums.EnumCustomerRatingType; import com.iformall.enums.EnumCustomerType; import com.iformall.enums.EnumInvestChannel; import lombok.Data; +import java.util.Date; + /** * 客户列表 * @@ -56,4 +61,13 @@ public class InvestCustomerEntity extends InvestBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "招商渠道:0-无;1-电视;2-广播;3-报纸;4-刊物;5-物联网;6-招商活动;7-中介机构;8-自定义渠道", name = "investChannel") private EnumInvestChannel investChannel; + /** + * 更新时间 + */ + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48",readOnly = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Version + private Date updateDate; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java index f2f530e36..4ff692910 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestDemandEntity.java @@ -3,10 +3,14 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonIgnore; +import com.baomidou.mybatisplus.annotation.Version; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.enums.EnumInvestType; import lombok.Data; +import java.util.Date; + /** * 客户需求 * @@ -38,7 +42,6 @@ public class InvestDemandEntity extends InvestBaseEntity { * 目标类型:0-商铺招租;1-其他 */ @io.swagger.annotations.ApiModelProperty(value = "目标类型:0-商铺招租;1-其他", name = "targetType") - @JsonIgnore private EnumInvestType targetType; /** * 目标ID @@ -46,4 +49,13 @@ public class InvestDemandEntity extends InvestBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "目标ID", name = "targetId") private Long targetId; + /** + * 更新时间 + */ + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48",readOnly = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Version + private Date updateDate; + } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java index 5834e9ec2..0817e6e8a 100755 --- a/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/InvestTaskEntity.java @@ -2,10 +2,15 @@ package com.iformall.domain.po; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import com.iformall.enums.EnumInvestType; import com.iformall.enums.EnumTaskStatus; import lombok.Data; +import java.util.Date; + /** * 招商任务 * @@ -43,4 +48,13 @@ public class InvestTaskEntity extends InvestBaseEntity { @io.swagger.annotations.ApiModelProperty(value = "任务设定条件", name = "content") private String content; + /** + * 更新时间 + */ + @io.swagger.annotations.ApiModelProperty(value = "更新时间", name = "updateDate", example = "2018-10-01 12:18:48",readOnly = true) + @JsonProperty(access = JsonProperty.Access.READ_ONLY) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Version + private Date updateDate; + } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java index a76a89227..447949081 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/InvestHelper.java @@ -114,4 +114,9 @@ public class InvestHelper { page.setSearchCount(true); return page; } + + + public static void notSupport() { + throw new MallinkException(ErrorCode.SYS_METHOD_NOT_SUPPORT); + } } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java index d4427318f..30e82274e 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestCustomerServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.mapper.InvestCustomerDao; import com.iformall.service.WxBrandService; import com.iformall.service.WxBusinessService; import com.iformall.service.invest.InvestCustomerService; +import com.iformall.service.invest.InvestHelper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -50,13 +51,15 @@ public class InvestCustomerServiceImpl extends ServiceImpl updateWrapper) { //checkBeforeSaveOrUpdate(entity); //return super.update(entity, updateWrapper); - notSupport(); + InvestHelper.notSupport(); return false; } @@ -74,7 +73,7 @@ public class InvestFollowRecordServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(queryParams); IPage taskPage = this.page(queryPage, queryWrapper); diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java index 7f3bf786b..594e15db1 100755 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestTaskServiceImpl.java @@ -4,8 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.iformall.common.TableLog; -import com.iformall.domain.po.*; +import com.iformall.domain.po.InvestTaskEntity; +import com.iformall.domain.po.WxShop; import com.iformall.domain.vo.invest.InvestPageQuery; import com.iformall.domain.vo.invest.InvestPageResult; import com.iformall.domain.vo.invest.InvestTaskVo; @@ -19,11 +21,12 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - @Service public class InvestTaskServiceImpl extends ServiceImpl implements InvestTaskService { @@ -88,11 +91,13 @@ public class InvestTaskServiceImpl extends ServiceImpl