xhxu 5 лет назад
Родитель
Сommit
552dac7b40
2 измененных файлов: 37 добавлений и 4 удалений
  1. +17
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java
  2. +20
    -4
      mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java

+ 17
- 0
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProjectConfigController.java Просмотреть файл

@@ -2,6 +2,7 @@ package com.iformall.controller.basic;

import com.github.pagehelper.PageInfo;
import com.iformall.annotation.SystemControllerLog;
import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode;
import com.iformall.common.ResultData;
import com.iformall.controller.base.BaseController;
@@ -24,6 +25,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.util.Assert;
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;

import java.util.*;
@@ -100,6 +102,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加商场基础数据")
@GetMapping(value = "/init/{id}")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData init(@PathVariable Long id) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::init");
try {
@@ -116,6 +119,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("查询商场集团列表")
@GetMapping(value = "/mallList")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData getMallList(@ModelAttribute WxMall wxMall, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getMallList");
try {
@@ -133,6 +137,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("查询商场集团列表(选择子集团)")
@GetMapping(value = "/mallListbyMall")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData mallListbyMall(@ModelAttribute WxMall wxMall) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::mallListbyMall");
try {
@@ -150,9 +155,11 @@ public class WxProjectConfigController extends BaseController {
}
}


@ApiOperation("添加修改商场集团")
@PostMapping("/init/mall")
@SystemControllerLog(description = "商场集团-更新")
@TenantIgnore
public ResultData initMall(@RequestBody WxMall wxMall) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initMall");
try {
@@ -183,6 +190,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改商场楼座信息")
@PostMapping("/init/building")
@SystemControllerLog(description = "商场楼座-更新")
@TenantIgnore
public ResultData initBuilding(@RequestBody List<WxMallBuilding> wxMallBuildings) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initBuilding");
try {
@@ -206,6 +214,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改特殊商户号信息")
@PostMapping("/init/payAccount")
@SystemControllerLog(description = "特殊商户号-更新")
@TenantIgnore
public ResultData initPayAccount(@RequestBody WxPayAccount wxPayAccount) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPayAccount");
try {
@@ -245,6 +254,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改小程序信息")
@PostMapping("/init/appinfo")
@SystemControllerLog(description = "小程序信息-更新")
@TenantIgnore
public ResultData initAppinfo(@RequestBody WxAppinfo wxAppinfo) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAppinfo");
try {
@@ -305,6 +315,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改商场后台管理帐号")
@PostMapping("/init/userInfo")
@SystemControllerLog(description = "商场后台管理帐号-更新")
@TenantIgnore
public ResultData initUserInfo(@RequestBody MallUserInfo userInfo) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initUserInfo");
try {
@@ -413,6 +424,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改停车场配置")
@PostMapping("/init/park")
@SystemControllerLog(description = "商场停车场配置-更新")
@TenantIgnore
public ResultData initPark(@RequestBody WxPark wxPark) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initPark");
try {
@@ -515,6 +527,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("查询商场基础数据")
@GetMapping(value = "/getinit/{id}")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData getinit(@PathVariable Long id) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getinit");
try {
@@ -604,6 +617,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("集团新增修改子广场")
@PostMapping("/init/submall")
@SystemControllerLog(description = "子广场-更新")
@TenantIgnore
public ResultData initSubmall(@RequestBody WxMall wxMall) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initSubmall");
try {
@@ -635,6 +649,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("刷集团商场历史数据(五分钟内只能掉一次)")
@PostMapping("/init/after/group")
@SystemControllerLog(description = "商场-数据更新")
@TenantIgnore
public ResultData initAfterGroup(@RequestBody WxMall wxMall) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAfterGroup");
try {
@@ -674,6 +689,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("查询ext数据")
@GetMapping(value = "/getExt/{appId}")
@SystemControllerLog(description = "商场基础数据")
@TenantIgnore
public ResultData getExt(@PathVariable String appId) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::getExt");
try {
@@ -691,6 +707,7 @@ public class WxProjectConfigController extends BaseController {
@ApiOperation("添加修改ext数据配置")
@PostMapping("/init/appExt")
@SystemControllerLog(description = "商场ext数据配置-更新")
@TenantIgnore
public ResultData initAppExt(@RequestBody WxWeappExtSet wxWeappExtSet) {
logger.debug("[" + getIpAddr() + "] WxProjectConfigController::initAppExt");
try {


+ 20
- 4
mallinkAdmin/src/main/java/com/iformall/tenant/TenantInfoImpl.java Просмотреть файл

@@ -122,12 +122,21 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_msg_validationcode_model".equals(tableName)) {
return true;
}
if ("wx_flow_config".equals(tableName)) {
/*if ("wx_flow_config".equals(tableName)) {
return true;
}
if ("wx_msg_config".equals(tableName)) {
return true;
}
if ("wx_mall_building".equals(tableName)) {
return true;
}
if ("wx_mall_floor".equals(tableName)) {
return true;
}
if ("wx_park".equals(tableName)) {
return true;
}*/
return false;
}

@@ -205,12 +214,21 @@ public class TenantInfoImpl implements TenantInfo {
if ("wx_msg_validationcode_model".equals(tableName)) {
return true;
}
if ("wx_flow_config".equals(tableName)) {
/* if ("wx_flow_config".equals(tableName)) {
return true;
}
if ("wx_msg_config".equals(tableName)) {
return true;
}
if ("wx_mall_building".equals(tableName)) {
return true;
}
if ("wx_mall_floor".equals(tableName)) {
return true;
}
if ("wx_park".equals(tableName)) {
return true;
}*/
return false;
}

@@ -268,8 +286,6 @@ public class TenantInfoImpl implements TenantInfo {
return true;
if ("com.iformall.mapper.wxFlowConfigMapper.wxFlowConfigInit".equals(ms.getId()))
return true;
if ("com.iformall.mapper.wxFlowConfigMapper.wxFlowConfigInit".equals(ms.getId()))
return true;
return false;
}
}

Загрузка…
Отмена
Сохранить