log的文件

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -602,7 +602,7 @@ public class WorkOrderBaseController extends BaseController {
 
     //重启 2、重启：只有已完结的可进行重启，重启之后，工单为重办中状态
     @ApiOperation("重启 ,参数是id，以后都用id")
-    @Log(title = "重启", businessType = BusinessType.OTHER)
+    @Log(title = "重启", businessType = BusinessType.UPDATE)
     @PostMapping("/restarts/{id}")
     public AjaxResult restarts( @PathVariable long id, @RequestBody  String reason) {
         WorkOrderBase orderBase = workorderbaseService.getEntity(id);
@@ -617,7 +617,7 @@ public class WorkOrderBaseController extends BaseController {
         qw.set(WorkOrderBase::getRestartsnum, orderBase.getRestartsnum() == null ? 1 : orderBase.getRestartsnum() + 1);
         workorderbaseService.updateBatch(qw);
 
-        if (StringHelper.isNotEmpty(reason)) {
+        if (!StringHelper.isEmpty(reason)) {
             reason = ",原因：" + reason;
         }
         boolean logresult = addlog("重启了工单" + reason, "重启", CurrentUser().getUserName(), orderBase.getWorkordercode(), CurrentUser().getNickName(), "");

zxkf-api/src/main/java/api/controller/order/WorkOrderOperateLogController.java

@@ -1,8 +1,12 @@
 package api.controller.order;
 
+import api.entity.database.system.SysAccessories;
 import api.entity.database.system.User;
 
+import api.entity.view.order.WorkOrderOperateLogView;
 import api.mapper.system.UserMapper;
+import api.service.system.IConfigService;
+import api.service.system.ISysAccessoriesService;
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -22,6 +26,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 
 @Api(value = "wo_operatelog",tags = "wo_operatelog")
@@ -30,10 +35,12 @@ import java.util.List;
 public class WorkOrderOperateLogController extends BaseController {
     @Autowired
     private IWorkOrderOperateLogService workorderoperatelogService;
-
+    @Autowired
+    private ISysAccessoriesService sysaccessoriesService;
     @Autowired
     private UserMapper userMapper;
-
+    @Autowired
+    private IConfigService configService;
     @ApiOperation("列表")
     @Log(title = "查询wo_operatelog列表", businessType = BusinessType.QUERY)
     @GetMapping
@@ -48,14 +55,30 @@ public class WorkOrderOperateLogController extends BaseController {
         qw.eq(WorkOrderOperateLog::getIsdelete, 0);
         qw.orderByDesc(WorkOrderOperateLog::getOperationtime);
         Page<WorkOrderOperateLog> page = GetPage(pageInput);
+
+
         if (page != null) {
             IPage<WorkOrderOperateLog> iPage = workorderoperatelogService.getListPage(page, qw);
 
-            return Success("成功", iPage.getRecords(), iPage.getTotal());
-        } else {
+            List<WorkOrderOperateLog> returnlist = iPage.getRecords();
+            List<WorkOrderOperateLogView> logViews = new ArrayList<>();
+            //处理数据
+            if (returnlist != null && returnlist.size() > 0) {
+                for (WorkOrderOperateLog log : returnlist) {
+
+                    WorkOrderOperateLogView ov = trans(log);
+
+
+                    logViews.add(ov);
+                }
+            }
 
+            return Success("成功", logViews, iPage.getTotal());
+        } else {
             return Success("成功", workorderoperatelogService.getList(qw));
         }
+
+
     }
 
     @ApiOperation("详情")
@@ -77,6 +100,28 @@ public class WorkOrderOperateLogController extends BaseController {
         }
     }
 
+    public WorkOrderOperateLogView trans(WorkOrderOperateLog orderBase) {
+
+        WorkOrderOperateLogView ov = JSON.parseObject(JSON.toJSONString(orderBase), WorkOrderOperateLogView.class);
+
+        if (!StringHelper.isEmpty(orderBase.getFile())) {
+            String captchaEnabled = configService.selectCaptchaEnabled("FileUrl");
+            LambdaQueryWrapper<SysAccessories> qw = new LambdaQueryWrapper<>();
+            qw.in(SysAccessories::getFileid, orderBase.getFile());
+            List<SysAccessories> accessoriesList = sysaccessoriesService.getList(qw);
+            if (accessoriesList != null && accessoriesList.stream().count() > 0) {
+                HashMap<String, String> fileInfo = new HashMap<String, String>();
+                for (SysAccessories accessories : accessoriesList
+                ) {
+                    fileInfo.put(accessories.getOriname(), accessories.getFileurl());
+                }
+                ov.setFileurl(fileInfo);
+            }
+
+        }
+        return ov;
+    }
+
 }
 
 

zxkf-entity/src/main/java/api/entity/view/order/WorkOrderOperateLogView.java

@@ -0,0 +1,23 @@
+package api.entity.view.order;
+
+import api.entity.database.order.WorkOrderBase;
+import api.entity.database.order.WorkOrderOperateLog;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.HashMap;
+import java.util.List;
+
+
+@Data
+public class WorkOrderOperateLogView extends WorkOrderOperateLog {
+
+
+
+
+    /** 工单类型 */
+    @ApiModelProperty("文件路径")
+    private HashMap<String,String> fileurl;
+
+
+}