diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java similarity index 89% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java index a7234e9b0..c9f3ae091 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.app; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor; @@ -6,8 +6,12 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; +<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java import com.iformall.exception.MallinkException; +======= +>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java import com.iformall.service.WxAppinfoService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; @@ -18,6 +22,7 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.error.WxErrorException; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -45,6 +50,7 @@ public class WxAppinfoController extends BaseController { @Autowired private FmOpenService openService; +<<<<<<< HEAD:mallinkAdmin/src/main/java/com/iformall/controller/WxAppinfoController.java @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ @@ -95,6 +101,12 @@ public class WxAppinfoController extends BaseController { @ApiOperation(value = "下载二维码", produces="application/json;charset=UTF-8", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") @PostMapping("/downQrCode") public void downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) throws MallinkException { +======= + @ApiOperation(value = "下载二维码", notes = "参数{\"name\":\"String\",\"pageUrl\":\"String\", \"sceneParam\":\"二维码参数\", \"type\":0:有限二维码,1:无限二维码,\"withText\":int(0:不带字, 1:加一行字,2:加两行字),\"text1\":\"String\",\"text2\":\"String\"}") + @PostMapping("/downQrCode") + @RequiresPermissions("app:qr:download") + public ResultData downQrCode(HttpServletRequest request, HttpServletResponse response, @RequestBody Map params) { +>>>>>>> [controller][修改]:按照功能分类,分别放到不同的路径下:mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java logger.debug("[" + getIpAddr() + "] WxAppinfoController::downQrCode"); String name = (String) params.get("name"); String pageUrl = (String) params.get("pageUrl"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java index 0deff34ff..2767ffb3b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.base; import java.beans.PropertyEditorSupport; import java.text.ParseException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java index 3174413b4..50ded68c6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBrandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBrand; import com.iformall.service.WxBrandService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java index 907438f29..c01941f64 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxGroupController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxGroup; import com.iformall.service.WxGroupService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java index 01a6aa03a..8e4f36042 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallBuildingController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallBuildingController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMallBuilding; import com.iformall.service.WxMallBuildingService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java index 94dae59e4..08e545f22 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMall; import com.iformall.service.WxMallService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java index d0378962e..7825f42eb 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallFloorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMallFloorController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java index 94427a143..5be2e5444 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantBUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantBUserController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchantBUser; import com.iformall.service.WxMerchantBUserService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java index dc900fbe4..838b2b474 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java @@ -1,20 +1,17 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxLevelConfig; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchant; -import com.iformall.domain.po.WxProfitSharingReceiver; -import com.iformall.domain.vo.WxMerchantSimpleVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.service.WxMerchantService; import com.iformall.service.WxProfitSharingReceiverService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.commons.beanutils.BeanUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -102,7 +99,7 @@ public class WxMerchantController extends BaseController { public ResultData addMerchant(@RequestBody WxMerchant wxMerchant) { logger.debug("[" + getIpAddr() + "] WxMerchantController::addMerchant"); wxMerchant.setTenantId(getTenantId()); - return wxMerchantService.addMerchant(wxMerchant, getUser().getId()); + return wxMerchantService.addMerchant(wxMerchant, getUserId()); } @ApiOperation("更新商户接口") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java index c00f30129..0eda5f4ca 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantShopController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchantShop; import com.iformall.domain.po.WxShop; import com.iformall.service.WxMerchantShopService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverController.java index dfe8a9edc..3acd91225 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingReceiverController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxProfitSharingReceiverController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxProfitSharingReceiver; import com.iformall.service.WxMerchantService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java index 8e9ff4fee..51b059586 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxShopController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.basic; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxShop; import com.iformall.service.WxShopService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java similarity index 78% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java index b0ea4e04a..5e9c210ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/basic/WxTagsController.java @@ -1,16 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.basic; -import java.util.ArrayList; import java.util.Arrays; -import java.util.List; import com.iformall.annotation.SystemControllerLog; -import com.iformall.domain.po.WxTagsGroup; -import com.iformall.domain.po.WxTagsType; -import com.iformall.domain.vo.WxTagsGroupVo; -import com.iformall.domain.vo.WxTagsTypeVo; -import com.iformall.service.WxTagsGroupService; -import com.iformall.service.WxTagsTypeService; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,10 +11,8 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; 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.po.WxTags; import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxTagsService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java index dd5fb51c9..2597edc0e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarCallBackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.callback; import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.Result; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.EnumCarCmd; import com.iformall.enums.EnumCarVendor; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayBillController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayBillController.java index 4e74ec196..4f3afa10b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayBillController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayBillController.java @@ -1,5 +1,6 @@ -package com.iformall.controller; +package com.iformall.controller.callback; +import com.iformall.controller.base.BaseController; import com.iformall.enums.EnumPayWay; import com.iformall.exception.BizMessageException; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayController.java index 4a5ebfb34..b31089b71 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/callback/WxPayController.java @@ -1,5 +1,6 @@ -package com.iformall.controller; +package com.iformall.controller.callback; +import com.iformall.controller.base.BaseController; import com.iformall.enums.EnumPayWay; import com.iformall.exception.BizMessageException; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index 09b4b23f5..26dd23251 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.car; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxCouponCar; import com.iformall.domain.po.WxMerchant; @@ -56,9 +57,9 @@ public class WxCarController extends BaseController { @Autowired WxCouponCarService wxCouponCarService; - private WxPark getCurrentPark(MallUserInfo user) { + private WxPark getCurrentPark() { WxPark parkQ = new WxPark(); - parkQ.setTenantId(user.getTenantId()); + parkQ.setTenantId(getTenantId()); WxPark wxPark = wxParkService.getByObj(parkQ); // 1, get mall's park // future use redis to optimize @@ -70,9 +71,8 @@ public class WxCarController extends BaseController { @SystemControllerLog(description = "车-获取车场支持的厂家") public ResultData getVendor() { logger.debug("[" + getIpAddr() + "] WxCarController::getVendor"); - MallUserInfo user = getUser(); // 1, get mall's park - WxPark park = getCurrentPark(user); + WxPark park = getCurrentPark(); Map map = new HashMap(); map.put("vendor", park.getVendorType()); return new ResultData(map); @@ -125,9 +125,8 @@ public class WxCarController extends BaseController { @SystemControllerLog(description = "车-优免券模板") public ResultData quanTemplate(String merchantId, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxCarController::quanTemplate"); - MallUserInfo user = getUser(); /// 1, get mall's park - WxPark park = getCurrentPark(user); + WxPark park = getCurrentPark(); String params = park.getVendorParams(); JSONObject objParams = JSON.parseObject(params); String url = objParams.getString("url"); @@ -216,7 +215,7 @@ public class WxCarController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "可用库存已达到停车厂商优免券数量限制"); } // check End - coupon.setTenantId(user.getTenantId()); + coupon.setTenantId(getTenantId()); ResultData resultData = wxCouponService.saveOrUpdate(coupon); if (resultData.code != ResultData.SUCCESS){ @@ -226,9 +225,9 @@ public class WxCarController extends BaseController { // Save to wx_coupon_car WxCouponCar couponCar = new WxCouponCar(); couponCar.setId(coupon.getId()); - couponCar.setTenantId(user.getTenantId()); + couponCar.setTenantId(getTenantId()); - WxPark park = getCurrentPark(user); + WxPark park = getCurrentPark(); couponCar.setParkId(park.getId()); couponCar.setVendorType(park.getVendorType()); couponCar.setVendorParams(coupon.getVendorParams()); @@ -297,9 +296,8 @@ public class WxCarController extends BaseController { @GetMapping("/getParkStatus") @SystemControllerLog(description = "车-停车场状态") public ResultData getParkStatus() { - MallUserInfo user = getUser(); /// 1, get mall's park - WxPark park = getCurrentPark(user); + WxPark park = getCurrentPark(); if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String params = park.getVendorParams(); if(params == null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java index dcc5f5678..84b48957d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxParkController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxParkController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.car; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxPark; import com.iformall.service.WxParkService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index d74ac6aac..4960e405c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -1,17 +1,14 @@ -package com.iformall.controller; +package com.iformall.controller.contract; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillProperty; -import com.iformall.domain.po.WxFlowRecord; import com.iformall.domain.po.WxPropertyContract; -import com.iformall.domain.po.WxRentContract; -import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index 074ace279..279e22f6a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.contract; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillRent; import com.iformall.domain.po.WxPayAccountBill; import com.iformall.domain.po.WxRentContract; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java similarity index 95% rename from mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java index da5a454a3..7846e99d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/DataTowerController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/DataTowerController.java @@ -1,18 +1,16 @@ -package com.iformall.controller; +package com.iformall.controller.datatower; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.service.DataTowerService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.HashMap; import java.util.Map; @Api(description = "数据塔台") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java index 58b966a8a..1d3631fb0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChartDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxChartDataController.java @@ -1,7 +1,8 @@ -package com.iformall.controller; +package com.iformall.controller.datatower; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.service.WxChartDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java index 5e33fcea7..5fcb884c8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.datatower; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxMerchantTradeDailyVo; import com.iformall.service.WxMerchantTradeDailyService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java index 0edaa3dba..8694fde6e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxUserStructureController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.datatower; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoDto; import com.iformall.domain.po.*; import com.iformall.domain.vo.UserStructureVo; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java index ca30b665e..dabbf67e1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.device; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxDevice; import com.iformall.enums.EnumDeviceOnlineStatus; import com.iformall.enums.EnumDeviceStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java index 3927ae291..a7587b32f 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java @@ -1,13 +1,12 @@ -package com.iformall.controller; +package com.iformall.controller.device; -import com.github.pagehelper.Page; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxDevice; -import com.iformall.domain.po.WxMall; import com.iformall.domain.po.WxScreenAd; import com.iformall.enums.EnumScreenAdStatus; import com.iformall.enums.EnumScreenAdType; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java similarity index 94% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java index 192c8caf9..a7229b9ae 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/WxScreenAdController.java @@ -1,14 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.device; -import com.alibaba.fastjson.JSONObject; -import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxCampaign; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxScreenAd; -import com.iformall.enums.EnumScoreType; import com.iformall.enums.EnumScreenAdStatus; import com.iformall.enums.EnumScreenAdType; import com.iformall.service.WxCampaignService; @@ -23,9 +20,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - @RestController @RequestMapping("wxScreenAd") @Api(description="广告屏") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java index db41ce3c9..bf42d0be8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MarkingDataReportController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/MarkingDataReportController.java @@ -1,7 +1,8 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.MarkingCouponDataReportDto; import com.iformall.service.MarkingDataReportService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java similarity index 94% rename from mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java index ad5bfd5fc..73f8d51d0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/PushLimitController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/PushLimitController.java @@ -1,7 +1,8 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.PushLimit; import com.iformall.service.PushLimitService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java similarity index 93% rename from mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java index 45ef54696..17d8e7da6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UeditorController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/UeditorController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.ueditor.ActionEnter; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 95d199045..bcfc4245e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -7,6 +7,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCampaign; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 8ef5a4c63..579ae0818 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -1,14 +1,14 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.vo.WxCardSpendVo; import com.iformall.domain.vo.WxCardVo; -import com.iformall.enums.EnumCardSpendStatus; import com.iformall.exception.MallinkException; import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; @@ -27,7 +27,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; -import java.util.Date; import java.util.List; import java.util.Map; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java index b131fb6ba..8450263c3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxChannelController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxChannel; import com.iformall.service.WxChannelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java index 77e1c2a56..9241022b2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponActionLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponActionLogController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponActionLog; import com.iformall.service.WxCouponActionLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java index 1977e0fff..6509170e2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponCarController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponCar; import com.iformall.service.WxCouponCarService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java index 930c997ad..1c02fa1bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponChannelController.java @@ -1,18 +1,15 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCouponChannelDto; import com.iformall.domain.po.MallUserInfo; -import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.vo.WxCouponChannelVo; -import com.iformall.enums.EnumCouponChannelStatus; -import com.iformall.enums.EnumCouponStatus; import com.iformall.service.WxCouponChannelService; import com.iformall.service.WxCouponService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index b709419ea..40c6b2841 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -1,12 +1,12 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.vo.WxCouponStatisVo; -import com.iformall.enums.*; import com.iformall.service.WxCouponService; import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java index 531e17ebd..2c68c9bff 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponInjectController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponInjectController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponInject; import com.iformall.service.WxCouponInjectService; import com.iformall.service.WxCUserTagsService; @@ -18,9 +19,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.ArrayList; -import java.util.List; - @Api(description = "精准投放接口") @RestController @RequestMapping("couponInject") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java index 00bf5dfc4..852240f07 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponOrderController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.vo.WxCouponOrderBVo; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java index f39a9e57c..b617146d2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendConfigController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponSendConfig; import com.iformall.service.WxCouponSendConfigService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 4bd7c6a2f..6a9903c7c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCoupon; import com.iformall.domain.po.WxCouponSend; import com.iformall.domain.vo.WxCouponSendVo; @@ -23,7 +24,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; -import java.util.List; @RestController @RequestMapping("wxCouponSend") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSpreadController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSpreadController.java index f58aa0d63..f1ff2c524 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponSpreadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSpreadController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponSpread; import com.iformall.service.WxCouponSpreadService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java index 98801451b..26115285d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponTypeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponTypeController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponType; import com.iformall.service.WxCouponTypeService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java index 9185903ae..77211d328 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxGame; import com.iformall.enums.EnumGameStatus; import com.iformall.service.WxGameService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java index 8f85d9bfd..ba9ce4156 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxGameTemplateController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxGameTemplateController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxGameTemplate; import com.iformall.service.WxGameTemplateService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java index a084e13a1..461ff567e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantMicroPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantMicroPayController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxOrderReportDto; import com.iformall.domain.vo.WxMerchantMicroPayVo; import com.iformall.enums.EnumOrderStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java index 9016ac9bd..3f367fcea 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxMerchantSubsidyController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxMerchantSubsidy; import com.iformall.domain.vo.WxMerchantSubsidyVo; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index d4f5ea905..eecd85b82 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCouponChannel; import com.iformall.domain.po.WxOrder; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java similarity index 95% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java index 096ee2ac3..4aa0e5199 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxOrderGroupController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderGroupController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxOrderGroupMarketing; import com.iformall.service.WxOrderGroupService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java index 87c3121ac..7f5077541 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayAccountController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayAccountController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 0ddff03d9..713becab8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxOrder; import com.iformall.domain.po.WxPayOrder; import com.iformall.enums.EnumPayStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 6e4686e52..a75aaf418 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxProfitSharingOrderQueryVo; import com.iformall.domain.vo.WxProfitSharingOrderVo; import com.iformall.service.WxProfitSharingOrderService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java index b63e19291..0114cf5d3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxQuestionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxQuestionController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.alibaba.fastjson.JSONObject; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxQuestion; import com.iformall.domain.po.WxQuestionConfig; import com.iformall.enums.EnumQuestionConfigStatus; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java index a561b088f..b0573d90d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxRefundOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRefundOrderController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java index 3093df848..757247697 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxSubsidyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxSubsidyController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.exception.MallinkException; import com.iformall.utils.PayUtil; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java index b0d424f53..50b79505c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxTopicController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxTopicController.java @@ -1,7 +1,8 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.enums.EnumWxTopicStatus; import com.iformall.service.*; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java similarity index 94% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java index db364c409..de35200dc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxUserCouponController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.market; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxUserCouponDto; import com.iformall.service.WxUserCouponService; import io.swagger.annotations.ApiOperation; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/AsyncTask.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/AsyncTask.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java index ce8502152..d410bf40e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/AsyncTask.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/AsyncTask.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import cn.afterturn.easypoi.excel.ExcelImportUtil; import cn.afterturn.easypoi.excel.entity.ImportParams; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 9d9d8f8ef..34ec01866 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -8,7 +8,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxCUserBasicInfoDto; +import com.iformall.controller.base.BaseController; import com.iformall.domain.dto.WxCUserBasicInfoFilterDto; import com.iformall.domain.po.*; import com.iformall.enums.EnumAssignTagsTrigger; @@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; import static com.iformall.domain.po.WxCouponOrder.Field.CreateDate_DESC; -import static com.iformall.ueditor.define.AppInfo.info; @RestController @RequestMapping("wxCUserBasicInfo") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java index dc7235c56..45893dd90 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserCarController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUserCar; import com.iformall.service.WxCUserCarService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java index 4937dd782..d3f15c979 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java index 7b0c5723c..23d377850 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserDataController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserDataController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import java.text.DecimalFormat; import java.text.NumberFormat; @@ -11,6 +11,7 @@ import java.util.List; import java.util.Map; import com.iformall.annotation.SystemControllerLog; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCouponOrder; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.service.WxCUserBasicInfoService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java index 4733a7897..c021a78d5 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCUserTagsController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserTagsController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCUserTags; import com.iformall.service.WxCUserTagsService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java index ef64c99b6..397f8f809 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCreditHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCreditHistoryController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.vo.WxCreditHistoryVo; import com.iformall.exception.MallinkException; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java index f74740772..83cb937b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxLevelConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxLevelConfigController.java @@ -1,6 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.iformall.common.ErrorCode; +import com.iformall.controller.base.BaseController; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java index 44a3260e3..17752c865 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreHistoryController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxScoreHistory; import com.iformall.service.WxScoreHistoryService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java similarity index 90% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java index 3ade4e2b8..bd5fe1cba 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScoreRulesController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreRulesController.java @@ -1,14 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.mem; -import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxScoreRules; import com.iformall.service.WxScoreRulesService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java index 5b3745ebf..fc8e0a255 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxUserChannelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxUserChannelController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.mem; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxUserChannel; import com.iformall.service.WxUserChannelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java index ab9d98c54..e2d2851b3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgCallbackController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgCallbackController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgCallback; import com.iformall.service.WxMsgCallbackService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java index f49591609..6b226eb6b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgConfigController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgConfig; import com.iformall.service.WxMsgConfigService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java similarity index 84% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java index a11386688..9074089da 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgController.java @@ -1,32 +1,17 @@ -package com.iformall.controller; +package com.iformall.controller.msg; -import com.alibaba.fastjson.JSON; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; -import com.iformall.domain.dto.WxCUserBasicInfoFilterListDto; -import com.iformall.domain.po.PushLimit; -import com.iformall.domain.po.WxCUserBasicInfo; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.msg.WxMsg; -import com.iformall.domain.po.WxMsgConfig; -import com.iformall.enums.EnumMsgSend; -import com.iformall.enums.EnumMsgStatus; -import com.iformall.exception.MallinkException; -import com.iformall.mapper.WxMsgConfigMapper; -import com.iformall.service.PushLimitService; -import com.iformall.service.WxCUserBasicInfoService; -import com.iformall.service.WxCUserTagsService; import com.iformall.service.WxMsgService; import com.iformall.utils.Constant; -import com.iformall.utils.DateUtils; -import io.netty.util.internal.StringUtil; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -36,7 +21,6 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.io.FileOutputStream; import java.util.*; -import java.util.stream.Collectors; /** * @author gongbiao diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java index 2c463fbbf..f3e80a330 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgModelController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgModel; import com.iformall.service.WxMsgModelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java index 1f87c8464..860b75a63 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgRecordController.java @@ -1,7 +1,7 @@ -package com.iformall.controller; +package com.iformall.controller.msg; -import com.alibaba.fastjson.JSONArray; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.msg.MailMsg; import com.iformall.domain.po.msg.SmartAppMsg; import com.iformall.domain.po.msg.WxMsg; @@ -11,7 +11,6 @@ import com.iformall.mapper.WxMsgMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgRecordService; import com.iformall.service.msg.impl.SendCallBackSmsServiceImpl; -import com.iformall.utils.DateUtils; import com.iformall.utils.JsonUtil; import io.swagger.annotations.Api; import org.slf4j.Logger; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java index 389c439e9..fbede329c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgSignatureController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgSignature; import com.iformall.service.WxMsgSignatureService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java index c1a5ac4a6..4ecdcb5c7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.service.WxMsgValidationcodeService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java index 373a30b53..a67e4a93c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMsgValidationcodeModelController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeModelController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.msg; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMsgValidationcodeModel; import com.iformall.service.WxMsgValidationcodeModelService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/official/WxMallApplyController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/official/WxMallApplyController.java index a00dcfba5..6812a2c65 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxMallApplyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/official/WxMallApplyController.java @@ -1,9 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.official; import com.github.pagehelper.PageInfo; -import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxMallApply; import com.iformall.domain.po.WxMsgValidationcode; import com.iformall.service.WxMallApplyService; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillActionController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java similarity index 95% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillActionController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java index 131d3aa82..d5bd7a54e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillActionController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillActionController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillAction; import com.iformall.service.WxBillActionService; import io.swagger.annotations.Api; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 9003fb596..16a0d41c1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -1,8 +1,8 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; -import com.iformall.domain.po.WxShop; +import com.iformall.controller.base.BaseController; import com.iformall.domain.vo.WxBillAll; import com.iformall.service.WxBillAllService; import io.swagger.annotations.ApiImplicitParam; @@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.List; import java.util.Map; /** diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java index 0c1679399..6b6c19ff7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDailyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDailyController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillDaily; import com.iformall.service.WxBillDailyService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java index cf046629b..2e514711d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillDepositController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillDeposit; import com.iformall.service.WxBillDepositService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java index 4530e823c..c4078fc89 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillOther; import com.iformall.service.WxBillOtherService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java index 737fce954..c8704b933 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillOtherDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillOtherDepositController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillOtherDeposit; import com.iformall.service.WxBillOtherDepositService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java index cb1d1d322..1d23ffa52 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillProperty; import com.iformall.service.WxBillPropertyService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java index 77b54641d..e61a8defe 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillPropertyDepositController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillPropertyDepositController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillPropertyDeposit; import com.iformall.service.WxBillPropertyDepositService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java index 6c106f8ec..7114b39af 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBillRentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillRentController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.rent; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBillRent; import com.iformall.service.WxBillRentService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java index 54bfe8179..ea31c643a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java @@ -1,16 +1,16 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.google.code.kaptcha.Constants; import com.google.code.kaptcha.Producer; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.annotation.SystemControllerLog; -import com.iformall.mq.MqBaseProducer; import com.iformall.service.*; import com.iformall.shiro.UserSession; import com.iformall.shiro.UseriFormallToken; @@ -71,6 +71,7 @@ public class HomeController extends BaseController { @Autowired private MallUserActionService mallUserActionService; + @ApiOperation("验证码") @GetMapping("/captcha.jpg") public void captcha(HttpServletResponse response)throws ServletException, IOException { logger.debug("[" + getIpAddr() + "] HomeController::captcha"); @@ -246,6 +247,7 @@ public class HomeController extends BaseController { return data; } + @ApiOperation("发送手机验证码") @GetMapping("sendLoginPhoneCode") @ApiImplicitParams({ @ApiImplicitParam(name = "phone", value = "手机号", dataType = "String", paramType = "query", required = true)}) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java similarity index 92% rename from mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index 749304706..56b3d5871 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -1,10 +1,11 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallRole; import com.iformall.domain.po.MallRolePermission; import com.iformall.domain.po.MallUserInfo; @@ -12,12 +13,13 @@ import com.iformall.domain.po.MallUserRole; import com.iformall.enums.EnumUserAdmin; import com.iformall.service.MallRolePermissionService; import com.iformall.service.MallRoleService; -import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserRoleService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -41,13 +43,12 @@ public class MallRoleController extends BaseController { @Autowired private MallRolePermissionService sysRolePermissionService; - @Autowired - private MallUserInfoService mallUserInfoService; - @Autowired private MallUserRoleService mallUserRoleService; + @ApiOperation("角色列表") @GetMapping("list") + @RequiresPermissions("sys:role:list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @@ -75,7 +76,9 @@ public class MallRoleController extends BaseController { } + @ApiOperation("角色保存") @PostMapping("saveOrUpdate") + @RequiresPermissions("sys:role:save") @SystemControllerLog(description = "用户管理-rule保存") public ResultData saveOrUpdate(@RequestBody MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::saveOrUpdate"); @@ -101,8 +104,9 @@ public class MallRoleController extends BaseController { return new ResultData(); } - + @ApiOperation("角色增加") @PostMapping("add") + @RequiresPermissions("sys:role:add") @SystemControllerLog(description = "用户管理-rule添加") public ResultData add(MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::add"); @@ -116,7 +120,9 @@ public class MallRoleController extends BaseController { return new ResultData(); } + @ApiOperation("角色更新") @PostMapping("update") + @RequiresPermissions("sys:role:update") @SystemControllerLog(description = "用户管理-rule更新") public ResultData update(MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::update"); @@ -132,8 +138,9 @@ public class MallRoleController extends BaseController { return new ResultData(); } - + @ApiOperation("角色删除") @PostMapping("/del") + @RequiresPermissions("sys:role:del") @SystemControllerLog(description = "用户管理-rule删除") public ResultData delete(@RequestBody MallRole sysRole) { logger.debug("[" + getIpAddr() + "] MallRoleController::delete"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 188b534fb..5076ff696 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -1,21 +1,18 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.EnumMallUserStatus; import com.iformall.enums.EnumUserAdmin; import com.iformall.enums.EnumFlowPermissionType; -import com.iformall.enums.EnumUserWechat; import com.iformall.service.*; import com.iformall.shiro.PasswordHelper; import com.iformall.shiro.UserSession; -import com.iformall.utils.Constant; -import com.sun.tools.internal.jxc.ap.Const; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -23,13 +20,13 @@ import io.swagger.annotations.ApiOperation; import org.apache.commons.collections.map.HashedMap; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; +import org.apache.shiro.authz.annotation.RequiresPermissions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; -import javax.print.DocFlavor; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -68,6 +65,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户分页接口", response = String.class) @GetMapping("lists") + @RequiresPermissions("sys:user:list") @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @@ -100,6 +98,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "用户详情接口", response = String.class) @GetMapping("detail") + @RequiresPermissions("sys:user:info") @SystemControllerLog(description = "用户管理-用户详情") public ResultData detail(Long id) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::detail"); @@ -115,6 +114,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "创建用户接口", response = String.class) @PostMapping("add") + @RequiresPermissions("sys:user:add") @SystemControllerLog(description = "用户管理-创建用户") public ResultData createUser(@RequestBody MallUserInfo userInfo) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); @@ -147,6 +147,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "修改用户接口", response = String.class) @PostMapping("update") + @RequiresPermissions("sys:user:update") @SystemControllerLog(description = "用户管理-修改用户") public ResultData updateUser(@RequestBody MallUserInfo userInfo) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); @@ -221,6 +222,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "删除用户接口", response = String.class) @PostMapping("/del") + @RequiresPermissions("sys:user:del") @SystemControllerLog(description = "用户管理-删除用户") public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); @@ -236,13 +238,9 @@ public class MallUserInfoController extends BaseController { return new ResultData(); } - /** - * 启用,停用用户 - * - * @return - */ @ApiOperation(value = "起停用户接口") @PostMapping("updateStatus") + @RequiresPermissions("sys:user:update") @SystemControllerLog(description = "用户管理-起停用户") public ResultData modifyStatus(@RequestBody MallUserInfo userInfo) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); @@ -273,6 +271,7 @@ public class MallUserInfoController extends BaseController { } + @ApiOperation(value = "用户权限检查") @GetMapping("hasButtonPermission") @SystemControllerLog(description = "用户管理-用户权限检查") public ResultData hasButtonPermission(String permissions) { @@ -285,17 +284,12 @@ public class MallUserInfoController extends BaseController { boolean has = userInfoService.hasButtonPermission(userId, name); map.put(name, has); } -// StringBuffer buffer = new StringBuffer(); -// for(Entry entrySet :map.entrySet()){ -// buffer.append("var "+entrySet.getKey()); -// buffer.append("="+entrySet.getValue()); -// buffer.append(";"); -// } - //return new ResultData(buffer.toString()); return new ResultData(map); } + @ApiOperation(value = "用户权限检查") @GetMapping("getUser") + @RequiresPermissions("sys:user:info") @SystemControllerLog(description = "用户管理-用户信息") public ResultData getUserInfo() { logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); @@ -345,6 +339,7 @@ public class MallUserInfoController extends BaseController { return new ResultData(info); } + @ApiOperation(value = "用户密码发送验证码") @GetMapping("sendvalidationcode") @ApiImplicitParams({ @ApiImplicitParam(name = "userName", value = "手机号", dataType = "String", paramType = "query", required = true), @@ -419,6 +414,7 @@ public class MallUserInfoController extends BaseController { @ApiOperation(value = "审批权限用户列表", response = String.class) @GetMapping("getFlowPermissionList") + @RequiresPermissions("sys:user:flowlist") @SystemControllerLog(description = "用户管理-审批权限用户列表") public ResultData getFlowPermissionList() { logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList"); diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java similarity index 70% rename from mallinkAdmin/src/main/java/com/iformall/controller/SysMenuController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index 0aa601f7c..5a41e32bf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -1,9 +1,10 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.enums.EnumPermissionType; @@ -11,6 +12,7 @@ import com.iformall.exception.MallinkException; import com.iformall.service.MallPermissionService; import com.iformall.service.MallUserInfoService; import com.iformall.utils.Constant; +import io.swagger.annotations.ApiOperation; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.util.Assert; @@ -21,11 +23,12 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.method.HandlerMethod; +import org.springframework.web.servlet.mvc.condition.PatternsRequestCondition; +import org.springframework.web.servlet.mvc.method.RequestMappingInfo; +import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; /** * @author Stormeye Wu @@ -42,9 +45,7 @@ public class SysMenuController extends BaseController { @Autowired private MallUserInfoService mallUserInfoService; - /** - * 导航菜单 - */ + @ApiOperation("导航菜单") @GetMapping("/nav") public ResultData nav(){ logger.debug("[" + getIpAddr() + "] MallPermissionController::nav"); @@ -57,21 +58,18 @@ public class SysMenuController extends BaseController { return new ResultData(map); } - - /** - * 所有菜单列表 - * @return - */ + @ApiOperation("所有菜单列表") @GetMapping("list") @RequiresPermissions("sys:menu:list") @SystemControllerLog(description = "用户管理-权限") public ResultData getList() { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); - List menuList = mallPermissionService.getUserMenuList(user); + List menuList = mallUserInfoService.getAllPermissions(user); return new ResultData(Result.SUCCESS, "查询成功", menuList); } + @ApiOperation("添加菜单/权限") @PostMapping("add") @RequiresPermissions("sys:menu:save") @SystemControllerLog(description = "用户管理-权限添加") @@ -85,6 +83,7 @@ public class SysMenuController extends BaseController { return new ResultData(mallPermission.getId()); } + @ApiOperation("更新菜单/权限") @PostMapping("update") @RequiresPermissions("sys:menu:update") @SystemControllerLog(description = "用户管理-权限更新") @@ -97,6 +96,7 @@ public class SysMenuController extends BaseController { return new ResultData(); } + @ApiOperation("删除菜单/权限") @GetMapping("/del") @RequiresPermissions("sys:menu:delete") @SystemControllerLog(description = "用户管理-权限删除") @@ -116,9 +116,7 @@ public class SysMenuController extends BaseController { return new ResultData(Result.SUCCESS, "删除成功"); } - /** - * 菜单信息 - */ + @ApiOperation("菜单信息") @GetMapping("/findById") @RequiresPermissions("sys:menu:info") @SystemControllerLog(description = "用户管理-权限查找") @@ -127,6 +125,42 @@ public class SysMenuController extends BaseController { return new ResultData(Result.SUCCESS, "成功", mallPermissionService.getById(id)); } + @Autowired + private RequestMappingHandlerMapping requestMappingHandlerMapping; + + @ApiOperation("导出菜单") + @GetMapping("/export") + //@RequiresPermissions("sys:menu:import") + @SystemControllerLog(description = "用户管理-导出权限") + public ResultData export() { + logger.debug("[" + getIpAddr() + "] MallPermissionController::export"); + List resourceList = new ArrayList(); + //获取所有Controller的方法 + Map map = requestMappingHandlerMapping.getHandlerMethods(); + for (Map.Entry m : map.entrySet()) { + RequestMappingInfo info = m.getKey(); + HandlerMethod method = m.getValue(); + PatternsRequestCondition p = info.getPatternsCondition(); + //扫描Shiro的权限资源标签 + RequiresPermissions requiresPermissions = method.getMethod().getAnnotation(RequiresPermissions.class); + if (requiresPermissions != null) { + Map newSource = new HashMap(); + String[] strArr = requiresPermissions.value(); + newSource.put("permission", strArr[0]); + //扫描Swagger注解 + ApiOperation apiOperation = method.getMethod().getAnnotation(ApiOperation.class); + if (apiOperation != null) { + newSource.put("name", apiOperation.value()); + Set urls = p.getPatterns(); + newSource.put("url", urls.toArray()[0]); + } + resourceList.add(newSource); + } + } + + return new ResultData(resourceList); + } + /** * 验证参数是否正确 */ diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java index bc58b1d06..9d493d174 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/UploadController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/UploadController.java @@ -1,4 +1,4 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.amazonaws.AmazonClientException; @@ -13,6 +13,7 @@ import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; import com.iformall.common.ResultData; import com.iformall.config.AwsProperty; +import com.iformall.controller.base.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java similarity index 99% rename from mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java index 8e83ede7d..08a48846a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WechatLoginController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WechatLoginController.java @@ -1,15 +1,15 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.alibaba.fastjson.JSON; import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserAction; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.vo.MallUserInfoVo; import com.iformall.enums.EnumMallUserAction; import com.iformall.enums.EnumUserAdmin; -import com.iformall.exception.MallinkException; import com.iformall.service.MallUserActionService; import com.iformall.service.MallUserInfoService; import com.iformall.service.MallUserRoleService; @@ -46,10 +46,8 @@ import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.*; -import java.util.concurrent.TimeUnit; @Controller diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java similarity index 97% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java index eff36752d..649c99d6e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxAdminLogController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxAdminLogController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxAdminLog; import com.iformall.service.WxAdminLogService; import io.swagger.annotations.ApiImplicitParam; diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java similarity index 96% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java index 56509492f..720afdb4a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxBusinessController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/WxBusinessController.java @@ -1,9 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.sys; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; -import com.iformall.common.Result; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxBusiness; import com.iformall.domain.po.WxSubBusiness; import com.iformall.service.WxBusinessService; @@ -18,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.stream.Collectors; @RestController @RequestMapping("wxBusiness") diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java similarity index 98% rename from mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java rename to mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java index 24d1ac625..551851764 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxFlowAbleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/workflow/WxFlowAbleController.java @@ -1,8 +1,9 @@ -package com.iformall.controller; +package com.iformall.controller.workflow; import com.github.pagehelper.PageInfo; import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ResultData; +import com.iformall.controller.base.BaseController; import com.iformall.domain.po.WxFlowRecord; import com.iformall.enums.EnumFlowRecordStatus; import com.iformall.service.WxFlowService;