Skip to content

O
operate-customer-service
提交 fc2d9978 作者: gh
操作

Merge remote-tracking branch 'origin/master'

上级 a091706c 8a9c70e5
正在显示 包含 26 行增加 和 28 行删除
src/main/java/com/yaoyaozw/customer/aop/OperateLogAop.java
......@@ -34,7 +34,6 @@ public class OperateLogAop {
private ObjectMapper objectMapper;
@Autowired
private SystemOperateLogService operateLogService;
/*
@Pointcut("@annotation(com.yaoyaozw.customer.annotations.OperateLog)")
public void operateLogCut() {
//操作日志切点
......@@ -81,6 +80,6 @@ public class OperateLogAop {
operateLogService.save(operateLogEntity);
}
}*/
}
}
src/main/java/com/yaoyaozw/customer/components/CustomerServiceCommonAsyncComponent.java
......@@ -420,12 +420,6 @@ public class CustomerServiceCommonAsyncComponent {
targetReferralEntity.setAccountId(targetAuthInfo.getAccountId());
targetReferralEntity.setStoreTypeName(targetAuthInfo.getStoreTypeName());
String name = CustomerCommonConstant.getLinkNameModel(targetReferralEntity.getNewsType());
if (StringUtils.isNotBlank(name) && !CustomerCommonConstant.USUAL_LINK_NEWS_TYPE.equals(targetReferralEntity.getNewsType())) {
name = name + "-" +System.currentTimeMillis() % 100000;
targetReferralEntity.setName(name);
}
Integer newsType = sourceReferralEntity.getNewsType();
// 调用获取链接方法
if (newsType.equals(CustomerCommonConstant.BOOK_NEWS_TYPE)) {
......@@ -568,8 +562,12 @@ public class CustomerServiceCommonAsyncComponent {
ygAccessLimit(true, authInfoVo.getStoreType());
referralEntity.setStoreType(authInfoVo.getStoreType());
// 非常用链接类型的name需要处理
String name = referralEntity.getName();
Integer newsType = referralEntity.getNewsType();
String name = CustomerCommonConstant.getLinkNameModel(newsType);
if (StringUtils.isNotBlank(name) && !CustomerCommonConstant.USUAL_LINK_NEWS_TYPE.equals(newsType)) {
name = name + "-" +System.currentTimeMillis() % 100000;
referralEntity.setName(name);
}
if (!CustomerCommonConstant.USUAL_LINK_NEWS_TYPE.equals(newsType) && !StringUtils.isBlank(name)) {
String newsTypeName = CustomerCommonConstant.getNewsTypeName(newsType);
if (ObjectUtil.isNull(newsTypeName)) {
......@@ -590,8 +588,7 @@ public class CustomerServiceCommonAsyncComponent {
String tempId = CustomerStoreTemplateEnum.getTempId(referralEntity.getStoreType());
referralEntity.setTemplateId(tempId);
}
long suffix = System.currentTimeMillis() % 100000;
referralEntity.setName(name + "-" + suffix);
referralEntity.setName(name);
}
referralEntity.setInfoId(authInfoVo.getId());
LOCAL_LOG.info("获取链接, 参数: {}", referralEntity);
......@@ -599,6 +596,8 @@ public class CustomerServiceCommonAsyncComponent {
if (!r.getCode().equals(ApiResultConstant.SUCCESS_CODE)) {
if (OVER_FREQUENCY_MSG.equals(r.getMessage())) {
referralEntity.setReferral(OVER_FREQUENCY_STR);
} else {
referralEntity.setReferral(null);
}
throw new RuntimeException(r.getMessage());
} else {
......
src/main/java/com/yaoyaozw/customer/controller/CrowdPackageController.java
......@@ -30,7 +30,7 @@ public class CrowdPackageController {
@ApiOperation("新增人群包")
@GetMapping("/insertPackage")
@OperateLog(desc = "新增人群包")
@OperateLog(module = "人群包", desc = "新增人群包")
public GenericsResult<CrowdPackageCommonIdVO> insertCrowdPackage(@RequestParam(required = false) Long id,
@RequestParam(required = false) String name,
@RequestParam(required = false) Double activeTimeMin,
......@@ -40,7 +40,7 @@ public class CrowdPackageController {
@ApiOperation("向人群包内新增条件")
@PostMapping("/insertCondition")
@OperateLog(desc = "添加人群包条件")
@OperateLog(module = "人群包", desc = "添加人群包条件")
public GenericsResult<CrowdPackageCommonIdVO> insertCondition(@RequestBody CrowdPackageConditionDTO conditionDto) {
return crowdPackageService.insertConditionIntoPackage(conditionDto);
}
......@@ -53,14 +53,14 @@ public class CrowdPackageController {
@ApiOperation("删除人群包")
@GetMapping("/removePackage/{id}")
@OperateLog(desc = "删除人群包")
@OperateLog(module = "人群包", desc = "删除人群包")
public BaseResult removeCrowdPackage(@PathVariable("id") Long id) {
return crowdPackageService.removeCrowdPackage(id);
}
@ApiOperation("从人群包中删除条件")
@GetMapping("/removeCondition/{linkedId}")
@OperateLog(desc = "删除人群包条件")
@OperateLog(module = "人群包", desc = "删除人群包条件")
public BaseResult removeCondition(@PathVariable("linkedId") Long linkedId) {
return crowdPackageService.removeConditionFromPackage(linkedId);
}
......@@ -85,7 +85,7 @@ public class CrowdPackageController {
@ApiOperation("更新用户列表所属的人群包")
@GetMapping("/updateUserPackageBatch")
@OperateLog(desc = "更新用户列表所属的人群包")
@OperateLog(module = "人群包", desc = "更新用户列表所属的人群包")
public BaseResult updateUserPackageBatch(@RequestBody List<String> openIdList) {
return crowdPackageService.updateUserPackageBatch(openIdList);
}
......
src/main/java/com/yaoyaozw/customer/controller/CustomerDelayGraphicsController.java
......@@ -36,7 +36,7 @@ public class CustomerDelayGraphicsController {
@ApiOperation("新增")
@PostMapping("/insert")
@OperateLog(desc = "新增图文延时客服")
@OperateLog(module = "延时客服", desc = "新增图文延时客服")
@AccountOperateControl(paramType = AccountParamType.REQUEST_BODY, paramName = "saveDto", columnType = AccountTableColumnType.APP_ID, property = "appId")
public BaseResult insertCustomerDelay(@RequestBody CustomerDelaySaveDTO saveDto) {
return customerGraphicsDelayService.insertCustomerDelay(saveDto);
......@@ -63,7 +63,7 @@ public class CustomerDelayGraphicsController {
@ApiOperation("删除")
@GetMapping("/remove/{id}")
@OperateLog(desc = "删除图文延时客服")
@OperateLog(module = "延时客服", desc = "删除图文延时客服")
@AccountOperateControl(paramType = AccountParamType.TABLE_PRIMARY, paramName = "id", columnType = AccountTableColumnType.APP_ID, table = "customer_graphics_delay", column = "app_id")
public BaseResult removeCustomerDelay(@PathVariable("id") Long id) {
return customerGraphicsDelayService.removeCustomerDelay(id);
......@@ -77,7 +77,7 @@ public class CustomerDelayGraphicsController {
@ApiOperation("复用")
@PostMapping("/copy")
@OperateLog(desc = "复用图文延时客服")
@OperateLog(module = "延时客服", desc = "复用图文延时客服")
public BaseResult copy(@RequestParam String appId,
@RequestParam(required = false) String bookId,
@RequestParam(required = false) String bookName,
......
src/main/java/com/yaoyaozw/customer/controller/CustomerDelayTextController.java
......@@ -28,7 +28,7 @@ public class CustomerDelayTextController {
@ApiOperation("新增客服主体")
@PostMapping("/insertCustomerDelay")
@OperateLog(desc = "新增文本延时客服")
@OperateLog(module = "延时客服-文本", desc = "新增文本延时客服")
@AccountOperateControl(paramType = AccountParamType.REQUEST_BODY, paramName = "saveDto", columnType = AccountTableColumnType.APP_ID, property = "appId")
public GenericsResult<String> insertCustomerDelay(@RequestBody CustomerDelayTextSaveDTO saveDto) {
return textService.insertCustomerDelay(saveDto);
......@@ -36,7 +36,7 @@ public class CustomerDelayTextController {
@ApiOperation("新增客服内容")
@PostMapping("/insertCustomerContent")
@OperateLog(desc = "新增文本延时客服子素材")
@OperateLog(module = "延时客服-文本", desc = "新增文本延时客服子素材")
public GenericsResult<CustomerDelayTextDetailVO> insertCustomerContent(@RequestBody CustomerReferralDTO referralDto) {
return textService.insertCustomerContent(referralDto);
}
......@@ -50,7 +50,7 @@ public class CustomerDelayTextController {
@ApiOperation("删除单条文本内容")
@GetMapping("/removeCustomerContent/{contentId}")
@OperateLog(desc = "删除文本延时客服子素材")
@OperateLog(module = "延时客服-文本", desc = "删除文本延时客服子素材")
public GenericsResult<CustomerDelayTextDetailVO> removeCustomerContent(@PathVariable("contentId") Long contentId) {
return textService.removeCustomerContent(contentId);
}
......
src/main/java/com/yaoyaozw/customer/controller/CustomerMessageGraphicsController.java
......@@ -32,7 +32,7 @@ public class CustomerMessageGraphicsController {
@ApiOperation("新增")
@PostMapping("/insert")
@OperateLog(desc = "新增图文客服消息")
@OperateLog(module = "客服消息", desc = "新增图文客服消息")
public BaseResult insertCustomerMessage(@RequestBody CustomerMessageSaveDTO saveDto) {
return customerGraphicsService.insertCustomerMessage(saveDto);
}
......@@ -51,14 +51,14 @@ public class CustomerMessageGraphicsController {
@ApiOperation("删除")
@GetMapping("/remove/{id}")
@OperateLog(desc = "删除图文客服消息")
@OperateLog(module = "客服消息", desc = "删除图文客服消息")
public BaseResult removeCustomerMessage(@PathVariable("id") Long id) {
return customerGraphicsService.removeCustomerMessage(id);
}
@ApiOperation("设置人群包")
@GetMapping("/setPack")
@OperateLog(desc = "设置人群包")
@OperateLog(module = "客服消息", desc = "设置人群包")
public BaseResult setPack(@RequestParam Long id, @RequestParam Long packId) {
return customerGraphicsService.setPack(id, packId);
}
......
src/main/java/com/yaoyaozw/customer/controller/CustomerMessageTextController.java
......@@ -25,14 +25,14 @@ public class CustomerMessageTextController {
@ApiOperation("新增客服主体")
@PostMapping("/insertCustomerMessage")
@OperateLog(desc = "新增文本客服消息")
@OperateLog(module = "客服消息-文本", desc = "新增文本客服消息")
public GenericsResult<String> insertCustomerMessage(@RequestBody CustomerMessageTextSaveDTO saveDto) {
return textService.insertCustomerMessage(saveDto);
}
@ApiOperation("新增客服内容")
@PostMapping("/insertCustomerContent")
@OperateLog(desc = "新增文本客服消息子素材")
@OperateLog(module = "客服消息-文本", desc = "新增文本客服消息子素材")
public GenericsResult<CustomerMessageTextDetailVO> insertCustomerContent(@RequestBody CustomerReferralDTO referralDto) {
return textService.insertCustomerContent(referralDto);
}
......@@ -45,7 +45,7 @@ public class CustomerMessageTextController {
@ApiOperation("删除单条文本内容")
@GetMapping("/removeCustomerContent/{contentId}")
@OperateLog(desc = "删除文本客服消息子素材")
@OperateLog(module = "客服消息-文本", desc = "删除文本客服消息子素材")
public GenericsResult<CustomerMessageTextDetailVO> removeCustomerContent(@PathVariable("contentId") Long contentId) {
return textService.removeCustomerContent(contentId);
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论