Guwan
/
cqyt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

恢复误修改文件

This commit is contained in:
张博 2024-10-18 16:23:41 +08:00
parent cdd9c76d5c
commit 15c19e05d3
49 changed files with 97 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppRegisterController.java
View File

@ -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();
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppUserScopeController.java
View File

@ -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);

4
shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java
View File

@ -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;

14
shapelight-admin/src/main/java/net/shapelight/modules/httpapi/controler/HttpApiController.java
View File

@ -567,24 +567,19 @@ public class HttpApiController {
List<AppPersonType> 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();
}
}

2
shapelight-admin/src/main/java/net/shapelight/modules/job/controller/ScheduleJobController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonProcessTask.java
View File

@ -60,7 +60,7 @@ public class PersonProcessTask implements ITask {
// List<TenPersonSyncEntity> syncEntityList = tenPersonSyncService.findByPersonId(guest.getPersonId(),guest.getTenantId());
// for(TenPersonSyncEntity syncEntity: syncEntityList){
// syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// tenPersonSyncService.updateTenPersonById(syncEntity);
// tenPersonSyncService.updateById(syncEntity);
// }
}
//断开说有设备

6
shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java
View File

@ -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<JSONObject> pmContractorCertDatas = person.getJSONArray("pmContractorCertDatas").toList(JSONObject.class);
pmContractorCertDatas.forEach(contractorCert -> {

4
shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java
View File

@ -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")){

2
shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java
View File

@ -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")){

6
shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java
View File

@ -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")){

2
shapelight-admin/src/main/java/net/shapelight/modules/job/utils/ScheduleJob.java
View File

@ -71,7 +71,7 @@ public class ScheduleJob extends QuartzJobBean {
scheduleJobLogService.save(log);
}finally {
// scheduleJobLogService.saveTenPerson(log);
// scheduleJobLogService.save(log);
}
}
}

2
shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/DeviceApiServiceImpl.java
View File

@ -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<TenPersonOperationVo> list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo();

2
shapelight-admin/src/main/java/net/shapelight/modules/oss/controller/SysOssController.java
View File

@ -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);
// }

4
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysAppVersionController.java
View File

@ -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

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysConfigController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDbBakController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeptController.java
View File

@ -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);

4
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceController.java
View File

@ -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();

10
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDeviceLogController.java
View File

@ -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();
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysDictController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysMenuController.java
View File

@ -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){
//数据校验

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysRoleController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/sys/controller/SysUserController.java
View File

@ -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 });

2
shapelight-admin/src/main/java/net/shapelight/modules/systen/controller/SysTenUserController.java
View File

@ -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);

10
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenAddressController.java
View File

@ -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();
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenBuildController.java
View File

@ -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){

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenCellController.java
View File

@ -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());

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenChargeController.java
View File

@ -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);

6
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java
View File

@ -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();
}

8
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLabelController_copy.java
View File

@ -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<Long> 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();
// }
//

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenLogController.java
View File

@ -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);

8
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPackRecordController.java
View File

@ -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();
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPayController.java
View File

@ -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);

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonExtractController.java
View File

@ -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);

10
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonSyncController.java
View File

@ -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();
// }

8
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRecordController.java
View File

@ -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();
// }

6
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRoomController.java
View File

@ -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);
// }
}

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenRuleController.java
View File

@ -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());

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenThirdPartyController.java
View File

@ -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);

4
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java
View File

@ -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<SysUserEntity>()

1
shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenPersonEntity.java
View File

@ -381,5 +381,6 @@ public class TenPersonEntity extends BaseEntity implements Serializable {
private Integer isProtectDevice;
private Integer isWatchSafeVideo;
private String belongContractorName;
private Integer isBlacklistPersonnel;
}

4
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPackRecordService.java
View File

@ -16,13 +16,13 @@ public interface TenPackRecordService {
PageUtils queryPage(Map<String, Object> params);
// boolean saveTenPerson(TenPackRecordEntity entity);
// boolean save(TenPackRecordEntity entity);
// boolean removeById(Long roomId,Long cellId);
//
// boolean removeByIdList(List<Map<String,String>> idList);
// boolean updateTenPersonById(TenPackRecordEntity entity);
// boolean updateById(TenPackRecordEntity entity);
// TenPackRecordEntity getById(Long id,Long cellId);

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenBuildServiceImpl.java
View File

@ -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);
// }
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenCheckServiceImpl.java
View File

@ -510,7 +510,7 @@ public class TenCheckServiceImpl extends ServiceImpl<TenCheckDao, TenCheckEntity
// int zaotui = schedule.getDutyOff().toLocalTime().getHour() * 60 + schedule.getDutyOff().toLocalTime().getMinute() - (recordTime.getHour() * 60 + recordTime.getMinute());
// checkSchedule.setDutyOffStatusInfo("早退" + zaotui + "分钟");
// }
// tenCheckScheduleService.updateTenPersonById(checkSchedule);
// tenCheckScheduleService.updateById(checkSchedule);
// }
// }else{
// //下班已经打过卡，再次更新打卡时间

6
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPackRecordServiceImpl.java
View File

@ -45,7 +45,7 @@ public class TenPackRecordServiceImpl implements TenPackRecordService {
private MinioConfig minioConfig;
// @Override
// public boolean saveTenPerson(TenPackRecordEntity entity) {
// public boolean save(TenPackRecordEntity entity) {
// int flag = tenPackRecordDao.insert(entity);
// if(flag==1){
// return true;
@ -75,8 +75,8 @@ public class TenPackRecordServiceImpl implements TenPackRecordService {
// @Override
// public boolean updateTenPersonById(TenPackRecordEntity entity) {
// int flag = tenPackRecordDao.updateTenPersonById(entity);
// public boolean updateById(TenPackRecordEntity entity) {
// int flag = tenPackRecordDao.updateById(entity);
// if(flag==1){
// return true;
// }

22
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java
View File

@ -619,7 +619,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// card.setCreateBy(getUser().getUsername());
card.setCreateTime(now);
card.setLastUpdateTime(now);
// tenDoorCardService.saveTenPerson(doorCardEntity);
// tenDoorCardService.save(doorCardEntity);
tenDoorCardService.save(card);
}
//保存App用户
@ -921,7 +921,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
//// appUser.setSalt(salt);
// appUser.setPassword(DigestUtils.sha256Hex(entity.getPassword()));
// appUser.setCreateTime(new Date());
// appUserService.saveTenPerson(appUser);
// appUserService.save(appUser);
//保存房产信息
AppUserScopeEntity appScope = new AppUserScopeEntity();
@ -932,7 +932,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
appUserScopeService.save(appScope);
// appUser.setCurrentScopeId(appScope.getUserScopeId());
// appUserService.updateTenPersonById(appUser);
// appUserService.updateById(appUser);
}
@ -1049,7 +1049,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// TenPersonSyncEntity syncEntity = tenPersonSyncService.findByDeviceIdAndPersonId(deviceEntity.getDeviceId(), personId, tenantId);
// syncEntity.setLastUpdateTime(lastUpdateTime);
// syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// tenPersonSyncService.updateTenPersonById(syncEntity);
// tenPersonSyncService.updateById(syncEntity);
// }
// //下发通知
// List<TenPersonSyncEntity> allDelete = tenPersonSyncService.findDeviceAllDeletePersons(deviceEntity.getDeviceId(), deviceEntity.getTenantId());
@ -1573,7 +1573,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// }
// oldCard.setDoorCard(entity.getDoorCardEntity().getDoorCard());
// oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateTenPersonById(oldCard);
// tenDoorCardService.updateById(oldCard);
// }
// } else {
// if (entity.getDoorCardEntity().getValidBegin() == null) {
@ -1593,7 +1593,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// }
//// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd());
// oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateTenPersonById(oldCard);
// tenDoorCardService.updateById(oldCard);
// }
// }
// } else {
@ -1622,7 +1622,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// Date now = new Date();
// newCard.setCreateTime(now);
// newCard.setLastUpdateTime(now);
// tenDoorCardService.saveTenPerson(newCard);
// tenDoorCardService.save(newCard);
// }
}
@ -1651,7 +1651,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// for (TenPersonSyncEntity syncEn : syncEntitys) {
// syncEn.setLastUpdateTime(entity.getLastUpdateTime());
// syncEn.setState(2);
// tenPersonSyncService.updateTenPersonById(syncEn);
// tenPersonSyncService.updateById(syncEn);
// //下发通知
// List<TenPersonOperationVo> list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo();
@ -2181,11 +2181,11 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// if(type.equals("s") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_DATE_NOT_START){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_NOMOR);
// tenPersonEntity.setLastUpdateTime(new Date());
// tenPersonDao.updateTenPersonById(tenPersonEntity);
// tenPersonDao.updateById(tenPersonEntity);
// }else if(type.equals("e") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_NOMOR){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT);
// tenPersonEntity.setLastUpdateTime(new Date());
// tenPersonDao.updateTenPersonById(tenPersonEntity);
// tenPersonDao.updateById(tenPersonEntity);
// }
// List<TenDeviceVo> devList = tenDeviceService.findByCellId(cellId);
// for (TenDeviceVo dev : devList) {
@ -2341,7 +2341,7 @@ public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEnti
// doorCardEntity.setDoorCard(personModel.getDoorCard());
// doorCardEntity.setCellId(tenPerson.getCellId());
// doorCardEntity.setPersonId(tenPerson.getPersonId());
// tenDoorCardService.saveTenPerson(doorCardEntity);
// tenDoorCardService.save(doorCardEntity);
// }

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenRecordServiceImpl.java
View File

@ -357,7 +357,7 @@ public class TenRecordServiceImpl implements TenRecordService {
TenPersonEntity p = tenPersonService.getById(entity.getPersonId(),entity.getCellId());
if(p!=null){
vo.setPersonName(p.getName());
if(p.getPersonType().intValue() == Constant.PERSON_TYPE_BLACK){
if(p.getIsBlacklistPersonnel()==1){
vo.setAddress(p.getCellName());
}else{
vo.setAddress(p.getCellName()+p.getBuildName()+p.getRoomName());

2
shapelight-admin/src/main/java/net/shapelight/modules/video/controller/VideoOpenApi.java
View File

@ -158,7 +158,7 @@ public class VideoOpenApi {
if(videoEntity!=null){
// videoEntity.setIp(deviceIp);
// videoEntity.setLastOnlineTime(new Date());
// tenVideoService.updateTenPersonById(videoEntity);
// tenVideoService.updateById(videoEntity);
}
Map res = new HashMap();