From 2fab6df4a4631ad96669150a933bd7c9ecf16406 Mon Sep 17 00:00:00 2001 From: gaoben Date: Wed, 7 Apr 2021 19:07:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A1=E8=BF=90?= =?UTF-8?q?=E8=A1=8C=E8=BF=90=E8=90=A5=E5=95=86=E6=B7=BB=E5=8A=A0=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E5=85=88=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E5=B7=B2=E7=BB=8F=E6=B7=BB=E5=8A=A02=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E5=88=A0=E9=99=A4=E4=BA=BA=E5=91=98=E5=A4=A7=E4=BA=8E?= =?UTF-8?q?23=E6=9D=A1=E5=90=8Esql=E5=87=BD=E6=95=B0=E6=8B=BC=E6=8E=A5?= =?UTF-8?q?=E9=99=90=E5=88=B63=E5=B9=B3=E5=8F=B0=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=A6=81=E7=94=A8=E8=87=AA=E5=B7=B14?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7redis=E7=BC=93=E5=AD=98bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/car/controller/CarOpenApi.java | 89 +++++ .../modules/job/task/XaAddressTask.java | 238 ++++++++----- .../modules/job/task/XaRealDataTask.java | 312 ++++++++++++++---- .../service/impl/MessageServiceImpl.java | 27 +- .../ten/controller/TenDeviceController.java | 5 + .../ten/controller/TenPersonController.java | 4 +- .../ten/controller/TenUserController.java | 3 + .../modules/ten/service/TenDeviceService.java | 2 +- .../service/impl/TenPersonServiceImpl.java | 1 + .../modules/xian/service/RunMain.java | 29 ++ .../main/resources/5362545_c.xitu3d.com.pfx | Bin 0 -> 4514 bytes .../src/main/resources/application.yml | 1 + .../main/resources/mapper/ten/TenRoomDao.xml | 1 + 13 files changed, 527 insertions(+), 185 deletions(-) create mode 100644 shapelight-admin/src/main/java/net/shapelight/modules/xian/service/RunMain.java create mode 100644 shapelight-admin/src/main/resources/5362545_c.xitu3d.com.pfx diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java index 5108b19..f6665d1 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/car/controller/CarOpenApi.java @@ -252,4 +252,93 @@ public class CarOpenApi { res.put("msg", "成功"); return res; } + + + @PostMapping({"/pushCarRecord"}) + @ApiOperation("第三方推送") + public Map pushCarRecord(@RequestBody Object object) { + Map res = new HashMap<>(); + res.put("code", "401"); + res.put("msg", "签名结果不一致"); + JSONObject msgJson = (JSONObject)JSONObject.toJSON(object); + log.debug("收到数据"+ msgJson.toString()); + String sign = msgJson.getString("sign"); + String pid = msgJson.getString("pid"); + Long timestamp = msgJson.getLong("timestamp"); + String serviceName = msgJson.getString("serviceName"); + JSONObject bizContent = msgJson.getJSONObject("bizContent"); + String parkCode = bizContent.getString("parkCode"); + String parkName = bizContent.getString("parkName"); + String orderNum = bizContent.getString("orderNum"); + String plateNum = bizContent.getString("plateNum"); + String channelName = bizContent.getString("channelName"); + int type = bizContent.getIntValue("type"); + int carType = bizContent.getIntValue("carType"); + String imgUrl = bizContent.getString("imgUrl"); + String fileName = "car/" + parkCode + "/" + UUIDUtil.uuid() + ".jpg"; + if (!StringUtils.isEmpty(imgUrl)) { + URL url = null; + InputStream is = null; + HttpURLConnection httpUrl = null; + try { + url = new URL(imgUrl); + httpUrl = (HttpURLConnection)url.openConnection(); + httpUrl.connect(); + httpUrl.getInputStream(); + is = httpUrl.getInputStream(); + PutObjectOptions putObjectOptions = new PutObjectOptions(is.available(), -1L); + putObjectOptions.setContentType("image/jpeg"); + this.minioClient.putObject(this.minioConfig + .getBucketName(), fileName, is, putObjectOptions); + } catch (Exception e) { + e.printStackTrace(); + fileName = ""; + } finally { + if (is != null) + try { + is.close(); + } catch (IOException e) { + e.printStackTrace(); + } + if (httpUrl != null) + httpUrl.disconnect(); + } + } + if (serviceName.equals("enter")) { + long enterTimeLong = bizContent.getLongValue("enterTime"); + Date enterTime = new Date(enterTimeLong * 1000L); + TenPackRecordEnterEntity enter = new TenPackRecordEnterEntity(); + enter.setParkCode(parkCode); + enter.setParkName(parkName); + enter.setOrderNumber(orderNum); + enter.setPlateNumber(plateNum); + enter.setChannelName(channelName); + enter.setType(Integer.valueOf(type)); + enter.setCarType(Integer.valueOf(carType)); + enter.setEnterTime(enterTime); + if (fileName.length() > 0) + enter.setImage(fileName); + this.tenPackRecordEnterService.save(enter); + } else if (serviceName.equals("exit")) { + long exitTimeLong = bizContent.getLongValue("exitTime"); + Date exitTime = new Date(exitTimeLong * 1000L); + long parkTime = bizContent.getLongValue("parkTime"); + TenPackRecordExitEntity exit = new TenPackRecordExitEntity(); + exit.setParkCode(parkCode); + exit.setParkName(parkName); + exit.setOrderNumber(orderNum); + exit.setPlateNumber(plateNum); + exit.setChannelName(channelName); + exit.setType(Integer.valueOf(type)); + exit.setCarType(Integer.valueOf(carType)); + exit.setExitTime(exitTime); + exit.setPackTime(Long.valueOf(parkTime)); + if (fileName.length() > 0) + exit.setImage(fileName); + this.tenPackRecordExitService.save(exit); + } + res.put("code", "200"); + res.put("msg", "成功"); + return res; +} } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaAddressTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaAddressTask.java index 529dfaf..01c3f1c 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaAddressTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaAddressTask.java @@ -13,12 +13,14 @@ import java.util.ArrayList; import java.util.List; import lombok.extern.slf4j.Slf4j; +import net.shapelight.common.utils.StringUtils; import net.shapelight.modules.sys.entity.SysUserEntity; import net.shapelight.modules.sys.service.SysUserService; import net.shapelight.modules.ten.entity.TenAddressEntity; import net.shapelight.modules.ten.entity.TenCellEntity; import net.shapelight.modules.ten.service.TenAddressService; import net.shapelight.modules.ten.service.TenCellService; +import net.shapelight.modules.xian.service.XaApi; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -34,111 +36,167 @@ public class XaAddressTask implements ITask { @Autowired private TenAddressService tenAddressService; + // + public void run(String params) { - log.debug("xaApiTask定时任务正在执行", params); + log.debug("获取标准地址定时任务正在执行", params); List allSysTenUser = this.sysUserService.findAllSysTenUser(); for (SysUserEntity sysTenUser : allSysTenUser) { + //open_id 是json串 if (sysTenUser.getOpenId() != null && sysTenUser.getOpenId().length() > 0) { - JSONObject object = JSONObject.parseObject(sysTenUser.getOpenId()); - Integer type = object.getInteger("type"); + JSONObject objectOpenId = JSONObject.parseObject(sysTenUser.getOpenId()); + Integer type = objectOpenId.getInteger("type"); if (type.intValue() == 1) { - String appId = object.getString("appId"); - String appSecret = object.getString("appSecret"); + + String appId = objectOpenId.getString("appId"); + String appSecret = objectOpenId.getString("appSecret"); + + List allCells = this.tenCellService.list((Wrapper) (new QueryWrapper()) .eq("tenant_id", sysTenUser.getTenantId())); + for (TenCellEntity cellEntity : allCells) { String xqid = cellEntity.getThirdId(); - if (xqid == null || xqid.length() > 0) ; + if (xqid != null && xqid.length() > 0) { + //调用第三方接口获取所有信息 + //6.1 获取标准地址接口--------------------------------------------------------------------------- +// String address = XaApi.getAddress(xqid, appId, appSecret); +// 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\"}]}}}"; + log.debug("获取小区标准地址-" + cellEntity.getName() + ":返回数据" + address); + + //解析json + + JSONObject xml = JSONObject.parseObject(address); + if (xml == null) { + continue; + } + JSONObject data = xml.getJSONObject("xml").getJSONObject("data"); + if (data == null) { + continue; + } + JSONArray hlwtable = data.getJSONArray("HLWTable"); + if (hlwtable == null) { + continue; + } +// List list = new ArrayList<>(); + for (int i = 0; i < hlwtable.size(); i++) { + JSONObject object = (JSONObject) hlwtable.get(i); + + TenAddressEntity addressEntity = new TenAddressEntity(); + addressEntity.setJwsid(object.getString("@JWSID")); + addressEntity.setSwjid(object.getString("@SWJID")); + addressEntity.setSsxqbm(object.getString("@SSXQBM")); + addressEntity.setXzqhname(object.getString("@XZQHNAME")); + addressEntity.setDzsc(object.getString("@DZSC")); + addressEntity.setDzqc(object.getString("@DZQC")); + addressEntity.setPId(Long.parseLong(object.getString("@P_ID"))); + addressEntity.setJlxmc(object.getString("@JLXMC")); + addressEntity.setWd(object.getString("@WD")); + addressEntity.setDzjb(object.getString("@DZJB")); + addressEntity.setMphlx(object.getString("@MPHLX")); + addressEntity.setXqid(object.getString("@XQID")); + addressEntity.setDzgsdw(object.getString("@DZGSDW")); + addressEntity.setXtZhxgsj(object.getString("@XT_ZHXGSJ")); + addressEntity.setSj(object.getString("@SJ")); + addressEntity.setXzqh(object.getString("@XZQH")); + addressEntity.setXq(object.getString("@XQ")); + addressEntity.setJd(object.getString("@JD")); + addressEntity.setJwsmc(object.getString("@JWSMC")); + addressEntity.setDzdm(object.getString("@DZDM")); + addressEntity.setJlxdm(object.getString("@JLXDM")); + +// list.add(addressEntity); + tenAddressService.saveOrUpdate(addressEntity); + } + } } } } } - - try { -// String src = "D:\\VsCode\\11.18\\anputest.js"; +// try { +// String src = "/home/huangyifang/gb/社区/oufeng"; // File file = new File(src); -// String js = FileUtils.readFileToString(src,"utf-8"); - - String src = "/home/huangyifang/gb/社区/oufeng"; - File file = new File(src); - FileReader fileReader = new FileReader(file); - BufferedReader br = new BufferedReader(fileReader); - StringBuilder sb = new StringBuilder(); - String temp = ""; - while ((temp = br.readLine()) != null) { - // 拼接换行符 - sb.append(temp + "\n"); - } - br.close(); - String js = sb.toString(); - System.out.println(js); - JSONObject xml = JSONObject.parseObject(js); - JSONArray hlwtable = xml.getJSONObject("xml").getJSONObject("data").getJSONArray("HLWTable"); - - List list = new ArrayList<>(); - for(int i = 0;i list = new ArrayList<>(); +// for (int i = 0; i < hlwtable.size(); i++) { +// JSONObject object = (JSONObject) hlwtable.get(i); +// /* +// { +// "@JWSID": "610113600000000001202", +// "@SWJID": "610113003012013", +// "@SSXQBM": "A61011304538", +// "@XZQHNAME": "西安市雁塔区", +// "@DZSC": "", +// "@DZQC": "陕西省西安市雁塔区长安南路439号1栋1单元2层1121号", +// "@P_ID": "1820580963", +// "@JLXMC": "长安南路", +// "@WD": "34.206951", +// "@DZJB": "14", +// "@MPHLX": "10", +// "@XQID": "610113600000000004538", +// "@DZGSDW": "610113600000", +// "@XT_ZHXGSJ": "2021-03-23 16: 50: 08", +// "@SJ": "", +// "@XZQH": "610113", +// "@XQ": "欧风园小区", +// "@JD": "108.942541", +// "@JWSMC": "陕师大警务室", +// "@DZDM": "000268000029000010000001000002000001", +// "@JLXDM": "000268" +// } +// */ +// +// TenAddressEntity addressEntity = new TenAddressEntity(); +// addressEntity.setJwsid(object.getString("@JWSID")); +// addressEntity.setSwjid(object.getString("@SWJID")); +// addressEntity.setSsxqbm(object.getString("@SSXQBM")); +// addressEntity.setXzqhname(object.getString("@XZQHNAME")); +// addressEntity.setDzsc(object.getString("@DZSC")); +// addressEntity.setDzqc(object.getString("@DZQC")); +// addressEntity.setPId(Long.parseLong(object.getString("@P_ID"))); +// addressEntity.setJlxmc(object.getString("@JLXMC")); +// addressEntity.setWd(object.getString("@WD")); +// addressEntity.setDzjb(object.getString("@DZJB")); +// addressEntity.setMphlx(object.getString("@MPHLX")); +// addressEntity.setXqid(object.getString("@XQID")); +// addressEntity.setDzgsdw(object.getString("@DZGSDW")); +// addressEntity.setXtZhxgsj(object.getString("@XT_ZHXGSJ")); +// addressEntity.setSj(object.getString("@SJ")); +// addressEntity.setXzqh(object.getString("@XZQH")); +// addressEntity.setXq(object.getString("@XQ")); +// addressEntity.setJd(object.getString("@JD")); +// addressEntity.setJwsmc(object.getString("@JWSMC")); +// addressEntity.setDzdm(object.getString("@DZDM")); +// addressEntity.setJlxdm(object.getString("@JLXDM")); +// +// list.add(addressEntity); +// tenAddressService.saveOrUpdate(addressEntity); +// } +// +// System.out.println(""); +//// tenAddressService.saveBatch(list); +// +// } catch (Exception e) { +// log.error(e.getMessage()); +// } + log.debug("获取标准地址定时任务执行完毕"); } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java index e20b6d7..2ca787d 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRealDataTask.java @@ -4,6 +4,7 @@ package net.shapelight.modules.job.task; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import java.util.ArrayList; import java.util.Date; import java.util.HashMap; @@ -14,21 +15,12 @@ import lombok.extern.slf4j.Slf4j; import net.shapelight.common.utils.DateUtils; import net.shapelight.modules.sys.entity.SysUserEntity; import net.shapelight.modules.sys.service.SysUserService; -import net.shapelight.modules.ten.entity.TenCellEntity; -import net.shapelight.modules.ten.entity.TenDeviceEntity; -import net.shapelight.modules.ten.entity.TenPersonEntity; -import net.shapelight.modules.ten.entity.TenRoomEntity; -import net.shapelight.modules.ten.service.TenCellService; -import net.shapelight.modules.ten.service.TenDeviceService; -import net.shapelight.modules.ten.service.TenDoorCardService; -import net.shapelight.modules.ten.service.TenPersonService; -import net.shapelight.modules.ten.service.TenRoomService; +import net.shapelight.modules.ten.entity.*; +import net.shapelight.modules.ten.service.*; import net.shapelight.modules.xian.service.XaApi; -import net.shapelight.modules.xian.vo.XaMJKXX; -import net.shapelight.modules.xian.vo.XaMJSBXX; -import net.shapelight.modules.xian.vo.XaPages; -import net.shapelight.modules.xian.vo.XaSYFW; -import net.shapelight.modules.xian.vo.XaSYRK; +import net.shapelight.modules.xian.utils.AESUtils; +import net.shapelight.modules.xian.utils.XaUtils; +import net.shapelight.modules.xian.vo.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -44,11 +36,12 @@ public class XaRealDataTask implements ITask { @Autowired private TenPersonService tenPersonService; @Autowired - private TenDoorCardService tenDoorCardService; - @Autowired private TenDeviceService tenDeviceService; + @Autowired + private TenAddressService tenAddressService; + public void run(String params) { - log.debug("xaApiTask定时任务正在执行", params); + log.debug("一标三实定时任务正在执行", params); List allSysTenUser = this.sysUserService.findAllSysTenUser(); for (SysUserEntity sysTenUser : allSysTenUser) { if (sysTenUser.getOpenId() != null && sysTenUser.getOpenId().length() > 0) { @@ -57,18 +50,22 @@ public class XaRealDataTask implements ITask { if (type.intValue() == 1) { String appId = object.getString("appId"); String appSecret = object.getString("appSecret"); - String fwikUrl = "http://"; - if (fwikUrl != null) { - List allCells = this.tenCellService.list((Wrapper)(new QueryWrapper()) + //6.2 获取数据对接接口--------------------------------------------------------------------------- +// String fwikUrl = XaApi.getFwikUrl(appId, appSecret); + String fwikUrl = "http://"; + + if (fwikUrl != null) { + List allCells = this.tenCellService.list((Wrapper) (new QueryWrapper()) .eq("tenant_id", sysTenUser.getTenantId())); + for (TenCellEntity cellEntity : allCells) { String xqid = cellEntity.getThirdId(); Long cellId = cellEntity.getCellId(); if (xqid != null && xqid.length() > 0) { processRealRoom(appId, appSecret, xqid, fwikUrl, cellId); - processRealPerson(appId, appSecret, xqid, fwikUrl, cellId); processDoorCard(appId, appSecret, xqid, fwikUrl, cellId); + processRealPerson(appId, appSecret, xqid, fwikUrl, cellId); processDevice(appId, appSecret, xqid, fwikUrl, cellId); } } @@ -76,105 +73,276 @@ public class XaRealDataTask implements ITask { } } } - log.debug("xaApiTask定时任务执行完毕"); + log.debug("一标三实定时任务执行完毕"); } private void processRealRoom(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { List rooms = this.tenRoomService.getNotSync(cellId); List syncRooms = new ArrayList(); + List updateRooms = new ArrayList<>(); int count = 0; for (TenRoomEntity room : rooms) { TenPersonEntity owner = this.tenPersonService.getOwner(room.getRoomId()); - if (owner != null) { - XaSYFW realRoom = new XaSYFW(); - realRoom.setLV_FWLB("1"); - realRoom.setLV_FWXZ("2"); - realRoom.setLV_FWYT("4"); - realRoom.setLV_SFCZF("否"); - realRoom.setLV_FZ_GMSFHM(owner.getIdCard()); - realRoom.setLV_FZ_XM(owner.getName()); - realRoom.setLV_FZ_ZJZL("10"); - realRoom.setLV_FZ_ZJHM(owner.getIdCard()); - realRoom.setLV_FZ_LXDH(owner.getMobile()); - realRoom.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); - realRoom.setLV_FWXZZ("1000"); - realRoom.setLV_FWJG("1"); - realRoom.setLV_COMPUTERID(xqid); - realRoom.setLV_PROCMODE("PMINSERT"); - syncRooms.add(realRoom); + TenAddressEntity addressEntity = tenAddressService.getById(room.getPId()); + if (owner != null && addressEntity != null) { + XaSYFW xaSYFW = new XaSYFW(); + xaSYFW.setLV_FWBM(String.format("%s%011d", addressEntity.getXqid(), addressEntity.getPId()));//xqid(21)+0+P_ID + xaSYFW.setLV_DZBM(addressEntity.getDzdm()); + xaSYFW.setLV_DZMC(addressEntity.getDzqc()); + xaSYFW.setLV_FWLB("1");//1单元楼，2筒子楼3别墅4自建小楼5独立平房6四合院平房7其他 + xaSYFW.setLV_FWXZ("2");//房屋性质1.公有2私有3其他 + xaSYFW.setLV_FWYT("4");//房屋用途：1.办公2厂房3商用4居住5商住两用6其他 + xaSYFW.setLV_SFCZF("否");//是否出租 + xaSYFW.setLV_FZ_GMSFHM(owner.getIdCard());//房主，公民身份证 + xaSYFW.setLV_FZ_XM(owner.getName()); + xaSYFW.setLV_FZ_ZJZL("10");//房主证件类型 + xaSYFW.setLV_FZ_ZJHM(owner.getIdCard());//房主证件号码 + xaSYFW.setLV_FZ_LXDH(owner.getMobile());//联系电话 +// xaSYFW.setLV_DJDWGAJGJGMC("西图之光智能科技有限公司"); //承建商名称 +// xaSYFW.setLV_DJDWGAJGJGDM("xtzg"); + xaSYFW.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); + xaSYFW.setLV_FWXZZ("1000");//房屋现状 1020借用 1000 自用 1010 闲置 1030 租用 1900 其他 9000空挂 9010 拆迁 + xaSYFW.setLV_FWJG("1");//1钢混 2混合 3 砖木 4其他 + xaSYFW.setLV_COMPUTERID(xqid); //XQID + xaSYFW.setLV_SSXQBM(addressEntity.getSsxqbm());//SSXQBM + xaSYFW.setLV_PROCMODE("PMINSERT"); + +// xaSYFW.setLV_FWBM("610113600000000004538" + "01820591355");//xqid(21)+0+P_ID +// xaSYFW.setLV_DZBM("000268000029000013000001000003000002"); +// xaSYFW.setLV_DZMC("陕西省西安市雁塔区长安南路439号4栋1单元3层4131号"); +// xaSYFW.setLV_FWLB("1");//1单元楼，2筒子楼3别墅4自建小楼5独立平房6四合院平房7其他 +// xaSYFW.setLV_FWXZ("2");//房屋性质1.公有2私有3其他 +// xaSYFW.setLV_FWYT("4");//房屋用途：1.办公2厂房3商用4居住5商住两用6其他 +// xaSYFW.setLV_SFCZF("否"); +// xaSYFW.setLV_FZ_GMSFHM("610122196404160321");//房主，公民身份证 +// xaSYFW.setLV_FZ_XM("文淑利"); +// xaSYFW.setLV_FZ_ZJZL("10");//房主证件类型 +// xaSYFW.setLV_FZ_ZJHM("610122196404160321");//房主证件号码 +// xaSYFW.setLV_FZ_LXDH("15325635588");//联系电话 +//// xaSYFW.setLV_DJDWGAJGJGMC("西图之光智能科技有限公司"); //承建商名称 +//// xaSYFW.setLV_DJDWGAJGJGDM("xtzg"); +// xaSYFW.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); +// xaSYFW.setLV_FWXZZ("1000");//房屋现状 1020借用 1000 自用 1010 闲置 1030 租用 1900 其他 9000空挂 9010 拆迁 +// xaSYFW.setLV_FWJG("1");//1钢混 2混合 3 砖木 4其他 +// xaSYFW.setLV_COMPUTERID(xqid); //XQID +// xaSYFW.setLV_SSXQBM("A61011304538");//SSXQBM +// xaSYFW.setLV_PROCMODE("PMINSERT"); + + syncRooms.add(xaSYFW); + updateRooms.add(room); count++; - if (count >= 60) + if (count >= 50) break; } } - Map xaData = new HashMap<>(); - if (syncRooms.size() > 0) - xaData.put("datas", syncRooms); - XaPages xapage = new XaPages(); - xapage.setPno("1"); -// xapage.setPsize(count); -// xapage.setTcount(0); -// xapage.setTsize(0); - String realRoomRes = XaApi.postData(fwikUrl, appId, appSecret, "1", "SYFW", "SYFW", xaData); + XaData jsonData = new XaData(); + jsonData.setDatas(syncRooms); + + List listPages = new ArrayList<>(); + XaPages pages = new XaPages(); + pages.setPno("1"); + pages.setPsize("1"); + listPages.add(pages); + jsonData.setPages(listPages); + + String json = JSONObject.toJSONString(jsonData); + + String enJson = XaUtils.encryptStr(json.trim(), appSecret); +// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYFW", "SYFW", appId, appSecret); +// String resJons = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; + String resJons = "23232"; +// System.out.println(s); + log.debug("上传实有房屋返回数据：" + resJons); + //上传成功，修改sync状态 + if (resJons.contains("\"code\":\"0000\"")) { + for (TenRoomEntity room : updateRooms) { + room.setXaSync(1); + tenRoomService.updateById(room); + } + } } private void processRealPerson(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { - List realPersons = this.tenPersonService.getNotSync(cellId); - List syncPersons = new ArrayList<>(); + List persons = this.tenPersonService.getNotSync(cellId); + List syncPersons = new ArrayList(); + List updatePersons = new ArrayList<>(); int count = 0; - for (TenPersonEntity person : realPersons) { - TenRoomEntity room = this.tenRoomService.getById(person.getRoomId(), person.getCellId()); + for (TenPersonEntity person : persons) { XaSYRK realPerson = new XaSYRK(); - realPerson.setLV_GMSFHM(person.getIdCard()); - realPerson.setLV_XM(person.getName()); + TenRoomEntity roomEntity = tenRoomService.getById(person.getRoomId(), person.getCellId()); + TenAddressEntity addressEntity = tenAddressService.getById(roomEntity.getRoomId()); + + String idcard = person.getIdCard(); + if (idcard.length() >= 18) { + idcard = idcard.substring(0, 18); + } else { + StringBuffer zeroBuf = new StringBuffer(); + for (int i = 0; i < 18 - idcard.length(); i++) { + zeroBuf.append("0"); + } + zeroBuf.append(idcard); + idcard = zeroBuf.toString(); + + } + String syrkbm = String.format("10%s%012d", idcard, addressEntity.getPId());//证件类型10+身份证号(18位)+p_id(12位) + realPerson.setLV_SYRKBM(syrkbm); //实有人口编码 + realPerson.setLV_GMSFHM(person.getIdCard()); //身份证号 + realPerson.setLV_XM(person.getName()); //姓名 realPerson.setLV_ZJZL("10"); - realPerson.setLV_ZJHM(person.getIdCard()); - realPerson.setLV_JZDZ_DZBM(room.getDzbm()); + realPerson.setLV_ZJHM(person.getIdCard()); //身份证号 + realPerson.setLV_JZDZ_DZBM(addressEntity.getDzdm()); //地址编码 DZDM + realPerson.setLV_JZDZ_SSXQ(addressEntity.getXzqh()); //行政区划 XZQH + realPerson.setLV_JZDZ_QHLXXDZ(addressEntity.getDzqc()); //地址名称 DZQC + realPerson.setLV_DJDWGAJGJGMC("西图之光智能科技有限公司"); //承建商名称 + realPerson.setLV_DJDWGAJGJGDM("xtzg"); realPerson.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); - realPerson.setLV_COMPUTERID(xqid); + realPerson.setLV_COMPUTERID(xqid); //XQID realPerson.setLV_PROCMODE("PMINSERT"); + syncPersons.add(realPerson); + updatePersons.add(person); + count++; - if (count >= 60) + if (count >= 50) break; + + } + XaData jsonData = new XaData(); + jsonData.setDatas(syncPersons); + + List listPages = new ArrayList<>(); + XaPages pages = new XaPages(); + pages.setPno("1"); + pages.setPsize("1"); + listPages.add(pages); + jsonData.setPages(listPages); + + String json = JSONObject.toJSONString(jsonData); + + String enJson = XaUtils.encryptStr(json.trim(), appSecret); + +// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "SYRK", "SYRK", appId, appSecret); +// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; + String resJson = "23232"; +// System.out.println(s); + log.debug("上传实有房屋返回数据：" + resJson); + //上传成功，修改sync状态 + if (resJson.contains("\"code\":\"0000\"")) { + for (TenPersonEntity personEntity : updatePersons) { + personEntity.setXaSync(1); + tenPersonService.updateNonal(personEntity); + } } } private void processDoorCard(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { - List realPersons = this.tenPersonService.getNotSyncCard(cellId); - List syncDoorCard = new ArrayList<>(); + List persons = this.tenPersonService.getNotSyncCard(cellId); + List syncDoorCards = new ArrayList<>(); + List updatePersons = new ArrayList<>(); int count = 0; - for (TenPersonEntity person : realPersons) { + for (TenPersonEntity person : persons) { + TenRoomEntity roomEntity = tenRoomService.getById(person.getRoomId(), person.getCellId()); + TenAddressEntity addressEntity = tenAddressService.getById(roomEntity.getRoomId()); + XaMJKXX realCard = new XaMJKXX(); realCard.setLV_MJKLX("4"); realCard.setLV_DJSJ(DateUtils.format(new Date(), "yyyyMMddHHmmss")); + realCard.setLV_SSXQBM(addressEntity.getSsxqbm()); realCard.setLV_SBXT("10"); realCard.setLV_CKR(person.getIdCard()); realCard.setLV_BH(person.getPersonId().toString()); realCard.setLV_PROCMODE("PMINSERT"); - syncDoorCard.add(realCard); + + syncDoorCards.add(realCard); + updatePersons.add(person); + count++; - if (count >= 60) + if (count >= 50) break; } + + XaData jsonData = new XaData(); + jsonData.setDatas(syncDoorCards); + + List listPages = new ArrayList<>(); + XaPages pages = new XaPages(); + pages.setPno("1"); + pages.setPsize("1"); + listPages.add(pages); + jsonData.setPages(listPages); + + String json = JSONObject.toJSONString(jsonData); + + String enJson = XaUtils.encryptStr(json.trim(), appSecret); + +// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJKXX", "MJKXX", appId, appSecret); +// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; + String resJson = "23232"; +// System.out.println(s); + log.debug("上传实有房屋返回数据：" + resJson); + //上传成功，修改sync状态 + if (resJson.contains("\"code\":\"0000\"")) { + for (TenPersonEntity personEntity : updatePersons) { + personEntity.setXaSyncCard(1); + tenPersonService.updateNonal(personEntity); + } + } } private void processDevice(String appId, String appSecret, String xqid, String fwikUrl, Long cellId) { - List realDevices = this.tenDeviceService.getNotSync(cellId); + + List devices = tenDeviceService.getNotSync(cellId); List syncDevices = new ArrayList<>(); + List updateDevices = new ArrayList<>(); int count = 0; - for (TenDeviceEntity device : realDevices) { + for (TenDeviceEntity device : devices) { + + TenAddressEntity addressEntity = tenAddressService.getOne(new QueryWrapper() + .eq("xqid",xqid).last("LIMIT 1")); + String ssxqbm = addressEntity.getSsxqbm(); + XaMJSBXX realDevice = new XaMJSBXX(); - realDevice.setLV_MJMC(device.getName()); - realDevice.setLV_WZMS("1"); - realDevice.setLV_SFYSXT("1"); - realDevice.setLV_SBXT("10"); - realDevice.setLV_MJXTWYBM(device.getSn()); + realDevice.setLV_MJMC(device.getName());//门禁名称，同一小区不可重复 + realDevice.setLV_WZMS("1");//位置描述：1门禁终端设备安装在小区的大门2设备安装在小区某栋楼的出入口3设备安装在小区某栋楼的某几个单元的出入口4设备安装在房屋、单位、学校、医院的出入口 + realDevice.setLV_SFYSXT("1");//是否有摄像头 1有0无 + realDevice.setLV_SSXQBM(ssxqbm);//SSXQBM + realDevice.setLV_SBXT("10");//申报系统，默认10 + realDevice.setLV_MJXTWYBM(device.getSn());//接入方门禁主键 realDevice.setLV_PROCMODE("PMINSERT"); + syncDevices.add(realDevice); + updateDevices.add(device); + count++; - if (count >= 60) + if (count >= 50) break; } + + XaData jsonData = new XaData(); + jsonData.setDatas(syncDevices); + + List listPages = new ArrayList<>(); + XaPages pages = new XaPages(); + pages.setPno("1"); + pages.setPsize("1"); + listPages.add(pages); + jsonData.setPages(listPages); + + String json = JSONObject.toJSONString(jsonData); + + String enJson = XaUtils.encryptStr(json.trim(), appSecret); + +// String resJson = XaApi.httpPOSTJson(fwikUrl, enJson, "MJSBXX", "MJSBXX", appId, appSecret); +// String resJson = "{\"sta\":{\"code\":\"0000\",\"des\":\"成功\",\"ErrorLineParameter\":\"empty\"},\"datas\":[{\"Result\":\"接收成功\"}],\"pages\":[{\"psize\":\"1\",\"tcount\":\"1\",\"pno\":\"1\",\"tsize\":\"0\"}]}"; + String resJson = "23232"; +// System.out.println(s); + log.debug("上传实有房屋返回数据：" + resJson); + //上传成功，修改sync状态 + if (resJson.contains("\"code\":\"0000\"")) { + for (TenDeviceEntity deviceEntity : updateDevices) { + deviceEntity.setXaSync(1); + tenDeviceService.evictupdateById(deviceEntity); + } + } } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/MessageServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/MessageServiceImpl.java index 16edae0..af0b48a 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/MessageServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/nettyapi/service/impl/MessageServiceImpl.java @@ -41,12 +41,12 @@ public class MessageServiceImpl implements MessageService { case CmdConstant.CMD_LOGIN: { // deviceLogin(ctx, msg.content); deviceApiService.login(channel,content); - log.debug("登录信息：" + msg.cmd); + log.debug("登录信息：" + content); break; } case CmdConstant.CMD_GETALL: { - log.debug("全量获取：" + msg.cmd); + log.debug("全量获取：" + content); if(!clientMap.hasUser(channel)){ Result res = Result.error(403,"No permission"); String resContent = JSONObject.toJSONString(res); @@ -58,7 +58,7 @@ public class MessageServiceImpl implements MessageService { break; } case CmdConstant.CMD_GETONE: { - log.debug("获取详情：" + msg.cmd); + log.debug("获取详情：" + content); deviceApiService.getMemberInfo(channel,content); if(!clientMap.hasUser(channel)){ Result res = Result.error(403,"No permission"); @@ -70,7 +70,7 @@ public class MessageServiceImpl implements MessageService { break; } case CmdConstant.CMD_HART: { - log.debug("收到心跳：" + msg.cmd); + log.debug("收到心跳：" + content); if(!clientMap.hasUser(channel)){ Result res = Result.error(403,"No permission"); String resContent = JSONObject.toJSONString(res); @@ -83,7 +83,7 @@ public class MessageServiceImpl implements MessageService { } case CmdConstant.CMD_UPRECORD: { - log.debug("收到上传记录：" + msg.cmd); +// log.debug("收到上传记录：" + msg.cmd); if(!clientMap.hasUser(channel)){ Result res = Result.error(403,"No permission"); String resContent = JSONObject.toJSONString(res); @@ -96,7 +96,7 @@ public class MessageServiceImpl implements MessageService { } case CmdConstant.CMD_EXTRACT: { - log.debug("提取失败log：" + msg.cmd); +// log.debug("提取失败log：" + msg.cmd); if(!clientMap.hasUser(channel)){ Result res = Result.error(403,"No permission"); String resContent = JSONObject.toJSONString(res); @@ -110,43 +110,28 @@ public class MessageServiceImpl implements MessageService { case CmdConstant.CMD_CONFIG: { - log.debug("配置成功：" + msg.cmd); break; } - case CmdConstant.CMD_CHANGE: { - log.debug("人员变更成功：" + msg.cmd); break; } - case CmdConstant.CMD_OPENDOOR: { - log.debug("远程开门：" + msg.cmd); break; } - case CmdConstant.CMD_RESTART: { - log.debug("重启设备：" + msg.cmd); break; } - case CmdConstant.CMD_APPUPDATE: { - log.debug("app升级：" + msg.cmd); break; } - case CmdConstant.CMD_CLEANDATA: { - log.debug("清除数据：" + msg.cmd); serverApiService.cleanDataRes(channel,content); break; } - case CmdConstant.CMD_ENABLE: { - log.debug("停用设备：" + msg.cmd); break; } - default: - log.debug("未知类型:" + msg.cmd); break; } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java index 5398e51..d3e4be3 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenDeviceController.java @@ -114,6 +114,11 @@ public class TenDeviceController extends AbstractController { if(dev!=null){ return R.error("设备已绑定"); } + SysDeviceEntity sysDeviceEntity = sysDeviceService.getOne(new QueryWrapper() + .eq("sn",tenDevice.getSn())); + if(sysDeviceEntity==null){ + return R.error("设备未备案，请联系管理员"); + } // tenDeviceService.save(tenDevice); tenDeviceService.evictSave(tenDevice); return R.ok(); diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java index 6cf3b8c..9c8615a 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenPersonController.java @@ -530,7 +530,9 @@ public class TenPersonController extends AbstractController { }) public R delete(@RequestBody List> params) { //tenRoomService.removeByIds(Arrays.asList(roomIds)); - + if(params.size()>20){ + return R.error("最多选择20条数据"); + } tenPersonService.removeByIdList(params); return R.ok(); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java index d8305b0..1c42955 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/controller/TenUserController.java @@ -236,6 +236,9 @@ public class TenUserController extends AbstractController { return R.error("系统管理员禁止修改"); } } + if(user.getUserId().longValue() == getUserId().longValue()){ + return R.error("您不能停用自己"); + } sysUserService.updateById(user); return R.ok(); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenDeviceService.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenDeviceService.java index 40b03e7..f7587ae 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenDeviceService.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/TenDeviceService.java @@ -65,7 +65,7 @@ public interface TenDeviceService extends IService { void evictupdateById(TenDeviceEntity tenDevice); - List getNotSync(Long paramLong); + List getNotSync(Long cellId); } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java index ad4c082..0b71572 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/ten/service/impl/TenPersonServiceImpl.java @@ -191,6 +191,7 @@ public class TenPersonServiceImpl implements TenPersonService { @Override @Transactional(rollbackFor = Exception.class) + @CacheEvict(value = "TenPerson", allEntries = true) public int save(TenPersonEntity entity) { String userFileUrl = globalValue.getImagesDir() + "/" + entity.getCellId().toString() + "/" + diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/xian/service/RunMain.java b/shapelight-admin/src/main/java/net/shapelight/modules/xian/service/RunMain.java new file mode 100644 index 0000000..a4a0a4c --- /dev/null +++ b/shapelight-admin/src/main/java/net/shapelight/modules/xian/service/RunMain.java @@ -0,0 +1,29 @@ +package net.shapelight.modules.xian.service; + +public class RunMain { + public static void main(String args[]){ + String xqid = "610113600000000004538"; + String idcard = "10325219890212"; + Long pid = 1820591355l; + String s =String.format("%s%011d",xqid,pid); + + String d =String.format("10%s%012d",idcard,pid);//证件类型10+身份证号(18位)+p_id(12位) + System.out.println(d); + + if(idcard.length()>=18){ + idcard = idcard.substring(0,18); + }else{ + StringBuffer zeroBuf = new StringBuffer(); + for(int i = 0;i<18-idcard.length();i++){ + zeroBuf.append("0"); + } + zeroBuf.append(idcard); + idcard = zeroBuf.toString(); + + } + + System.out.println(idcard); + } + + +} diff --git a/shapelight-admin/src/main/resources/5362545_c.xitu3d.com.pfx b/shapelight-admin/src/main/resources/5362545_c.xitu3d.com.pfx new file mode 100644 index 0000000000000000000000000000000000000000..15b7ff757a23e7fa796cb5057d4ff38e8f4d0cdc GIT binary patch literal 4514 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 literal 0 HcmV?d00001 diff --git a/shapelight-admin/src/main/resources/application.yml b/shapelight-admin/src/main/resources/application.yml index 5d3b9ce..8af09bb 100644 --- a/shapelight-admin/src/main/resources/application.yml +++ b/shapelight-admin/src/main/resources/application.yml @@ -29,6 +29,7 @@ spring: max-file-size: 1000MB max-request-size: 1000MB enabled: true + file-size-threshold: 1000MB redis: database: 0 host: 192.168.50.232 diff --git a/shapelight-admin/src/main/resources/mapper/ten/TenRoomDao.xml b/shapelight-admin/src/main/resources/mapper/ten/TenRoomDao.xml index 169e7d4..4b0aa98 100644 --- a/shapelight-admin/src/main/resources/mapper/ten/TenRoomDao.xml +++ b/shapelight-admin/src/main/resources/mapper/ten/TenRoomDao.xml @@ -418,6 +418,7 @@ select * from ten_room where delete_flag = 0 and xa_sync = 0 and cell_id = #{cellId} + and p_id is not null