diff --git a/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml new file mode 100644 index 0000000..6978c0b --- /dev/null +++ b/.idea/libraries/Maven__javax_validation_validation_api_2_0_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_1_Final.xml b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_1_Final.xml new file mode 100644 index 0000000..d606865 --- /dev/null +++ b/.idea/libraries/Maven__org_hibernate_hibernate_validator_5_1_1_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/module-common/module-common.iml b/module-common/module-common.iml index 13bf923..91b1e0e 100644 --- a/module-common/module-common.iml +++ b/module-common/module-common.iml @@ -25,6 +25,10 @@ + + + + @@ -69,7 +73,6 @@ - diff --git a/module-wcs/module-wcs.iml b/module-wcs/module-wcs.iml index 18b8b14..7ae6ba5 100644 --- a/module-wcs/module-wcs.iml +++ b/module-wcs/module-wcs.iml @@ -26,6 +26,10 @@ + + + + @@ -70,7 +74,6 @@ - diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeInfoController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeInfoController.java index 4d10a76..0d399b5 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeInfoController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeInfoController.java @@ -1,6 +1,7 @@ package io.renren.modules.wcs.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -46,7 +47,7 @@ public class MtDdDeviceCodeInfoController { * 列表 */ @GetMapping("/list") - @RequiresPermissions("wcs:mtdddevicecodeinfo:list") +// @RequiresPermissions("wcs:mtdddevicecodeinfo:list") @ApiOperation(value = "分页list", notes = "传入deviceCodeInfo") public R list(@RequestParam Map params){ PageUtils page = mtDdDeviceCodeInfoService.queryPage(params); @@ -59,7 +60,7 @@ public class MtDdDeviceCodeInfoController { * 信息 */ @GetMapping("/info/{id}")@ApiOperation(value = "详情", notes = "传入id") - @RequiresPermissions("wcs:mtdddevicecodeinfo:info") +// @RequiresPermissions("wcs:mtdddevicecodeinfo:info") public R info(@PathVariable("id") Integer id){ MtDdDeviceCodeInfoEntity mtDdDeviceCodeInfo = mtDdDeviceCodeInfoService.getById(id); @@ -69,9 +70,10 @@ public class MtDdDeviceCodeInfoController { /** * 保存 */ - @GetMapping("/save")@ApiOperation(value = "新增", notes = "传入deviceCodeInfo") - @RequiresPermissions("wcs:mtdddevicecodeinfo:save") + @PostMapping("/save")@ApiOperation(value = "新增", notes = "传入deviceCodeInfo") +// @RequiresPermissions("wcs:mtdddevicecodeinfo:save") public R save(@RequestBody MtDdDeviceCodeInfoEntity mtDdDeviceCodeInfo){ + mtDdDeviceCodeInfo.setCreateTime(new Date()); mtDdDeviceCodeInfoService.save(mtDdDeviceCodeInfo); return R.ok(); @@ -80,8 +82,8 @@ public class MtDdDeviceCodeInfoController { /** * 修改 */ - @GetMapping("/update")@ApiOperation(value = "修改", notes = "传入deviceCodeInfo") - @RequiresPermissions("wcs:mtdddevicecodeinfo:update") + @PostMapping("/update")@ApiOperation(value = "修改", notes = "传入deviceCodeInfo") +// @RequiresPermissions("wcs:mtdddevicecodeinfo:update") public R update(@RequestBody MtDdDeviceCodeInfoEntity mtDdDeviceCodeInfo){ mtDdDeviceCodeInfoService.updateById(mtDdDeviceCodeInfo); @@ -91,8 +93,8 @@ public class MtDdDeviceCodeInfoController { /** * 删除 */ - @GetMapping("/delete")@ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtdddevicecodeinfo:delete") + @PostMapping("/delete")@ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtdddevicecodeinfo:delete") public R delete(@RequestBody Integer[] ids){ mtDdDeviceCodeInfoService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeLogController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeLogController.java index e44d7a1..065f278 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeLogController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceCodeLogController.java @@ -45,7 +45,7 @@ public class MtDdDeviceCodeLogController { * 列表 */ @GetMapping("/list")@ApiOperation("查询设备code日志list") - @RequiresPermissions("wcs:mtdddevicecodelog:list") +// @RequiresPermissions("wcs:mtdddevicecodelog:list") public R list(@RequestParam Map params){ PageUtils page = mtDdDeviceCodeLogService.queryPage(params); @@ -57,7 +57,7 @@ public class MtDdDeviceCodeLogController { * 信息 */ @GetMapping("/info/{id}")@ApiOperation("通过id查询设备code") - @RequiresPermissions("wcs:mtdddevicecodelog:info") +// @RequiresPermissions("wcs:mtdddevicecodelog:info") public R info(@PathVariable("id") Integer id){ MtDdDeviceCodeLogEntity mtDdDeviceCodeLog = mtDdDeviceCodeLogService.getById(id); return R.ok().put("mtDdDeviceCodeLog", mtDdDeviceCodeLog); @@ -66,8 +66,8 @@ public class MtDdDeviceCodeLogController { /** * 保存 */ - @GetMapping("/save")@ApiOperation(value = "新增", notes = "传入deviceCodeLog") - @RequiresPermissions("wcs:mtdddevicecodelog:save") + @PostMapping("/save")@ApiOperation(value = "新增", notes = "传入deviceCodeLog") +// @RequiresPermissions("wcs:mtdddevicecodelog:save") public R save(@RequestBody MtDdDeviceCodeLogEntity mtDdDeviceCodeLog){ mtDdDeviceCodeLogService.save(mtDdDeviceCodeLog); @@ -77,8 +77,8 @@ public class MtDdDeviceCodeLogController { /** * 修改 */ - @GetMapping("/update")@ApiOperation(value = "修改", notes = "传入deviceCodeLog") - @RequiresPermissions("wcs:mtdddevicecodelog:update") + @PostMapping("/update")@ApiOperation(value = "修改", notes = "传入deviceCodeLog") +// @RequiresPermissions("wcs:mtdddevicecodelog:update") public R update(@RequestBody MtDdDeviceCodeLogEntity mtDdDeviceCodeLog){ mtDdDeviceCodeLogService.updateById(mtDdDeviceCodeLog); @@ -88,8 +88,8 @@ public class MtDdDeviceCodeLogController { /** * 删除 */ - @GetMapping("/delete")@ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtdddevicecodelog:delete") + @PostMapping("/delete")@ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtdddevicecodelog:delete") public R delete(@RequestBody Integer[] ids){ mtDdDeviceCodeLogService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceInfoController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceInfoController.java index 5dc0bfb..838371e 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceInfoController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceInfoController.java @@ -1,6 +1,7 @@ package io.renren.modules.wcs.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -44,7 +45,7 @@ public class MtDdDeviceInfoController { * 列表 */ @GetMapping("/list") @ApiOperation(value = "分页", notes = "") - @RequiresPermissions("wcs:mtdddeviceinfo:list") +// @RequiresPermissions("wcs:mtdddeviceinfo:list") public R list(@RequestParam Map params){ PageUtils page = mtDdDeviceInfoService.queryPage(params); @@ -56,7 +57,7 @@ public class MtDdDeviceInfoController { * 信息 */ @GetMapping("/info/{id}")@ApiOperation(value = "参数查询", notes = "传入id") - @RequiresPermissions("wcs:mtdddeviceinfo:info") +// @RequiresPermissions("wcs:mtdddeviceinfo:info") public R info(@PathVariable("id") Integer id){ MtDdDeviceInfoEntity mtDdDeviceInfo = mtDdDeviceInfoService.getById(id); @@ -66,9 +67,10 @@ public class MtDdDeviceInfoController { /** * 保存 */ - @GetMapping("/save") @ApiOperation(value = "新增", notes = "传入deviceInfo") - @RequiresPermissions("wcs:mtdddeviceinfo:save") + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入deviceInfo") +// @RequiresPermissions("wcs:mtdddeviceinfo:save") public R save(@RequestBody MtDdDeviceInfoEntity mtDdDeviceInfo){ + mtDdDeviceInfo.setCreateTime(new Date()); mtDdDeviceInfoService.save(mtDdDeviceInfo); return R.ok(); @@ -77,8 +79,8 @@ public class MtDdDeviceInfoController { /** * 修改 */ - @GetMapping("/update") @ApiOperation(value = "修改", notes = "传入deviceInfo") - @RequiresPermissions("wcs:mtdddeviceinfo:update") + @PostMapping("/update") @ApiOperation(value = "修改", notes = "传入deviceInfo") +// @RequiresPermissions("wcs:mtdddeviceinfo:update") public R update(@RequestBody MtDdDeviceInfoEntity mtDdDeviceInfo){ mtDdDeviceInfoService.updateById(mtDdDeviceInfo); @@ -88,8 +90,8 @@ public class MtDdDeviceInfoController { /** * 删除 */ - @GetMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtdddeviceinfo:delete") + @PostMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtdddeviceinfo:delete") public R delete(@RequestBody Integer[] ids){ mtDdDeviceInfoService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceRunLogController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceRunLogController.java index 2a424f2..b9f472c 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceRunLogController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdDeviceRunLogController.java @@ -46,7 +46,7 @@ public class MtDdDeviceRunLogController { * 列表 */ @GetMapping("/list") @ApiOperation(value = "分页", notes = "") - @RequiresPermissions("wcs:mtdddevicerunlog:list") +// @RequiresPermissions("wcs:mtdddevicerunlog:list") public R list(@RequestParam Map params){ PageUtils page = mtDdDeviceRunLogService.queryPage(params); @@ -58,7 +58,7 @@ public class MtDdDeviceRunLogController { * 信息 */ @GetMapping("/info/{id}") @ApiOperation(value = "详情", notes = "传入id") - @RequiresPermissions("wcs:mtdddevicerunlog:info") +// @RequiresPermissions("wcs:mtdddevicerunlog:info") public R info(@PathVariable("id") Integer id){ MtDdDeviceRunLogEntity mtDdDeviceRunLog = mtDdDeviceRunLogService.getById(id); @@ -68,8 +68,8 @@ public class MtDdDeviceRunLogController { /** * 保存 */ - @GetMapping("/save") @ApiOperation(value = "新增", notes = "传入deviceRunLog") - @RequiresPermissions("wcs:mtdddevicerunlog:save") + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入deviceRunLog") +// @RequiresPermissions("wcs:mtdddevicerunlog:save") public R save(@RequestBody MtDdDeviceRunLogEntity mtDdDeviceRunLog){ mtDdDeviceRunLogService.save(mtDdDeviceRunLog); @@ -79,8 +79,8 @@ public class MtDdDeviceRunLogController { /** * 修改 */ - @GetMapping("/update") @ApiOperation(value = "修改", notes = "传入deviceRunLog") - @RequiresPermissions("wcs:mtdddevicerunlog:update") + @PostMapping("/update") @ApiOperation(value = "修改", notes = "传入deviceRunLog") +// @RequiresPermissions("wcs:mtdddevicerunlog:update") public R update(@RequestBody MtDdDeviceRunLogEntity mtDdDeviceRunLog){ mtDdDeviceRunLogService.updateById(mtDdDeviceRunLog); @@ -90,8 +90,8 @@ public class MtDdDeviceRunLogController { /** * 删除 */ - @GetMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtdddevicerunlog:delete") + @PostMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtdddevicerunlog:delete") public R delete(@RequestBody Integer[] ids){ mtDdDeviceRunLogService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdInterfaceInfoLogController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdInterfaceInfoLogController.java index 479efa6..bd418d6 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdInterfaceInfoLogController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdInterfaceInfoLogController.java @@ -45,7 +45,7 @@ public class MtDdInterfaceInfoLogController { * 列表 */ @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入interfaceInfoLog") - @RequiresPermissions("wcs:mtddinterfaceinfolog:list") +// @RequiresPermissions("wcs:mtddinterfaceinfolog:list") public R list(@RequestParam Map params){ PageUtils page = mtDdInterfaceInfoLogService.queryPage(params); @@ -57,7 +57,7 @@ public class MtDdInterfaceInfoLogController { * 信息 */ @GetMapping("/info/{id}") @ApiOperation(value = "详情", notes = "传入id") - @RequiresPermissions("wcs:mtddinterfaceinfolog:info") +// @RequiresPermissions("wcs:mtddinterfaceinfolog:info") public R info(@PathVariable("id") Integer id){ MtDdInterfaceInfoLogEntity mtDdInterfaceInfoLog = mtDdInterfaceInfoLogService.getById(id); @@ -67,8 +67,8 @@ public class MtDdInterfaceInfoLogController { /** * 保存 */ - @GetMapping("/save") @ApiOperation(value = "新增", notes = "传入interfaceInfoLog") - @RequiresPermissions("wcs:mtddinterfaceinfolog:save") + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入interfaceInfoLog") +// @RequiresPermissions("wcs:mtddinterfaceinfolog:save") public R save(@RequestBody MtDdInterfaceInfoLogEntity mtDdInterfaceInfoLog){ mtDdInterfaceInfoLogService.save(mtDdInterfaceInfoLog); @@ -78,8 +78,8 @@ public class MtDdInterfaceInfoLogController { /** * 修改 */ - @GetMapping("/update") @ApiOperation(value = "修改", notes = "传入interfaceInfoLog") - @RequiresPermissions("wcs:mtddinterfaceinfolog:update") + @PostMapping("/update") @ApiOperation(value = "修改", notes = "传入interfaceInfoLog") +// @RequiresPermissions("wcs:mtddinterfaceinfolog:update") public R update(@RequestBody MtDdInterfaceInfoLogEntity mtDdInterfaceInfoLog){ mtDdInterfaceInfoLogService.updateById(mtDdInterfaceInfoLog); @@ -89,8 +89,8 @@ public class MtDdInterfaceInfoLogController { /** * 删除 */ - @GetMapping("/delete") @ApiOperation(value = "新增或修改", notes = "传入interfaceInfoLog") - @RequiresPermissions("wcs:mtddinterfaceinfolog:delete") + @PostMapping("/delete") @ApiOperation(value = "新增或修改", notes = "传入interfaceInfoLog") +// @RequiresPermissions("wcs:mtddinterfaceinfolog:delete") public R delete(@RequestBody Integer[] ids){ mtDdInterfaceInfoLogService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoController.java index 0dfe08d..4b0c643 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoController.java @@ -1,6 +1,7 @@ package io.renren.modules.wcs.controller; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; @@ -45,7 +46,7 @@ public class MtDdTaskInfoController { * 列表 */ @GetMapping("/list") @ApiOperation(value = "分页", notes = "传入taskInfo") - @RequiresPermissions("wcs:mtddtaskinfo:list") +// @RequiresPermissions("wcs:mtddtaskinfo:list") public R list(@RequestParam Map params){ PageUtils page = mtDdTaskInfoService.queryPage(params); @@ -68,7 +69,7 @@ public class MtDdTaskInfoController { * 信息 */ @GetMapping("/info/{id}") @ApiOperation(value = "详情", notes = "传入id") - @RequiresPermissions("wcs:mtddtaskinfo:info") +// @RequiresPermissions("wcs:mtddtaskinfo:info") public R info(@PathVariable("id") Integer id){ MtDdTaskInfoEntity mtDdTaskInfo = mtDdTaskInfoService.getById(id); @@ -78,9 +79,10 @@ public class MtDdTaskInfoController { /** * 保存 */ - @GetMapping("/save") @ApiOperation(value = "新增", notes = "传入taskInfo") - @RequiresPermissions("wcs:mtddtaskinfo:save") + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入taskInfo") +// @RequiresPermissions("wcs:mtddtaskinfo:save") public R save(@RequestBody MtDdTaskInfoEntity mtDdTaskInfo){ + mtDdTaskInfo.setCreateTime(new Date()); mtDdTaskInfoService.save(mtDdTaskInfo); return R.ok(); @@ -89,8 +91,8 @@ public class MtDdTaskInfoController { /** * 修改 */ - @GetMapping("/update") @ApiOperation(value = "更新", notes = "传入taskInfo") - @RequiresPermissions("wcs:mtddtaskinfo:update") + @PostMapping("/update") @ApiOperation(value = "更新", notes = "传入taskInfo") +// @RequiresPermissions("wcs:mtddtaskinfo:update") public R update(@RequestBody MtDdTaskInfoEntity mtDdTaskInfo){ mtDdTaskInfoService.updateById(mtDdTaskInfo); @@ -100,8 +102,8 @@ public class MtDdTaskInfoController { /** * 删除 */ - @GetMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtddtaskinfo:delete") + @PostMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtddtaskinfo:delete") public R delete(@RequestBody Integer[] ids){ mtDdTaskInfoService.removeByIds(Arrays.asList(ids)); diff --git a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoLogController.java b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoLogController.java index d4dbb84..b142c85 100644 --- a/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoLogController.java +++ b/module-wcs/src/main/java/io/renren/modules/wcs/controller/MtDdTaskInfoLogController.java @@ -44,7 +44,7 @@ public class MtDdTaskInfoLogController { * 列表 */ @GetMapping("/list")@ApiOperation(value = "分页", notes = "") - @RequiresPermissions("wcs:mtddtaskinfolog:list") +// @RequiresPermissions("wcs:mtddtaskinfolog:list") public R list(@RequestParam Map params){ PageUtils page = mtDdTaskInfoLogService.queryPage(params); @@ -56,7 +56,7 @@ public class MtDdTaskInfoLogController { * 信息 */ @GetMapping("/info/{id}") @ApiOperation(value = "详情", notes = "传入id") - @RequiresPermissions("wcs:mtddtaskinfolog:info") +// @RequiresPermissions("wcs:mtddtaskinfolog:info") public R info(@PathVariable("id") Integer id){ MtDdTaskInfoLogEntity mtDdTaskInfoLog = mtDdTaskInfoLogService.getById(id); @@ -66,8 +66,8 @@ public class MtDdTaskInfoLogController { /** * 保存 */ - @GetMapping("/save") @ApiOperation(value = "新增", notes = "传入taskInfoLog") - @RequiresPermissions("wcs:mtddtaskinfolog:save") + @PostMapping("/save") @ApiOperation(value = "新增", notes = "传入taskInfoLog") +// @RequiresPermissions("wcs:mtddtaskinfolog:save") public R save(@RequestBody MtDdTaskInfoLogEntity mtDdTaskInfoLog){ mtDdTaskInfoLogService.save(mtDdTaskInfoLog); @@ -77,8 +77,8 @@ public class MtDdTaskInfoLogController { /** * 修改 */ - @GetMapping("/update") @ApiOperation(value = "更新", notes = "传入taskInfoLog") - @RequiresPermissions("wcs:mtddtaskinfolog:update") + @PostMapping("/update") @ApiOperation(value = "更新", notes = "传入taskInfoLog") +// @RequiresPermissions("wcs:mtddtaskinfolog:update") public R update(@RequestBody MtDdTaskInfoLogEntity mtDdTaskInfoLog){ mtDdTaskInfoLogService.updateById(mtDdTaskInfoLog); @@ -88,8 +88,8 @@ public class MtDdTaskInfoLogController { /** * 删除 */ - @GetMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") - @RequiresPermissions("wcs:mtddtaskinfolog:delete") + @PostMapping("/delete") @ApiOperation(value = "删除", notes = "传入ids") +// @RequiresPermissions("wcs:mtddtaskinfolog:delete") public R delete(@RequestBody Integer[] ids){ mtDdTaskInfoLogService.removeByIds(Arrays.asList(ids));