admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

数据校验修改

Browse Source
This commit is contained in:
GUO 2024-06-01 21:41:34 +08:00
parent 5c9e1dc443
commit adc97cd3fd
5 changed files with 44 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
View File

@ -1846,7 +1846,7 @@ public class HikvisionCall {
final String ARTEMIS_PATH = "/artemis"; final String ARTEMIS_PATH = "/artemis";
final String path = ARTEMIS_PATH + "/api/pms/v1/parkingSpace/reservations/deletion"; final String path = ARTEMIS_PATH + "/api/pms/v1/parkingSpace/reservations/deletion";
String host = "https://" + project.getArtemisConfigHost(); String host = "https://" + project.getArtemisConfigHost();
JSONArray reservationCarInfoList = getReservationCarInfoList(carInfo, project); JSONArray reservationCarInfoList = getReservationCarInfoList(carInfo.getCarNumber(), project);
if (CollUtil.isNotEmpty(reservationCarInfoList)) { if (CollUtil.isNotEmpty(reservationCarInfoList)) {
for (int i = 0; i < reservationCarInfoList.size(); i++) { for (int i = 0; i < reservationCarInfoList.size(); i++) {
JSONObject jsonObject = reservationCarInfoList.getJSONObject(i); JSONObject jsonObject = reservationCarInfoList.getJSONObject(i);
@ -1864,30 +1864,24 @@ public class HikvisionCall {
/** /**
* 查询预约记录v2 * 查询预约记录v2
* *
* @param carInfo * @param carNumber
* @param project * @param project
*/ */
private JSONArray getReservationCarInfoList(CarInfo carInfo, Project project) throws Exception { public JSONArray getReservationCarInfoList(String carNumber, Project project) throws Exception {
final String ARTEMIS_PATH = "/artemis"; final String ARTEMIS_PATH = "/artemis";
final String path = ARTEMIS_PATH + "/api/pms/v2/reserveRecord/page"; final String path = ARTEMIS_PATH + "/api/pms/v2/reserveRecord/page";
String host = "https://" + project.getArtemisConfigHost(); String host = "https://" + project.getArtemisConfigHost();
HikvisionReservationCarInfo info = getHikvisionReservationCarInfoObj(carInfo, project); HikvisionReservationCarInfo info = getHikvisionReservationCarInfoObj(carNumber, project);
String rs = HikvisionUtil.doPost(host, path, JSON.toJSONString(info), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()); String rs = HikvisionUtil.doPost(host, path, JSON.toJSONString(info), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
try { JSONObject jsonObjectData = HikvisionUtil.getJSONObjectData(rs);
JSONObject jsonObjectData = HikvisionUtil.getJSONObjectData(rs); return jsonObjectData.getJSONArray("list");
return jsonObjectData.getJSONArray("list");
} catch (Exception e) {
log.error("error：", e);
}
return null;
} }
private HikvisionReservationCarInfo getHikvisionReservationCarInfoObj(CarInfo carInfo, Project project) throws Exception { private HikvisionReservationCarInfo getHikvisionReservationCarInfoObj(String carNumber, Project project) throws Exception {
String projectParkCode = getProjectParkCode(project); String projectParkCode = getProjectParkCode(project);
HikvisionReservationCarInfo hikvisionReservationCarInfo = new HikvisionReservationCarInfo(); HikvisionReservationCarInfo hikvisionReservationCarInfo = new HikvisionReservationCarInfo();
String parkIndexCode = projectParkCode; hikvisionReservationCarInfo.setParkSyscode(projectParkCode);
hikvisionReservationCarInfo.setParkSyscode(parkIndexCode); hikvisionReservationCarInfo.setPlateNo(carNumber);
hikvisionReservationCarInfo.setPlateNo(carInfo.getCarNumber());
hikvisionReservationCarInfo.setResvState(0L); hikvisionReservationCarInfo.setResvState(0L);
//hikvisionReservationCarInfo.setResvWay(); //hikvisionReservationCarInfo.setResvWay();
//hikvisionReservationCarInfo.setAllowTimes(); //hikvisionReservationCarInfo.setAllowTimes();
@ -2184,8 +2178,7 @@ public class HikvisionCall {
String host = "https://" + project.getArtemisConfigHost(); String host = "https://" + project.getArtemisConfigHost();
JSONObject jo = new JSONObject(); JSONObject jo = new JSONObject();
String rs = HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret()); String rs = HikvisionUtil.doPost(host, path, jo.toJSONString(), null, project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret());
JSONArray jod = HikvisionUtil.getJSONArrayData(rs); return HikvisionUtil.getJSONArrayData(rs);
return jod;
} }
private HikvisionOrganization getHikvisionOrganization(Project project) { private HikvisionOrganization getHikvisionOrganization(Project project) {

1
src/main/java/com/zhgd/xmgl/constant/Cts.java
View File

@ -26,4 +26,5 @@ public interface Cts {
String TEAM_ID = "teamId"; String TEAM_ID = "teamId";
String IF_FROM_TASK_KEY = "ifFromTaskKey"; String IF_FROM_TASK_KEY = "ifFromTaskKey";
String DEPARTMENT_ID = "departmentId"; String DEPARTMENT_ID = "departmentId";
String RESERVATION_TYPE = "reservationType";
} }

3
src/main/java/com/zhgd/xmgl/modules/car/mapper/xml/CarInfoMapper.xml
View File

@ -30,6 +30,9 @@
<if test="param.carModuleType != null and param.carModuleType != '' and param.carModuleType != '4'.toString()"> <if test="param.carModuleType != null and param.carModuleType != '' and param.carModuleType != '4'.toString()">
and t.car_module_type = #{param.carModuleType} and t.car_module_type = #{param.carModuleType}
</if> </if>
<if test="param.reservationType == '1'.toString()">
and t.car_module_type != 1
</if>
<if test="param.enterpriseIds != null and param.enterpriseIds.size() != 0"> <if test="param.enterpriseIds != null and param.enterpriseIds.size() != 0">
and t.enterprise_id in and t.enterprise_id in
<foreach collection="param.enterpriseIds" index="index" item="item" open="(" separator="," close=")"> <foreach collection="param.enterpriseIds" index="index" item="item" open="(" separator="," close=")">

32
src/main/java/com/zhgd/xmgl/task/HikvisionTask.java
View File

@ -104,6 +104,12 @@ public class HikvisionTask {
} }
} }
public void compareHikvisionForCar(Project project) throws Exception {
compareHikvisionForFixCar(project);
compareHikvisionForReservationCar(project);
xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "4");
}
public void compareHikvisionForEnterpriseEtc(Project project) throws Exception { public void compareHikvisionForEnterpriseEtc(Project project) throws Exception {
//对比企业 //对比企业
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
@ -256,13 +262,31 @@ public class HikvisionTask {
xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "3"); xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "3");
} }
public void compareHikvisionForCar(Project project) throws Exception { public void compareHikvisionForFixCar(Project project) throws Exception {
JSONObject param = new JSONObject(); JSONObject param = new JSONObject();
HikvisionUtil.addPageParamIfAbsent(param); HikvisionUtil.addPageParamIfAbsent(param);
JSONObject rtJo = HikvisionUtil.getCarList(project, param); JSONObject rtJo = HikvisionUtil.getFixCarList(project, param);
List<CarInfo> carInfoList = carInfoService.selectCarList(new MapBuilder<String, Object>().put(Cts.PROJECT_SN, project.getProjectSn()).build()); List<CarInfo> carInfoList = carInfoService.selectCarList(new MapBuilder<String, Object>()
.put(Cts.PROJECT_SN, project.getProjectSn())
.put("carModuleType", 1)
.build());
JSONObject dataJo = HikvisionUtil.getJSONObjectData(rtJo); JSONObject dataJo = HikvisionUtil.getJSONObjectData(rtJo);
JSONArray listJa = dataJo.getJSONArray("list"); JSONArray listJa = dataJo.getJSONArray("list");
compareAndAddData(project, listJa, carInfoList);
}
public void compareHikvisionForReservationCar(Project project) throws Exception {
JSONObject param = new JSONObject();
HikvisionUtil.addPageParamIfAbsent(param);
JSONArray listJa = hikvisionCall.getReservationCarInfoList(null, project);
List<CarInfo> carInfoList = carInfoService.selectCarList(new MapBuilder<String, Object>()
.put(Cts.PROJECT_SN, project.getProjectSn())
.put(Cts.RESERVATION_TYPE, 1)
.build());
compareAndAddData(project, listJa, carInfoList);
}
private void compareAndAddData(Project project, JSONArray listJa, List<CarInfo> carInfoList) {
if (CollUtil.isEmpty(listJa)) { if (CollUtil.isEmpty(listJa)) {
for (CarInfo carInfo : carInfoList) { for (CarInfo carInfo : carInfoList) {
xzHikvisionCompareDataService.addCompareDataForCar(project, carInfo.getCarNumber(), 0, 1, String.valueOf(carInfo.getId())); xzHikvisionCompareDataService.addCompareDataForCar(project, carInfo.getCarNumber(), 0, 1, String.valueOf(carInfo.getId()));
@ -286,7 +310,7 @@ public class HikvisionTask {
} }
} }
xzHikvisionCompareDataService.addSuccessShow(project.getProjectSn(), "4");
} }
} }

4
src/main/java/com/zhgd/xmgl/util/HikvisionUtil.java
View File

@ -154,12 +154,12 @@ public class HikvisionUtil {
} }
/** /**
* 查询车辆列表v2 * 查询车辆列表v2-固定车辆
* *
* @param project * @param project
* @return * @return
*/ */
public static JSONObject getCarList(Project project, JSONObject param) throws Exception { public static JSONObject getFixCarList(Project project, JSONObject param) throws Exception {
if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) { if (project == null || !Objects.equals(project.getSyncHikvision(), 1)) {
return null; return null;
} }