运维模块

hx-service-api/dev-ops-api/pom.xml

@@ -10,6 +10,12 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>dev-ops-api</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>service-file-api</artifactId>
+        </dependency>
+    </dependencies>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hx-service-api/dev-ops-api/src/main/java/com/fjhx/entity/maintain/MaintainRecords.java

@@ -1,13 +1,14 @@
 package com.fjhx.entity.maintain;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 维护记录
@@ -27,9 +28,19 @@ public class MaintainRecords extends BaseEntity {
     private Long deviceId;
 
     /**
-     * 维护人id
+     * 设备名称
+     */
+    private Long deviceName;
+
+    /**
+     * 类型 1设备 2软件
      */
-    private Long maintainUser;
+    private Integer type;
+
+    /**
+     * 维护人
+     */
+    private String maintainUser;
 
     /**
      * 维护时间
@@ -41,5 +52,11 @@ public class MaintainRecords extends BaseEntity {
      */
     private String maintainContent;
 
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
 
 }

hx-service-api/dev-ops-api/src/main/java/com/fjhx/entity/qa/QaInfo.java

@@ -1,8 +1,6 @@
 package com.fjhx.entity.qa;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fjhx.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -30,5 +28,11 @@ public class QaInfo extends BaseEntity {
      */
     private String answer;
 
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
 
 }

hx-service-api/dev-ops-api/src/main/java/com/fjhx/params/maintain/MaintainRecordsVo.java

@@ -1,9 +1,12 @@
 package com.fjhx.params.maintain;
 
+import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.maintain.MaintainRecords;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * 维护记录
  *
@@ -14,4 +17,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class MaintainRecordsVo extends MaintainRecords {
 
+    /**
+     * 文件列表
+     */
+    private List<FileInfo> fileInfoList;
+
 }

hx-service-api/dev-ops-api/src/main/java/com/fjhx/params/qa/QaInfoVo.java

@@ -1,9 +1,12 @@
 package com.fjhx.params.qa;
 
+import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.qa.QaInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.List;
+
 /**
  * qa
  *
@@ -14,4 +17,9 @@ import lombok.EqualsAndHashCode;
 @EqualsAndHashCode(callSuper = true)
 public class QaInfoVo extends QaInfo {
 
+    /**
+     * 文件列表
+     */
+    private List<FileInfo> fileInfoList;
+
 }

hx-service/dev-ops/pom.xml

@@ -17,10 +17,17 @@
     </properties>
 
     <dependencies>
+        
         <dependency>
             <groupId>com.fjhx</groupId>
             <artifactId>dev-ops-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>common-client-util</artifactId>
+        </dependency>
+
     </dependencies>
 
 </project>

hx-service/dev-ops/src/main/java/com/fjhx/DevOpsApplication.java

@@ -4,7 +4,7 @@ import org.springblade.core.cloud.client.BladeCloudApplication;
 import org.springblade.core.launch.BladeApplication;
 
 /**
- * crm模块
+ * 运维模块
  */
 @BladeCloudApplication
 public class DevOpsApplication {

hx-service/dev-ops/src/main/java/com/fjhx/service/maintain/impl/MaintainRecordsServiceImpl.java

@@ -3,12 +3,13 @@ package com.fjhx.service.maintain.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.maintain.MaintainRecords;
-import com.fjhx.params.maintain.MaintainRecordsVo;
 import com.fjhx.mapper.maintain.MaintainRecordsMapper;
+import com.fjhx.params.maintain.MaintainRecordsVo;
 import com.fjhx.service.maintain.MaintainRecordsService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.FileClientUtil;
+import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -30,25 +31,28 @@ public class MaintainRecordsServiceImpl extends ServiceImpl<MaintainRecordsMappe
         QueryWrapper<MaintainRecords> wrapper = Wrappers.query();
 
         WrapperUtil.init(condition, wrapper)
+                .keyword("deviceName", "maintainUser", "id")
                 .createTimeDesc();
 
-        Page<MaintainRecords> page = page(condition, wrapper);
-        return page;
+        return page(condition, wrapper);
     }
 
     @Override
     public void add(MaintainRecordsVo maintainRecordsVo) {
         save(maintainRecordsVo);
+        FileClientUtil.bindingFile(maintainRecordsVo.getId(), maintainRecordsVo.getFileInfoList());
     }
 
     @Override
     public void edit(MaintainRecordsVo maintainRecordsVo) {
         updateById(maintainRecordsVo);
+        FileClientUtil.againBindingFile(maintainRecordsVo.getId(), maintainRecordsVo.getFileInfoList());
     }
 
     @Override
     public void delete(MaintainRecordsVo maintainRecordsVo) {
         removeById(maintainRecordsVo.getId());
+        FileClientUtil.relieveBindingFile(maintainRecordsVo.getId());
     }
 
 }

hx-service/dev-ops/src/main/java/com/fjhx/service/qa/impl/QaInfoServiceImpl.java

@@ -3,12 +3,13 @@ package com.fjhx.service.qa.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fjhx.utils.WrapperUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.entity.qa.QaInfo;
-import com.fjhx.params.qa.QaInfoVo;
 import com.fjhx.mapper.qa.QaInfoMapper;
+import com.fjhx.params.qa.QaInfoVo;
 import com.fjhx.service.qa.QaInfoService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.FileClientUtil;
+import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 
 import java.util.Map;
@@ -30,25 +31,28 @@ public class QaInfoServiceImpl extends ServiceImpl<QaInfoMapper, QaInfo> impleme
         QueryWrapper<QaInfo> wrapper = Wrappers.query();
 
         WrapperUtil.init(condition, wrapper)
+                .keyword("question")
                 .createTimeDesc();
 
-        Page<QaInfo> page = page(condition, wrapper);
-        return page;
+        return page(condition, wrapper);
     }
 
     @Override
     public void add(QaInfoVo qaInfoVo) {
         save(qaInfoVo);
+        FileClientUtil.bindingFile(qaInfoVo.getId(), qaInfoVo.getFileInfoList());
     }
 
     @Override
     public void edit(QaInfoVo qaInfoVo) {
         updateById(qaInfoVo);
+        FileClientUtil.againBindingFile(qaInfoVo.getId(), qaInfoVo.getFileInfoList());
     }
 
     @Override
     public void delete(QaInfoVo qaInfoVo) {
         removeById(qaInfoVo.getId());
+        FileClientUtil.relieveBindingFile(qaInfoVo.getId());
     }
 
 }