1

sources/server/vrv/vrv-core-api/src/main/java/com/kuyuntech/vrv/coreapi/bean/core/DeviceParamBean.java

@@ -44,6 +44,8 @@ public class DeviceParamBean  implements Serializable {
 
     private String value ;
 
+    private String mode ;
+
     private Long id ;
 
     private Long version ;

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

@@ -103,4 +103,6 @@ public interface UserService  {
     UserBean bindRole(UserBean userBean);
 
     boolean updateUserPassword(UserBean userBean, String newPassword);
+
+    UserBean bindOperator(UserBean userBean);
 }

sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/controller/core/DeviceController.java

@@ -0,0 +1,205 @@
+package com.kuyuntech.vrv.corerestful.controller.core;
+
+import com.kuyuntech.vrv.coreapi.service.core.DeviceService;
+import com.kuyuntech.vrv.coreapi.bean.core.DeviceBean;
+import com.wbspool.fastboot.core.common.bean.ResponseBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.wbspool.fastboot.core.web.result.ParamErrorResultBuilder;
+import com.wbspool.fastboot.core.common.bean.PagerBean;
+import java.util.Map;
+import com.wbspool.fastboot.core.common.builder.MapBuilder;
+import com.wbspool.fastboot.core.web.annotation.ParamErrorAutoResponse;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.validation.Errors;
+import com.wbspool.fastboot.core.common.constant.ValidGroup;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+
+/**
+* DeviceController
+*
+*/
+@RestController
+public class DeviceController {
+
+    private static final Logger logger = LoggerFactory.getLogger(DeviceController.class);
+
+    @Autowired
+    DeviceService deviceService;
+
+    
+
+    /**
+    * 新增
+    * TODO 待实现
+    * @param deviceBean 新增参数
+    * @return
+    *
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object add(@Validated(ValidGroup.Add.class) DeviceBean deviceBean){
+
+         deviceBean = this.deviceService.add(deviceBean);
+
+
+         if (deviceBean == null) {
+               return ResponseBean.serverError("操作失败！");
+         }
+
+          return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
+
+    }
+
+    /**
+    * 更新
+    * TODO 待实现
+    * @param deviceBean 更新参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object update(@Validated(ValidGroup.Update.class) DeviceBean deviceBean){
+
+       deviceBean = this.deviceService.update(deviceBean);
+
+
+       if (deviceBean == null) {
+           return ResponseBean.serverError("操作失败！");
+       }
+
+       return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
+
+    }
+
+
+    /**
+    * 删除
+    * TODO 待实现
+    * @param deviceBean 删除参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object delete(@Validated(ValidGroup.Delete.class) DeviceBean deviceBean){
+
+         deviceBean = this.deviceService.delete(deviceBean);
+
+          if (deviceBean == null) {
+             return ResponseBean.serverError("操作失败！");
+          }
+
+          return ResponseBean.success("操作成功！");
+
+    }
+
+
+    /**
+    * 查询列表
+    * TODO 待实现
+    * @param deviceBean 查询参数
+    * @return
+    */
+    @RequestMapping
+    public Object list(DeviceBean deviceBean, PagerBean pagerBean){
+
+        PagerBean<DeviceBean> deviceBeanPagerBean = this.deviceService.findPager(deviceBean,pagerBean);
+
+        List<Map> deviceMapList = new ArrayList<>();
+
+        deviceBeanPagerBean.getItems().forEach((e) ->{
+             Map deviceMap = MapBuilder.newBuilder()
+                                            .put("name",e.getName())
+                                            .put("ip",e.getIp())
+                                            .put("sn",e.getSn())
+                                            .put("type",e.getType())
+                                            .put("operatorNumber",e.getOperatorNumber())
+                                            .put("operatorCode",e.getOperatorCode())
+                                            .put("projectNumber",e.getProjectNumber())
+                                            .put("projectCode",e.getProjectCode())
+                                            .put("gatewayNumber",e.getGatewayNumber())
+                                            .put("gatewayCode",e.getGatewayCode())
+                                            .put("deviceStatus",e.getDeviceStatus())
+                                            .put("code",e.getCode())
+                                            .put("createTime",e.getCreateTime())
+                                            .put("updateTime",e.getUpdateTime())
+                                            .build();
+                    deviceMapList.add(deviceMap);
+             });
+
+
+                return ResponseBean.success("操作成功！").addData("devices",deviceMapList).addData("pager",deviceBeanPagerBean.simplePager());
+
+    }
+
+
+
+    /**
+    * 查询详情
+    * TODO 待实现
+    * @param deviceBean 查询参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object detail(@Validated(ValidGroup.Detail.class) DeviceBean deviceBean,Errors errors){
+
+           deviceBean = this.deviceService.find(deviceBean);
+
+                if(deviceBean == null){
+                    return  ResponseBean.serverError("该记录不存在!");
+                }
+
+                Map deviceMap = MapBuilder.newBuilder()
+                        .put("name",deviceBean.getName())
+                        .put("ip",deviceBean.getIp())
+                        .put("sn",deviceBean.getSn())
+                        .put("type",deviceBean.getType())
+                        .put("operatorNumber",deviceBean.getOperatorNumber())
+                        .put("operatorCode",deviceBean.getOperatorCode())
+                        .put("projectNumber",deviceBean.getProjectNumber())
+                        .put("projectCode",deviceBean.getProjectCode())
+                        .put("gatewayNumber",deviceBean.getGatewayNumber())
+                        .put("gatewayCode",deviceBean.getGatewayCode())
+                        .put("deviceStatus",deviceBean.getDeviceStatus())
+                        .put("code",deviceBean.getCode())
+                        .put("createTime",deviceBean.getCreateTime())
+                        .put("updateTime",deviceBean.getUpdateTime())
+                        .build();
+
+        return ResponseBean.success("操作成功！").addData("device",deviceMap);
+
+    }
+
+    /**
+    * 批量删除
+    * @param codes 删除唯一标识集合
+    * @return
+    */
+    @RequestMapping
+    public Object batchDelete(List<String> codes){
+
+        if(codes.isEmpty()){
+            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes","不能为空！").build();
+        }
+
+        try{
+            this.deviceService.batchDeleteByCodes(codes);
+        }catch (Exception e){
+            return  ResponseBean.serverError("操作失败！");
+        }
+
+
+        return ResponseBean.success("操作成功！");
+    }
+
+    
+
+}

sources/server/vrv/vrv-core-restful/src/main/java/com/kuyuntech/vrv/corerestful/controller/core/VerifyCodeController.java

@@ -0,0 +1,191 @@
+package com.kuyuntech.vrv.corerestful.controller.core;
+
+import com.kuyuntech.vrv.coreapi.service.core.VerifyCodeService;
+import com.kuyuntech.vrv.coreapi.bean.core.VerifyCodeBean;
+import com.wbspool.fastboot.core.common.bean.ResponseBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.wbspool.fastboot.core.web.result.ParamErrorResultBuilder;
+import com.wbspool.fastboot.core.common.bean.PagerBean;
+import java.util.Map;
+import com.wbspool.fastboot.core.common.builder.MapBuilder;
+import com.wbspool.fastboot.core.web.annotation.ParamErrorAutoResponse;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.validation.Errors;
+import com.wbspool.fastboot.core.common.constant.ValidGroup;
+import java.util.ArrayList;
+import java.util.List;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+
+
+/**
+* VerifyCodeController
+*
+*/
+@RestController
+public class VerifyCodeController {
+
+    private static final Logger logger = LoggerFactory.getLogger(VerifyCodeController.class);
+
+    @Autowired
+    VerifyCodeService verifyCodeService;
+
+    
+
+    /**
+    * 新增
+    * TODO 待实现
+    * @param verifyCodeBean 新增参数
+    * @return
+    *
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object add(@Validated(ValidGroup.Add.class) VerifyCodeBean verifyCodeBean){
+
+         verifyCodeBean = this.verifyCodeService.add(verifyCodeBean);
+
+
+         if (verifyCodeBean == null) {
+               return ResponseBean.serverError("操作失败！");
+         }
+
+          return ResponseBean.success("操作成功！").addData("code", verifyCodeBean.getCode());
+
+    }
+
+    /**
+    * 更新
+    * TODO 待实现
+    * @param verifyCodeBean 更新参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object update(@Validated(ValidGroup.Update.class) VerifyCodeBean verifyCodeBean){
+
+       verifyCodeBean = this.verifyCodeService.update(verifyCodeBean);
+
+
+       if (verifyCodeBean == null) {
+           return ResponseBean.serverError("操作失败！");
+       }
+
+       return ResponseBean.success("操作成功！").addData("code", verifyCodeBean.getCode());
+
+    }
+
+
+    /**
+    * 删除
+    * TODO 待实现
+    * @param verifyCodeBean 删除参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object delete(@Validated(ValidGroup.Delete.class) VerifyCodeBean verifyCodeBean){
+
+         verifyCodeBean = this.verifyCodeService.delete(verifyCodeBean);
+
+          if (verifyCodeBean == null) {
+             return ResponseBean.serverError("操作失败！");
+          }
+
+          return ResponseBean.success("操作成功！");
+
+    }
+
+
+    /**
+    * 查询列表
+    * TODO 待实现
+    * @param verifyCodeBean 查询参数
+    * @return
+    */
+    @RequestMapping
+    public Object list(VerifyCodeBean verifyCodeBean, PagerBean pagerBean){
+
+        PagerBean<VerifyCodeBean> verifyCodeBeanPagerBean = this.verifyCodeService.findPager(verifyCodeBean,pagerBean);
+
+        List<Map> verifyCodeMapList = new ArrayList<>();
+
+        verifyCodeBeanPagerBean.getItems().forEach((e) ->{
+             Map verifyCodeMap = MapBuilder.newBuilder()
+                                            .put("type",e.getType())
+                                            .put("verifyCode",e.getVerifyCode())
+                                            .put("expireTime",e.getExpireTime())
+                                            .put("verified",e.getVerified())
+                                            .put("code",e.getCode())
+                                            .put("createTime",e.getCreateTime())
+                                            .put("updateTime",e.getUpdateTime())
+                                            .build();
+                    verifyCodeMapList.add(verifyCodeMap);
+             });
+
+
+                return ResponseBean.success("操作成功！").addData("verifyCodes",verifyCodeMapList).addData("pager",verifyCodeBeanPagerBean.simplePager());
+
+    }
+
+
+
+    /**
+    * 查询详情
+    * TODO 待实现
+    * @param verifyCodeBean 查询参数
+    * @return
+    */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object detail(@Validated(ValidGroup.Detail.class) VerifyCodeBean verifyCodeBean,Errors errors){
+
+           verifyCodeBean = this.verifyCodeService.find(verifyCodeBean);
+
+                if(verifyCodeBean == null){
+                    return  ResponseBean.serverError("该记录不存在!");
+                }
+
+                Map verifyCodeMap = MapBuilder.newBuilder()
+                        .put("type",verifyCodeBean.getType())
+                        .put("verifyCode",verifyCodeBean.getVerifyCode())
+                        .put("expireTime",verifyCodeBean.getExpireTime())
+                        .put("verified",verifyCodeBean.getVerified())
+                        .put("code",verifyCodeBean.getCode())
+                        .put("createTime",verifyCodeBean.getCreateTime())
+                        .put("updateTime",verifyCodeBean.getUpdateTime())
+                        .build();
+
+        return ResponseBean.success("操作成功！").addData("verifyCode",verifyCodeMap);
+
+    }
+
+    /**
+    * 批量删除
+    * @param codes 删除唯一标识集合
+    * @return
+    */
+    @RequestMapping
+    public Object batchDelete(List<String> codes){
+
+        if(codes.isEmpty()){
+            return ParamErrorResultBuilder.newBuilder().message("未选择任何删除记录！").paramError("codes","不能为空！").build();
+        }
+
+        try{
+            this.verifyCodeService.batchDeleteByCodes(codes);
+        }catch (Exception e){
+            return  ResponseBean.serverError("操作失败！");
+        }
+
+
+        return ResponseBean.success("操作成功！");
+    }
+
+    
+
+}

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

@@ -0,0 +1,24 @@
+package com.kuyuntech.vrv.coreservice.dao.core;
+
+import com.kuyuntech.vrv.coreservice.domain.core.VerifyCode;
+import com.wbspool.fastboot.core.jpa.repository.FastbootRepository;
+
+
+
+
+/**
+ * VerifyCodeDao
+ *
+ */
+public interface VerifyCodeDao extends FastbootRepository<VerifyCode,Long> {
+
+    
+
+   
+   VerifyCode findByCodeAndValid(String code,Short valid);
+   
+
+   
+
+
+}

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/domain/core/DeviceParam.java

@@ -39,4 +39,13 @@ public class DeviceParam extends FastbootEntity {
 
     @Column(columnDefinition = "varchar(255) COMMENT '关联网关'")
     private String gatewayCode;
+
+    @Column(columnDefinition = "varchar(255) COMMENT '参数名'")
+    private String name;
+
+    @Column(columnDefinition = "varchar(255) COMMENT '参数值'")
+    private String value;
+
+    @Column(columnDefinition = "varchar(255) COMMENT '选择模式'")
+    private String mode;
 }

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/LoginRecordMapper.java

@@ -0,0 +1,15 @@
+package com.kuyuntech.vrv.coreservice.mapper.core;
+
+import org.apache.ibatis.annotations.Mapper;
+
+
+
+/**
+ * LoginRecordMapper
+ *
+ */
+@Mapper
+public interface LoginRecordMapper {
+
+
+}

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/LoginRecordMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kuyuntech.vrv.coreservice.mapper.core.LoginRecordMapper">
+</mapper>

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/VerifyCodeMapper.java

@@ -0,0 +1,15 @@
+package com.kuyuntech.vrv.coreservice.mapper.core;
+
+import org.apache.ibatis.annotations.Mapper;
+
+
+
+/**
+ * VerifyCodeMapper
+ *
+ */
+@Mapper
+public interface VerifyCodeMapper {
+
+
+}

sources/server/vrv/vrv-core-service/src/main/java/com/kuyuntech/vrv/coreservice/mapper/core/VerifyCodeMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.kuyuntech.vrv.coreservice.mapper.core.VerifyCodeMapper">
+</mapper>

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

@@ -235,6 +235,15 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
             if (StringUtils.isNotBlank(deviceAlarmRecordBean.getRecordCondition())) {
                 detachedCriteria.add(Restrictions.like("recordCondition", deviceAlarmRecordBean.getRecordCondition(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getStartTime())) {
+                detachedCriteria.add(Restrictions.like("startTime", deviceAlarmRecordBean.getStartTime(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getEndTime())) {
+                detachedCriteria.add(Restrictions.like("endTime", deviceAlarmRecordBean.getEndTime(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getStatus())) {
+                detachedCriteria.add(Restrictions.eq("status", deviceAlarmRecordBean.getStatus()));
+            }
         }
 
 

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

@@ -4,6 +4,7 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 import com.kuyuntech.vrv.coreapi.service.core.DeviceAlarmRepairRecordService;
 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.DeviceAlarmRepairRecordBean;
@@ -212,6 +213,28 @@ public class DeviceAlarmRepairRecordServiceImpl extends AbstractFastbootService<
       */
      private static DetachedCriteria createListCriteria(DeviceAlarmRepairRecordBean deviceAlarmRepairRecordBean){
          DetachedCriteria detachedCriteria = DetachedCriteria.forClass(DeviceAlarmRepairRecord.class);
+
+         if (deviceAlarmRepairRecordBean != null) {
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getSn())) {
+                 detachedCriteria.add(Restrictions.like("sn", deviceAlarmRepairRecordBean.getSn(), MatchMode.ANYWHERE));
+             }
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getRepairName())) {
+                 detachedCriteria.add(Restrictions.like("repairName", deviceAlarmRepairRecordBean.getRepairName(), MatchMode.ANYWHERE));
+             }
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getRepairType())) {
+                 detachedCriteria.add(Restrictions.like("repairType", deviceAlarmRepairRecordBean.getRepairType(), MatchMode.ANYWHERE));
+             }
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getLastCreateTime())) {
+                 detachedCriteria.add(Restrictions.eq("lastCreateTime", deviceAlarmRepairRecordBean.getLastCreateTime()));
+             }
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getPromptInterval())) {
+                 detachedCriteria.add(Restrictions.like("promptInterval", deviceAlarmRepairRecordBean.getPromptInterval(), MatchMode.ANYWHERE));
+             }
+             if (StringUtils.isNotBlank(deviceAlarmRepairRecordBean.getStatus())) {
+                 detachedCriteria.add(Restrictions.eq("status", deviceAlarmRepairRecordBean.getStatus()));
+             }
+         }
+
          detachedCriteria.add(Restrictions.eq("valid",VALID));
          return  detachedCriteria;
      }

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

@@ -0,0 +1,263 @@
+package com.kuyuntech.vrv.coreservice.service.core.impl;
+
+
+import com.kuyuntech.vrv.coreapi.service.core.DeviceService;
+import com.kuyuntech.vrv.coreapi.service.core.GatewayService;
+import com.kuyuntech.vrv.coreapi.service.core.OperatorService;
+import com.kuyuntech.vrv.coreapi.service.core.ProjectService;
+import com.kuyuntech.vrv.coreservice.dao.core.DeviceDao;
+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.Gateway;
+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;
+import org.springframework.transaction.annotation.Transactional;
+import com.kuyuntech.vrv.coreapi.bean.core.DeviceBean;
+import com.kuyuntech.vrv.coreservice.domain.core.Device;
+import com.wbspool.fastboot.core.common.bean.PagerBean;
+
+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 org.apache.commons.lang3.StringUtils;
+import org.hibernate.criterion.DetachedCriteria;
+import org.hibernate.criterion.Restrictions;
+
+import java.util.ArrayList;
+
+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.*;
+
+
+/**
+ * DeviceService
+ */
+@Service("deviceService")
+@Transactional(rollbackFor = Exception.class, transactionManager = "vrvCoreServiceTransactionManager")
+public class DeviceServiceImpl extends AbstractFastbootService<Device, DeviceBean> implements DeviceService {
+
+    private static final Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class);
+
+    @Autowired
+    DeviceDao deviceDao;
+    @Autowired
+    OperatorDao operatorDao;
+    @Autowired
+    ProjectDao projectDao;
+    @Autowired
+    GatewayDao gatewayDao;
+
+
+    @Override
+    public DeviceBean add(DeviceBean deviceBean) {
+
+        Device device = new Device();
+        beanToDomain(deviceBean, device, "id");
+
+        String operatorNumber = deviceBean.getOperatorNumber();
+        String projectNumber = deviceBean.getProjectNumber();
+        String gatewayNumber = deviceBean.getGatewayNumber();
+
+        if ((operatorNumber == null || operatorNumber == "") && (projectNumber == null || projectNumber == "") && (gatewayNumber == null || gatewayNumber == "")) {
+
+            deviceDao.save(device);
+
+            domainToBean(device, deviceBean);
+
+            return deviceBean;
+        }
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+        Project project = projectDao.findByNumberAndValid(projectNumber, VALID);
+        Gateway gateway = gatewayDao.findByNumberAndValid(gatewayNumber, VALID);
+
+        device.setOperatorCode(operator.getCode());
+        device.setProjectCode(project.getCode());
+        device.setGatewayCode(gateway.getCode());
+
+        deviceDao.save(device);
+
+        domainToBean(device, deviceBean);
+
+        return deviceBean;
+
+    }
+
+    @Override
+    public DeviceBean update(DeviceBean deviceBean) {
+
+        if (deviceBean == null) {
+            return null;
+        }
+
+
+        Device device = deviceDao.findByCodeAndValid(deviceBean.getCode(), VALID);
+
+
+        if (device == null) {
+            return null;
+        }
+
+        beanToDomain(deviceBean, device, "id", "code", "version", "createTime", "updateTime", "valid");
+
+        deviceDao.save(device);
+
+        domainToBean(device, deviceBean);
+
+        return deviceBean;
+    }
+
+    @Override
+    public DeviceBean delete(DeviceBean deviceBean) {
+
+        if (deviceBean == null) {
+            return null;
+        }
+
+
+        Device device = deviceDao.findByCodeAndValid(deviceBean.getCode(), VALID);
+
+
+        if (device == null) {
+            return null;
+        }
+
+
+        device.setValid(INVALID);
+        deviceDao.save(device);
+
+
+        domainToBean(device, deviceBean);
+
+        return deviceBean;
+    }
+
+    @Override
+    public DeviceBean find(DeviceBean deviceBean) {
+        if (deviceBean == null) {
+            return null;
+        }
+
+
+        Device device = deviceDao.findByCodeAndValid(deviceBean.getCode(), VALID);
+
+
+        if (device == null) {
+            return null;
+        }
+        BeanUtils.copyProperties(device, deviceBean);
+        return deviceBean;
+    }
+
+    @Override
+    public DeviceBean find(String code) {
+        return this.find(DeviceBean.builder().code(code).build());
+    }
+
+    @Override
+    public List<DeviceBean> findAll(DeviceBean deviceBean, PagerBean pagerBean) {
+        List<DeviceBean> deviceBeans = new ArrayList<>();
+        DetachedCriteria detachedCriteria = createListCriteria(deviceBean);
+        List<Device> devices = deviceDao.findAll(detachedCriteria, pagerBean);
+        for (Device device : devices) {
+            DeviceBean deviceBeanTemp = new DeviceBean();
+            domainToBean(device, deviceBeanTemp);
+            deviceBeans.add(deviceBeanTemp);
+        }
+        return deviceBeans;
+    }
+
+    @Override
+    public List<DeviceBean> findAll(DeviceBean deviceBean) {
+        return this.findAll(deviceBean, null);
+    }
+
+    @Override
+    public Long countAll(DeviceBean deviceBean) {
+        DetachedCriteria detachedCriteria = createListCriteria(deviceBean);
+        return deviceDao.countAll(detachedCriteria);
+    }
+
+    @Override
+    public PagerBean<DeviceBean> findPager(DeviceBean deviceBean, PagerBean pagerBean) {
+        List<DeviceBean> deviceBeans = this.findAll(deviceBean, pagerBean);
+        Long count = this.countAll(deviceBean);
+        PagerBean<DeviceBean> devicePageBean = new PagerBean<>();
+        BeanUtils.copyProperties(pagerBean, devicePageBean);
+        devicePageBean.setItemCount(count.intValue());
+        devicePageBean.init();
+        devicePageBean.setItems(deviceBeans);
+        return devicePageBean;
+    }
+
+    /**
+     * 创建列表查询条件
+     *
+     * @param deviceBean 查询参数
+     * @return
+     */
+    private static DetachedCriteria createListCriteria(DeviceBean deviceBean) {
+        DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Device.class);
+
+        if (deviceBean != null) {
+            if (StringUtils.isNotBlank(deviceBean.getSn())) {
+                detachedCriteria.add(Restrictions.like("sn", deviceBean.getSn(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceBean.getIp())) {
+                detachedCriteria.add(Restrictions.like("ip", deviceBean.getIp(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceBean.getName())) {
+                detachedCriteria.add(Restrictions.like("name", deviceBean.getName(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceBean.getType())) {
+                detachedCriteria.add(Restrictions.like("type", deviceBean.getType(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceBean.getDeviceStatus())) {
+                detachedCriteria.add(Restrictions.eq("deviceStatus", deviceBean.getDeviceStatus()));
+            }
+
+        }
+
+        detachedCriteria.add(Restrictions.eq("valid", VALID));
+        return detachedCriteria;
+    }
+
+
+    @Override
+    public void batchDelete(List<DeviceBean> deviceBean) {
+        if (deviceBean.isEmpty()) {
+            return;
+        }
+        List<String> codes = new ArrayList<>();
+        deviceBean.forEach((e) -> {
+            codes.add(e.getCode());
+        });
+        batchDeleteByCodes(codes);
+
+    }
+
+
+    @Override
+    public void batchDeleteByCodes(List<String> codes) {
+
+        if (codes.isEmpty()) {
+            return;
+        }
+
+        for (String code : codes) {
+            Assert.notNull(this.delete(DeviceBean.builder().code(code).build()), "batch delete by codes error! ");
+        }
+
+    }
+
+
+}

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

@@ -61,7 +61,7 @@ public class GatewayServiceImpl extends AbstractFastbootService<Gateway, Gateway
         String operatorNumber = gatewayBean.getOperatorNumber();
         String projectNumber = gatewayBean.getProjectNumber();
 
-        if ((operatorNumber == null || operatorNumber == "") && (projectNumber == null || projectNumber == "")){
+        if ((operatorNumber == null || operatorNumber == "") && (projectNumber == null || projectNumber == "")) {
 
             gatewayDao.save(gateway);
 
@@ -210,6 +210,9 @@ public class GatewayServiceImpl extends AbstractFastbootService<Gateway, Gateway
             if (StringUtils.isNotBlank(gatewayBean.getLocation())) {
                 detachedCriteria.add(Restrictions.like("location", gatewayBean.getLocation(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(gatewayBean.getUseStatus())) {
+                detachedCriteria.add(Restrictions.eq("useStatus", gatewayBean.getUseStatus()));
+            }
         }
 
         detachedCriteria.add(Restrictions.eq("valid", VALID));

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

@@ -188,6 +188,12 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator, Opera
             if (StringUtils.isNotBlank(operatorBean.getTel())) {
                 detachedCriteria.add(Restrictions.like("tel", operatorBean.getTel(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(operatorBean.getStatus())) {
+                detachedCriteria.add(Restrictions.eq("status", operatorBean.getStatus()));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getNumber())) {
+                detachedCriteria.add(Restrictions.like("number", operatorBean.getNumber(), MatchMode.ANYWHERE));
+            }
         }
 
         detachedCriteria.add(Restrictions.eq("valid", VALID));

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

@@ -215,6 +215,9 @@ public class ProjectServiceImpl extends AbstractFastbootService<Project, Project
             if (StringUtils.isNotBlank(projectBean.getCustomerTel())) {
                 detachedCriteria.add(Restrictions.like("customerTel ", projectBean.getCustomerTel(), MatchMode.ANYWHERE));
             }
+            if (StringUtils.isNotBlank(projectBean.getNumber())) {
+                detachedCriteria.add(Restrictions.like("number", projectBean.getNumber(), MatchMode.ANYWHERE));
+            }
         }
 
 

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

@@ -3,6 +3,8 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 import com.kuyuntech.vrv.coreapi.service.core.RolePowerService;
 import com.kuyuntech.vrv.coreservice.dao.core.RolePowerDao;
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.RolePowerBean;
@@ -164,6 +166,16 @@ public class RolePowerServiceImpl extends AbstractFastbootService<RolePower, Rol
      */
     private static DetachedCriteria createListCriteria(RolePowerBean rolePowerBean) {
         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(RolePower.class);
+
+        if (rolePowerBean != null) {
+            if (StringUtils.isNotBlank(rolePowerBean.getPowerFlag())) {
+                detachedCriteria.add(Restrictions.eq("powerFlag", rolePowerBean.getPowerFlag()));
+            }
+            if (StringUtils.isNotBlank(rolePowerBean.getRoleFlag())) {
+                detachedCriteria.add(Restrictions.eq("roleFlag", rolePowerBean.getRoleFlag()));
+            }
+        }
+
         detachedCriteria.add(Restrictions.eq("valid", VALID));
         return detachedCriteria;
     }
@@ -197,6 +209,4 @@ public class RolePowerServiceImpl extends AbstractFastbootService<RolePower, Rol
     }
 
 
-
-
 }

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

@@ -3,8 +3,10 @@ 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.coreservice.dao.core.OperatorDao;
 import com.kuyuntech.vrv.coreservice.dao.core.RoleDao;
 import com.kuyuntech.vrv.coreservice.dao.core.UserDao;
+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 com.wbspool.fastboot.core.common.bean.PagerBean;
@@ -42,6 +44,8 @@ public class UserServiceImpl extends AbstractFastbootService<User, UserBean> imp
 
     @Autowired
     RoleDao roleDao;
+    @Autowired
+    OperatorDao operatorDao;
 
     @Override
     public UserBean add(UserBean userBean) {
@@ -298,5 +302,31 @@ public class UserServiceImpl extends AbstractFastbootService<User, UserBean> imp
         return true;
     }
 
+    @Override
+    public UserBean bindOperator(UserBean userBean) {
+        if (userBean == null) {
+            return null;
+        }
+
+        User user = userDao.findByCodeAndValid(userBean.getCode(), VALID);
+
+        if (user == null) {
+            return null;
+        }
+
+        String operatorNumber = userBean.getOperatorNumber();
+
+        Operator operator = operatorDao.findByNumberAndValid(operatorNumber, VALID);
+
+        user.setOperatorCode(operator.getCode());
+        user.setOperatorNumber(userBean.getOperatorNumber());
+
+        userDao.save(user);
+
+        domainToBean(user, userBean);
+
+        return userBean;
+    }
+
 
 }

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

@@ -21,12 +21,9 @@ import java.util.List;
 import java.util.Map;
 
 
-
-
 /**
-* DeviceAlarmRecordController
-*
-*/
+ * DeviceAlarmRecordController
+ */
 @RestController
 public class DeviceAlarmRecordController {
 
@@ -35,184 +32,186 @@ public class DeviceAlarmRecordController {
     @Autowired
     DeviceAlarmRecordService deviceAlarmRecordService;
 
-    
 
     /**
-    * 新增
-    * TODO 待实现
-    * @param deviceAlarmRecordBean 新增参数
-    * @return
-    *
-    */
+     * 新增
+     * TODO 待实现
+     *
+     * @param deviceAlarmRecordBean 新增参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object add(@Validated(ValidGroup.Add.class) DeviceAlarmRecordBean deviceAlarmRecordBean){
+    public Object add(@Validated(ValidGroup.Add.class) DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
-         deviceAlarmRecordBean = this.deviceAlarmRecordService.add(deviceAlarmRecordBean);
+        deviceAlarmRecordBean = this.deviceAlarmRecordService.add(deviceAlarmRecordBean);
 
 
-         if (deviceAlarmRecordBean == null) {
-               return ResponseBean.serverError("操作失败！");
-         }
+        if (deviceAlarmRecordBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！").addData("code", deviceAlarmRecordBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceAlarmRecordBean.getCode());
 
     }
 
     /**
-    * 更新
-    * TODO 待实现
-    * @param deviceAlarmRecordBean 更新参数
-    * @return
-    */
+     * 更新
+     * TODO 待实现
+     *
+     * @param deviceAlarmRecordBean 更新参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object update(@Validated(ValidGroup.Update.class) DeviceAlarmRecordBean deviceAlarmRecordBean){
+    public Object update(@Validated(ValidGroup.Update.class) DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
-       deviceAlarmRecordBean = this.deviceAlarmRecordService.update(deviceAlarmRecordBean);
+        deviceAlarmRecordBean = this.deviceAlarmRecordService.update(deviceAlarmRecordBean);
 
 
-       if (deviceAlarmRecordBean == null) {
-           return ResponseBean.serverError("操作失败！");
-       }
+        if (deviceAlarmRecordBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-       return ResponseBean.success("操作成功！").addData("code", deviceAlarmRecordBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceAlarmRecordBean.getCode());
 
     }
 
 
     /**
-    * 删除
-    * TODO 待实现
-    * @param deviceAlarmRecordBean 删除参数
-    * @return
-    */
+     * 删除
+     * TODO 待实现
+     *
+     * @param deviceAlarmRecordBean 删除参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object delete(@Validated(ValidGroup.Delete.class) DeviceAlarmRecordBean deviceAlarmRecordBean){
+    public Object delete(@Validated(ValidGroup.Delete.class) DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
-         deviceAlarmRecordBean = this.deviceAlarmRecordService.delete(deviceAlarmRecordBean);
+        deviceAlarmRecordBean = this.deviceAlarmRecordService.delete(deviceAlarmRecordBean);
 
-          if (deviceAlarmRecordBean == null) {
-             return ResponseBean.serverError("操作失败！");
-          }
+        if (deviceAlarmRecordBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！");
+        return ResponseBean.success("操作成功！");
 
     }
 
 
     /**
-    * 查询列表
-    * TODO 待实现
-    * @param deviceAlarmRecordBean 查询参数
-    * @return
-    */
+     * 查询列表
+     * TODO 待实现
+     *
+     * @param deviceAlarmRecordBean 查询参数
+     * @return
+     */
     @RequestMapping
-    public Object list(DeviceAlarmRecordBean deviceAlarmRecordBean, PagerBean pagerBean){
+    public Object list(DeviceAlarmRecordBean deviceAlarmRecordBean, PagerBean pagerBean) {
 
-        PagerBean<DeviceAlarmRecordBean> deviceAlarmRecordBeanPagerBean = this.deviceAlarmRecordService.findPager(deviceAlarmRecordBean,pagerBean);
+        PagerBean<DeviceAlarmRecordBean> deviceAlarmRecordBeanPagerBean = this.deviceAlarmRecordService.findPager(deviceAlarmRecordBean, pagerBean);
 
         List<Map> deviceAlarmRecordMapList = new ArrayList<>();
 
-        deviceAlarmRecordBeanPagerBean.getItems().forEach((e) ->{
-             Map deviceAlarmRecordMap = MapBuilder.newBuilder()
-                                            .put("deviceCode",e.getDeviceCode())
-                                            .put("sn",e.getSn())
-                                            .put("operatorNumber",e.getOperatorNumber())
-                                            .put("operatorCode",e.getOperatorCode())
-                                            .put("projectNumber",e.getProjectNumber())
-                                            .put("projectCode",e.getProjectCode())
-                                            .put("gatewayNumber",e.getGatewayNumber())
-                                            .put("gatewayCode",e.getGatewayCode())
-                                            .put("alarmName",e.getAlarmName())
-                                            .put("alarmType",e.getAlarmType())
-                                            .put("variableId",e.getVariableId())
-                                            .put("condition",e.getRecordCondition())
-                                            .put("alarmConfigCode",e.getAlarmConfigCode())
-                                            .put("startTime",e.getStartTime())
-                                            .put("endTime",e.getEndTime())
-                                            .put("status",e.getStatus())
-                                            .put("content",e.getContent())
-                                            .put("code",e.getCode())
-                                            .put("createTime",e.getCreateTime())
-                                            .put("updateTime",e.getUpdateTime())
-                                            .build();
-                    deviceAlarmRecordMapList.add(deviceAlarmRecordMap);
-             });
-
-
-                return ResponseBean.success("操作成功！").addData("deviceAlarmRecords",deviceAlarmRecordMapList).addData("pager",deviceAlarmRecordBeanPagerBean.simplePager());
+        deviceAlarmRecordBeanPagerBean.getItems().forEach((e) -> {
+            Map deviceAlarmRecordMap = MapBuilder.newBuilder()
+                    .put("deviceCode", e.getDeviceCode())
+                    .put("sn", e.getSn())
+                    .put("operatorNumber", e.getOperatorNumber())
+                    .put("operatorCode", e.getOperatorCode())
+                    .put("projectNumber", e.getProjectNumber())
+                    .put("projectCode", e.getProjectCode())
+                    .put("gatewayNumber", e.getGatewayNumber())
+                    .put("gatewayCode", e.getGatewayCode())
+                    .put("alarmName", e.getAlarmName())
+                    .put("alarmType", e.getAlarmType())
+                    .put("variableId", e.getVariableId())
+                    .put("condition", e.getRecordCondition())
+                    .put("alarmConfigCode", e.getAlarmConfigCode())
+                    .put("startTime", e.getStartTime())
+                    .put("endTime", e.getEndTime())
+                    .put("status", e.getStatus())
+                    .put("content", e.getContent())
+                    .put("code", e.getCode())
+                    .put("createTime", e.getCreateTime())
+                    .put("updateTime", e.getUpdateTime())
+                    .build();
+            deviceAlarmRecordMapList.add(deviceAlarmRecordMap);
+        });
+
+
+        return ResponseBean.success("操作成功！").addData("deviceAlarmRecords", deviceAlarmRecordMapList).addData("pager", deviceAlarmRecordBeanPagerBean.simplePager());
 
     }
 
 
-
     /**
-    * 查询详情
-    * TODO 待实现
-    * @param deviceAlarmRecordBean 查询参数
-    * @return
-    */
+     * 查询详情
+     * TODO 待实现
+     *
+     * @param deviceAlarmRecordBean 查询参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object detail(@Validated(ValidGroup.Detail.class) DeviceAlarmRecordBean deviceAlarmRecordBean,Errors errors){
-
-           deviceAlarmRecordBean = this.deviceAlarmRecordService.find(deviceAlarmRecordBean);
-
-                if(deviceAlarmRecordBean == null){
-                    return  ResponseBean.serverError("该记录不存在!");
-                }
-
-                Map deviceAlarmRecordMap = MapBuilder.newBuilder()
-                        .put("deviceCode",deviceAlarmRecordBean.getDeviceCode())
-                        .put("sn",deviceAlarmRecordBean.getSn())
-                        .put("operatorNumber",deviceAlarmRecordBean.getOperatorNumber())
-                        .put("operatorCode",deviceAlarmRecordBean.getOperatorCode())
-                        .put("projectNumber",deviceAlarmRecordBean.getProjectNumber())
-                        .put("projectCode",deviceAlarmRecordBean.getProjectCode())
-                        .put("gatewayNumber",deviceAlarmRecordBean.getGatewayNumber())
-                        .put("gatewayCode",deviceAlarmRecordBean.getGatewayCode())
-                        .put("alarmName",deviceAlarmRecordBean.getAlarmName())
-                        .put("alarmType",deviceAlarmRecordBean.getAlarmType())
-                        .put("variableId",deviceAlarmRecordBean.getVariableId())
-                        .put("condition",deviceAlarmRecordBean.getRecordCondition())
-                        .put("alarmConfigCode",deviceAlarmRecordBean.getAlarmConfigCode())
-                        .put("startTime",deviceAlarmRecordBean.getStartTime())
-                        .put("endTime",deviceAlarmRecordBean.getEndTime())
-                        .put("status",deviceAlarmRecordBean.getStatus())
-                        .put("content",deviceAlarmRecordBean.getContent())
-                        .put("code",deviceAlarmRecordBean.getCode())
-                        .put("createTime",deviceAlarmRecordBean.getCreateTime())
-                        .put("updateTime",deviceAlarmRecordBean.getUpdateTime())
-                        .build();
-
-        return ResponseBean.success("操作成功！").addData("deviceAlarmRecord",deviceAlarmRecordMap);
+    public Object detail(@Validated(ValidGroup.Detail.class) DeviceAlarmRecordBean deviceAlarmRecordBean, Errors errors) {
+
+        deviceAlarmRecordBean = this.deviceAlarmRecordService.find(deviceAlarmRecordBean);
+
+        if (deviceAlarmRecordBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
+
+        Map deviceAlarmRecordMap = MapBuilder.newBuilder()
+                .put("deviceCode", deviceAlarmRecordBean.getDeviceCode())
+                .put("sn", deviceAlarmRecordBean.getSn())
+                .put("operatorNumber", deviceAlarmRecordBean.getOperatorNumber())
+                .put("operatorCode", deviceAlarmRecordBean.getOperatorCode())
+                .put("projectNumber", deviceAlarmRecordBean.getProjectNumber())
+                .put("projectCode", deviceAlarmRecordBean.getProjectCode())
+                .put("gatewayNumber", deviceAlarmRecordBean.getGatewayNumber())
+                .put("gatewayCode", deviceAlarmRecordBean.getGatewayCode())
+                .put("alarmName", deviceAlarmRecordBean.getAlarmName())
+                .put("alarmType", deviceAlarmRecordBean.getAlarmType())
+                .put("variableId", deviceAlarmRecordBean.getVariableId())
+                .put("condition", deviceAlarmRecordBean.getRecordCondition())
+                .put("alarmConfigCode", deviceAlarmRecordBean.getAlarmConfigCode())
+                .put("startTime", deviceAlarmRecordBean.getStartTime())
+                .put("endTime", deviceAlarmRecordBean.getEndTime())
+                .put("status", deviceAlarmRecordBean.getStatus())
+                .put("content", deviceAlarmRecordBean.getContent())
+                .put("code", deviceAlarmRecordBean.getCode())
+                .put("createTime", deviceAlarmRecordBean.getCreateTime())
+                .put("updateTime", deviceAlarmRecordBean.getUpdateTime())
+                .build();
+
+        return ResponseBean.success("操作成功！").addData("deviceAlarmRecord", deviceAlarmRecordMap);
 
     }
 
     /**
-    * 批量删除
-    * @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.deviceAlarmRecordService.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/DeviceController.java

@@ -21,12 +21,9 @@ import java.util.List;
 import java.util.Map;
 
 
-
-
 /**
-* DeviceController
-*
-*/
+ * DeviceController
+ */
 @RestController
 public class DeviceController {
 
@@ -35,170 +32,174 @@ public class DeviceController {
     @Autowired
     DeviceService deviceService;
 
-    
 
     /**
-    * 新增
-    * TODO 待实现
-    * @param deviceBean 新增参数
-    * @return
-    *
-    */
+     * 新增
+     * TODO 待实现
+     *
+     * @param deviceBean 新增参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object add(@Validated(ValidGroup.Add.class) DeviceBean deviceBean){
+    public Object add(@Validated(ValidGroup.Add.class) DeviceBean deviceBean) {
 
-         deviceBean = this.deviceService.add(deviceBean);
+        deviceBean = this.deviceService.add(deviceBean);
 
 
-         if (deviceBean == null) {
-               return ResponseBean.serverError("操作失败！");
-         }
+        if (deviceBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
 
     }
 
     /**
-    * 更新
-    * TODO 待实现
-    * @param deviceBean 更新参数
-    * @return
-    */
+     * 更新
+     * TODO 待实现
+     *
+     * @param deviceBean 更新参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object update(@Validated(ValidGroup.Update.class) DeviceBean deviceBean){
+    public Object update(@Validated(ValidGroup.Update.class) DeviceBean deviceBean) {
 
-       deviceBean = this.deviceService.update(deviceBean);
+        deviceBean = this.deviceService.update(deviceBean);
 
 
-       if (deviceBean == null) {
-           return ResponseBean.serverError("操作失败！");
-       }
+        if (deviceBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-       return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceBean.getCode());
 
     }
 
 
     /**
-    * 删除
-    * TODO 待实现
-    * @param deviceBean 删除参数
-    * @return
-    */
+     * 删除
+     * TODO 待实现
+     *
+     * @param deviceBean 删除参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object delete(@Validated(ValidGroup.Delete.class) DeviceBean deviceBean){
+    public Object delete(@Validated(ValidGroup.Delete.class) DeviceBean deviceBean) {
 
-         deviceBean = this.deviceService.delete(deviceBean);
+        deviceBean = this.deviceService.delete(deviceBean);
 
-          if (deviceBean == null) {
-             return ResponseBean.serverError("操作失败！");
-          }
+        if (deviceBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！");
+        return ResponseBean.success("操作成功！");
 
     }
 
 
     /**
-    * 查询列表
-    * TODO 待实现
-    * @param deviceBean 查询参数
-    * @return
-    */
+     * 查询列表
+     * TODO 待实现
+     *
+     * @param deviceBean 查询参数
+     * @return
+     */
     @RequestMapping
-    public Object list(DeviceBean deviceBean, PagerBean pagerBean){
+    public Object list(DeviceBean deviceBean, PagerBean pagerBean) {
 
-        PagerBean<DeviceBean> deviceBeanPagerBean = this.deviceService.findPager(deviceBean,pagerBean);
+        PagerBean<DeviceBean> deviceBeanPagerBean = this.deviceService.findPager(deviceBean, pagerBean);
 
         List<Map> deviceMapList = new ArrayList<>();
 
-        deviceBeanPagerBean.getItems().forEach((e) ->{
-             Map deviceMap = MapBuilder.newBuilder()
-                                            .put("name",e.getName())
-                                            .put("ip",e.getIp())
-                                            .put("sn",e.getSn())
-                                            .put("type",e.getType())
-                                            .put("operatorNumber",e.getOperatorNumber())
-                                            .put("operatorCode",e.getOperatorCode())
-                                            .put("projectNumber",e.getProjectNumber())
-                                            .put("projectCode",e.getProjectCode())
-                                            .put("gatewayNumber",e.getGatewayNumber())
-                                            .put("gatewayCode",e.getGatewayCode())
-                                            .put("code",e.getCode())
-                                            .put("createTime",e.getCreateTime())
-                                            .put("updateTime",e.getUpdateTime())
-                                            .build();
-                    deviceMapList.add(deviceMap);
-             });
-
-
-                return ResponseBean.success("操作成功！").addData("devices",deviceMapList).addData("pager",deviceBeanPagerBean.simplePager());
+        deviceBeanPagerBean.getItems().forEach((e) -> {
+            Map deviceMap = MapBuilder.newBuilder()
+                    .put("name", e.getName())
+                    .put("ip", e.getIp())
+                    .put("sn", e.getSn())
+                    .put("type", e.getType())
+                    .put("operatorNumber", e.getOperatorNumber())
+                    .put("operatorCode", e.getOperatorCode())
+                    .put("projectNumber", e.getProjectNumber())
+                    .put("projectCode", e.getProjectCode())
+                    .put("gatewayNumber", e.getGatewayNumber())
+                    .put("gatewayCode", e.getGatewayCode())
+                    .put("code", e.getCode())
+                    .put("createTime", e.getCreateTime())
+                    .put("updateTime", e.getUpdateTime())
+                    .put("deviceStatus",e.getDeviceStatus())
+                    .build();
+            deviceMapList.add(deviceMap);
+        });
+
+
+        return ResponseBean.success("操作成功！").addData("devices", deviceMapList).addData("pager", deviceBeanPagerBean.simplePager());
 
     }
 
 
-
     /**
-    * 查询详情
-    * TODO 待实现
-    * @param deviceBean 查询参数
-    * @return
-    */
+     * 查询详情
+     * TODO 待实现
+     *
+     * @param deviceBean 查询参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object detail(@Validated(ValidGroup.Detail.class) DeviceBean deviceBean,Errors errors){
-
-           deviceBean = this.deviceService.find(deviceBean);
-
-                if(deviceBean == null){
-                    return  ResponseBean.serverError("该记录不存在!");
-                }
-
-                Map deviceMap = MapBuilder.newBuilder()
-                        .put("name",deviceBean.getName())
-                        .put("ip",deviceBean.getIp())
-                        .put("sn",deviceBean.getSn())
-                        .put("type",deviceBean.getType())
-                        .put("operatorNumber",deviceBean.getOperatorNumber())
-                        .put("operatorCode",deviceBean.getOperatorCode())
-                        .put("projectNumber",deviceBean.getProjectNumber())
-                        .put("projectCode",deviceBean.getProjectCode())
-                        .put("gatewayNumber",deviceBean.getGatewayNumber())
-                        .put("gatewayCode",deviceBean.getGatewayCode())
-                        .put("code",deviceBean.getCode())
-                        .put("createTime",deviceBean.getCreateTime())
-                        .put("updateTime",deviceBean.getUpdateTime())
-                        .build();
-
-        return ResponseBean.success("操作成功！").addData("device",deviceMap);
+    public Object detail(@Validated(ValidGroup.Detail.class) DeviceBean deviceBean, Errors errors) {
+
+        deviceBean = this.deviceService.find(deviceBean);
+
+        if (deviceBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
+
+        Map deviceMap = MapBuilder.newBuilder()
+                .put("name", deviceBean.getName())
+                .put("ip", deviceBean.getIp())
+                .put("sn", deviceBean.getSn())
+                .put("type", deviceBean.getType())
+                .put("operatorNumber", deviceBean.getOperatorNumber())
+                .put("operatorCode", deviceBean.getOperatorCode())
+                .put("projectNumber", deviceBean.getProjectNumber())
+                .put("projectCode", deviceBean.getProjectCode())
+                .put("gatewayNumber", deviceBean.getGatewayNumber())
+                .put("gatewayCode", deviceBean.getGatewayCode())
+                .put("code", deviceBean.getCode())
+                .put("createTime", deviceBean.getCreateTime())
+                .put("updateTime", deviceBean.getUpdateTime())
+                .put("deviceStatus", deviceBean.getDeviceStatus())
+                .build();
+
+        return ResponseBean.success("操作成功！").addData("device", deviceMap);
 
     }
 
     /**
-    * 批量删除
-    * @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.deviceService.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/DeviceParamController.java

@@ -21,12 +21,9 @@ import java.util.List;
 import java.util.Map;
 
 
-
-
 /**
-* DeviceParamController
-*
-*/
+ * DeviceParamController
+ */
 @RestController
 public class DeviceParamController {
 
@@ -35,170 +32,174 @@ public class DeviceParamController {
     @Autowired
     DeviceParamService deviceParamService;
 
-    
 
     /**
-    * 新增
-    * TODO 待实现
-    * @param deviceParamBean 新增参数
-    * @return
-    *
-    */
+     * 新增
+     * TODO 待实现
+     *
+     * @param deviceParamBean 新增参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object add(@Validated(ValidGroup.Add.class) DeviceParamBean deviceParamBean){
+    public Object add(@Validated(ValidGroup.Add.class) DeviceParamBean deviceParamBean) {
 
-         deviceParamBean = this.deviceParamService.add(deviceParamBean);
+        deviceParamBean = this.deviceParamService.add(deviceParamBean);
 
 
-         if (deviceParamBean == null) {
-               return ResponseBean.serverError("操作失败！");
-         }
+        if (deviceParamBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！").addData("code", deviceParamBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceParamBean.getCode());
 
     }
 
     /**
-    * 更新
-    * TODO 待实现
-    * @param deviceParamBean 更新参数
-    * @return
-    */
+     * 更新
+     * TODO 待实现
+     *
+     * @param deviceParamBean 更新参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object update(@Validated(ValidGroup.Update.class) DeviceParamBean deviceParamBean){
+    public Object update(@Validated(ValidGroup.Update.class) DeviceParamBean deviceParamBean) {
 
-       deviceParamBean = this.deviceParamService.update(deviceParamBean);
+        deviceParamBean = this.deviceParamService.update(deviceParamBean);
 
 
-       if (deviceParamBean == null) {
-           return ResponseBean.serverError("操作失败！");
-       }
+        if (deviceParamBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-       return ResponseBean.success("操作成功！").addData("code", deviceParamBean.getCode());
+        return ResponseBean.success("操作成功！").addData("code", deviceParamBean.getCode());
 
     }
 
 
     /**
-    * 删除
-    * TODO 待实现
-    * @param deviceParamBean 删除参数
-    * @return
-    */
+     * 删除
+     * TODO 待实现
+     *
+     * @param deviceParamBean 删除参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object delete(@Validated(ValidGroup.Delete.class) DeviceParamBean deviceParamBean){
+    public Object delete(@Validated(ValidGroup.Delete.class) DeviceParamBean deviceParamBean) {
 
-         deviceParamBean = this.deviceParamService.delete(deviceParamBean);
+        deviceParamBean = this.deviceParamService.delete(deviceParamBean);
 
-          if (deviceParamBean == null) {
-             return ResponseBean.serverError("操作失败！");
-          }
+        if (deviceParamBean == null) {
+            return ResponseBean.serverError("操作失败！");
+        }
 
-          return ResponseBean.success("操作成功！");
+        return ResponseBean.success("操作成功！");
 
     }
 
 
     /**
-    * 查询列表
-    * TODO 待实现
-    * @param deviceParamBean 查询参数
-    * @return
-    */
+     * 查询列表
+     * TODO 待实现
+     *
+     * @param deviceParamBean 查询参数
+     * @return
+     */
     @RequestMapping
-    public Object list(DeviceParamBean deviceParamBean, PagerBean pagerBean){
+    public Object list(DeviceParamBean deviceParamBean, PagerBean pagerBean) {
 
-        PagerBean<DeviceParamBean> deviceParamBeanPagerBean = this.deviceParamService.findPager(deviceParamBean,pagerBean);
+        PagerBean<DeviceParamBean> deviceParamBeanPagerBean = this.deviceParamService.findPager(deviceParamBean, pagerBean);
 
         List<Map> deviceParamMapList = new ArrayList<>();
 
-        deviceParamBeanPagerBean.getItems().forEach((e) ->{
-             Map deviceParamMap = MapBuilder.newBuilder()
-                                            .put("sn",e.getSn())
-                                            .put("deviceCode",e.getDeviceCode())
-                                            .put("operatorNumber",e.getOperatorNumber())
-                                            .put("operatorCode",e.getOperatorCode())
-                                            .put("projectNumber",e.getProjectNumber())
-                                            .put("projectCode",e.getProjectCode())
-                                            .put("gatewayNumber",e.getGatewayNumber())
-                                            .put("gatewayCode",e.getGatewayCode())
-                                            .put("name",e.getName())
-                                            .put("value",e.getValue())
-                                            .put("code",e.getCode())
-                                            .put("createTime",e.getCreateTime())
-                                            .put("updateTime",e.getUpdateTime())
-                                            .build();
-                    deviceParamMapList.add(deviceParamMap);
-             });
-
-
-                return ResponseBean.success("操作成功！").addData("deviceParams",deviceParamMapList).addData("pager",deviceParamBeanPagerBean.simplePager());
+        deviceParamBeanPagerBean.getItems().forEach((e) -> {
+            Map deviceParamMap = MapBuilder.newBuilder()
+                    .put("sn", e.getSn())
+                    .put("deviceCode", e.getDeviceCode())
+                    .put("operatorNumber", e.getOperatorNumber())
+                    .put("operatorCode", e.getOperatorCode())
+                    .put("projectNumber", e.getProjectNumber())
+                    .put("projectCode", e.getProjectCode())
+                    .put("gatewayNumber", e.getGatewayNumber())
+                    .put("gatewayCode", e.getGatewayCode())
+                    .put("name", e.getName())
+                    .put("value", e.getValue())
+                    .put("code", e.getCode())
+                    .put("createTime", e.getCreateTime())
+                    .put("updateTime", e.getUpdateTime())
+                    .put("mode", e.getMode())
+                    .build();
+            deviceParamMapList.add(deviceParamMap);
+        });
+
+
+        return ResponseBean.success("操作成功！").addData("deviceParams", deviceParamMapList).addData("pager", deviceParamBeanPagerBean.simplePager());
 
     }
 
 
-
     /**
-    * 查询详情
-    * TODO 待实现
-    * @param deviceParamBean 查询参数
-    * @return
-    */
+     * 查询详情
+     * TODO 待实现
+     *
+     * @param deviceParamBean 查询参数
+     * @return
+     */
     @RequestMapping
     @ParamErrorAutoResponse
-    public Object detail(@Validated(ValidGroup.Detail.class) DeviceParamBean deviceParamBean,Errors errors){
-
-           deviceParamBean = this.deviceParamService.find(deviceParamBean);
-
-                if(deviceParamBean == null){
-                    return  ResponseBean.serverError("该记录不存在!");
-                }
-
-                Map deviceParamMap = MapBuilder.newBuilder()
-                        .put("sn",deviceParamBean.getSn())
-                        .put("deviceCode",deviceParamBean.getDeviceCode())
-                        .put("operatorNumber",deviceParamBean.getOperatorNumber())
-                        .put("operatorCode",deviceParamBean.getOperatorCode())
-                        .put("projectNumber",deviceParamBean.getProjectNumber())
-                        .put("projectCode",deviceParamBean.getProjectCode())
-                        .put("gatewayNumber",deviceParamBean.getGatewayNumber())
-                        .put("gatewayCode",deviceParamBean.getGatewayCode())
-                        .put("name",deviceParamBean.getName())
-                        .put("value",deviceParamBean.getValue())
-                        .put("code",deviceParamBean.getCode())
-                        .put("createTime",deviceParamBean.getCreateTime())
-                        .put("updateTime",deviceParamBean.getUpdateTime())
-                        .build();
-
-        return ResponseBean.success("操作成功！").addData("deviceParam",deviceParamMap);
+    public Object detail(@Validated(ValidGroup.Detail.class) DeviceParamBean deviceParamBean, Errors errors) {
+
+        deviceParamBean = this.deviceParamService.find(deviceParamBean);
+
+        if (deviceParamBean == null) {
+            return ResponseBean.serverError("该记录不存在!");
+        }
+
+        Map deviceParamMap = MapBuilder.newBuilder()
+                .put("sn", deviceParamBean.getSn())
+                .put("deviceCode", deviceParamBean.getDeviceCode())
+                .put("operatorNumber", deviceParamBean.getOperatorNumber())
+                .put("operatorCode", deviceParamBean.getOperatorCode())
+                .put("projectNumber", deviceParamBean.getProjectNumber())
+                .put("projectCode", deviceParamBean.getProjectCode())
+                .put("gatewayNumber", deviceParamBean.getGatewayNumber())
+                .put("gatewayCode", deviceParamBean.getGatewayCode())
+                .put("name", deviceParamBean.getName())
+                .put("value", deviceParamBean.getValue())
+                .put("code", deviceParamBean.getCode())
+                .put("createTime", deviceParamBean.getCreateTime())
+                .put("updateTime", deviceParamBean.getUpdateTime())
+                .put("mode", deviceParamBean.getMode())
+                .build();
+
+        return ResponseBean.success("操作成功！").addData("deviceParam", deviceParamMap);
 
     }
 
     /**
-    * 批量删除
-    * @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.deviceParamService.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/UserController.java

@@ -212,4 +212,23 @@ public class UserController {
 
         return ResponseBean.success("绑定成功！");
     }
+
+    /**
+     * 关联运营商
+     *
+     * @param userBean
+     * @return
+     */
+    @RequestMapping
+    @ParamErrorAutoResponse
+    public Object bindOperator(UserBean userBean) {
+
+        userBean = this.userService.bindOperator(userBean);
+
+        if (userBean == null) {
+            return ResponseBean.serverError("关联运营商失败！");
+        }
+
+        return ResponseBean.success("关联运营商成功！");
+    }
 }