diff --git a/pom.xml b/pom.xml
index 35649fa..83c9395 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,20 @@
2.8.5
2.0.3
+ Greenwich.SR1
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-dependencies
+ ${spring-cloud.version}
+ pom
+ import
+
+
+
diff --git a/shapelight-admin/pom.xml b/shapelight-admin/pom.xml
index dbbb016..56bef91 100644
--- a/shapelight-admin/pom.xml
+++ b/shapelight-admin/pom.xml
@@ -234,6 +234,11 @@
+
+ org.springframework.cloud
+ spring-cloud-starter-openfeign
+
+
diff --git a/shapelight-admin/src/main/java/net/shapelight/AdminApplication.java b/shapelight-admin/src/main/java/net/shapelight/AdminApplication.java
index 4696ffb..d8abce3 100644
--- a/shapelight-admin/src/main/java/net/shapelight/AdminApplication.java
+++ b/shapelight-admin/src/main/java/net/shapelight/AdminApplication.java
@@ -3,29 +3,36 @@
package net.shapelight;
//import net.shapelight.modules.dev.mqtt.MqttClientUtil;
+import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j;
-import net.shapelight.commons.engine.sdk.PalmSDK;
//import org.bytedeco.javacpp.Loader;
//import org.bytedeco.opencv.global.opencv_imgproc;
//import org.bytedeco.opencv.opencv_core.CvPoint;
//import org.bytedeco.opencv.opencv_imgproc.CvFont;
-import org.mybatis.spring.annotation.MapperScan;
+import net.shapelight.common.config.CxFeignConfig;
+import net.shapelight.modules.feignClient.CxFeignClient;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.context.annotation.ImportResource;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
import org.springframework.transaction.annotation.EnableTransactionManagement;
+import javax.annotation.PostConstruct;
+
@Slf4j
//@ImportResource(value = { "classpath:spring/spring.xml" })
@SpringBootApplication//(exclude = DataSourceAutoConfiguration.class)//排除DataSourceConfiguratrion
@EnableCaching
@EnableTransactionManagement
@ServletComponentScan
+@EnableFeignClients
//@MapperScan("net.shapelight.modules.sys.dao")
public class AdminApplication {
+ @Autowired
+ CxFeignClient cxFeignClient;
public static void main(String[] args) {
SpringApplication.run(AdminApplication.class, args);
@@ -53,4 +60,11 @@ public class AdminApplication {
// });
}
+ @Bean
+ @PostConstruct
+ void init(){
+ String res = cxFeignClient.getToken("5bb50ad0cc40e10565089c35aa61e7f3","k9?8bCqaQ*R1e2Wx0f65AzY4^]LDp@_Z");
+ CxFeignConfig.token = res;
+ }
+
}
diff --git a/shapelight-admin/src/main/java/net/shapelight/common/config/CxFeignConfig.java b/shapelight-admin/src/main/java/net/shapelight/common/config/CxFeignConfig.java
new file mode 100644
index 0000000..b3c0dbe
--- /dev/null
+++ b/shapelight-admin/src/main/java/net/shapelight/common/config/CxFeignConfig.java
@@ -0,0 +1,23 @@
+package net.shapelight.common.config;
+
+import feign.Logger;
+import feign.RequestInterceptor;
+import feign.RequestTemplate;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+
+@Slf4j
+public class CxFeignConfig implements RequestInterceptor {
+ public static String token;
+
+ @Bean
+ Logger.Level feignLoggerLevel() {
+ return Logger.Level.FULL;
+ }
+
+
+ @Override
+ public void apply(RequestTemplate requestTemplate) {
+ requestTemplate.header("Bearer ", token);
+ }
+}
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java
index e99dadd..a95f7bd 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java
@@ -25,7 +25,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.service.*;
-import net.shapelight.modules.vo.TenCelldeptSelectVo;
import net.shapelight.modules.vo.TenCelldeptWeVo;
import net.shapelight.modules.vo.TenDeviceVo;
import org.apache.commons.io.FilenameUtils;
@@ -179,7 +178,7 @@ public class AppApiController {
}
}
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}
@@ -328,7 +327,7 @@ public class AppApiController {
Date now = new Date();
tenPerson.setLiveStart(now);
tenPerson.setLiveEnd(new Date(now.getTime()+3600000L));
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}else if(res == 10){
@@ -602,7 +601,7 @@ public class AppApiController {
tenPerson.setCreateTime(new Date());
tenPerson.setRegisterType(Constant.RESGISTER_TYPE_APP);
tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR);
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}
@@ -693,7 +692,7 @@ public class AppApiController {
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}
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 ad94d60..6a99601 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.save(user);
+// userService.saveTenPerson(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 ec1b402..843b73f 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:save")
+ @RequiresPermissions("app:user:saveTenPerson")
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 5851ed0..bcefd68 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:save")
+ @RequiresPermissions("ten:appuserscope:saveTenPerson")
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 5434c85..fb0890e 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.save(enter);
+// this.tenPackRecordEnterService.saveTenPerson(enter);
// res.put("code", "200");
// res.put("msg", "成功");
// return res;
@@ -280,7 +280,7 @@ public class CarOpenApi {
// httpUrl.disconnect();
// }
// }
-// this.tenPackRecordExitService.save(enter);
+// this.tenPackRecordExitService.saveTenPerson(enter);
// res.put("code", "200");
// res.put("msg", "成功");
// return res;
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/feignClient/CxFeignClient.java b/shapelight-admin/src/main/java/net/shapelight/modules/feignClient/CxFeignClient.java
new file mode 100644
index 0000000..2097cd8
--- /dev/null
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/feignClient/CxFeignClient.java
@@ -0,0 +1,37 @@
+package net.shapelight.modules.feignClient;
+
+import cn.hutool.json.JSONObject;
+import net.shapelight.common.config.CxFeignConfig;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.Map;
+
+@FeignClient(name="cxFeignClient",url="${spring.global.qhseUrl}",configuration = CxFeignConfig.class)
+@Component
+public interface CxFeignClient {
+
+ @GetMapping("/Auth/getToken")
+ String getToken(@RequestParam String appid, @RequestParam String appsecret);
+
+ @PostMapping("/ExternalService/SavePmWatchVideoRecord")
+ JSONObject savePmWatchVideoRecord(@RequestParam Map params);
+
+ @PostMapping("/ExternalService/SavePmEntryExitRecord")
+ JSONObject savePmEntryExitRecord(@RequestParam Map params);
+
+ @PostMapping("/ExternalService/SavePmVisitorPersonnel")
+ JSONObject savePmVisitorPersonnel(@RequestParam Map params);
+
+ @GetMapping("/ExternalService/GetPmInternalPersonnelList")
+ JSONObject getPmInternalPersonnelList(@RequestParam Map params);
+
+ @GetMapping("/ExternalService/GetPmContractorDataList")
+ JSONObject getPmContractorDataList(@RequestParam Map params);
+
+ @GetMapping("/ExternalService/GetPmSupplierDataList")
+ JSONObject getPmSupplierDataList(@RequestParam Map params);
+}
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 2f653ff..f27b41b 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:save")
+ @RequiresPermissions("sys:schedule:saveTenPerson")
@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 1c22cca..b666c79 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.updateById(syncEntity);
+// tenPersonSyncService.updateTenPersonById(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
new file mode 100644
index 0000000..2bd0831
--- /dev/null
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java
@@ -0,0 +1,113 @@
+package net.shapelight.modules.job.task;
+
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import io.minio.MinioClient;
+import io.minio.PutObjectOptions;
+import net.shapelight.common.config.GlobalValue;
+import net.shapelight.common.config.MinioConfig;
+import net.shapelight.common.utils.Constant;
+import net.shapelight.common.utils.SnowflakeIdWorker;
+import net.shapelight.common.utils.UUIDUtil;
+import net.shapelight.modules.feignClient.CxFeignClient;
+import net.shapelight.modules.ten.entity.TenCellEntity;
+import net.shapelight.modules.ten.entity.TenPersonEntity;
+import net.shapelight.modules.ten.service.TenCellService;
+import net.shapelight.modules.ten.service.TenPersonService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.util.*;
+
+@Component
+public class PersonSynchronousTask implements ITask{
+ @Resource
+ private CxFeignClient cxFeignClient;
+ @Resource
+ private TenCellService tenCellService;
+ @Autowired
+ private GlobalValue globalValue;
+ @Autowired
+ private MinioClient minioClient;
+ @Autowired
+ private MinioConfig minioConfig;
+ @Autowired
+ private TenPersonService tenPersonService;
+
+
+ @Override
+ public void run(String params) {
+
+ }
+
+ private void GetPmInternalPersonnelList(){
+ List list = tenCellService.list();
+ list.forEach(item -> {
+ boolean flag = true;
+ int pageIndex = 1;
+ while (flag) {
+ Map params = new HashMap<>();
+ params.put("pageIndex",pageIndex);
+ params.put("pageSize",1000);
+ params.put("orgName",item.getName());
+ params.put("orgId",item.getCellId());
+ JSONObject json = cxFeignClient.getPmInternalPersonnelList(params);
+ if(json.getBool("success")) {
+ JSONObject data = json.getJSONObject("data");
+ JSONArray dataList = data.getJSONArray("list");
+ List list1 = dataList.toList(JSONObject.class);
+ list1.forEach(person -> {
+ TenPersonEntity tenPerson = new TenPersonEntity();
+ Date now = new Date();
+ long id = new SnowflakeIdWorker().nextId();
+ tenPerson.setPersonId(id);
+ tenPerson.setUuid(UUIDUtil.uuid());
+ tenPerson.setTenantId(item.getTenantId());
+ tenPerson.setCreateBy("sync");
+ tenPerson.setRegisterType(Constant.RESGISTER_TYPE_FILE);
+ tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR);
+ tenPerson.setCreateTime(now);
+ tenPerson.setLastUpdateTime(now);
+ tenPerson.setName(person.getStr("personnelName"));
+ tenPerson.setGender(1);
+ tenPerson.setNation(1);
+ tenPerson.setCellId(item.getCellId());
+ tenPerson.setPersonType(5000);
+ tenPerson.setOpenId(person.getStr("pmPersonnelId"));
+ tenPerson.setOrgId(person.getStr("orgId"));
+ try {
+ //保存原始图片
+ String userFileUrl = globalValue.getImagesDir() + "/" +
+ tenPerson.getCellId().toString() + "/" +
+ tenPerson.getPersonId().toString() + "/";
+ String orgImageFileName = userFileUrl + "o_" + UUIDUtil.uuid() + ".jpg";
+
+ byte[] b = Base64.getDecoder().decode(person.getStr("attachment").replace("\n",""));
+
+ InputStream inputStream = new ByteArrayInputStream(b);
+ PutObjectOptions putObjectOptions = new PutObjectOptions(inputStream.available(), -1);
+ putObjectOptions.setContentType("image/jpeg");
+ minioClient.putObject(
+ minioConfig.getBucketName(), orgImageFileName, inputStream, putObjectOptions);
+ inputStream.close();
+
+ tenPerson.setOrgImage(orgImageFileName);
+ tenPerson.setFaceImage(orgImageFileName);
+
+ tenPersonService.save3d(tenPerson);
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
+ });
+ }
+ flag = false;
+ }
+ });
+
+ }
+}
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 b2b112d..747c6ec 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
@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
import net.shapelight.common.config.MinioConfig;
import net.shapelight.common.utils.Constant;
import net.shapelight.common.utils.DateUtils;
-import net.shapelight.modules.job.task.ITask;
import net.shapelight.modules.sys.entity.SysUserEntity;
import net.shapelight.modules.sys.service.SysUserService;
import net.shapelight.modules.ten.entity.*;
@@ -23,8 +22,6 @@ import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.xian.service.XaApi;
import net.shapelight.modules.xian.utils.XaUtils;
import net.shapelight.modules.xian.vo.*;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -203,7 +200,7 @@ public class XaImageTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) {
// for (TenRecordEntity recordEntity : updateRecords) {
// recordEntity.setXaSyncImage(1);
-// tenRecordService.updateById(recordEntity);
+// tenRecordService.updateTenPersonById(recordEntity);
// }
// }
if(resJson.contains("ErrorLineParameter")){
@@ -508,7 +505,7 @@ public class XaImageTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) {
// for (TenPackRecordExitEntity recordEntity : updateRecords) {
// recordEntity.setXaSync(1);
-// tenPackRecordExitService.updateById(recordEntity);
+// tenPackRecordExitService.updateTenPersonById(recordEntity);
// }
// }
if(resJson.contains("ErrorLineParameter")){
@@ -686,7 +683,7 @@ public class XaImageTask implements ITask {
if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSyncImage(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}else{
String[] lines = errLine.split(",");
@@ -697,7 +694,7 @@ public class XaImageTask implements ITask {
}else {
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncImage(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}
}
@@ -708,7 +705,7 @@ public class XaImageTask implements ITask {
|| ((String)resData.get("Result")).indexOf("实有人口不存在")>0){
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncImage(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}
}
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 aa4a907..94160cb 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
@@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.*;
-import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j;
import net.shapelight.common.utils.Constant;
import net.shapelight.common.utils.DateUtils;
@@ -17,7 +16,6 @@ import net.shapelight.modules.sys.service.SysUserService;
import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.xian.service.XaApi;
-import net.shapelight.modules.xian.utils.AESUtils;
import net.shapelight.modules.xian.utils.XaUtils;
import net.shapelight.modules.xian.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -186,7 +184,7 @@ public class XaRealDataTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) {
// for (TenRoomEntity room : updateRooms) {
// room.setXaSync(1);
-// tenRoomService.updateById(room);
+// tenRoomService.updateTenPersonById(room);
// }
// }
if(resJson.contains("ErrorLineParameter")){
@@ -303,7 +301,7 @@ public class XaRealDataTask implements ITask {
if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSync(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}else{
// List syncPersonsDelete = new ArrayList();
@@ -314,11 +312,11 @@ public class XaRealDataTask implements ITask {
if(res.equals("接收成功")){
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSync(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}else if(res.indexOf("违反唯一约束条件")>0){
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSync(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
//页面删除过，但是没有上报，这次上报
// XaSYRK realPerson = syncPersons.get(i);
// realPerson.setLV_ZXSJ(DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH));
@@ -337,7 +335,7 @@ public class XaRealDataTask implements ITask {
// }else {
// TenPersonEntity recordEntity = updatePersons.get(i);
// recordEntity.setXaSync(1);
-// tenPersonService.updateById(recordEntity);
+// tenPersonService.updateTenPersonById(recordEntity);
// }
// }
}
@@ -412,7 +410,7 @@ public class XaRealDataTask implements ITask {
if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSyncCard(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}else{
String[] lines = errLine.split(",");
@@ -423,7 +421,7 @@ public class XaRealDataTask implements ITask {
}else {
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncCard(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}
}
@@ -433,7 +431,7 @@ public class XaRealDataTask implements ITask {
if(((String)resData.get("Result")).indexOf("重复申报")>0){
TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncCard(1);
- tenPersonService.updateById(recordEntity);
+ tenPersonService.updateTenPersonById(recordEntity);
}
}
}
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 925d235..2a11fa6 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.updateById(recordEntity);
+// tenRecordService.updateTenPersonById(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.updateById(recordEntity);
+// tenPackRecordEnterService.updateTenPersonById(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.updateById(recordEntity);
+// tenPackRecordExitService.updateTenPersonById(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 eda87da..30a516e 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.save(log);
+// scheduleJobLogService.saveTenPerson(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 c233f98..6e0870f 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.updateById(syncEn);
+// tenPersonSyncService.updateTenPersonById(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 1da152d..224b6fc 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.save(ossEntity);
+// sysOssService.saveTenPerson(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 e1b949f..a52791e 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:save")
+ @RequiresPermissions("sys:appversion:saveTenPerson")
//@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:save")
+ @RequiresPermissions("sys:appversion:saveTenPerson")
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 5a5ead1..2179905 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:save")
+ @RequiresPermissions("sys:config:saveTenPerson")
// @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 39d39bc..70e622f 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:save")
+ @RequiresPermissions("sys:dbbak:saveTenPerson")
//@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 df6452b..9f0edfd 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:save")
+// @RequiresPermissions("sys:dept:saveTenPerson")
// @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 ad4c891..d07b7e9 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.updateById(sysDevice);
+// sysDeviceService.updateTenPersonById(sysDevice);
// }
// }else{
-// sysDeviceService.updateById(sysDevice);
+// sysDeviceService.updateTenPersonById(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 66ea65a..ecd9d03 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("/save")
-// @RequiresPermissions("sys:devicelog:save")
-// public R save(@RequestBody SysDeviceLogEntity sysDeviceLog){
-// sysDeviceLogService.save(sysDeviceLog);
+// @RequestMapping("/saveTenPerson")
+// @RequiresPermissions("sys:devicelog:saveTenPerson")
+// public R saveTenPerson(@RequestBody SysDeviceLogEntity sysDeviceLog){
+// sysDeviceLogService.saveTenPerson(sysDeviceLog);
//
// return R.ok();
// }
@@ -68,7 +68,7 @@ public class SysDeviceLogController {
// @RequestMapping("/update")
// @RequiresPermissions("sys:devicelog:update")
// public R update(@RequestBody SysDeviceLogEntity sysDeviceLog){
-// sysDeviceLogService.updateById(sysDeviceLog);
+// sysDeviceLogService.updateTenPersonById(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 2ffb80f..ee72cbd 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:save")
+ @RequiresPermissions("sys:dict:saveTenPerson")
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 07844ac..2782874 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:save")
+ @RequiresPermissions("sys:menu:saveTenPerson")
@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 76a8f3d..a4d5129 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:save")
+// @RequiresPermissions("sys:role:saveTenPerson")
@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 1a92fab..af166d1 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:save")
+ @RequiresPermissions("sys:user:saveTenPerson")
@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 45f66ad..3a1d3aa 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:save")
+ @RequiresPermissions("systen:user:saveTenPerson")
@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 b1bc093..3ce53bf 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("/save")
-// @RequiresPermissions("ten:address:save")
-// public R save(@RequestBody TenAddressEntity tenAddress) {
-// tenAddressService.save(tenAddress);
+// @PostMapping("/saveTenPerson")
+// @RequiresPermissions("ten:address:saveTenPerson")
+// public R saveTenPerson(@RequestBody TenAddressEntity tenAddress) {
+// tenAddressService.saveTenPerson(tenAddress);
//
// return R.ok();
// }
@@ -70,7 +70,7 @@ public class TenAddressController {
// @PostMapping("/update")
// @RequiresPermissions("ten:address:update")
// public R update(@RequestBody TenAddressEntity tenAddress) {
-// tenAddressService.updateById(tenAddress);
+// tenAddressService.updateTenPersonById(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 2adacdc..1555e48 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:save")
+ //@RequiresPermissions("ten:build:saveTenPerson")
@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 0b64a1e..ba153fd 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:save")
+ //@RequiresPermissions("ten:cell:saveTenPerson")
@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 a73e035..56a7d91 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:save")
+ @RequiresPermissions("ten:tencharge:saveTenPerson")
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 4e710e3..1850454 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:save")
+// @RequiresPermissions("ten:device:saveTenPerson")
@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.save(tenDevice);
+// tenDeviceService.saveTenPerson(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.updateById(tenDevice);
+// tenDeviceService.updateTenPersonById(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 13fc4d9..b9c1d23 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("/save")
+// @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:label")
// @ApiOperation(value = "保存标签")
-// public R save(@RequestBody TenLabelEntity tenLabel) {
+// public R saveTenPerson(@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.save(tenLabel);
+// tenLabelService.saveTenPerson(tenLabel);
//
// return R.ok();
// }
@@ -147,7 +147,7 @@
// tenLabel.setTenantId(getUser().getTenantId());
// tenLabel.setLastUpdateBy(getUser().getUsername());
// tenLabel.setLastUpdateTime(new Date());
-// tenLabelService.updateById(tenLabel);
+// tenLabelService.updateTenPersonById(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 d712dd7..c8ef443 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:save")
+ @RequiresPermissions("ten:log:saveTenPerson")
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 2c180ec..819e884 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("/save")
+// @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:packrecord")
-// public R save(@RequestBody TenPackRecordEntity tenPackRecord){
-// tenPackRecordService.save(tenPackRecord);
+// public R saveTenPerson(@RequestBody TenPackRecordEntity tenPackRecord){
+// tenPackRecordService.saveTenPerson(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.updateById(tenPackRecord);
+// tenPackRecordService.updateTenPersonById(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 3f6bb5e..95e0adf 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:save")
+ @RequiresPermissions("ten:tenpay:saveTenPerson")
public R save(@RequestBody TenPayEntity tenPay){
tenPayService.save(tenPay);
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java
index 1d002b3..28c9a50 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java
@@ -3,7 +3,6 @@ package net.shapelight.modules.ten.controller;
import java.awt.image.BufferedImage;
import java.io.*;
import java.net.URLEncoder;
-import java.nio.file.Files;
import java.util.*;
import java.util.zip.ZipOutputStream;
@@ -23,7 +22,6 @@ import net.shapelight.common.config.GlobalValue;
import net.shapelight.common.config.MinioConfig;
import net.shapelight.common.utils.*;
import net.shapelight.commons.engine.sdk.PalmSDK;
-import net.shapelight.commons.engine.sdk.PicSDK;
import net.shapelight.commons.engine.sdk.SdkImageUtils;
import net.shapelight.commons.engine.sdk.palm.FaceFeatureBase;
import net.shapelight.commons.engine.sdk.palm.OutArg;
@@ -33,7 +31,6 @@ import net.shapelight.modules.excel.model.PersonModel;
import net.shapelight.modules.face.entity.UserCompareInfo;
import net.shapelight.modules.face.util.Base64Util;
import net.shapelight.modules.face.util.UserInfo;
-import net.shapelight.modules.face.util.UserRamCache;
import net.shapelight.modules.face.util.UserRamGroup;
import net.shapelight.modules.nettyapi.service.ServerApiService;
import net.shapelight.modules.sys.controller.AbstractController;
@@ -43,9 +40,6 @@ import net.shapelight.modules.sys.service.SysUserService;
import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.ten.vo.PersonExcelModel;
-import net.shapelight.modules.vo.TenDeviceVo;
-import net.shapelight.modules.vo.TenPersonOperationVo;
-import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -464,7 +458,7 @@ public class TenPersonController extends AbstractController {
if(card!=null){
return R.error("卡号已录入");
}
-// tenDoorCardService.save(tenPerson);
+// tenDoorCardService.saveTenPerson(tenPerson);
}
@@ -497,7 +491,7 @@ public class TenPersonController extends AbstractController {
tenPerson.setCreateTime(new Date());
tenPerson.setRegisterType(Constant.RESGISTER_TYPE_WEB);
tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR);
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}
@@ -607,10 +601,10 @@ public class TenPersonController extends AbstractController {
// }
//
// }
-//// tenDoorCardService.save(tenPerson);
+//// tenDoorCardService.saveTenPerson(tenPerson);
// }
- String resStr = tenPersonService.updateById(tenPerson);
+ String resStr = tenPersonService.updateTenPersonById(tenPerson);
if(resStr.equals("OK")){
return R.ok();
}else{
@@ -685,7 +679,7 @@ public class TenPersonController extends AbstractController {
// }else{
// syncEntity.setState(Constant.PERSON_SYNC_MODIFY);
// syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime());
-// tenPersonSyncService.updateById(syncEntity);
+// tenPersonSyncService.updateTenPersonById(syncEntity);
//
// //下发通知
// List list = new ArrayList<>();
@@ -706,7 +700,7 @@ public class TenPersonController extends AbstractController {
// if(syncEntity!=null){
// syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime());
-// tenPersonSyncService.updateById(syncEntity);
+// tenPersonSyncService.updateTenPersonById(syncEntity);
// //下发通知
// List list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo();
@@ -1184,7 +1178,7 @@ public class TenPersonController extends AbstractController {
//----------------------------------掌静脉特征压缩包封装--------------------------------------
- String resStr = tenPersonService.updateById(tenPerson);
+ String resStr = tenPersonService.updateTenPersonById(tenPerson);
if(resStr.equals("OK")){
return R.ok();
}else{
@@ -1242,7 +1236,7 @@ public class TenPersonController extends AbstractController {
if(card!=null){
return R.error("卡号已录入");
}
-// tenDoorCardService.save(tenPerson);
+// tenDoorCardService.saveTenPerson(tenPerson);
}
@@ -1396,7 +1390,7 @@ public class TenPersonController extends AbstractController {
//----------------------------------掌静脉特征压缩包封装--------------------------------------
- int res = tenPersonService.save(tenPerson);
+ int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) {
return R.error("照片未检测到人脸");
}
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 48ff6a4..e8cc305 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:save")
+ @RequiresPermissions("ten:personextract:saveTenPerson")
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 a80cb60..ff71197 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("/save")
-// @RequiresPermissions("ten:personsync:save")
-// public R save(@RequestBody TenPersonSyncEntity tenPersonSync){
-// tenPersonSyncService.save(tenPersonSync);
+// @PostMapping("/saveTenPerson")
+// @RequiresPermissions("ten:personsync:saveTenPerson")
+// public R saveTenPerson(@RequestBody TenPersonSyncEntity tenPersonSync){
+// tenPersonSyncService.saveTenPerson(tenPersonSync);
//
// return R.ok();
// }
@@ -64,7 +64,7 @@ public class TenPersonSyncController {
// @PostMapping("/update")
// @RequiresPermissions("ten:personsync:update")
// public R update(@RequestBody TenPersonSyncEntity tenPersonSync){
-// tenPersonSyncService.updateById(tenPersonSync);
+// tenPersonSyncService.updateTenPersonById(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 8e510b9..a26821a 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("/save")
-//// @RequiresPermissions("ten:tenrecord:save")
-// public R save(@RequestBody TenRecordEntity tenRecord){
-// tenRecordService.save(tenRecord);
+// @PostMapping("/saveTenPerson")
+//// @RequiresPermissions("ten:tenrecord:saveTenPerson")
+// public R saveTenPerson(@RequestBody TenRecordEntity tenRecord){
+// tenRecordService.saveTenPerson(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 58f8f5e..c2c8d78 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.updateById(oldCard);
+// tenDoorCardService.updateTenPersonById(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.updateById(oldCard);
+// tenDoorCardService.updateTenPersonById(oldCard);
// }
// }
// } else {
@@ -293,7 +293,7 @@ public class TenRoomController extends AbstractController {
// Date now = new Date();
// newCard.setCreateTime(now);
// newCard.setLastUpdateTime(now);
-// tenDoorCardService.save(newCard);
+// tenDoorCardService.saveTenPerson(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 be4cb04..2dc9137 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.save(tenRule);
+// tenRuleService.saveTenPerson(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 8d0a08c..66a40de 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:save")
+ @RequiresPermissions("ten:tenthirdparty:saveTenPerson")
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 f2a57a1..ade1802 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:save")
+ //@RequiresPermissions("ten:user:saveTenPerson")
@ApiOperation("保存用户")
- @RequiresPermissions("ten:user:save")
+ @RequiresPermissions("ten:user:saveTenPerson")
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/dao/TenPersonDao.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPersonDao.java
index e3b5daa..cbb5f45 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPersonDao.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPersonDao.java
@@ -19,7 +19,7 @@ import java.util.Map;
*
*/
@Mapper
-public interface TenPersonDao {
+public interface TenPersonDao extends BaseMapper{
int insert(TenPersonEntity entity);
int deleteById(@Param("personId")Long personId, @Param("cellId")Long cellId);
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCellEntity.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCellEntity.java
index cf26c6f..20483d6 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCellEntity.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCellEntity.java
@@ -121,4 +121,6 @@ public class TenCellEntity extends BaseEntity implements Serializable {
@ApiModelProperty("住户总数")
private Integer ownerCount;
+ private String orgId;
+
}
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 eb5c6a9..9ce3461 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
@@ -360,6 +360,8 @@ public class TenPersonEntity extends BaseEntity implements Serializable {
@TableField(exist = false)
private String deptAllName;
+ private String orgId;
+
//--------v10掌静脉---------------
private String pvLeft;
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/listen/RedisKeyExpirationListener.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/listen/RedisKeyExpirationListener.java
index f60cec7..11a3ef3 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/listen/RedisKeyExpirationListener.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/listen/RedisKeyExpirationListener.java
@@ -50,7 +50,7 @@
// }else if(ids[1].equals("e")){
// personEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT);
// }
-// tenPersonService.updateById(personEntity);
+// tenPersonService.updateTenPersonById(personEntity);
// }
//
//
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 cc9aacf..918391b 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 save(TenPackRecordEntity entity);
+// boolean saveTenPerson(TenPackRecordEntity entity);
// boolean removeById(Long roomId,Long cellId);
//
// boolean removeByIdList(List> idList);
-// boolean updateById(TenPackRecordEntity entity);
+// boolean updateTenPersonById(TenPackRecordEntity entity);
// TenPackRecordEntity getById(Long id,Long cellId);
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPersonService.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPersonService.java
index e4cd90e..7c9f1f3 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPersonService.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPersonService.java
@@ -6,7 +6,6 @@ import net.shapelight.modules.excel.model.PersonModel;
import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.vo.PersonExcelModel;
import net.shapelight.modules.vo.*;
-import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -15,7 +14,7 @@ import java.util.Map;
* 人员表
*
*/
-public interface TenPersonService {
+public interface TenPersonService extends IService {
PageUtils queryPage(Map params);
List queryPersonModel(Map params);
@@ -23,7 +22,7 @@ public interface TenPersonService {
PageUtils queryVerify(Map params);
- int save(TenPersonEntity entity);
+ int saveTenPerson(TenPersonEntity entity);
int save3d(TenPersonEntity entity);
int update3d(TenPersonEntity entity);
boolean saveOtherRoom(TenPersonEntity entity);
@@ -34,7 +33,7 @@ public interface TenPersonService {
boolean reviewByIdList(List> roomIdList);
- String updateById(TenPersonEntity entity);
+ String updateTenPersonById(TenPersonEntity entity);
boolean updateStatusById(TenPersonEntity entity);
void updateStatusByIds(List entitys);
boolean updateLabelById(TenPersonEntity entity);
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 eea35f6..9eaeded 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.save(room);
+// tenRoomService.saveTenPerson(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 682d64c..da68684 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 implements TenPersonService {
@Autowired
private TenCellService tenCellService;
@Autowired
@@ -375,7 +375,7 @@ public class TenPersonServiceImpl implements TenPersonService {
@Override
@Transactional(rollbackFor = Exception.class)
@CacheEvict(value = "TenPerson", allEntries = true)
- public int save(TenPersonEntity entity) {
+ public int saveTenPerson(TenPersonEntity entity) {
String userFileUrl = globalValue.getImagesDir() + "/org/";
try {
//保存原始图片
@@ -627,7 +627,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// card.setCreateBy(getUser().getUsername());
card.setCreateTime(now);
card.setLastUpdateTime(now);
-// tenDoorCardService.save(doorCardEntity);
+// tenDoorCardService.saveTenPerson(doorCardEntity);
tenDoorCardService.save(card);
}
//保存App用户
@@ -929,7 +929,7 @@ public class TenPersonServiceImpl implements TenPersonService {
//// appUser.setSalt(salt);
// appUser.setPassword(DigestUtils.sha256Hex(entity.getPassword()));
// appUser.setCreateTime(new Date());
-// appUserService.save(appUser);
+// appUserService.saveTenPerson(appUser);
//保存房产信息
AppUserScopeEntity appScope = new AppUserScopeEntity();
@@ -940,7 +940,7 @@ public class TenPersonServiceImpl implements TenPersonService {
appUserScopeService.save(appScope);
// appUser.setCurrentScopeId(appScope.getUserScopeId());
-// appUserService.updateById(appUser);
+// appUserService.updateTenPersonById(appUser);
}
@@ -1057,7 +1057,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// TenPersonSyncEntity syncEntity = tenPersonSyncService.findByDeviceIdAndPersonId(deviceEntity.getDeviceId(), personId, tenantId);
// syncEntity.setLastUpdateTime(lastUpdateTime);
// syncEntity.setState(Constant.PERSON_SYNC_DELETE);
-// tenPersonSyncService.updateById(syncEntity);
+// tenPersonSyncService.updateTenPersonById(syncEntity);
// }
// //下发通知
// List allDelete = tenPersonSyncService.findDeviceAllDeletePersons(deviceEntity.getDeviceId(), deviceEntity.getTenantId());
@@ -1130,7 +1130,7 @@ public class TenPersonServiceImpl implements TenPersonService {
@Override
@CacheEvict(value = "TenPerson", key = "#entity.personId+'-'+#entity.cellId")
- public String updateById(TenPersonEntity entity) {
+ public String updateTenPersonById(TenPersonEntity entity) {
if (entity.getUsername() != null && entity.getUsername().isEmpty()) {
entity.setUsername(null);
}
@@ -1562,7 +1562,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// }
// oldCard.setDoorCard(entity.getDoorCardEntity().getDoorCard());
// oldCard.setLastUpdateTime(new Date());
-// tenDoorCardService.updateById(oldCard);
+// tenDoorCardService.updateTenPersonById(oldCard);
// }
// } else {
// if (entity.getDoorCardEntity().getValidBegin() == null) {
@@ -1582,7 +1582,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// }
//// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd());
// oldCard.setLastUpdateTime(new Date());
-// tenDoorCardService.updateById(oldCard);
+// tenDoorCardService.updateTenPersonById(oldCard);
// }
// }
// } else {
@@ -1611,7 +1611,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// Date now = new Date();
// newCard.setCreateTime(now);
// newCard.setLastUpdateTime(now);
-// tenDoorCardService.save(newCard);
+// tenDoorCardService.saveTenPerson(newCard);
// }
}
@@ -1640,7 +1640,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// for (TenPersonSyncEntity syncEn : syncEntitys) {
// syncEn.setLastUpdateTime(entity.getLastUpdateTime());
// syncEn.setState(2);
-// tenPersonSyncService.updateById(syncEn);
+// tenPersonSyncService.updateTenPersonById(syncEn);
// //下发通知
// List list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo();
@@ -2170,11 +2170,11 @@ public class TenPersonServiceImpl implements TenPersonService {
// if(type.equals("s") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_DATE_NOT_START){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_NOMOR);
// tenPersonEntity.setLastUpdateTime(new Date());
-// tenPersonDao.updateById(tenPersonEntity);
+// tenPersonDao.updateTenPersonById(tenPersonEntity);
// }else if(type.equals("e") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_NOMOR){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT);
// tenPersonEntity.setLastUpdateTime(new Date());
-// tenPersonDao.updateById(tenPersonEntity);
+// tenPersonDao.updateTenPersonById(tenPersonEntity);
// }
// List devList = tenDeviceService.findByCellId(cellId);
// for (TenDeviceVo dev : devList) {
@@ -2330,7 +2330,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// doorCardEntity.setDoorCard(personModel.getDoorCard());
// doorCardEntity.setCellId(tenPerson.getCellId());
// doorCardEntity.setPersonId(tenPerson.getPersonId());
-// tenDoorCardService.save(doorCardEntity);
+// tenDoorCardService.saveTenPerson(doorCardEntity);
// }
diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenSyncServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenSyncServiceImpl.java
index b3ef4c2..9a5881a 100644
--- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenSyncServiceImpl.java
+++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenSyncServiceImpl.java
@@ -336,7 +336,7 @@ public class TenSyncServiceImpl implements TenSyncService {
int total = syncA001(cellEntity,1);
log.debug("同步inxex：1");
if(total>1){
- for(int i = 2;i