CHANGE(device):部分字段从int改为Long，DMS字典接口更改，设备巡检样式修改

app/src/main/java/com/example/haiwei_mom/data/device/BxSubmitBeen.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public class BxSubmitBeen extends BaseObservable {
 
-    private int deviceld;
+    private Long deviceld;
     private String faultType;
     private String faultDescription;
     private String designOperations;
@@ -76,11 +76,11 @@ public class BxSubmitBeen extends BaseObservable {
         this.outsrcVis = outsrcVis;
     }
 
-    public int getDeviceld() {
+    public Long getDeviceld() {
         return deviceld;
     }
 
-    public void setDeviceld(int deviceld) {
+    public void setDeviceld(Long deviceld) {
         this.deviceld = deviceld;
     }
 

app/src/main/java/com/example/haiwei_mom/data/device/DeviceBeen.java

@@ -7,7 +7,7 @@ package com.example.haiwei_mom.data.device;
 public class DeviceBeen {
 
 
- private int deviceId;
+ private Long deviceId;
  private String deviceCode;
  private String deviceName;
  private String deviceLocation;
@@ -15,11 +15,11 @@ public class DeviceBeen {
  private String deviceSpec;
  private int deviceStatus;
 
- public int getDeviceId() {
+ public Long getDeviceId() {
   return deviceId;
  }
 
- public void setDeviceId(int deviceId) {
+ public void setDeviceId(Long deviceId) {
   this.deviceId = deviceId;
  }
 

app/src/main/java/com/example/haiwei_mom/data/device/DeviceInspectionDetail.java

@@ -9,9 +9,9 @@ import java.util.List;
 public class DeviceInspectionDetail {
 
 
-    private int instanceDetailId;
+    private Long instanceDetailId;
-    private int inspectInstanceId;
+    private Long inspectInstanceId;
-    private int deviceId;
+    private Long deviceId;
     /**
      * 点巡检状态：1-待巡检；2-巡检中；3-已完成
      */
@@ -54,27 +54,27 @@ public class DeviceInspectionDetail {
         this.dmsInspectInstanceDetailProjectList = dmsInspectInstanceDetailProjectList;
     }
 
-    public int getInstanceDetailId() {
+    public Long getInstanceDetailId() {
         return instanceDetailId;
     }
 
-    public void setInstanceDetailId(int instanceDetailId) {
+    public void setInstanceDetailId(Long instanceDetailId) {
         this.instanceDetailId = instanceDetailId;
     }
 
-    public int getInspectInstanceId() {
+    public Long getInspectInstanceId() {
         return inspectInstanceId;
     }
 
-    public void setInspectInstanceId(int inspectInstanceId) {
+    public void setInspectInstanceId(Long inspectInstanceId) {
         this.inspectInstanceId = inspectInstanceId;
     }
 
-    public int getDeviceId() {
+    public Long getDeviceId() {
         return deviceId;
     }
 
-    public void setDeviceId(int deviceId) {
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
 

app/src/main/java/com/example/haiwei_mom/data/device/LubricationBeen.java

@@ -30,7 +30,7 @@ public class LubricationBeen {
      * dmsBillsLubeDetailList : []
      */
 
-    private int lubeInstanceId;
+    private Long lubeInstanceId;
     private String billsLubeCode;
     private Long lubeStatus;
     private String lubeGroup;
@@ -68,11 +68,11 @@ public class LubricationBeen {
 
     private List<LubricationDetail> dmsBillsLubeDetailList;
 
-    public int getLubeInstanceId() {
+    public Long getLubeInstanceId() {
         return lubeInstanceId;
     }
 
-    public void setLubeInstanceId(int lubeInstanceId) {
+    public void setLubeInstanceId(Long lubeInstanceId) {
         this.lubeInstanceId = lubeInstanceId;
     }
 

app/src/main/java/com/example/haiwei_mom/data/device/LubricationDetail.java

@@ -27,11 +27,11 @@ public class LubricationDetail extends BaseObservable {
      * lubeOperationDescription : null
      */
 
-    private int billsLubeDetailId;
+    private Long billsLubeDetailId;
-    private int lubeInstanceId;
+    private Long lubeInstanceId;
-    private int deviceId;
+    private Long deviceId;
-    private int lubeStationId;
+    private Long lubeStationId;
-    private int lubeStandardId;
+    private Long lubeStandardId;
     private String operationDescription;
     private Long maintStatus;
     private String typeName;
@@ -70,43 +70,43 @@ public class LubricationDetail extends BaseObservable {
 
         return null;
     }
-    public int getBillsLubeDetailId() {
+    public Long getBillsLubeDetailId() {
         return billsLubeDetailId;
     }
 
-    public void setBillsLubeDetailId(int billsLubeDetailId) {
+    public void setBillsLubeDetailId(Long billsLubeDetailId) {
         this.billsLubeDetailId = billsLubeDetailId;
     }
 
-    public int getLubeInstanceId() {
+    public Long getLubeInstanceId() {
         return lubeInstanceId;
     }
 
-    public void setLubeInstanceId(int lubeInstanceId) {
+    public void setLubeInstanceId(Long lubeInstanceId) {
         this.lubeInstanceId = lubeInstanceId;
     }
 
-    public int getDeviceId() {
+    public Long getDeviceId() {
         return deviceId;
     }
 
-    public void setDeviceId(int deviceId) {
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
 
-    public int getLubeStationId() {
+    public Long getLubeStationId() {
         return lubeStationId;
     }
 
-    public void setLubeStationId(int lubeStationId) {
+    public void setLubeStationId(Long lubeStationId) {
         this.lubeStationId = lubeStationId;
     }
 
-    public int getLubeStandardId() {
+    public Long getLubeStandardId() {
         return lubeStandardId;
     }
 
-    public void setLubeStandardId(int lubeStandardId) {
+    public void setLubeStandardId(Long lubeStandardId) {
         this.lubeStandardId = lubeStandardId;
     }
 

app/src/main/java/com/example/haiwei_mom/data/device/MaintainBeen.java

@@ -34,7 +34,7 @@ public class MaintainBeen {
 
     private String createTime;
     private Long maintInstanceId;
-    private int wfProcessId;
+    private Long wfProcessId;
     private String billsMaintCode;
     private String planEndTime;
     private Long maintLevel;
@@ -66,11 +66,11 @@ public class MaintainBeen {
         this.maintInstanceId = maintInstanceId;
     }
 
-    public int getWfProcessId() {
+    public Long getWfProcessId() {
         return wfProcessId;
     }
 
-    public void setWfProcessId(int wfProcessId) {
+    public void setWfProcessId(Long wfProcessId) {
         this.wfProcessId = wfProcessId;
     }
 

app/src/main/java/com/example/haiwei_mom/data/device/MaintainDetail.java

@@ -35,11 +35,11 @@ public class MaintainDetail extends BaseObservable {
      */
 
 
-    private int billsMaintDetailId;
+    private Long billsMaintDetailId;
-    private int maintInstanceId;
+    private Long maintInstanceId;
-    private int deviceId;
+    private Long deviceId;
-    private int stationId;
+    private Long stationId;
-    private int maintStandardId;
+    private Long maintStandardId;
     private String operationDescription;
     private String deviceCode;
     private String deviceName;
@@ -107,7 +107,7 @@ public class MaintainDetail extends BaseObservable {
         return null;
     }
 
-    public int getBillsMaintDetailId() {
+    public Long getBillsMaintDetailId() {
         return billsMaintDetailId;
     }
 
@@ -125,39 +125,39 @@ public class MaintainDetail extends BaseObservable {
         this.buttonVisb = buttonVisb;
     }
 
-    public void setBillsMaintDetailId(int billsMaintDetailId) {
+    public void setBillsMaintDetailId(Long billsMaintDetailId) {
         this.billsMaintDetailId = billsMaintDetailId;
     }
 
-    public int getMaintInstanceId() {
+    public Long getMaintInstanceId() {
         return maintInstanceId;
     }
 
-    public void setMaintInstanceId(int maintInstanceId) {
+    public void setMaintInstanceId(Long maintInstanceId) {
         this.maintInstanceId = maintInstanceId;
     }
 
-    public int getDeviceId() {
+    public Long getDeviceId() {
         return deviceId;
     }
 
-    public void setDeviceId(int deviceId) {
+    public void setDeviceId(Long deviceId) {
         this.deviceId = deviceId;
     }
 
-    public int getStationId() {
+    public Long getStationId() {
         return stationId;
     }
 
-    public void setStationId(int stationId) {
+    public void setStationId(Long stationId) {
         this.stationId = stationId;
     }
 
-    public int getMaintStandardId() {
+    public Long getMaintStandardId() {
         return maintStandardId;
     }
 
-    public void setMaintStandardId(int maintStandardId) {
+    public void setMaintStandardId(Long maintStandardId) {
         this.maintStandardId = maintStandardId;
     }
 

app/src/main/java/com/example/haiwei_mom/device/BxActivity.java

@@ -133,7 +133,7 @@ public class BxActivity extends BaseActivity implements DisposalFileAdapter.Item
 
     // 维修
     private void initRequest(String uri) {
-        OkGo.<MyResult>get(url + "/system/dict/data/type/" + uri).tag(this)
+        OkGo.<MyResult>get(url + "/dms/mobile/dict/type/" + uri).tag(this)
                 .execute(new MyRecultCall(dialog, this) {
                     @Override
                     public void onSuccess(Response<MyResult> response) {

app/src/main/java/com/example/haiwei_mom/device/DeviceRepairInfoActivity.java

@@ -220,7 +220,7 @@ public class DeviceRepairInfoActivity extends BaseActivity {
 
     // 查询故障 和 ope接口
     private void initRequest(String uri) {
-        OkGo.<MyResult>get(url + "/system/dict/data/type/" + uri).tag(this)
+        OkGo.<MyResult>get(url + "/dms/mobile/dict/type/" + uri).tag(this)
                 .execute(new MyRecultCall(dialog, this) {
             @Override
             public void onSuccess(Response<MyResult> response) {

app/src/main/res/layout/activity_device_check_info.xml

@@ -158,6 +158,8 @@
             android:padding="5dp" />
 
         <Button
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             style="@style/button_submit"
             android:onClick="deviceCheckInfoSubmit"
             android:text="提交" />