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

修改personservice方法

This commit is contained in:
张博 2024-10-16 16:56:18 +08:00
parent f479f053b3
commit a401815a90
61 changed files with 339 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pom.xml
View File

@ -45,7 +45,20 @@
<gson.version>2.8.5</gson.version> <gson.version>2.8.5</gson.version>
<!--<sharding.jdbc.version>3.0.0</sharding.jdbc.version>--> <!--<sharding.jdbc.version>3.0.0</sharding.jdbc.version>-->
<sharding.jdbc.version>2.0.3</sharding.jdbc.version> <sharding.jdbc.version>2.0.3</sharding.jdbc.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
</properties> </properties>
<dependencyManagement>
<dependencies>
<!-- SpringCloud 版本依赖 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>

5
shapelight-admin/pom.xml
View File

@ -234,6 +234,11 @@
<!-- <systemPath>${project.basedir}/libs/arcsoft-sdk-face-3.0.0.0.jar</systemPath>--> <!-- <systemPath>${project.basedir}/libs/arcsoft-sdk-face-3.0.0.0.jar</systemPath>-->
</dependency> </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
</dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.arcsoft.face</groupId>--> <!-- <groupId>com.arcsoft.face</groupId>-->
<!-- <artifactId>arcsoft-sdk-face</artifactId>--> <!-- <artifactId>arcsoft-sdk-face</artifactId>-->

22
shapelight-admin/src/main/java/net/shapelight/AdminApplication.java
View File

@ -3,29 +3,36 @@
package net.shapelight; package net.shapelight;
//import net.shapelight.modules.dev.mqtt.MqttClientUtil; //import net.shapelight.modules.dev.mqtt.MqttClientUtil;
import cn.hutool.json.JSONObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.shapelight.commons.engine.sdk.PalmSDK;
//import org.bytedeco.javacpp.Loader; //import org.bytedeco.javacpp.Loader;
//import org.bytedeco.opencv.global.opencv_imgproc; //import org.bytedeco.opencv.global.opencv_imgproc;
//import org.bytedeco.opencv.opencv_core.CvPoint; //import org.bytedeco.opencv.opencv_core.CvPoint;
//import org.bytedeco.opencv.opencv_imgproc.CvFont; //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.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
import org.springframework.boot.web.servlet.ServletComponentScan; import org.springframework.boot.web.servlet.ServletComponentScan;
import org.springframework.cache.annotation.EnableCaching; 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 org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.annotation.PostConstruct;
@Slf4j @Slf4j
//@ImportResource(value = { "classpath:spring/spring.xml" }) //@ImportResource(value = { "classpath:spring/spring.xml" })
@SpringBootApplication//(exclude = DataSourceAutoConfiguration.class)//排除DataSourceConfiguratrion @SpringBootApplication//(exclude = DataSourceAutoConfiguration.class)//排除DataSourceConfiguratrion
@EnableCaching @EnableCaching
@EnableTransactionManagement @EnableTransactionManagement
@ServletComponentScan @ServletComponentScan
@EnableFeignClients
//@MapperScan("net.shapelight.modules.sys.dao") //@MapperScan("net.shapelight.modules.sys.dao")
public class AdminApplication { public class AdminApplication {
@Autowired
CxFeignClient cxFeignClient;
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(AdminApplication.class, 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;
}
} }

23
shapelight-admin/src/main/java/net/shapelight/common/config/CxFeignConfig.java Normal file
View File

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

9
shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppApiController.java
View File

@ -25,7 +25,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import net.shapelight.modules.ten.entity.*; import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.service.*; import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.vo.TenCelldeptSelectVo;
import net.shapelight.modules.vo.TenCelldeptWeVo; import net.shapelight.modules.vo.TenCelldeptWeVo;
import net.shapelight.modules.vo.TenDeviceVo; import net.shapelight.modules.vo.TenDeviceVo;
import org.apache.commons.io.FilenameUtils; 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) { if (res==2) {
return R.error("照片未检测到人脸"); return R.error("照片未检测到人脸");
} }
@ -328,7 +327,7 @@ public class AppApiController {
Date now = new Date(); Date now = new Date();
tenPerson.setLiveStart(now); tenPerson.setLiveStart(now);
tenPerson.setLiveEnd(new Date(now.getTime()+3600000L)); tenPerson.setLiveEnd(new Date(now.getTime()+3600000L));
int res = tenPersonService.save(tenPerson); int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) { if (res==2) {
return R.error("照片未检测到人脸"); return R.error("照片未检测到人脸");
}else if(res == 10){ }else if(res == 10){
@ -602,7 +601,7 @@ public class AppApiController {
tenPerson.setCreateTime(new Date()); tenPerson.setCreateTime(new Date());
tenPerson.setRegisterType(Constant.RESGISTER_TYPE_APP); tenPerson.setRegisterType(Constant.RESGISTER_TYPE_APP);
tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR); tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR);
int res = tenPersonService.save(tenPerson); int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) { if (res==2) {
return R.error("照片未检测到人脸"); return R.error("照片未检测到人脸");
} }
@ -693,7 +692,7 @@ public class AppApiController {
int res = tenPersonService.save(tenPerson); int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) { if (res==2) {
return R.error("照片未检测到人脸"); return R.error("照片未检测到人脸");
} }

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.setUsername(mobile);
// user.setPassword(DigestUtils.sha256Hex(password)); // user.setPassword(DigestUtils.sha256Hex(password));
// user.setCreateTime(new Date()); // user.setCreateTime(new Date());
// userService.save(user); // userService.saveTenPerson(user);
// request.getSession().setAttribute("verifyCode", null); // request.getSession().setAttribute("verifyCode", null);
// return R.ok(); // 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") @RequestMapping("/save")
@RequiresPermissions("app:user:save") @RequiresPermissions("app:user:saveTenPerson")
public R save(@RequestBody AppUserEntity appUser){ public R save(@RequestBody AppUserEntity appUser){
appUserService.save(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") @RequestMapping("/save")
@RequiresPermissions("ten:appuserscope:save") @RequiresPermissions("ten:appuserscope:saveTenPerson")
public R save(@RequestBody AppUserScopeEntity appUserScope){ public R save(@RequestBody AppUserScopeEntity appUserScope){
appUserScopeService.save(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(); // httpUrl.disconnect();
// } // }
// } // }
// this.tenPackRecordEnterService.save(enter); // this.tenPackRecordEnterService.saveTenPerson(enter);
// res.put("code", "200"); // res.put("code", "200");
// res.put("msg", "成功"); // res.put("msg", "成功");
// return res; // return res;
@ -280,7 +280,7 @@ public class CarOpenApi {
// httpUrl.disconnect(); // httpUrl.disconnect();
// } // }
// } // }
// this.tenPackRecordExitService.save(enter); // this.tenPackRecordExitService.saveTenPerson(enter);
// res.put("code", "200"); // res.put("code", "200");
// res.put("msg", "成功"); // res.put("msg", "成功");
// return res; // return res;

37
shapelight-admin/src/main/java/net/shapelight/modules/feignClient/CxFeignClient.java Normal file
View File

@ -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<String,Object> params);
@PostMapping("/ExternalService/SavePmEntryExitRecord")
JSONObject savePmEntryExitRecord(@RequestParam Map<String,Object> params);
@PostMapping("/ExternalService/SavePmVisitorPersonnel")
JSONObject savePmVisitorPersonnel(@RequestParam Map<String,Object> params);
@GetMapping("/ExternalService/GetPmInternalPersonnelList")
JSONObject getPmInternalPersonnelList(@RequestParam Map<String,Object> params);
@GetMapping("/ExternalService/GetPmContractorDataList")
JSONObject getPmContractorDataList(@RequestParam Map<String,Object> params);
@GetMapping("/ExternalService/GetPmSupplierDataList")
JSONObject getPmSupplierDataList(@RequestParam Map<String,Object> params);
}

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

@ -62,7 +62,7 @@ public class ScheduleJobController {
*/ */
@SysLog("保存定时任务") @SysLog("保存定时任务")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("sys:schedule:save") @RequiresPermissions("sys:schedule:saveTenPerson")
@ApiOperation("增加定时任务") @ApiOperation("增加定时任务")
public R save(@RequestBody ScheduleJobEntity scheduleJob){ public R save(@RequestBody ScheduleJobEntity scheduleJob){
ValidatorUtils.validateEntity(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()); // List<TenPersonSyncEntity> syncEntityList = tenPersonSyncService.findByPersonId(guest.getPersonId(),guest.getTenantId());
// for(TenPersonSyncEntity syncEntity: syncEntityList){ // for(TenPersonSyncEntity syncEntity: syncEntityList){
// syncEntity.setState(Constant.PERSON_SYNC_DELETE); // syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// tenPersonSyncService.updateById(syncEntity); // tenPersonSyncService.updateTenPersonById(syncEntity);
// } // }
} }
//断开说有设备 //断开说有设备

113
shapelight-admin/src/main/java/net/shapelight/modules/job/task/PersonSynchronousTask.java Normal file
View File

@ -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<TenCellEntity> list = tenCellService.list();
list.forEach(item -> {
boolean flag = true;
int pageIndex = 1;
while (flag) {
Map<String,Object> 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<JSONObject> 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;
}
});
}
}

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

@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
import net.shapelight.common.config.MinioConfig; import net.shapelight.common.config.MinioConfig;
import net.shapelight.common.utils.Constant; import net.shapelight.common.utils.Constant;
import net.shapelight.common.utils.DateUtils; 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.entity.SysUserEntity;
import net.shapelight.modules.sys.service.SysUserService; import net.shapelight.modules.sys.service.SysUserService;
import net.shapelight.modules.ten.entity.*; 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.service.XaApi;
import net.shapelight.modules.xian.utils.XaUtils; import net.shapelight.modules.xian.utils.XaUtils;
import net.shapelight.modules.xian.vo.*; import net.shapelight.modules.xian.vo.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@ -203,7 +200,7 @@ public class XaImageTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenRecordEntity recordEntity : updateRecords) { // for (TenRecordEntity recordEntity : updateRecords) {
// recordEntity.setXaSyncImage(1); // recordEntity.setXaSyncImage(1);
// tenRecordService.updateById(recordEntity); // tenRecordService.updateTenPersonById(recordEntity);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ if(resJson.contains("ErrorLineParameter")){
@ -508,7 +505,7 @@ public class XaImageTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenPackRecordExitEntity recordEntity : updateRecords) { // for (TenPackRecordExitEntity recordEntity : updateRecords) {
// recordEntity.setXaSync(1); // recordEntity.setXaSync(1);
// tenPackRecordExitService.updateById(recordEntity); // tenPackRecordExitService.updateTenPersonById(recordEntity);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ if(resJson.contains("ErrorLineParameter")){
@ -686,7 +683,7 @@ public class XaImageTask implements ITask {
if(errLine.equals("empty")){ if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) { for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSyncImage(1); recordEntity.setXaSyncImage(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
}else{ }else{
String[] lines = errLine.split(","); String[] lines = errLine.split(",");
@ -697,7 +694,7 @@ public class XaImageTask implements ITask {
}else { }else {
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncImage(1); recordEntity.setXaSyncImage(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
} }
} }
@ -708,7 +705,7 @@ public class XaImageTask implements ITask {
|| ((String)resData.get("Result")).indexOf("实有人口不存在")>0){ || ((String)resData.get("Result")).indexOf("实有人口不存在")>0){
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncImage(1); recordEntity.setXaSyncImage(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
} }
} }

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

@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import java.util.*; import java.util.*;
import com.google.gson.JsonObject;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import net.shapelight.common.utils.Constant; import net.shapelight.common.utils.Constant;
import net.shapelight.common.utils.DateUtils; 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.entity.*;
import net.shapelight.modules.ten.service.*; import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.xian.service.XaApi; 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.utils.XaUtils;
import net.shapelight.modules.xian.vo.*; import net.shapelight.modules.xian.vo.*;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -186,7 +184,7 @@ public class XaRealDataTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenRoomEntity room : updateRooms) { // for (TenRoomEntity room : updateRooms) {
// room.setXaSync(1); // room.setXaSync(1);
// tenRoomService.updateById(room); // tenRoomService.updateTenPersonById(room);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ if(resJson.contains("ErrorLineParameter")){
@ -303,7 +301,7 @@ public class XaRealDataTask implements ITask {
if(errLine.equals("empty")){ if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) { for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSync(1); recordEntity.setXaSync(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
}else{ }else{
// List<XaSYRK> syncPersonsDelete = new ArrayList(); // List<XaSYRK> syncPersonsDelete = new ArrayList();
@ -314,11 +312,11 @@ public class XaRealDataTask implements ITask {
if(res.equals("接收成功")){ if(res.equals("接收成功")){
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSync(1); recordEntity.setXaSync(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
}else if(res.indexOf("违反唯一约束条件")>0){ }else if(res.indexOf("违反唯一约束条件")>0){
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSync(1); recordEntity.setXaSync(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
//页面删除过，但是没有上报，这次上报 //页面删除过，但是没有上报，这次上报
// XaSYRK realPerson = syncPersons.get(i); // XaSYRK realPerson = syncPersons.get(i);
// realPerson.setLV_ZXSJ(DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH)); // realPerson.setLV_ZXSJ(DateUtils.format(new Date(),DateUtils.DATE_YEAR_MONTH));
@ -337,7 +335,7 @@ public class XaRealDataTask implements ITask {
// }else { // }else {
// TenPersonEntity recordEntity = updatePersons.get(i); // TenPersonEntity recordEntity = updatePersons.get(i);
// recordEntity.setXaSync(1); // recordEntity.setXaSync(1);
// tenPersonService.updateById(recordEntity); // tenPersonService.updateTenPersonById(recordEntity);
// } // }
// } // }
} }
@ -412,7 +410,7 @@ public class XaRealDataTask implements ITask {
if(errLine.equals("empty")){ if(errLine.equals("empty")){
for (TenPersonEntity recordEntity : updatePersons) { for (TenPersonEntity recordEntity : updatePersons) {
recordEntity.setXaSyncCard(1); recordEntity.setXaSyncCard(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
}else{ }else{
String[] lines = errLine.split(","); String[] lines = errLine.split(",");
@ -423,7 +421,7 @@ public class XaRealDataTask implements ITask {
}else { }else {
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncCard(1); 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){ if(((String)resData.get("Result")).indexOf("重复申报")>0){
TenPersonEntity recordEntity = updatePersons.get(i); TenPersonEntity recordEntity = updatePersons.get(i);
recordEntity.setXaSyncCard(1); recordEntity.setXaSyncCard(1);
tenPersonService.updateById(recordEntity); tenPersonService.updateTenPersonById(recordEntity);
} }
} }
} }

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\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenRecordEntity recordEntity : updateRecords) { // for (TenRecordEntity recordEntity : updateRecords) {
// recordEntity.setXaSync(1); // recordEntity.setXaSync(1);
// tenRecordService.updateById(recordEntity); // tenRecordService.updateTenPersonById(recordEntity);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ if(resJson.contains("ErrorLineParameter")){
@ -259,7 +259,7 @@ public class XaRecordTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenPackRecordEnterEntity recordEntity : updateRecords) { // for (TenPackRecordEnterEntity recordEntity : updateRecords) {
// recordEntity.setXaSync(1); // recordEntity.setXaSync(1);
// tenPackRecordEnterService.updateById(recordEntity); // tenPackRecordEnterService.updateTenPersonById(recordEntity);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ if(resJson.contains("ErrorLineParameter")){
@ -393,7 +393,7 @@ public class XaRecordTask implements ITask {
// if (resJson.contains("\"code\":\"0000\"")) { // if (resJson.contains("\"code\":\"0000\"")) {
// for (TenPackRecordExitEntity recordEntity : updateRecords) { // for (TenPackRecordExitEntity recordEntity : updateRecords) {
// recordEntity.setXaSync(1); // recordEntity.setXaSync(1);
// tenPackRecordExitService.updateById(recordEntity); // tenPackRecordExitService.updateTenPersonById(recordEntity);
// } // }
// } // }
if(resJson.contains("ErrorLineParameter")){ 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); scheduleJobLogService.save(log);
}finally { }finally {
// scheduleJobLogService.save(log); // scheduleJobLogService.saveTenPerson(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) { // for (TenPersonSyncEntity syncEn : syncEntitys) {
// syncEn.setLastUpdateTime(p.getLastUpdateTime()); // syncEn.setLastUpdateTime(p.getLastUpdateTime());
// syncEn.setState(2); // syncEn.setState(2);
// tenPersonSyncService.updateById(syncEn); // tenPersonSyncService.updateTenPersonById(syncEn);
// //下发通知 // //下发通知
// List<TenPersonOperationVo> list = new ArrayList<>(); // List<TenPersonOperationVo> list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo(); // 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(); // SysOssEntity ossEntity = new SysOssEntity();
// ossEntity.setUrl(url); // ossEntity.setUrl(url);
// ossEntity.setCreateDate(new Date()); // ossEntity.setCreateDate(new Date());
// sysOssService.save(ossEntity); // sysOssService.saveTenPerson(ossEntity);
// //
// return R.ok().put("data", url); // 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") @PostMapping("/save")
@RequiresPermissions("sys:appversion:save") @RequiresPermissions("sys:appversion:saveTenPerson")
//@ApiOperation("保存") //@ApiOperation("保存")
public R save(@RequestBody SysAppVersionEntity sysAppVersion){ public R save(@RequestBody SysAppVersionEntity sysAppVersion){
sysAppVersionService.save(sysAppVersion); sysAppVersionService.save(sysAppVersion);
@ -109,7 +109,7 @@ public class SysAppVersionController {
@PostMapping("/upload") @PostMapping("/upload")
@ResponseBody @ResponseBody
// @ApiOperation("上传apk文件") // @ApiOperation("上传apk文件")
@RequiresPermissions("sys:appversion:save") @RequiresPermissions("sys:appversion:saveTenPerson")
public R upload(@RequestParam("file") MultipartFile file) public R upload(@RequestParam("file") MultipartFile file)
{ {
try 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("保存配置") @SysLog("保存配置")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("sys:config:save") @RequiresPermissions("sys:config:saveTenPerson")
// @ApiOperation("保存配置") // @ApiOperation("保存配置")
public R save(@RequestBody SysConfigEntity config){ public R save(@RequestBody SysConfigEntity config){
ValidatorUtils.validateEntity(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") @PostMapping("/save")
@RequiresPermissions("sys:dbbak:save") @RequiresPermissions("sys:dbbak:saveTenPerson")
//@ApiOperation("保存数据库备份文件") //@ApiOperation("保存数据库备份文件")
public R save(@RequestBody SysDbBakEntity sysDbBak) { public R save(@RequestBody SysDbBakEntity sysDbBak) {
sysDbBakService.save(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") @PostMapping("/save")
// @RequiresPermissions("sys:dept:save") // @RequiresPermissions("sys:dept:saveTenPerson")
// @ApiOperation("保存部门") // @ApiOperation("保存部门")
public R save(@RequestBody SysDeptEntity dept){ public R save(@RequestBody SysDeptEntity dept){
sysDeptService.save(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){ // if(flag == -1){
// return R.error("设备不在线"); // return R.error("设备不在线");
// }else { // }else {
// sysDeviceService.updateById(sysDevice); // sysDeviceService.updateTenPersonById(sysDevice);
// } // }
// }else{ // }else{
// sysDeviceService.updateById(sysDevice); // sysDeviceService.updateTenPersonById(sysDevice);
// } // }
sysDeviceService.updateById(sysDevice); sysDeviceService.updateById(sysDevice);
return R.ok(); 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("/save") // @RequestMapping("/saveTenPerson")
// @RequiresPermissions("sys:devicelog:save") // @RequiresPermissions("sys:devicelog:saveTenPerson")
// public R save(@RequestBody SysDeviceLogEntity sysDeviceLog){ // public R saveTenPerson(@RequestBody SysDeviceLogEntity sysDeviceLog){
// sysDeviceLogService.save(sysDeviceLog); // sysDeviceLogService.saveTenPerson(sysDeviceLog);
// //
// return R.ok(); // return R.ok();
// } // }
@ -68,7 +68,7 @@ public class SysDeviceLogController {
// @RequestMapping("/update") // @RequestMapping("/update")
// @RequiresPermissions("sys:devicelog:update") // @RequiresPermissions("sys:devicelog:update")
// public R update(@RequestBody SysDeviceLogEntity sysDeviceLog){ // public R update(@RequestBody SysDeviceLogEntity sysDeviceLog){
// sysDeviceLogService.updateById(sysDeviceLog); // sysDeviceLogService.updateTenPersonById(sysDeviceLog);
// //
// return R.ok(); // 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") @PostMapping("/save")
@RequiresPermissions("sys:dict:save") @RequiresPermissions("sys:dict:saveTenPerson")
public R save(@RequestBody SysDictEntity dict){ public R save(@RequestBody SysDictEntity dict){
//校验类型 //校验类型
ValidatorUtils.validateEntity(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("保存菜单") @SysLog("保存菜单")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("sys:menu:save") @RequiresPermissions("sys:menu:saveTenPerson")
@ApiOperation("保存菜单") @ApiOperation("保存菜单")
public R save(@RequestBody SysMenuEntity menu){ 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("保存角色") @SysLog("保存角色")
@PostMapping("/save") @PostMapping("/save")
// @RequiresPermissions("sys:role:save") // @RequiresPermissions("sys:role:saveTenPerson")
@ApiOperation("保存角色") @ApiOperation("保存角色")
public R save(@RequestBody SysRoleEntity role){ public R save(@RequestBody SysRoleEntity role){
//ValidatorUtils.validateEntity(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("保存用户") @SysLog("保存用户")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("sys:user:save") @RequiresPermissions("sys:user:saveTenPerson")
@ApiOperation("保存用户") @ApiOperation("保存用户")
public R save(@RequestBody SysUserEntity user){ public R save(@RequestBody SysUserEntity user){
ValidatorUtils.validateEntity(user, new Class[] { AddGroup.class }); 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("保存用户") @SysLog("保存用户")
@PostMapping("/save") @PostMapping("/save")
@RequiresPermissions("systen:user:save") @RequiresPermissions("systen:user:saveTenPerson")
@ApiOperation("保存用户") @ApiOperation("保存用户")
public R save(@RequestBody SysUserEntity user){ public R save(@RequestBody SysUserEntity user){
// ValidatorUtils.validateEntity(user, AddGroup.class); // 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("/save") // @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:address:save") // @RequiresPermissions("ten:address:saveTenPerson")
// public R save(@RequestBody TenAddressEntity tenAddress) { // public R saveTenPerson(@RequestBody TenAddressEntity tenAddress) {
// tenAddressService.save(tenAddress); // tenAddressService.saveTenPerson(tenAddress);
// //
// return R.ok(); // return R.ok();
// } // }
@ -70,7 +70,7 @@ public class TenAddressController {
// @PostMapping("/update") // @PostMapping("/update")
// @RequiresPermissions("ten:address:update") // @RequiresPermissions("ten:address:update")
// public R update(@RequestBody TenAddressEntity tenAddress) { // public R update(@RequestBody TenAddressEntity tenAddress) {
// tenAddressService.updateById(tenAddress); // tenAddressService.updateTenPersonById(tenAddress);
// //
// return R.ok(); // 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") @PostMapping("/save")
//@RequiresPermissions("ten:build:save") //@RequiresPermissions("ten:build:saveTenPerson")
@RequiresPermissions("ten:build") @RequiresPermissions("ten:build")
@ApiOperation(value = "保存") @ApiOperation(value = "保存")
public R save(@RequestBody TenBuildEntity tenBuild){ 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("添加小区") @SysLog("添加小区")
@PostMapping("/save") @PostMapping("/save")
@ApiOperation("添加小区") @ApiOperation("添加小区")
//@RequiresPermissions("ten:cell:save") //@RequiresPermissions("ten:cell:saveTenPerson")
@RequiresPermissions("ten:cell") @RequiresPermissions("ten:cell")
public R save(@RequestBody TenCellEntity tenCell){ public R save(@RequestBody TenCellEntity tenCell){
TenCellEntity cell = tenCellService.findByCellName(tenCell.getName(),getUser().getTenantId().toString()); 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") @RequestMapping("/save")
@RequiresPermissions("ten:tencharge:save") @RequiresPermissions("ten:tencharge:saveTenPerson")
public R save(@RequestBody TenChargeEntity tenCharge){ public R save(@RequestBody TenChargeEntity tenCharge){
tenChargeService.save(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("添加设备") @SysLog("添加设备")
@PostMapping("/save") @PostMapping("/save")
// @RequiresPermissions("ten:device:save") // @RequiresPermissions("ten:device:saveTenPerson")
@ApiOperation(value = "添加设备") @ApiOperation(value = "添加设备")
public R save(@RequestBody TenDeviceEntity tenDevice){ public R save(@RequestBody TenDeviceEntity tenDevice){
tenDevice.setTenantId(getUser().getTenantId()); tenDevice.setTenantId(getUser().getTenantId());
@ -124,7 +124,7 @@ public class TenDeviceController extends AbstractController {
if(sysDeviceEntity==null){ if(sysDeviceEntity==null){
return R.error("设备未备案，请联系管理员"); return R.error("设备未备案，请联系管理员");
} }
// tenDeviceService.save(tenDevice); // tenDeviceService.saveTenPerson(tenDevice);
tenDeviceService.evictSave(tenDevice); tenDeviceService.evictSave(tenDevice);
return R.ok(); return R.ok();
} }
@ -139,7 +139,7 @@ public class TenDeviceController extends AbstractController {
public R update(@RequestBody TenDeviceEntity tenDevice){ public R update(@RequestBody TenDeviceEntity tenDevice){
tenDevice.setLastUpdateBy(getUser().getUsername()); tenDevice.setLastUpdateBy(getUser().getUsername());
tenDevice.setLastUpdateTime(new Date()); tenDevice.setLastUpdateTime(new Date());
// tenDeviceService.updateById(tenDevice); // tenDeviceService.updateTenPersonById(tenDevice);
tenDeviceService.evictupdateById(tenDevice); tenDeviceService.evictupdateById(tenDevice);
return R.ok(); return R.ok();
} }

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

@ -114,10 +114,10 @@
// /** // /**
// * 保存 // * 保存
// */ // */
// @PostMapping("/save") // @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:label") // @RequiresPermissions("ten:label")
// @ApiOperation(value = "保存标签") // @ApiOperation(value = "保存标签")
// public R save(@RequestBody TenLabelEntity tenLabel) { // public R saveTenPerson(@RequestBody TenLabelEntity tenLabel) {
// SysUserEntity user = getUser(); // SysUserEntity user = getUser();
// List<Long> roleIdList = sysUserRoleService.queryRoleIdList(user.getUserId()); // List<Long> roleIdList = sysUserRoleService.queryRoleIdList(user.getUserId());
// Long cellId = 0L; // Long cellId = 0L;
@ -132,7 +132,7 @@
// tenLabel.setCreateBy(getUser().getUsername()); // tenLabel.setCreateBy(getUser().getUsername());
// tenLabel.setCreateTime(new Date()); // tenLabel.setCreateTime(new Date());
// tenLabel.setTenantId(getUser().getTenantId()); // tenLabel.setTenantId(getUser().getTenantId());
// tenLabelService.save(tenLabel); // tenLabelService.saveTenPerson(tenLabel);
// //
// return R.ok(); // return R.ok();
// } // }
@ -147,7 +147,7 @@
// tenLabel.setTenantId(getUser().getTenantId()); // tenLabel.setTenantId(getUser().getTenantId());
// tenLabel.setLastUpdateBy(getUser().getUsername()); // tenLabel.setLastUpdateBy(getUser().getUsername());
// tenLabel.setLastUpdateTime(new Date()); // tenLabel.setLastUpdateTime(new Date());
// tenLabelService.updateById(tenLabel); // tenLabelService.updateTenPersonById(tenLabel);
// return R.ok(); // 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") @PostMapping("/save")
@RequiresPermissions("ten:log:save") @RequiresPermissions("ten:log:saveTenPerson")
public R save(@RequestBody TenLogEntity tenLog){ public R save(@RequestBody TenLogEntity tenLog){
tenLog.setTenantId(getUser().getTenantId()); tenLog.setTenantId(getUser().getTenantId());
tenLogService.add(tenLog); 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("/save") // @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:packrecord") // @RequiresPermissions("ten:packrecord")
// public R save(@RequestBody TenPackRecordEntity tenPackRecord){ // public R saveTenPerson(@RequestBody TenPackRecordEntity tenPackRecord){
// tenPackRecordService.save(tenPackRecord); // tenPackRecordService.saveTenPerson(tenPackRecord);
// //
// return R.ok(); // return R.ok();
// } // }
@ -99,7 +99,7 @@ public class TenPackRecordController extends AbstractController {
// @PostMapping("/update") // @PostMapping("/update")
// @RequiresPermissions("ten:packrecord") // @RequiresPermissions("ten:packrecord")
// public R update(@RequestBody TenPackRecordEntity tenPackRecord){ // public R update(@RequestBody TenPackRecordEntity tenPackRecord){
// tenPackRecordService.updateById(tenPackRecord); // tenPackRecordService.updateTenPersonById(tenPackRecord);
// //
// return R.ok(); // 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") @RequestMapping("/save")
@RequiresPermissions("ten:tenpay:save") @RequiresPermissions("ten:tenpay:saveTenPerson")
public R save(@RequestBody TenPayEntity tenPay){ public R save(@RequestBody TenPayEntity tenPay){
tenPayService.save(tenPay); tenPayService.save(tenPay);

24
shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java
View File

@ -3,7 +3,6 @@ package net.shapelight.modules.ten.controller;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.*; import java.io.*;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.nio.file.Files;
import java.util.*; import java.util.*;
import java.util.zip.ZipOutputStream; 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.config.MinioConfig;
import net.shapelight.common.utils.*; import net.shapelight.common.utils.*;
import net.shapelight.commons.engine.sdk.PalmSDK; 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.SdkImageUtils;
import net.shapelight.commons.engine.sdk.palm.FaceFeatureBase; import net.shapelight.commons.engine.sdk.palm.FaceFeatureBase;
import net.shapelight.commons.engine.sdk.palm.OutArg; 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.entity.UserCompareInfo;
import net.shapelight.modules.face.util.Base64Util; import net.shapelight.modules.face.util.Base64Util;
import net.shapelight.modules.face.util.UserInfo; 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.face.util.UserRamGroup;
import net.shapelight.modules.nettyapi.service.ServerApiService; import net.shapelight.modules.nettyapi.service.ServerApiService;
import net.shapelight.modules.sys.controller.AbstractController; 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.entity.*;
import net.shapelight.modules.ten.service.*; import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.ten.vo.PersonExcelModel; 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.commons.io.FilenameUtils;
import org.apache.poi.ss.usermodel.HorizontalAlignment; import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
@ -464,7 +458,7 @@ public class TenPersonController extends AbstractController {
if(card!=null){ if(card!=null){
return R.error("卡号已录入"); return R.error("卡号已录入");
} }
// tenDoorCardService.save(tenPerson); // tenDoorCardService.saveTenPerson(tenPerson);
} }
@ -497,7 +491,7 @@ public class TenPersonController extends AbstractController {
tenPerson.setCreateTime(new Date()); tenPerson.setCreateTime(new Date());
tenPerson.setRegisterType(Constant.RESGISTER_TYPE_WEB); tenPerson.setRegisterType(Constant.RESGISTER_TYPE_WEB);
tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR); tenPerson.setStatus(Constant.PESON_SUATUS_NOMOR);
int res = tenPersonService.save(tenPerson); int res = tenPersonService.saveTenPerson(tenPerson);
if (res==2) { if (res==2) {
return R.error("照片未检测到人脸"); 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")){ if(resStr.equals("OK")){
return R.ok(); return R.ok();
}else{ }else{
@ -685,7 +679,7 @@ public class TenPersonController extends AbstractController {
// }else{ // }else{
// syncEntity.setState(Constant.PERSON_SYNC_MODIFY); // syncEntity.setState(Constant.PERSON_SYNC_MODIFY);
// syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime()); // syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime());
// tenPersonSyncService.updateById(syncEntity); // tenPersonSyncService.updateTenPersonById(syncEntity);
// //
// //下发通知 // //下发通知
// List<TenPersonOperationVo> list = new ArrayList<>(); // List<TenPersonOperationVo> list = new ArrayList<>();
@ -706,7 +700,7 @@ public class TenPersonController extends AbstractController {
// if(syncEntity!=null){ // if(syncEntity!=null){
// syncEntity.setState(Constant.PERSON_SYNC_DELETE); // syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime()); // syncEntity.setLastUpdateTime(tenPerson.getLastUpdateTime());
// tenPersonSyncService.updateById(syncEntity); // tenPersonSyncService.updateTenPersonById(syncEntity);
// //下发通知 // //下发通知
// List<TenPersonOperationVo> list = new ArrayList<>(); // List<TenPersonOperationVo> list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo(); // 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")){ if(resStr.equals("OK")){
return R.ok(); return R.ok();
}else{ }else{
@ -1242,7 +1236,7 @@ public class TenPersonController extends AbstractController {
if(card!=null){ if(card!=null){
return R.error("卡号已录入"); 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) { if (res==2) {
return R.error("照片未检测到人脸"); return R.error("照片未检测到人脸");
} }

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") @PostMapping("/save")
@RequiresPermissions("ten:personextract:save") @RequiresPermissions("ten:personextract:saveTenPerson")
public R save(@RequestBody TenPersonExtractEntity tenPersonExtract){ public R save(@RequestBody TenPersonExtractEntity tenPersonExtract){
tenPersonExtractService.save(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("/save") // @PostMapping("/saveTenPerson")
// @RequiresPermissions("ten:personsync:save") // @RequiresPermissions("ten:personsync:saveTenPerson")
// public R save(@RequestBody TenPersonSyncEntity tenPersonSync){ // public R saveTenPerson(@RequestBody TenPersonSyncEntity tenPersonSync){
// tenPersonSyncService.save(tenPersonSync); // tenPersonSyncService.saveTenPerson(tenPersonSync);
// //
// return R.ok(); // return R.ok();
// } // }
@ -64,7 +64,7 @@ public class TenPersonSyncController {
// @PostMapping("/update") // @PostMapping("/update")
// @RequiresPermissions("ten:personsync:update") // @RequiresPermissions("ten:personsync:update")
// public R update(@RequestBody TenPersonSyncEntity tenPersonSync){ // public R update(@RequestBody TenPersonSyncEntity tenPersonSync){
// tenPersonSyncService.updateById(tenPersonSync); // tenPersonSyncService.updateTenPersonById(tenPersonSync);
// //
// return R.ok(); // 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("/save") // @PostMapping("/saveTenPerson")
//// @RequiresPermissions("ten:tenrecord:save") //// @RequiresPermissions("ten:tenrecord:saveTenPerson")
// public R save(@RequestBody TenRecordEntity tenRecord){ // public R saveTenPerson(@RequestBody TenRecordEntity tenRecord){
// tenRecordService.save(tenRecord); // tenRecordService.saveTenPerson(tenRecord);
// //
// return R.ok(); // 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.setDoorCard(entity.getDoorCardEntity().getDoorCard());
// oldCard.setLastUpdateTime(new Date()); // oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateById(oldCard); // tenDoorCardService.updateTenPersonById(oldCard);
// } // }
// } else { // } else {
// if (entity.getDoorCardEntity().getValidBegin()==null) { // if (entity.getDoorCardEntity().getValidBegin()==null) {
@ -264,7 +264,7 @@ public class TenRoomController extends AbstractController {
// } // }
//// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd()); //// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd());
//// oldCard.setLastUpdateTime(new Date()); //// oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateById(oldCard); // tenDoorCardService.updateTenPersonById(oldCard);
// } // }
// } // }
// } else { // } else {
@ -293,7 +293,7 @@ public class TenRoomController extends AbstractController {
// Date now = new Date(); // Date now = new Date();
// newCard.setCreateTime(now); // newCard.setCreateTime(now);
// newCard.setLastUpdateTime(now); // newCard.setLastUpdateTime(now);
// tenDoorCardService.save(newCard); // tenDoorCardService.saveTenPerson(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{ }else{
return R.error("您无权访问"); return R.error("您无权访问");
} }
// tenRuleService.save(tenRule); // tenRuleService.saveTenPerson(tenRule);
TenScheduleEntity scheduleEntity = tenRule.getScheduleEntityList().get(0); TenScheduleEntity scheduleEntity = tenRule.getScheduleEntityList().get(0);
int onTime = MyDateUtils.getSeconds(scheduleEntity.getDutyOn()); int onTime = MyDateUtils.getSeconds(scheduleEntity.getDutyOn());
int offTime = MyDateUtils.getSeconds(scheduleEntity.getDutyOff()); 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") @RequestMapping("/save")
@RequiresPermissions("ten:tenthirdparty:save") @RequiresPermissions("ten:tenthirdparty:saveTenPerson")
public R save(@RequestBody TenThirdPartyEntity tenThirdParty){ public R save(@RequestBody TenThirdPartyEntity tenThirdParty){
tenThirdPartyService.save(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("保存用户") @SysLog("保存用户")
@PostMapping("/save") @PostMapping("/save")
//@RequiresPermissions("ten:user:save") //@RequiresPermissions("ten:user:saveTenPerson")
@ApiOperation("保存用户") @ApiOperation("保存用户")
@RequiresPermissions("ten:user:save") @RequiresPermissions("ten:user:saveTenPerson")
public R save(@RequestBody SysUserEntity user){ public R save(@RequestBody SysUserEntity user){
ValidatorUtils.validateEntity(user, AddGroup.class); ValidatorUtils.validateEntity(user, AddGroup.class);
// SysUserEntity su = sysUserService.getOne(new QueryWrapper<SysUserEntity>() // SysUserEntity su = sysUserService.getOne(new QueryWrapper<SysUserEntity>()

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/dao/TenPersonDao.java
View File

@ -19,7 +19,7 @@ import java.util.Map;
* *
*/ */
@Mapper @Mapper
public interface TenPersonDao { public interface TenPersonDao extends BaseMapper<TenPersonEntity>{
int insert(TenPersonEntity entity); int insert(TenPersonEntity entity);
int deleteById(@Param("personId")Long personId, @Param("cellId")Long cellId); int deleteById(@Param("personId")Long personId, @Param("cellId")Long cellId);

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/entity/TenCellEntity.java
View File

@ -121,4 +121,6 @@ public class TenCellEntity extends BaseEntity implements Serializable {
@ApiModelProperty("住户总数") @ApiModelProperty("住户总数")
private Integer ownerCount; private Integer ownerCount;
private String orgId;
} }

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

@ -360,6 +360,8 @@ public class TenPersonEntity extends BaseEntity implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String deptAllName; private String deptAllName;
private String orgId;
//--------v10掌静脉--------------- //--------v10掌静脉---------------
private String pvLeft; private String pvLeft;

2
shapelight-admin/src/main/java/net/shapelight/modules/ten/listen/RedisKeyExpirationListener.java
View File

@ -50,7 +50,7 @@
// }else if(ids[1].equals("e")){ // }else if(ids[1].equals("e")){
// personEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT); // personEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT);
// } // }
// tenPersonService.updateById(personEntity); // tenPersonService.updateTenPersonById(personEntity);
// } // }
// //
// //

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); PageUtils queryPage(Map<String, Object> params);
// boolean save(TenPackRecordEntity entity); // boolean saveTenPerson(TenPackRecordEntity entity);
// boolean removeById(Long roomId,Long cellId); // boolean removeById(Long roomId,Long cellId);
// //
// boolean removeByIdList(List<Map<String,String>> idList); // boolean removeByIdList(List<Map<String,String>> idList);
// boolean updateById(TenPackRecordEntity entity); // boolean updateTenPersonById(TenPackRecordEntity entity);
// TenPackRecordEntity getById(Long id,Long cellId); // TenPackRecordEntity getById(Long id,Long cellId);

7
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenPersonService.java
View File

@ -6,7 +6,6 @@ import net.shapelight.modules.excel.model.PersonModel;
import net.shapelight.modules.ten.entity.*; import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.vo.PersonExcelModel; import net.shapelight.modules.ten.vo.PersonExcelModel;
import net.shapelight.modules.vo.*; import net.shapelight.modules.vo.*;
import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -15,7 +14,7 @@ import java.util.Map;
* 人员表 * 人员表
* *
*/ */
public interface TenPersonService { public interface TenPersonService extends IService<TenPersonEntity> {
PageUtils queryPage(Map<String, Object> params); PageUtils queryPage(Map<String, Object> params);
List<PersonExcelModel> queryPersonModel(Map<String, Object> params); List<PersonExcelModel> queryPersonModel(Map<String, Object> params);
@ -23,7 +22,7 @@ public interface TenPersonService {
PageUtils queryVerify(Map<String, Object> params); PageUtils queryVerify(Map<String, Object> params);
int save(TenPersonEntity entity); int saveTenPerson(TenPersonEntity entity);
int save3d(TenPersonEntity entity); int save3d(TenPersonEntity entity);
int update3d(TenPersonEntity entity); int update3d(TenPersonEntity entity);
boolean saveOtherRoom(TenPersonEntity entity); boolean saveOtherRoom(TenPersonEntity entity);
@ -34,7 +33,7 @@ public interface TenPersonService {
boolean reviewByIdList(List<Map<String,String>> roomIdList); boolean reviewByIdList(List<Map<String,String>> roomIdList);
String updateById(TenPersonEntity entity); String updateTenPersonById(TenPersonEntity entity);
boolean updateStatusById(TenPersonEntity entity); boolean updateStatusById(TenPersonEntity entity);
void updateStatusByIds(List<TenPersonEntity> entitys); void updateStatusByIds(List<TenPersonEntity> entitys);
boolean updateLabelById(TenPersonEntity entity); boolean updateLabelById(TenPersonEntity entity);

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.setCreateBy(build.getCreateBy());
// room.setTenantId(build.getTenantId()); // room.setTenantId(build.getTenantId());
// //roomList.add(room); // //roomList.add(room);
// tenRoomService.save(room); // tenRoomService.saveTenPerson(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()); // int zaotui = schedule.getDutyOff().toLocalTime().getHour() * 60 + schedule.getDutyOff().toLocalTime().getMinute() - (recordTime.getHour() * 60 + recordTime.getMinute());
// checkSchedule.setDutyOffStatusInfo("早退" + zaotui + "分钟"); // checkSchedule.setDutyOffStatusInfo("早退" + zaotui + "分钟");
// } // }
// tenCheckScheduleService.updateById(checkSchedule); // tenCheckScheduleService.updateTenPersonById(checkSchedule);
// } // }
// }else{ // }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; private MinioConfig minioConfig;
// @Override // @Override
// public boolean save(TenPackRecordEntity entity) { // public boolean saveTenPerson(TenPackRecordEntity entity) {
// int flag = tenPackRecordDao.insert(entity); // int flag = tenPackRecordDao.insert(entity);
// if(flag==1){ // if(flag==1){
// return true; // return true;
@ -75,8 +75,8 @@ public class TenPackRecordServiceImpl implements TenPackRecordService {
// @Override // @Override
// public boolean updateById(TenPackRecordEntity entity) { // public boolean updateTenPersonById(TenPackRecordEntity entity) {
// int flag = tenPackRecordDao.updateById(entity); // int flag = tenPackRecordDao.updateTenPersonById(entity);
// if(flag==1){ // if(flag==1){
// return true; // return true;
// } // }

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

@ -73,7 +73,7 @@ import javax.imageio.ImageIO;
@Service("tenPersonService") @Service("tenPersonService")
@Slf4j @Slf4j
public class TenPersonServiceImpl implements TenPersonService { public class TenPersonServiceImpl extends ServiceImpl<TenPersonDao,TenPersonEntity> implements TenPersonService {
@Autowired @Autowired
private TenCellService tenCellService; private TenCellService tenCellService;
@Autowired @Autowired
@ -375,7 +375,7 @@ public class TenPersonServiceImpl implements TenPersonService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@CacheEvict(value = "TenPerson", allEntries = true) @CacheEvict(value = "TenPerson", allEntries = true)
public int save(TenPersonEntity entity) { public int saveTenPerson(TenPersonEntity entity) {
String userFileUrl = globalValue.getImagesDir() + "/org/"; String userFileUrl = globalValue.getImagesDir() + "/org/";
try { try {
//保存原始图片 //保存原始图片
@ -627,7 +627,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// card.setCreateBy(getUser().getUsername()); // card.setCreateBy(getUser().getUsername());
card.setCreateTime(now); card.setCreateTime(now);
card.setLastUpdateTime(now); card.setLastUpdateTime(now);
// tenDoorCardService.save(doorCardEntity); // tenDoorCardService.saveTenPerson(doorCardEntity);
tenDoorCardService.save(card); tenDoorCardService.save(card);
} }
//保存App用户 //保存App用户
@ -929,7 +929,7 @@ public class TenPersonServiceImpl implements TenPersonService {
//// appUser.setSalt(salt); //// appUser.setSalt(salt);
// appUser.setPassword(DigestUtils.sha256Hex(entity.getPassword())); // appUser.setPassword(DigestUtils.sha256Hex(entity.getPassword()));
// appUser.setCreateTime(new Date()); // appUser.setCreateTime(new Date());
// appUserService.save(appUser); // appUserService.saveTenPerson(appUser);
//保存房产信息 //保存房产信息
AppUserScopeEntity appScope = new AppUserScopeEntity(); AppUserScopeEntity appScope = new AppUserScopeEntity();
@ -940,7 +940,7 @@ public class TenPersonServiceImpl implements TenPersonService {
appUserScopeService.save(appScope); appUserScopeService.save(appScope);
// appUser.setCurrentScopeId(appScope.getUserScopeId()); // 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); // TenPersonSyncEntity syncEntity = tenPersonSyncService.findByDeviceIdAndPersonId(deviceEntity.getDeviceId(), personId, tenantId);
// syncEntity.setLastUpdateTime(lastUpdateTime); // syncEntity.setLastUpdateTime(lastUpdateTime);
// syncEntity.setState(Constant.PERSON_SYNC_DELETE); // syncEntity.setState(Constant.PERSON_SYNC_DELETE);
// tenPersonSyncService.updateById(syncEntity); // tenPersonSyncService.updateTenPersonById(syncEntity);
// } // }
// //下发通知 // //下发通知
// List<TenPersonSyncEntity> allDelete = tenPersonSyncService.findDeviceAllDeletePersons(deviceEntity.getDeviceId(), deviceEntity.getTenantId()); // List<TenPersonSyncEntity> allDelete = tenPersonSyncService.findDeviceAllDeletePersons(deviceEntity.getDeviceId(), deviceEntity.getTenantId());
@ -1130,7 +1130,7 @@ public class TenPersonServiceImpl implements TenPersonService {
@Override @Override
@CacheEvict(value = "TenPerson", key = "#entity.personId+'-'+#entity.cellId") @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()) { if (entity.getUsername() != null && entity.getUsername().isEmpty()) {
entity.setUsername(null); entity.setUsername(null);
} }
@ -1562,7 +1562,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// } // }
// oldCard.setDoorCard(entity.getDoorCardEntity().getDoorCard()); // oldCard.setDoorCard(entity.getDoorCardEntity().getDoorCard());
// oldCard.setLastUpdateTime(new Date()); // oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateById(oldCard); // tenDoorCardService.updateTenPersonById(oldCard);
// } // }
// } else { // } else {
// if (entity.getDoorCardEntity().getValidBegin() == null) { // if (entity.getDoorCardEntity().getValidBegin() == null) {
@ -1582,7 +1582,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// } // }
//// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd()); //// oldCard.setValidEnd(entity.getDoorCardEntity().getValidEnd());
// oldCard.setLastUpdateTime(new Date()); // oldCard.setLastUpdateTime(new Date());
// tenDoorCardService.updateById(oldCard); // tenDoorCardService.updateTenPersonById(oldCard);
// } // }
// } // }
// } else { // } else {
@ -1611,7 +1611,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// Date now = new Date(); // Date now = new Date();
// newCard.setCreateTime(now); // newCard.setCreateTime(now);
// newCard.setLastUpdateTime(now); // newCard.setLastUpdateTime(now);
// tenDoorCardService.save(newCard); // tenDoorCardService.saveTenPerson(newCard);
// } // }
} }
@ -1640,7 +1640,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// for (TenPersonSyncEntity syncEn : syncEntitys) { // for (TenPersonSyncEntity syncEn : syncEntitys) {
// syncEn.setLastUpdateTime(entity.getLastUpdateTime()); // syncEn.setLastUpdateTime(entity.getLastUpdateTime());
// syncEn.setState(2); // syncEn.setState(2);
// tenPersonSyncService.updateById(syncEn); // tenPersonSyncService.updateTenPersonById(syncEn);
// //下发通知 // //下发通知
// List<TenPersonOperationVo> list = new ArrayList<>(); // List<TenPersonOperationVo> list = new ArrayList<>();
// TenPersonOperationVo vo = new TenPersonOperationVo(); // 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){ // if(type.equals("s") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_DATE_NOT_START){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_NOMOR); // tenPersonEntity.setStatus(Constant.PESON_SUATUS_NOMOR);
// tenPersonEntity.setLastUpdateTime(new Date()); // tenPersonEntity.setLastUpdateTime(new Date());
// tenPersonDao.updateById(tenPersonEntity); // tenPersonDao.updateTenPersonById(tenPersonEntity);
// }else if(type.equals("e") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_NOMOR){ // }else if(type.equals("e") && tenPersonEntity.getStatus() == Constant.PESON_SUATUS_NOMOR){
// tenPersonEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT); // tenPersonEntity.setStatus(Constant.PESON_SUATUS_DATE_OUT);
// tenPersonEntity.setLastUpdateTime(new Date()); // tenPersonEntity.setLastUpdateTime(new Date());
// tenPersonDao.updateById(tenPersonEntity); // tenPersonDao.updateTenPersonById(tenPersonEntity);
// } // }
// List<TenDeviceVo> devList = tenDeviceService.findByCellId(cellId); // List<TenDeviceVo> devList = tenDeviceService.findByCellId(cellId);
// for (TenDeviceVo dev : devList) { // for (TenDeviceVo dev : devList) {
@ -2330,7 +2330,7 @@ public class TenPersonServiceImpl implements TenPersonService {
// doorCardEntity.setDoorCard(personModel.getDoorCard()); // doorCardEntity.setDoorCard(personModel.getDoorCard());
// doorCardEntity.setCellId(tenPerson.getCellId()); // doorCardEntity.setCellId(tenPerson.getCellId());
// doorCardEntity.setPersonId(tenPerson.getPersonId()); // doorCardEntity.setPersonId(tenPerson.getPersonId());
// tenDoorCardService.save(doorCardEntity); // tenDoorCardService.saveTenPerson(doorCardEntity);
// } // }

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

@ -336,7 +336,7 @@ public class TenSyncServiceImpl implements TenSyncService {
int total = syncA001(cellEntity,1); int total = syncA001(cellEntity,1);
log.debug("同步inxex：1"); log.debug("同步inxex：1");
if(total>1){ if(total>1){
for(int i = 2;i<total;i++){ for(int i = 2;i<total/20;i++){
syncA001(cellEntity,i); syncA001(cellEntity,i);
log.debug("同步inxex："+i); log.debug("同步inxex："+i);
} }

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){ if(videoEntity!=null){
// videoEntity.setIp(deviceIp); // videoEntity.setIp(deviceIp);
// videoEntity.setLastOnlineTime(new Date()); // videoEntity.setLastOnlineTime(new Date());
// tenVideoService.updateById(videoEntity); // tenVideoService.updateTenPersonById(videoEntity);
} }
Map res = new HashMap(); Map res = new HashMap();

2
shapelight-admin/src/main/resources/application-dev.yml
View File

@ -36,3 +36,5 @@ spring:
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
global:
qhseUrl: https://wstest.yunuat.cqyt.petrochina/ZLSTS/v1

2
shapelight-admin/src/main/resources/application-prod.yml
View File

@ -34,3 +34,5 @@ spring:
wall: wall:
config: config:
multi-statement-allow: true multi-statement-allow: true
global:
qhseUrl: https://qhse.yun.cqyt.petrochina/ZLSTS/v1