diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogsController.java similarity index 62% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java rename to mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogsController.java index 4fcf94ab9..3eb4a4141 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkInController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCarCmdLogsController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkIn; -import com.simple.service.WxEtcpParkInService; +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("wxEtcpParkIn") -public class WxEtcpParkInController extends BaseController +@RequestMapping("wxCarCmdLogs") +public class WxCarCmdLogsController extends BaseController { @Autowired - private WxEtcpParkInService wxEtcpParkInService; + private WxCarCmdLogsService wxCarCmdLogsService; - private Logger logger = Logger.getLogger(WxEtcpParkInController.class); + 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 WxEtcpParkIn wxEtcpParkIn,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkIn) wxEtcpParkIn = new WxEtcpParkIn(); - final PageInfo page = wxEtcpParkInService.listAsPage(wxEtcpParkIn, pageNum, pageSize); + 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 WxEtcpParkIn wxEtcpParkIn) { - //Assert.notNull(wxEtcpParkIn.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkInService.saveOrUpdate(wxEtcpParkIn); + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkIn wxEtcpParkIn) { - wxEtcpParkInService.saveOrUpdate(wxEtcpParkIn); + public ResultData update(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkInController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkInService.deleteById(id); + wxCarCmdLogsService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkInController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkInService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCarCmdLogsService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java similarity index 60% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java rename to mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java index a09fdbc29..6da6ef31d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOutController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkOut; -import com.simple.service.WxEtcpParkOutService; +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("wxEtcpParkOut") -public class WxEtcpParkOutController extends BaseController +@RequestMapping("wxCouponCar") +public class WxCouponCarController extends BaseController { @Autowired - private WxEtcpParkOutService wxEtcpParkOutService; + private WxCouponCarService wxCouponCarService; - private Logger logger = Logger.getLogger(WxEtcpParkOutController.class); + 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 WxEtcpParkOut wxEtcpParkOut,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkOut) wxEtcpParkOut = new WxEtcpParkOut(); - final PageInfo page = wxEtcpParkOutService.listAsPage(wxEtcpParkOut, pageNum, pageSize); + 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 WxEtcpParkOut wxEtcpParkOut) { - //Assert.notNull(wxEtcpParkOut.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCouponCar wxCouponCar) { + //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkOutService.saveOrUpdate(wxEtcpParkOut); + wxCouponCarService.saveOrUpdate(wxCouponCar); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkOut wxEtcpParkOut) { - wxEtcpParkOutService.saveOrUpdate(wxEtcpParkOut); + public ResultData update(@RequestBody WxCouponCar wxCouponCar) { + wxCouponCarService.saveOrUpdate(wxCouponCar); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkOutController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkOutService.deleteById(id); + wxCouponCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkOutController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOutService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java similarity index 57% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java rename to mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java index 4dd30914c..d96f24a42 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkTransaction; -import com.simple.service.WxEtcpParkTransactionService; +import com.simple.domain.po.WxCouponCarRecordEtcp; +import com.simple.service.WxCouponCarRecordEtcpService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController -@RequestMapping("wxEtcpParkTransaction") -public class WxEtcpParkTransactionController extends BaseController +@RequestMapping("wxCouponCarRecordEtcp") +public class WxCouponCarRecordEtcpController extends BaseController { @Autowired - private WxEtcpParkTransactionService wxEtcpParkTransactionService; + private WxCouponCarRecordEtcpService wxCouponCarRecordEtcpService; - private Logger logger = Logger.getLogger(WxEtcpParkTransactionController.class); + private Logger logger = Logger.getLogger(WxCouponCarRecordEtcpController.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 WxEtcpParkTransaction wxEtcpParkTransaction,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkTransaction) wxEtcpParkTransaction = new WxEtcpParkTransaction(); - final PageInfo page = wxEtcpParkTransactionService.listAsPage(wxEtcpParkTransaction, pageNum, pageSize); + public ResultData list(@ModelAttribute WxCouponCarRecordEtcp wxCouponCarRecordEtcp,Integer pageNum, Integer pageSize) { + if (null == wxCouponCarRecordEtcp) wxCouponCarRecordEtcp = new WxCouponCarRecordEtcp(); + final PageInfo page = wxCouponCarRecordEtcpService.listAsPage(wxCouponCarRecordEtcp, pageNum, pageSize); return new ResultData(page); } @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkTransaction wxEtcpParkTransaction) { - //Assert.notNull(wxEtcpParkTransaction.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCouponCarRecordEtcp wxCouponCarRecordEtcp) { + //Assert.notNull(wxCouponCarRecordEtcp.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkTransactionService.saveOrUpdate(wxEtcpParkTransaction); + wxCouponCarRecordEtcpService.saveOrUpdate(wxCouponCarRecordEtcp); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkTransaction wxEtcpParkTransaction) { - wxEtcpParkTransactionService.saveOrUpdate(wxEtcpParkTransaction); + public ResultData update(@RequestBody WxCouponCarRecordEtcp wxCouponCarRecordEtcp) { + wxCouponCarRecordEtcpService.saveOrUpdate(wxCouponCarRecordEtcp); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkTransactionController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkTransactionService.deleteById(id); + wxCouponCarRecordEtcpService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkTransactionController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkTransactionService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarRecordEtcpService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java deleted file mode 100644 index c31c86685..000000000 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxEtcpCouponRecord; -import com.simple.service.WxEtcpCouponRecordService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxEtcpCouponRecord") -public class WxEtcpCouponRecordController extends BaseController -{ - @Autowired - private WxEtcpCouponRecordService wxEtcpCouponRecordService; - - private Logger logger = Logger.getLogger(WxEtcpCouponRecordController.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 WxEtcpCouponRecord wxEtcpCouponRecord,Integer pageNum, Integer pageSize) { - if (null == wxEtcpCouponRecord) wxEtcpCouponRecord = new WxEtcpCouponRecord(); - final PageInfo page = wxEtcpCouponRecordService.listAsPage(wxEtcpCouponRecord, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpCouponRecord wxEtcpCouponRecord) { - //Assert.notNull(wxEtcpCouponRecord.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpCouponRecordService.saveOrUpdate(wxEtcpCouponRecord); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpCouponRecord wxEtcpCouponRecord) { - wxEtcpCouponRecordService.saveOrUpdate(wxEtcpCouponRecord); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpCouponRecordService.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,"查询成功",wxEtcpCouponRecordService.getById(id)); - } - - - -} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java deleted file mode 100644 index 678976174..000000000 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java +++ /dev/null @@ -1,71 +0,0 @@ -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.WxEtcpParkOrderunpay; -import com.simple.service.WxEtcpParkOrderunpayService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; -import io.swagger.annotations.ApiOperation; - -@RestController -@RequestMapping("wxEtcpParkOrderunpay") -public class WxEtcpParkOrderunpayController extends BaseController -{ - @Autowired - private WxEtcpParkOrderunpayService wxEtcpParkOrderunpayService; - - private Logger logger = Logger.getLogger(WxEtcpParkOrderunpayController.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 WxEtcpParkOrderunpay wxEtcpParkOrderunpay,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkOrderunpay) wxEtcpParkOrderunpay = new WxEtcpParkOrderunpay(); - final PageInfo page = wxEtcpParkOrderunpayService.listAsPage(wxEtcpParkOrderunpay, pageNum, pageSize); - return new ResultData(page); - } - - @ApiOperation("新增接口") - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkOrderunpay wxEtcpParkOrderunpay) { - //Assert.notNull(wxEtcpParkOrderunpay.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkOrderunpayService.saveOrUpdate(wxEtcpParkOrderunpay); - return new ResultData(); - } - - @ApiOperation("根据id更新接口") - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkOrderunpay wxEtcpParkOrderunpay) { - wxEtcpParkOrderunpayService.saveOrUpdate(wxEtcpParkOrderunpay); - return new ResultData(); - } - - @ApiOperation("根据id删除接口") - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkOrderunpayService.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,"查询成功",wxEtcpParkOrderunpayService.getById(id)); - } - - - -} diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java similarity index 58% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java rename to mallinkApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java index 730f2758e..3eb4a4141 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCarCmdLogsController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkUnbind; -import com.simple.service.WxEtcpParkUnbindService; +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("wxEtcpParkUnbind") -public class WxEtcpParkUnbindController extends BaseController +@RequestMapping("wxCarCmdLogs") +public class WxCarCmdLogsController extends BaseController { @Autowired - private WxEtcpParkUnbindService wxEtcpParkUnbindService; + private WxCarCmdLogsService wxCarCmdLogsService; - private Logger logger = Logger.getLogger(WxEtcpParkUnbindController.class); + 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 WxEtcpParkUnbind wxEtcpParkUnbind,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkUnbind) wxEtcpParkUnbind = new WxEtcpParkUnbind(); - final PageInfo page = wxEtcpParkUnbindService.listAsPage(wxEtcpParkUnbind, pageNum, pageSize); + 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 WxEtcpParkUnbind wxEtcpParkUnbind) { - //Assert.notNull(wxEtcpParkUnbind.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + //Assert.notNull(wxCarCmdLogs.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkUnbindService.saveOrUpdate(wxEtcpParkUnbind); + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkUnbind wxEtcpParkUnbind) { - wxEtcpParkUnbindService.saveOrUpdate(wxEtcpParkUnbind); + public ResultData update(@RequestBody WxCarCmdLogs wxCarCmdLogs) { + wxCarCmdLogsService.saveOrUpdate(wxCarCmdLogs); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkUnbindController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkUnbindService.deleteById(id); + wxCarCmdLogsService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkUnbindController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkUnbindService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCarCmdLogsService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponCarController.java similarity index 58% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java rename to mallinkApi/src/main/java/com/simple/controller/WxCouponCarController.java index 039823b93..6da6ef31d 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponCarController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkMsgSuc; -import com.simple.service.WxEtcpParkMsgSucService; +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("wxEtcpParkMsgSuc") -public class WxEtcpParkMsgSucController extends BaseController +@RequestMapping("wxCouponCar") +public class WxCouponCarController extends BaseController { @Autowired - private WxEtcpParkMsgSucService wxEtcpParkMsgSucService; + private WxCouponCarService wxCouponCarService; - private Logger logger = Logger.getLogger(WxEtcpParkMsgSucController.class); + 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 WxEtcpParkMsgSuc wxEtcpParkMsgSuc,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkMsgSuc) wxEtcpParkMsgSuc = new WxEtcpParkMsgSuc(); - final PageInfo page = wxEtcpParkMsgSucService.listAsPage(wxEtcpParkMsgSuc, pageNum, pageSize); + 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 WxEtcpParkMsgSuc wxEtcpParkMsgSuc) { - //Assert.notNull(wxEtcpParkMsgSuc.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCouponCar wxCouponCar) { + //Assert.notNull(wxCouponCar.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkMsgSucService.saveOrUpdate(wxEtcpParkMsgSuc); + wxCouponCarService.saveOrUpdate(wxCouponCar); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkMsgSuc wxEtcpParkMsgSuc) { - wxEtcpParkMsgSucService.saveOrUpdate(wxEtcpParkMsgSuc); + public ResultData update(@RequestBody WxCouponCar wxCouponCar) { + wxCouponCarService.saveOrUpdate(wxCouponCar); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkMsgSucController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkMsgSucService.deleteById(id); + wxCouponCarService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkMsgSucController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkMsgSucService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarService.getById(id)); } diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkApi/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java similarity index 57% rename from mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java rename to mallinkApi/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java index 872b2c2f4..d96f24a42 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java +++ b/mallinkApi/src/main/java/com/simple/controller/WxCouponCarRecordEtcpController.java @@ -9,45 +9,45 @@ import com.github.pagehelper.PageInfo; import com.simple.common.Result; import com.simple.common.ResultData; -import com.simple.domain.po.WxEtcpParkDissolution; -import com.simple.service.WxEtcpParkDissolutionService; +import com.simple.domain.po.WxCouponCarRecordEtcp; +import com.simple.service.WxCouponCarRecordEtcpService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @RestController -@RequestMapping("wxEtcpParkDissolution") -public class WxEtcpParkDissolutionController extends BaseController +@RequestMapping("wxCouponCarRecordEtcp") +public class WxCouponCarRecordEtcpController extends BaseController { @Autowired - private WxEtcpParkDissolutionService wxEtcpParkDissolutionService; + private WxCouponCarRecordEtcpService wxCouponCarRecordEtcpService; - private Logger logger = Logger.getLogger(WxEtcpParkDissolutionController.class); + private Logger logger = Logger.getLogger(WxCouponCarRecordEtcpController.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 WxEtcpParkDissolution wxEtcpParkDissolution,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkDissolution) wxEtcpParkDissolution = new WxEtcpParkDissolution(); - final PageInfo page = wxEtcpParkDissolutionService.listAsPage(wxEtcpParkDissolution, pageNum, pageSize); + public ResultData list(@ModelAttribute WxCouponCarRecordEtcp wxCouponCarRecordEtcp,Integer pageNum, Integer pageSize) { + if (null == wxCouponCarRecordEtcp) wxCouponCarRecordEtcp = new WxCouponCarRecordEtcp(); + final PageInfo page = wxCouponCarRecordEtcpService.listAsPage(wxCouponCarRecordEtcp, pageNum, pageSize); return new ResultData(page); } @ApiOperation("新增接口") @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkDissolution wxEtcpParkDissolution) { - //Assert.notNull(wxEtcpParkDissolution.getName(), "角色名不能为空"); + public ResultData add(@RequestBody WxCouponCarRecordEtcp wxCouponCarRecordEtcp) { + //Assert.notNull(wxCouponCarRecordEtcp.getName(), "角色名不能为空"); //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkDissolutionService.saveOrUpdate(wxEtcpParkDissolution); + wxCouponCarRecordEtcpService.saveOrUpdate(wxCouponCarRecordEtcp); return new ResultData(); } @ApiOperation("根据id更新接口") @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkDissolution wxEtcpParkDissolution) { - wxEtcpParkDissolutionService.saveOrUpdate(wxEtcpParkDissolution); + public ResultData update(@RequestBody WxCouponCarRecordEtcp wxCouponCarRecordEtcp) { + wxCouponCarRecordEtcpService.saveOrUpdate(wxCouponCarRecordEtcp); return new ResultData(); } @@ -55,7 +55,7 @@ public class WxEtcpParkDissolutionController extends BaseController @GetMapping("/del") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData delete(Long id) { - wxEtcpParkDissolutionService.deleteById(id); + wxCouponCarRecordEtcpService.deleteById(id); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -63,7 +63,7 @@ public class WxEtcpParkDissolutionController extends BaseController @GetMapping("/findById") @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkDissolutionService.getById(id)); + return new ResultData(Result.SUCCESS,"查询成功",wxCouponCarRecordEtcpService.getById(id)); } diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java deleted file mode 100644 index 7bf204bc8..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpCouponRecordController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpCouponRecord; -import com.simple.service.WxEtcpCouponRecordService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpCouponRecord") -public class WxEtcpCouponRecordController extends BaseController -{ - @Autowired - private WxEtcpCouponRecordService wxEtcpCouponRecordService; - - private Logger logger = Logger.getLogger(WxEtcpCouponRecordController.class); - - @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 WxEtcpCouponRecord wxEtcpCouponRecord,Integer pageNum, Integer pageSize) { - if (null == wxEtcpCouponRecord) wxEtcpCouponRecord = new WxEtcpCouponRecord(); - final PageInfo page = wxEtcpCouponRecordService.listAsPage(wxEtcpCouponRecord, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpCouponRecord wxEtcpCouponRecord) { - //Assert.notNull(wxEtcpCouponRecord.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpCouponRecordService.saveOrUpdate(wxEtcpCouponRecord); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpCouponRecord wxEtcpCouponRecord) { - wxEtcpCouponRecordService.saveOrUpdate(wxEtcpCouponRecord); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpCouponRecordService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpCouponRecordService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java deleted file mode 100644 index a39a04321..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkDissolutionController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkDissolution; -import com.simple.service.WxEtcpParkDissolutionService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkDissolution") -public class WxEtcpParkDissolutionController extends BaseController -{ - @Autowired - private WxEtcpParkDissolutionService wxEtcpParkDissolutionService; - - private Logger logger = Logger.getLogger(WxEtcpParkDissolutionController.class); - - @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 WxEtcpParkDissolution wxEtcpParkDissolution,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkDissolution) wxEtcpParkDissolution = new WxEtcpParkDissolution(); - final PageInfo page = wxEtcpParkDissolutionService.listAsPage(wxEtcpParkDissolution, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkDissolution wxEtcpParkDissolution) { - //Assert.notNull(wxEtcpParkDissolution.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkDissolutionService.saveOrUpdate(wxEtcpParkDissolution); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkDissolution wxEtcpParkDissolution) { - wxEtcpParkDissolutionService.saveOrUpdate(wxEtcpParkDissolution); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkDissolutionService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkDissolutionService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java deleted file mode 100644 index 1fd816c91..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkInController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkIn; -import com.simple.service.WxEtcpParkInService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkIn") -public class WxEtcpParkInController extends BaseController -{ - @Autowired - private WxEtcpParkInService wxEtcpParkInService; - - private Logger logger = Logger.getLogger(WxEtcpParkInController.class); - - @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 WxEtcpParkIn wxEtcpParkIn,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkIn) wxEtcpParkIn = new WxEtcpParkIn(); - final PageInfo page = wxEtcpParkInService.listAsPage(wxEtcpParkIn, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkIn wxEtcpParkIn) { - //Assert.notNull(wxEtcpParkIn.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkInService.saveOrUpdate(wxEtcpParkIn); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkIn wxEtcpParkIn) { - wxEtcpParkInService.saveOrUpdate(wxEtcpParkIn); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkInService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkInService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java deleted file mode 100644 index f8175a7fd..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkMsgSucController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkMsgSuc; -import com.simple.service.WxEtcpParkMsgSucService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkMsgSuc") -public class WxEtcpParkMsgSucController extends BaseController -{ - @Autowired - private WxEtcpParkMsgSucService wxEtcpParkMsgSucService; - - private Logger logger = Logger.getLogger(WxEtcpParkMsgSucController.class); - - @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 WxEtcpParkMsgSuc wxEtcpParkMsgSuc,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkMsgSuc) wxEtcpParkMsgSuc = new WxEtcpParkMsgSuc(); - final PageInfo page = wxEtcpParkMsgSucService.listAsPage(wxEtcpParkMsgSuc, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkMsgSuc wxEtcpParkMsgSuc) { - //Assert.notNull(wxEtcpParkMsgSuc.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkMsgSucService.saveOrUpdate(wxEtcpParkMsgSuc); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkMsgSuc wxEtcpParkMsgSuc) { - wxEtcpParkMsgSucService.saveOrUpdate(wxEtcpParkMsgSuc); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkMsgSucService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkMsgSucService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java deleted file mode 100644 index f3cc90dd8..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOrderunpayController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkOrderunpay; -import com.simple.service.WxEtcpParkOrderunpayService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkOrderunpay") -public class WxEtcpParkOrderunpayController extends BaseController -{ - @Autowired - private WxEtcpParkOrderunpayService wxEtcpParkOrderunpayService; - - private Logger logger = Logger.getLogger(WxEtcpParkOrderunpayController.class); - - @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 WxEtcpParkOrderunpay wxEtcpParkOrderunpay,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkOrderunpay) wxEtcpParkOrderunpay = new WxEtcpParkOrderunpay(); - final PageInfo page = wxEtcpParkOrderunpayService.listAsPage(wxEtcpParkOrderunpay, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkOrderunpay wxEtcpParkOrderunpay) { - //Assert.notNull(wxEtcpParkOrderunpay.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkOrderunpayService.saveOrUpdate(wxEtcpParkOrderunpay); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkOrderunpay wxEtcpParkOrderunpay) { - wxEtcpParkOrderunpayService.saveOrUpdate(wxEtcpParkOrderunpay); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkOrderunpayService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOrderunpayService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java deleted file mode 100644 index f17bf75c8..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkOutController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkOut; -import com.simple.service.WxEtcpParkOutService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkOut") -public class WxEtcpParkOutController extends BaseController -{ - @Autowired - private WxEtcpParkOutService wxEtcpParkOutService; - - private Logger logger = Logger.getLogger(WxEtcpParkOutController.class); - - @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 WxEtcpParkOut wxEtcpParkOut,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkOut) wxEtcpParkOut = new WxEtcpParkOut(); - final PageInfo page = wxEtcpParkOutService.listAsPage(wxEtcpParkOut, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkOut wxEtcpParkOut) { - //Assert.notNull(wxEtcpParkOut.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkOutService.saveOrUpdate(wxEtcpParkOut); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkOut wxEtcpParkOut) { - wxEtcpParkOutService.saveOrUpdate(wxEtcpParkOut); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkOutService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkOutService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java deleted file mode 100644 index e7e196e7b..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkTransactionController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkTransaction; -import com.simple.service.WxEtcpParkTransactionService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkTransaction") -public class WxEtcpParkTransactionController extends BaseController -{ - @Autowired - private WxEtcpParkTransactionService wxEtcpParkTransactionService; - - private Logger logger = Logger.getLogger(WxEtcpParkTransactionController.class); - - @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 WxEtcpParkTransaction wxEtcpParkTransaction,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkTransaction) wxEtcpParkTransaction = new WxEtcpParkTransaction(); - final PageInfo page = wxEtcpParkTransactionService.listAsPage(wxEtcpParkTransaction, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkTransaction wxEtcpParkTransaction) { - //Assert.notNull(wxEtcpParkTransaction.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkTransactionService.saveOrUpdate(wxEtcpParkTransaction); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkTransaction wxEtcpParkTransaction) { - wxEtcpParkTransactionService.saveOrUpdate(wxEtcpParkTransaction); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkTransactionService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkTransactionService.getById(id)); - } - - - -} diff --git a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java b/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java deleted file mode 100644 index f7228b97c..000000000 --- a/mallinkApi/src/main/java/com/simple/controller/WxEtcpParkUnbindController.java +++ /dev/null @@ -1,65 +0,0 @@ -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.WxEtcpParkUnbind; -import com.simple.service.WxEtcpParkUnbindService; -import io.swagger.annotations.ApiImplicitParam; -import io.swagger.annotations.ApiImplicitParams; - -@RestController -@RequestMapping("wxEtcpParkUnbind") -public class WxEtcpParkUnbindController extends BaseController -{ - @Autowired - private WxEtcpParkUnbindService wxEtcpParkUnbindService; - - private Logger logger = Logger.getLogger(WxEtcpParkUnbindController.class); - - @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 WxEtcpParkUnbind wxEtcpParkUnbind,Integer pageNum, Integer pageSize) { - if (null == wxEtcpParkUnbind) wxEtcpParkUnbind = new WxEtcpParkUnbind(); - final PageInfo page = wxEtcpParkUnbindService.listAsPage(wxEtcpParkUnbind, pageNum, pageSize); - return new ResultData(page); - } - - @PostMapping("add") - public ResultData add(@RequestBody WxEtcpParkUnbind wxEtcpParkUnbind) { - //Assert.notNull(wxEtcpParkUnbind.getName(), "角色名不能为空"); - //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); - wxEtcpParkUnbindService.saveOrUpdate(wxEtcpParkUnbind); - return new ResultData(); - } - - @PostMapping("update") - public ResultData update(@RequestBody WxEtcpParkUnbind wxEtcpParkUnbind) { - wxEtcpParkUnbindService.saveOrUpdate(wxEtcpParkUnbind); - return new ResultData(); - } - - @GetMapping("/del") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData delete(Long id) { - wxEtcpParkUnbindService.deleteById(id); - return new ResultData(Result.SUCCESS, "删除成功", null); - } - - @GetMapping("/findById") - @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) - public ResultData findById(Long id) { - return new ResultData(Result.SUCCESS,"查询成功",wxEtcpParkUnbindService.getById(id)); - } - - - -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java b/mallinkService/src/main/java/com/simple/domain/po/WxCarCmdLogs.java similarity index 51% rename from mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java rename to mallinkService/src/main/java/com/simple/domain/po/WxCarCmdLogs.java index 28d531318..aa2e1da95 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkIn.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCarCmdLogs.java @@ -8,8 +8,8 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Table(name = "wx_etcp_park_in") -public class WxEtcpParkIn implements Serializable { +@Table(name = "wx_car_cmd_logs") +public class WxCarCmdLogs implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -41,41 +41,59 @@ public class WxEtcpParkIn implements Serializable { - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="synId") - private String synId; + @io.swagger.annotations.ApiModelProperty(value="",name="tenantId") + private String tenantId; + /*停车厂家,1. ETCP,2.停简单**/ + @io.swagger.annotations.ApiModelProperty(value="停车厂家,1. ETCP,2.停简单",name="supportVendor") + private Integer supportVendor; + /*厂家命令名**/ + @io.swagger.annotations.ApiModelProperty(value="厂家命令名",name="cmdType") + private String cmdType; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="plateNumber") - private String plateNumber; - /*车场名称**/ - @io.swagger.annotations.ApiModelProperty(value="车场名称",name="parkName") - private String parkName; + @io.swagger.annotations.ApiModelProperty(value="",name="updateDate") + private Date updateDate; + /*命令请求或者结果及相应花费的时间**/ + @io.swagger.annotations.ApiModelProperty(value="命令请求或者结果及相应花费的时间",name="cmdJson") + private String cmdJson; public String getTenantId() { return tenantId; } public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public String getSynId() { - return synId; + public Integer getSupportVendor() { + return supportVendor; + } + public void setSupportVendor(Integer _supportVendor) { + supportVendor = _supportVendor; + } + public String getCmdType() { + return cmdType; + } + public void setCmdType(String _cmdType) { + cmdType = _cmdType; + } + public Date getCreateDate() { + return createDate; } - public void setSynId(String _synId) { - synId = _synId; + public void setCreateDate(Date _createDate) { + createDate = _createDate; } - public String getPlateNumber() { - return plateNumber; + public Date getUpdateDate() { + return updateDate; } - public void setPlateNumber(String _plateNumber) { - plateNumber = _plateNumber; + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; } - public String getParkName() { - return parkName; + public String getCmdJson() { + return cmdJson; } - public void setParkName(String _parkName) { - parkName = _parkName; + public void setCmdJson(String _cmdJson) { + cmdJson = _cmdJson; } @@ -84,9 +102,11 @@ public class WxEtcpParkIn implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC") - ,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC") - ,ParkName_ASC("`parkName` ASC"),ParkName_DESC("`parkName` DESC") + ,SupportVendor_ASC("`supportVendor` ASC"),SupportVendor_DESC("`supportVendor` DESC") + ,CmdType_ASC("`cmdType` ASC"),CmdType_DESC("`cmdType` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,CmdJson_ASC("`cmdJson` ASC"),CmdJson_DESC("`cmdJson` DESC") ; private String value; Field(String value){ @@ -104,7 +124,7 @@ public class WxEtcpParkIn implements Serializable { } } - public void setSortColumns(WxEtcpParkIn.Field... fields) + public void setSortColumns(WxCarCmdLogs.Field... fields) { if (fields == null || fields.length == 0) { return; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java similarity index 79% rename from mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java rename to mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java index 2f837bc9b..0f352d322 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkMsgSuc.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCar.java @@ -8,8 +8,8 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Table(name = "wx_etcp_park_msg_suc") -public class WxEtcpParkMsgSuc implements Serializable { +@Table(name = "wx_coupon_car") +public class WxCouponCar implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -43,21 +43,21 @@ public class WxEtcpParkMsgSuc implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*签约号**/ - @io.swagger.annotations.ApiModelProperty(value="签约号",name="signNo") - private String signNo; - public String getTenantId() { + private Long tenantId; + /*停车场ID**/ + @io.swagger.annotations.ApiModelProperty(value="停车场ID",name="parkId") + private Long parkId; + public Long getTenantId() { return tenantId; } - public void setTenantId(String _tenantId) { + public void setTenantId(Long _tenantId) { tenantId = _tenantId; } - public String getSignNo() { - return signNo; + public Long getParkId() { + return parkId; } - public void setSignNo(String _signNo) { - signNo = _signNo; + public void setParkId(Long _parkId) { + parkId = _parkId; } @@ -66,7 +66,7 @@ public class WxEtcpParkMsgSuc implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,SignNo_ASC("`signNo` ASC"),SignNo_DESC("`signNo` DESC") + ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC") ; private String value; Field(String value){ @@ -84,7 +84,7 @@ public class WxEtcpParkMsgSuc implements Serializable { } } - public void setSortColumns(WxEtcpParkMsgSuc.Field... fields) + public void setSortColumns(WxCouponCar.Field... fields) { if (fields == null || fields.length == 0) { return; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCarRecordEtcp.java similarity index 83% rename from mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java rename to mallinkService/src/main/java/com/simple/domain/po/WxCouponCarRecordEtcp.java index df33280b0..c129890bb 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpCouponRecord.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxCouponCarRecordEtcp.java @@ -8,8 +8,8 @@ import java.util.List; import javax.persistence.Id; import java.io.Serializable; -@Table(name = "wx_etcp_coupon_record") -public class WxEtcpCouponRecord implements Serializable { +@Table(name = "wx_coupon_car_record_etcp") +public class WxCouponCarRecordEtcp implements Serializable { private static final long serialVersionUID = 1L; @Id @@ -47,15 +47,18 @@ public class WxEtcpCouponRecord implements Serializable { /*coupon id**/ @io.swagger.annotations.ApiModelProperty(value="coupon id",name="couponId") private Long couponId; - /*车牌号**/ - @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") - private String carNumber; /*etcp 车场标识**/ @io.swagger.annotations.ApiModelProperty(value="etcp 车场标识",name="parkId") private String parkId; - /*etcp 优免商户标识**/ - @io.swagger.annotations.ApiModelProperty(value="etcp 优免商户标识",name="businessId") - private String businessId; + /*车牌号**/ + @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") + private String carNumber; + /*etcp 优免商户标识 bussinessId**/ + @io.swagger.annotations.ApiModelProperty(value="etcp 优免商户标识 bussinessId",name="etcpMerchantId") + private String etcpMerchantId; + /*第三方厂家信息**/ + @io.swagger.annotations.ApiModelProperty(value="第三方厂家信息",name="vendorInfos") + private String vendorInfos; /*优免模板 ID**/ @io.swagger.annotations.ApiModelProperty(value="优免模板 ID",name="couponFreeId") private Integer couponFreeId; @@ -83,23 +86,29 @@ public class WxEtcpCouponRecord implements Serializable { public void setCouponId(Long _couponId) { couponId = _couponId; } + public String getParkId() { + return parkId; + } + public void setParkId(String _parkId) { + parkId = _parkId; + } public String getCarNumber() { return carNumber; } public void setCarNumber(String _carNumber) { carNumber = _carNumber; } - public String getParkId() { - return parkId; + public String getEtcpMerchantId() { + return etcpMerchantId; } - public void setParkId(String _parkId) { - parkId = _parkId; + public void setEtcpMerchantId(String _etcpMerchantId) { + etcpMerchantId = _etcpMerchantId; } - public String getBusinessId() { - return businessId; + public String getVendorInfos() { + return vendorInfos; } - public void setBusinessId(String _businessId) { - businessId = _businessId; + public void setVendorInfos(String _vendorInfos) { + vendorInfos = _vendorInfos; } public Integer getCouponFreeId() { return couponFreeId; @@ -139,9 +148,10 @@ public class WxEtcpCouponRecord implements Serializable { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,CouponId_ASC("`couponId` ASC"),CouponId_DESC("`couponId` DESC") - ,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC") ,ParkId_ASC("`parkId` ASC"),ParkId_DESC("`parkId` DESC") - ,BusinessId_ASC("`businessId` ASC"),BusinessId_DESC("`businessId` DESC") + ,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC") + ,EtcpMerchantId_ASC("`etcpMerchantId` ASC"),EtcpMerchantId_DESC("`etcpMerchantId` DESC") + ,VendorInfos_ASC("`vendorInfos` ASC"),VendorInfos_DESC("`vendorInfos` DESC") ,CouponFreeId_ASC("`couponFreeId` ASC"),CouponFreeId_DESC("`couponFreeId` DESC") ,Code_ASC("`code` ASC"),Code_DESC("`code` DESC") ,Message_ASC("`message` ASC"),Message_DESC("`message` DESC") @@ -164,7 +174,7 @@ public class WxEtcpCouponRecord implements Serializable { } } - public void setSortColumns(WxEtcpCouponRecord.Field... fields) + public void setSortColumns(WxCouponCarRecordEtcp.Field... fields) { if (fields == null || fields.length == 0) { return; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java deleted file mode 100644 index 2978421cb..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkDissolution.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_etcp_park_dissolution") -public class WxEtcpParkDissolution implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /* 签约号**/ - @io.swagger.annotations.ApiModelProperty(value=" 签约号",name="signNo") - private String signNo; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getSignNo() { - return signNo; - } - public void setSignNo(String _signNo) { - signNo = _signNo; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,SignNo_ASC("`signNo` ASC"),SignNo_DESC("`signNo` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxEtcpParkDissolution.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java deleted file mode 100644 index 355a523c4..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOrderunpay.java +++ /dev/null @@ -1,291 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_etcp_park_orderunpay") -public class WxEtcpParkOrderunpay implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*车牌号**/ - @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber") - private String plateNumber; - /*停车费查询code**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询code",name="code") - private Integer code; - /*停车费查询message**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询message",name="message") - private String message; - /*停车费查询data**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询data",name="data") - private String data; - /*入场时间**/ - @io.swagger.annotations.ApiModelProperty(value="入场时间",name="entranceTime") - private String entranceTime; - /*总停车费**/ - @io.swagger.annotations.ApiModelProperty(value="总停车费",name="parkingFee") - private BigDecimal parkingFee; - /*剩余代缴停车费**/ - @io.swagger.annotations.ApiModelProperty(value="剩余代缴停车费",name="remainingFee") - private BigDecimal remainingFee; - /*已缴停车费**/ - @io.swagger.annotations.ApiModelProperty(value="已缴停车费",name="paidFee") - private BigDecimal paidFee; - /*车场 ID**/ - @io.swagger.annotations.ApiModelProperty(value="车场 ID",name="parkingId") - private String parkingId; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="discountAmount") - private BigDecimal discountAmount; - /*停车记录订单号**/ - @io.swagger.annotations.ApiModelProperty(value="停车记录订单号",name="orderId") - private String orderId; - /*车牌号**/ - @io.swagger.annotations.ApiModelProperty(value="车牌号",name="carNumber") - private String carNumber; - /*验证信息**/ - @io.swagger.annotations.ApiModelProperty(value="验证信息",name="verificationInfo") - private String verificationInfo; - /*停车记录标识**/ - @io.swagger.annotations.ApiModelProperty(value="停车记录标识",name="synId") - private String synId; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="discountNo") - private Integer discountNo; - /*状态(1.停车费拉取,2.)**/ - @io.swagger.annotations.ApiModelProperty(value="状态(1.停车费拉取,2.)",name="status") - private Integer status; - /*创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; - /*更新时间**/ - @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") - private Date updateDate; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getPlateNumber() { - return plateNumber; - } - public void setPlateNumber(String _plateNumber) { - plateNumber = _plateNumber; - } - public Integer getCode() { - return code; - } - public void setCode(Integer _code) { - code = _code; - } - public String getMessage() { - return message; - } - public void setMessage(String _message) { - message = _message; - } - public String getData() { - return data; - } - public void setData(String _data) { - data = _data; - } - public String getEntranceTime() { - return entranceTime; - } - public void setEntranceTime(String _entranceTime) { - entranceTime = _entranceTime; - } - public BigDecimal getParkingFee() { - return parkingFee; - } - public void setParkingFee(BigDecimal _parkingFee) { - parkingFee = _parkingFee; - } - public BigDecimal getRemainingFee() { - return remainingFee; - } - public void setRemainingFee(BigDecimal _remainingFee) { - remainingFee = _remainingFee; - } - public BigDecimal getPaidFee() { - return paidFee; - } - public void setPaidFee(BigDecimal _paidFee) { - paidFee = _paidFee; - } - public String getParkingId() { - return parkingId; - } - public void setParkingId(String _parkingId) { - parkingId = _parkingId; - } - public BigDecimal getDiscountAmount() { - return discountAmount; - } - public void setDiscountAmount(BigDecimal _discountAmount) { - discountAmount = _discountAmount; - } - public String getOrderId() { - return orderId; - } - public void setOrderId(String _orderId) { - orderId = _orderId; - } - public String getCarNumber() { - return carNumber; - } - public void setCarNumber(String _carNumber) { - carNumber = _carNumber; - } - public String getVerificationInfo() { - return verificationInfo; - } - public void setVerificationInfo(String _verificationInfo) { - verificationInfo = _verificationInfo; - } - public String getSynId() { - return synId; - } - public void setSynId(String _synId) { - synId = _synId; - } - public Integer getDiscountNo() { - return discountNo; - } - public void setDiscountNo(Integer _discountNo) { - discountNo = _discountNo; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC") - ,Code_ASC("`code` ASC"),Code_DESC("`code` DESC") - ,Message_ASC("`message` ASC"),Message_DESC("`message` DESC") - ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") - ,EntranceTime_ASC("`entranceTime` ASC"),EntranceTime_DESC("`entranceTime` DESC") - ,ParkingFee_ASC("`parkingFee` ASC"),ParkingFee_DESC("`parkingFee` DESC") - ,RemainingFee_ASC("`remainingFee` ASC"),RemainingFee_DESC("`remainingFee` DESC") - ,PaidFee_ASC("`paidFee` ASC"),PaidFee_DESC("`paidFee` DESC") - ,ParkingId_ASC("`parkingId` ASC"),ParkingId_DESC("`parkingId` DESC") - ,DiscountAmount_ASC("`discountAmount` ASC"),DiscountAmount_DESC("`discountAmount` DESC") - ,OrderId_ASC("`orderId` ASC"),OrderId_DESC("`orderId` DESC") - ,CarNumber_ASC("`carNumber` ASC"),CarNumber_DESC("`carNumber` DESC") - ,VerificationInfo_ASC("`verificationInfo` ASC"),VerificationInfo_DESC("`verificationInfo` DESC") - ,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC") - ,DiscountNo_ASC("`discountNo` ASC"),DiscountNo_DESC("`discountNo` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxEtcpParkOrderunpay.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java deleted file mode 100644 index b48fc4751..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkOut.java +++ /dev/null @@ -1,141 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_etcp_park_out") -public class WxEtcpParkOut implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*ETCP订单ID**/ - @io.swagger.annotations.ApiModelProperty(value="ETCP订单ID",name="synId") - private String synId; - /*车牌号**/ - @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber") - private String plateNumber; - /*车场名**/ - @io.swagger.annotations.ApiModelProperty(value="车场名",name="parkName") - private String parkName; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getSynId() { - return synId; - } - public void setSynId(String _synId) { - synId = _synId; - } - public String getPlateNumber() { - return plateNumber; - } - public void setPlateNumber(String _plateNumber) { - plateNumber = _plateNumber; - } - public String getParkName() { - return parkName; - } - public void setParkName(String _parkName) { - parkName = _parkName; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC") - ,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC") - ,ParkName_ASC("`parkName` ASC"),ParkName_DESC("`parkName` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxEtcpParkOut.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java deleted file mode 100644 index c0ffea8d1..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkTransaction.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_etcp_park_transaction") -public class WxEtcpParkTransaction implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)**/ - @io.swagger.annotations.ApiModelProperty(value="支付方式(1 微信公众号内支付2 支付宝 H5 支付 3 微信二维码4 支付宝二维码 5 微信 H5)",name="payType") - private Integer payType; - /*停车记录标识(查费接口中的 返回的 orderId 字段)**/ - @io.swagger.annotations.ApiModelProperty(value="停车记录标识(查费接口中的 返回的 orderId 字段)",name="synId") - private String synId; - /*支付完成后跳转地址 ,支付方 式为 1,2,5 时候需要**/ - @io.swagger.annotations.ApiModelProperty(value="支付完成后跳转地址 ,支付方 式为 1,2,5 时候需要",name="returnUrl") - private String returnUrl; - /*优惠券code**/ - @io.swagger.annotations.ApiModelProperty(value="优惠券code",name="couponCode") - private String couponCode; - /*停车费查询结果code**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询结果code",name="code") - private Integer code; - /*停车费查询结果message**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询结果message",name="message") - private String message; - /*停车费查询data**/ - @io.swagger.annotations.ApiModelProperty(value="停车费查询data",name="data") - private String data; - /*状态(1.主动支付开始,2.拉起支付h5,3.支付Cancel,4.支付完成)**/ - @io.swagger.annotations.ApiModelProperty(value="状态(1.主动支付开始,2.拉起支付h5,3.支付Cancel,4.支付完成)",name="status") - private Integer status; - /*创建时间**/ - @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") - private Date createDate; - /*更新时间**/ - @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") - private Date updateDate; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public Integer getPayType() { - return payType; - } - public void setPayType(Integer _payType) { - payType = _payType; - } - public String getSynId() { - return synId; - } - public void setSynId(String _synId) { - synId = _synId; - } - public String getReturnUrl() { - return returnUrl; - } - public void setReturnUrl(String _returnUrl) { - returnUrl = _returnUrl; - } - public String getCouponCode() { - return couponCode; - } - public void setCouponCode(String _couponCode) { - couponCode = _couponCode; - } - public Integer getCode() { - return code; - } - public void setCode(Integer _code) { - code = _code; - } - public String getMessage() { - return message; - } - public void setMessage(String _message) { - message = _message; - } - public String getData() { - return data; - } - public void setData(String _data) { - data = _data; - } - public Integer getStatus() { - return status; - } - public void setStatus(Integer _status) { - status = _status; - } - public Date getCreateDate() { - return createDate; - } - public void setCreateDate(Date _createDate) { - createDate = _createDate; - } - public Date getUpdateDate() { - return updateDate; - } - public void setUpdateDate(Date _updateDate) { - updateDate = _updateDate; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,PayType_ASC("`payType` ASC"),PayType_DESC("`payType` DESC") - ,SynId_ASC("`synId` ASC"),SynId_DESC("`synId` DESC") - ,ReturnUrl_ASC("`returnUrl` ASC"),ReturnUrl_DESC("`returnUrl` DESC") - ,CouponCode_ASC("`couponCode` ASC"),CouponCode_DESC("`couponCode` DESC") - ,Code_ASC("`code` ASC"),Code_DESC("`code` DESC") - ,Message_ASC("`message` ASC"),Message_DESC("`message` DESC") - ,Data_ASC("`data` ASC"),Data_DESC("`data` DESC") - ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") - ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") - ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxEtcpParkTransaction.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java b/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java deleted file mode 100644 index 2ff699df5..000000000 --- a/mallinkService/src/main/java/com/simple/domain/po/WxEtcpParkUnbind.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.simple.domain.po; - -import javax.persistence.*; -import java.util.*; -import java.math.*; -import javax.persistence.Transient; -import java.util.List; -import javax.persistence.Id; -import java.io.Serializable; - -@Table(name = "wx_etcp_park_unbind") -public class WxEtcpParkUnbind implements Serializable { - private static final long serialVersionUID = 1L; - - @Id - protected Long id; - - @Transient - protected List ids; - @Transient - protected String sortColumns; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getSortColumns() { - return sortColumns; - } - - public List getIds() { - return ids; - } - public void setIds(List ids) { - this.ids = ids; - } - - - - /*租户ID**/ - @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") - private String tenantId; - /*车牌号**/ - @io.swagger.annotations.ApiModelProperty(value="车牌号",name="plateNumber") - private String plateNumber; - public String getTenantId() { - return tenantId; - } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; - } - public String getPlateNumber() { - return plateNumber; - } - public void setPlateNumber(String _plateNumber) { - plateNumber = _plateNumber; - } - - - - public static enum Field - { - Id_ASC("`id` ASC"),Id_DESC("`id` DESC") - ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,PlateNumber_ASC("`plateNumber` ASC"),PlateNumber_DESC("`plateNumber` DESC") - ; - private String value; - Field(String value){ - this.value = value; - } - public String getValue() { - return value; - } - public void setCol(String value) { - this.value = value; - } - @Override - public String toString() { - return this.getValue(); - } - } - - public void setSortColumns(WxEtcpParkUnbind.Field... fields) - { - if (fields == null || fields.length == 0) { - return; - } - for (int k = 0; k < fields.length; k++) { - if (fields[k] == null) { - return; - } - } - StringBuilder sb = new StringBuilder(fields[0].toString()); - for (int k = 1; k < fields.length; k++) { - sb.append(","); - sb.append(fields[k].toString()); - } - - } - - public void setSortColumns(String sortColumns) - { - if (sortColumns == null || "".equals(sortColumns.trim())) { - return; - } - if (sortColumns.contains(",")) { - String[] cols = sortColumns.split(","); - java.util.List fList = new java.util.ArrayList(); - for (int k = 0; k < cols.length; k++) { - fList.add(Field.valueOf(cols[k])); - } - this.setSortColumns(fList.toArray(new Field[fList.size()])); - } else { - this.setSortColumns(Field.valueOf(sortColumns)); - } - } -} diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java index 53b14ac5e..c34c957e2 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxMerchantShop.java @@ -50,6 +50,18 @@ public class WxMerchantShop implements Serializable { /*商铺ID**/ @io.swagger.annotations.ApiModelProperty(value="商铺ID",name="shopId") private Long shopId; + /*创建时间**/ + @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") + private Date createDate; + /*更新时间**/ + @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") + private Date updateDate; + /*租期开始时间**/ + @io.swagger.annotations.ApiModelProperty(value="租期开始时间",name="rentalStartDate") + private Date rentalStartDate; + /*租期结束时间**/ + @io.swagger.annotations.ApiModelProperty(value="租期结束时间",name="rentalEndDate") + private Date rentalEndDate; public String getTenantId() { return tenantId; } @@ -68,6 +80,30 @@ public class WxMerchantShop implements Serializable { public void setShopId(Long _shopId) { shopId = _shopId; } + public Date getCreateDate() { + return createDate; + } + public void setCreateDate(Date _createDate) { + createDate = _createDate; + } + public Date getUpdateDate() { + return updateDate; + } + public void setUpdateDate(Date _updateDate) { + updateDate = _updateDate; + } + public Date getRentalStartDate() { + return rentalStartDate; + } + public void setRentalStartDate(Date _rentalStartDate) { + rentalStartDate = _rentalStartDate; + } + public Date getRentalEndDate() { + return rentalEndDate; + } + public void setRentalEndDate(Date _rentalEndDate) { + rentalEndDate = _rentalEndDate; + } @@ -77,6 +113,10 @@ public class WxMerchantShop implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,MerchantId_ASC("`merchantId` ASC"),MerchantId_DESC("`merchantId` DESC") ,ShopId_ASC("`shopId` ASC"),ShopId_DESC("`shopId` DESC") + ,CreateDate_ASC("`createDate` ASC"),CreateDate_DESC("`createDate` DESC") + ,UpdateDate_ASC("`updateDate` ASC"),UpdateDate_DESC("`updateDate` DESC") + ,RentalStartDate_ASC("`rentalStartDate` ASC"),RentalStartDate_DESC("`rentalStartDate` DESC") + ,RentalEndDate_ASC("`rentalEndDate` ASC"),RentalEndDate_DESC("`rentalEndDate` DESC") ; private String value; Field(String value){ diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java index 87b3e2ca5..628d5d12e 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxPark.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxPark.java @@ -50,9 +50,6 @@ public class WxPark implements Serializable { /*车位数**/ @io.swagger.annotations.ApiModelProperty(value="车位数",name="number") private Integer number; - /*etcp parkId**/ - @io.swagger.annotations.ApiModelProperty(value="etcp parkId",name="etcpParkId") - private String etcpParkId; /*出入口数量**/ @io.swagger.annotations.ApiModelProperty(value="出入口数量",name="entryExit") private Integer entryExit; @@ -74,12 +71,6 @@ public class WxPark implements Serializable { public void setNumber(Integer _number) { number = _number; } - public String getEtcpParkId() { - return etcpParkId; - } - public void setEtcpParkId(String _etcpParkId) { - etcpParkId = _etcpParkId; - } public Integer getEntryExit() { return entryExit; } @@ -95,7 +86,6 @@ public class WxPark implements Serializable { ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") ,Addr_ASC("`addr` ASC"),Addr_DESC("`addr` DESC") ,Number_ASC("`number` ASC"),Number_DESC("`number` DESC") - ,EtcpParkId_ASC("`etcpParkId` ASC"),EtcpParkId_DESC("`etcpParkId` DESC") ,EntryExit_ASC("`entryExit` ASC"),EntryExit_DESC("`entryExit` DESC") ; private String value; diff --git a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java index a9b589712..134ec6c7c 100644 --- a/mallinkService/src/main/java/com/simple/domain/po/WxShop.java +++ b/mallinkService/src/main/java/com/simple/domain/po/WxShop.java @@ -44,9 +44,9 @@ public class WxShop implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; - /*商铺名**/ - @io.swagger.annotations.ApiModelProperty(value="商铺名",name="title") - private String title; + /*商铺编号**/ + @io.swagger.annotations.ApiModelProperty(value="商铺编号",name="shopNumber") + private String shopNumber; /*建筑面积**/ @io.swagger.annotations.ApiModelProperty(value="建筑面积",name="buildArea") private String buildArea; @@ -56,9 +56,12 @@ public class WxShop implements Serializable { /*楼座号**/ @io.swagger.annotations.ApiModelProperty(value="楼座号",name="building") private String building; - /***/ - @io.swagger.annotations.ApiModelProperty(value="",name="floor") + /*楼层号**/ + @io.swagger.annotations.ApiModelProperty(value="楼层号",name="floor") private Integer floor; + /*状态(0:未出租, 1:已出租)**/ + @io.swagger.annotations.ApiModelProperty(value="状态(0:未出租, 1:已出租)",name="status") + private Integer status; /*店铺相对位置x**/ @io.swagger.annotations.ApiModelProperty(value="店铺相对位置x",name="x") private BigDecimal x; @@ -80,11 +83,11 @@ public class WxShop implements Serializable { public void setTenantId(String _tenantId) { tenantId = _tenantId; } - public String getTitle() { - return title; + public String getShopNumber() { + return shopNumber; } - public void setTitle(String _title) { - title = _title; + public void setShopNumber(String _shopNumber) { + shopNumber = _shopNumber; } public String getBuildArea() { return buildArea; @@ -110,6 +113,12 @@ public class WxShop implements Serializable { public void setFloor(Integer _floor) { floor = _floor; } + public Integer getStatus() { + return status; + } + public void setStatus(Integer _status) { + status = _status; + } public BigDecimal getX() { return x; } @@ -147,11 +156,12 @@ public class WxShop implements Serializable { { Id_ASC("`id` ASC"),Id_DESC("`id` DESC") ,TenantId_ASC("`tenantId` ASC"),TenantId_DESC("`tenantId` DESC") - ,Title_ASC("`title` ASC"),Title_DESC("`title` DESC") + ,ShopNumber_ASC("`shopNumber` ASC"),ShopNumber_DESC("`shopNumber` DESC") ,BuildArea_ASC("`buildArea` ASC"),BuildArea_DESC("`buildArea` DESC") ,OperationArea_ASC("`operationArea` ASC"),OperationArea_DESC("`operationArea` DESC") ,Building_ASC("`building` ASC"),Building_DESC("`building` DESC") ,Floor_ASC("`floor` ASC"),Floor_DESC("`floor` DESC") + ,Status_ASC("`status` ASC"),Status_DESC("`status` DESC") ,X_ASC("`x` ASC"),X_DESC("`x` DESC") ,Y_ASC("`y` ASC"),Y_DESC("`y` DESC") ,BaiduPoi_ASC("`baiduPoi` ASC"),BaiduPoi_DESC("`baiduPoi` DESC") diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogsMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogsMapper.java new file mode 100644 index 000000000..44f6af535 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCarCmdLogsMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxCarCmdLogs; + +public interface WxCarCmdLogsMapper extends CommonMapper { + + List findList(WxCarCmdLogs wxCarCmdLogs); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponCarMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponCarMapper.java new file mode 100644 index 000000000..5421db797 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponCarMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxCouponCar; + +public interface WxCouponCarMapper extends CommonMapper { + + List findList(WxCouponCar wxCouponCar); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponCarRecordEtcpMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponCarRecordEtcpMapper.java new file mode 100644 index 000000000..6e0c768a0 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponCarRecordEtcpMapper.java @@ -0,0 +1,17 @@ +package com.simple.mapper; + +import java.util.*; +import com.simple.common.CommonMapper; +import org.apache.ibatis.annotations.Param; +import com.simple.domain.po.WxCouponCarRecordEtcp; + +public interface WxCouponCarRecordEtcpMapper extends CommonMapper { + + List findList(WxCouponCarRecordEtcp wxCouponCarRecordEtcp); + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java deleted file mode 100644 index da5ab6282..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpCouponRecordMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpCouponRecord; - -public interface WxEtcpCouponRecordMapper extends CommonMapper { - - List findList(WxEtcpCouponRecord wxEtcpCouponRecord); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java deleted file mode 100644 index 4deb06e47..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkDissolutionMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkDissolution; - -public interface WxEtcpParkDissolutionMapper extends CommonMapper { - - List findList(WxEtcpParkDissolution wxEtcpParkDissolution); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java deleted file mode 100644 index 50b17f257..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkInMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkIn; - -public interface WxEtcpParkInMapper extends CommonMapper { - - List findList(WxEtcpParkIn wxEtcpParkIn); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java deleted file mode 100644 index 229c065c8..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkMsgSucMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkMsgSuc; - -public interface WxEtcpParkMsgSucMapper extends CommonMapper { - - List findList(WxEtcpParkMsgSuc wxEtcpParkMsgSuc); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java deleted file mode 100644 index 44ce3be35..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOrderunpayMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkOrderunpay; - -public interface WxEtcpParkOrderunpayMapper extends CommonMapper { - - List findList(WxEtcpParkOrderunpay wxEtcpParkOrderunpay); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java deleted file mode 100644 index 7e963c809..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkOutMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkOut; - -public interface WxEtcpParkOutMapper extends CommonMapper { - - List findList(WxEtcpParkOut wxEtcpParkOut); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java deleted file mode 100644 index 08d154ca2..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkTransactionMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkTransaction; - -public interface WxEtcpParkTransactionMapper extends CommonMapper { - - List findList(WxEtcpParkTransaction wxEtcpParkTransaction); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java deleted file mode 100644 index 4c0dce2de..000000000 --- a/mallinkService/src/main/java/com/simple/mapper/WxEtcpParkUnbindMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.simple.mapper; - -import java.util.*; -import com.simple.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxEtcpParkUnbind; - -public interface WxEtcpParkUnbindMapper extends CommonMapper { - - List findList(WxEtcpParkUnbind wxEtcpParkUnbind); - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java index 24c3e48c1..9f4242bdb 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserCarsService.java @@ -10,8 +10,8 @@ public interface WxCUserCarsService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCUserCars record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java b/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java index b5a84f2c8..c6effe153 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCUserEtcpTokenService.java @@ -10,8 +10,8 @@ public interface WxCUserEtcpTokenService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxCUserEtcpToken record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java b/mallinkService/src/main/java/com/simple/service/WxCarCmdLogsService.java similarity index 64% rename from mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java rename to mallinkService/src/main/java/com/simple/service/WxCarCmdLogsService.java index 4143a6dfa..94986e923 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkInService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCarCmdLogsService.java @@ -2,19 +2,19 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkIn; +import com.simple.domain.po.WxCarCmdLogs; -public interface WxEtcpParkInService { +public interface WxCarCmdLogsService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ - PageInfo listAsPage(WxEtcpParkIn record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCarCmdLogs record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,14 +22,14 @@ public interface WxEtcpParkInService { * @param id * @return */ - WxEtcpParkIn getById(Long id); + WxCarCmdLogs getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(WxEtcpParkIn record); + void saveOrUpdate(WxCarCmdLogs record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java b/mallinkService/src/main/java/com/simple/service/WxCouponCarRecordEtcpService.java similarity index 56% rename from mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java rename to mallinkService/src/main/java/com/simple/service/WxCouponCarRecordEtcpService.java index 1a58f0fe9..6e9aa2489 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpCouponRecordService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponCarRecordEtcpService.java @@ -2,19 +2,19 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpCouponRecord; +import com.simple.domain.po.WxCouponCarRecordEtcp; -public interface WxEtcpCouponRecordService { +public interface WxCouponCarRecordEtcpService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ - PageInfo listAsPage(WxEtcpCouponRecord record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCouponCarRecordEtcp record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,14 +22,14 @@ public interface WxEtcpCouponRecordService { * @param id * @return */ - WxEtcpCouponRecord getById(Long id); + WxCouponCarRecordEtcp getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(WxEtcpCouponRecord record); + void saveOrUpdate(WxCouponCarRecordEtcp record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java b/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java similarity index 60% rename from mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java rename to mallinkService/src/main/java/com/simple/service/WxCouponCarService.java index 02a90e5ee..6aca30ceb 100644 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOutService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponCarService.java @@ -2,19 +2,19 @@ package com.simple.service; import java.util.*; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkOut; +import com.simple.domain.po.WxCouponCar; -public interface WxEtcpParkOutService { +public interface WxCouponCarService { /** * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ - PageInfo listAsPage(WxEtcpParkOut record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCouponCar record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,14 +22,14 @@ public interface WxEtcpParkOutService { * @param id * @return */ - WxEtcpParkOut getById(Long id); + WxCouponCar getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(WxEtcpParkOut record); + void saveOrUpdate(WxCouponCar record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java deleted file mode 100644 index a17ea342b..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkDissolutionService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkDissolution; - -public interface WxEtcpParkDissolutionService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxEtcpParkDissolution record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEtcpParkDissolution getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxEtcpParkDissolution record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java deleted file mode 100644 index 364b7f2ef..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkMsgSucService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkMsgSuc; - -public interface WxEtcpParkMsgSucService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxEtcpParkMsgSuc record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEtcpParkMsgSuc getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxEtcpParkMsgSuc record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java deleted file mode 100644 index 4d1989de6..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkOrderunpayService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkOrderunpay; - -public interface WxEtcpParkOrderunpayService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxEtcpParkOrderunpay record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEtcpParkOrderunpay getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxEtcpParkOrderunpay record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java deleted file mode 100644 index f068b4d40..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkTransactionService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkTransaction; - -public interface WxEtcpParkTransactionService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxEtcpParkTransaction record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEtcpParkTransaction getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxEtcpParkTransaction record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java b/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java deleted file mode 100644 index e542e88f9..000000000 --- a/mallinkService/src/main/java/com/simple/service/WxEtcpParkUnbindService.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.simple.service; - -import java.util.*; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkUnbind; - -public interface WxEtcpParkUnbindService { - - /** - * 根据实体查询分页列表 - * - * @param record - * @param offset - * @param limit - * @return - */ - PageInfo listAsPage(WxEtcpParkUnbind record, Integer pageIndex, Integer pageSize); - - /** - * 根据Id获得实体 - * - * @param id - * @return - */ - WxEtcpParkUnbind getById(Long id); - - /** - * 保存或更新实体 - * - * @param record - */ - void saveOrUpdate(WxEtcpParkUnbind record); - - /** - * 根据Id删除实体 - * - * @param id - */ - void deleteById(Long id); - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java b/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java index 4cb2d370e..88e6eec57 100644 --- a/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java +++ b/mallinkService/src/main/java/com/simple/service/WxImgUrlService.java @@ -10,8 +10,8 @@ public interface WxImgUrlService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxImgUrl record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java b/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java index fff35b971..befb50bb7 100644 --- a/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java +++ b/mallinkService/src/main/java/com/simple/service/WxParkEtcpService.java @@ -10,8 +10,8 @@ public interface WxParkEtcpService { * 根据实体查询分页列表 * * @param record - * @param offset - * @param limit + * @param pageIndex + * @param pageSize * @return */ PageInfo listAsPage(WxParkEtcp record, Integer pageIndex, Integer pageSize); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java similarity index 54% rename from mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java rename to mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java index da9100039..7d2ac8975 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkInServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCarCmdLogsServiceImpl.java @@ -3,45 +3,45 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkIn; -import com.simple.mapper.WxEtcpParkInMapper; -import com.simple.service.WxEtcpParkInService; +import com.simple.domain.po.WxCarCmdLogs; +import com.simple.mapper.WxCarCmdLogsMapper; +import com.simple.service.WxCarCmdLogsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; @Service -public class WxEtcpParkInServiceImpl implements WxEtcpParkInService { +public class WxCarCmdLogsServiceImpl implements WxCarCmdLogsService { @Autowired - WxEtcpParkInMapper wxEtcpParkInMapper; + WxCarCmdLogsMapper wxCarCmdLogsMapper; @Override - public PageInfo listAsPage(WxEtcpParkIn record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkInMapper.findList(record)); + public PageInfo listAsPage(WxCarCmdLogs record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCarCmdLogsMapper.findList(record)); } @Override - public WxEtcpParkIn getById(Long id) { - return wxEtcpParkInMapper.selectByPrimaryKey(id); + public WxCarCmdLogs getById(Long id) { + return wxCarCmdLogsMapper.selectByPrimaryKey(id); } @Override - public void saveOrUpdate(WxEtcpParkIn record) { + public void saveOrUpdate(WxCarCmdLogs record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); IdWorker idWorker = new IdWorker(0, 0); record.setId(idWorker.nextId()); - wxEtcpParkInMapper.insertSelective(record); + wxCarCmdLogsMapper.insertSelective(record); } else { - wxEtcpParkInMapper.updateByPrimaryKeySelective(record); + wxCarCmdLogsMapper.updateByPrimaryKeySelective(record); } } @Override public void deleteById(Long id) { - wxEtcpParkInMapper.deleteByPrimaryKey(id); + wxCarCmdLogsMapper.deleteByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarRecordEtcpServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarRecordEtcpServiceImpl.java new file mode 100644 index 000000000..b49380fd2 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarRecordEtcpServiceImpl.java @@ -0,0 +1,54 @@ +package com.simple.service.impl; + +import java.util.*; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.simple.domain.po.WxCouponCarRecordEtcp; +import com.simple.mapper.WxCouponCarRecordEtcpMapper; +import com.simple.service.WxCouponCarRecordEtcpService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.simple.common.IdWorker; + +@Service +public class WxCouponCarRecordEtcpServiceImpl implements WxCouponCarRecordEtcpService { + + @Autowired + WxCouponCarRecordEtcpMapper wxCouponCarRecordEtcpMapper; + + + @Override + public PageInfo listAsPage(WxCouponCarRecordEtcp record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponCarRecordEtcpMapper.findList(record)); + } + + @Override + public WxCouponCarRecordEtcp getById(Long id) { + return wxCouponCarRecordEtcpMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCouponCarRecordEtcp record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + IdWorker idWorker = new IdWorker(0, 0); + record.setId(idWorker.nextId()); + wxCouponCarRecordEtcpMapper.insertSelective(record); + } else { + wxCouponCarRecordEtcpMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxCouponCarRecordEtcpMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java similarity index 50% rename from mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java rename to mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java index 6e6e5dd9b..4a753534d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOutServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponCarServiceImpl.java @@ -3,45 +3,45 @@ package com.simple.service.impl; import java.util.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkOut; -import com.simple.mapper.WxEtcpParkOutMapper; -import com.simple.service.WxEtcpParkOutService; +import com.simple.domain.po.WxCouponCar; +import com.simple.mapper.WxCouponCarMapper; +import com.simple.service.WxCouponCarService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.simple.common.IdWorker; @Service -public class WxEtcpParkOutServiceImpl implements WxEtcpParkOutService { +public class WxCouponCarServiceImpl implements WxCouponCarService { @Autowired - WxEtcpParkOutMapper wxEtcpParkOutMapper; + WxCouponCarMapper wxCouponCarMapper; @Override - public PageInfo listAsPage(WxEtcpParkOut record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkOutMapper.findList(record)); + public PageInfo listAsPage(WxCouponCar record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponCarMapper.findList(record)); } @Override - public WxEtcpParkOut getById(Long id) { - return wxEtcpParkOutMapper.selectByPrimaryKey(id); + public WxCouponCar getById(Long id) { + return wxCouponCarMapper.selectByPrimaryKey(id); } @Override - public void saveOrUpdate(WxEtcpParkOut record) { + public void saveOrUpdate(WxCouponCar record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); IdWorker idWorker = new IdWorker(0, 0); record.setId(idWorker.nextId()); - wxEtcpParkOutMapper.insertSelective(record); + wxCouponCarMapper.insertSelective(record); } else { - wxEtcpParkOutMapper.updateByPrimaryKeySelective(record); + wxCouponCarMapper.updateByPrimaryKeySelective(record); } } @Override public void deleteById(Long id) { - wxEtcpParkOutMapper.deleteByPrimaryKey(id); + wxCouponCarMapper.deleteByPrimaryKey(id); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java deleted file mode 100644 index ad29b74e6..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpCouponRecordServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpCouponRecord; -import com.simple.mapper.WxEtcpCouponRecordMapper; -import com.simple.service.WxEtcpCouponRecordService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpCouponRecordServiceImpl implements WxEtcpCouponRecordService { - - @Autowired - WxEtcpCouponRecordMapper wxEtcpCouponRecordMapper; - - - @Override - public PageInfo listAsPage(WxEtcpCouponRecord record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpCouponRecordMapper.findList(record)); - } - - @Override - public WxEtcpCouponRecord getById(Long id) { - return wxEtcpCouponRecordMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpCouponRecord record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpCouponRecordMapper.insertSelective(record); - } else { - wxEtcpCouponRecordMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpCouponRecordMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java deleted file mode 100644 index cb1279034..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkDissolutionServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkDissolution; -import com.simple.mapper.WxEtcpParkDissolutionMapper; -import com.simple.service.WxEtcpParkDissolutionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpParkDissolutionServiceImpl implements WxEtcpParkDissolutionService { - - @Autowired - WxEtcpParkDissolutionMapper wxEtcpParkDissolutionMapper; - - - @Override - public PageInfo listAsPage(WxEtcpParkDissolution record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkDissolutionMapper.findList(record)); - } - - @Override - public WxEtcpParkDissolution getById(Long id) { - return wxEtcpParkDissolutionMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpParkDissolution record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpParkDissolutionMapper.insertSelective(record); - } else { - wxEtcpParkDissolutionMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpParkDissolutionMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java deleted file mode 100644 index 1e3f98efb..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkMsgSucServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkMsgSuc; -import com.simple.mapper.WxEtcpParkMsgSucMapper; -import com.simple.service.WxEtcpParkMsgSucService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpParkMsgSucServiceImpl implements WxEtcpParkMsgSucService { - - @Autowired - WxEtcpParkMsgSucMapper wxEtcpParkMsgSucMapper; - - - @Override - public PageInfo listAsPage(WxEtcpParkMsgSuc record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkMsgSucMapper.findList(record)); - } - - @Override - public WxEtcpParkMsgSuc getById(Long id) { - return wxEtcpParkMsgSucMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpParkMsgSuc record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpParkMsgSucMapper.insertSelective(record); - } else { - wxEtcpParkMsgSucMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpParkMsgSucMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java deleted file mode 100644 index fc224466f..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkOrderunpayServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkOrderunpay; -import com.simple.mapper.WxEtcpParkOrderunpayMapper; -import com.simple.service.WxEtcpParkOrderunpayService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpParkOrderunpayServiceImpl implements WxEtcpParkOrderunpayService { - - @Autowired - WxEtcpParkOrderunpayMapper wxEtcpParkOrderunpayMapper; - - - @Override - public PageInfo listAsPage(WxEtcpParkOrderunpay record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkOrderunpayMapper.findList(record)); - } - - @Override - public WxEtcpParkOrderunpay getById(Long id) { - return wxEtcpParkOrderunpayMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpParkOrderunpay record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpParkOrderunpayMapper.insertSelective(record); - } else { - wxEtcpParkOrderunpayMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpParkOrderunpayMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java deleted file mode 100644 index 4294b04e9..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkTransactionServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkTransaction; -import com.simple.mapper.WxEtcpParkTransactionMapper; -import com.simple.service.WxEtcpParkTransactionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpParkTransactionServiceImpl implements WxEtcpParkTransactionService { - - @Autowired - WxEtcpParkTransactionMapper wxEtcpParkTransactionMapper; - - - @Override - public PageInfo listAsPage(WxEtcpParkTransaction record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkTransactionMapper.findList(record)); - } - - @Override - public WxEtcpParkTransaction getById(Long id) { - return wxEtcpParkTransactionMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpParkTransaction record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpParkTransactionMapper.insertSelective(record); - } else { - wxEtcpParkTransactionMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpParkTransactionMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java deleted file mode 100644 index 73bc48e99..000000000 --- a/mallinkService/src/main/java/com/simple/service/impl/WxEtcpParkUnbindServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.simple.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.simple.domain.po.WxEtcpParkUnbind; -import com.simple.mapper.WxEtcpParkUnbindMapper; -import com.simple.service.WxEtcpParkUnbindService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.simple.common.IdWorker; - -@Service -public class WxEtcpParkUnbindServiceImpl implements WxEtcpParkUnbindService { - - @Autowired - WxEtcpParkUnbindMapper wxEtcpParkUnbindMapper; - - - @Override - public PageInfo listAsPage(WxEtcpParkUnbind record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxEtcpParkUnbindMapper.findList(record)); - } - - @Override - public WxEtcpParkUnbind getById(Long id) { - return wxEtcpParkUnbindMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxEtcpParkUnbind record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); - record.setId(idWorker.nextId()); - wxEtcpParkUnbindMapper.insertSelective(record); - } else { - wxEtcpParkUnbindMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxEtcpParkUnbindMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/resources/mapper/WxCarCmdLogsMapper.xml b/mallinkService/src/main/resources/mapper/WxCarCmdLogsMapper.xml new file mode 100644 index 000000000..f1a0f5690 --- /dev/null +++ b/mallinkService/src/main/resources/mapper/WxCarCmdLogsMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + `id`,`tenant_id`,`support_vendor`,`cmd_type`,`create_date`,`update_date`,`cmd_json` + + + + where 1 = 1 + + + and `id` = #{id} + + + + + and `tenant_id` like concat('%', #{tenantId},'%') + + + + + and `support_vendor` = #{supportVendor} + + + + + and `cmd_type` like concat('%', #{cmdType},'%') + + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `cmd_json` like concat('%', #{cmdJson},'%') + + + + and id in + + #{idItem} + + + order by ${sortColumns} + + + + + + + + + + diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml similarity index 56% rename from mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml rename to mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml index 278b9537c..198708b94 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkMsgSucMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml @@ -1,14 +1,14 @@ - - + + - - + + - `id`,`tenant_id`,`sign_no` + `id`,`tenant_id`,`park_id` @@ -20,12 +20,12 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id` = #{tenantId} - - and `sign_no` like concat('%', #{signNo},'%') + + and `park_id` = #{parkId} @@ -37,8 +37,8 @@ order by ${sortColumns} - + select from wx_coupon_car diff --git a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarRecordEtcpMapper.xml similarity index 72% rename from mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml rename to mallinkService/src/main/resources/mapper/WxCouponCarRecordEtcpMapper.xml index 867ba0546..9a1a51f5f 100644 --- a/mallinkService/src/main/resources/mapper/WxEtcpCouponRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarRecordEtcpMapper.xml @@ -1,13 +1,14 @@ - - + + - - + + + @@ -16,7 +17,7 @@ - `id`,`tenant_id`,`coupon_id`,`car_number`,`park_id`,`business_id`,`coupon_free_id`,`code`,`message`,`create_date`,`update_date` + `id`,`tenant_id`,`coupon_id`,`park_id`,`car_number`,`etcp_merchant_id`,`vendor_infos`,`coupon_free_id`,`code`,`message`,`create_date`,`update_date` @@ -37,18 +38,23 @@ + + and `park_id` like concat('%', #{parkId},'%') + + + and `car_number` like concat('%', #{carNumber},'%') - - and `park_id` like concat('%', #{parkId},'%') + + and `etcp_merchant_id` like concat('%', #{etcpMerchantId},'%') - - and `business_id` like concat('%', #{businessId},'%') + + and `vendor_infos` like concat('%', #{vendorInfos},'%') @@ -85,8 +91,8 @@ order by ${sortColumns} - + select from wx_coupon_car_record_etcp diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml deleted file mode 100644 index 6488d6f87..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkDissolutionMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - `id`,`tenant_id`,`sign_no` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `sign_no` like concat('%', #{signNo},'%') - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml deleted file mode 100644 index 8d812fb5e..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkInMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - `id`,`tenant_id`,`syn_id`,`plate_number`,`park_name` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `syn_id` like concat('%', #{synId},'%') - - - - - and `plate_number` like concat('%', #{plateNumber},'%') - - - - - and `park_name` like concat('%', #{parkName},'%') - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml deleted file mode 100644 index 39bf89930..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkOrderunpayMapper.xml +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`plate_number`,`code`,`message`,`data`,`entrance_time`,`parking_fee`,`remaining_fee`,`paid_fee`,`parking_id`,`discount_amount`,`order_id`,`car_number`,`verification_info`,`syn_id`,`discount_no`,`status`,`create_date`,`update_date` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `plate_number` like concat('%', #{plateNumber},'%') - - - - - and `code` = #{code} - - - - - and `message` like concat('%', #{message},'%') - - - - - and `data` like concat('%', #{data},'%') - - - - - and `entrance_time` like concat('%', #{entranceTime},'%') - - - - - and `parking_fee` = #{parkingFee} - - - - - and `remaining_fee` = #{remainingFee} - - - - - and `paid_fee` = #{paidFee} - - - - - and `parking_id` like concat('%', #{parkingId},'%') - - - - - and `discount_amount` = #{discountAmount} - - - - - and `order_id` like concat('%', #{orderId},'%') - - - - - and `car_number` like concat('%', #{carNumber},'%') - - - - - and `verification_info` like concat('%', #{verificationInfo},'%') - - - - - and `syn_id` like concat('%', #{synId},'%') - - - - - and `discount_no` = #{discountNo} - - - - - and `status` = #{status} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml deleted file mode 100644 index 0e5cb7255..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkOutMapper.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - `id`,`tenant_id`,`syn_id`,`plate_number`,`park_name` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `syn_id` like concat('%', #{synId},'%') - - - - - and `plate_number` like concat('%', #{plateNumber},'%') - - - - - and `park_name` like concat('%', #{parkName},'%') - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml deleted file mode 100644 index 3a042591d..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkTransactionMapper.xml +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - `id`,`tenant_id`,`pay_type`,`syn_id`,`return_url`,`coupon_code`,`code`,`message`,`data`,`status`,`create_date`,`update_date` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `pay_type` = #{payType} - - - - - and `syn_id` like concat('%', #{synId},'%') - - - - - and `return_url` like concat('%', #{returnUrl},'%') - - - - - and `coupon_code` like concat('%', #{couponCode},'%') - - - - - and `code` = #{code} - - - - - and `message` like concat('%', #{message},'%') - - - - - and `data` like concat('%', #{data},'%') - - - - - and `status` = #{status} - - - - - and `create_date` = #{createDate} - - - - - and `update_date` = #{updateDate} - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml b/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml deleted file mode 100644 index 0bd8a1603..000000000 --- a/mallinkService/src/main/resources/mapper/WxEtcpParkUnbindMapper.xml +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - - - `id`,`tenant_id`,`plate_number` - - - - where 1 = 1 - - - and `id` = #{id} - - - - - and `tenant_id` like concat('%', #{tenantId},'%') - - - - - and `plate_number` like concat('%', #{plateNumber},'%') - - - - and id in - - #{idItem} - - - order by ${sortColumns} - - - - - - - - - - diff --git a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml index 37245799b..e6d6c6a51 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantShopMapper.xml @@ -6,10 +6,14 @@ + + + + - `id`,`tenant_id`,`merchant_id`,`shop_id` + `id`,`tenant_id`,`merchant_id`,`shop_id`,`create_date`,`update_date`,`rental_start_date`,`rental_end_date` @@ -33,6 +37,26 @@ and `shop_id` = #{shopId} + + + + and `create_date` = #{createDate} + + + + + and `update_date` = #{updateDate} + + + + + and `rental_start_date` = #{rentalStartDate} + + + + + and `rental_end_date` = #{rentalEndDate} + and id in diff --git a/mallinkService/src/main/resources/mapper/WxParkMapper.xml b/mallinkService/src/main/resources/mapper/WxParkMapper.xml index 80aa2d703..3ead6da3c 100644 --- a/mallinkService/src/main/resources/mapper/WxParkMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxParkMapper.xml @@ -6,12 +6,11 @@ - - `id`,`tenant_id`,`addr`,`number`,`etcp_park_id`,`entry_exit` + `id`,`tenant_id`,`addr`,`number`,`entry_exit` @@ -37,11 +36,6 @@ - - and `etcp_park_id` like concat('%', #{etcpParkId},'%') - - - and `entry_exit` = #{entryExit} diff --git a/mallinkService/src/main/resources/mapper/WxShopMapper.xml b/mallinkService/src/main/resources/mapper/WxShopMapper.xml index 2732ae6b6..987856032 100644 --- a/mallinkService/src/main/resources/mapper/WxShopMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxShopMapper.xml @@ -4,11 +4,12 @@ - + + @@ -17,7 +18,7 @@ - `id`,`tenant_id`,`title`,`build_area`,`operation_area`,`building`,`floor`,`x`,`y`,`baidu_poi`,`create_date`,`update_date` + `id`,`tenant_id`,`shop_number`,`build_area`,`operation_area`,`building`,`floor`,`status`,`x`,`y`,`baidu_poi`,`create_date`,`update_date` @@ -33,8 +34,8 @@ - - and `title` like concat('%', #{title},'%') + + and `shop_number` like concat('%', #{shopNumber},'%') @@ -58,6 +59,11 @@ + + and `status` = #{status} + + + and `x` = #{x}