功能测试完毕，新增更改设备状态字段

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

@@ -46,7 +46,7 @@ public class DeviceAlarmConfigBean  implements Serializable {
 
     private String alarmType ;
 
-    private String condition ;
+    private String configCondition ;
 
     private Long id ;
 

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

@@ -46,7 +46,7 @@ public class DeviceAlarmRecordBean  implements Serializable {
 
     private String variableId ;
 
-    private String condition ;
+    private String recordCondition ;
 
     private String alarmConfigCode ;
 

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

@@ -1,61 +0,0 @@
-package com.kuyuntech.vrv.coreapi.bean.core;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.Builder;
-import lombok.ToString;
-import java.io.Serializable;
-
-import java.lang.Long;
-import java.lang.Short;
-import java.util.Date;
-import java.lang.String;
-
-/**
-* DeviceBean
-*
-*/
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@Builder
-@ToString
-public class DeviceBean  implements Serializable {
-
-
-    private String name ;
-
-    private String ip ;
-
-    private String sn ;
-
-    private String type ;
-
-    private String operatorNumber ;
-
-    private String operatorCode ;
-
-    private String projectNumber ;
-
-    private String projectCode ;
-
-    private String gatewayNumber ;
-
-    private String gatewayCode ;
-
-    private Long id ;
-
-    private Long version ;
-
-    private String code ;
-
-    private Short valid ;
-
-    private Date createTime ;
-
-    private Date updateTime ;
-
-
-
-}

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

@@ -1,97 +0,0 @@
-package com.kuyuntech.vrv.coreapi.service.core;
-
-import com.kuyuntech.vrv.coreapi.bean.core.DeviceBean;
-import com.wbspool.fastboot.core.common.bean.PagerBean;
-import java.util.List;
-
-/**
- * DeviceService
- *
- */
-public interface DeviceService  {
-
-    
-
-    /**
-     * 新增记录
-     * @param deviceBean 新增参数
-     * @return 如果成功返回对应bean，否则返回null
-     */
-     DeviceBean add(DeviceBean deviceBean);
-
-    /**
-     * 更新记录
-     * @param deviceBean 更新参数
-     * @return 如果成功返回对应bean，否则返回null
-     */
-     DeviceBean update(DeviceBean deviceBean);
-
-    /**
-     * 删除记录
-     * @param deviceBean 删除参数
-     * @return 如果成功返回对应bean，否则返回null
-     */
-    DeviceBean delete(DeviceBean deviceBean);
-
-    /**
-     * 查找一条记录
-     * @param deviceBean 查找参数
-     * @return 如果成功返回对应bean，否则返回null
-     */
-    DeviceBean find(DeviceBean deviceBean);
-
-    /**
-     * 通过唯一标识查找记录
-     * @param code 用户标识
-     * @return 记录存在返回对应的bean，否则返回null
-     */
-     DeviceBean find(String code);
-
-    /**
-     * 分页查找多条记录
-     * @param deviceBean 查找参数
-     * @param pagerBean  分页参数
-     * @return 记录存在返回对应的bean集合，否则返回空集合
-     */
-     List<DeviceBean> findAll(DeviceBean deviceBean, PagerBean pagerBean);
-
-
-
-    /**
-     * 查找所有记录
-     * @param deviceBean 查找参数
-     * @return 记录存在返回对应的bean集合，否则返回空集合
-     */
-     List<DeviceBean> findAll(DeviceBean deviceBean);
-
-
-    /**
-     * 统计所有记录
-     * @param deviceBean 统计参数
-     * @return 记录存在返回对应的bean集合，否则返回空集合
-     */
-     Long countAll(DeviceBean deviceBean);
-
-    /**
-     * 分页查找多条记录
-     * @param deviceBean 查询条件参数
-     * @param pagerBean 分页参数
-     * @return 返回查询结果的Pager封装
-     */
-     PagerBean<DeviceBean> findPager(DeviceBean deviceBean, PagerBean pagerBean);
-
-    /**
-     * 批量删除
-     * @param deviceBeans 批量删除元素集合
-     */
-     void batchDelete(List<DeviceBean> deviceBeans);
-
-    /**
-     * 批量删除
-     * @param codes 唯一标识集合
-     */
-    void batchDeleteByCodes(List<String> codes);
-
-    
-
-}

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

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

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

@@ -127,7 +127,7 @@ public class DeviceAlarmConfigController {
                                             .put("alarmName",e.getAlarmName())
                                             .put("variableId",e.getVariableId())
                                             .put("alarmType",e.getAlarmType())
-                                            .put("condition",e.getCondition())
+                                            .put("condition",e.getConfigCondition())
                                             .put("code",e.getCode())
                                             .put("createTime",e.getCreateTime())
                                             .put("updateTime",e.getUpdateTime())
@@ -170,7 +170,7 @@ public class DeviceAlarmConfigController {
                         .put("alarmName",deviceAlarmConfigBean.getAlarmName())
                         .put("variableId",deviceAlarmConfigBean.getVariableId())
                         .put("alarmType",deviceAlarmConfigBean.getAlarmType())
-                        .put("condition",deviceAlarmConfigBean.getCondition())
+                        .put("condition",deviceAlarmConfigBean.getConfigCondition())
                         .put("code",deviceAlarmConfigBean.getCode())
                         .put("createTime",deviceAlarmConfigBean.getCreateTime())
                         .put("updateTime",deviceAlarmConfigBean.getUpdateTime())

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

@@ -127,7 +127,7 @@ public class DeviceAlarmRecordController {
                                             .put("alarmName",e.getAlarmName())
                                             .put("alarmType",e.getAlarmType())
                                             .put("variableId",e.getVariableId())
-                                            .put("condition",e.getCondition())
+                                            .put("condition",e.getRecordCondition())
                                             .put("alarmConfigCode",e.getAlarmConfigCode())
                                             .put("startTime",e.getStartTime())
                                             .put("endTime",e.getEndTime())
@@ -175,7 +175,7 @@ public class DeviceAlarmRecordController {
                         .put("alarmName",deviceAlarmRecordBean.getAlarmName())
                         .put("alarmType",deviceAlarmRecordBean.getAlarmType())
                         .put("variableId",deviceAlarmRecordBean.getVariableId())
-                        .put("condition",deviceAlarmRecordBean.getCondition())
+                        .put("condition",deviceAlarmRecordBean.getRecordCondition())
                         .put("alarmConfigCode",deviceAlarmRecordBean.getAlarmConfigCode())
                         .put("startTime",deviceAlarmRecordBean.getStartTime())
                         .put("endTime",deviceAlarmRecordBean.getEndTime())

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

@@ -1,203 +0,0 @@
-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("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("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-service/src/main/java/com/kuyuntech/vrv/coreservice/dao/core/ProjectDao.java

@@ -12,8 +12,4 @@ public interface ProjectDao extends FastbootRepository<Project, Long> {
 
     Project findByCodeAndValid(String code, Short valid);
 
-
-    Project findByOperatorNumberAndProvinceAndCityAndCustomer(String operNumber, String province, String city, String customer);
-
-
 }

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

@@ -44,4 +44,7 @@ public class Device extends FastbootEntity {
 
     @Column(columnDefinition = "varchar(255) COMMENT '关联网关'")
     private String gatewayCode;
+
+    @Column(columnDefinition = "varchar(255) COMMENT '设备状态'")
+    private String deviceStatus;
 }

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

@@ -49,7 +49,7 @@ public class DeviceAlarmConfig extends FastbootEntity {
     @Column(columnDefinition = "varchar(255) COMMENT '报警类型'")
     private String alarmType;
 
-//    @Column(columnDefinition = "text COMMENT '判断条件'")
-//    private String condition;
+    @Column(columnDefinition = "text COMMENT '判断条件'")
+    private String configCondition;
 
 }

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

@@ -49,8 +49,8 @@ public class DeviceAlarmRecord extends FastbootEntity {
     @Column(columnDefinition = "varchar(255) COMMENT '变量id'")
     private String variableId;
 
-//    @Column(columnDefinition = "text COMMENT '判断条件'")
-//    private String condition;
+    @Column(columnDefinition = "text COMMENT '判断条件'")
+    private String recordCondition;
 
     @Column(columnDefinition = "varchar(255) COMMENT '关联报警配置'")
     private String alarmConfigCode;

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

@@ -3,12 +3,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 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.List;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,38 +19,36 @@ 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.*;
-
-
 
+import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.*;
 
 
 /**
-* DeviceAlarmRecordService
-*
-*/
+ * DeviceAlarmRecordService
+ */
 @Service("deviceAlarmRecordService")
-@Transactional(rollbackFor = Exception.class,transactionManager = "vrvCoreServiceTransactionManager")
-public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<DeviceAlarmRecord,DeviceAlarmRecordBean> implements DeviceAlarmRecordService {
+@Transactional(rollbackFor = Exception.class, transactionManager = "vrvCoreServiceTransactionManager")
+public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<DeviceAlarmRecord, DeviceAlarmRecordBean> implements DeviceAlarmRecordService {
 
     private static final Logger logger = LoggerFactory.getLogger(DeviceAlarmRecordServiceImpl.class);
 
     @Autowired
     DeviceAlarmRecordDao deviceAlarmRecordDao;
 
-    
 
     @Override
     public DeviceAlarmRecordBean add(DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
         DeviceAlarmRecord deviceAlarmRecord = new DeviceAlarmRecord();
-        beanToDomain(deviceAlarmRecordBean,deviceAlarmRecord,"id");
+        beanToDomain(deviceAlarmRecordBean, deviceAlarmRecord, "id");
         deviceAlarmRecordDao.save(deviceAlarmRecord);
-        domainToBean(deviceAlarmRecord,deviceAlarmRecordBean);
+        domainToBean(deviceAlarmRecord, deviceAlarmRecordBean);
         return deviceAlarmRecordBean;
 
     }
@@ -55,23 +56,23 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
     @Override
     public DeviceAlarmRecordBean update(DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
-        if(deviceAlarmRecordBean == null ){
-            return null ;
+        if (deviceAlarmRecordBean == null) {
+            return null;
         }
 
-        
-        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(),VALID);
-        
 
-        if(deviceAlarmRecord == null){
+        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(), VALID);
+
+
+        if (deviceAlarmRecord == null) {
             return null;
         }
 
-        beanToDomain(deviceAlarmRecordBean,deviceAlarmRecord,"id","code","version","createTime","updateTime","valid");
+        beanToDomain(deviceAlarmRecordBean, deviceAlarmRecord, "id", "code", "version", "createTime", "updateTime", "valid");
 
         deviceAlarmRecordDao.save(deviceAlarmRecord);
 
-        domainToBean(deviceAlarmRecord,deviceAlarmRecordBean);
+        domainToBean(deviceAlarmRecord, deviceAlarmRecordBean);
 
         return deviceAlarmRecordBean;
     }
@@ -79,60 +80,58 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
     @Override
     public DeviceAlarmRecordBean delete(DeviceAlarmRecordBean deviceAlarmRecordBean) {
 
-        if(deviceAlarmRecordBean == null){
-            return null ;
+        if (deviceAlarmRecordBean == null) {
+            return null;
         }
 
-        
-        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(),VALID);
-        
 
+        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(), VALID);
 
-        if(deviceAlarmRecord == null){
+
+        if (deviceAlarmRecord == null) {
             return null;
         }
 
-        
+
         deviceAlarmRecord.setValid(INVALID);
         deviceAlarmRecordDao.save(deviceAlarmRecord);
-        
 
-        domainToBean(deviceAlarmRecord,deviceAlarmRecordBean);
+
+        domainToBean(deviceAlarmRecord, deviceAlarmRecordBean);
 
         return deviceAlarmRecordBean;
     }
 
     @Override
     public DeviceAlarmRecordBean find(DeviceAlarmRecordBean deviceAlarmRecordBean) {
-        if(deviceAlarmRecordBean == null){
-            return null ;
+        if (deviceAlarmRecordBean == null) {
+            return null;
         }
 
-        
-        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(),VALID);
-        
+
+        DeviceAlarmRecord deviceAlarmRecord = deviceAlarmRecordDao.findByCodeAndValid(deviceAlarmRecordBean.getCode(), VALID);
 
 
-        if(deviceAlarmRecord == null){
-            return null ;
+        if (deviceAlarmRecord == null) {
+            return null;
         }
-        BeanUtils.copyProperties(deviceAlarmRecord,deviceAlarmRecordBean);
+        BeanUtils.copyProperties(deviceAlarmRecord, deviceAlarmRecordBean);
         return deviceAlarmRecordBean;
     }
 
     @Override
     public DeviceAlarmRecordBean find(String code) {
-        return  this.find(DeviceAlarmRecordBean.builder().code(code).build());
+        return this.find(DeviceAlarmRecordBean.builder().code(code).build());
     }
 
     @Override
     public List<DeviceAlarmRecordBean> findAll(DeviceAlarmRecordBean deviceAlarmRecordBean, PagerBean pagerBean) {
         List<DeviceAlarmRecordBean> deviceAlarmRecordBeans = new ArrayList<>();
         DetachedCriteria detachedCriteria = createListCriteria(deviceAlarmRecordBean);
-        List<DeviceAlarmRecord> deviceAlarmRecords = deviceAlarmRecordDao.findAll(detachedCriteria,pagerBean);
+        List<DeviceAlarmRecord> deviceAlarmRecords = deviceAlarmRecordDao.findAll(detachedCriteria, pagerBean);
         for (DeviceAlarmRecord deviceAlarmRecord : deviceAlarmRecords) {
             DeviceAlarmRecordBean deviceAlarmRecordBeanTemp = new DeviceAlarmRecordBean();
-            domainToBean(deviceAlarmRecord,deviceAlarmRecordBeanTemp);
+            domainToBean(deviceAlarmRecord, deviceAlarmRecordBeanTemp);
             deviceAlarmRecordBeans.add(deviceAlarmRecordBeanTemp);
         }
         return deviceAlarmRecordBeans;
@@ -140,17 +139,17 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
 
     @Override
     public List<DeviceAlarmRecordBean> findAll(DeviceAlarmRecordBean deviceAlarmRecordBean) {
-       return  this.findAll(deviceAlarmRecordBean,null);
+        return this.findAll(deviceAlarmRecordBean, null);
     }
 
     @Override
-     public Long countAll(DeviceAlarmRecordBean deviceAlarmRecordBean) {
+    public Long countAll(DeviceAlarmRecordBean deviceAlarmRecordBean) {
         DetachedCriteria detachedCriteria = createListCriteria(deviceAlarmRecordBean);
         return deviceAlarmRecordDao.countAll(detachedCriteria);
     }
 
-     @Override
-     public PagerBean<DeviceAlarmRecordBean> findPager(DeviceAlarmRecordBean deviceAlarmRecordBean, PagerBean pagerBean) {
+    @Override
+    public PagerBean<DeviceAlarmRecordBean> findPager(DeviceAlarmRecordBean deviceAlarmRecordBean, PagerBean pagerBean) {
         List<DeviceAlarmRecordBean> deviceAlarmRecordBeans = this.findAll(deviceAlarmRecordBean, pagerBean);
         Long count = this.countAll(deviceAlarmRecordBean);
         PagerBean<DeviceAlarmRecordBean> deviceAlarmRecordPageBean = new PagerBean<>();
@@ -158,30 +157,50 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
         deviceAlarmRecordPageBean.setItemCount(count.intValue());
         deviceAlarmRecordPageBean.init();
         deviceAlarmRecordPageBean.setItems(deviceAlarmRecordBeans);
-        return  deviceAlarmRecordPageBean ;
-     }
+        return deviceAlarmRecordPageBean;
+    }
+
+    /**
+     * 创建列表查询条件
+     *
+     * @param deviceAlarmRecordBean 查询参数
+     * @return
+     */
+    private static DetachedCriteria createListCriteria(DeviceAlarmRecordBean deviceAlarmRecordBean) {
+        DetachedCriteria detachedCriteria = DetachedCriteria.forClass(DeviceAlarmRecord.class);
+
+        if (deviceAlarmRecordBean != null) {
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getSn())) {
+                detachedCriteria.add(Restrictions.like("sn", deviceAlarmRecordBean.getSn(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getAlarmName())) {
+                detachedCriteria.add(Restrictions.like("alarmName", deviceAlarmRecordBean.getAlarmName(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getVariableId())) {
+                detachedCriteria.add(Restrictions.like("variableId", deviceAlarmRecordBean.getVariableId(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getAlarmType())) {
+                detachedCriteria.add(Restrictions.eq("alarmType", deviceAlarmRecordBean.getAlarmType()));
+            }
+            if (StringUtils.isNotBlank(deviceAlarmRecordBean.getRecordCondition())) {
+                detachedCriteria.add(Restrictions.like("recordCondition", deviceAlarmRecordBean.getRecordCondition(), MatchMode.ANYWHERE));
+            }
+        }
 
-     /**
-      * 创建列表查询条件
-      * @param deviceAlarmRecordBean 查询参数
-      * @return
-      */
-     private static DetachedCriteria createListCriteria(DeviceAlarmRecordBean deviceAlarmRecordBean){
-         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(DeviceAlarmRecord.class);
-         detachedCriteria.add(Restrictions.eq("valid",VALID));
-         return  detachedCriteria;
-     }
 
+        detachedCriteria.add(Restrictions.eq("valid", VALID));
+        return detachedCriteria;
+    }
 
 
     @Override
     public void batchDelete(List<DeviceAlarmRecordBean> deviceAlarmRecordBean) {
-        if(deviceAlarmRecordBean.isEmpty()){
-            return ;
+        if (deviceAlarmRecordBean.isEmpty()) {
+            return;
         }
         List<String> codes = new ArrayList<>();
-       deviceAlarmRecordBean.forEach((e) ->{
-          codes.add(e.getCode());
+        deviceAlarmRecordBean.forEach((e) -> {
+            codes.add(e.getCode());
         });
         batchDeleteByCodes(codes);
 
@@ -191,17 +210,15 @@ public class DeviceAlarmRecordServiceImpl extends AbstractFastbootService<Device
     @Override
     public void batchDeleteByCodes(List<String> codes) {
 
-        if(codes.isEmpty()){
-        return ;
+        if (codes.isEmpty()) {
+            return;
         }
 
         for (String code : codes) {
-            Assert.notNull(this.delete(DeviceAlarmRecordBean.builder().code(code).build()),"batch delete by codes error! ");
+            Assert.notNull(this.delete(DeviceAlarmRecordBean.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/DeviceServiceImpl.java

@@ -1,207 +0,0 @@
-package com.kuyuntech.vrv.coreservice.service.core.impl;
-
-
-import com.kuyuntech.vrv.coreapi.service.core.DeviceService;
-import com.kuyuntech.vrv.coreservice.dao.core.DeviceDao;
-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;
-
-    
-
-    @Override
-    public DeviceBean add(DeviceBean deviceBean) {
-
-        Device device = new Device();
-        beanToDomain(deviceBean,device,"id");
-        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);
-         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

@@ -4,6 +4,7 @@ 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.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.GatewayBean;
@@ -168,6 +169,19 @@ public class GatewayServiceImpl extends AbstractFastbootService<Gateway, Gateway
      */
     private static DetachedCriteria createListCriteria(GatewayBean gatewayBean) {
         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Gateway.class);
+
+        if (gatewayBean != null) {
+            if (StringUtils.isNotBlank(gatewayBean.getNumber())) {
+                detachedCriteria.add(Restrictions.like("number", gatewayBean.getNumber(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(gatewayBean.getIp())) {
+                detachedCriteria.add(Restrictions.like("ip", gatewayBean.getIp(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(gatewayBean.getLocation())) {
+                detachedCriteria.add(Restrictions.like("location", gatewayBean.getLocation(), MatchMode.ANYWHERE));
+            }
+        }
+
         detachedCriteria.add(Restrictions.eq("valid", VALID));
         return detachedCriteria;
     }

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

@@ -3,12 +3,15 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 import com.kuyuntech.vrv.coreapi.service.core.OperatorLogService;
 import com.kuyuntech.vrv.coreservice.dao.core.OperatorLogDao;
+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;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,38 +19,36 @@ 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.*;
-
-
 
+import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.*;
 
 
 /**
-* OperatorLogService
-*
-*/
+ * OperatorLogService
+ */
 @Service("operatorLogService")
-@Transactional(rollbackFor = Exception.class,transactionManager = "vrvCoreServiceTransactionManager")
-public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,OperatorLogBean> implements OperatorLogService {
+@Transactional(rollbackFor = Exception.class, transactionManager = "vrvCoreServiceTransactionManager")
+public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog, OperatorLogBean> implements OperatorLogService {
 
     private static final Logger logger = LoggerFactory.getLogger(OperatorLogServiceImpl.class);
 
     @Autowired
     OperatorLogDao operatorLogDao;
 
-    
 
     @Override
     public OperatorLogBean add(OperatorLogBean operatorLogBean) {
 
         OperatorLog operatorLog = new OperatorLog();
-        beanToDomain(operatorLogBean,operatorLog,"id");
+        beanToDomain(operatorLogBean, operatorLog, "id");
         operatorLogDao.save(operatorLog);
-        domainToBean(operatorLog,operatorLogBean);
+        domainToBean(operatorLog, operatorLogBean);
         return operatorLogBean;
 
     }
@@ -55,23 +56,23 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
     @Override
     public OperatorLogBean update(OperatorLogBean operatorLogBean) {
 
-        if(operatorLogBean == null ){
-            return null ;
+        if (operatorLogBean == null) {
+            return null;
         }
 
-        
-        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(),VALID);
-        
 
-        if(operatorLog == null){
+        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(), VALID);
+
+
+        if (operatorLog == null) {
             return null;
         }
 
-        beanToDomain(operatorLogBean,operatorLog,"id","code","version","createTime","updateTime","valid");
+        beanToDomain(operatorLogBean, operatorLog, "id", "code", "version", "createTime", "updateTime", "valid");
 
         operatorLogDao.save(operatorLog);
 
-        domainToBean(operatorLog,operatorLogBean);
+        domainToBean(operatorLog, operatorLogBean);
 
         return operatorLogBean;
     }
@@ -79,60 +80,58 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
     @Override
     public OperatorLogBean delete(OperatorLogBean operatorLogBean) {
 
-        if(operatorLogBean == null){
-            return null ;
+        if (operatorLogBean == null) {
+            return null;
         }
 
-        
-        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(),VALID);
-        
 
+        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(), VALID);
 
-        if(operatorLog == null){
+
+        if (operatorLog == null) {
             return null;
         }
 
-        
+
         operatorLog.setValid(INVALID);
         operatorLogDao.save(operatorLog);
-        
 
-        domainToBean(operatorLog,operatorLogBean);
+
+        domainToBean(operatorLog, operatorLogBean);
 
         return operatorLogBean;
     }
 
     @Override
     public OperatorLogBean find(OperatorLogBean operatorLogBean) {
-        if(operatorLogBean == null){
-            return null ;
+        if (operatorLogBean == null) {
+            return null;
         }
 
-        
-        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(),VALID);
-        
+
+        OperatorLog operatorLog = operatorLogDao.findByCodeAndValid(operatorLogBean.getCode(), VALID);
 
 
-        if(operatorLog == null){
-            return null ;
+        if (operatorLog == null) {
+            return null;
         }
-        BeanUtils.copyProperties(operatorLog,operatorLogBean);
+        BeanUtils.copyProperties(operatorLog, operatorLogBean);
         return operatorLogBean;
     }
 
     @Override
     public OperatorLogBean find(String code) {
-        return  this.find(OperatorLogBean.builder().code(code).build());
+        return this.find(OperatorLogBean.builder().code(code).build());
     }
 
     @Override
     public List<OperatorLogBean> findAll(OperatorLogBean operatorLogBean, PagerBean pagerBean) {
         List<OperatorLogBean> operatorLogBeans = new ArrayList<>();
         DetachedCriteria detachedCriteria = createListCriteria(operatorLogBean);
-        List<OperatorLog> operatorLogs = operatorLogDao.findAll(detachedCriteria,pagerBean);
+        List<OperatorLog> operatorLogs = operatorLogDao.findAll(detachedCriteria, pagerBean);
         for (OperatorLog operatorLog : operatorLogs) {
             OperatorLogBean operatorLogBeanTemp = new OperatorLogBean();
-            domainToBean(operatorLog,operatorLogBeanTemp);
+            domainToBean(operatorLog, operatorLogBeanTemp);
             operatorLogBeans.add(operatorLogBeanTemp);
         }
         return operatorLogBeans;
@@ -140,17 +139,17 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
 
     @Override
     public List<OperatorLogBean> findAll(OperatorLogBean operatorLogBean) {
-       return  this.findAll(operatorLogBean,null);
+        return this.findAll(operatorLogBean, null);
     }
 
     @Override
-     public Long countAll(OperatorLogBean operatorLogBean) {
+    public Long countAll(OperatorLogBean operatorLogBean) {
         DetachedCriteria detachedCriteria = createListCriteria(operatorLogBean);
         return operatorLogDao.countAll(detachedCriteria);
     }
 
-     @Override
-     public PagerBean<OperatorLogBean> findPager(OperatorLogBean operatorLogBean, PagerBean pagerBean) {
+    @Override
+    public PagerBean<OperatorLogBean> findPager(OperatorLogBean operatorLogBean, PagerBean pagerBean) {
         List<OperatorLogBean> operatorLogBeans = this.findAll(operatorLogBean, pagerBean);
         Long count = this.countAll(operatorLogBean);
         PagerBean<OperatorLogBean> operatorLogPageBean = new PagerBean<>();
@@ -158,30 +157,41 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
         operatorLogPageBean.setItemCount(count.intValue());
         operatorLogPageBean.init();
         operatorLogPageBean.setItems(operatorLogBeans);
-        return  operatorLogPageBean ;
-     }
+        return operatorLogPageBean;
+    }
+
+    /**
+     * 创建列表查询条件
+     *
+     * @param operatorLogBean 查询参数
+     * @return
+     */
+    private static DetachedCriteria createListCriteria(OperatorLogBean operatorLogBean) {
+        DetachedCriteria detachedCriteria = DetachedCriteria.forClass(OperatorLog.class);
+
+        if (operatorLogBean != null) {
+            if (StringUtils.isNotBlank(operatorLogBean.getUserRealname())) {
+                detachedCriteria.add(Restrictions.like("userRealname", operatorLogBean.getUserRealname(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(operatorLogBean.getUserAccount())) {
+                detachedCriteria.add(Restrictions.like("userAccount", operatorLogBean.getUserAccount(), MatchMode.ANYWHERE));
+            }
+        }
 
-     /**
-      * 创建列表查询条件
-      * @param operatorLogBean 查询参数
-      * @return
-      */
-     private static DetachedCriteria createListCriteria(OperatorLogBean operatorLogBean){
-         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(OperatorLog.class);
-         detachedCriteria.add(Restrictions.eq("valid",VALID));
-         return  detachedCriteria;
-     }
 
+        detachedCriteria.add(Restrictions.eq("valid", VALID));
+        return detachedCriteria;
+    }
 
 
     @Override
     public void batchDelete(List<OperatorLogBean> operatorLogBean) {
-        if(operatorLogBean.isEmpty()){
-            return ;
+        if (operatorLogBean.isEmpty()) {
+            return;
         }
         List<String> codes = new ArrayList<>();
-       operatorLogBean.forEach((e) ->{
-          codes.add(e.getCode());
+        operatorLogBean.forEach((e) -> {
+            codes.add(e.getCode());
         });
         batchDeleteByCodes(codes);
 
@@ -191,17 +201,15 @@ public class OperatorLogServiceImpl extends AbstractFastbootService<OperatorLog,
     @Override
     public void batchDeleteByCodes(List<String> codes) {
 
-        if(codes.isEmpty()){
-        return ;
+        if (codes.isEmpty()) {
+            return;
         }
 
         for (String code : codes) {
-            Assert.notNull(this.delete(OperatorLogBean.builder().code(code).build()),"batch delete by codes error! ");
+            Assert.notNull(this.delete(OperatorLogBean.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/OperatorServiceImpl.java

@@ -3,12 +3,15 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 import com.kuyuntech.vrv.coreapi.service.core.OperatorService;
 import com.kuyuntech.vrv.coreservice.dao.core.OperatorDao;
+import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.OperatorBean;
 import com.kuyuntech.vrv.coreservice.domain.core.Operator;
 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;
@@ -16,38 +19,36 @@ 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.*;
-
-
 
+import static com.wbspool.fastboot.core.jpa.constant.DataValidTypes.*;
 
 
 /**
-* OperatorService
-*
-*/
+ * OperatorService
+ */
 @Service("operatorService")
-@Transactional(rollbackFor = Exception.class,transactionManager = "vrvCoreServiceTransactionManager")
-public class OperatorServiceImpl extends AbstractFastbootService<Operator,OperatorBean> implements OperatorService {
+@Transactional(rollbackFor = Exception.class, transactionManager = "vrvCoreServiceTransactionManager")
+public class OperatorServiceImpl extends AbstractFastbootService<Operator, OperatorBean> implements OperatorService {
 
     private static final Logger logger = LoggerFactory.getLogger(OperatorServiceImpl.class);
 
     @Autowired
     OperatorDao operatorDao;
 
-    
 
     @Override
     public OperatorBean add(OperatorBean operatorBean) {
 
         Operator operator = new Operator();
-        beanToDomain(operatorBean,operator,"id");
+        beanToDomain(operatorBean, operator, "id");
         operatorDao.save(operator);
-        domainToBean(operator,operatorBean);
+        domainToBean(operator, operatorBean);
         return operatorBean;
 
     }
@@ -55,23 +56,23 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator,Operat
     @Override
     public OperatorBean update(OperatorBean operatorBean) {
 
-        if(operatorBean == null ){
-            return null ;
+        if (operatorBean == null) {
+            return null;
         }
 
-        
-        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(),VALID);
-        
 
-        if(operator == null){
+        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(), VALID);
+
+
+        if (operator == null) {
             return null;
         }
 
-        beanToDomain(operatorBean,operator,"id","code","version","createTime","updateTime","valid");
+        beanToDomain(operatorBean, operator, "id", "code", "version", "createTime", "updateTime", "valid");
 
         operatorDao.save(operator);
 
-        domainToBean(operator,operatorBean);
+        domainToBean(operator, operatorBean);
 
         return operatorBean;
     }
@@ -79,60 +80,58 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator,Operat
     @Override
     public OperatorBean delete(OperatorBean operatorBean) {
 
-        if(operatorBean == null){
-            return null ;
+        if (operatorBean == null) {
+            return null;
         }
 
-        
-        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(),VALID);
-        
 
+        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(), VALID);
 
-        if(operator == null){
+
+        if (operator == null) {
             return null;
         }
 
-        
+
         operator.setValid(INVALID);
         operatorDao.save(operator);
-        
 
-        domainToBean(operator,operatorBean);
+
+        domainToBean(operator, operatorBean);
 
         return operatorBean;
     }
 
     @Override
     public OperatorBean find(OperatorBean operatorBean) {
-        if(operatorBean == null){
-            return null ;
+        if (operatorBean == null) {
+            return null;
         }
 
-        
-        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(),VALID);
-        
+
+        Operator operator = operatorDao.findByCodeAndValid(operatorBean.getCode(), VALID);
 
 
-        if(operator == null){
-            return null ;
+        if (operator == null) {
+            return null;
         }
-        BeanUtils.copyProperties(operator,operatorBean);
+        BeanUtils.copyProperties(operator, operatorBean);
         return operatorBean;
     }
 
     @Override
     public OperatorBean find(String code) {
-        return  this.find(OperatorBean.builder().code(code).build());
+        return this.find(OperatorBean.builder().code(code).build());
     }
 
     @Override
     public List<OperatorBean> findAll(OperatorBean operatorBean, PagerBean pagerBean) {
         List<OperatorBean> operatorBeans = new ArrayList<>();
         DetachedCriteria detachedCriteria = createListCriteria(operatorBean);
-        List<Operator> operators = operatorDao.findAll(detachedCriteria,pagerBean);
+        List<Operator> operators = operatorDao.findAll(detachedCriteria, pagerBean);
         for (Operator operator : operators) {
             OperatorBean operatorBeanTemp = new OperatorBean();
-            domainToBean(operator,operatorBeanTemp);
+            domainToBean(operator, operatorBeanTemp);
             operatorBeans.add(operatorBeanTemp);
         }
         return operatorBeans;
@@ -140,17 +139,17 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator,Operat
 
     @Override
     public List<OperatorBean> findAll(OperatorBean operatorBean) {
-       return  this.findAll(operatorBean,null);
+        return this.findAll(operatorBean, null);
     }
 
     @Override
-     public Long countAll(OperatorBean operatorBean) {
+    public Long countAll(OperatorBean operatorBean) {
         DetachedCriteria detachedCriteria = createListCriteria(operatorBean);
         return operatorDao.countAll(detachedCriteria);
     }
 
-     @Override
-     public PagerBean<OperatorBean> findPager(OperatorBean operatorBean, PagerBean pagerBean) {
+    @Override
+    public PagerBean<OperatorBean> findPager(OperatorBean operatorBean, PagerBean pagerBean) {
         List<OperatorBean> operatorBeans = this.findAll(operatorBean, pagerBean);
         Long count = this.countAll(operatorBean);
         PagerBean<OperatorBean> operatorPageBean = new PagerBean<>();
@@ -158,30 +157,52 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator,Operat
         operatorPageBean.setItemCount(count.intValue());
         operatorPageBean.init();
         operatorPageBean.setItems(operatorBeans);
-        return  operatorPageBean ;
-     }
+        return operatorPageBean;
+    }
 
-     /**
-      * 创建列表查询条件
-      * @param operatorBean 查询参数
-      * @return
-      */
-     private static DetachedCriteria createListCriteria(OperatorBean operatorBean){
-         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Operator.class);
-         detachedCriteria.add(Restrictions.eq("valid",VALID));
-         return  detachedCriteria;
-     }
+    /**
+     * 创建列表查询条件
+     *
+     * @param operatorBean 查询参数
+     * @return
+     */
+    private static DetachedCriteria createListCriteria(OperatorBean operatorBean) {
+        DetachedCriteria detachedCriteria = DetachedCriteria.forClass(Operator.class);
+
+        if (operatorBean != null) {
+            if (StringUtils.isNotBlank(operatorBean.getName())) {
+                detachedCriteria.add(Restrictions.like("name", operatorBean.getName(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getProvince())) {
+                detachedCriteria.add(Restrictions.eq("province", operatorBean.getProvince()));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getCity())) {
+                detachedCriteria.add(Restrictions.eq("city", operatorBean.getCity()));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getAddress())) {
+                detachedCriteria.add(Restrictions.like("address", operatorBean.getAddress(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getContact())) {
+                detachedCriteria.add(Restrictions.like("customer", operatorBean.getContact(), MatchMode.ANYWHERE));
+            }
+            if (StringUtils.isNotBlank(operatorBean.getTel())) {
+                detachedCriteria.add(Restrictions.like("tel", operatorBean.getTel(), MatchMode.ANYWHERE));
+            }
+        }
 
+        detachedCriteria.add(Restrictions.eq("valid", VALID));
+        return detachedCriteria;
+    }
 
 
     @Override
     public void batchDelete(List<OperatorBean> operatorBean) {
-        if(operatorBean.isEmpty()){
-            return ;
+        if (operatorBean.isEmpty()) {
+            return;
         }
         List<String> codes = new ArrayList<>();
-       operatorBean.forEach((e) ->{
-          codes.add(e.getCode());
+        operatorBean.forEach((e) -> {
+            codes.add(e.getCode());
         });
         batchDeleteByCodes(codes);
 
@@ -191,17 +212,15 @@ public class OperatorServiceImpl extends AbstractFastbootService<Operator,Operat
     @Override
     public void batchDeleteByCodes(List<String> codes) {
 
-        if(codes.isEmpty()){
-        return ;
+        if (codes.isEmpty()) {
+            return;
         }
 
         for (String code : codes) {
-            Assert.notNull(this.delete(OperatorBean.builder().code(code).build()),"batch delete by codes error! ");
+            Assert.notNull(this.delete(OperatorBean.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/ProjectServiceImpl.java

@@ -3,6 +3,7 @@ package com.kuyuntech.vrv.coreservice.service.core.impl;
 
 import com.kuyuntech.vrv.coreapi.service.core.ProjectService;
 import com.kuyuntech.vrv.coreservice.dao.core.ProjectDao;
+import org.hibernate.criterion.MatchMode;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.kuyuntech.vrv.coreapi.bean.core.ProjectBean;
@@ -167,6 +168,29 @@ 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())) {
+                detachedCriteria.add(Restrictions.eq("province", projectBean.getProvince()));
+            }
+            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.getCustomer())) {
+                detachedCriteria.add(Restrictions.like("customer", projectBean.getCustomer(), MatchMode.ANYWHERE));
+            }
+            if(StringUtils.isNotBlank(projectBean.getCustomerTel())) {
+                detachedCriteria.add(Restrictions.like("customerTel ", projectBean.getCustomerTel(), MatchMode.ANYWHERE));
+            }
+        }
+
+
         detachedCriteria.add(Restrictions.eq("valid", VALID));
         return detachedCriteria;
     }
@@ -199,23 +223,4 @@ public class ProjectServiceImpl extends AbstractFastbootService<Project, Project
 
     }
 
-    @Override
-    public ProjectBean findByCondition(ProjectBean projectBean) {
-
-        if(projectBean == null){
-            return null;
-        }
-
-        Project project = projectDao.findByOperatorNumberAndProvinceAndCityAndCustomer(projectBean.getOperatorNumber(), projectBean.getProvince(), projectBean.getCity(), projectBean.getCustomer());
-
-        if(project == null){
-            return null;
-        }
-
-        domainToBean(project, projectBean);
-
-
-        return projectBean;
-    }
-
 }

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

@@ -6,6 +6,7 @@ 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;
@@ -65,14 +66,16 @@ public class UserServiceImpl extends AbstractFastbootService<User, UserBean> imp
             return null;
         }
 
-        User user = userDao.findByAccountAndPasswordAndValid(userBean.getAccount(), userBean.getPassword(), userBean.getValid());
+        User user = userDao.findByAccountAndPasswordAndValid(userBean.getAccount(), userBean.getPassword(), VALID);
 
-        if (user != null) {
+        if (user == null) {
 
-            return userBean;
+            return null;
         }
 
-        return null;
+        domainToBean(user, userBean);
+
+        return userBean;
     }
 
     @Override
@@ -192,9 +195,16 @@ public class UserServiceImpl extends AbstractFastbootService<User, UserBean> imp
         DetachedCriteria detachedCriteria = DetachedCriteria.forClass(User.class);
 
         if (userBean != null) {
+            if (StringUtils.isNotBlank(userBean.getRealname())) {
+                detachedCriteria.add(Restrictions.like("realname", userBean.getRealname(),MatchMode.ANYWHERE));
+            }
             if (StringUtils.isNotBlank(userBean.getAccount())) {
                 detachedCriteria.add(Restrictions.eq("account", userBean.getAccount()));
             }
+            if (StringUtils.isNotBlank(userBean.getPhone())) {
+                detachedCriteria.add(Restrictions.like("phone", userBean.getPhone(),MatchMode.ANYWHERE));
+            }
+
         }
 
 

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

@@ -32,7 +32,7 @@ public class AuthController {
             return ResponseBean.serverError("用户名或密码错误，操作失败！");
         }
 
-        return ResponseBean.success("操作成功！");
+        return ResponseBean.success("登录成功！");
     }
 
 

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

@@ -128,7 +128,7 @@ public class DeviceAlarmConfigController {
                                             .put("alarmName",e.getAlarmName())
                                             .put("variableId",e.getVariableId())
                                             .put("alarmType",e.getAlarmType())
-                                            .put("condition",e.getCondition())
+                                            .put("condition",e.getConfigCondition())
                                             .put("code",e.getCode())
                                             .put("createTime",e.getCreateTime())
                                             .put("updateTime",e.getUpdateTime())
@@ -171,7 +171,7 @@ public class DeviceAlarmConfigController {
                         .put("alarmName",deviceAlarmConfigBean.getAlarmName())
                         .put("variableId",deviceAlarmConfigBean.getVariableId())
                         .put("alarmType",deviceAlarmConfigBean.getAlarmType())
-                        .put("condition",deviceAlarmConfigBean.getCondition())
+                        .put("condition",deviceAlarmConfigBean.getConfigCondition())
                         .put("code",deviceAlarmConfigBean.getCode())
                         .put("createTime",deviceAlarmConfigBean.getCreateTime())
                         .put("updateTime",deviceAlarmConfigBean.getUpdateTime())

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

@@ -128,7 +128,7 @@ public class DeviceAlarmRecordController {
                                             .put("alarmName",e.getAlarmName())
                                             .put("alarmType",e.getAlarmType())
                                             .put("variableId",e.getVariableId())
-                                            .put("condition",e.getCondition())
+                                            .put("condition",e.getRecordCondition())
                                             .put("alarmConfigCode",e.getAlarmConfigCode())
                                             .put("startTime",e.getStartTime())
                                             .put("endTime",e.getEndTime())
@@ -176,7 +176,7 @@ public class DeviceAlarmRecordController {
                         .put("alarmName",deviceAlarmRecordBean.getAlarmName())
                         .put("alarmType",deviceAlarmRecordBean.getAlarmType())
                         .put("variableId",deviceAlarmRecordBean.getVariableId())
-                        .put("condition",deviceAlarmRecordBean.getCondition())
+                        .put("condition",deviceAlarmRecordBean.getRecordCondition())
                         .put("alarmConfigCode",deviceAlarmRecordBean.getAlarmConfigCode())
                         .put("startTime",deviceAlarmRecordBean.getStartTime())
                         .put("endTime",deviceAlarmRecordBean.getEndTime())

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

@@ -199,44 +199,4 @@ public class ProjectController {
         return ResponseBean.success("操作成功！");
     }
 
-
-
-
-
-    /**
-     * 按条件查询
-     * TODO 待实现
-     * @param projectBean 查询参数
-     * @return
-     */
-    @RequestMapping
-    @ParamErrorAutoResponse
-    public Object findByCondition(@Validated(ValidGroup.Detail.class) ProjectBean projectBean,Errors errors){
-
-        projectBean = this.projectService.findByCondition(projectBean);
-
-        if(projectBean == null){
-            return  ResponseBean.serverError("该项目不存在!");
-        }
-
-
-        Map projectMap = MapBuilder.newBuilder()
-                .put("name",projectBean.getName())
-                .put("description",projectBean.getDescription())
-                .put("province",projectBean.getProvince())
-                .put("city",projectBean.getCity())
-                .put("address",projectBean.getAddress())
-                .put("customer",projectBean.getCustomer())
-                .put("customerTel",projectBean.getCustomerTel())
-                .put("operatorNumber",projectBean.getOperatorNumber())
-                .put("operatorCode",projectBean.getOperatorCode())
-                .put("number",projectBean.getNumber())
-                .put("code",projectBean.getCode())
-                .put("createTime",projectBean.getCreateTime())
-                .put("updateTime",projectBean.getUpdateTime())
-                .build();
-
-        return ResponseBean.success("操作成功！").addData("project",projectMap);
-
-    }
 }