From 135e1039d78e767536d91bcbce04d2efedb2f7b2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 29 五月 2023 20:37:18 +0800
Subject: [PATCH] 出入库优化-登记1
---
igds-core/src/main/java/com/ld/igds/inout/ApiInoutManager.java | 11
igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java | 38 -
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutDeviceController.java | 43 --
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 2
igds-core/src/main/java/com/ld/igds/constant/RedisConst.java | 54 +-
igds-inout/src/main/java/com/ld/igds/io/notify/impl/NotifyLprServiceImpl.java | 11
igds-web/src/main/resources/templates/admin/inout/in-register.html | 655 ++++++++++++++++-----------------
igds-web/src/main/resources/static/admin/inout/style.css | 27 +
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java | 47 +-
/dev/null | 0
igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java | 74 +++
igds-inout/src/main/java/com/ld/igds/m/view/InoutConf.view.xml | 59 +-
igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java | 32 -
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 2
igds-core/src/main/java/com/ld/igds/models/InoutConf.java | 11
igds-inout/src/main/java/com/ld/igds/io/notify/NotifyLprService.java | 8
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java | 50 +-
igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/WeightGatewayRemoteTask.java | 10
18 files changed, 559 insertions(+), 575 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 8ba9a5d..6f7362c 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -7,7 +7,6 @@
import com.ld.igds.common.dto.THDto;
import com.ld.igds.common.mapper.CommonMapper;
import com.ld.igds.constant.Constant;
-import com.ld.igds.constant.DepotStatus;
import com.ld.igds.constant.RedisConst;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
@@ -19,7 +18,6 @@
import com.ld.igds.util.RedisUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
-import org.dom4j.CDATA;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
diff --git a/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java b/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
index a8ac206..d8431e3 100644
--- a/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
+++ b/igds-core/src/main/java/com/ld/igds/constant/RedisConst.java
@@ -72,127 +72,127 @@
/**
* 浠撳簱鍒楄〃KEY
*/
- public static final String KEY_DEPOT = "KEY_DEPOT";
+ public static final String KEY_DEPOT = "DEPOT_DATA";
/**
* 浠撳簱鍙傛暟鍒楄〃KEY
*/
- public static final String KEY_DEPOT_CONF = "KEY_DEPOT_CONF";
+ public static final String KEY_DEPOT_CONF = "DEPOT_CONF";
/**
* 鍒嗘満鍒楄〃KEY
*/
- public static final String KEY_DEVICE_SER_LIST = "KEY_SER_LIST";
+ public static final String KEY_DEVICE_SER_LIST = "SER_LIST";
/**
* 璁惧鍒楄〃
*/
- public static final String KEY_DEVICE_LIST = "KEY_DEVICE_LIST";
+ public static final String KEY_DEVICE_LIST = "DEVICE_LIST";
/**
* 璁惧鍒楄〃
*/
- public static final String KEY_DEVICE_IOT_LIST = "KEY_DEVICE_IOT_LIST";
+ public static final String KEY_DEVICE_IOT_LIST = "DEVICE_IOT_LIST";
/**
* 浠撳簱鍜屽垎鏈虹殑澶氬澶氬叧绯婚泦鍚�
*/
- public static final String KEY_DEPOT_SER_LIST = "KEY_DEPOT_SER_LIST";
+ public static final String KEY_DEPOT_SER_LIST = "DEPOT_SER_LIST";
/**
* 寤虹瓚鐗╀俊鎭�
*/
- public static final String KEY_BUILDING_LIST = "KEY_BUILDING_LIST";
+ public static final String KEY_BUILDING_LIST = "BUILDING_LIST";
/**
* 鎵ц鍛戒护KEY鍓嶇紑
*/
- public static final String KEY_ORDER_PRE = "KEY_ORDER";
+ public static final String KEY_ORDER_PRE = "ORDER";
/**
* 鏈�鏂扮伯鎯呬俊鎭紦瀛樺垪琛紝鐢ㄤ簬瀛樻斁褰撳墠鏈�鏂扮殑绮儏淇℃伅
*/
- public static final String KEY_GRAIN = "KEY_GRAIN";
+ public static final String KEY_GRAIN = "GRAIN_DATA";
/**
* 鏈�鏂版皵浣撲俊鎭紦瀛樺垪琛�
*/
- public static final String KEY_GAS_DATA = "KEY_GAS_DATA";
+ public static final String KEY_GAS_DATA = "GAS_DATA";
/**
* 绯荤粺閰嶇疆KEY
*/
- public static final String KEY_SYS_CONF = "KEY_SYS_CONF";
+ public static final String KEY_SYS_CONF = "SYS_CONF";
/**
* 绮簱鐨勬俯婀垮害淇℃伅缂撳瓨
*/
- public static final String KEY_DEPOT_TH_PREFIX = "KEY_DEPOT_TH_PREFIX";
+ public static final String KEY_DEPOT_TH_PREFIX = "DEPOT_TH_PREFIX";
/**
* 浠ュ垎鏈烘垨鑰呬粨搴撲负鍗曚綅瀛樺偍鐨勪粨娓╀粨婀跨紦瀛樻爣鏍囩
*/
- public static final String KEY_T_TH = "KEY_T_TH";
+ public static final String KEY_T_TH = "T_TH";
/**
* 瀛樻斁姘旇薄淇℃伅鐨凨EY
*/
- public static final String KEY_WEATHER_INFO = "KEY_WEATHER_INFO";
+ public static final String KEY_WEATHER_INFO = "WEATHER_INFO";
/**
* 鏍规嵁浠撳簱缂栫爜瀛樻斁鏈�鏂扮殑鑳借�楁暟鎹俊鎭�
*/
- public static final String KEY_ES_DATA_MAP = "KEY_ES_DATA_MAP";
+ public static final String KEY_ES_DATA_MAP = "ES_DATA_MAP";
/**
* 绯荤粺涓粍缁囧垪琛�
*/
- public static final String KEY_DEPT_LIST = "KEY_DEPT_LIST";
+ public static final String KEY_DEPT_LIST = "DEPT_LIST";
/**
* 鍒舵爱鏈洪厤缃垪琛�
*/
- public static final String KEY_N2_CONF_LIST = "KEY_N2_CONF_LIST";
+ public static final String KEY_N2_CONF_LIST = "N2_CONF_LIST";
/**
* 鏈�鏂版皵鍘嬩俊鎭紦瀛樺垪琛�
*/
- public static final String KEY_PRESSURE_DATA = "KEY_PRESSURE_DATA";
+ public static final String KEY_PRESSURE_DATA = "PRESSURE_DATA";
/**
* 绯荤粺閰嶇疆鐨勬憚鍍忔満淇℃伅缂撳瓨
*/
- public static final String KEY_CAMERA_LIST = "KEY_CAMERA_LIST";
+ public static final String KEY_CAMERA_LIST = "CAMERA_LIST";
/**
* 涓夌淮閰嶇疆鍏宠仈淇℃伅key
*/
- public static final String KEY_THREE_CONF = "KEY_THREE_CONF";
+ public static final String KEY_THREE_CONF = "THREE_CONF";
/**
* 涓存椂缂撳瓨KEY鍓嶇紑
*/
- public static final String KEY_TEMP_PREFIX = "KEY_TEMP_";
+ public static final String KEY_TEMP_PREFIX = "TEMP_";
/**
* 鏁伴噺鐩戞祴鍙傛暟鍒楄〃KEY--鍗曚釜璁惧
*/
- public static final String KEY_QUANTITY_CONF = "KEY_QUANTITY_CONF";
+ public static final String KEY_QUANTITY_CONF = "QUANTITY_CONF";
/**
* 浠撳簱璐ㄩ噺宸℃鏁版嵁缂撳瓨
*/
- public static final String KEY_DEPOT_QUALITY = "KEY_DEPOT_QUALITY";
+ public static final String KEY_DEPOT_QUALITY = "DEPOT_QUALITY";
/**
* 浠撳簱娑蹭綅鏁版嵁缂撳瓨
*/
- public static final String KEY_DEPOT_HEIGHT = "KEY_DEPOT_HEIGHT";
+ public static final String KEY_DEPOT_HEIGHT = "DEPOT_HEIGHT";
/**
* 浠撳簱鐗╄仈缃戝叧iot璁惧娓╂箍搴︾紦瀛榢ey
*/
- public static final String KEY_IOT_DEPOT_TEMP_HUM = "KEY_IOT_DEPOT_TEMP_HUM";
+ public static final String KEY_IOT_DEPOT_TEMP_HUM = "IOT_DEPOT_TEMP_HUM";
/**
* 鍗曚釜鏁伴噺妫�娴嬫湇鍔�
*/
@@ -201,11 +201,11 @@
/**
* 璀﹀憡閰嶇疆鍒楄〃KEY
*/
- public static final String KEY_WARN_CONF = "KEY_WARN_CONF";
+ public static final String KEY_WARN_CONF = "WARN_CONF";
/**
* 闂ㄧ璁惧閰嶇疆鍒楄〃
*/
- public static final String KEY_DOOR_SENSOR_LIST = "KEY_DOOR_SENSOR_LIST";
+ public static final String KEY_DOOR_SENSOR_LIST = "DOOR_SENSOR_LIST";
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/ApiInoutManager.java b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutManager.java
similarity index 74%
rename from igds-inout/src/main/java/com/ld/igds/inout/manager/ApiInoutManager.java
rename to igds-core/src/main/java/com/ld/igds/inout/ApiInoutManager.java
index fd7df9b..e97a135 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/ApiInoutManager.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutManager.java
@@ -1,6 +1,5 @@
-package com.ld.igds.inout.manager;
+package com.ld.igds.inout;
-import com.ld.igds.io.InoutApiService;
import com.ld.igds.io.constant.ProtocolEnum;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
@@ -20,12 +19,12 @@
public class ApiInoutManager implements ApplicationContextAware {
- public static Map<String, InoutApiService> remoteMap = new HashMap<>();
+ public static Map<String, ApiInoutService> remoteMap = new HashMap<>();
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- Map<String, InoutApiService> grainMap = applicationContext.getBeansOfType(InoutApiService.class);
+ Map<String, ApiInoutService> grainMap = applicationContext.getBeansOfType(ApiInoutService.class);
for (String key : grainMap.keySet()) {
remoteMap.put(grainMap.get(key).getProtocol(), grainMap.get(key));
@@ -38,8 +37,8 @@
* @param protocol 鎵�灞炲崗璁�
* @return
*/
- public InoutApiService getApiService(String protocol) {
- InoutApiService apiService = remoteMap.get(protocol);
+ public ApiInoutService getApiService(String protocol) {
+ ApiInoutService apiService = remoteMap.get(protocol);
if (null == apiService) {
apiService = remoteMap.get(ProtocolEnum.TCP_DEFAULT.getCode());
}
diff --git a/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
new file mode 100644
index 0000000..82d8614
--- /dev/null
+++ b/igds-core/src/main/java/com/ld/igds/inout/ApiInoutService.java
@@ -0,0 +1,74 @@
+package com.ld.igds.inout;
+
+import com.ld.igds.inout.dto.ApiInoutData;
+
+
+/**
+ * @Desc: 鍑哄叆搴撶浉鍏宠澶囪皟鐢ㄦ帴鍙�
+ * @author: Andy
+ * @update-time: 2023/5/29
+ */
+public interface ApiInoutService {
+
+ /**
+ * 鑾峰彇鍗忚
+ *
+ * @return
+ */
+ String getProtocol();
+
+
+ /**
+ * 閫氳繃鍗忚鑾峰彇涓�鍗￠�氱殑缁撴灉
+ *
+ * @param param
+ * @return
+ */
+ ApiInoutData getIcCardNum(ApiInoutData param);
+
+
+ /**
+ * 鑾峰彇杞︾墝璇嗗埆缁撴灉
+ *
+ * @param param
+ * @return
+ */
+ ApiInoutData getPlateNum(ApiInoutData param);
+
+
+ /**
+ * 杞︾墝璇嗗埆鍒濆鍖�
+ *
+ * @param param
+ * @return
+ */
+ String initLpr(ApiInoutData param);
+
+
+ /**
+ * 闂告満鎺у埗-actionCode鍜� deviceId
+ *
+ * @param param
+ * @return
+ */
+ String gateControl(ApiInoutData param);
+
+
+ /**
+ * 璇煶鎾斁--杩滅▼璋冪敤璇煶鎾斁
+ *
+ * @param param actionCode 鍜� msg涓嶅彲涓虹┖
+ * @return
+ */
+ String noticeRadio(ApiInoutData param);
+
+
+ /**
+ * LED灞忓箷鎺ㄩ�佷俊鎭�
+ *
+ * @param param actionCode 鍜� msg涓嶅彲涓虹┖
+ * @return
+ */
+ String noticeLed(ApiInoutData param);
+
+}
diff --git a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
similarity index 78%
rename from igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java
rename to igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
index 8414a0c..10168ff 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/dto/InoutApiData.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/dto/ApiInoutData.java
@@ -11,28 +11,19 @@
* 鍑哄叆搴撴祦绋嬭繃绋嬩腑锛岃溅鐗屽け璐ワ紝璇诲崱鍣ㄧ瓑璁惧鐨勫叕鍏卞弬鏁板拰浼犻�掑璞�
*/
@Data
-public class InoutApiData implements Serializable {
+public class ApiInoutData implements Serializable {
private static final long serialVersionUID = 1L;
- @PropertyDef(label = "涓婚敭")
private String id;
- @PropertyDef(label = "缁勭粐缂栫爜")
private String companyId;
- @PropertyDef(label = "鎵�灞炲簱鐐�")
private String deptId;
@PropertyDef(label = "鍑哄叆搴撻厤濂楀簭鍙�")
private String sort = "1";
-
- @PropertyDef(label = "璁惧椤哄簭")
- private int inOrder = 1;
-
- @PropertyDef(label = "鎵�灞炴祦绋�")
- private String inoutProgress;
@PropertyDef(label = "璁惧鍚嶇О")
private String name;
@@ -40,10 +31,8 @@
@PropertyDef(label = "璁惧搴忓垪鍙�/璁惧缂栫爜")
private String sn;
- @PropertyDef(label = "鍒嗘満IP")
private String ip;
- @PropertyDef(label = "鍒嗘満绔彛")
private Integer port;
@PropertyDef(label = "甯愬彿")
@@ -57,9 +46,6 @@
@PropertyDef(label = "鎺у埗绔彛")
private Integer portCtrl;
-
- @PropertyDef(label = "WEB绔彛")
- private Integer portWeb;
@PropertyDef(label = "璁惧绫诲瀷")
private String type;
@@ -88,9 +74,6 @@
private Date time = new Date();
- //璁惧缂栫爜
-// private String deviceId;
-
//淇℃伅
private String msg;
@@ -103,18 +86,22 @@
//绉伴噸淇℃伅
private double weight = 0.0;
+ //鍔ㄤ綔缂栫爜锛屼緥濡傚紑闂告満-鍏抽椄鏈虹瓑
+ private String actionCode;
- public InoutApiData() {
+ //鍔ㄤ綔缂栫爜锛岃澶囩紪鍙�
+ private String deviceId;
+
+
+ public ApiInoutData() {
super();
}
- public InoutApiData(InoutConf conf) {
+ public ApiInoutData(InoutConf conf) {
this.id = conf.getId();
this.companyId = conf.getCompanyId();
this.deptId = conf.getDeptId();
this.sort = conf.getSort();
- this.inOrder = conf.getInOrder();
- this.inoutProgress = conf.getInoutProgress();
this.name = conf.getName();
this.sn = conf.getSn();
this.ip = conf.getIp();
@@ -123,7 +110,6 @@
this.pwd = conf.getPwd();
this.chanNum = conf.getChanNum();
this.portCtrl = conf.getPortCtrl();
- this.portWeb = conf.getPortWeb();
this.type = conf.getType();
this.status = conf.getStatus();
this.protocol = conf.getProtocol();
diff --git a/igds-core/src/main/java/com/ld/igds/io/InoutApiService.java b/igds-core/src/main/java/com/ld/igds/io/InoutApiService.java
deleted file mode 100644
index 8d82754..0000000
--- a/igds-core/src/main/java/com/ld/igds/io/InoutApiService.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.ld.igds.io;
-
-import com.ld.igds.inout.dto.InoutApiData;
-
-/**
- * 杞︾墝璇嗗埆璋冪敤鎺ュ彛锛岄�氳繃閰嶇疆鐨勫崗璁皟鐢ㄤ笉鍚岀殑鎺ュ彛瀹炵幇
- *
- * @author chen
- */
-public interface InoutApiService {
-
- /**
- * 鑾峰彇鍗忚
- *
- * @return
- */
- String getProtocol();
-
- /**
- * 鑾峰彇杞︾墝璇嗗埆缁撴灉
- *
- * @param param
- * @return
- */
- InoutApiData getPlateNum(InoutApiData param);
-
- /**
- * 杞︾墝璇嗗埆-閲嶇疆杩炴帴
- *
- * @param param
- * @return 鎴愬姛杩斿洖nULL锛屽紓甯歌繑鍥炲紓甯镐俊鎭�
- */
- String reConnectLpr(InoutApiData param);
-
-
- /**
- * 鍒濆鍖�
- *
- * @param param
- * @return
- */
- String initLpr(InoutApiData param);
-
-
- /**
- * 闂告満杩滅▼鎿嶄綔
- *
- * @param param deviceId鍜宎ctionCode 涓嶅彲涓虹┖
- * @return
- */
- String gateControl(InoutApiData param);
-
-
- /**
- * 杞︾墝璇嗗埆-鐧藉悕鍗曟搷浣滄帶鍒讹紝鍖呮嫭鏂板鍜屽垹闄�
- *
- * @param param deviceId鍜宎ctionCode 涓嶅彲涓虹┖
- * @return
- */
- String addWhitePlate(InoutApiData param);
-
- /**
- * 鍒犻櫎鍑哄叆搴撹溅鐗岃瘑鍒櫧鍚嶅崟
- *
- * @param apiData
- * @return
- */
- String delWhitePlate(InoutApiData apiData);
-
-
- /**
- * 璇煶鎾斁--杩滅▼璋冪敤璇煶鎾斁
- *
- * @param param actionCode 鍜� msg涓嶅彲涓虹┖
- * @return
- */
- String noticeRadio(InoutApiData param);
-
- /**
- * 杩滅▼鍒ゆ柇绉伴噸涓绘帶鍣ㄥ湪绾跨姸鎬�
- *
- * @param param
- * @return
- */
- String gatewayStatus(InoutApiData param);
-
-
- /**
- * 绉伴噸瀹屾垚璇煶閫氱煡鍜屽畬鎴愰�氱煡锛屼竴骞跺疄鐜�
- *
- * @param param
- * @return
- */
- String noticeWeightDone(InoutApiData param);
-
- /**
- * 鑾峰彇涓�鍗￠�氳鍙栫粨鏋�
- *
- * @param param
- * @return
- */
- InoutApiData getIcCardNum(InoutApiData param);
-
-
-
-}
diff --git a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java b/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
index 9ca4a17..4eec8ec 100644
--- a/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/io/impl/DefaultInoutApiServiceImpl.java
@@ -1,7 +1,7 @@
package com.ld.igds.io.impl;
-import com.ld.igds.inout.dto.InoutApiData;
-import com.ld.igds.io.InoutApiService;
+import com.ld.igds.inout.dto.ApiInoutData;
+import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import org.springframework.stereotype.Repository;
@@ -9,7 +9,7 @@
* @author
*/
@Repository
-public class DefaultInoutApiServiceImpl implements InoutApiService {
+public class DefaultInoutApiServiceImpl implements ApiInoutService {
@Override
public String getProtocol() {
@@ -17,52 +17,32 @@
}
@Override
- public InoutApiData getPlateNum(InoutApiData param) {
+ public ApiInoutData getPlateNum(ApiInoutData param) {
return param;
}
@Override
- public String reConnectLpr(InoutApiData param) {
+ public String initLpr(ApiInoutData param) {
return null;
}
@Override
- public String initLpr(InoutApiData param) {
+ public String gateControl(ApiInoutData param) {
return null;
}
@Override
- public String gateControl(InoutApiData param) {
+ public String noticeRadio(ApiInoutData param) {
return null;
}
@Override
- public String addWhitePlate(InoutApiData param) {
+ public String noticeLed(ApiInoutData param) {
return null;
}
@Override
- public String delWhitePlate(InoutApiData apiData) {
- return null;
- }
-
- @Override
- public String noticeRadio(InoutApiData param) {
- return null;
- }
-
- @Override
- public String gatewayStatus(InoutApiData param) {
- return null;
- }
-
- @Override
- public String noticeWeightDone(InoutApiData param) {
- return null;
- }
-
- @Override
- public InoutApiData getIcCardNum(InoutApiData param) {
+ public ApiInoutData getIcCardNum(ApiInoutData param) {
return null;
}
diff --git a/igds-core/src/main/java/com/ld/igds/models/InoutConf.java b/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
index 8a58eaf..4b802c3 100644
--- a/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
+++ b/igds-core/src/main/java/com/ld/igds/models/InoutConf.java
@@ -31,7 +31,7 @@
private String companyId;
@Column(name = "DEPT_ID_", length = 40)
- @PropertyDef(label = "鎵�灞炲簱鐐�")
+ @PropertyDef(label = "鎵�灞炲簱鍖�")
private String deptId;
@Column(name = "SORT_", length = 2)
@@ -78,9 +78,9 @@
@PropertyDef(label = "鎺у埗绔彛")
private Integer portCtrl;
- @Column(name = "PORT_WEB_")
- @PropertyDef(label = "WEB绔彛")
- private Integer portWeb;
+// @Column(name = "PORT_WEB_")
+// @PropertyDef(label = "WEB绔彛")
+// private Integer portWeb;
@Column(name = "TYPE_", length = 10)
@PropertyDef(label = "璁惧绫诲瀷")
@@ -91,7 +91,7 @@
private String status;
@Column(name = "PROTOCOL_", length = 40)
- @PropertyDef(label = "鍒嗘満鍗忚", description = "涓嶅悓鍘傚晢鏈変笉鍚岀殑鍗忚")
+ @PropertyDef(label = "鍗忚", description = "涓嶅悓鍘傚晢鏈変笉鍚岀殑鍗忚")
private String protocol;
@Column(name = "PLAY_TYPE_", length = 25)
@@ -133,7 +133,6 @@
this.pwd = conf.getPwd();
this.chanNum = conf.getChanNum();
this.portCtrl = conf.getPortCtrl();
- this.portWeb = conf.getPortWeb();
this.type = conf.getType();
this.status = conf.getStatus();
this.protocol = conf.getProtocol();
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index f0e7cc3..a652f0a 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -89,10 +89,10 @@
// 鑾峰彇鍑哄叆搴撻厤缃俊鎭�
List<InoutConf> listInoutConf = inoutCommonManager.getListInoutConf(user.getCompanyId(), deptId);
+
// 杞︾墝璇嗗埆鍙傛暟灏佽
InoutConf conf = inoutCommonManager.getInoutConf(listInoutConf, sort, InoutConstant.CONF_TYPE_10, InoutConstant.PROGRESS_REGISTER, 1);
if(null != conf) conf.setSort(sort);
-
view.addObject("lprDto", conf);
//鍒濆鍖栬溅鐗岃瘑鍒�
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutDeviceController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutDeviceController.java
index b8605cc..764ce2b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutDeviceController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutDeviceController.java
@@ -2,7 +2,7 @@
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.dto.InoutCameraDto;
import com.ld.igds.inout.dto.InoutSnapImgDto;
import com.ld.igds.inout.manager.InoutDeviceManager;
@@ -35,7 +35,7 @@
*/
@ResponseBody
@RequestMapping("/flush-lpr")
- public PageResponse<InoutApiData> flushPlate(@RequestBody InoutApiData param) {
+ public PageResponse<ApiInoutData> flushPlate(@RequestBody ApiInoutData param) {
if (StringUtils.isEmpty(param.getProtocol())) {
param.setErrorMsg("褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�");
@@ -64,7 +64,7 @@
*/
@ResponseBody
@RequestMapping("/ic-card-num")
- public PageResponse<InoutApiData> getIcCardNum(@RequestBody InoutApiData param) {
+ public PageResponse<ApiInoutData> getIcCardNum(@RequestBody ApiInoutData param) {
if (StringUtils.isEmpty(param.getProtocol())) {
param.setErrorMsg("褰撳墠鏅烘収鍗℃湭閰嶇疆閫氳鍗忚锛屾棤娉曟墽琛�");
@@ -84,40 +84,7 @@
return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), param.getErrorMsg());
}
-
- /**
- * 閲嶆柊杩炴帴绯荤粺-杞︾墝璇嗗埆
- *
- * @return
- */
- @ResponseBody
- @RequestMapping("/reset-lpr")
- public PageResponse<String> resetLpr(@RequestBody InoutApiData param) {
-
-
- String result = "鎵ц瀹屾垚";
-
- if (StringUtils.isEmpty(param.getProtocol())) {
- result = "褰撳墠杞︾墝璇嗗埆鏈厤缃�氳鍗忚锛屾棤娉曟墽琛�";
- return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), result);
- }
-
- if (null == param.getIp()) {
- result = "鍑哄叆搴撻厤缃腑娌℃湁閰嶇疆濡傚叆鐧昏鐨勮溅鐗岃瘑鍒�";
-
- return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), result);
- }
-
-
- result = inoutDeviceManager.reConnectLpr(param);
-
- if (null == result) {
- return new PageResponse<String>(RespCodeEnum.CODE_0000, "鎵ц鎴愬姛");
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(), result);
- }
-
+
/**
* 鍑哄叆搴撹棰�
*
@@ -202,7 +169,7 @@
*/
@RequestMapping("/notice-weight-done")
public @ResponseBody
- PageResponse<String> noticeWeightDone(@RequestBody InoutApiData param) {
+ PageResponse<String> noticeWeightDone(@RequestBody ApiInoutData param) {
String msg = inoutDeviceManager.noticeWeightDone(param);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
index 442b974..71662b3 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java
@@ -6,12 +6,13 @@
import com.ld.igds.camera.data.ApiCameraResp;
import com.ld.igds.camera.data.ApiSnapReq;
import com.ld.igds.file.CoreFileService;
+import com.ld.igds.inout.ApiInoutManager;
import com.ld.igds.inout.InoutConstant;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.dto.InoutCameraDto;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutSnapImgDto;
-import com.ld.igds.io.InoutApiService;
+import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.InoutConf;
@@ -49,7 +50,7 @@
private ApiCameraManager apiCameraManager;
- public InoutApiData getPlateNum(InoutApiData param) {
+ public ApiInoutData getPlateNum(ApiInoutData param) {
//濡傛灉浣跨敤鐨勬槸鍦扮鎻掍欢鑾峰彇锛屽垯闇�瑕佽皟鏁磋澶囦负鍦扮鎻掍欢淇℃伅
if (ProtocolEnum.TCP_FZZY_WEIGHT.getCode().equals(param.getProtocol())) {
@@ -60,7 +61,7 @@
return param;
}
- InoutApiData pluginWeight = new InoutApiData();
+ ApiInoutData pluginWeight = new ApiInoutData();
pluginWeight = param;
pluginWeight.setIp(conf.getIp());
pluginWeight.setPort(conf.getPort());
@@ -74,7 +75,7 @@
return apiInoutManager.getApiService(param.getProtocol()).getPlateNum(param);
}
- public InoutApiData getIcCardNum(InoutApiData param) {
+ public ApiInoutData getIcCardNum(ApiInoutData param) {
return apiInoutManager.getApiService(param.getProtocol()).getIcCardNum(param);
}
@@ -119,14 +120,9 @@
if (null == conf) return;
- InoutApiData lprData = new InoutApiData(conf);
+ ApiInoutData lprData = new ApiInoutData(conf);
apiInoutManager.getApiService(conf.getProtocol()).initLpr(lprData);
- }
-
-
- public String reConnectLpr(InoutApiData param) {
- return apiInoutManager.getApiService(param.getProtocol()).reConnectLpr(param);
}
@@ -134,7 +130,7 @@
* @param param
* @return
*/
- public String noticeWeightDone(InoutApiData param) {
+ public String noticeWeightDone(ApiInoutData param) {
//鑾峰彇绉伴噸涓绘帶鍣ㄩ厤缃�
InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());
@@ -142,14 +138,14 @@
return "绉伴噸涓绘帶鏈厤缃紝鏀寔澶辫触";
}
- InoutApiData apiData = new InoutApiData(conf);
+ ApiInoutData apiData = new ApiInoutData(conf);
apiData.setPlateNum(param.getPlateNum());
- apiData.setInoutProgress(param.getInoutProgress());
apiData.setTime(new Date());
- InoutApiService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
- return inoutApiService.noticeWeightDone(apiData);
+ // return inoutApiService.noticeWeightDone(apiData); TODO
+ return null;
}
/**
@@ -215,7 +211,7 @@
return;
}
- InoutApiData apiData = new InoutApiData(conf);
+ ApiInoutData apiData = new ApiInoutData(conf);
apiData.setTime(new Date());
apiData.setRepeat(2);
apiData.setWeight(snapImgDto.getWeight());
@@ -244,13 +240,13 @@
log.debug("-------------鐧昏瀹屾垚锛屽鍔犺溅鐗岀櫧鍚嶅崟-----------{}", imgDto.getPlateNum());
- InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
- InoutApiData apiData;
+ ApiInoutData apiData;
for (InoutConf conf : list) {
- apiData = new InoutApiData(conf);
+ apiData = new ApiInoutData(conf);
apiData.setPlateNum(imgDto.getPlateNum());
- inoutApiService.addWhitePlate(apiData);
+ // inoutApiService.addWhitePlate(apiData);
}
}
@@ -262,13 +258,14 @@
return;
}
- InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
+ ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
- InoutApiData apiData;
+ ApiInoutData apiData;
for (InoutConf conf : list) {
- apiData = new InoutApiData(conf);
+ apiData = new ApiInoutData(conf);
apiData.setPlateNum(data.getPlateNum());
- inoutApiService.delWhitePlate(apiData);
+
+ // inoutApiService.delWhitePlate(apiData); TODO
}
}
diff --git a/igds-inout/src/main/java/com/ld/igds/io/notify/NotifyLprService.java b/igds-inout/src/main/java/com/ld/igds/io/notify/NotifyLprService.java
index 0c14c8e..30667e9 100644
--- a/igds-inout/src/main/java/com/ld/igds/io/notify/NotifyLprService.java
+++ b/igds-inout/src/main/java/com/ld/igds/io/notify/NotifyLprService.java
@@ -1,7 +1,7 @@
package com.ld.igds.io.notify;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
/**
* 杞︾墝璇嗗埆淇℃伅閫氱煡
@@ -22,9 +22,9 @@
*
* @param lprDto
*/
- void notify(InoutApiData lprDto);
+ void notify(ApiInoutData lprDto);
- InoutApiData getLpr(String key);
+ ApiInoutData getLpr(String key);
void remove(String key);
@@ -33,5 +33,5 @@
* @param sn
* @param lprDto
*/
- void setLpr(String sn, InoutApiData lprDto);
+ void setLpr(String sn, ApiInoutData lprDto);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/io/notify/impl/NotifyLprServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/io/notify/impl/NotifyLprServiceImpl.java
index e2c1e7f..ba7a88c 100644
--- a/igds-inout/src/main/java/com/ld/igds/io/notify/impl/NotifyLprServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/io/notify/impl/NotifyLprServiceImpl.java
@@ -2,7 +2,7 @@
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.RedisConst;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.io.notify.NotifyLprService;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.RedisUtil;
@@ -27,12 +27,11 @@
@SuppressWarnings("static-access")
@Override
- public void notify(InoutApiData plate) {
+ public void notify(ApiInoutData plate) {
if (null == plate) return;
WebSocketPacket packet = new WebSocketPacket();
packet.setCompanyId(ContextUtil.getDefaultCompanyId());
packet.setBizType(BizType.INOUT_IN.getCode());
- packet.setBizTag(plate.getInoutProgress());
packet.setUserId(plate.getUserId());
packet.setBizId("PLATE_NUM");
@@ -45,9 +44,9 @@
@Override
- public InoutApiData getLpr(String key) {
+ public ApiInoutData getLpr(String key) {
key = RedisConst.buildKey(ContextUtil.getDefaultCompanyId(),KEY_LPR,key);
- InoutApiData lprDto = (InoutApiData) redisUtil.get(key);
+ ApiInoutData lprDto = (ApiInoutData) redisUtil.get(key);
if(null == lprDto) return null;
return lprDto;
}
@@ -59,7 +58,7 @@
}
@Override
- public void setLpr(String sn, InoutApiData lprDto) {
+ public void setLpr(String sn, ApiInoutData lprDto) {
String key = RedisConst.buildKey(ContextUtil.getDefaultCompanyId(),KEY_LPR,sn);
redisUtil.set(key,lprDto, 60 * 60);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutConf.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/InoutConf.view.xml
index 434fe12..3992dcb 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutConf.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutConf.view.xml
@@ -103,11 +103,11 @@
</PropertyDef>
<PropertyDef name="ip">
<Property></Property>
- <Property name="label">鍒嗘満IP</Property>
+ <Property name="label">IP鍦板潃</Property>
</PropertyDef>
<PropertyDef name="port">
<Property name="dataType">Integer</Property>
- <Property name="label">鍒嗘満绔彛</Property>
+ <Property name="label">璁惧绔彛</Property>
</PropertyDef>
<PropertyDef name="loginId">
<Property></Property>
@@ -119,7 +119,7 @@
</PropertyDef>
<PropertyDef name="chanNum">
<Property name="dataType">int</Property>
- <Property name="label">鎶撴媿閫氶亾</Property>
+ <Property name="label">閫氶亾鍙�</Property>
</PropertyDef>
<PropertyDef name="portCtrl">
<Property name="dataType">Integer</Property>
@@ -190,7 +190,7 @@
</PropertyDef>
<PropertyDef name="errorMsg">
<Property></Property>
- <Property name="label">澶囨敞淇℃伅</Property>
+ <Property name="label">寮傚父璇存槑</Property>
</PropertyDef>
</DataType>
</Model>
@@ -382,11 +382,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">status</Property>
- <Property name="property">status</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">ip</Property>
<Property name="property">ip</Property>
<Editor/>
@@ -397,6 +392,29 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">status</Property>
+ <Property name="property">status</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">inOrder</Property>
+ <Property name="property">inOrder</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Children>
+ </FieldSet>
+ <FieldSet layoutConstraint="padding:10">
+ <Property name="caption">鎽勫儚澶撮厤缃�</Property>
+ <Buttons/>
+ <Children>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator">锛�</Property>
+ <Property name="labelWidth">100</Property>
+ <AutoFormElement>
<Property name="name">loginId</Property>
<Property name="property">loginId</Property>
<Editor/>
@@ -406,19 +424,6 @@
<Property name="property">pwd</Property>
<Editor/>
</AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layoutConstraint="padding:10">
- <Property name="caption">鎶撴媿鍜屽叾瀹冮厤缃�</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
<AutoFormElement>
<Property name="name">chanNum</Property>
<Property name="property">chanNum</Property>
@@ -450,16 +455,6 @@
<AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">remark</Property>
<Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">errorMsg</Property>
- <Property name="property">errorMsg</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">inOrder</Property>
- <Property name="property">inOrder</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
index 9f27bd7..f54b5e1 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/FzzyWeightServiceImpl.java
@@ -1,14 +1,17 @@
package com.ld.igds.protocol.weight;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.inout.dto.InoutApiData;
-import com.ld.igds.io.InoutApiService;
+import com.ld.igds.inout.dto.ApiInoutData;
+import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.util.HttpUtils;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.stereotype.Component;
+
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.FutureTask;
@@ -20,7 +23,7 @@
*/
@Slf4j
@Component
-public class FzzyWeightServiceImpl implements InoutApiService {
+public class FzzyWeightServiceImpl implements ApiInoutService {
@Override
@@ -33,7 +36,7 @@
* @return
*/
@Override
- public InoutApiData getPlateNum(InoutApiData param) {
+ public ApiInoutData getPlateNum(ApiInoutData param) {
if (null == param.getSn()) {
@@ -87,18 +90,7 @@
* @return
*/
@Override
- public String reConnectLpr(InoutApiData param) {
- return "褰撳墠妯″紡鏃犻渶閲嶇疆杞︾墝璇嗗埆";
- }
-
- /**
- * 涓嶉渶瑕佸疄鐜�
- *
- * @param param
- * @return
- */
- @Override
- public String initLpr(InoutApiData param) {
+ public String initLpr(ApiInoutData param) {
return "褰撳墠妯″紡鏃犻渶鍒濆鍖栬溅鐗岃瘑鍒�";
}
@@ -110,7 +102,7 @@
* @return
*/
@Override
- public String gateControl(InoutApiData param) {
+ public String gateControl(ApiInoutData param) {
return null;
}
@@ -120,8 +112,7 @@
* @param param deviceId鍜宎ctionCode 涓嶅彲涓虹┖
* @return
*/
- @Override
- public String addWhitePlate(InoutApiData param) {
+ public String addWhitePlate(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_10}));
ExecutorService executorService = Executors.newCachedThreadPool();
@@ -137,8 +128,7 @@
* @param param
* @return
*/
- @Override
- public String delWhitePlate(InoutApiData param) {
+ public String delWhitePlate(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_11}));
ExecutorService executorService = Executors.newCachedThreadPool();
executorService.submit(futureTask);
@@ -154,7 +144,7 @@
* @return
*/
@Override
- public String noticeRadio(InoutApiData param) {
+ public String noticeRadio(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_30}));
ExecutorService executorService = Executors.newCachedThreadPool();
@@ -164,10 +154,6 @@
return "SUCCESS";
}
- @Override
- public String gatewayStatus(InoutApiData param) {
- return null;
- }
/**
* 绉伴噸瀹屾垚 --璋冪敤瀛愮嚎绋嬪疄鐜�
@@ -175,9 +161,7 @@
* @param param
* @return
*/
- @Override
- public String noticeWeightDone(InoutApiData param) {
-
+ public String noticeWeightDone(ApiInoutData param) {
FutureTask<String> futureTask = new FutureTask<>(new WeightGatewayRemoteTask(param, new String[]{WeightUtil.ACTION_CODE_60, WeightUtil.ACTION_CODE_30}));
ExecutorService executorService = Executors.newCachedThreadPool();
executorService.submit(futureTask);
@@ -191,7 +175,7 @@
* @return
*/
@Override
- public InoutApiData getIcCardNum(InoutApiData param) {
+ public ApiInoutData getIcCardNum(ApiInoutData param) {
try {
@@ -230,4 +214,10 @@
return param;
}
+
+ @Override
+ public String noticeLed(ApiInoutData param) {
+ // TODO Auto-generated method stub
+ return null;
+ }
}
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/WeightGatewayRemoteTask.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/WeightGatewayRemoteTask.java
index 7b06831..0b9af94 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/WeightGatewayRemoteTask.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/weight/WeightGatewayRemoteTask.java
@@ -1,7 +1,7 @@
package com.ld.igds.protocol.weight;
import com.alibaba.fastjson.JSONObject;
-import com.ld.igds.inout.dto.InoutApiData;
+import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.util.HttpUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -15,16 +15,16 @@
@Slf4j
public class WeightGatewayRemoteTask implements Callable<String> {
- private InoutApiData param;
+ private ApiInoutData param;
private String[] actionCodes;
- public InoutApiData getParam() {
+ public ApiInoutData getParam() {
return param;
}
- public void setParam(InoutApiData param) {
+ public void setParam(ApiInoutData param) {
this.param = param;
}
@@ -39,7 +39,7 @@
public WeightGatewayRemoteTask() {
}
- public WeightGatewayRemoteTask(InoutApiData param, String[] actionCodes) {
+ public WeightGatewayRemoteTask(ApiInoutData param, String[] actionCodes) {
this.param = param;
this.actionCodes = actionCodes;
}
diff --git a/igds-web/src/main/resources/static/admin/inout/style.css b/igds-web/src/main/resources/static/admin/inout/style.css
index 1a0d2f6..183d8b3 100644
--- a/igds-web/src/main/resources/static/admin/inout/style.css
+++ b/igds-web/src/main/resources/static/admin/inout/style.css
@@ -758,7 +758,7 @@
.kccz-r-btnbox {
- width: 86px;
+ width: 110px;
position: absolute;
right: 0;
top: 0;
@@ -767,10 +767,32 @@
.kccz-r-btn {
display: block;
- width: 84px;
+ width: 110px;
height: 78px;
border: 1px solid #e7eaed;
text-align: center;
+}
+
+.kccz-r-div{
+ display: block;
+ height: 78px;
+ border: 1px solid #e7eaed;
+ background: #53adce;
+ text-align: center;
+}
+
+.kccz-r-div span{
+ display: inline-block;
+ width: 100px;
+ margin: 10px 0 0px;
+ height: 40px;
+ font-size: 18px;
+ font-weight: bold;
+ color: #FFF;
+}
+
+.kccz-r-div p {
+ color: #fff;
}
.kccz-r-btn span {
@@ -812,6 +834,7 @@
background: #53adce;
}
+
.kccz-r-btn1:hover .kccz-r-pz,
.kccz-r-btn1.active .kccz-r-pz {
background: url(../../images/icon-camera-h.png) no-repeat;
diff --git a/igds-web/src/main/resources/static/favicon-fzzy.ico b/igds-web/src/main/resources/static/favicon-fzzy.ico
deleted file mode 100644
index 8314db1..0000000
--- a/igds-web/src/main/resources/static/favicon-fzzy.ico
+++ /dev/null
Binary files differ
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-register.html b/igds-web/src/main/resources/templates/admin/inout/in-register.html
index 36d1695..ea69c2f 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-register.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-register.html
@@ -1,348 +1,324 @@
<!DOCTYPE html>
<html lang="zh-cn" xmlns:th=http://www.thymeleaf.org>
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
- <meta name="viewport"
- content="width=device-width, initial-scale=1, maximum-scale=1">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <meta name="renderer" content="webkit">
- <title>鍑哄叆搴撶鐞�-鍏ュ簱鐧昏</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="viewport"
+ content="width=device-width, initial-scale=1, maximum-scale=1">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+<meta name="renderer" content="webkit">
+<title>鍑哄叆搴撶鐞�-鍏ュ簱鐧昏</title>
+<link rel="stylesheet" type="text/css"
+ th:href="@{../../static/plugins/layui/css/layui.css}">
+<link rel="stylesheet" type="text/css"
+ th:href="@{../../static/admin/inout/style.css}">
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/plugins/layui/css/layui.css?v=2.5.5}">
- <link rel="stylesheet" type="text/css"
- th:href="@{../../static/admin/inout/style.css}">
+<style>
+.display-none {
+ display: none;
+}
- <style>
- .display-none {
- display: none;
- }
+.kccz-r-con2 {
+ padding-right: 120px;
+ position: relative;
+ margin-top: 10px;
+ z-index: 99;
+}
- .kccz-r-con2 {
- /* height: 230px; */
- padding-right: 120px;
- position: relative;
- margin-top: 10px;
- z-index: 99;
- }
+.kccz-r-vedio {
+ width: 100%;
+ height: 280px;
+ background: #000;
+ color: #FFF;
+ text-align: center;
+}
- .kccz-r-vedio {
- width: 100%;
- height: 280px;
- /* background: #dee6ec; */
- background: #000;
- color: #FFF;
- text-align: center;
- }
+.layui-form-label {
+ font-weight: bold;
+}
- .kccz-r-btnbox {
- width: 100px;
- position: absolute;
- right: 0px;
- top: 0px;
- z-index: 99;
- }
+.iframe-video {
+ position: absolute;
+ visibility: inherit;
+ top: 0px;
+ left: 0px;
+ z-index: -1;
+ width: 100%;
+ height: 100%;
+}
- .layui-form-label {
- font-weight: bold;
- }
+.ckdj-radiobox .layui-form-item {
+ margin-bottom: 0px;
+ margin-top: 10px;
+}
- .iframe-video {
- position: absolute;
- visibility: inherit;
- top: 0px;
- left: 0px;
- z-index: -1;
- width: 100%;
- height: 100%;
- }
+.rk-step-wrap {
+ padding: 0px;
+ border-bottom: 0px;
+ text-align: center;
+}
- .ckdj-radiobox .layui-form-item {
- margin-bottom: 0px;
- margin-top: 10px;
- }
+.qyzj-btnbox .rkbk-quick {
+ margin-top: 15px !important;
+}
- .rk-step-wrap {
- padding: 0px;
- border-bottom: 0px;
- text-align: center;
- }
+.color-red {
+ color: red !important;
+}
- .qyzj-btnbox .rkbk-quick {
- margin-top: 15px !important;
- }
+.layui-form-item .layui-input-inline {
+ width: unset;
+}
- .color-red {
- color: red !important;
- }
+.rkbk-search-input {
+ background: #FFF !important;
+}
- .layui-form-item .layui-input-inline {
- width: unset;
- }
-
- .rkbk-search-input{
- background: #FFF !important;
- }
- .rkbk-search-input.bg-date {
- background: #FFF !important;
- }
- </style>
+.rkbk-search-input.bg-date {
+ background: #FFF !important;
+}
+</style>
</head>
<body>
-<div class="l-container layui-clear">
- <div class="rk-main">
+ <div class="l-container layui-clear">
+ <div class="rk-main">
- <!-- 鎿嶄綔鑿滃崟-->
- <div class="qyzj-btnbox layui-clear">
- <div class="rkbk-quick fl">
- <button class="rkbk-quick-btn layui-btn btn-red"
- onclick="resetForm()">
- <i><img th:src="@{../../static/images/icon-clear.png}"/></i> 娓呯┖鏁版嵁
- </button>
- <button class="rkbk-quick-btn layui-btn btn-green"
- onclick="submit()">
- <i><img th:src="@{../../static/images/icon-ok.png}"/></i> 瀹屾垚鐧昏
- </button>
+ <!-- 鎿嶄綔鑿滃崟-->
+ <div class="qyzj-btnbox layui-clear">
+ <div class="rkbk-quick fl">
+ <button class="rkbk-quick-btn layui-btn btn-red"
+ onclick="resetForm()">
+ <i><img th:src="@{../../static/images/icon-clear.png}" /></i> 娓呯┖鏁版嵁
+ </button>
+ <button class="rkbk-quick-btn layui-btn btn-green"
+ onclick="submit()">
+ <i><img th:src="@{../../static/images/icon-ok.png}" /></i> 瀹屾垚鐧昏
+ </button>
+ </div>
- <button class="rkbk-quick-btn layui-btn btn-violet"
- onclick="resetPlateNum()">
- <i><img th:src="@{../../static/images/icon-che.png}"/></i>閲嶇疆杞︾墝璇嗗埆
- </button>
- </div>
+ <!--娴佺▼寮曞-->
+ <div class="rk-step-wrap fr">
+ <ul class="rk-step">
+ <li id="progress-register" class="active rk-step-first"><span
+ class="rk-step-span"> <img
+ th:src="@{../../static/images/icon-dengji.png}" />
+ </span>
+ <p>鍏ュ簱鐧昏</p></li>
+ <li id="progress-check"><span class="rk-step-span"> <img
+ th:src="@{../../static/images/icon-zhijian.png}" />
+ </span>
+ <p>鎵︽牱璐ㄦ</p></li>
+ <li id="progress-fullWeight"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}" />
+ </span>
+ <p>婊¤溅绉伴噸</p></li>
+ <li id="progress-hand"><span class="rk-step-span"> <img
+ th:src="@{../../static/images/icon-xiehuo.png}" />
+ </span>
+ <p>鍏ュ簱鍊间粨</p></li>
+ <li id="progress-emptyWeight"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-chengzhong.png}" />
+ </span>
+ <p>绌鸿溅绉伴噸</p></li>
+ <li id="progress-cardBack"><span class="rk-step-span">
+ <img th:src="@{../../static/images/icon-banli.png}" />
+ </span>
+ <p>绂诲簱纭</p></li>
+ </ul>
+ </div>
+ <!--娴佺▼寮曞缁撴潫-->
+ </div>
- <!--娴佺▼寮曞-->
- <div class="rk-step-wrap fr">
- <ul class="rk-step">
- <li id="progress-register" class="active rk-step-first">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-dengji.png}"/>
- </span>
- <p>鍏ュ簱鐧昏</p>
- </li>
- <li id="progress-check">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-zhijian.png}"/>
- </span>
- <p>鎵︽牱璐ㄦ</p>
- </li>
- <li id="progress-fullWeight">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}"/>
- </span>
- <p>婊¤溅绉伴噸</p>
- </li>
- <li id="progress-hand">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-xiehuo.png}"/>
- </span>
- <p>鍏ュ簱鍊间粨</p>
- </li>
- <li id="progress-emptyWeight">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-chengzhong.png}"/>
- </span>
- <p>绌鸿溅绉伴噸</p>
- </li>
- <li id="progress-cardBack">
- <span class="rk-step-span">
- <img th:src="@{../../static/images/icon-banli.png}"/>
- </span>
- <p>绂诲簱纭</p>
- </li>
- </ul>
- </div>
- <!--娴佺▼寮曞缁撴潫-->
- </div>
+ <!-- 涓讳綋淇℃伅 -->
+ <form class="layui-form" action="" id="form-data"
+ lay-filter="form-data">
- <!-- 涓讳綋淇℃伅 -->
- <form class="layui-form" action="" id="form-data" lay-filter="form-data">
+ <div class="rkbk-con">
+ <div class="radius-6 rkbk-left-wrap fl">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鎵胯繍浜轰俊鎭�</h3>
+ </div>
+ <div class="rkbk-left-form">
+ <div class="rkbk-form-box1">
+ <div class="layui-form-item display-none">
+ <label class="layui-form-label">闅愯棌-绫诲瀷</label>
+ <div class="layui-input-block">
+ <input type="text" name="type" autocomplete="off"
+ th:value="${type}" class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="rkbk-con">
- <div class="radius-6 rkbk-left-wrap fl">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鎵胯繍浜轰俊鎭�</h3>
- </div>
- <div class="rkbk-left-form">
- <div class="rkbk-form-box1">
- <div class="layui-form-item display-none">
- <label class="layui-form-label">闅愯棌-绫诲瀷</label>
- <div class="layui-input-block">
- <input type="text" name="type" autocomplete="off"
- th:value="${type}" class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="rkbk-form-left">
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">濮� 鍚嶏細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userName" id="userName"
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="rkbk-form-left">
- <div class="layui-form-item">
- <label class="layui-form-label color-red">濮� 鍚嶏細</label>
- <div class="layui-input-block">
- <input type="text" name="userName" id="userName"
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userId" id="userId"
+ lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userContact" id="userContact"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userBirthday" id="userBirthday"
+ placeholder="yyyy-MM-dd" autocomplete="off"
+ class="layui-input rkbk-search-input bg-date">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎬� 鍒細</label>
+ <div class="layui-input-block rkbk-selBox">
+ <input type="radio" name="userSex" id="userSex" value="鐢�"
+ title="鐢�" checked> <input type="radio"
+ name="userSex" value="濂�" title="濂�">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label color-red">韬唤璇佸彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userId" id="userId"
- lay-verify="required" placeholder="蹇呭～淇℃伅" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鑱旂郴鏂瑰紡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userContact" id="userContact"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍑虹敓鏃ユ湡锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userBirthday" id="userBirthday"
- placeholder="yyyy-MM-dd" autocomplete="off"
- class="layui-input rkbk-search-input bg-date">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鎬� 鍒細</label>
- <div class="layui-input-block rkbk-selBox">
- <input type="radio" name="userSex" id="userSex" value="鐢�"
- title="鐢�" checked> <input type="radio"
- name="userSex" value="濂�" title="濂�">
- </div>
- </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">姘� 鏃忥細</label>
+ <div class="layui-input-block">
+ <input type="text" name="userNation" id="userNation"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <label class="layui-form-label">姘� 鏃忥細</label>
- <div class="layui-input-block">
- <input type="text" name="userNation" id="userNation" placeholder="璇疯緭鍏�"
- autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
+ </div>
+ <!--rk-form-left end-->
- </div>
- <!--rk-form-left end-->
+ <div class="rkbk-photo">
+ <a href="#"><img id="id_img_pers"
+ th:src="@{../../static/images/rkbk-photo_03.png}" /></a>
+ </div>
- <div class="rkbk-photo">
- <a href="#"><img id="id_img_pers"
- th:src="@{../../static/images/rkbk-photo_03.png}"/></a>
- </div>
+ </div>
+ <!--rkbk-form-box1 end-->
- </div>
- <!--rkbk-form-box1 end-->
+ <div class="rkbk-form-box2" style="padding-top: 20px;">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍦� 鍧�锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="userAddress" id="userAddress"
+ placeholder="璇疯緭鍏�" autocomplete="off"
+ class="layui-input rkbk-search-input">
+ </div>
+ </div>
+ </div>
+ <!--rkbk-form-box2 end-->
- <div class="rkbk-form-box2" style="padding-top: 20px;">
- <div class="layui-form-item">
- <label class="layui-form-label">鍦� 鍧�锛�</label>
- <div class="layui-input-block">
- <input type="text" name="userAddress" id="userAddress"
- placeholder="璇疯緭鍏�" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
- </div>
- <!--rkbk-form-box2 end-->
+ <div class="rkbk-quick layui-text-center">
+ <button id="button_readID" type="button"
+ onclick="flushIdCard()"
+ class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�</button>
+ </div>
- <div class="rkbk-quick layui-text-center">
- <button id="button_readID" type="button"
- onclick="flushIdCard()"
- class="rkbk-quick-btn layui-btn btn-blue">璇诲彇韬唤璇�
- </button>
- </div>
+ </div>
+ </div>
- </div>
- </div>
-
- </div>
- <!--rkbk-left end-->
+ </div>
+ <!--rkbk-left end-->
- <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>杩愯緭淇℃伅</h3>
- </div>
+ <div class="radius-6 rkbk-right-wrap fr" style="height: 512px;">
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鐧昏淇℃伅</h3>
+ </div>
- <div class="rkbk-left-form rkbk-right-form">
- <div class="layui-form-item">
- <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn"
- onclick="flushICCard()"/>
- <label class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
- <div class="layui-input-block">
- <input type="text" name="intelCard" id="intelCard" required
- lay-verify="required" placeholder="鍏堟斁鍗★紝鍚庣偣鍑昏鍗�"
- autocomplete="off" class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="rkbk-left-form rkbk-right-form">
+ <div class="layui-form-item">
+ <input type="button" value="璇诲崱" class="rkbk-r-btn fr layui-btn"
+ onclick="flushICCard()" /> <label
+ class="layui-form-label color-red">鏅烘収鍗″彿锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="intelCard" id="intelCard" required
+ lay-verify="required" placeholder="鍏堟斁鍗★紝鍚庣偣鍑昏鍗�"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <input type="button" value="璇昏溅鐗�"
- class="rkbk-r-btn fr layui-btn layui-btn-normal"
- onclick="flushPlateNum()"/>
- <label class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
- <div class="layui-input-block">
- <input type="text" name="plateNum" id="plateNum" placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�"
- lay-verify="required" autocomplete="off"
- class="layui-input rkbk-search-input">
- </div>
- </div>
+ <div class="layui-form-item">
+ <input type="button" value="璇昏溅鐗�"
+ class="rkbk-r-btn fr layui-btn layui-btn-normal"
+ onclick="flushPlateNum()" /> <label
+ class="layui-form-label color-red">杩愯緭杞︾墝锛�</label>
+ <div class="layui-input-block">
+ <input type="text" name="plateNum" id="plateNum"
+ placeholder="鏃犺溅鐗岃溅杈嗭紝濉啓 鏃犺溅鐗�" lay-verify="required"
+ autocomplete="off" class="layui-input rkbk-search-input">
+ </div>
+ </div>
- <div class="layui-form-item">
- <div class="layui-inline">
- <label class="layui-form-label">杩愯緭鏂瑰紡锛�</label>
- <div class="layui-input-inline">
- <input type="radio" name="transType" value="1" title="姹借溅" checked>
- <input type="radio" name="transType" value="2" title="鐏溅">
- <input type="radio" name="transType" value="3" title="杞埞">
- <input type="radio" name="transType" value="9" title="鍏朵粬">
- </div>
- </div>
- </div>
- </div>
- </div>
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">杩愯緭宸ュ叿锛�</label>
+ <div class="layui-input-inline">
+ <input type="radio" name="transType" value="1" title="姹借溅"
+ checked> <input type="radio" name="transType"
+ value="2" title="鐏溅"> <input type="radio"
+ name="transType" value="3" title="杞埞"> <input
+ type="radio" name="transType" value="9" title="鍏朵粬">
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
- <!-- 瑙嗛 -->
- <div class="rkbk-left">
- <div class="rkbk-tit">
- <i></i>
- <h3>鐧昏瑙嗛</h3>
- </div>
- <div class="kccz-r-con2">
- <div class="kccz-r-vedio" id="kccz-r-video1">
+ <!-- 瑙嗛 -->
+ <div class="rkbk-left">
+ <div class="rkbk-tit">
+ <i></i>
+ <h3>鐧昏瑙嗛</h3>
+ </div>
+ <div class="kccz-r-con2">
+ <div class="kccz-r-vedio" id="kccz-r-video1"></div>
+ <div class="kccz-r-btnbox">
+ <div class="kccz-r-div">
+ <span>鏈瘑鍒�</span>
+ <p>杞︾墝璇嗗埆</p>
+ </div>
+
+ <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active mt-10"> <span class="kccz-r-pz"></span>
+ <p>绯荤粺鑷姩鎶撴媿</p>
+ </a>
+
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--rkbk-right end-->
+ </div>
+ <!--rkbk-con end-->
+ </form>
+ </div>
+ <!--rk-main end-->
- </div>
- <div class="kccz-r-btnbox">
- <a href="javascript:;" class="kccz-r-btn kccz-r-btn1 active">
- <span class="kccz-r-pz"></span>
- <p>杞︾墝璇嗗埆</p>
- </a> <a href="javascript:;" class="kccz-r-btn mt-10">
- <span id="pz-img" class="kccz-r-img"></span>
- <p id="pz-text">鑷姩鎶撴媿</p>
- </a>
- </div>
- </div>
- </div>
- </div>
- <!--rkbk-right end-->
- </div>
- <!--rkbk-con end-->
- </form>
- </div>
- <!--rk-main end-->
+ </div>
+ <!--l-container end-->
-</div>
-<!--l-container end-->
-
-<script th:inline="javascript">
+ <script th:inline="javascript">
//娴佺▼鐜妭
var inoutProgress = [[${inoutProgress}]];
//褰撳墠鑺傜偣
@@ -359,42 +335,43 @@
var ship = null; //鏄惁鑸硅繍椤甸潰鏍囪瘑
</script>
-<script th:src="@{../../static/plugins/layui/layui.js}"></script>
-<script th:src="@{../../static/js/jquery.min.js}"></script>
-<script th:src="@{../../static/js/constant.js}"></script>
-<script th:src="@{../../static/js/igds-common.js}"></script>
-<script th:src="@{../../static/admin/inout/video-play.js}"></script>
-<script th:src="@{../../static/admin/inout/in-register.js}"></script>
+ <script th:src="@{../../static/plugins/layui/layui.js}"></script>
+ <script th:src="@{../../static/js/jquery.min.js}"></script>
+ <script th:src="@{../../static/js/constant.js}"></script>
+ <script th:src="@{../../static/js/igds-common.js}"></script>
+ <script th:src="@{../../static/admin/inout/video-play.js}"></script>
+ <script th:src="@{../../static/admin/inout/in-register.js}"></script>
-<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
-<div class="layui-tab-content" id="dialog-from-notify" style="display: none;">
- <table class="layui-table">
- <colgroup>
- <col width="100">
- </colgroup>
- <tbody>
- <tr>
- <td>杩斿洖淇℃伅</td>
- <td id="resultMsg" style="color: red;font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鎵胯繍浜�</td>
- <td id="resultUserName" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>杞︾墝鍙�</td>
- <td id="resultPlateNum" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>涓嬩竴姝�</td>
- <td id="resultType" style="font-weight: bold;"></td>
- </tr>
- <tr>
- <td>鏅烘収鍗″彿</td>
- <td id="resultIntelCard" style="font-weight: bold;"></td>
- </tr>
- </tbody>
- </table>
-</div>
+ <!-- 寮瑰嚭妗嗙殑淇℃伅 -->
+ <div class="layui-tab-content" id="dialog-from-notify"
+ style="display: none;">
+ <table class="layui-table">
+ <colgroup>
+ <col width="100">
+ </colgroup>
+ <tbody>
+ <tr>
+ <td>杩斿洖淇℃伅</td>
+ <td id="resultMsg" style="color: red; font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鎵胯繍浜�</td>
+ <td id="resultUserName" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>杞︾墝鍙�</td>
+ <td id="resultPlateNum" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>涓嬩竴姝�</td>
+ <td id="resultType" style="font-weight: bold;"></td>
+ </tr>
+ <tr>
+ <td>鏅烘収鍗″彿</td>
+ <td id="resultIntelCard" style="font-weight: bold;"></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
</body>
</html>
\ No newline at end of file
--
Gitblit v1.9.3