diff --git a/mallinkBApi/pom.xml b/mallinkBApi/pom.xml new file mode 100644 index 000000000..4b4449c02 --- /dev/null +++ b/mallinkBApi/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + mallink + com.simple + 1.0 + + + mallinkBApi + + + + com.simple + mallinkService + 1.0 + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + true + + + + + \ No newline at end of file diff --git a/mallinkCclientApi/src/main/java/com/simple/UserApplication.java b/mallinkBApi/src/main/java/com/simple/UserApplication.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/UserApplication.java rename to mallinkBApi/src/main/java/com/simple/UserApplication.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java similarity index 97% rename from mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java rename to mallinkBApi/src/main/java/com/simple/controller/BaseController.java index 73d9c5cbb..7f8b36a46 100644 --- a/mallinkCclientApi/src/main/java/com/simple/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/BaseController.java @@ -1,35 +1,35 @@ -package com.simple.controller; - -import java.beans.PropertyEditorSupport; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; - -import org.springframework.web.bind.WebDataBinder; -import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class BaseController { - @InitBinder - public void InitBinder(WebDataBinder dataBinder) { - dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { - public void setAsText(String value) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); - } catch(ParseException e) { - try { - setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); - } catch (ParseException e1) { - setValue(null); - } - } - } - - public String getAsText() { - return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); - } - - }); - } -} +package com.simple.controller; + +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class BaseController { + @InitBinder + public void InitBinder(WebDataBinder dataBinder) { + dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + public void setAsText(String value) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); + } catch(ParseException e) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); + } catch (ParseException e1) { + setValue(null); + } + } + } + + public String getAsText() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); + } + + }); + } +} diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkBApi/src/main/java/com/simple/controller/WxAppinfoController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxAppinfoController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxAppinfoController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBannersController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBannersController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxBusinessController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxBusinessController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserCarsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserCarsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserCarsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCUserTagsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCUserTagsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponActionLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponActionLogController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponCarController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponCarController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponChannelController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponChannelController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponSendController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponSendController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponTypeController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponTypeController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxCouponVerifyController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxCouponVerifyController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallBuildingController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallBuildingController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMallFloorController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMallFloorController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantBUserController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantBUserController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantShopController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantShopController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgCallbackController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgCallbackController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgConfigController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgConfigController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgModelController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgModelController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxMsgSignatureController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxMsgSignatureController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxOrderController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxOrderController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkBApi/src/main/java/com/simple/controller/WxParkController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxParkController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxParkController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxPayOrderController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxPayOrderController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreHistoryController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreHistoryController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreRulesController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreRulesController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkBApi/src/main/java/com/simple/controller/WxShopController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxShopController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxShopController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxTagsController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxTagsController.java diff --git a/mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java similarity index 100% rename from mallinkCclientApi/src/main/java/com/simple/controller/WxWebLogController.java rename to mallinkBApi/src/main/java/com/simple/controller/WxWebLogController.java diff --git a/mallinkCclientApi/src/main/resources/application-dev.yml b/mallinkBApi/src/main/resources/application-dev.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application-dev.yml rename to mallinkBApi/src/main/resources/application-dev.yml diff --git a/mallinkCclientApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application-prod.yml rename to mallinkBApi/src/main/resources/application-prod.yml diff --git a/mallinkBApi/src/main/resources/application.yml b/mallinkBApi/src/main/resources/application.yml new file mode 100644 index 000000000..4f5159bdd --- /dev/null +++ b/mallinkBApi/src/main/resources/application.yml @@ -0,0 +1,39 @@ +server: + port: 8000 + context-path: /B + +spring: + application: + name: mallink + profiles: + active: dev + jackson: + date-format: yyyy-MM-dd HH:mm:ss + time-zone: GMT+8 + + +# @{link} https://github.com/abel533 +#Mybatis +mybatis: + type-aliases-package: com.simple.domain.po + mapper-locations: classpath:mapper/*Mapper.xml + configuration: + map-underscore-to-camel-case: true + cache-enabled: true + lazy-loading-enabled: true + use-generated-keys: true + default-fetch-size: 100 + +#PageHelper +pagehelper: + helperDialect: mysql + reasonable: false + supportMethodsArguments: true + params: count=countSql + offset-as-page-num: true + page-size-zero: true + row-bounds-with-count: true + +mapper: + mappers: + - com.simple.common.CommonMapper diff --git a/mallinkCclientApi/src/main/resources/logback.xml b/mallinkBApi/src/main/resources/logback.xml similarity index 97% rename from mallinkCclientApi/src/main/resources/logback.xml rename to mallinkBApi/src/main/resources/logback.xml index 41e865f70..155df638e 100644 --- a/mallinkCclientApi/src/main/resources/logback.xml +++ b/mallinkBApi/src/main/resources/logback.xml @@ -1,95 +1,95 @@ - - - - - - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n - - - - - ${PATH}/trace.log - - logs/trace.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - - - ${PATH}/info.log - - logs/info.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - INFO - ACCEPT - DENY - - - - - ${PATH}/debug.log - - logs/debug.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - DEBUG - ACCEPT - DENY - - - - - - ${PATH}/warn.log - - logs/warn.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - WARN - ACCEPT - DENY - - - - - - - ${PATH}/error.log - - logs/error.%d{yyyy-MM-dd}.log - - - [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - + + + + + + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n + + + + + ${PATH}/trace.log + + logs/trace.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + + + ${PATH}/info.log + + logs/info.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + INFO + ACCEPT + DENY + + + + + ${PATH}/debug.log + + logs/debug.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + DEBUG + ACCEPT + DENY + + + + + + ${PATH}/warn.log + + logs/warn.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + WARN + ACCEPT + DENY + + + + + + + ${PATH}/error.log + + logs/error.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + \ No newline at end of file diff --git a/mallinkCclientApi/pom.xml b/mallinkCApi/pom.xml similarity index 100% rename from mallinkCclientApi/pom.xml rename to mallinkCApi/pom.xml diff --git a/mallinkCApi/src/main/java/com/simple/UserApplication.java b/mallinkCApi/src/main/java/com/simple/UserApplication.java new file mode 100644 index 000000000..a16a60136 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/UserApplication.java @@ -0,0 +1,21 @@ +package com.simple; + +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +/** + * @author chenkx + * @date 2017-12-26 + */ +@SpringBootApplication +@MapperScan(basePackages = {"com.simple.mapper"}) +@EnableSwagger2 +public class UserApplication { + + public static void main(String[] args) { + SpringApplication.run(UserApplication.class, args); + } +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/BaseController.java b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java new file mode 100644 index 000000000..7f8b36a46 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/BaseController.java @@ -0,0 +1,35 @@ +package com.simple.controller; + +import java.beans.PropertyEditorSupport; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.springframework.web.bind.WebDataBinder; +import org.springframework.web.bind.annotation.InitBinder; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class BaseController { + @InitBinder + public void InitBinder(WebDataBinder dataBinder) { + dataBinder.registerCustomEditor(Date.class, new PropertyEditorSupport() { + public void setAsText(String value) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(value)); + } catch(ParseException e) { + try { + setValue(new SimpleDateFormat("yyyy-MM-dd ").parse(value)); + } catch (ParseException e1) { + setValue(null); + } + } + } + + public String getAsText() { + return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) getValue()); + } + + }); + } +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java b/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java new file mode 100644 index 000000000..d228e669b --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxAppinfoController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxAppinfo; +import com.simple.service.WxAppinfoService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxAppinfo") +public class WxAppinfoController extends BaseController +{ + @Autowired + private WxAppinfoService wxAppinfoService; + + private Logger logger = Logger.getLogger(WxAppinfoController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxAppinfo wxAppinfo,Integer pageNum, Integer pageSize) { + if (null == wxAppinfo) wxAppinfo = new WxAppinfo(); + final PageInfo page = wxAppinfoService.listAsPage(wxAppinfo, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxAppinfo wxAppinfo) { + //Assert.notNull(wxAppinfo.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxAppinfoService.saveOrUpdate(wxAppinfo); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxAppinfo wxAppinfo) { + wxAppinfoService.saveOrUpdate(wxAppinfo); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxAppinfoService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxAppinfoService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java new file mode 100644 index 000000000..f438992e0 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBLogController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxBLog; +import com.simple.service.WxBLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxBLog") +public class WxBLogController extends BaseController +{ + @Autowired + private WxBLogService wxBLogService; + + private Logger logger = Logger.getLogger(WxBLogController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxBLog wxBLog,Integer pageNum, Integer pageSize) { + if (null == wxBLog) wxBLog = new WxBLog(); + final PageInfo page = wxBLogService.listAsPage(wxBLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBLog wxBLog) { + //Assert.notNull(wxBLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBLogService.saveOrUpdate(wxBLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBLog wxBLog) { + wxBLogService.saveOrUpdate(wxBLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxBLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxBLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java new file mode 100644 index 000000000..e148e2402 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBannersController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxBanners; +import com.simple.service.WxBannersService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxBanners") +public class WxBannersController extends BaseController +{ + @Autowired + private WxBannersService wxBannersService; + + private Logger logger = Logger.getLogger(WxBannersController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxBanners wxBanners,Integer pageNum, Integer pageSize) { + if (null == wxBanners) wxBanners = new WxBanners(); + final PageInfo page = wxBannersService.listAsPage(wxBanners, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBanners wxBanners) { + //Assert.notNull(wxBanners.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBannersService.saveOrUpdate(wxBanners); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBanners wxBanners) { + wxBannersService.saveOrUpdate(wxBanners); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxBannersService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxBannersService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java new file mode 100644 index 000000000..3f0d53b90 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxBusinessController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxBusiness; +import com.simple.service.WxBusinessService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxBusiness") +public class WxBusinessController extends BaseController +{ + @Autowired + private WxBusinessService wxBusinessService; + + private Logger logger = Logger.getLogger(WxBusinessController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { + if (null == wxBusiness) wxBusiness = new WxBusiness(); + final PageInfo page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxBusiness wxBusiness) { + //Assert.notNull(wxBusiness.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxBusinessService.saveOrUpdate(wxBusiness); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxBusiness wxBusiness) { + wxBusinessService.saveOrUpdate(wxBusiness); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxBusinessService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxBusinessService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java new file mode 100644 index 000000000..934c12628 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCLogController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCLog; +import com.simple.service.WxCLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCLog") +public class WxCLogController extends BaseController +{ + @Autowired + private WxCLogService wxCLogService; + + private Logger logger = Logger.getLogger(WxCLogController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCLog wxCLog,Integer pageNum, Integer pageSize) { + if (null == wxCLog) wxCLog = new WxCLog(); + final PageInfo page = wxCLogService.listAsPage(wxCLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCLog wxCLog) { + //Assert.notNull(wxCLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCLogService.saveOrUpdate(wxCLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCLog wxCLog) { + wxCLogService.saveOrUpdate(wxCLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java new file mode 100644 index 000000000..8b9374f21 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserCarsController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCUserCars; +import com.simple.service.WxCUserCarsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCUserCars") +public class WxCUserCarsController extends BaseController +{ + @Autowired + private WxCUserCarsService wxCUserCarsService; + + private Logger logger = Logger.getLogger(WxCUserCarsController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCUserCars wxCUserCars,Integer pageNum, Integer pageSize) { + if (null == wxCUserCars) wxCUserCars = new WxCUserCars(); + final PageInfo page = wxCUserCarsService.listAsPage(wxCUserCars, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUserCars wxCUserCars) { + //Assert.notNull(wxCUserCars.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserCarsService.saveOrUpdate(wxCUserCars); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUserCars wxCUserCars) { + wxCUserCarsService.saveOrUpdate(wxCUserCars); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCUserCarsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserCarsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java new file mode 100644 index 000000000..f93ce3c99 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCUser; +import com.simple.service.WxCUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCUser") +public class WxCUserController extends BaseController +{ + @Autowired + private WxCUserService wxCUserService; + + private Logger logger = Logger.getLogger(WxCUserController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCUser wxCUser,Integer pageNum, Integer pageSize) { + if (null == wxCUser) wxCUser = new WxCUser(); + final PageInfo page = wxCUserService.listAsPage(wxCUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUser wxCUser) { + //Assert.notNull(wxCUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserService.saveOrUpdate(wxCUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUser wxCUser) { + wxCUserService.saveOrUpdate(wxCUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCUserService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java new file mode 100644 index 000000000..8dc774b51 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCUserTagsController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCUserTags; +import com.simple.service.WxCUserTagsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCUserTags") +public class WxCUserTagsController extends BaseController +{ + @Autowired + private WxCUserTagsService wxCUserTagsService; + + private Logger logger = Logger.getLogger(WxCUserTagsController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCUserTags wxCUserTags,Integer pageNum, Integer pageSize) { + if (null == wxCUserTags) wxCUserTags = new WxCUserTags(); + final PageInfo page = wxCUserTagsService.listAsPage(wxCUserTags, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCUserTags wxCUserTags) { + //Assert.notNull(wxCUserTags.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCUserTagsService.saveOrUpdate(wxCUserTags); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCUserTags wxCUserTags) { + wxCUserTagsService.saveOrUpdate(wxCUserTags); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCUserTagsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCUserTagsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java new file mode 100644 index 000000000..3eb4a4141 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCarCmdLogs; +import com.simple.service.WxCarCmdLogsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCarCmdLogs") +public class WxCarCmdLogsController extends BaseController +{ + @Autowired + private WxCarCmdLogsService wxCarCmdLogsService; + + private Logger logger = Logger.getLogger(WxCarCmdLogsController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCarCmdLogs wxCarCmdLogs,Integer pageNum, Integer pageSize) { + if (null == wxCarCmdLogs) wxCarCmdLogs = new WxCarCmdLogs(); + final PageInfo page = wxCarCmdLogsService.listAsPage(wxCarCmdLogs, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCarCmdLogsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCarCmdLogsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java new file mode 100644 index 000000000..8b0605cc3 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponActionLogController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponActionLog; +import com.simple.service.WxCouponActionLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponActionLog") +public class WxCouponActionLogController extends BaseController +{ + @Autowired + private WxCouponActionLogService wxCouponActionLogService; + + private Logger logger = Logger.getLogger(WxCouponActionLogController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponActionLog wxCouponActionLog,Integer pageNum, Integer pageSize) { + if (null == wxCouponActionLog) wxCouponActionLog = new WxCouponActionLog(); + final PageInfo page = wxCouponActionLogService.listAsPage(wxCouponActionLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponActionLog wxCouponActionLog) { + //Assert.notNull(wxCouponActionLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponActionLog wxCouponActionLog) { + wxCouponActionLogService.saveOrUpdate(wxCouponActionLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponActionLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponActionLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java new file mode 100644 index 000000000..6da6ef31d --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponCarController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponCar; +import com.simple.service.WxCouponCarService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponCar") +public class WxCouponCarController extends BaseController +{ + @Autowired + private WxCouponCarService wxCouponCarService; + + private Logger logger = Logger.getLogger(WxCouponCarController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponCar wxCouponCar,Integer pageNum, Integer pageSize) { + if (null == wxCouponCar) wxCouponCar = new WxCouponCar(); + final PageInfo page = wxCouponCarService.listAsPage(wxCouponCar, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponCar wxCouponCar) { + //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponCarService.saveOrUpdate(wxCouponCar); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponCar wxCouponCar) { + wxCouponCarService.saveOrUpdate(wxCouponCar); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponCarService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java new file mode 100644 index 000000000..f86461c8b --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponChannelController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponChannel; +import com.simple.service.WxCouponChannelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponChannel") +public class WxCouponChannelController extends BaseController +{ + @Autowired + private WxCouponChannelService wxCouponChannelService; + + private Logger logger = Logger.getLogger(WxCouponChannelController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponChannel wxCouponChannel,Integer pageNum, Integer pageSize) { + if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); + final PageInfo page = wxCouponChannelService.listAsPage(wxCouponChannel, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponChannel wxCouponChannel) { + //Assert.notNull(wxCouponChannel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponChannelService.saveOrUpdate(wxCouponChannel); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponChannel wxCouponChannel) { + wxCouponChannelService.saveOrUpdate(wxCouponChannel); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponChannelService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java new file mode 100644 index 000000000..dd39b05b8 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCoupon; +import com.simple.service.WxCouponService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCoupon") +public class WxCouponController extends BaseController +{ + @Autowired + private WxCouponService wxCouponService; + + private Logger logger = Logger.getLogger(WxCouponController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCoupon wxCoupon,Integer pageNum, Integer pageSize) { + if (null == wxCoupon) wxCoupon = new WxCoupon(); + final PageInfo page = wxCouponService.listAsPage(wxCoupon, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCoupon wxCoupon) { + //Assert.notNull(wxCoupon.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCoupon wxCoupon) { + wxCouponService.saveOrUpdate(wxCoupon); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java new file mode 100644 index 000000000..b43a78ab1 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponSendController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponSend; +import com.simple.service.WxCouponSendService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponSend") +public class WxCouponSendController extends BaseController +{ + @Autowired + private WxCouponSendService wxCouponSendService; + + private Logger logger = Logger.getLogger(WxCouponSendController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponSend wxCouponSend,Integer pageNum, Integer pageSize) { + if (null == wxCouponSend) wxCouponSend = new WxCouponSend(); + final PageInfo page = wxCouponSendService.listAsPage(wxCouponSend, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponSend wxCouponSend) { + //Assert.notNull(wxCouponSend.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponSend wxCouponSend) { + wxCouponSendService.saveOrUpdate(wxCouponSend); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponSendService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponSendService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java new file mode 100644 index 000000000..e61f27b76 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponTypeController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponType; +import com.simple.service.WxCouponTypeService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponType") +public class WxCouponTypeController extends BaseController +{ + @Autowired + private WxCouponTypeService wxCouponTypeService; + + private Logger logger = Logger.getLogger(WxCouponTypeController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponType wxCouponType,Integer pageNum, Integer pageSize) { + if (null == wxCouponType) wxCouponType = new WxCouponType(); + final PageInfo page = wxCouponTypeService.listAsPage(wxCouponType, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponType wxCouponType) { + //Assert.notNull(wxCouponType.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponTypeService.saveOrUpdate(wxCouponType); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponType wxCouponType) { + wxCouponTypeService.saveOrUpdate(wxCouponType); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponTypeService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponTypeService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java new file mode 100644 index 000000000..95b91de39 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCouponVerifyController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxCouponVerify; +import com.simple.service.WxCouponVerifyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxCouponVerify") +public class WxCouponVerifyController extends BaseController +{ + @Autowired + private WxCouponVerifyService wxCouponVerifyService; + + private Logger logger = Logger.getLogger(WxCouponVerifyController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxCouponVerify wxCouponVerify,Integer pageNum, Integer pageSize) { + if (null == wxCouponVerify) wxCouponVerify = new WxCouponVerify(); + final PageInfo page = wxCouponVerifyService.listAsPage(wxCouponVerify, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxCouponVerify wxCouponVerify) { + //Assert.notNull(wxCouponVerify.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxCouponVerifyService.saveOrUpdate(wxCouponVerify); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxCouponVerify wxCouponVerify) { + wxCouponVerifyService.saveOrUpdate(wxCouponVerify); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxCouponVerifyService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxCouponVerifyService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java new file mode 100644 index 000000000..170a712bb --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallBuildingController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMallBuilding; +import com.simple.service.WxMallBuildingService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMallBuilding") +public class WxMallBuildingController extends BaseController +{ + @Autowired + private WxMallBuildingService wxMallBuildingService; + + private Logger logger = Logger.getLogger(WxMallBuildingController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMallBuilding wxMallBuilding,Integer pageNum, Integer pageSize) { + if (null == wxMallBuilding) wxMallBuilding = new WxMallBuilding(); + final PageInfo page = wxMallBuildingService.listAsPage(wxMallBuilding, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMallBuilding wxMallBuilding) { + //Assert.notNull(wxMallBuilding.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallBuildingService.saveOrUpdate(wxMallBuilding); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMallBuilding wxMallBuilding) { + wxMallBuildingService.saveOrUpdate(wxMallBuilding); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallBuildingService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMallBuildingService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java new file mode 100644 index 000000000..def24e2a4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMall; +import com.simple.service.WxMallService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMall") +public class WxMallController extends BaseController +{ + @Autowired + private WxMallService wxMallService; + + private Logger logger = Logger.getLogger(WxMallController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMall wxMall,Integer pageNum, Integer pageSize) { + if (null == wxMall) wxMall = new WxMall(); + final PageInfo page = wxMallService.listAsPage(wxMall, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMall wxMall) { + //Assert.notNull(wxMall.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallService.saveOrUpdate(wxMall); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMall wxMall) { + wxMallService.saveOrUpdate(wxMall); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMallService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java new file mode 100644 index 000000000..23e580207 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMallFloorController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMallFloor; +import com.simple.service.WxMallFloorService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMallFloor") +public class WxMallFloorController extends BaseController +{ + @Autowired + private WxMallFloorService wxMallFloorService; + + private Logger logger = Logger.getLogger(WxMallFloorController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMallFloor wxMallFloor,Integer pageNum, Integer pageSize) { + if (null == wxMallFloor) wxMallFloor = new WxMallFloor(); + final PageInfo page = wxMallFloorService.listAsPage(wxMallFloor, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMallFloor wxMallFloor) { + //Assert.notNull(wxMallFloor.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMallFloorService.saveOrUpdate(wxMallFloor); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMallFloor wxMallFloor) { + wxMallFloorService.saveOrUpdate(wxMallFloor); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMallFloorService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMallFloorService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java new file mode 100644 index 000000000..5b7ec6a03 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantBUserController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMerchantBUser; +import com.simple.service.WxMerchantBUserService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantBUser") +public class WxMerchantBUserController extends BaseController +{ + @Autowired + private WxMerchantBUserService wxMerchantBUserService; + + private Logger logger = Logger.getLogger(WxMerchantBUserController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMerchantBUser wxMerchantBUser,Integer pageNum, Integer pageSize) { + if (null == wxMerchantBUser) wxMerchantBUser = new WxMerchantBUser(); + final PageInfo page = wxMerchantBUserService.listAsPage(wxMerchantBUser, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantBUser wxMerchantBUser) { + //Assert.notNull(wxMerchantBUser.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantBUser wxMerchantBUser) { + wxMerchantBUserService.saveOrUpdate(wxMerchantBUser); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantBUserService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantBUserService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java new file mode 100644 index 000000000..91e177f88 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMerchant; +import com.simple.service.WxMerchantService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchant") +public class WxMerchantController extends BaseController +{ + @Autowired + private WxMerchantService wxMerchantService; + + private Logger logger = Logger.getLogger(WxMerchantController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { + if (null == wxMerchant) wxMerchant = new WxMerchant(); + final PageInfo page = wxMerchantService.listAsPage(wxMerchant, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchant wxMerchant) { + //Assert.notNull(wxMerchant.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantService.saveOrUpdate(wxMerchant); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchant wxMerchant) { + wxMerchantService.saveOrUpdate(wxMerchant); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java new file mode 100644 index 000000000..f0c78f729 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantShopController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMerchantShop; +import com.simple.service.WxMerchantShopService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantShop") +public class WxMerchantShopController extends BaseController +{ + @Autowired + private WxMerchantShopService wxMerchantShopService; + + private Logger logger = Logger.getLogger(WxMerchantShopController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMerchantShop wxMerchantShop,Integer pageNum, Integer pageSize) { + if (null == wxMerchantShop) wxMerchantShop = new WxMerchantShop(); + final PageInfo page = wxMerchantShopService.listAsPage(wxMerchantShop, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantShop wxMerchantShop) { + //Assert.notNull(wxMerchantShop.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantShopService.saveOrUpdate(wxMerchantShop); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantShop wxMerchantShop) { + wxMerchantShopService.saveOrUpdate(wxMerchantShop); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantShopService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantShopService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java new file mode 100644 index 000000000..eccfc627a --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMerchantTradeDaily; +import com.simple.service.WxMerchantTradeDailyService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMerchantTradeDaily") +public class WxMerchantTradeDailyController extends BaseController +{ + @Autowired + private WxMerchantTradeDailyService wxMerchantTradeDailyService; + + private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily,Integer pageNum, Integer pageSize) { + if (null == wxMerchantTradeDaily) wxMerchantTradeDaily = new WxMerchantTradeDaily(); + final PageInfo page = wxMerchantTradeDailyService.listAsPage(wxMerchantTradeDaily, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { + //Assert.notNull(wxMerchantTradeDaily.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { + wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMerchantTradeDailyService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMerchantTradeDailyService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java new file mode 100644 index 000000000..fe83b1398 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgCallbackController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgCallback; +import com.simple.service.WxMsgCallbackService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgCallback") +public class WxMsgCallbackController extends BaseController +{ + @Autowired + private WxMsgCallbackService wxMsgCallbackService; + + private Logger logger = Logger.getLogger(WxMsgCallbackController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgCallback wxMsgCallback,Integer pageNum, Integer pageSize) { + if (null == wxMsgCallback) wxMsgCallback = new WxMsgCallback(); + final PageInfo page = wxMsgCallbackService.listAsPage(wxMsgCallback, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgCallback wxMsgCallback) { + //Assert.notNull(wxMsgCallback.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgCallbackService.saveOrUpdate(wxMsgCallback); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgCallback wxMsgCallback) { + wxMsgCallbackService.saveOrUpdate(wxMsgCallback); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMsgCallbackService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgCallbackService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java new file mode 100644 index 000000000..7ec2199c4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgConfigController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgConfig; +import com.simple.service.WxMsgConfigService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgConfig") +public class WxMsgConfigController extends BaseController +{ + @Autowired + private WxMsgConfigService wxMsgConfigService; + + private Logger logger = Logger.getLogger(WxMsgConfigController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgConfig wxMsgConfig,Integer pageNum, Integer pageSize) { + if (null == wxMsgConfig) wxMsgConfig = new WxMsgConfig(); + final PageInfo page = wxMsgConfigService.listAsPage(wxMsgConfig, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgConfig wxMsgConfig) { + //Assert.notNull(wxMsgConfig.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) { + wxMsgConfigService.saveOrUpdate(wxMsgConfig); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMsgConfigService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgConfigService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java new file mode 100644 index 000000000..e97b4a3c6 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsg; +import com.simple.service.WxMsgService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsg") +public class WxMsgController extends BaseController +{ + @Autowired + private WxMsgService wxMsgService; + + private Logger logger = Logger.getLogger(WxMsgController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsg wxMsg,Integer pageNum, Integer pageSize) { + if (null == wxMsg) wxMsg = new WxMsg(); + final PageInfo page = wxMsgService.listAsPage(wxMsg, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsg wxMsg) { + //Assert.notNull(wxMsg.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgService.saveOrUpdate(wxMsg); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsg wxMsg) { + wxMsgService.saveOrUpdate(wxMsg); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMsgService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java new file mode 100644 index 000000000..38a746c01 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgModelController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgModel; +import com.simple.service.WxMsgModelService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgModel") +public class WxMsgModelController extends BaseController +{ + @Autowired + private WxMsgModelService wxMsgModelService; + + private Logger logger = Logger.getLogger(WxMsgModelController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgModel wxMsgModel,Integer pageNum, Integer pageSize) { + if (null == wxMsgModel) wxMsgModel = new WxMsgModel(); + final PageInfo page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgModel wxMsgModel) { + //Assert.notNull(wxMsgModel.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgModel wxMsgModel) { + wxMsgModelService.saveOrUpdate(wxMsgModel); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMsgModelService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgModelService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java b/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java new file mode 100644 index 000000000..e1bc56cce --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxMsgSignatureController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxMsgSignature; +import com.simple.service.WxMsgSignatureService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxMsgSignature") +public class WxMsgSignatureController extends BaseController +{ + @Autowired + private WxMsgSignatureService wxMsgSignatureService; + + private Logger logger = Logger.getLogger(WxMsgSignatureController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxMsgSignature wxMsgSignature,Integer pageNum, Integer pageSize) { + if (null == wxMsgSignature) wxMsgSignature = new WxMsgSignature(); + final PageInfo page = wxMsgSignatureService.listAsPage(wxMsgSignature, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxMsgSignature wxMsgSignature) { + //Assert.notNull(wxMsgSignature.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxMsgSignatureService.saveOrUpdate(wxMsgSignature); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) { + wxMsgSignatureService.saveOrUpdate(wxMsgSignature); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxMsgSignatureService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxMsgSignatureService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java new file mode 100644 index 000000000..4c2653cf8 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxOrderController.java @@ -0,0 +1,126 @@ +package com.simple.controller; + +import com.simple.enums.EnumOrderStatus; +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxOrder; +import com.simple.service.WxOrderService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxOrder") +public class WxOrderController extends BaseController { + private Logger logger = Logger.getLogger(WxOrderController.class); + + @Autowired + private WxOrderService wxOrderService; + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { + if (null == wxOrder) wxOrder = new WxOrder(); + final PageInfo page = wxOrderService.listAsPage(wxOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("提交订单") + @PostMapping("save") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponId", value = "券ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "payment", value = "支付金额", required = true, dataType = "BigDecimal"), + @ApiImplicitParam(name = "status", value = "订单状态:-1全部;0-已下单/待付款;1-已支付;2-已取消(限定时间内未付款);3-未退款/待退款;4-已退款;5-退款失败", defaultValue = "0", required = false, dataType = "Integer") + }) + public ResultData saveOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.saveOrder(wxOrder); + return new ResultData(); + } + + @ApiOperation("取消订单") + @PostMapping("cancel") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData cancelOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL); + return new ResultData(); + } + + @ApiOperation("订单过期") + @PostMapping("expiring") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData expiringOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_PENDING_REFUND); + return new ResultData(); + } + + @ApiOperation("订单已过期") + @PostMapping("expired") + @ApiImplicitParams({ + @ApiImplicitParam(name = "id", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "cUserId", value = "用户ID", required = true, dataType = "Long") + }) + public ResultData expiredOrder(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrders.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.updateOrderStatus(wxOrder.getId(), EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS); + return new ResultData(); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxOrder wxOrder) { + //Assert.notNull(wxOrder.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxOrderService.saveOrUpdate(wxOrder); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxOrder wxOrder) { + wxOrderService.saveOrUpdate(wxOrder); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData delete(Long id) { + wxOrderService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS, "查询成功", wxOrderService.getById(id)); + } + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java new file mode 100644 index 000000000..2f7309c99 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxParkController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxPark; +import com.simple.service.WxParkService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxPark") +public class WxParkController extends BaseController +{ + @Autowired + private WxParkService wxParkService; + + private Logger logger = Logger.getLogger(WxParkController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxPark wxPark,Integer pageNum, Integer pageSize) { + if (null == wxPark) wxPark = new WxPark(); + final PageInfo page = wxParkService.listAsPage(wxPark, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxPark wxPark) { + //Assert.notNull(wxPark.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxParkService.saveOrUpdate(wxPark); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxPark wxPark) { + wxParkService.saveOrUpdate(wxPark); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxParkService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxParkService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java new file mode 100644 index 000000000..b0bbf862e --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxPayOrderController.java @@ -0,0 +1,150 @@ +package com.simple.controller; + +import com.simple.common.ErrorCode; +import com.simple.enums.EnumPayStatus; +import com.simple.enums.EnumPayWay; +import com.simple.exception.BizMessageException; +import com.simple.exception.MallinkException; +import com.simple.pay.WxPayment; +import com.simple.utils.IPUtil; +import org.apache.log4j.Logger; +import org.apache.commons.io.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxPayOrder; +import com.simple.service.WxPayOrderService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +import javax.servlet.http.HttpServletRequest; +import java.util.Map; + +@RestController +@RequestMapping("wxPayOrder") +public class WxPayOrderController extends BaseController { + + private Logger logger = Logger.getLogger(WxPayOrderController.class); + + @Autowired + private WxPayOrderService wxPayOrderService; + + @ApiOperation(value = "发起微信小程序支付订单") + @ApiImplicitParams({ + @ApiImplicitParam(name = "cUserId", value = "用户id", required = true, dataType = "Long"), + @ApiImplicitParam(name = "orderId", value = "订单ID", required = true, dataType = "Long"), + @ApiImplicitParam(name = "payVendor", value = "支付发起渠道:0-微信小程序", defaultValue = "0",required = false, dataType = "Integer") + }) + @RequestMapping(value = "/create", method = RequestMethod.POST) + public ResultData _create(WxPayOrder record, HttpServletRequest request) throws Exception { + logger.info("payment wechat, order create, param : " + record.toString()); + try { + record.setIp(IPUtil.getIpAddr(request)); + return wxPayOrderService.createPayOrder(record, EnumPayWay.PAY_WAY_WECHAT); + } catch (MallinkException e) { + logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage()); + return new ResultData(e.getErrorCode(), e.getMessage()); + } catch (Exception e) { + logger.error("payment wechat, order create error, req 3: " + record.toString() + ", e:" + e.getMessage()); + } + return new ResultData(ErrorCode.PAYORDER_ERROR.getCode(), ErrorCode.PAYORDER_ERROR.getMessage()); + } + + /** + * + * @return 接收微信异步通知 + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "/notify", method = RequestMethod.POST) + public String __doNotify(HttpServletRequest request) throws Exception { + Map paramMap = null; + String response; + try { + String xml = IOUtils.toString(request.getInputStream()); + paramMap = WxPayment.xmlToMap(xml); + logger.info("payment wxpay, notify, param: " + paramMap.toString() ); + response = wxPayOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP); + logger.info("payment wxpay, notify success, req : " + paramMap.toString() + ", resp: " + response.toString()); + return response; + } catch (BizMessageException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" + e.getLocalizedMessage()); + return e.getMessage(); + } catch (MallinkException e) { + logger.error("payment wxpay, notify error, req: " + paramMap.toString() + ", e:" +e.getLocalizedMessage()); + return e.getMessage(); + } catch (Exception e) { + logger.error("payment wxpay, order create error, req: " + paramMap.toString() + ", e: " + e.getMessage()); + return e.getMessage(); + } + } + + /** + * + * @return 同步回调(订单状态主动检查) + * @throws Exception 可能产生的任何异常 + */ + @RequestMapping(value = "callback", method = {RequestMethod.GET, RequestMethod.POST}) + public String __doCallback(HttpServletRequest request) throws Exception { + + logger.info("payment wxpay, callback,request:" + request.toString()); + + return "\n" + + "\n" + + "\n" + + "\n" + + " \n" + + " \n" + + "\n"; + } + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxPayOrder wxPayOrder,Integer pageNum, Integer pageSize) { + if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); + final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxPayOrder wxPayOrder) { + //Assert.notNull(wxPayOrder.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxPayOrderService.saveOrUpdate(wxPayOrder); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxPayOrder wxPayOrder) { + wxPayOrderService.saveOrUpdate(wxPayOrder); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxPayOrderService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxPayOrderService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java new file mode 100644 index 000000000..56794ac8a --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreHistoryController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxScoreHistory; +import com.simple.service.WxScoreHistoryService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxScoreHistory") +public class WxScoreHistoryController extends BaseController +{ + @Autowired + private WxScoreHistoryService wxScoreHistoryService; + + private Logger logger = Logger.getLogger(WxScoreHistoryController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxScoreHistory wxScoreHistory,Integer pageNum, Integer pageSize) { + if (null == wxScoreHistory) wxScoreHistory = new WxScoreHistory(); + final PageInfo page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreHistory wxScoreHistory) { + //Assert.notNull(wxScoreHistory.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreHistoryService.saveOrUpdate(wxScoreHistory); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreHistory wxScoreHistory) { + wxScoreHistoryService.saveOrUpdate(wxScoreHistory); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxScoreHistoryService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreHistoryService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java new file mode 100644 index 000000000..21cb402b7 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreRulesController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxScoreRules; +import com.simple.service.WxScoreRulesService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxScoreRules") +public class WxScoreRulesController extends BaseController +{ + @Autowired + private WxScoreRulesService wxScoreRulesService; + + private Logger logger = Logger.getLogger(WxScoreRulesController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxScoreRules wxScoreRules,Integer pageNum, Integer pageSize) { + if (null == wxScoreRules) wxScoreRules = new WxScoreRules(); + final PageInfo page = wxScoreRulesService.listAsPage(wxScoreRules, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreRules wxScoreRules) { + //Assert.notNull(wxScoreRules.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreRulesService.saveOrUpdate(wxScoreRules); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreRules wxScoreRules) { + wxScoreRulesService.saveOrUpdate(wxScoreRules); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxScoreRulesService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreRulesService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java b/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java new file mode 100644 index 000000000..1271b55d5 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxScoreValidityPeriodController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxScoreValidityPeriod; +import com.simple.service.WxScoreValidityPeriodService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxScoreValidityPeriod") +public class WxScoreValidityPeriodController extends BaseController +{ + @Autowired + private WxScoreValidityPeriodService wxScoreValidityPeriodService; + + private Logger logger = Logger.getLogger(WxScoreValidityPeriodController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxScoreValidityPeriod wxScoreValidityPeriod,Integer pageNum, Integer pageSize) { + if (null == wxScoreValidityPeriod) wxScoreValidityPeriod = new WxScoreValidityPeriod(); + final PageInfo page = wxScoreValidityPeriodService.listAsPage(wxScoreValidityPeriod, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + //Assert.notNull(wxScoreValidityPeriod.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxScoreValidityPeriod wxScoreValidityPeriod) { + wxScoreValidityPeriodService.saveOrUpdate(wxScoreValidityPeriod); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxScoreValidityPeriodService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxScoreValidityPeriodService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java b/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java new file mode 100644 index 000000000..5685653d4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxShopController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxShop; +import com.simple.service.WxShopService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxShop") +public class WxShopController extends BaseController +{ + @Autowired + private WxShopService wxShopService; + + private Logger logger = Logger.getLogger(WxShopController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxShop wxShop,Integer pageNum, Integer pageSize) { + if (null == wxShop) wxShop = new WxShop(); + final PageInfo page = wxShopService.listAsPage(wxShop, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxShop wxShop) { + //Assert.notNull(wxShop.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxShopService.saveOrUpdate(wxShop); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxShop wxShop) { + wxShopService.saveOrUpdate(wxShop); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxShopService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxShopService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java b/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java new file mode 100644 index 000000000..52929d3c4 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxTagsController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxTags; +import com.simple.service.WxTagsService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxTags") +public class WxTagsController extends BaseController +{ + @Autowired + private WxTagsService wxTagsService; + + private Logger logger = Logger.getLogger(WxTagsController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxTags wxTags,Integer pageNum, Integer pageSize) { + if (null == wxTags) wxTags = new WxTags(); + final PageInfo page = wxTagsService.listAsPage(wxTags, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxTags wxTags) { + //Assert.notNull(wxTags.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxTagsService.saveOrUpdate(wxTags); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxTags wxTags) { + wxTagsService.saveOrUpdate(wxTags); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxTagsService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxTagsService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java b/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java new file mode 100644 index 000000000..a74b33363 --- /dev/null +++ b/mallinkCApi/src/main/java/com/simple/controller/WxWebLogController.java @@ -0,0 +1,71 @@ +package com.simple.controller; + +import org.apache.log4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.Assert; +import org.springframework.web.bind.annotation.*; + +import com.github.pagehelper.PageInfo; +import com.simple.common.Result; +import com.simple.common.ResultData; + +import com.simple.domain.po.WxWebLog; +import com.simple.service.WxWebLogService; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; +import io.swagger.annotations.ApiOperation; + +@RestController +@RequestMapping("wxWebLog") +public class WxWebLogController extends BaseController +{ + @Autowired + private WxWebLogService wxWebLogService; + + private Logger logger = Logger.getLogger(WxWebLogController.class); + + @ApiOperation("分页列表接口") + @GetMapping("list") + @ApiImplicitParams({ + @ApiImplicitParam(name="pageNum",value="页数",dataType="int", paramType = "query",required=true), + @ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)}) + public ResultData list(@ModelAttribute WxWebLog wxWebLog,Integer pageNum, Integer pageSize) { + if (null == wxWebLog) wxWebLog = new WxWebLog(); + final PageInfo page = wxWebLogService.listAsPage(wxWebLog, pageNum, pageSize); + return new ResultData(page); + } + + @ApiOperation("新增接口") + @PostMapping("add") + public ResultData add(@RequestBody WxWebLog wxWebLog) { + //Assert.notNull(wxWebLog.getName(), "角色名不能为空"); + //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); + wxWebLogService.saveOrUpdate(wxWebLog); + return new ResultData(); + } + + @ApiOperation("根据id更新接口") + @PostMapping("update") + public ResultData update(@RequestBody WxWebLog wxWebLog) { + wxWebLogService.saveOrUpdate(wxWebLog); + return new ResultData(); + } + + @ApiOperation("根据id删除接口") + @GetMapping("/del") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData delete(Long id) { + wxWebLogService.deleteById(id); + return new ResultData(Result.SUCCESS, "删除成功", null); + } + + @ApiOperation("根据id查询接口") + @GetMapping("/findById") + @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) + public ResultData findById(Long id) { + return new ResultData(Result.SUCCESS,"查询成功",wxWebLogService.getById(id)); + } + + + +} diff --git a/mallinkCApi/src/main/resources/application-dev.yml b/mallinkCApi/src/main/resources/application-dev.yml new file mode 100644 index 000000000..c40f720f9 --- /dev/null +++ b/mallinkCApi/src/main/resources/application-dev.yml @@ -0,0 +1,40 @@ +spring: + # JDBC + datasource: + url: jdbc:mysql://202.165.179.86:3306/mallink?characterEncoding=UTF-8&useSSL=false + username: mallone + password: m@1l0ne123@# + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + filters: stat + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + #jackson: + #date-format: yyyy-MM-dd HH:mm:ss + + # REDIS + redis: + host: 202.165.179.86 + port: 6789 + password: JGtest123 + timeout: 0 + expire: 1800 #30分钟 + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + +logging: + level: + tk.mybatis: debug + com.simple.mapper: debug diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml new file mode 100644 index 000000000..79193a5e4 --- /dev/null +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -0,0 +1,36 @@ +spring: + # JDBC + datasource: + url: jdbc:mysql://127.0.0.1:3306/mallink?characterEncoding=UTF-8 + username: root + password: 1234qwer + type: com.alibaba.druid.pool.DruidDataSource + driver-class-name: com.mysql.jdbc.Driver + filters: stat + maxActive: 20 + initialSize: 1 + maxWait: 60000 + minIdle: 1 + timeBetweenEvictionRunsMillis: 60000 + minEvictableIdleTimeMillis: 300000 + validationQuery: select 'x' + testWhileIdle: true + testOnBorrow: false + testOnReturn: false + poolPreparedStatements: true + maxOpenPreparedStatements: 20 + # REDIS + redis: + host: 127.0.0.1 + port: 6379 + timeout: 0 + pool: + max-active: 8 + max-idle: 8 + max-wait: -1 + min-idle: 0 + +logging: + level: + tk.mybatis: error + com.simple.mapper: error \ No newline at end of file diff --git a/mallinkCclientApi/src/main/resources/application.yml b/mallinkCApi/src/main/resources/application.yml similarity index 100% rename from mallinkCclientApi/src/main/resources/application.yml rename to mallinkCApi/src/main/resources/application.yml diff --git a/mallinkCApi/src/main/resources/logback.xml b/mallinkCApi/src/main/resources/logback.xml new file mode 100644 index 000000000..155df638e --- /dev/null +++ b/mallinkCApi/src/main/resources/logback.xml @@ -0,0 +1,95 @@ + + + + + + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] --%mdc{client}%msg%n + + + + + ${PATH}/trace.log + + logs/trace.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + + + ${PATH}/info.log + + logs/info.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + INFO + ACCEPT + DENY + + + + + ${PATH}/debug.log + + logs/debug.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + DEBUG + ACCEPT + DENY + + + + + + ${PATH}/warn.log + + logs/warn.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + WARN + ACCEPT + DENY + + + + + + + ${PATH}/error.log + + logs/error.%d{yyyy-MM-dd}.log + + + [%date{yyyy-MM-dd HH:mm:ss}] [%-5level] [%logger:%line]--%mdc{client} %msg%n + + + ERROR + ACCEPT + DENY + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index d6afbe7db..d7bbe663c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,8 @@ mallinkService mallinkAdmin - mallinkCclientApi + mallinkCApi + mallinkBApi