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

v2.0.2 

1.修改bug
This commit is contained in:
gaoben 2021-04-28 18:01:26 +08:00
parent 33b9d1bb76
commit bbeec0ecf6
10 changed files with 415 additions and 352 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -31,7 +31,7 @@
<jedis.version>2.9.0</jedis.version> <jedis.version>2.9.0</jedis.version>
<druid.version>1.1.13</druid.version> <druid.version>1.1.13</druid.version>
<mybatisplus.version>3.1.2</mybatisplus.version> <mybatisplus.version>3.1.2</mybatisplus.version>
<mysql.version>8.0.16</mysql.version> <mysql.version>8.0.19</mysql.version>
<mssql.version>4.0</mssql.version> <mssql.version>4.0</mssql.version>
<oracle.version>11.2.0.3</oracle.version> <oracle.version>11.2.0.3</oracle.version>
<commons.lang.version>2.6</commons.lang.version> <commons.lang.version>2.6</commons.lang.version>

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

@ -222,6 +222,9 @@ public class AppApiController {
//Map<String,Object> params = new HashMap<>(); //Map<String,Object> params = new HashMap<>();
// params.put("tenantId",tenantId+""); // params.put("tenantId",tenantId+"");
List<TenBuildEntity> buildList = tenBuildService.selectByCellId(cellId); List<TenBuildEntity> buildList = tenBuildService.selectByCellId(cellId);
for(TenBuildEntity buildEntity: buildList){
buildEntity.setName(buildEntity.getName()+buildEntity.getUnit()+"单元");
}
return R.ok().put("data", buildList); return R.ok().put("data", buildList);
} }
@ -668,6 +671,8 @@ public class AppApiController {
} }
AppUserScopeEntity scope = appUserScopeService.getById(user.getCurrentScopeId()); AppUserScopeEntity scope = appUserScopeService.getById(user.getCurrentScopeId());
//不能删除自己 //不能删除自己
if (scope.getRoleId().intValue() != Constant.ROLE_TEN_CELL) {
//住户，家属
for (Map<String, String> param : params) { for (Map<String, String> param : params) {
Long personId = Long.parseLong(param.get("personId")); Long personId = Long.parseLong(param.get("personId"));
Long cellId = Long.parseLong(param.get("cellId")); Long cellId = Long.parseLong(param.get("cellId"));
@ -679,6 +684,7 @@ public class AppApiController {
return R.error("您无权删除"+personEntity.getName()); return R.error("您无权删除"+personEntity.getName());
} }
} }
}
tenPersonService.removeByIdList(params); tenPersonService.removeByIdList(params);
return R.ok(); return R.ok();
} }

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

@ -1,6 +1,7 @@
package net.shapelight.modules.car.controller; package net.shapelight.modules.car.controller;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.minio.MinioClient; import io.minio.MinioClient;
import io.minio.PutObjectOptions; import io.minio.PutObjectOptions;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@ -23,14 +24,8 @@ import java.util.Map;
import net.shapelight.common.config.GlobalValue; 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.modules.ten.entity.TenCarEntity; import net.shapelight.modules.ten.entity.*;
import net.shapelight.modules.ten.entity.TenPackRecordEnterEntity; import net.shapelight.modules.ten.service.*;
import net.shapelight.modules.ten.entity.TenPackRecordEntity;
import net.shapelight.modules.ten.entity.TenPackRecordExitEntity;
import net.shapelight.modules.ten.service.TenCarService;
import net.shapelight.modules.ten.service.TenPackRecordEnterService;
import net.shapelight.modules.ten.service.TenPackRecordExitService;
import net.shapelight.modules.ten.service.TenPackRecordService;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -70,6 +65,9 @@ public class CarOpenApi {
@Autowired @Autowired
private TenPackRecordExitService tenPackRecordExitService; private TenPackRecordExitService tenPackRecordExitService;
@Autowired
private TenPackService tenPackService;
@PostMapping({"/getMsg/{cellId}"}) @PostMapping({"/getMsg/{cellId}"})
@ApiOperation("获取MSG") @ApiOperation("获取MSG")
@ApiImplicitParams({@ApiImplicitParam(name = "sn", value = "设备sn", paramType = "query", dataType = "String", required = true)}) @ApiImplicitParams({@ApiImplicitParam(name = "sn", value = "设备sn", paramType = "query", dataType = "String", required = true)})
@ -304,6 +302,8 @@ public class CarOpenApi {
*/ */
//https://c.xitu3d.com:1002/cell/api/car/v1/pushCarRecord
@PostMapping({"/pushCarRecord"}) @PostMapping({"/pushCarRecord"})
@ApiOperation("第三方推送") @ApiOperation("第三方推送")
public Map pushCarRecord(@RequestBody Object object) { public Map pushCarRecord(@RequestBody Object object) {
@ -379,6 +379,16 @@ public class CarOpenApi {
httpUrl.disconnect(); httpUrl.disconnect();
} }
} }
//
Long cellId = null;
Long tenantId = null;
TenPackEntity packEntity = tenPackService.getOne(new QueryWrapper<TenPackEntity>()
.eq("park_code",parkCode));
if(packEntity!=null){
cellId = packEntity.getCellId();
tenantId = packEntity.getTenantId();
}
if (serviceName.equals("enter")) { if (serviceName.equals("enter")) {
long enterTimeLong = bizContent.getLongValue("enterTime"); long enterTimeLong = bizContent.getLongValue("enterTime");
Date enterTime = new Date(enterTimeLong * 1000L); Date enterTime = new Date(enterTimeLong * 1000L);
@ -391,6 +401,8 @@ public class CarOpenApi {
enter.setType(Integer.valueOf(type)); enter.setType(Integer.valueOf(type));
enter.setCarType(Integer.valueOf(carType)); enter.setCarType(Integer.valueOf(carType));
enter.setEnterTime(enterTime); enter.setEnterTime(enterTime);
enter.setCellId(cellId);
enter.setTenantId(tenantId);
if (fileName.length() > 0) if (fileName.length() > 0)
enter.setImage(fileName); enter.setImage(fileName);
this.tenPackRecordEnterService.save(enter); this.tenPackRecordEnterService.save(enter);
@ -408,6 +420,8 @@ public class CarOpenApi {
exit.setCarType(Integer.valueOf(carType)); exit.setCarType(Integer.valueOf(carType));
exit.setExitTime(exitTime); exit.setExitTime(exitTime);
exit.setPackTime(Long.valueOf(parkTime)); exit.setPackTime(Long.valueOf(parkTime));
exit.setCellId(cellId);
exit.setTenantId(tenantId);
if (fileName.length() > 0) if (fileName.length() > 0)
exit.setImage(fileName); exit.setImage(fileName);
this.tenPackRecordExitService.save(exit); this.tenPackRecordExitService.save(exit);

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

@ -60,10 +60,10 @@ public class XaAddressTask implements ITask {
if (xqid != null && xqid.length() > 0) { if (xqid != null && xqid.length() > 0) {
//调用第三方接口获取所有信息 //调用第三方接口获取所有信息
//6.1 获取标准地址接口--------------------------------------------------------------------------- //6.1 获取标准地址接口---------------------------------------------------------------------------
// String address = XaApi.getAddress(xqid, appId, appSecret); String address = XaApi.getAddress(xqid, appId, appSecret);
// String address = "{\"xml\":{\"data\":\"信息验证失败\"}}"; // String address = "{\"xml\":{\"data\":\"信息验证失败\"}}";
String address = "{\"xml\":{\"data\":{\"NEXTPAGE\":\"END\",\"HLWTable\":[{\"@JWSID\":\"610113600000000001202\",\"@SWJID\":\"610113003012013\",\"@SSXQBM\":\"A61011304538\",\"@XZQHNAME\":\"西安市雁塔区\",\"@DZSC\":\"殴风园\",\"@DZQC\":\"陕西省西安市雁塔区长安南路439号\",\"@P_ID\":\"1544038\",\"@JLXMC\":\"长安南路\",\"@WD\":\"34.207728945844494\",\"@DZJB\":\"10\",\"@MPHLX\":\"10\",\"@XQID\":\"610113600000000004538\",\"@DZGSDW\":\"610113600000\",\"@XT_ZHXGSJ\":\"2021-03-23 16:50:08\",\"@SJ\":\"\",\"@XZQH\":\"610113\",\"@XQ\":\"欧风园小区\",\"@JD\":\"108.94238923458721\",\"@JWSMC\":\"陕师大警务室\",\"@DZDM\":\"000268000029\",\"@JLXDM\":\"000268\"},{\"@JWSID\":\"610113600000000001202\",\"@SWJID\":\"610113003012013\",\"@SSXQBM\":\"A61011304538\",\"@XZQHNAME\":\"西安市雁塔区\",\"@DZSC\":\"\",\"@DZQC\":\"陕西省西安市雁塔区长安南路439号1栋\",\"@P_ID\":\"1820578255\",\"@JLXMC\":\"长安南路\",\"@WD\":\"34.206951\",\"@DZJB\":\"11\",\"@MPHLX\":\"10\",\"@XQID\":\"610113600000000004538\",\"@DZGSDW\":\"610113600000\",\"@XT_ZHXGSJ\":\"2021-03-23 16:50:08\",\"@SJ\":\"\",\"@XZQH\":\"610113\",\"@XQ\":\"欧风园小区\",\"@JD\":\"108.942541\",\"@JWSMC\":\"陕师大警务室\",\"@DZDM\":\"000268000029000010\",\"@JLXDM\":\"000268\"}]}}}"; // String address = "{\"xml\":{\"data\":{\"NEXTPAGE\":\"END\",\"HLWTable\":[{\"@JWSID\":\"610113600000000001202\",\"@SWJID\":\"610113003012013\",\"@SSXQBM\":\"A61011304538\",\"@XZQHNAME\":\"西安市雁塔区\",\"@DZSC\":\"殴风园\",\"@DZQC\":\"陕西省西安市雁塔区长安南路439号\",\"@P_ID\":\"1544038\",\"@JLXMC\":\"长安南路\",\"@WD\":\"34.207728945844494\",\"@DZJB\":\"10\",\"@MPHLX\":\"10\",\"@XQID\":\"610113600000000004538\",\"@DZGSDW\":\"610113600000\",\"@XT_ZHXGSJ\":\"2021-03-23 16:50:08\",\"@SJ\":\"\",\"@XZQH\":\"610113\",\"@XQ\":\"欧风园小区\",\"@JD\":\"108.94238923458721\",\"@JWSMC\":\"陕师大警务室\",\"@DZDM\":\"000268000029\",\"@JLXDM\":\"000268\"},{\"@JWSID\":\"610113600000000001202\",\"@SWJID\":\"610113003012013\",\"@SSXQBM\":\"A61011304538\",\"@XZQHNAME\":\"西安市雁塔区\",\"@DZSC\":\"\",\"@DZQC\":\"陕西省西安市雁塔区长安南路439号1栋\",\"@P_ID\":\"1820578255\",\"@JLXMC\":\"长安南路\",\"@WD\":\"34.206951\",\"@DZJB\":\"11\",\"@MPHLX\":\"10\",\"@XQID\":\"610113600000000004538\",\"@DZGSDW\":\"610113600000\",\"@XT_ZHXGSJ\":\"2021-03-23 16:50:08\",\"@SJ\":\"\",\"@XZQH\":\"610113\",\"@XQ\":\"欧风园小区\",\"@JD\":\"108.942541\",\"@JWSMC\":\"陕师大警务室\",\"@DZDM\":\"000268000029000010\",\"@JLXDM\":\"000268\"}]}}}";
log.debug("获取小区标准地址-" + cellEntity.getName() + ":返回数据" + address); log.debug("获取小区标准地址-" + cellEntity.getName() + ":返回数据" + address);
//解析json //解析json

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

@ -56,6 +56,14 @@ public class XaImageTask implements ITask {
private TenAddressService tenAddressService; private TenAddressService tenAddressService;
@Autowired @Autowired
private TenTranService tenTranService; private TenTranService tenTranService;
@Autowired
private TenPackRecordEnterService tenPackRecordEnterService;
@Autowired
private TenPackRecordExitService tenPackRecordExitService;
@Autowired
private TenPackService tenPackService;
@Autowired
private TenPackChannalService tenPackChannalService;
public void run(String params) { public void run(String params) {
log.debug("xaImageTask定时任务正在执行", params); log.debug("xaImageTask定时任务正在执行", params);
@ -77,10 +85,14 @@ public class XaImageTask implements ITask {
String xqid = cellEntity.getThirdId(); String xqid = cellEntity.getThirdId();
Long cellId = cellEntity.getCellId(); Long cellId = cellEntity.getCellId();
if (xqid == null || xqid.length() > 0){ if (xqid == null || xqid.length() > 0){
//人员 //人员记录图片
processRecordPersonImage(appId, appSecret, xqid, fwikUrl, cellId,tenantId); processRecordPersonImage(appId, appSecret, xqid, fwikUrl, cellId,tenantId);
// //人员图片
processRealPersonImage(appId, appSecret, xqid, fwikUrl, cellId); processRealPersonImage(appId, appSecret, xqid, fwikUrl, cellId);
//车辆进入图片
processRecordCarEnterImage(appId, appSecret, xqid, fwikUrl, cellId);
//车辆离开图片
processRecordCarExitImage(appId, appSecret, xqid, fwikUrl, cellId);
} }
} }
} }
@ -104,6 +116,7 @@ public class XaImageTask implements ITask {
TenAddressEntity addressEntity = tenAddressService.getOne(new QueryWrapper<TenAddressEntity>() TenAddressEntity addressEntity = tenAddressService.getOne(new QueryWrapper<TenAddressEntity>()
.eq("xqid", xqid).last("LIMIT 1")); .eq("xqid", xqid).last("LIMIT 1"));
if(addressEntity!=null){
String ssxqbm = addressEntity.getSsxqbm(); String ssxqbm = addressEntity.getSsxqbm();
syncRecord.setLV_SSXQBM(ssxqbm); //小区申报编码 syncRecord.setLV_SSXQBM(ssxqbm); //小区申报编码
@ -154,6 +167,7 @@ public class XaImageTask implements ITask {
if (count >= 30) if (count >= 30)
break; break;
} }
}
if(count == 0){ if(count == 0){
return; return;
} }
@ -174,8 +188,8 @@ public class XaImageTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,"","RYJCZPXX", "RYJCZPXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,"","RYJCZPXX", "RYJCZPXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "RYJCZPXX", "RYJCZPXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "RYJCZPXX", "RYJCZPXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传人员识别记录返回数据：" + resJson); log.debug("上传人员识别记录返回数据：" + resJson);
@ -190,156 +204,163 @@ public class XaImageTask implements ITask {
} }
} }
// private void processRecordCarEnterImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { private void processRecordCarEnterImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) {
// List<TenPackRecordEnterEntity> records = this.tenPackRecordEnterService.getNotSync(cellId); List<TenPackRecordEnterEntity> records = this.tenPackRecordEnterService.getNotSync(cellId);
// List<XaTCCTCSBXX> syncRecords = new ArrayList(); List<XaTCCTCSBXX> syncRecords = new ArrayList();
// List<TenPackRecordEnterEntity> updateRecords = new ArrayList<>(); List<TenPackRecordEnterEntity> updateRecords = new ArrayList<>();
// int count = 0; int count = 0;
// for (TenPackRecordEnterEntity record : records) { for (TenPackRecordEnterEntity record : records) {
// XaTCCTCSBXX syncRecord = new XaTCCTCSBXX(); XaTCCTCSBXX syncRecord = new XaTCCTCSBXX();
//
// TenPackEntity packEntity = tenPackService.getOne(new QueryWrapper<TenPackEntity>() TenPackEntity packEntity = tenPackService.getOne(new QueryWrapper<TenPackEntity>()
// .eq("park_code",record.getParkCode())); .eq("park_code",record.getParkCode()));
//
// if(packEntity==null){ if(packEntity==null){
// continue; continue;
// } }
// String packCodeXa = packEntity.getParkCodeXa(); String packCodeXa = packEntity.getParkCodeXa();
// if(packCodeXa==null || packCodeXa.length()==0){ if(packCodeXa==null || packCodeXa.length()==0){
// continue; continue;
// } }
//
// TenPackChannalEntity channalEntity = tenPackChannalService.getOne(new QueryWrapper<TenPackChannalEntity>() TenPackChannalEntity channalEntity = tenPackChannalService.getOne(new QueryWrapper<TenPackChannalEntity>()
// .eq("channal_name",record.getChannelName())); .eq("channal_name",record.getChannelName()));
// if(channalEntity==null){ if(channalEntity==null){
// continue; continue;
// } }
// String channalCodeXa = channalEntity.getChannalCodeXa(); String channalCodeXa = channalEntity.getChannalCodeXa();
// if(channalCodeXa==null || channalCodeXa.length()==0){ if(channalCodeXa==null || channalCodeXa.length()==0){
// continue; continue;
// } }
//
//
// syncRecord.setLV_TCCBH(packCodeXa); syncRecord.setLV_TCCBH(packCodeXa);
// syncRecord.setLV_CPHM(record.getPlateNumber()); syncRecord.setLV_CPHM(record.getPlateNumber());
// syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌 syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌
// syncRecord.setLV_GCSJ(DateUtils.format(record.getEnterTime(), "yyyyMMddHHmmss")); syncRecord.setLV_GCSJ(DateUtils.format(record.getEnterTime(), "yyyyMMddHHmmss"));
// syncRecord.setLV_GCLX("1");//1进场2出场 syncRecord.setLV_GCLX("1");//1进场2出场
// syncRecord.setLV_JKBM(record.getRecordEnterId()+""); syncRecord.setLV_JKBM(record.getRecordEnterId()+"");
// syncRecord.setLV_SBXT("10");//申报系统,默认10 syncRecord.setLV_SBXT("10");//申报系统,默认10
// syncRecord.setLV_KKSBBH(channalCodeXa); syncRecord.setLV_KKSBBH(channalCodeXa);
// syncRecord.setLV_PROCMODE("PMINSERT"); syncRecord.setLV_PROCMODE("PMINSERT");
//
// syncRecords.add(syncRecord); syncRecords.add(syncRecord);
// updateRecords.add(record); updateRecords.add(record);
// count++; count++;
// if (count >= 30) if (count >= 30)
// break; break;
// } }
// XaData jsonData = new XaData(); XaData jsonData = new XaData();
// jsonData.setDatas(syncRecords); jsonData.setDatas(syncRecords);
//
// List<XaPages> listPages = new ArrayList<>(); List<XaPages> listPages = new ArrayList<>();
// XaPages pages = new XaPages(); XaPages pages = new XaPages();
// pages.setPno("1"); pages.setPno("1");
// pages.setPsize("1"); pages.setPsize("1");
// listPages.add(pages); listPages.add(pages);
// jsonData.setPages(listPages); jsonData.setPages(listPages);
//
// String json = JSONObject.toJSONString(jsonData); String json = JSONObject.toJSONString(jsonData);
//
// String enJson = XaUtils.encryptStr(json.trim(), appSecret); String enJson = XaUtils.encryptStr(json.trim(), appSecret);
//
//// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,"","TCCTCSBXX", "TCCTCSBXX", appId, appSecret);
//// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId);
// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
//// System.out.println(s); // System.out.println(s);
// log.debug("上传车辆进场记录返回数据：" + resJson); log.debug("上传车辆进场记录返回数据：" + resJson);
// //上传成功，修改sync状态 //上传成功，修改sync状态
// 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.updateById(recordEntity);
// } }
// } }
// } }
//
//
//
//
// private void processRecordCarExitImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { private void processRecordCarExitImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) {
// List<TenPackRecordExitEntity> records = this.tenPackRecordExitService.getNotSync(cellId); List<TenPackRecordExitEntity> records = this.tenPackRecordExitService.getNotSync(cellId);
// List<XaTCCTCSBXXEXIT> syncRecords = new ArrayList(); List<XaTCCTCSBXXEXIT> syncRecords = new ArrayList();
// List<TenPackRecordExitEntity> updateRecords = new ArrayList<>(); List<TenPackRecordExitEntity> updateRecords = new ArrayList<>();
// int count = 0; int count = 0;
// for (TenPackRecordExitEntity record : records) { for (TenPackRecordExitEntity record : records) {
// XaTCCTCSBXXEXIT syncRecord = new XaTCCTCSBXXEXIT(); XaTCCTCSBXXEXIT syncRecord = new XaTCCTCSBXXEXIT();
//
// TenPackEntity packEntity = tenPackService.getOne(new QueryWrapper<TenPackEntity>() TenPackEntity packEntity = tenPackService.getOne(new QueryWrapper<TenPackEntity>()
// .eq("park_code",record.getParkCode())); .eq("park_code",record.getParkCode()));
//
// if(packEntity==null){ if(packEntity==null){
// continue; continue;
// } }
// String packCodeXa = packEntity.getParkCodeXa(); String packCodeXa = packEntity.getParkCodeXa();
// if(packCodeXa==null || packCodeXa.length()==0){ if(packCodeXa==null || packCodeXa.length()==0){
// continue; continue;
// } }
//
// TenPackChannalEntity channalEntity = tenPackChannalService.getOne(new QueryWrapper<TenPackChannalEntity>() TenPackChannalEntity channalEntity = tenPackChannalService.getOne(new QueryWrapper<TenPackChannalEntity>()
// .eq("channal_name",record.getChannelName())); .eq("channal_name",record.getChannelName()));
// if(channalEntity==null){ if(channalEntity==null){
// continue; continue;
// } }
// String channalCodeXa = channalEntity.getChannalCodeXa(); String channalCodeXa = channalEntity.getChannalCodeXa();
// if(channalCodeXa==null || channalCodeXa.length()==0){ if(channalCodeXa==null || channalCodeXa.length()==0){
// continue; continue;
// } }
//
//
// syncRecord.setLV_TCCBH(packCodeXa); syncRecord.setLV_TCCBH(packCodeXa);
// syncRecord.setLV_CPHM(record.getPlateNumber()); syncRecord.setLV_CPHM(record.getPlateNumber());
// syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌 syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌
// syncRecord.setLV_GCSJ(DateUtils.format(record.getExitTime(), "yyyyMMddHHmmss")); syncRecord.setLV_GCSJ(DateUtils.format(record.getExitTime(), "yyyyMMddHHmmss"));
// syncRecord.setLV_GCLX("1");//1进场2出场 syncRecord.setLV_GCLX("1");//1进场2出场
// syncRecord.setLV_CKBM(record.getRecordExitId()+""); syncRecord.setLV_CKBM(record.getRecordExitId()+"");
// syncRecord.setLV_SBXT("10");//申报系统,默认10 syncRecord.setLV_SBXT("10");//申报系统,默认10
// syncRecord.setLV_KKSBBH(channalCodeXa); syncRecord.setLV_KKSBBH(channalCodeXa);
// syncRecord.setLV_PROCMODE("PMINSERT"); syncRecord.setLV_PROCMODE("PMINSERT");
//
// syncRecords.add(syncRecord); syncRecords.add(syncRecord);
// updateRecords.add(record); updateRecords.add(record);
// count++; count++;
// if (count >= 30) if (count >= 30)
// break; break;
// } }
// XaData jsonData = new XaData(); XaData jsonData = new XaData();
// jsonData.setDatas(syncRecords); jsonData.setDatas(syncRecords);
//
// List<XaPages> listPages = new ArrayList<>(); List<XaPages> listPages = new ArrayList<>();
// XaPages pages = new XaPages(); XaPages pages = new XaPages();
// pages.setPno("1"); pages.setPno("1");
// pages.setPsize("1"); pages.setPsize("1");
// listPages.add(pages); listPages.add(pages);
// jsonData.setPages(listPages); jsonData.setPages(listPages);
//
// String json = JSONObject.toJSONString(jsonData); String json = JSONObject.toJSONString(jsonData);
//
// String enJson = XaUtils.encryptStr(json.trim(), appSecret); String enJson = XaUtils.encryptStr(json.trim(), appSecret);
//
//// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,"","TCCTCSBXX", "TCCTCSBXX", appId, appSecret);
//// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId);
// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
//// System.out.println(s); // System.out.println(s);
// log.debug("上传车辆进场记录返回数据：" + resJson); log.debug("上传车辆进场记录返回数据：" + resJson);
// //上传成功，修改sync状态 //上传成功，修改sync状态
// 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.updateById(recordEntity);
// } }
// } }
// } }
private void processRealPersonImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { private void processRealPersonImage(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) {
@ -352,6 +373,7 @@ public class XaImageTask implements ITask {
TenRoomEntity roomEntity = tenRoomService.getById(person.getRoomId(), person.getCellId()); TenRoomEntity roomEntity = tenRoomService.getById(person.getRoomId(), person.getCellId());
TenAddressEntity addressEntity = tenAddressService.getById(roomEntity.getPId()); TenAddressEntity addressEntity = tenAddressService.getById(roomEntity.getPId());
if(addressEntity!=null){
realPerson.setLV_CASE_ID(person.getUuid()); //实有人口编码 realPerson.setLV_CASE_ID(person.getUuid()); //实有人口编码
realPerson.setLV_GMSFHM(person.getIdCard()); //身份证号 realPerson.setLV_GMSFHM(person.getIdCard()); //身份证号
realPerson.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); realPerson.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss"));
@ -405,7 +427,7 @@ public class XaImageTask implements ITask {
count++; count++;
if (count >= 50) if (count >= 50)
break; break;
}
} }
if(count == 0){ if(count == 0){
return; return;

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

@ -54,8 +54,8 @@ public class XaRealDataTask implements ITask {
String appSecret = object.getString("appSecret"); String appSecret = object.getString("appSecret");
//6.2 获取数据对接接口--------------------------------------------------------------------------- //6.2 获取数据对接接口---------------------------------------------------------------------------
// String fwikUrl = XaApi.getFwikUrl(appId, appSecret); String fwikUrl = XaApi.getFwikUrl(appId, appSecret);
String fwikUrl = "http://"; // String fwikUrl = "http://";
if (fwikUrl != null) { if (fwikUrl != null) {
List<TenCellEntity> allCells = this.tenCellService.list((Wrapper) (new QueryWrapper()) List<TenCellEntity> allCells = this.tenCellService.list((Wrapper) (new QueryWrapper())
@ -160,8 +160,8 @@ public class XaRealDataTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"SYFW", "SYFW", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"SYFW", "SYFW", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYFW", "SYFW", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYFW", "SYFW", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传实有房屋返回数据：" + resJson); log.debug("上传实有房屋返回数据：" + resJson);
@ -245,8 +245,8 @@ public class XaRealDataTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"SYRK", "SYRK", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"SYRK", "SYRK", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYRK", "SYRK", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYRK", "SYRK", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传实有房屋返回数据：" + resJson); log.debug("上传实有房屋返回数据：" + resJson);
@ -308,8 +308,8 @@ public class XaRealDataTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"MJKXX", "MJKXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"MJKXX", "MJKXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJKXX", "MJKXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJKXX", "MJKXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传实有房屋返回数据：" + resJson); log.debug("上传实有房屋返回数据：" + resJson);
@ -372,8 +372,8 @@ public class XaRealDataTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"MJSBXX", "MJSBXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"MJSBXX", "MJSBXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJSBXX", "MJSBXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJSBXX", "MJSBXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传实有房屋返回数据：" + resJson); log.debug("上传实有房屋返回数据：" + resJson);

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

@ -90,6 +90,7 @@ public class XaRecordTask implements ITask {
TenAddressEntity addressEntity = tenAddressService.getOne(new QueryWrapper<TenAddressEntity>() TenAddressEntity addressEntity = tenAddressService.getOne(new QueryWrapper<TenAddressEntity>()
.eq("xqid",xqid).last("LIMIT 1")); .eq("xqid",xqid).last("LIMIT 1"));
if(addressEntity!=null){
String ssxqbm = addressEntity.getSsxqbm(); String ssxqbm = addressEntity.getSsxqbm();
syncRecord.setLV_SSXQBM(ssxqbm); //小区申报编码 syncRecord.setLV_SSXQBM(ssxqbm); //小区申报编码
@ -108,6 +109,7 @@ public class XaRecordTask implements ITask {
if (count >= 30) if (count >= 30)
break; break;
} }
}
if(count == 0){ if(count == 0){
return; return;
} }
@ -128,8 +130,8 @@ public class XaRecordTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"RYSKZPXX", "RYSKZPXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"RYSKZPXX", "RYSKZPXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "RYSKZPXX", "RYSKZPXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "RYSKZPXX", "RYSKZPXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传人员识别记录返回数据：" + resJson); log.debug("上传人员识别记录返回数据：" + resJson);
@ -210,8 +212,8 @@ public class XaRecordTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"TCCTCSBXX", "TCCTCSBXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"TCCTCSBXX", "TCCTCSBXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传车辆进场记录返回数据：" + resJson); log.debug("上传车辆进场记录返回数据：" + resJson);
@ -295,8 +297,8 @@ public class XaRecordTask implements ITask {
TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"TCCTCSBXX", "TCCTCSBXX", appId, appSecret); TenTranEntity tranEntity = tenTranService.saveApi(fwikUrl,jsonData,"TCCTCSBXX", "TCCTCSBXX", appId, appSecret);
String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId()); String tranId = String.format("%s%016d",DateUtils.format(tranEntity.getTranDate(),"yyyyMMddHHmmss"),tranEntity.getTranId());
// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId); String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "TCCTCSBXX", "TCCTCSBXX", appId, appSecret,tranId);
String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; // String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}";
// String resJson = "23232"; // String resJson = "23232";
// System.out.println(s); // System.out.println(s);
log.debug("上传车辆进场记录返回数据：" + resJson); log.debug("上传车辆进场记录返回数据：" + resJson);

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

@ -120,6 +120,9 @@ public class TenBuildController extends AbstractController {
Map<String,Object> params = new HashMap<>(); Map<String,Object> params = new HashMap<>();
params.put("tenantId",tenantId+""); params.put("tenantId",tenantId+"");
List<TenBuildEntity> buildList = tenBuildService.selectByCellId(cellId); List<TenBuildEntity> buildList = tenBuildService.selectByCellId(cellId);
// for(TenBuildEntity buildEntity: buildList){
// buildEntity.setName(buildEntity.getName()+buildEntity.getUnit()+"单元");
// }
return R.ok().put("data", buildList); return R.ok().put("data", buildList);
} }

117
shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenDeviceServiceImpl.java
View File

@ -11,6 +11,7 @@ import net.shapelight.modules.vo.TenPersonIdUpdateAllVo;
import net.shapelight.modules.vo.TenPersonIdUpdateVo; import net.shapelight.modules.vo.TenPersonIdUpdateVo;
import net.shapelight.modules.vo.TenPersonVo; import net.shapelight.modules.vo.TenPersonVo;
import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.BeanUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.CacheEvict;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
@ -22,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@ -46,7 +48,7 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
private TenPersonService tenPersonService; private TenPersonService tenPersonService;
@Autowired @Autowired
private TenRecordService tenRecordService; private TenRecordService tenRecordService;
// @Autowired // @Autowired
// private EmqHttpApi emqHttpApi; // private EmqHttpApi emqHttpApi;
@Autowired @Autowired
private TenDeviceAlertService tenDeviceAlertService; private TenDeviceAlertService tenDeviceAlertService;
@ -61,42 +63,52 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
public PageUtils queryPage(Map<String, Object> params) { public PageUtils queryPage(Map<String, Object> params) {
List<Long> cellIds = new ArrayList<>(); List<Long> cellIds = new ArrayList<>();
// cellIds.add(709832651506188289L); // cellIds.add(709832651506188289L);
String cellId = (String)params.get("cellId"); String cellId = (String) params.get("cellId");
if (cellId!=null && !cellId.isEmpty()){ String key = (String) params.get("key");
// if(key == null){
// key = "";
// }
if (cellId != null && !cellId.isEmpty()) {
Long cellLong = Long.parseLong(cellId); Long cellLong = Long.parseLong(cellId);
cellIds.add(cellLong); cellIds.add(cellLong);
}else { } else {
List<TenCellEntity> cells = tenCellService.queryAll(params); List<TenCellEntity> cells = tenCellService.queryAll(params);
for (TenCellEntity cell : cells) { for (TenCellEntity cell : cells) {
cellIds.add(cell.getCellId()); cellIds.add(cell.getCellId());
} }
} }
if (cellIds.size() == 0) { if (cellIds.size() == 0) {
return new PageUtils(new ArrayList<>(),0,0,0); return new PageUtils(new ArrayList<>(), 0, 0, 0);
} }
IPage<TenDeviceEntity> page = this.page( IPage<TenDeviceEntity> page = this.page(
new Query<TenDeviceEntity>().getPage(params), new Query<TenDeviceEntity>().getPage(params),
new QueryWrapper<TenDeviceEntity>() new QueryWrapper<TenDeviceEntity>()
.eq("tenant_id",params.get("tenantId")) .eq("tenant_id", params.get("tenantId"))
.in("cell_id",cellIds) .in("cell_id", cellIds)
.and(StringUtils.isNotBlank(key),
i -> i
.like("sn", key)
.or()
.like("name", key)
)
); );
for(TenDeviceEntity dev : page.getRecords()){ for (TenDeviceEntity dev : page.getRecords()) {
StringBuffer scope = new StringBuffer(); StringBuffer scope = new StringBuffer();
if(dev.getCellId()!=null){ if (dev.getCellId() != null) {
String cellName = tenCellService.getCellName(dev.getCellId().toString()); String cellName = tenCellService.getCellName(dev.getCellId().toString());
scope.append(cellName); scope.append(cellName);
} }
if(dev.getBuildId()!=null){ if (dev.getBuildId() != null) {
TenBuildEntity build = tenBuildService.getById(dev.getBuildId(),dev.getCellId()); TenBuildEntity build = tenBuildService.getById(dev.getBuildId(), dev.getCellId());
// dev.setBuildName(build.getName()); // dev.setBuildName(build.getName());
// dev.setBuildUnit(build.getUnit()); // dev.setBuildUnit(build.getUnit());
scope.append(build.getName()); scope.append(build.getName());
scope.append(build.getUnit()); scope.append(build.getUnit());
scope.append("单元"); scope.append("单元");
} }
if(dev.getRoomId()!=null){ if (dev.getRoomId() != null) {
String roomName = tenRoomService.getRoomName(dev.getRoomId(),dev.getCellId()); String roomName = tenRoomService.getRoomName(dev.getRoomId(), dev.getCellId());
// dev.setRoomName(roomName); // dev.setRoomName(roomName);
scope.append(roomName); scope.append(roomName);
} }
@ -113,7 +125,7 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
Boolean flag = deviceApiService.isOnline(dev.getSn()); Boolean flag = deviceApiService.isOnline(dev.getSn());
if (flag) { if (flag) {
dev.setStatus(1); dev.setStatus(1);
}else{ } else {
dev.setStatus(0); dev.setStatus(0);
} }
@ -125,11 +137,11 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
@Override @Override
public List<TenDeviceVo> findByCellId(long cellId) { public List<TenDeviceVo> findByCellId(long cellId) {
List<TenDeviceEntity> devList = this.list(new QueryWrapper<TenDeviceEntity>() List<TenDeviceEntity> devList = this.list(new QueryWrapper<TenDeviceEntity>()
.eq("cell_id",cellId)); .eq("cell_id", cellId));
List<TenDeviceVo> resList = new ArrayList<>(); List<TenDeviceVo> resList = new ArrayList<>();
if(devList.size()>0){ if (devList.size() > 0) {
for(TenDeviceEntity dev: devList){ for (TenDeviceEntity dev : devList) {
// boolean onlineFlag = emqHttpApi.getClient(dev.getSn()); // boolean onlineFlag = emqHttpApi.getClient(dev.getSn());
// if(onlineFlag){ // if(onlineFlag){
// dev.setStatus(1); // dev.setStatus(1);
@ -140,12 +152,12 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
Boolean flag = deviceApiService.isOnline(dev.getSn()); Boolean flag = deviceApiService.isOnline(dev.getSn());
if (flag) { if (flag) {
dev.setStatus(1); dev.setStatus(1);
}else{ } else {
dev.setStatus(0); dev.setStatus(0);
} }
TenDeviceVo vo = new TenDeviceVo(); TenDeviceVo vo = new TenDeviceVo();
try { try {
BeanUtils.copyProperties(vo,dev); BeanUtils.copyProperties(vo, dev);
} catch (IllegalAccessException e) { } catch (IllegalAccessException e) {
e.printStackTrace(); e.printStackTrace();
} catch (InvocationTargetException e) { } catch (InvocationTargetException e) {
@ -158,22 +170,22 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
} }
@Override @Override
public boolean remoteOpenDoor(String deviceSn,Long personId,Integer memberId) { public boolean remoteOpenDoor(String deviceSn, Long personId, Integer memberId) {
// CmdProcess.publishRemoteOpenDoor(deviceSn,memberId); // CmdProcess.publishRemoteOpenDoor(deviceSn,memberId);
//远程开门 //远程开门
int r = serverApiService.openDoor(deviceSn,personId); int r = serverApiService.openDoor(deviceSn, personId);
// if(r == -1){ // if(r == -1){
// return R.error("设备离线"); // return R.error("设备离线");
// } // }
// return R.ok(); // return R.ok();
Object open = null; Object open = null;
for(int i = 0;i<30;i++) { for (int i = 0; i < 30; i++) {
try { try {
Thread.sleep(200); Thread.sleep(200);
open = redisUtils.get(personId+"-"+deviceSn); open = redisUtils.get(personId + "-" + deviceSn);
if(open!=null){ if (open != null) {
return true; return true;
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
@ -185,9 +197,9 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
} }
@Override @Override
@Cacheable(value="TenDevice", key="#sn") @Cacheable(value = "TenDevice", key = "#sn")
public TenDeviceEntity findBySn(String sn) { public TenDeviceEntity findBySn(String sn) {
return this.getOne(new QueryWrapper<TenDeviceEntity>().eq("sn",sn)); return this.getOne(new QueryWrapper<TenDeviceEntity>().eq("sn", sn));
} }
@ -230,9 +242,9 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
public void updateFailurePerson(String sn, List<Integer> memberIdList) { public void updateFailurePerson(String sn, List<Integer> memberIdList) {
TenDeviceEntity dev = findBySn(sn); TenDeviceEntity dev = findBySn(sn);
Long cellId = dev.getCellId(); Long cellId = dev.getCellId();
for(Integer memberId: memberIdList){ for (Integer memberId : memberIdList) {
TenPersonEntity person = tenPersonService.getByMemberId(memberId,cellId); TenPersonEntity person = tenPersonService.getByMemberId(memberId, cellId);
log.info("不合格人脸："+person.getPersonId()); log.info("不合格人脸：" + person.getPersonId());
// TenPersonEntity person = new TenPersonEntity(); // TenPersonEntity person = new TenPersonEntity();
// person.setPersonId(personId); // person.setPersonId(personId);
// person.setCellId(cellId); // person.setCellId(cellId);
@ -251,23 +263,24 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
} }
@Override @Override
@Cacheable(value="TenDevice", key="#memberId+'-'+#cellId") @Cacheable(value = "TenDevice", key = "#memberId+'-'+#cellId")
public TenPersonEntity getByMemberId(Integer memberId, Long cellId) { public TenPersonEntity getByMemberId(Integer memberId, Long cellId) {
return tenPersonService.getByMemberId(memberId, cellId); return tenPersonService.getByMemberId(memberId, cellId);
} }
@Override @Override
@Cacheable(value="TenDevice", key="#psersonId+'-'+#cellId") @Cacheable(value = "TenDevice", key = "#psersonId+'-'+#cellId")
public TenPersonEntity getByPersonId(Long psersonId, Long cellId) { public TenPersonEntity getByPersonId(Long psersonId, Long cellId) {
return tenPersonService.getById(psersonId,cellId); return tenPersonService.getById(psersonId, cellId);
} }
@CacheEvict(value="TenDevice",allEntries = true) @CacheEvict(value = "TenDevice", allEntries = true)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public boolean evictRemoveByIds(Collection<? extends Serializable> idList) { public boolean evictRemoveByIds(Collection<? extends Serializable> idList) {
//删除同步人员 //删除同步人员
for(Long devId: (List<Long>)idList){ for (Long devId : (List<Long>) idList) {
TenDeviceEntity deviceEntity = this.getById(devId); TenDeviceEntity deviceEntity = this.getById(devId);
tenPersonSyncService.removeByDeviceId(devId,deviceEntity.getTenantId()); tenPersonSyncService.removeByDeviceId(devId, deviceEntity.getTenantId());
//清除通知： //清除通知：
serverApiService.cleanData(deviceEntity.getSn()); serverApiService.cleanData(deviceEntity.getSn());
} }
@ -275,10 +288,10 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
return removeByIds(idList); return removeByIds(idList);
} }
@CacheEvict(value="TenDevice",allEntries = true) @CacheEvict(value = "TenDevice", allEntries = true)
public boolean evictRemoveByCellIds(Long[] idList) { public boolean evictRemoveByCellIds(Long[] idList) {
return this.remove(new QueryWrapper<TenDeviceEntity>() return this.remove(new QueryWrapper<TenDeviceEntity>()
.in("cell_id",idList)); .in("cell_id", idList));
// return removeByIds(idList); // return removeByIds(idList);
} }
@ -289,12 +302,12 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
for (TenCellEntity cell : cells) { for (TenCellEntity cell : cells) {
cellIds.add(cell.getCellId()); cellIds.add(cell.getCellId());
} }
if(cellIds.size()==0){ if (cellIds.size() == 0) {
return 0; return 0;
}else{ } else {
List<TenDeviceEntity> list = this.list(new QueryWrapper<TenDeviceEntity>() List<TenDeviceEntity> list = this.list(new QueryWrapper<TenDeviceEntity>()
.eq("tenant_id",params.get("tenantId")) .eq("tenant_id", params.get("tenantId"))
.in("cell_id",cellIds)); .in("cell_id", cellIds));
return list.size(); return list.size();
} }
} }
@ -307,15 +320,15 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
for (TenCellEntity cell : cells) { for (TenCellEntity cell : cells) {
cellIds.add(cell.getCellId()); cellIds.add(cell.getCellId());
} }
if(cellIds.size()>0){ if (cellIds.size() > 0) {
List<TenDeviceEntity> list = this.list(new QueryWrapper<TenDeviceEntity>() List<TenDeviceEntity> list = this.list(new QueryWrapper<TenDeviceEntity>()
.eq("tenant_id",params.get("tenantId")) .eq("tenant_id", params.get("tenantId"))
.in("cell_id",cellIds)); .in("cell_id", cellIds));
if (list.size()>=0) { if (list.size() >= 0) {
for(TenDeviceEntity dev: list){ for (TenDeviceEntity dev : list) {
// boolean onlineFlag = emqHttpApi.getClient(dev.getSn()); // boolean onlineFlag = emqHttpApi.getClient(dev.getSn());
boolean onlineFlag = deviceApiService.isOnline(dev.getSn()); boolean onlineFlag = deviceApiService.isOnline(dev.getSn());
if(onlineFlag){ if (onlineFlag) {
onlineCount++; onlineCount++;
} }
} }
@ -326,7 +339,7 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
@Override @Override
@CacheEvict(value="TenDevice",allEntries = true) @CacheEvict(value = "TenDevice", allEntries = true)
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void evictSave(TenDeviceEntity deviceEntity) { public void evictSave(TenDeviceEntity deviceEntity) {
this.save(deviceEntity); this.save(deviceEntity);
@ -338,7 +351,7 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
//1.删除设备关联的人 //1.删除设备关联的人
//2.批量添加 //2.批量添加
List<TenPersonSyncEntity> saveList = new ArrayList<>(); List<TenPersonSyncEntity> saveList = new ArrayList<>();
for(TenPersonIdUpdateAllVo vo:list){ for (TenPersonIdUpdateAllVo vo : list) {
TenPersonSyncEntity entity = new TenPersonSyncEntity(); TenPersonSyncEntity entity = new TenPersonSyncEntity();
entity.setDeviceId(deviceEntity.getDeviceId()); entity.setDeviceId(deviceEntity.getDeviceId());
entity.setDeviceSn(deviceEntity.getSn()); entity.setDeviceSn(deviceEntity.getSn());
@ -350,15 +363,15 @@ public class TenDeviceServiceImpl extends ServiceImpl<TenDeviceDao, TenDeviceEnt
saveList.add(entity); saveList.add(entity);
// tenPersonSyncService.insert(entity); // tenPersonSyncService.insert(entity);
} }
if(saveList.size()>0){ if (saveList.size() > 0) {
tenPersonSyncService.insertBatch(saveList,deviceEntity.getTenantId()); tenPersonSyncService.insertBatch(saveList, deviceEntity.getTenantId());
} }
// tenPersonSyncService.saveBatch(sList); // tenPersonSyncService.saveBatch(sList);
} }
@Override @Override
@CacheEvict(value="TenDevice",allEntries = true) @CacheEvict(value = "TenDevice", allEntries = true)
public void evictupdateById(TenDeviceEntity tenDevice) { public void evictupdateById(TenDeviceEntity tenDevice) {
this.updateById(tenDevice); this.updateById(tenDevice);
} }

13
shapelight-admin/src/main/java/net/shapelight/modules/xian/service/XaApi.java
View File

@ -335,7 +335,7 @@ public class XaApi {
syncRecord.setLV_TCCBH("610113100000000000267"); syncRecord.setLV_TCCBH("610113100000000000267");
syncRecord.setLV_CPHM("陕A66GB0"); syncRecord.setLV_CPHM("陕AK8L34");
syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌 syncRecord.setLV_CPLX("03");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌
syncRecord.setLV_GCSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); syncRecord.setLV_GCSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss"));
syncRecord.setLV_GCLX("1");//1进场2出场 syncRecord.setLV_GCLX("1");//1进场2出场
@ -389,6 +389,9 @@ public class XaApi {
*/ */
String appid = "1297164778041095"; String appid = "1297164778041095";
String appsecret = "22971647780410956329716477804109"; String appsecret = "22971647780410956329716477804109";
//伟丰花园：610113600000000005977 欧风园：610113600000000004538
//西安文理学院：610113630000000010348 绿地花都：610113610000000017653
String xqid = "610113600000000004538"; String xqid = "610113600000000004538";
String address = getAddress(xqid, appid, appsecret); String address = getAddress(xqid, appid, appsecret);
System.out.println(address); System.out.println(address);
@ -398,8 +401,8 @@ public class XaApi {
String apiUrl = getFwikUrl(appid, appsecret); String apiUrl = getFwikUrl(appid, appsecret);
System.out.println(apiUrl); System.out.println(apiUrl);
//6.1 获取标准地址接口--------------------------------------------------------------------------- //6.1 获取标准地址接口---------------------------------------------------------------------------
// String address = getAddress(xqid, appid, appsecret); String addressCell = getAddress(xqid, appid, appsecret);
// System.out.println(address); System.out.println(addressCell);
//6.3.1 实有房屋信息---------------------------------------------------------------------------- //6.3.1 实有房屋信息----------------------------------------------------------------------------
// 1820591355 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号4栋1单元3层4131号 长安南路 108.942481 34.207741 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000013000001000003000002 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08 // 1820591355 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号4栋1单元3层4131号 长安南路 108.942481 34.207741 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000013000001000003000002 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08
/* /*
@ -413,11 +416,11 @@ public class XaApi {
1820580970 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号1栋1单元4层1142号 长安南路 108.942541 34.206951 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000010000001000004000002 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08 1820580970 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号1栋1单元4层1142号 长安南路 108.942541 34.206951 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000010000001000004000002 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08
1820581243 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号1栋1单元5层1152号 长安南路 108.942541 34.206951 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000010000001000005000001 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08 1820581243 610113600000000001202 610113003012013 陕西省西安市雁塔区长安南路439号1栋1单元5层1152号 长安南路 108.942541 34.206951 14 10 610113600000000004538 欧风园小区 610113 陕师大警务室 000268000029000010000001000005000001 000268 A61011304538 西安市雁塔区 610113600000 2021-03-23 16:50:08
*/ */
syncRoom(); // syncRoom();
//6.3.2 实有人口信息---------------------------------------------------------------------------- //6.3.2 实有人口信息----------------------------------------------------------------------------
// syncPerson(); // syncPerson();
//6.3.9 车辆出入记录------------------------------------------------------------- //6.3.9 车辆出入记录-------------------------------------------------------------
processRecordCarEnter(); // processRecordCarEnter();
} }