From 7dd6f64910238eca447d2bbc797f2817275963e6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 24 九月 2024 16:43:53 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 5 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java | 3 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java | 29 ++++-----
server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformStatusListResponse.java | 28 +++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java | 30 ++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 17 +++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java | 8 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java | 9 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java | 16 ++--
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java | 13 ++--
11 files changed, 114 insertions(+), 46 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
index da445e9..1214156 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkInterfaceTestCloudController.java
@@ -35,11 +35,10 @@
* @author 姹熻箘韫�
* @date 2023/11/30 15:33
*/
-@Api(tags = "娴峰悍鏁版嵁鍚屾鎺ュ彛")
+@Api(tags = "娴峰悍鎺ュ彛娴嬭瘯宸ュ叿鎺ュ彛")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/hktest")
public class HkInterfaceTestCloudController extends BaseController {
-
@Autowired
private SystemDictDataBiz systemDictDataBiz;
@@ -67,32 +66,32 @@
return ApiResponse.success( HKService.wxAccessToken(configId,tageId));
}
@ApiOperation("銆愭捣搴枫�戞祴璇曞垎椤佃幏鍙栧憡璀︿簨浠�")
- @GetMapping("/nhEventPageList")
+ @PostMapping("/nhEventPageList")
@LoginNoRequired
public ApiResponse<BaseResponse> nhEventPageList(@RequestBody NhEventPageListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.nhEventPageList(param));
}
@ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵��")
- @GetMapping("/sensorStatusSearch")
+ @PostMapping("/sensorStatusSearch")
@LoginNoRequired
public ApiResponse<BaseResponse> sensorStatusSearch(@RequestBody SensorStatusListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.sensorStatusSearch(param));
}
@ApiOperation("銆愭捣搴枫�戞煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃")
- @GetMapping("/fireChannelSearch")
+ @PostMapping("/fireChannelSearch")
@LoginNoRequired
public ApiResponse<BaseResponse> fireChannelSearch(@RequestBody FireChannelListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireChannelSearch(param));
}
@ApiOperation("銆愭捣搴枫�戞捣搴疯娑堥槻璁惧鍒楄〃")
- @GetMapping("/fireDeviceSearch")
+ @PostMapping("/fireDeviceSearch")
@LoginNoRequired
public ApiResponse<BaseResponse> fireDeviceSearch(@RequestBody FireDeviceListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireDeviceSearch(param));
}
@ApiOperation("銆愭捣搴枫�戝垎椤垫煡璇㈡秷闃茶澶囬儴浠剁姸鎬�")
- @GetMapping("/fireDeviceStatusSearch")
+ @PostMapping("/fireDeviceStatusSearch")
@LoginNoRequired
public ApiResponse<BaseResponse> fireDeviceStatusSearch(@RequestBody FireDeviceStatuslListRequest param, HttpServletResponse response) {
return ApiResponse.success( HKService.fireDeviceStatusSearch(param));
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
index 0170f1c..1643760 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/openapi/HkOpenApiController.java
@@ -195,4 +195,12 @@
public ApiResponse<List<PlatformWarnEventListResponse>> warningEventList(@RequestBody PlatformWarnEventListRequest param) {
return ApiResponse.success(new ArrayList<>());
}
+
+ @LoginNoRequired
+ @PreventRepeat
+ @ApiOperation("銆愭湀鍙般�戞湀鍙扮姸鎬�")
+ @PostMapping("/platform/getStatusList")
+ public ApiResponse<List<PlatformStatusListResponse>> getStatusList() {
+ return ApiResponse.success(platformService.getPlatformStatusList());
+ }
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
index b9e3b0d..8e39c56 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/HKTools.java
@@ -593,24 +593,24 @@
* @param body
* @return
*/
- public static String fireDeviceStatusSearch(Map<String,String> body) {
- return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
+ public static String fireDeviceStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceStatusSearch,body);
}
/**
* 鍒嗛〉鏌ヨ娑堥槻浼犳劅鍣ㄩ儴浠剁姸鎬�
* @param body
* @return
*/
- public static String sensorStatusSearch(Map<String,String> body) {
- return startDoGetStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
+ public static String sensorStatusSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.sensorStatusSearch,body);
}
/**
* 璇㈡秷闃茶澶囧垪琛�
* @param body
* @return
*/
- public static String fireChannelSearch(Map<String,String> body) {
- return startDoGetStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
+ public static String fireChannelSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireChannelSearch,body);
}
/**
@@ -618,8 +618,8 @@
* @param body
* @return
*/
- public static String fireDeviceSearch(Map<String,String> body) {
- return startDoGetStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
+ public static String fireDeviceSearch(String body) {
+ return startDoPostStringArtemis(HKConstants.InterfacePath.fireDeviceSearch,body);
}
/**
* 鑾峰彇鍏ㄩ噺鐢ㄦ埛鍒楄〃
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
index c750997..3823fba 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/BaseListPageResponse.java
@@ -13,6 +13,6 @@
private int pageNo ;// number False 褰撳墠椤电爜
private int totalPage;// number False 鎬婚〉鏁�
- @JSONField(name="list",alternateNames = {"rows","records"})
+ @JSONField(name="list",alternateNames = {"rows","list"})
private List<T> list ;// object[] False 鏉冮檺缁勫璞″垪琛�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
index 38407bc..b9f0d5b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/model/param/respose/FireDeviceStatusListResponse.java
@@ -4,21 +4,16 @@
@Data
public class FireDeviceStatusListResponse {
- private String id ;//String false 棰勫憡璀︿簨浠跺敮涓�鏍囪瘑
- private String warningName ;//String false 棰勫憡璀﹀悕绉�
- private String nodeType ;//Number false 鑺傜偣绫诲瀷
- private String nodeId ;//String false 鑺傜偣ID
- private String nodeName;// String false 鑺傜偣鍚嶇О
- private String nodePath;// String false 鑺傜偣璺緞
- private String ruleType ;//String false 棰勫憡璀︾被鍨�
- private String warningLevel ;//Number false 棰勫憡璀︾瓑绾э紝1锛氫竴鑸紝2锛氫弗閲嶏紝3锛氭晠闅�
- private String warningValue ;//String false 鏁版嵁椤瑰綋鍓嶅��
- private String warningEventTip;// String false 寮傚父鍘熷洜
- private String createTime;// String false 鍙戠敓鏃堕棿
- private String benchmark;// String false 鍩哄噯鏁版嵁
- private String handleStatus;// Number false 澶勭悊鐘舵�侊細1锛氭湭澶勭悊锛�2锛氬凡澶勭悊
- private String note;// String false 澶勭悊鎰忚
- private String handleTime;// String false 澶勭悊鏃堕棿
- private String normal;// Boolean false 棰勫憡璀︽槸鍚︽甯�
- private String deviceId;// String false 璁惧id
+ private String cn ;//String false
+ private String regionIndexCode ;//String false
+ private String indexCode;// String false
+ private String regionName;// String false
+ private String deviceIndexCode;// String false
+ private String deviceType;// Number false
+ private String unitStatus ;//Number false
+ private String online;// Number false
+ private String collectTime;// String false
+ private String faultType;// String false
+ private String faultName;// String false
+ private String faultNum;// String false
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
index 485b0fc..31f76aa 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKService.java
@@ -926,7 +926,7 @@
public static BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> fireDeviceStatusSearch(FireDeviceStatuslListRequest param){
log.info("銆愭捣搴锋煡璇㈡秷闃茶澶囬儴浠剁姸鎬併��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireDeviceStatusSearch(toMap(param));
+ String res = HKTools.fireDeviceStatusSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireDeviceStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -944,7 +944,7 @@
public static BaseResponse<BaseListPageResponse<SensorStatusListResponse>> sensorStatusSearch(SensorStatusListRequest param){
log.info("銆愭捣搴峰垎椤垫煡璇㈡秷闃蹭紶鎰熷櫒閮ㄤ欢鐘舵�併��================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.sensorStatusSearch(toMap(param));
+ String res = HKTools.sensorStatusSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<SensorStatusListResponse>>>(){};
BaseResponse<BaseListPageResponse<SensorStatusListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -963,7 +963,7 @@
public static BaseResponse<BaseListPageResponse<FireChannelListResponse>> fireChannelSearch(FireChannelListRequest param){
log.info("銆愭捣搴锋煡璇㈡秷闃蹭紶鎰熷櫒鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireChannelSearch(toMap(param));
+ String res = HKTools.fireChannelSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireChannelListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireChannelListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -981,7 +981,7 @@
public static BaseResponse<BaseListPageResponse<FireDeviceListResponse>> fireDeviceSearch(FireDeviceListRequest param){
log.info("銆愭捣搴疯娑堥槻璁惧鍒楄〃銆�================寮�濮�===="+JSONObject.toJSONString(param));
try {
- String res = HKTools.fireDeviceSearch(toMap(param));
+ String res = HKTools.fireDeviceSearch(JSONObject.toJSONString(param));
TypeReference typeReference =
new TypeReference<BaseResponse<BaseListPageResponse<FireDeviceListResponse>>>(){};
BaseResponse<BaseListPageResponse<FireDeviceListResponse>> result = JSONObject.parseObject(res, typeReference.getType());
@@ -1338,7 +1338,6 @@
log.error("銆愭捣搴疯幏鍙栧叏閮ㄦ湀鍙颁俊鎭��================澶辫触====锛歕n" + e.getMessage());
}
return null;
-
}
/**
*鍙戦�佹秷鎭粰LED
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 256a013..74e4fe0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -46,7 +46,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
-
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -184,6 +183,10 @@
@TableField(exist = false)
private Integer workStatus;
+ @ApiModelProperty(value = "浣滀笟杞﹁締杞︾墝鐓�")
+ @TableField(exist = false)
+ private String workCarCode;
+
@ApiModelProperty(value = "鏈堝彴浣滀笟鏁版嵁")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformStatusListResponse.java
new file mode 100644
index 0000000..720916f
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/openapi/response/PlatformStatusListResponse.java
@@ -0,0 +1,28 @@
+package com.doumee.dao.openapi.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Created by IntelliJ IDEA.
+ *
+ * @Author : Rk
+ * @create 2023/12/7 11:19
+ */
+@Data
+@ApiModel("銆愭湀鍙般�戞湀鍙扮姸鎬�")
+public class PlatformStatusListResponse {
+
+ @ApiModelProperty(value = "鏈堝彴ID" )
+ private String platformHkId;
+ @ApiModelProperty(value = "鏈堝彴鍚嶇О" )
+ private String platformName;
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String carCode;
+ @ApiModelProperty(value = "鏈堝彴鐘舵�� 0-鏃犺溅 1-鏈夎溅 2-瓒呮椂鍋滈潬 3-閿欒鍋滈潬" )
+ private Integer status;
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
index beaa70c..81fe289 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/PlatformService.java
@@ -4,6 +4,7 @@
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
+import com.doumee.dao.openapi.response.PlatformStatusListResponse;
import java.util.List;
@@ -101,4 +102,6 @@
PlatformNumByStatusResponse getPlatformNumByStatusResponse();
+ List<PlatformStatusListResponse> getPlatformStatusList();
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
index 893331c..589330c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/PlatformServiceImpl.java
@@ -14,6 +14,7 @@
import com.doumee.dao.business.join.PlatformJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.openapi.response.PlatformNumByStatusResponse;
+import com.doumee.dao.openapi.response.PlatformStatusListResponse;
import com.doumee.service.business.PlatformDeviceService;
import com.doumee.service.business.PlatformService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -333,6 +334,35 @@
+ @Override
+ public List<PlatformStatusListResponse> getPlatformStatusList(){
+ List<Platform> platformList = platformJoinMapper.selectJoinList(Platform.class,new MPJLambdaWrapper<Platform>()
+ .selectAll(Platform.class)
+ .select(" ( select count(1) from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" ) as workStatus ")
+ .select(" ( select pj.CAR_CODE_FRONT from platform_job pj where t.id = pj.PLATFORM_ID and pj.STATUS = "+Constants.PlatformJobStatus.WORKING.getKey()+" limit 1 ) as workCarCode ")
+ .eq(Platform::getIsdeleted,Constants.ZERO)
+ );
+ List<PlatformStatusListResponse> platformStatusListResponses = new ArrayList<>();
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(platformList)){
+ for (Platform platform:platformList) {
+ PlatformStatusListResponse response = new PlatformStatusListResponse();
+ response.setPlatformHkId(platform.getHkId());
+ response.setPlatformName(platform.getName());
+ response.setStatus(platform.getPlatformStatus());
+ if(Constants.equalsInteger(platform.getPlatformStatus(),Constants.ONE)){
+ response.setCarCode(platform.getWorkCarCode());
+ }
+
+
+
+ }
+ }
+
+
+ return platformStatusListResponses;
+
+ }
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 9816597..b10d537 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -1027,7 +1027,6 @@
*/
private void dealCarsInErrorPlatformBiz( PlatformJob model,EventPlatformCarsStatusInfoRequest status) {
//TODO-----------------澶勭悊杞﹁締杩涘叆閿欒鏈堝彴涓氬姟閫昏緫
-
List<PlatformDevice> deviceList = platformDeviceMapper.selectList(new QueryWrapper<PlatformDevice>().lambda()
.eq(PlatformDevice::getPlatformId,model.getPlatformId())
.eq(PlatformDevice::getIsdeleted,Constants.ZERO));
@@ -1041,7 +1040,6 @@
continue;
}
if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
-
//濡傛灉鏄疞ED
TransparentChannelBodyRequest body = new TransparentChannelBodyRequest();
TransparentChannelHeadRequest head = new TransparentChannelHeadRequest();
@@ -1053,16 +1051,21 @@
body.setMethod("ControlLedGereral");//鍥哄畾鍊�
request.setIndexCode(device.getHkId());
request.setOperationType(219);//鍥哄畾鍊�
- regions.setActionType(0);
+ regions.setActionType(32);
regions.setContent(content);
regions.setRegionNo(1);
regions.setRegionType(14);
- regions.setFontColor(2);
+ regions.setFontColor(1);
regions.setCircleTimes(1);//寰幆娆℃暟
- regions.setFontSize(31);//
+ regions.setFontSize(32);//
regions.setStayTime(1);//鍗曚綅锛燂紵
+ regions.setRegionLeftTopXPos(0);
+ regions.setRegionLeftTopYPos(0);
+ regions.setRegionRightBottomXPos(255);
+ regions.setRegionRightBottomYPos(31);
request.setRegions(new ArrayList<>());
request.getRegions().add(regions);
+ regions.setSpeed(13);
body.setParams(request);
HKService.transparentchannel(head,body);
}else if(Constants.equalsInteger(device.getType(),Constants.ZERO)){
@@ -1073,9 +1076,9 @@
if(broadcastList.size()>0){
CustomBroadcastRequest request = new CustomBroadcastRequest();
request.setAudioPointIndexCode(broadcastList);
- request.setPlayDuration(60);//鍗曚綅绉�
+ request.setPlayDuration(15);//鍗曚綅绉�
request.setBroadCastMode("tts");
- request.setPriority(15);
+ request.setPriority(1);
request.setState(1);//鎾斁/鍋滄鏍囪瘑 1-鎾斁锛�0-鍋滄
request.setPlayTtsContent(content);
HKService.customBroadcast(request);
--
Gitblit v1.9.3