diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppRegisterController.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppRegisterController.java index 6a99601..ad94d60 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppRegisterController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppRegisterController.java @@ -109,7 +109,7 @@ public class AppRegisterController { // user.setUsername(mobile); // user.setPassword(DigestUtils.sha256Hex(password)); // user.setCreateTime(new Date()); -// userService.saveTenPerson(user); +// userService.save(user); // request.getSession().setAttribute("verifyCode", null); // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserController.java index 843b73f..ec1b402 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserController.java @@ -55,7 +55,7 @@ public class AppUserController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("app:user:saveTenPerson") + @RequiresPermissions("app:user:save") public R save(@RequestBody AppUserEntity appUser){ appUserService.save(appUser); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserScopeController.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserScopeController.java index bcefd68..5851ed0 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserScopeController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserScopeController.java @@ -55,7 +55,7 @@ public class AppUserScopeController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("ten:appuserscope:saveTenPerson") + @RequiresPermissions("ten:appuserscope:save") public R save(@RequestBody AppUserScopeEntity appUserScope){ appUserScopeService.save(appUserScope); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java index fb0890e..5434c85 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java @@ -213,7 +213,7 @@ public class CarOpenApi { // httpUrl.disconnect(); // } // } -// this.tenPackRecordEnterService.saveTenPerson(enter); +// this.tenPackRecordEnterService.save(enter); // res.put("code", "200"); // res.put("msg", "成功"); // return res; @@ -280,7 +280,7 @@ public class CarOpenApi { // httpUrl.disconnect(); // } // } -// this.tenPackRecordExitService.saveTenPerson(enter); +// this.tenPackRecordExitService.save(enter); // res.put("code", "200"); // res.put("msg", "成功"); // return res; diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java b/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java index 3872bf0..73e71d0 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java @@ -567,24 +567,19 @@ public class HttpApiController { List personTypeList = new ArrayList<>(); AppPersonType personType5000 = new AppPersonType(); personType5000.setPersonType(Constant.PERSON_TYPE_OWNER); - personType5000.setTypeName("业主"); + personType5000.setTypeName("内部人员"); personTypeList.add(personType5000); AppPersonType personType5001 = new AppPersonType(); personType5001.setPersonType(Constant.PERSON_TYPE_MEMBER); - personType5001.setTypeName("家属住户"); + personType5001.setTypeName("承包商"); personTypeList.add(personType5001); AppPersonType personType5002 = new AppPersonType(); personType5002.setPersonType(Constant.PERSON_TYPE_TENANT); - personType5002.setTypeName("租户"); + personType5002.setTypeName("长期供应商"); personTypeList.add(personType5002); - AppPersonType personType5006 = new AppPersonType(); - personType5006.setPersonType(Constant.PERSON_TYPE_PROPERTY); - personType5006.setTypeName("物业"); - personTypeList.add(personType5006); - cellJson.put("personType",personTypeList); //删除状态为删除的人员 @@ -1304,8 +1299,7 @@ public class HttpApiController { if(label.getType() == Constant.PERSON_TYPE_OWNER || label.getType() == Constant.PERSON_TYPE_MEMBER || label.getType() == Constant.PERSON_TYPE_TENANT - || label.getType() == Constant.PERSON_TYPE_GUEST - || label.getType() == Constant.PERSON_TYPE_PROPERTY){ + || label.getType() == Constant.PERSON_TYPE_GUEST){ it.remove(); } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/controller/ScheduleJobController.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/controller/ScheduleJobController.java index f27b41b..2f653ff 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/controller/ScheduleJobController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/controller/ScheduleJobController.java @@ -62,7 +62,7 @@ public class ScheduleJobController { */ @SysLog("保存定时任务") @PostMapping("/save") - @RequiresPermissions("sys:schedule:saveTenPerson") + @RequiresPermissions("sys:schedule:save") @ApiOperation("增加定时任务") public R save(@RequestBody ScheduleJobEntity scheduleJob){ ValidatorUtils.validateEntity(scheduleJob); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonProcessTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonProcessTask.java index b666c79..1c22cca 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonProcessTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonProcessTask.java @@ -60,7 +60,7 @@ public class PersonProcessTask implements ITask { // List syncEntityList = tenPersonSyncService.findByPersonId(guest.getPersonId(),guest.getTenantId()); // for(TenPersonSyncEntity syncEntity: syncEntityList){ // syncEntity.setState(Constant.PERSON_SYNC_DELETE); -// tenPersonSyncService.updateTenPersonById(syncEntity); +// tenPersonSyncService.updateById(syncEntity); // } } //断开说有设备 diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java index 937e212..bca879d 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java @@ -168,11 +168,7 @@ public class PersonSynchronousTask implements ITask { if(person.getStr("belongContractorName")!=null) { tenPerson.setBelongContractorName(person.getStr("belongContractorName")); } - if(person.getStr("isBlacklistPersonnel")!=null && person.getStr("isBlacklistPersonnel").equals("是")) { - tenPerson.setPersonType(Constant.PERSON_TYPE_BLACK); - } else { - tenPerson.setPersonType(Constant.PERSON_TYPE_BLACK); - } + tenPerson.setIsBlacklistPersonnel(person.getStr("isBlacklistPersonnel").equals("是")?1:0); if(person.getJSONArray("pmContractorCertDatas")!=null) { List pmContractorCertDatas = person.getJSONArray("pmContractorCertDatas").toList(JSONObject.class); pmContractorCertDatas.forEach(contractorCert -> { diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java index 747c6ec..0b0863b 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java @@ -200,7 +200,7 @@ public class XaImageTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenRecordEntity recordEntity : updateRecords) { // recordEntity.setXaSyncImage(1); -// tenRecordService.updateTenPersonById(recordEntity); +// tenRecordService.updateById(recordEntity); // } // } if(resJson.contains("ErrorLineParameter")){ @@ -505,7 +505,7 @@ public class XaImageTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenPackRecordExitEntity recordEntity : updateRecords) { // recordEntity.setXaSync(1); -// tenPackRecordExitService.updateTenPersonById(recordEntity); +// tenPackRecordExitService.updateById(recordEntity); // } // } if(resJson.contains("ErrorLineParameter")){ diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java index 94160cb..54e4aed 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java @@ -184,7 +184,7 @@ public class XaRealDataTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenRoomEntity room : updateRooms) { // room.setXaSync(1); -// tenRoomService.updateTenPersonById(room); +// tenRoomService.updateById(room); // } // } if(resJson.contains("ErrorLineParameter")){ diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java index 2a11fa6..925d235 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java @@ -144,7 +144,7 @@ public class XaRecordTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenRecordEntity recordEntity : updateRecords) { // recordEntity.setXaSync(1); -// tenRecordService.updateTenPersonById(recordEntity); +// tenRecordService.updateById(recordEntity); // } // } if(resJson.contains("ErrorLineParameter")){ @@ -259,7 +259,7 @@ public class XaRecordTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenPackRecordEnterEntity recordEntity : updateRecords) { // recordEntity.setXaSync(1); -// tenPackRecordEnterService.updateTenPersonById(recordEntity); +// tenPackRecordEnterService.updateById(recordEntity); // } // } if(resJson.contains("ErrorLineParameter")){ @@ -393,7 +393,7 @@ public class XaRecordTask implements ITask { // if (resJson.contains("\"code\":\"0000\"")) { // for (TenPackRecordExitEntity recordEntity : updateRecords) { // recordEntity.setXaSync(1); -// tenPackRecordExitService.updateTenPersonById(recordEntity); +// tenPackRecordExitService.updateById(recordEntity); // } // } if(resJson.contains("ErrorLineParameter")){ diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/utils/ScheduleJob.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/utils/ScheduleJob.java index 30a516e..eda87da 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/utils/ScheduleJob.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/utils/ScheduleJob.java @@ -71,7 +71,7 @@ public class ScheduleJob extends QuartzJobBean { scheduleJobLogService.save(log); }finally { -// scheduleJobLogService.saveTenPerson(log); +// scheduleJobLogService.save(log); } } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java index 6e0870f..c233f98 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java @@ -712,7 +712,7 @@ public class DeviceApiServiceImpl implements DeviceApiService { // for (TenPersonSyncEntity syncEn : syncEntitys) { // syncEn.setLastUpdateTime(p.getLastUpdateTime()); // syncEn.setState(2); -// tenPersonSyncService.updateTenPersonById(syncEn); +// tenPersonSyncService.updateById(syncEn); // //下发通知 // List list = new ArrayList<>(); // TenPersonOperationVo vo = new TenPersonOperationVo(); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/oss/controller/SysOssController.java b/shapelight-admin/src/main/java/net/shapelight/modules/oss/controller/SysOssController.java index 224b6fc..1da152d 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/oss/controller/SysOssController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/oss/controller/SysOssController.java @@ -113,7 +113,7 @@ // SysOssEntity ossEntity = new SysOssEntity(); // ossEntity.setUrl(url); // ossEntity.setCreateDate(new Date()); -// sysOssService.saveTenPerson(ossEntity); +// sysOssService.save(ossEntity); // // return R.ok().put("data", url); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysAppVersionController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysAppVersionController.java index a52791e..e1b949f 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysAppVersionController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysAppVersionController.java @@ -75,7 +75,7 @@ public class SysAppVersionController { * 保存 */ @PostMapping("/save") - @RequiresPermissions("sys:appversion:saveTenPerson") + @RequiresPermissions("sys:appversion:save") //@ApiOperation("保存") public R save(@RequestBody SysAppVersionEntity sysAppVersion){ sysAppVersionService.save(sysAppVersion); @@ -109,7 +109,7 @@ public class SysAppVersionController { @PostMapping("/upload") @ResponseBody // @ApiOperation("上传apk文件") - @RequiresPermissions("sys:appversion:saveTenPerson") + @RequiresPermissions("sys:appversion:save") public R upload(@RequestParam("file") MultipartFile file) { try diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysConfigController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysConfigController.java index 2179905..5a5ead1 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysConfigController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysConfigController.java @@ -77,7 +77,7 @@ public class SysConfigController extends AbstractController { */ @SysLog("保存配置") @PostMapping("/save") - @RequiresPermissions("sys:config:saveTenPerson") + @RequiresPermissions("sys:config:save") // @ApiOperation("保存配置") public R save(@RequestBody SysConfigEntity config){ ValidatorUtils.validateEntity(config); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDbBakController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDbBakController.java index 70e622f..39d39bc 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDbBakController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDbBakController.java @@ -54,7 +54,7 @@ public class SysDbBakController { * 保存 */ @PostMapping("/save") - @RequiresPermissions("sys:dbbak:saveTenPerson") + @RequiresPermissions("sys:dbbak:save") //@ApiOperation("保存数据库备份文件") public R save(@RequestBody SysDbBakEntity sysDbBak) { sysDbBakService.save(sysDbBak); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeptController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeptController.java index 9f0edfd..df6452b 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeptController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeptController.java @@ -126,7 +126,7 @@ public class SysDeptController extends AbstractController { * 保存 */ @PostMapping("/save") -// @RequiresPermissions("sys:dept:saveTenPerson") +// @RequiresPermissions("sys:dept:save") // @ApiOperation("保存部门") public R save(@RequestBody SysDeptEntity dept){ sysDeptService.save(dept); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java index d07b7e9..ad4c891 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java @@ -128,10 +128,10 @@ public class SysDeviceController { // if(flag == -1){ // return R.error("设备不在线"); // }else { -// sysDeviceService.updateTenPersonById(sysDevice); +// sysDeviceService.updateById(sysDevice); // } // }else{ -// sysDeviceService.updateTenPersonById(sysDevice); +// sysDeviceService.updateById(sysDevice); // } sysDeviceService.updateById(sysDevice); return R.ok(); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceLogController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceLogController.java index ecd9d03..66ea65a 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceLogController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceLogController.java @@ -54,10 +54,10 @@ public class SysDeviceLogController { // /** // * 保存 // */ -// @RequestMapping("/saveTenPerson") -// @RequiresPermissions("sys:devicelog:saveTenPerson") -// public R saveTenPerson(@RequestBody SysDeviceLogEntity sysDeviceLog){ -// sysDeviceLogService.saveTenPerson(sysDeviceLog); +// @RequestMapping("/save") +// @RequiresPermissions("sys:devicelog:save") +// public R save(@RequestBody SysDeviceLogEntity sysDeviceLog){ +// sysDeviceLogService.save(sysDeviceLog); // // return R.ok(); // } @@ -68,7 +68,7 @@ public class SysDeviceLogController { // @RequestMapping("/update") // @RequiresPermissions("sys:devicelog:update") // public R update(@RequestBody SysDeviceLogEntity sysDeviceLog){ -// sysDeviceLogService.updateTenPersonById(sysDeviceLog); +// sysDeviceLogService.updateById(sysDeviceLog); // // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDictController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDictController.java index ee72cbd..2ffb80f 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDictController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDictController.java @@ -52,7 +52,7 @@ public class SysDictController { * 保存 */ @PostMapping("/save") - @RequiresPermissions("sys:dict:saveTenPerson") + @RequiresPermissions("sys:dict:save") public R save(@RequestBody SysDictEntity dict){ //校验类型 ValidatorUtils.validateEntity(dict); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysMenuController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysMenuController.java index 2782874..07844ac 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysMenuController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysMenuController.java @@ -164,7 +164,7 @@ public class SysMenuController extends AbstractController { */ @SysLog("保存菜单") @PostMapping("/save") - @RequiresPermissions("sys:menu:saveTenPerson") + @RequiresPermissions("sys:menu:save") @ApiOperation("保存菜单") public R save(@RequestBody SysMenuEntity menu){ //数据校验 diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysRoleController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysRoleController.java index a4d5129..76a8f3d 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysRoleController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysRoleController.java @@ -135,7 +135,7 @@ public class SysRoleController extends AbstractController { */ @SysLog("保存角色") @PostMapping("/save") -// @RequiresPermissions("sys:role:saveTenPerson") +// @RequiresPermissions("sys:role:save") @ApiOperation("保存角色") public R save(@RequestBody SysRoleEntity role){ //ValidatorUtils.validateEntity(role); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysUserController.java index af166d1..1a92fab 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysUserController.java @@ -131,7 +131,7 @@ public class SysUserController extends AbstractController { */ @SysLog("保存用户") @PostMapping("/save") - @RequiresPermissions("sys:user:saveTenPerson") + @RequiresPermissions("sys:user:save") @ApiOperation("保存用户") public R save(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, new Class[] { AddGroup.class }); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java index 3a1d3aa..45f66ad 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java @@ -95,7 +95,7 @@ public class SysTenUserController extends AbstractController { */ @SysLog("保存用户") @PostMapping("/save") - @RequiresPermissions("systen:user:saveTenPerson") + @RequiresPermissions("systen:user:save") @ApiOperation("保存用户") public R save(@RequestBody SysUserEntity user){ // ValidatorUtils.validateEntity(user, AddGroup.class); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenAddressController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenAddressController.java index 3ce53bf..b1bc093 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenAddressController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenAddressController.java @@ -56,10 +56,10 @@ public class TenAddressController { /** * 保存 */ -// @PostMapping("/saveTenPerson") -// @RequiresPermissions("ten:address:saveTenPerson") -// public R saveTenPerson(@RequestBody TenAddressEntity tenAddress) { -// tenAddressService.saveTenPerson(tenAddress); +// @PostMapping("/save") +// @RequiresPermissions("ten:address:save") +// public R save(@RequestBody TenAddressEntity tenAddress) { +// tenAddressService.save(tenAddress); // // return R.ok(); // } @@ -70,7 +70,7 @@ public class TenAddressController { // @PostMapping("/update") // @RequiresPermissions("ten:address:update") // public R update(@RequestBody TenAddressEntity tenAddress) { -// tenAddressService.updateTenPersonById(tenAddress); +// tenAddressService.updateById(tenAddress); // // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenBuildController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenBuildController.java index 1555e48..2adacdc 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenBuildController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenBuildController.java @@ -130,7 +130,7 @@ public class TenBuildController extends AbstractController { * 保存 */ @PostMapping("/save") - //@RequiresPermissions("ten:build:saveTenPerson") + //@RequiresPermissions("ten:build:save") @RequiresPermissions("ten:build") @ApiOperation(value = "保存") public R save(@RequestBody TenBuildEntity tenBuild){ diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenCellController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenCellController.java index ba153fd..0b64a1e 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenCellController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenCellController.java @@ -95,7 +95,7 @@ public class TenCellController extends AbstractController { @SysLog("添加小区") @PostMapping("/save") @ApiOperation("添加小区") - //@RequiresPermissions("ten:cell:saveTenPerson") + //@RequiresPermissions("ten:cell:save") @RequiresPermissions("ten:cell") public R save(@RequestBody TenCellEntity tenCell){ TenCellEntity cell = tenCellService.findByCellName(tenCell.getName(),getUser().getTenantId().toString()); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenChargeController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenChargeController.java index 56a7d91..a73e035 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenChargeController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenChargeController.java @@ -55,7 +55,7 @@ public class TenChargeController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("ten:tencharge:saveTenPerson") + @RequiresPermissions("ten:tencharge:save") public R save(@RequestBody TenChargeEntity tenCharge){ tenChargeService.save(tenCharge); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java index 1850454..4e710e3 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java @@ -109,7 +109,7 @@ public class TenDeviceController extends AbstractController { */ @SysLog("添加设备") @PostMapping("/save") -// @RequiresPermissions("ten:device:saveTenPerson") +// @RequiresPermissions("ten:device:save") @ApiOperation(value = "添加设备") public R save(@RequestBody TenDeviceEntity tenDevice){ tenDevice.setTenantId(getUser().getTenantId()); @@ -124,7 +124,7 @@ public class TenDeviceController extends AbstractController { if(sysDeviceEntity==null){ return R.error("设备未备案，请联系管理员"); } -// tenDeviceService.saveTenPerson(tenDevice); +// tenDeviceService.save(tenDevice); tenDeviceService.evictSave(tenDevice); return R.ok(); } @@ -139,7 +139,7 @@ public class TenDeviceController extends AbstractController { public R update(@RequestBody TenDeviceEntity tenDevice){ tenDevice.setLastUpdateBy(getUser().getUsername()); tenDevice.setLastUpdateTime(new Date()); -// tenDeviceService.updateTenPersonById(tenDevice); +// tenDeviceService.updateById(tenDevice); tenDeviceService.evictupdateById(tenDevice); return R.ok(); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLabelController_copy.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLabelController_copy.java index b9c1d23..13fc4d9 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLabelController_copy.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLabelController_copy.java @@ -114,10 +114,10 @@ // /** // * 保存 // */ -// @PostMapping("/saveTenPerson") +// @PostMapping("/save") // @RequiresPermissions("ten:label") // @ApiOperation(value = "保存标签") -// public R saveTenPerson(@RequestBody TenLabelEntity tenLabel) { +// public R save(@RequestBody TenLabelEntity tenLabel) { // SysUserEntity user = getUser(); // List roleIdList = sysUserRoleService.queryRoleIdList(user.getUserId()); // Long cellId = 0L; @@ -132,7 +132,7 @@ // tenLabel.setCreateBy(getUser().getUsername()); // tenLabel.setCreateTime(new Date()); // tenLabel.setTenantId(getUser().getTenantId()); -// tenLabelService.saveTenPerson(tenLabel); +// tenLabelService.save(tenLabel); // // return R.ok(); // } @@ -147,7 +147,7 @@ // tenLabel.setTenantId(getUser().getTenantId()); // tenLabel.setLastUpdateBy(getUser().getUsername()); // tenLabel.setLastUpdateTime(new Date()); -// tenLabelService.updateTenPersonById(tenLabel); +// tenLabelService.updateById(tenLabel); // return R.ok(); // } // diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLogController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLogController.java index c8ef443..d712dd7 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLogController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLogController.java @@ -56,7 +56,7 @@ public class TenLogController extends AbstractController { * 保存 */ @PostMapping("/save") - @RequiresPermissions("ten:log:saveTenPerson") + @RequiresPermissions("ten:log:save") public R save(@RequestBody TenLogEntity tenLog){ tenLog.setTenantId(getUser().getTenantId()); tenLogService.add(tenLog); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java index 819e884..2c180ec 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java @@ -85,10 +85,10 @@ public class TenPackRecordController extends AbstractController { /** * 保存 */ -// @PostMapping("/saveTenPerson") +// @PostMapping("/save") // @RequiresPermissions("ten:packrecord") -// public R saveTenPerson(@RequestBody TenPackRecordEntity tenPackRecord){ -// tenPackRecordService.saveTenPerson(tenPackRecord); +// public R save(@RequestBody TenPackRecordEntity tenPackRecord){ +// tenPackRecordService.save(tenPackRecord); // // return R.ok(); // } @@ -99,7 +99,7 @@ public class TenPackRecordController extends AbstractController { // @PostMapping("/update") // @RequiresPermissions("ten:packrecord") // public R update(@RequestBody TenPackRecordEntity tenPackRecord){ -// tenPackRecordService.updateTenPersonById(tenPackRecord); +// tenPackRecordService.updateById(tenPackRecord); // // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPayController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPayController.java index 95e0adf..3f6bb5e 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPayController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPayController.java @@ -55,7 +55,7 @@ public class TenPayController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("ten:tenpay:saveTenPerson") + @RequiresPermissions("ten:tenpay:save") public R save(@RequestBody TenPayEntity tenPay){ tenPayService.save(tenPay); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonExtractController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonExtractController.java index e8cc305..48ff6a4 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonExtractController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonExtractController.java @@ -60,7 +60,7 @@ public class TenPersonExtractController extends AbstractController { * 保存 */ @PostMapping("/save") - @RequiresPermissions("ten:personextract:saveTenPerson") + @RequiresPermissions("ten:personextract:save") public R save(@RequestBody TenPersonExtractEntity tenPersonExtract){ tenPersonExtractService.save(tenPersonExtract); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonSyncController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonSyncController.java index ff71197..a80cb60 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonSyncController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonSyncController.java @@ -50,10 +50,10 @@ public class TenPersonSyncController { // /** // * 保存 // */ -// @PostMapping("/saveTenPerson") -// @RequiresPermissions("ten:personsync:saveTenPerson") -// public R saveTenPerson(@RequestBody TenPersonSyncEntity tenPersonSync){ -// tenPersonSyncService.saveTenPerson(tenPersonSync); +// @PostMapping("/save") +// @RequiresPermissions("ten:personsync:save") +// public R save(@RequestBody TenPersonSyncEntity tenPersonSync){ +// tenPersonSyncService.save(tenPersonSync); // // return R.ok(); // } @@ -64,7 +64,7 @@ public class TenPersonSyncController { // @PostMapping("/update") // @RequiresPermissions("ten:personsync:update") // public R update(@RequestBody TenPersonSyncEntity tenPersonSync){ -// tenPersonSyncService.updateTenPersonById(tenPersonSync); +// tenPersonSyncService.updateById(tenPersonSync); // // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRecordController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRecordController.java index a26821a..8e510b9 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRecordController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRecordController.java @@ -138,10 +138,10 @@ public class TenRecordController extends AbstractController { /** * 保存 */ -// @PostMapping("/saveTenPerson") -//// @RequiresPermissions("ten:tenrecord:saveTenPerson") -// public R saveTenPerson(@RequestBody TenRecordEntity tenRecord){ -// tenRecordService.saveTenPerson(tenRecord); +// @PostMapping("/save") +//// @RequiresPermissions("ten:tenrecord:save") +// public R save(@RequestBody TenRecordEntity tenRecord){ +// tenRecordService.save(tenRecord); // // return R.ok(); // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRoomController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRoomController.java index c2c8d78..58f8f5e 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRoomController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRoomController.java @@ -244,7 +244,7 @@ public class TenRoomController extends AbstractController { // } // oldCard.setDoorCard(entity.getDoorCardEntity().getDoorCard()); // oldCard.setLastUpdateTime(new Date()); -// tenDoorCardService.updateTenPersonById(oldCard); +// tenDoorCardService.updateById(oldCard); // } // } else { // if (entity.getDoorCardEntity().getValidBegin()==null) { @@ -264,7 +264,7 @@ public class TenRoomController extends AbstractController { // } //// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd()); //// oldCard.setLastUpdateTime(new Date()); -// tenDoorCardService.updateTenPersonById(oldCard); +// tenDoorCardService.updateById(oldCard); // } // } // } else { @@ -293,7 +293,7 @@ public class TenRoomController extends AbstractController { // Date now = new Date(); // newCard.setCreateTime(now); // newCard.setLastUpdateTime(now); -// tenDoorCardService.saveTenPerson(newCard); +// tenDoorCardService.save(newCard); // } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRuleController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRuleController.java index 2dc9137..be4cb04 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRuleController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRuleController.java @@ -105,7 +105,7 @@ public class TenRuleController extends AbstractController { }else{ return R.error("您无权访问"); } -// tenRuleService.saveTenPerson(tenRule); +// tenRuleService.save(tenRule); TenScheduleEntity scheduleEntity = tenRule.getScheduleEntityList().get(0); int onTime = MyDateUtils.getSeconds(scheduleEntity.getDutyOn()); int offTime = MyDateUtils.getSeconds(scheduleEntity.getDutyOff()); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenThirdPartyController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenThirdPartyController.java index 66a40de..8d0a08c 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenThirdPartyController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenThirdPartyController.java @@ -55,7 +55,7 @@ public class TenThirdPartyController { * 保存 */ @RequestMapping("/save") - @RequiresPermissions("ten:tenthirdparty:saveTenPerson") + @RequiresPermissions("ten:tenthirdparty:save") public R save(@RequestBody TenThirdPartyEntity tenThirdParty){ tenThirdPartyService.save(tenThirdParty); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java index ade1802..f2a57a1 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java @@ -148,9 +148,9 @@ public class TenUserController extends AbstractController { */ @SysLog("保存用户") @PostMapping("/save") - //@RequiresPermissions("ten:user:saveTenPerson") + //@RequiresPermissions("ten:user:save") @ApiOperation("保存用户") - @RequiresPermissions("ten:user:saveTenPerson") + @RequiresPermissions("ten:user:save") public R save(@RequestBody SysUserEntity user){ ValidatorUtils.validateEntity(user, AddGroup.class); // SysUserEntity su = sysUserService.getOne(new QueryWrapper() diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java index 50da548..4dabe00 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java @@ -381,5 +381,6 @@ public class TenPersonEntity extends BaseEntity implements Serializable { private Integer isProtectDevice; private Integer isWatchSafeVideo; private String belongContractorName; + private Integer isBlacklistPersonnel; } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java index 918391b..cc9aacf 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java @@ -16,13 +16,13 @@ public interface TenPackRecordService { PageUtils queryPage(Map params); -// boolean saveTenPerson(TenPackRecordEntity entity); +// boolean save(TenPackRecordEntity entity); // boolean removeById(Long roomId,Long cellId); // // boolean removeByIdList(List> idList); -// boolean updateTenPersonById(TenPackRecordEntity entity); +// boolean updateById(TenPackRecordEntity entity); // TenPackRecordEntity getById(Long id,Long cellId); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenBuildServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenBuildServiceImpl.java index 9eaeded..eea35f6 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenBuildServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenBuildServiceImpl.java @@ -191,7 +191,7 @@ public class TenBuildServiceImpl implements TenBuildService { // room.setCreateBy(build.getCreateBy()); // room.setTenantId(build.getTenantId()); // //roomList.add(room); -// tenRoomService.saveTenPerson(room); +// tenRoomService.save(room); // } // } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCheckServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCheckServiceImpl.java index da68684..682d64c 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCheckServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCheckServiceImpl.java @@ -510,7 +510,7 @@ public class TenCheckServiceImpl extends ServiceImpl allDelete = tenPersonSyncService.findDeviceAllDeletePersons(deviceEntity.getDeviceId(), deviceEntity.getTenantId()); @@ -1573,7 +1573,7 @@ public class TenPersonServiceImpl extends ServiceImpl list = new ArrayList<>(); // TenPersonOperationVo vo = new TenPersonOperationVo(); @@ -2181,11 +2181,11 @@ public class TenPersonServiceImpl extends ServiceImpl devList = tenDeviceService.findByCellId(cellId); // for (TenDeviceVo dev : devList) { @@ -2341,7 +2341,7 @@ public class TenPersonServiceImpl extends ServiceImpl