hfy hai 2 días
pai
achega
3666d2dcdb

+ 3 - 1
src/com/mes/ui/DataUtil.java

@@ -17,6 +17,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
 
+import static com.mes.ui.MesClient.user_menu;
+
 public class DataUtil {
     public static final Logger log = LoggerFactory.getLogger(DataUtil.class);
 
@@ -318,7 +320,7 @@ public class DataUtil {
             log.info("服务器端需要Base64编码的参数: testPressure='{}'->'{}', leakVal='{}'->'{}', testTime='{}'->'{}', title='{}'->'{}'"
                     , qmParam.getTestPressure(), testPressureBase64, qmParam.getLeakVal(), leakValBase64
                     , qmParam.getCsDuration(), testTimeBase64, MesClient.mes_gw_des, titleBase64);
-
+                 user=user_menu.getText().toString();
             String params = "__ajax=json&oprno="+ URLEncoder.encode(oprno != null ? oprno : "", "UTF-8")
                     +"&lineSn="+URLEncoder.encode(lineSn != null ? lineSn : "", "UTF-8")
                     +"&sn="+URLEncoder.encode(sn != null ? sn : "", "UTF-8")

+ 1 - 2
src/com/mes/ui/MesClient.java

@@ -93,8 +93,7 @@ public class MesClient extends JFrame {
             EventQueue.invokeLater(new Runnable() {
                 @Override
                 public void run() {
-                    try{
-                        //读文件配置
+                    try{//读文件配置
                         readProperty();
 
                         // 显示界面

+ 2 - 5
src/com/mes/util/PLCUtils.java

@@ -30,11 +30,7 @@ public class PLCUtils {
         //  TODO
         // 泄露值
         String leakageValue = "0.0";
-        if ("comso".equals(MesClient.csyq)){
-            leakageValue = plc.readString("VB307", 7);
-        }else if ("ATEQ".equals(MesClient.csyq)){
-            leakageValue = plc.readFloat32("VD800")+"";
-        }
+        leakageValue = plc.readString("VB307", 7);
         // 结果
         String result = getResult(plc);
         // 检测压
@@ -53,6 +49,7 @@ public class PLCUtils {
         QmParam qmParam = new QmParam();
         qmParam.setLeakVal(leakageValue);
         qmParam.setLeakRateUnit("kPa");
+        qmParam.setLeakValUnit("kPa");
         qmParam.setTestPressure(pressure);
         qmParam.setTestPressureUnit("kPa");
         qmParam.setTestResult(result);