修改部署内容

device_cars/src/main/java/com/xr/device_car/config/common/LoginConfig.java

@@ -38,7 +38,7 @@ public class LoginConfig {
 	public static final String USER_ROLE_ID="1";
 	
 	
-	public static final String TIMESTAMP = "time_stamp";
+	public static final String TIMESTAMP = "timeStamp";
 	public static final String CryptoKey="ReGlory";
 	
 }

device_cars/src/main/java/com/xr/device_car/config/common/TypeNameConverter.java

@@ -1,40 +0,0 @@
-package com.xr.device_car.config.common;
-
-import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.enums.CellDataTypeEnum;
-import com.alibaba.excel.metadata.CellData;
-import com.alibaba.excel.metadata.GlobalConfiguration;
-import com.alibaba.excel.metadata.property.ExcelContentProperty;
-
-public class TypeNameConverter implements Converter<String> {
-    @Override
-    public Class supportJavaTypeKey() {
-        return null;
-    }
-
-    @Override
-    public CellDataTypeEnum supportExcelTypeKey() {
-        return null;
-    }
-
-    @Override
-    public String convertToJavaData(CellData cellData, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
-        return null;
-    }
-
-    @Override
-    public CellData convertToExcelData(String s, ExcelContentProperty excelContentProperty, GlobalConfiguration globalConfiguration) throws Exception {
-        //表计形状(0圆形指针1扇形指针2数字类表计3状态类表计
-        if (s.equals("0")){
-            return new CellData("圆形指针");
-        }else if (s.equals("1")){
-            return new CellData("扇形指针");
-        }else if (s.equals("2")){
-            return new CellData("数字类表计");
-        }else if (s.equals("3")){
-            return new CellData("状态类表计");
-        }else {
-            return new CellData(s);
-        }
-    }
-}

device_cars/src/main/java/com/xr/device_car/modules/analysis/controller/FocalLengthConfigController.java

@@ -129,6 +129,10 @@ public class FocalLengthConfigController {
                 meterType="floatocr";
             }else if(meterType.equals("3")){
                 meterType="swmet";
+            }else if(meterType.equals("5")){
+                meterType = "crocodile_non_scale";
+            }else if(meterType.equals("4")){
+                meterType = "crocodile_watershed";
             }
             if(config1.getAlgorithm() ==null || config1.getAlgorithm()==0){
                 algorithm="CrocodileCircle";
@@ -159,6 +163,8 @@ public class FocalLengthConfigController {
                     doubleList.add(Double.valueOf(map.get("bfb")));
                     doubleList.add(Double.valueOf(map.get("zzwz")));
                 }
+                stringBuffer.append("\t\t\t\"num_needles\": " + focalLengthConfig.getZzsl() + ",\n");
+                stringBuffer.append("\t\t\t\"needle_seg\": \"" + focalLengthConfig.getNeedleSeg() + "\",\n");
                 stringBuffer.append("\t\t\t").append("\"modbus\": {\n");
                 stringBuffer.append("\t\t\t\t").append("\"type\": \"float\",\n");
                 stringBuffer.append("\t\t\t\t\"register_address\":" + j + ",\n");
@@ -166,13 +172,40 @@ public class FocalLengthConfigController {
                 stringBuffer.append("\t\t\t\t").append("\"multiplier\": 10000.0\n");
                 stringBuffer.append("\t\t\t},\n");
                 stringBuffer.append("\t\t\t\"scales\": "+ Arrays.toString(doubleList.toArray())+"\n\t\t},");
-            } else {
+            } else if(config1.getConfigType().equals("2")) {
                 stringBuffer.append("\t\t\t").append("\"modbus\": {\n");
                 stringBuffer.append("\t\t\t\t").append("\"type\": \"int32\",\n");
                 stringBuffer.append("\t\t\t\t\"register_address\":" + j + ",\n");
                 stringBuffer.append("\t\t\t\t").append("\"num_register\": 1\n");
                 stringBuffer.append("\t\t\t},\n");
+                stringBuffer.append("\t\t\t").append("\"prior\": {\n");
+                stringBuffer.append("\t\t\t\t").append("\"invalid_chars\": \""+focalLengthConfig.getInvalidChars()+"\",\n");
+                stringBuffer.append("\t\t\t\t").append("\"expected_len\":"+focalLengthConfig.getExpectedLen()+",\n");
+                stringBuffer.append("\t\t\t\t\"padding\":\"0\",\n");
+                stringBuffer.append("\t\t\t\t\"append_from\":\"head\",\n");
+                stringBuffer.append("\t\t\t\t\"shorten_from\":\"tail\",\n");
+                stringBuffer.append("\t\t\t},\n");
                 stringBuffer.append("\t\t\t\"scales\": [0.0,0.0,1.0,5.0]\n\t\t},");
+            } else if(config1.getConfigType().equals("5")){
+                String lighting = "uniform";
+                if(focalLengthConfig.getGb().equals("1")){
+                    lighting = "blob";
+                }
+                stringBuffer.append("\t\t\t\"lighting\": \"" + lighting + "\",\n");
+                stringBuffer.append("\t\t\t\"blob_gap\": "+ focalLengthConfig.getGbcs() + ",\n");
+                stringBuffer.append("\t\t\t").append("\"modbus\": {\n");
+                stringBuffer.append("\t\t\t\t").append("\"type\": \"float\",\n");
+                stringBuffer.append("\t\t\t\t\"register_address\":" + j + ",\n");
+                stringBuffer.append("\t\t\t\t").append("\"num_register\": 2,\n");
+                stringBuffer.append("\t\t\t\t").append("\"multiplier\": 10000.0\n");
+                stringBuffer.append("\t\t\t}\n}\t\t\n");
+            }else if(config1.getConfigType().equals("4")){
+                stringBuffer.append("\t\t\t").append("\"modbus\": {\n");
+                stringBuffer.append("\t\t\t\t").append("\"type\": \"float\",\n");
+                stringBuffer.append("\t\t\t\t\"register_address\":" + j + ",\n");
+                stringBuffer.append("\t\t\t\t").append("\"num_register\": 2,\n");
+                stringBuffer.append("\t\t\t\t").append("\"multiplier\": 10000.0\n");
+                stringBuffer.append("\t\t\t}\n}\t\t\n");
             }
 
             j+=10;

device_cars/src/main/java/com/xr/device_car/modules/analysis/entity/FocalLengthConfig.java

@@ -127,6 +127,24 @@ public class FocalLengthConfig implements Serializable {
      */
     private String updateUser;
 
+    @TableField(exist = false)
+    private String gb;
+
+    @TableField(exist = false)
+    private String gbcs;
+
+    @TableField(exist = false)
+    private Integer zzsl;
+
+    @TableField(exist = false)
+    private String needleSeg;
+
+    @TableField(exist = false)
+    private String invalidChars;
+
+    @TableField(exist = false)
+    private Integer expectedLen;
+
     /**
      * 修改时间
      */

device_modbus/src/main/java/com/xr/clent/tool/ModbusUtils.java

@@ -215,7 +215,7 @@ public class ModbusUtils {
 
     public static void main(String[] args) {
         try{
-            ModbusMaster modbusMaster= ModbusUtils.getMaster("192.168.1.37",1502);
+            ModbusMaster modbusMaster= ModbusUtils.getMaster("192.168.1.105",1502);
             while (true){
                 Number n = ModbusUtils.readHoldingRegister(modbusMaster, 1, 0, 4);
                 System.out.println(n);