优化

src/main/java/com/bootdo/datas/service/impl/GyDataServiceImpl.java

@@ -406,7 +406,15 @@ public class GyDataServiceImpl implements GyDataService {
                 } else if("2".equals(deployType)){ //省级单独部署
                     gyDataDO.setAuditStage("2");
                 }  else if("3".equals(deployType)){ //省市一体部署
-                    gyDataDO.setAuditStage("1");
+                    if(StringUtils.isNotEmpty(currUser.getCity())){ //市级人员操作
+                        gyDataDO.setAuditStage("1");
+                    } else { //省级人员
+                        if (managerValue.contains(currUser.getDeptId().toString())) { //机构是管理员
+                            gyDataDO.setAuditStage("1");
+                        } else { //一般省级人员
+                            gyDataDO.setAuditStage("2");
+                        }
+                    }
                 }
             } else if(type == 2){ //数据目录导入
                 gyDataDO.setSendVerify("1");// 送审状态 0:未送审 1：已送审
@@ -441,9 +449,7 @@ public class GyDataServiceImpl implements GyDataService {
                         } else { //一般省级人员
                             throw new BDException("省级人员无权操作");
                         }
-
                     }
-
                 }
             }
             gyDataDO.setUploadTime(new Date());

src/main/java/com/bootdo/system/domain/AuthNetDeviceVo.java

@@ -1,147 +0,0 @@
-package com.bootdo.system.domain;
-
-import java.io.Serializable;
-
-public class AuthNetDeviceVo implements Serializable {
-
-    private String deviceName;
-
-    private String deviceMac;
-
-    private String deviceType;
-
-    private String deviceSno;
-
-    private String loginPwd;
-
-    private String deviceIp;
-
-    private String devicePort;
-
-    private String deviceProtol;
-
-    private String deviceModel;
-
-    private String deviceCode;
-
-    private String deviceNetid;
-
-    private String deviceOwner;
-
-    private String deviceOrg;
-
-    private String props;
-
-    public String getDeviceName() {
-        return deviceName;
-    }
-
-    public void setDeviceName(String deviceName) {
-        this.deviceName = deviceName;
-    }
-
-    public String getDeviceMac() {
-        return deviceMac;
-    }
-
-    public void setDeviceMac(String deviceMac) {
-        this.deviceMac = deviceMac;
-    }
-
-    public String getDeviceType() {
-        return deviceType;
-    }
-
-    public void setDeviceType(String deviceType) {
-        this.deviceType = deviceType;
-    }
-
-    public String getDeviceSno() {
-        return deviceSno;
-    }
-
-    public void setDeviceSno(String deviceSno) {
-        this.deviceSno = deviceSno;
-    }
-
-    public String getLoginPwd() {
-        return loginPwd;
-    }
-
-    public void setLoginPwd(String loginPwd) {
-        this.loginPwd = loginPwd;
-    }
-
-    public String getDeviceIp() {
-        return deviceIp;
-    }
-
-    public void setDeviceIp(String deviceIp) {
-        this.deviceIp = deviceIp;
-    }
-
-    public String getDevicePort() {
-        return devicePort;
-    }
-
-    public void setDevicePort(String devicePort) {
-        this.devicePort = devicePort;
-    }
-
-    public String getDeviceProtol() {
-        return deviceProtol;
-    }
-
-    public void setDeviceProtol(String deviceProtol) {
-        this.deviceProtol = deviceProtol;
-    }
-
-    public String getDeviceModel() {
-        return deviceModel;
-    }
-
-    public void setDeviceModel(String deviceModel) {
-        this.deviceModel = deviceModel;
-    }
-
-    public String getDeviceCode() {
-        return deviceCode;
-    }
-
-    public void setDeviceCode(String deviceCode) {
-        this.deviceCode = deviceCode;
-    }
-
-    public String getDeviceNetid() {
-        return deviceNetid;
-    }
-
-    public void setDeviceNetid(String deviceNetid) {
-        this.deviceNetid = deviceNetid;
-    }
-
-    public String getDeviceOwner() {
-        return deviceOwner;
-    }
-
-    public void setDeviceOwner(String deviceOwner) {
-        this.deviceOwner = deviceOwner;
-    }
-
-    public String getDeviceOrg() {
-        return deviceOrg;
-    }
-
-    public void setDeviceOrg(String deviceOrg) {
-        this.deviceOrg = deviceOrg;
-    }
-
-    public String getProps() {
-        return props;
-    }
-
-    public void setProps(String props) {
-        this.props = props;
-    }
-
-}