修改功能，关联

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/service/core/AuthService.java

@@ -1,6 +1,5 @@
 package com.kuyuntech.vrv.coreapi.service.core;
 
-import com.kuyuntech.vrv.coreapi.bean.auth.PassportBean;
 import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 
 public interface AuthService {

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/service/core/GatewayService.java

@@ -93,4 +93,7 @@ public interface GatewayService  {
     void batchDeleteByCodes(List<String> codes);
 
 
+    GatewayBean bindOperator(GatewayBean gatewayBean);
+
+    GatewayBean bindProject(GatewayBean gatewayBean);
 }

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/service/core/ProjectService.java

@@ -92,4 +92,5 @@ public interface ProjectService  {
      */
     void batchDeleteByCodes(List<String> codes);
 
+    ProjectBean bindOperator(ProjectBean projectBean);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/DeviceAlarmConfigDao.java

@@ -16,9 +16,7 @@ public interface DeviceAlarmConfigDao extends FastbootRepository<DeviceAlarmConf
 
    
    DeviceAlarmConfig findByCodeAndValid(String code,Short valid);
-   
-
-   
 
 
+    DeviceAlarmConfig findByVariableIdAndValid(String variableId, short valid);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/DeviceDao.java

@@ -16,9 +16,7 @@ public interface DeviceDao extends FastbootRepository<Device,Long> {
 
    
    Device findByCodeAndValid(String code,Short valid);
-   
-
-   
 
 
+    Device findBySnAndValid(String sn, short valid);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/GatewayDao.java

@@ -1,20 +1,17 @@
 package com.kuyuntech.vrv.coreservice.dao.core;
 
 import com.kuyuntech.vrv.coreservice.domain.core.Gateway;
+import com.kuyuntech.vrv.coreservice.domain.core.Project;
 import com.wbspool.fastboot.core.jpa.repository.FastbootRepository;
 
 
-
-
 /**
  * GatewayDao
- *
  */
-public interface GatewayDao extends FastbootRepository<Gateway,Long> {
+public interface GatewayDao extends FastbootRepository<Gateway, Long> {
 
-    
 
-   
-   Gateway findByCodeAndValid(String code,Short valid);
+    Gateway findByCodeAndValid(String code, Short valid);
 
+    Gateway findByNumberAndValid(String gatewayNumber, short valid);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/OperatorDao.java

@@ -16,9 +16,7 @@ public interface OperatorDao extends FastbootRepository<Operator,Long> {
 
    
    Operator findByCodeAndValid(String code,Short valid);
-   
-
-   
 
 
+    Operator findByNumberAndValid(String operatorNumber, short valid);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/ProjectDao.java

@@ -1,5 +1,6 @@
 package com.kuyuntech.vrv.coreservice.dao.core;
 
+import com.kuyuntech.vrv.coreservice.domain.core.Operator;
 import com.kuyuntech.vrv.coreservice.domain.core.Project;
 import com.wbspool.fastboot.core.jpa.repository.FastbootRepository;
 
@@ -12,4 +13,6 @@ public interface ProjectDao extends FastbootRepository<Project, Long> {
 
     Project findByCodeAndValid(String code, Short valid);
 
+
+    Project findByNumberAndValid(String projectNumber, short valid);
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/AuthServiceImpl.java

@@ -1,14 +1,9 @@
 package com.kuyuntech.vrv.coreservice.service.core.impl;
 
-import com.kuyuntech.vrv.coreapi.bean.auth.PassportBean;
 import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreapi.service.core.AuthService;
 import com.kuyuntech.vrv.coreapi.service.core.UserService;
-import com.kuyuntech.vrv.coreapi.until.core.PasswordEncryptUtils;
 import com.kuyuntech.vrv.coreservice.dao.core.UserDao;
-import com.kuyuntech.vrv.coreservice.domain.core.User;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceAlarmConfigServiceImpl.java

@@ -2,11 +2,11 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
 import com.kuyuntech.vrv.coreapi.service.core.DeviceAlarmConfigService;
-import com.kuyuntech.vrv.coreservice.dao.core.DeviceAlarmConfigDao;
+import com.kuyuntech.vrv.coreservice.dao.core.*;
+import com.kuyuntech.vrv.coreservice.domain.core.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceAlarmConfigBean;
-import com.kuyuntech.vrv.coreservice.domain.core.DeviceAlarmConfig;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 import java.util.List;
 import org.slf4j.Logger;
@@ -39,15 +39,53 @@ public class DeviceAlarmConfigServiceImpl extends AbstractFastbootService<Device
     @Autowired
     DeviceAlarmConfigDao deviceAlarmConfigDao;
 
-    
+    @Autowired
+    OperatorDao operatorDao;
+    @Autowired
+    ProjectDao projectDao;
+    @Autowired
+    GatewayDao gatewayDao;
+    @Autowired
+    DeviceDao deviceDao;
 
     @Override
     public DeviceAlarmConfigBean add(DeviceAlarmConfigBean deviceAlarmConfigBean) {
 
         DeviceAlarmConfig deviceAlarmConfig = new DeviceAlarmConfig();
         beanToDomain(deviceAlarmConfigBean,deviceAlarmConfig,"id");
+
+
+        String operatorNumber = deviceAlarmConfigBean.getOperatorNumber();
+        String projectNumber = deviceAlarmConfigBean.getProjectNumber();
+        String gatewayNumber = deviceAlarmConfigBean.getGatewayNumber();
+        String sn = deviceAlarmConfigBean.getSn();
+
+        if ((operatorNumber == null || operatorNumber == "")
+                && (projectNumber == null || projectNumber == "")
+                && (gatewayNumber == null || gatewayNumber == "")
+                && (sn == null || sn == "")) {
+
+            deviceAlarmConfigDao.save(deviceAlarmConfig);
+
+            domainToBean(deviceAlarmConfig, deviceAlarmConfigBean);
+
+            return deviceAlarmConfigBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+        Gateway gateway = gatewayDao.findByNumberAndValid(gatewayNumber, VALID);
+        Device device = deviceDao.findBySnAndValid(sn,VALID);
+
+        deviceAlarmConfig.setOperatorCode(operator.getCode());
+        deviceAlarmConfig.setProjectCode(project.getCode());
+        deviceAlarmConfig.setGatewayCode(gateway.getCode());
+        deviceAlarmConfig.setDeviceCode(device.getCode());
+
         deviceAlarmConfigDao.save(deviceAlarmConfig);
-        domainToBean(deviceAlarmConfig,deviceAlarmConfigBean);
+
+        domainToBean(deviceAlarmConfig, deviceAlarmConfigBean);
+
         return deviceAlarmConfigBean;
 
     }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceAlarmRecordServiceImpl.java

@@ -2,14 +2,15 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
 import com.kuyuntech.vrv.coreapi.service.core.DeviceAlarmRecordService;
-import com.kuyuntech.vrv.coreservice.dao.core.DeviceAlarmRecordDao;
+import com.kuyuntech.vrv.coreservice.dao.core.*;
+import com.kuyuntech.vrv.coreservice.domain.core.*;
 import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceAlarmRecordBean;
-import com.kuyuntech.vrv.coreservice.domain.core.DeviceAlarmRecord;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 
+import java.util.Date;
 import java.util.List;
 
 import org.slf4j.Logger;
@@ -40,17 +41,66 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
 
     @Autowired
     DeviceAlarmRecordDao deviceAlarmRecordDao;
-
+    @Autowired
+    OperatorDao operatorDao;
+    @Autowired
+    ProjectDao projectDao;
+    @Autowired
+    GatewayDao gatewayDao;
+    @Autowired
+    DeviceDao deviceDao;
+    @Autowired
+    DeviceAlarmConfigDao deviceAlarmConfigDao;
 
     @Override
     public DeviceAlarmRecordBean add(DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
         DeviceAlarmRecord deviceAlarmRecord = new DeviceAlarmRecord();
         beanToDomain(deviceAlarmRecordBean, deviceAlarmRecord, "id");
+
+        String operatorNumber = deviceAlarmRecordBean.getOperatorNumber();
+        String projectNumber = deviceAlarmRecordBean.getProjectNumber();
+        String gatewayNumber = deviceAlarmRecordBean.getGatewayNumber();
+        String sn = deviceAlarmRecordBean.getSn();
+        String variableId = deviceAlarmRecordBean.getVariableId();
+
+        if ((operatorNumber == null || operatorNumber == "")
+                && (projectNumber == null || projectNumber == "")
+                && (gatewayNumber == null || gatewayNumber == "")
+                && (sn == null || sn == "")
+                && (variableId == null || variableId == "")) {
+
+            deviceAlarmRecordDao.save(deviceAlarmRecord);
+
+            domainToBean(deviceAlarmRecord, deviceAlarmRecordBean);
+
+            return deviceAlarmRecordBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+        Gateway gateway = gatewayDao.findByNumberAndValid(gatewayNumber, VALID);
+        Device device = deviceDao.findBySnAndValid(sn, VALID);
+        DeviceAlarmConfig deviceAlarmConfig = deviceAlarmConfigDao.findByVariableIdAndValid(variableId, VALID);
+
+        deviceAlarmRecord.setOperatorCode(operator.getCode());
+        deviceAlarmRecord.setProjectCode(project.getCode());
+        deviceAlarmRecord.setGatewayCode(gateway.getCode());
+        deviceAlarmRecord.setDeviceCode(device.getCode());
+
+        deviceAlarmRecord.setAlarmConfigCode(deviceAlarmConfig.getCode());
+        deviceAlarmRecord.setAlarmName(deviceAlarmConfig.getAlarmName());
+        deviceAlarmRecord.setAlarmType(deviceAlarmConfig.getAlarmType());
+        deviceAlarmRecord.setRecordCondition(deviceAlarmConfig.getConfigCondition());
+
+        Date startTime = new Date();
+        deviceAlarmRecord.setStartTime(startTime);
+
         deviceAlarmRecordDao.save(deviceAlarmRecord);
+
         domainToBean(deviceAlarmRecord, deviceAlarmRecordBean);
-        return deviceAlarmRecordBean;
 
+        return deviceAlarmRecordBean;
     }
 
     @Override

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/DeviceAlarmRepairRecordServiceImpl.java

@@ -2,12 +2,14 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
 import com.kuyuntech.vrv.coreapi.service.core.DeviceAlarmRepairRecordService;
-import com.kuyuntech.vrv.coreservice.dao.core.DeviceAlarmRepairRecordDao;
+import com.kuyuntech.vrv.coreservice.dao.core.*;
+import com.kuyuntech.vrv.coreservice.domain.core.*;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.DeviceAlarmRepairRecordBean;
-import com.kuyuntech.vrv.coreservice.domain.core.DeviceAlarmRepairRecord;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
+
+import java.util.Date;
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,7 +40,16 @@ public class DeviceAlarmRepairRecordServiceImpl extends AbstractFastbootService<
 
     @Autowired
     DeviceAlarmRepairRecordDao deviceAlarmRepairRecordDao;
-
+    @Autowired
+    OperatorDao operatorDao;
+    @Autowired
+    ProjectDao projectDao;
+    @Autowired
+    GatewayDao gatewayDao;
+    @Autowired
+    DeviceDao deviceDao;
+    @Autowired
+    DeviceAlarmConfigDao deviceAlarmConfigDao;
     
 
     @Override
@@ -46,10 +57,43 @@ public class DeviceAlarmRepairRecordServiceImpl extends AbstractFastbootService<
 
         DeviceAlarmRepairRecord deviceAlarmRepairRecord = new DeviceAlarmRepairRecord();
         beanToDomain(deviceAlarmRepairRecordBean,deviceAlarmRepairRecord,"id");
+
+
+        String operatorNumber = deviceAlarmRepairRecordBean.getOperatorNumber();
+        String projectNumber = deviceAlarmRepairRecordBean.getProjectNumber();
+        String gatewayNumber = deviceAlarmRepairRecordBean.getGatewayNumber();
+        String sn = deviceAlarmRepairRecordBean.getSn();
+        String variableId = deviceAlarmRepairRecordBean.getVariableId();
+
+        if ((operatorNumber == null || operatorNumber == "")
+                && (projectNumber == null || projectNumber == "")
+                && (gatewayNumber == null || gatewayNumber == "")
+                && (sn == null || sn == "")
+                && (variableId == null || variableId == "")) {
+
+            deviceAlarmRepairRecordDao.save(deviceAlarmRepairRecord);
+
+            domainToBean(deviceAlarmRepairRecord, deviceAlarmRepairRecordBean);
+
+            return deviceAlarmRepairRecordBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+        Gateway gateway = gatewayDao.findByNumberAndValid(gatewayNumber, VALID);
+        Device device = deviceDao.findBySnAndValid(sn, VALID);
+
+        deviceAlarmRepairRecord.setOperatorCode(operator.getCode());
+        deviceAlarmRepairRecord.setProjectCode(project.getCode());
+        deviceAlarmRepairRecord.setGatewayCode(gateway.getCode());
+        deviceAlarmRepairRecord.setDeviceCode(device.getCode());
+
+
         deviceAlarmRepairRecordDao.save(deviceAlarmRepairRecord);
-        domainToBean(deviceAlarmRepairRecord,deviceAlarmRepairRecordBean);
-        return deviceAlarmRepairRecordBean;
 
+        domainToBean(deviceAlarmRepairRecord, deviceAlarmRepairRecordBean);
+
+        return deviceAlarmRepairRecordBean;
     }
 
     @Override

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/GatewayServiceImpl.java

@@ -3,6 +3,9 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 import com.kuyuntech.vrv.coreapi.service.core.GatewayService;
 import com.kuyuntech.vrv.coreservice.dao.core.GatewayDao;
+import com.kuyuntech.vrv.coreservice.dao.core.OperatorDao;
+import com.kuyuntech.vrv.coreservice.dao.core.ProjectDao;
+import com.kuyuntech.vrv.coreservice.domain.core.Operator;
 import com.kuyuntech.vrv.coreservice.domain.core.Project;
 import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
@@ -41,15 +44,42 @@ public class GatewayServiceImpl extends AbstractFastbootService<Gateway, Gateway
 
     @Autowired
     GatewayDao gatewayDao;
+    @Autowired
+    OperatorDao operatorDao;
+
+    @Autowired
+    ProjectDao projectDao;
 
 
     @Override
     public GatewayBean add(GatewayBean gatewayBean) {
 
         Gateway gateway = new Gateway();
+
         beanToDomain(gatewayBean, gateway, "id");
+
+        String operatorNumber = gatewayBean.getOperatorNumber();
+        String projectNumber = gatewayBean.getProjectNumber();
+
+        if ((operatorNumber == null || operatorNumber == "") && (projectNumber == null || projectNumber == "")){
+
+            gatewayDao.save(gateway);
+
+            domainToBean(gateway, gatewayBean);
+
+            return gatewayBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+
+        gateway.setOperatorCode(operator.getCode());
+        gateway.setProjectCode(project.getCode());
+
         gatewayDao.save(gateway);
+
         domainToBean(gateway, gatewayBean);
+
         return gatewayBean;
 
     }
@@ -214,4 +244,54 @@ public class GatewayServiceImpl extends AbstractFastbootService<Gateway, Gateway
 
     }
 
+    @Override
+    public GatewayBean bindOperator(GatewayBean gatewayBean) {
+        if (gatewayBean == null) {
+            return null;
+        }
+
+        Gateway gateway = gatewayDao.findByCodeAndValid(gatewayBean.getCode(), VALID);
+
+        if (gateway == null) {
+            return null;
+        }
+
+        String operatorNumber = gatewayBean.getOperatorNumber();
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+
+        gateway.setOperatorCode(operator.getCode());
+
+        gatewayDao.save(gateway);
+
+        domainToBean(gateway, gatewayBean);
+
+        return gatewayBean;
+    }
+
+    @Override
+    public GatewayBean bindProject(GatewayBean gatewayBean) {
+        if (gatewayBean == null) {
+            return null;
+        }
+
+        Gateway gateway = gatewayDao.findByCodeAndValid(gatewayBean.getCode(), VALID);
+
+        if (gateway == null) {
+            return null;
+        }
+
+        String projectNumber = gatewayBean.getProjectNumber();
+
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+
+        gateway.setProjectCode(project.getCode());
+
+        gatewayDao.save(gateway);
+
+        domainToBean(gateway, gatewayBean);
+
+        return gatewayBean;
+    }
+
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/OperatorLogServiceImpl.java

@@ -1,13 +1,17 @@
 package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
+import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreapi.service.core.OperatorLogService;
+import com.kuyuntech.vrv.coreapi.service.core.OperatorService;
+import com.kuyuntech.vrv.coreservice.dao.core.OperatorDao;
 import com.kuyuntech.vrv.coreservice.dao.core.OperatorLogDao;
+import com.kuyuntech.vrv.coreservice.dao.core.UserDao;
+import com.kuyuntech.vrv.coreservice.domain.core.*;
 import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.OperatorLogBean;
-import com.kuyuntech.vrv.coreservice.domain.core.OperatorLog;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 
 import java.util.List;
@@ -26,6 +30,8 @@ import org.hibernate.criterion.Order;
 import com.wbspool.fastboot.core.jpa.service.AbstractFastbootService;
 import org.springframework.util.Assert;
 
+import javax.servlet.http.HttpServletRequest;
+
 import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.*;
 
 
@@ -40,6 +46,8 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
 
     @Autowired
     OperatorLogDao operatorLogDao;
+    @Autowired
+    OperatorDao operatorDao;
 
 
     @Override
@@ -47,8 +55,31 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
 
         OperatorLog operatorLog = new OperatorLog();
         beanToDomain(operatorLogBean, operatorLog, "id");
+
+
+        String operatorNumber = operatorLogBean.getOperatorNumber();
+
+
+        if ((operatorNumber == null || operatorNumber == "")) {
+
+            operatorLogDao.save(operatorLog);
+
+            domainToBean(operatorLog, operatorLogBean);
+
+            return operatorLogBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+
+        operatorLog.setOperatorCode(operator.getCode());
+
+
+
+
         operatorLogDao.save(operatorLog);
+
         domainToBean(operatorLog, operatorLogBean);
+
         return operatorLogBean;
 
     }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/ProjectServiceImpl.java

@@ -2,7 +2,11 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
 import com.kuyuntech.vrv.coreapi.service.core.ProjectService;
+import com.kuyuntech.vrv.coreservice.dao.core.OperatorDao;
 import com.kuyuntech.vrv.coreservice.dao.core.ProjectDao;
+import com.kuyuntech.vrv.coreservice.domain.core.Operator;
+import com.kuyuntech.vrv.coreservice.domain.core.Role;
+import com.kuyuntech.vrv.coreservice.domain.core.User;
 import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -41,14 +45,37 @@ public class ProjectServiceImpl extends AbstractFastbootService<Project, Project
     @Autowired
     ProjectDao projectDao;
 
+    @Autowired
+    OperatorDao operatorDao;
+
 
     @Override
     public ProjectBean add(ProjectBean projectBean) {
 
         Project project = new Project();
+
         beanToDomain(projectBean, project, "id");
+
+        String operatorNumber = projectBean.getOperatorNumber();
+
+        if (operatorNumber == null || operatorNumber == "") {
+
+            projectDao.save(project);
+
+            domainToBean(project, projectBean);
+
+            return projectBean;
+        }
+
+        //下拉列表直接查数据库已有的运营商，不存在运营商不匹配的情况
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+
+        project.setOperatorCode(operator.getCode());
+
         projectDao.save(project);
+
         domainToBean(project, projectBean);
+
         return projectBean;
 
     }
@@ -169,23 +196,23 @@ public class ProjectServiceImpl extends AbstractFastbootService<Project, Project
     private static DetachedCriteria createListCriteria(ProjectBean projectBean) {
         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Project.class);
 
-        if(projectBean != null){
-           if(StringUtils.isNotBlank(projectBean.getName())) {
-               detachedCriteria.add(Restrictions.like("name", projectBean.getName(), MatchMode.ANYWHERE));
-           }
-            if(StringUtils.isNotBlank(projectBean.getProvince())) {
+        if (projectBean != null) {
+            if (StringUtils.isNotBlank(projectBean.getName())) {
+                detachedCriteria.add(Restrictions.like("name", projectBean.getName(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(projectBean.getProvince())) {
                 detachedCriteria.add(Restrictions.eq("province", projectBean.getProvince()));
             }
-            if(StringUtils.isNotBlank(projectBean.getCity())) {
+            if (StringUtils.isNotBlank(projectBean.getCity())) {
                 detachedCriteria.add(Restrictions.eq("city", projectBean.getCity()));
             }
-            if(StringUtils.isNotBlank(projectBean.getAddress())) {
-                detachedCriteria.add(Restrictions.like("address", projectBean.getAddress(),MatchMode.ANYWHERE));
+            if (StringUtils.isNotBlank(projectBean.getAddress())) {
+                detachedCriteria.add(Restrictions.like("address", projectBean.getAddress(), MatchMode.ANYWHERE));
             }
-            if(StringUtils.isNotBlank(projectBean.getCustomer())) {
+            if (StringUtils.isNotBlank(projectBean.getCustomer())) {
                 detachedCriteria.add(Restrictions.like("customer", projectBean.getCustomer(), MatchMode.ANYWHERE));
             }
-            if(StringUtils.isNotBlank(projectBean.getCustomerTel())) {
+            if (StringUtils.isNotBlank(projectBean.getCustomerTel())) {
                 detachedCriteria.add(Restrictions.like("customerTel ", projectBean.getCustomerTel(), MatchMode.ANYWHERE));
             }
         }
@@ -223,4 +250,30 @@ public class ProjectServiceImpl extends AbstractFastbootService<Project, Project
 
     }
 
+    @Override
+    public ProjectBean bindOperator(ProjectBean projectBean) {
+
+        if (projectBean == null) {
+            return null;
+        }
+
+        Project project = projectDao.findByCodeAndValid(projectBean.getCode(), VALID);
+
+        if (project == null) {
+            return null;
+        }
+
+        String operatorNumber = projectBean.getOperatorNumber();
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+
+        project.setOperatorCode(operator.getCode());
+
+        projectDao.save(project);
+
+        domainToBean(project, projectBean);
+
+        return projectBean;
+    }
+
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/UserServiceImpl.java

@@ -1,37 +1,31 @@
 package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 
+import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreapi.service.core.UserService;
-import com.kuyuntech.vrv.coreapi.until.core.PasswordEncryptUtils;
 import com.kuyuntech.vrv.coreservice.dao.core.RoleDao;
 import com.kuyuntech.vrv.coreservice.dao.core.UserDao;
 import com.kuyuntech.vrv.coreservice.domain.core.Role;
-import com.wbspool.fastboot.core.common.bean.ResponseBean;
-import org.hibernate.criterion.MatchMode;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreservice.domain.core.User;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
-
-import java.util.Date;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.BeanUtils;
+import com.wbspool.fastboot.core.jpa.service.AbstractFastbootService;
 import org.apache.commons.lang3.StringUtils;
 import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.MatchMode;
 import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.Assert;
 
 import java.util.ArrayList;
+import java.util.List;
 
-import org.hibernate.criterion.Order;
-import com.wbspool.fastboot.core.jpa.service.AbstractFastbootService;
-import org.springframework.util.Assert;
-
-import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.*;
+import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.INVALID;
+import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.VALID;
 
 
 /**
@@ -53,9 +47,29 @@ public class UserServiceImpl extends AbstractFastbootService<User, UserBean> imp
     public UserBean add(UserBean userBean) {
 
         User user = new User();
+
         beanToDomain(userBean, user, "id");
+
+        String roleFlag = userBean.getRoleFlag();
+
+        if (roleFlag == null || roleFlag == "") {
+            userDao.save(user);
+
+            domainToBean(user, userBean);
+
+            return userBean;
+        }
+
+        //下拉列表直接查数据库已有的角色，不存在角色不匹配的情况
+        Role role = roleDao.findByFlagAndValid(roleFlag, VALID);
+
+
+        user.setRoleCode(role.getCode());
+
         userDao.save(user);
+
         domainToBean(user, userBean);
+
         return userBean;
 
     }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/service/core/impl/VerifyCodeServiceImpl.java

@@ -32,7 +32,7 @@ import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.VALID;
 *
 */
 @Service("verifyCodeService")
-@Transactional(rollbackFor = Exception.class,transactionManager = "authCompCoreServiceTransactionManager")
+@Transactional(rollbackFor = Exception.class,transactionManager = "vrvCoreServiceTransactionManager")
 public class VerifyCodeServiceImpl extends AbstractFastbootService<VerifyCode, VerifyCodeBean> implements VerifyCodeService {
 
     private static final Logger logger = LoggerFactory.getLogger(VerifyCodeServiceImpl.class);

sources/server/vrv/vrv-platform/pom.xml

@@ -38,6 +38,13 @@
             <scope>compile</scope>
         </dependency>
 
+        <!--json转换-->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.80</version>
+        </dependency>
+
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -155,9 +162,11 @@
             <artifactId>vrv-core-service</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        
-
-        
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test-autoconfigure</artifactId>
+            <version>2.6.5</version>
+        </dependency>
 
 
     </dependencies>

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/auth/AuthController.java

@@ -2,6 +2,9 @@ package com.kuyuntech.vrv.platform.controller.auth;
 
 
 import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
+import com.kuyuntech.vrv.coreapi.bean.core.VerifyCodeBean;
+import com.kuyuntech.vrv.coreapi.constant.core.VerifyCodeStatus;
+import com.kuyuntech.vrv.coreapi.constant.core.VerifyCodeType;
 import com.kuyuntech.vrv.coreapi.service.core.AuthService;
 import com.kuyuntech.vrv.coreapi.service.core.UserService;
 import com.kuyuntech.vrv.coreapi.service.core.VerifyCodeService;
@@ -12,8 +15,6 @@ import com.wbspool.fastboot.core.web.result.ParamErrorResultBuilder;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.validation.Errors;
-import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -38,6 +39,8 @@ public class AuthController {
 
     @Value("${fastboot.auth.login-verify-code:true}")
     private Boolean verifyCodeCheck;
+    @Value("${fastboot.auth.verify-code-expire-time:300000}")
+    private Long verifyCodeExpireTime;
 
     final VerifyCodeService verifyCodeService;
 
@@ -55,41 +58,41 @@ public class AuthController {
     public void verifyCode(Integer width, Integer height, HttpServletRequest request, HttpServletResponse response) throws IOException {
 
         String verifyCode = ValidateCodeGenerator.generateVerifyCode(4);
-        Long createTime = System.currentTimeMillis();
-        System.out.println(createTime);
-        System.out.println("VerifyCode: " + verifyCode);
 
+        VerifyCodeBean verifyCodeBean = this.verifyCodeService.add(VerifyCodeBean.builder().type(VerifyCodeType.IMG).verified(VerifyCodeStatus.UN_VERIFY).expireTime(verifyCodeExpireTime).verifyCode(verifyCode).build());
 
-        request.getSession().setAttribute("verifyCode", verifyCode);
-        request.getSession().setAttribute("createTime", createTime);
+        request.getSession().setAttribute("verifyCodeBean", verifyCodeBean);
+
+        System.out.println(verifyCodeBean.getVerifyCode());
+
+        ValidateCodeGenerator.outputImage(width != null ? width : 300, height != null ? height : 100, response.getOutputStream(), verifyCode);
 
     }
 
     @RequestMapping
-    public Object login(@Validated UserBean userBean, String encrypt, Errors errors, HttpServletRequest request) {
+    public Object login(UserBean userBean, HttpServletRequest request) {
 
 
         //校验验证码是否正确
         if (this.verifyCodeCheck) {
 
+            VerifyCodeBean verifyCodeBean = (VerifyCodeBean) request.getSession().getAttribute("verifyCodeBean");
+
             if (StringUtils.isEmpty(userBean.getVerifyCode())) {
                 return ParamErrorResultBuilder.newBuilder().paramError("verifyCode", "验证码不能为空").build();
             }
 
-            String verifyCode = (String) request.getSession().getAttribute("verifyCode");
-
-            if (verifyCode == null) {
+            if (verifyCodeBean == null) {
                 return ParamErrorResultBuilder.newBuilder().paramError("verifyCode", "没有获取到验证码").build();
             }
 
-            Long expireTime = 50000L;
+            String verifyCode = verifyCodeBean.getVerifyCode();
 
-            Long createTime = (Long) request.getSession().getAttribute("createTime");
 
             //判断有效期
-//            if ((System.currentTimeMillis() - createTime) > expireTime) {
-//                return ParamErrorResultBuilder.newBuilder().paramError("verifyCode", "验证码已过期").build();
-//            }
+            if ((System.currentTimeMillis() - verifyCodeBean.getCreateTime().getTime()) > verifyCodeBean.getExpireTime()) {
+                return ParamErrorResultBuilder.newBuilder().paramError("verifyCode", "验证码已过期").build();
+            }
 
             if (!verifyCode.toLowerCase().equals(userBean.getVerifyCode().toLowerCase())) {
                 return ParamErrorResultBuilder.newBuilder().paramError("verifyCode", "验证码错误").build();
@@ -104,7 +107,7 @@ public class AuthController {
             return ResponseBean.serverError("账号或密码错误");
         }
 
-        request.getSession().removeAttribute("verifyCode");
+        request.getSession().removeAttribute("verifyCodeBean");
 
         request.getSession().setAttribute("userBean", userBean);
 
@@ -139,6 +142,12 @@ public class AuthController {
 
     }
 
+    /**
+     * 登出
+     *
+     * @param request
+     * @return
+     */
     @RequestMapping
     public Object logout(HttpServletRequest request) {
 

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/GatewayController.java

@@ -196,4 +196,42 @@ public class GatewayController {
         return ResponseBean.success("操作成功！");
     }
 
+    /**
+     * 绑定运营商
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object bindOperator(GatewayBean gatewayBean) {
+
+        gatewayBean = this.gatewayService.bindOperator(gatewayBean);
+
+        if (gatewayBean == null) {
+            return ResponseBean.serverError("绑定失败！");
+        }
+
+        return ResponseBean.success("绑定成功！");
+    }
+
+    /**
+     * 绑定项目
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object bindProject(GatewayBean gatewayBean) {
+
+        gatewayBean = this.gatewayService.bindProject(gatewayBean);
+
+        if (gatewayBean == null) {
+            return ResponseBean.serverError("绑定失败！");
+        }
+
+        return ResponseBean.success("绑定成功！");
+    }
+
 }

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/OperatorLogController.java

@@ -1,6 +1,7 @@
 package com.kuyuntech.vrv.platform.controller.core;
 
 import com.kuyuntech.vrv.coreapi.bean.core.OperatorLogBean;
+import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreapi.service.core.OperatorLogService;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 import com.wbspool.fastboot.core.common.bean.ResponseBean;
@@ -16,17 +17,15 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 
-
-
 /**
-* OperatorLogController
-*
-*/
+ * OperatorLogController
+ */
 @RestController
 public class OperatorLogController {
 
@@ -35,162 +34,169 @@ public class OperatorLogController {
     @Autowired
     OperatorLogService operatorLogService;
 
-    
 
     /**
-    * 新增
-    * TODO 待实现
-    * @param operatorLogBean 新增参数
-    * @return
-    *
-    */
+     * 新增
+     * TODO 待实现
+     *
+     * @param operatorLogBean 新增参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object add(@Validated(ValidGroup.Add.class) OperatorLogBean operatorLogBean){
+    public Object add(@Validated(ValidGroup.Add.class) OperatorLogBean operatorLogBean, HttpServletRequest request) {
+
+        UserBean userbean = (UserBean) request.getSession().getAttribute("userBean");
 
-         operatorLogBean = this.operatorLogService.add(operatorLogBean);
+        operatorLogBean.setUserAccount(userbean.getAccount());
+        operatorLogBean.setUserRealname(userbean.getRealname());
 
+        operatorLogBean = this.operatorLogService.add(operatorLogBean);
 
-         if (operatorLogBean == null) {
-               return ResponseBean.serverError("操作失败！");
-         }
 
-          return ResponseBean.success("操作成功！").addData("code", operatorLogBean.getCode());
+        if (operatorLogBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
+
+        return ResponseBean.success("操作成功！").addData("code", operatorLogBean.getCode());
 
     }
 
     /**
-    * 更新
-    * TODO 待实现
-    * @param operatorLogBean 更新参数
-    * @return
-    */
+     * 更新
+     * TODO 待实现
+     *
+     * @param operatorLogBean 更新参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object update(@Validated(ValidGroup.Update.class) OperatorLogBean operatorLogBean){
+    public Object update(@Validated(ValidGroup.Update.class) OperatorLogBean operatorLogBean) {
 
-       operatorLogBean = this.operatorLogService.update(operatorLogBean);
+        operatorLogBean = this.operatorLogService.update(operatorLogBean);
 
 
-       if (operatorLogBean == null) {
-           return ResponseBean.serverError("操作失败！");
-       }
+        if (operatorLogBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-       return ResponseBean.success("操作成功！").addData("code", operatorLogBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", operatorLogBean.getCode());
 
     }
 
 
     /**
-    * 删除
-    * TODO 待实现
-    * @param operatorLogBean 删除参数
-    * @return
-    */
+     * 删除
+     * TODO 待实现
+     *
+     * @param operatorLogBean 删除参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object delete(@Validated(ValidGroup.Delete.class) OperatorLogBean operatorLogBean){
+    public Object delete(@Validated(ValidGroup.Delete.class) OperatorLogBean operatorLogBean) {
 
-         operatorLogBean = this.operatorLogService.delete(operatorLogBean);
+        operatorLogBean = this.operatorLogService.delete(operatorLogBean);
 
-          if (operatorLogBean == null) {
-             return ResponseBean.serverError("操作失败！");
-          }
+        if (operatorLogBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！");
+        return ResponseBean.success("操作成功！");
 
     }
 
 
     /**
-    * 查询列表
-    * TODO 待实现
-    * @param operatorLogBean 查询参数
-    * @return
-    */
+     * 查询列表
+     * TODO 待实现
+     *
+     * @param operatorLogBean 查询参数
+     * @return
+     */
     @RequestMapping
-    public Object list(OperatorLogBean operatorLogBean, PagerBean pagerBean){
+    public Object list(OperatorLogBean operatorLogBean, PagerBean pagerBean) {
 
-        PagerBean<OperatorLogBean> operatorLogBeanPagerBean = this.operatorLogService.findPager(operatorLogBean,pagerBean);
+        PagerBean<OperatorLogBean> operatorLogBeanPagerBean = this.operatorLogService.findPager(operatorLogBean, pagerBean);
 
         List<Map> operatorLogMapList = new ArrayList<>();
 
-        operatorLogBeanPagerBean.getItems().forEach((e) ->{
-             Map operatorLogMap = MapBuilder.newBuilder()
-                                            .put("userCode",e.getUserCode())
-                                            .put("userRealname",e.getUserRealname())
-                                            .put("userAccount",e.getUserAccount())
-                                            .put("content",e.getContent())
-                                            .put("operatorNumber",e.getOperatorNumber())
-                                            .put("operatorCode",e.getOperatorCode())
-                                            .put("code",e.getCode())
-                                            .put("createTime",e.getCreateTime())
-                                            .put("updateTime",e.getUpdateTime())
-                                            .build();
-                    operatorLogMapList.add(operatorLogMap);
-             });
+        operatorLogBeanPagerBean.getItems().forEach((e) -> {
+            Map operatorLogMap = MapBuilder.newBuilder()
+                    .put("userCode", e.getUserCode())
+                    .put("userRealname", e.getUserRealname())
+                    .put("userAccount", e.getUserAccount())
+                    .put("content", e.getContent())
+                    .put("operatorNumber", e.getOperatorNumber())
+                    .put("operatorCode", e.getOperatorCode())
+                    .put("code", e.getCode())
+                    .put("createTime", e.getCreateTime())
+                    .put("updateTime", e.getUpdateTime())
+                    .build();
+            operatorLogMapList.add(operatorLogMap);
+        });
 
 
-                return ResponseBean.success("操作成功！").addData("operatorLogs",operatorLogMapList).addData("pager",operatorLogBeanPagerBean.simplePager());
+        return ResponseBean.success("操作成功！").addData("operatorLogs", operatorLogMapList).addData("pager", operatorLogBeanPagerBean.simplePager());
 
     }
 
 
-
     /**
-    * 查询详情
-    * TODO 待实现
-    * @param operatorLogBean 查询参数
-    * @return
-    */
+     * 查询详情
+     * TODO 待实现
+     *
+     * @param operatorLogBean 查询参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object detail(@Validated(ValidGroup.Detail.class) OperatorLogBean operatorLogBean,Errors errors){
+    public Object detail(@Validated(ValidGroup.Detail.class) OperatorLogBean operatorLogBean, Errors errors) {
 
-           operatorLogBean = this.operatorLogService.find(operatorLogBean);
+        operatorLogBean = this.operatorLogService.find(operatorLogBean);
 
-                if(operatorLogBean == null){
-                    return  ResponseBean.serverError("该记录不存在!");
-                }
+        if (operatorLogBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
 
-                Map operatorLogMap = MapBuilder.newBuilder()
-                        .put("userCode",operatorLogBean.getUserCode())
-                        .put("userRealname",operatorLogBean.getUserRealname())
-                        .put("userAccount",operatorLogBean.getUserAccount())
-                        .put("content",operatorLogBean.getContent())
-                        .put("operatorNumber",operatorLogBean.getOperatorNumber())
-                        .put("operatorCode",operatorLogBean.getOperatorCode())
-                        .put("code",operatorLogBean.getCode())
-                        .put("createTime",operatorLogBean.getCreateTime())
-                        .put("updateTime",operatorLogBean.getUpdateTime())
-                        .build();
+        Map operatorLogMap = MapBuilder.newBuilder()
+                .put("userCode", operatorLogBean.getUserCode())
+                .put("userRealname", operatorLogBean.getUserRealname())
+                .put("userAccount", operatorLogBean.getUserAccount())
+                .put("content", operatorLogBean.getContent())
+                .put("operatorNumber", operatorLogBean.getOperatorNumber())
+                .put("operatorCode", operatorLogBean.getOperatorCode())
+                .put("code", operatorLogBean.getCode())
+                .put("createTime", operatorLogBean.getCreateTime())
+                .put("updateTime", operatorLogBean.getUpdateTime())
+                .build();
 
-        return ResponseBean.success("操作成功！").addData("operatorLog",operatorLogMap);
+        return ResponseBean.success("操作成功！").addData("operatorLog", operatorLogMap);
 
     }
 
     /**
-    * 批量删除
-    * @param codes 删除唯一标识集合
-    * @return
-    */
+     * 批量删除
+     *
+     * @param codes 删除唯一标识集合
+     * @return
+     */
     @RequestMapping
-    public Object batchDelete(List<String> codes){
+    public Object batchDelete(List<String> codes) {
 
-        if(codes.isEmpty()){
-            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes","不能为空！").build();
+        if (codes.isEmpty()) {
+            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes", "不能为空！").build();
         }
 
-        try{
+        try {
             this.operatorLogService.batchDeleteByCodes(codes);
-        }catch (Exception e){
-            return  ResponseBean.serverError("操作失败！");
+        } catch (Exception e) {
+            return ResponseBean.serverError("操作失败！");
         }
 
 
         return ResponseBean.success("操作成功！");
     }
 
-    
 
 }

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/ProjectController.java

@@ -1,6 +1,7 @@
 package com.kuyuntech.vrv.platform.controller.core;
 
 import com.kuyuntech.vrv.coreapi.bean.core.ProjectBean;
+import com.kuyuntech.vrv.coreapi.bean.core.UserBean;
 import com.kuyuntech.vrv.coreapi.service.core.ProjectService;
 import com.wbspool.fastboot.core.common.bean.PagerBean;
 import com.wbspool.fastboot.core.common.bean.ResponseBean;
@@ -199,4 +200,23 @@ public class ProjectController {
         return ResponseBean.success("操作成功！");
     }
 
+    /**
+     * 绑定运营商
+     *
+     * @param
+     * @return
+     */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object bindOperator(ProjectBean projectBean) {
+
+        projectBean = this.projectService.bindOperator(projectBean);
+
+        if (projectBean == null) {
+            return ResponseBean.serverError("绑定失败！");
+        }
+
+        return ResponseBean.success("绑定成功！");
+    }
+
 }

sources/server/vrv/vrv-platform/src/main/java/com/kuyuntech/vrv/platform/controller/core/UserController.java

@@ -21,12 +21,9 @@ import java.util.List;
 import java.util.Map;
 
 
-
-
 /**
-* UserController
-*
-*/
+ * UserController
+ */
 @RestController
 public class UserController {
 
@@ -35,160 +32,161 @@ public class UserController {
     @Autowired
     UserService userService;
 
-    
 
     /**
-    * 新增
-    * TODO 待实现
-    * @param userBean 新增参数
-    * @return
-    *
-    */
+     * 新增  在新增用户的时候绑定角色
+     * TODO 待实现
+     *
+     * @param userBean 新增参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object add(@Validated(ValidGroup.Add.class) UserBean userBean){
+    public Object add(@Validated(ValidGroup.Add.class) UserBean userBean) {
 
-         userBean = this.userService.add(userBean);
+        userBean = this.userService.add(userBean);
 
+        if (userBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-         if (userBean == null) {
-               return ResponseBean.serverError("操作失败！");
-         }
-
-          return ResponseBean.success("操作成功！").addData("code", userBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", userBean.getCode());
 
     }
 
     /**
-    * 更新
-    * TODO 待实现
-    * @param userBean 更新参数
-    * @return
-    */
+     * 更新
+     * TODO 待实现
+     *
+     * @param userBean 更新参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object update(@Validated(ValidGroup.Update.class) UserBean userBean){
-
-       userBean = this.userService.update(userBean);
+    public Object update(@Validated(ValidGroup.Update.class) UserBean userBean) {
 
+        userBean = this.userService.update(userBean);
 
-       if (userBean == null) {
-           return ResponseBean.serverError("操作失败！");
-       }
+        if (userBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-       return ResponseBean.success("操作成功！").addData("code", userBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", userBean.getCode());
 
     }
 
 
     /**
-    * 删除
-    * TODO 待实现
-    * @param userBean 删除参数
-    * @return
-    */
+     * 删除
+     * TODO 待实现
+     *
+     * @param userBean 删除参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object delete(@Validated(ValidGroup.Delete.class) UserBean userBean){
+    public Object delete(@Validated(ValidGroup.Delete.class) UserBean userBean) {
 
-         userBean = this.userService.delete(userBean);
+        userBean = this.userService.delete(userBean);
 
-          if (userBean == null) {
-             return ResponseBean.serverError("操作失败！");
-          }
+        if (userBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！");
+        return ResponseBean.success("操作成功！");
 
     }
 
 
     /**
-    * 查询列表
-    * TODO 待实现
-    * @param userBean 查询参数
-    * @return
-    */
+     * 查询列表
+     * TODO 待实现
+     *
+     * @param userBean 查询参数
+     * @return
+     */
     @RequestMapping
-    public Object list(UserBean userBean, PagerBean pagerBean){
+    public Object list(UserBean userBean, PagerBean pagerBean) {
 
-        PagerBean<UserBean> userBeanPagerBean = this.userService.findPager(userBean,pagerBean);
+        PagerBean<UserBean> userBeanPagerBean = this.userService.findPager(userBean, pagerBean);
 
         List<Map> userMapList = new ArrayList<>();
 
-        userBeanPagerBean.getItems().forEach((e) ->{
-             Map userMap = MapBuilder.newBuilder()
-                                            .put("realname",e.getRealname())
-                                            .put("account",e.getAccount())
-                                            .put("phone",e.getPhone())
-                                            .put("password",e.getPassword())
-                                            .put("roleCode",e.getRoleCode())
-                                            .put("roleFlag",e.getRoleFlag())
-                                            .put("operatorCode",e.getOperatorCode())
-                                            .put("operatorNumber",e.getOperatorNumber())
-                                            .put("code",e.getCode())
-                                            .put("createTime",e.getCreateTime())
-                                            .put("updateTime",e.getUpdateTime())
-                                            .build();
-                    userMapList.add(userMap);
-             });
-
-
-                return ResponseBean.success("操作成功！").addData("users",userMapList).addData("pager",userBeanPagerBean.simplePager());
+        userBeanPagerBean.getItems().forEach((e) -> {
+            Map userMap = MapBuilder.newBuilder()
+                    .put("realname", e.getRealname())
+                    .put("account", e.getAccount())
+                    .put("phone", e.getPhone())
+                    .put("password", e.getPassword())
+                    .put("roleCode", e.getRoleCode())
+                    .put("roleFlag", e.getRoleFlag())
+                    .put("operatorCode", e.getOperatorCode())
+                    .put("operatorNumber", e.getOperatorNumber())
+                    .put("code", e.getCode())
+                    .put("createTime", e.getCreateTime())
+                    .put("updateTime", e.getUpdateTime())
+                    .build();
+            userMapList.add(userMap);
+        });
+
+
+        return ResponseBean.success("操作成功！").addData("users", userMapList).addData("pager", userBeanPagerBean.simplePager());
 
     }
 
 
-
     /**
-    * 查询详情
-    * TODO 待实现
-    * @param userBean 查询参数
-    * @return
-    */
+     * 查询详情
+     * TODO 待实现
+     *
+     * @param userBean 查询参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object detail(@Validated(ValidGroup.Detail.class) UserBean userBean,Errors errors){
-
-           userBean = this.userService.find(userBean);
-
-                if(userBean == null){
-                    return  ResponseBean.serverError("该记录不存在!");
-                }
-
-                Map userMap = MapBuilder.newBuilder()
-                        .put("realname",userBean.getRealname())
-                        .put("account",userBean.getAccount())
-                        .put("phone",userBean.getPhone())
-                        .put("password",userBean.getPassword())
-                        .put("roleCode",userBean.getRoleCode())
-                        .put("roleFlag",userBean.getRoleFlag())
-                        .put("operatorCode",userBean.getOperatorCode())
-                        .put("operatorNumber",userBean.getOperatorNumber())
-                        .put("code",userBean.getCode())
-                        .put("createTime",userBean.getCreateTime())
-                        .put("updateTime",userBean.getUpdateTime())
-                        .build();
-
-        return ResponseBean.success("操作成功！").addData("user",userMap);
+    public Object detail(@Validated(ValidGroup.Detail.class) UserBean userBean, Errors errors) {
+
+        userBean = this.userService.find(userBean);
+
+        if (userBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
+
+        Map userMap = MapBuilder.newBuilder()
+                .put("realname", userBean.getRealname())
+                .put("account", userBean.getAccount())
+                .put("phone", userBean.getPhone())
+                .put("password", userBean.getPassword())
+                .put("roleCode", userBean.getRoleCode())
+                .put("roleFlag", userBean.getRoleFlag())
+                .put("operatorCode", userBean.getOperatorCode())
+                .put("operatorNumber", userBean.getOperatorNumber())
+                .put("code", userBean.getCode())
+                .put("createTime", userBean.getCreateTime())
+                .put("updateTime", userBean.getUpdateTime())
+                .build();
+
+        return ResponseBean.success("操作成功！").addData("user", userMap);
 
     }
 
     /**
-    * 批量删除
-    * @param codes 删除唯一标识集合
-    * @return
-    */
+     * 批量删除
+     *
+     * @param codes 删除唯一标识集合
+     * @return
+     */
     @RequestMapping
-    public Object batchDelete(List<String> codes){
+    public Object batchDelete(List<String> codes) {
 
-        if(codes.isEmpty()){
-            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes","不能为空！").build();
+        if (codes.isEmpty()) {
+            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes", "不能为空！").build();
         }
 
-        try{
+        try {
             this.userService.batchDeleteByCodes(codes);
-        }catch (Exception e){
-            return  ResponseBean.serverError("操作失败！");
+        } catch (Exception e) {
+            return ResponseBean.serverError("操作失败！");
         }
 
 
@@ -198,6 +196,7 @@ public class UserController {
 
     /**
      * 绑定角色
+     *
      * @param userBean
      * @return
      */

sources/server/vrv/vrv-platform/src/main/resources/static/device-params.json

@@ -0,0 +1,111 @@
+{
+  "devices": [
+    {
+      "deviceId": "CK1",
+      "deviceState": 1,
+      "deviceData": {
+        "WD_1": 0.0,
+        "SD_1": 0.0,
+        "WD_SD": 0.0,
+        "SD_SD": 0.0,
+        "WD1_XZ": 0.0,
+        "SD1_XZ": 0.0,
+        "ZL_P": 0.0,
+        "ZL_I": 0.0,
+        "CS_P": 0.0,
+        "CS_I": 0.0,
+        "JR_P": 0.0,
+        "JR_I": 0.0,
+        "JS_P": 0.0,
+        "JS_I": 0.0,
+        "RSF_SDKD": 0.0,
+        "LSF_SDKD": 0.0,
+        "JSF_SDKD": 0.0,
+        "LSF": 0.0,
+        "RSF": 0.0,
+        "JSF": 0.0,
+        "HSL_SD": 0.0,
+        "HSL": 0.0,
+        "QF_YSBJ": 0,
+        "JZ_YSTZ": 0,
+        "SFJ_YSQD": 0,
+        "PFJ_YSQD": 0,
+        "QD_XQ": 0,
+        "QD_S": 0,
+        "QD_F": 0,
+        "QD_S": 0,
+        "TZ_XQ": 0,
+        "TZ_S": 0,
+        "TZ_F": 0,
+        "TZ_S": 0,
+        "MS_XZ": 0,
+        "JZ_XZ": 0,
+        "JZ_KGJ": 0,
+        "DS_QT": 0,
+        "GZ_FW": 0,
+        "SFF_SZXZ": 0,
+        "SFF_SDQD": 0,
+        "PFF_SZXZ": 0,
+        "PFF_SDQD": 0,
+        "SFJ_SZXZ": 0,
+        "SFJ_SDQD": 0,
+        "PFJ_SZXZ": 0,
+        "PFJ_SDQD": 0,
+        "FLZJ_SZXZ": 0,
+        "FLZJ_SDQD": 0,
+        "YJDJR_SZXZ": 0,
+        "YJDJR_SDQD": 0,
+        "EJDJR_SZXZ": 0,
+        "EJDJR_SDQD": 0,
+        "SJDJR_SZXZ": 0,
+        "SJDJR_SDQD": 0,
+        "RSF_SZXZ": 0,
+        "LSF_SZXZ": 0,
+        "JSF_SZXZ": 0,
+        "HF_CC": 0,
+        "WS_YXXZ": 0,
+        "DX_XZ": 0,
+        "WD_GBJ": 0,
+        "WD_DBJ": 0,
+        "SD_GBJ": 0,
+        "SD_DBJ": 0,
+        "LWDS_CX": 0,
+        "LWDS_ZX": 0,
+        "SFJ_GZ": 0,
+        "PFJ_GZ": 0,
+        "FLZJ_GZ": 0,
+        "GW_BJ": 0,
+        "QFYC_BJ": 0,
+        "JZ_JT": 0,
+        "JZ_YX": 0,
+        "JZ_GZ": 0,
+        "SFJ_QT": 0,
+        "PFJ_QT": 0,
+        "YJDJR_QT": 0,
+        "EJDJR_QT": 0,
+        "SJDJR_QT": 0,
+        "SFF_KGKZ": 0,
+        "PFF_KGKZ": 0,
+        "FLZJ_QT": 0,
+        "WD_2": 0.0,
+        "SD_2": 0.0,
+        "SFJ_PLSD": 0.0,
+        "PFJ_PLSD": 0.0,
+        "SFJ_PLFH": 0.0,
+        "PFJ_PLFH": 0.0,
+        "SFJ_PLSX": 0.0,
+        "SFJ_PLXX": 0.0,
+        "PFJ_PLSX": 0.0,
+        "PFJ_PLXX": 0.0,
+        "WDBJ_SX": 0.0,
+        "WDBJ_XX": 0.0,
+        "SDBJ_SX": 0.0,
+        "SDBJ_XX": 0.0,
+        "SFJ_PLXZ": 0.0,
+        "PFJ_PLXZ": 0.0
+      }
+    }
+  ]
+}
+
+