From c93663ce356988b6e1391170312028a6e7636518 Mon Sep 17 00:00:00 2001
From: chenhuan <czj123456>
Date: 星期二, 25 六月 2024 17:58:09 +0800
Subject: [PATCH] 更改左上角logo

---
 javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java |   74 ++++++++++++++++++++++++------------
 1 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
index 585292e..6695b35 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/controller/TubLogController.java
@@ -1,15 +1,13 @@
 package com.javaweb.geo.controller;
 
 import java.util.List;
+
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 import com.javaweb.common.annotation.Log;
 import com.javaweb.common.enums.BusinessType;
 import com.javaweb.geo.domain.TubLog;
@@ -18,17 +16,17 @@
 import com.javaweb.common.core.domain.AjaxResult;
 import com.javaweb.common.utils.poi.ExcelUtil;
 import com.javaweb.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * 鏉愭枡鍑哄叆搴撹褰旵ontroller
- * 
+ *
  * @author cxy
  * @date 2024-05-22
  */
 @Controller
 @RequestMapping("/geo/TubLog")
-public class TubLogController extends BaseController
-{
+public class TubLogController extends BaseController {
     private String prefix = "geo/TubLog";
 
     @Autowired
@@ -36,8 +34,8 @@
 
     @RequiresPermissions("geo:TubLog:view")
     @GetMapping()
-    public String TubLog()
-    {
+    public String TubLog(String id, ModelMap mmap) {
+        mmap.put("projectId", id);
         return prefix + "/TubLog";
     }
 
@@ -47,8 +45,7 @@
     @RequiresPermissions("geo:TubLog:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(TubLog tubLog)
-    {
+    public TableDataInfo list(TubLog tubLog) {
         startPage();
         List<TubLog> list = tubLogService.selectTubLogList(tubLog);
         return getDataTable(list);
@@ -61,8 +58,7 @@
     @Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
-    public AjaxResult export(TubLog tubLog)
-    {
+    public AjaxResult export(TubLog tubLog) {
         List<TubLog> list = tubLogService.selectTubLogList(tubLog);
         ExcelUtil<TubLog> util = new ExcelUtil<TubLog>(TubLog.class);
         return util.exportExcel(list, "TubLog");
@@ -72,8 +68,17 @@
      * 鏂板鏉愭枡鍑哄叆搴撹褰�
      */
     @GetMapping("/add")
-    public String add()
-    {
+    public String add(String projectId, ModelMap mmap) {
+        Integer number = tubLogService.selectMaxTubLogId(projectId);
+        if (ObjectUtils.isEmpty(number)){
+            number = 1;
+        }else {
+            number++;
+        }
+        String formattedNumber = String.format("%06d", number);
+        String code = "ZTCJ" + formattedNumber;
+        mmap.put("projectId", projectId);
+        mmap.put("code", code);
         return prefix + "/add";
     }
 
@@ -84,8 +89,7 @@
     @Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
-    public AjaxResult addSave(TubLog tubLog)
-    {
+    public AjaxResult addSave(TubLog tubLog) {
         return toAjax(tubLogService.insertTubLog(tubLog));
     }
 
@@ -93,8 +97,7 @@
      * 淇敼鏉愭枡鍑哄叆搴撹褰�
      */
     @GetMapping("/edit/{id}")
-    public String edit(@PathVariable("id") Integer id, ModelMap mmap)
-    {
+    public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
         TubLog tubLog = tubLogService.selectTubLogById(id);
         mmap.put("tubLog", tubLog);
         return prefix + "/edit";
@@ -107,8 +110,7 @@
     @Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
-    public AjaxResult editSave(TubLog tubLog)
-    {
+    public AjaxResult editSave(TubLog tubLog) {
         return toAjax(tubLogService.updateTubLog(tubLog));
     }
 
@@ -117,10 +119,32 @@
      */
     @RequiresPermissions("geo:TubLog:remove")
     @Log(title = "鏉愭枡鍑哄叆搴撹褰�", businessType = BusinessType.DELETE)
-    @PostMapping( "/remove")
+    @PostMapping("/remove")
     @ResponseBody
-    public AjaxResult remove(String ids)
-    {
+    public AjaxResult remove(String ids) {
         return toAjax(tubLogService.deleteTubLogByIds(ids));
     }
+
+    /**
+     * 瀵煎叆绠℃潗鍑哄叆搴撹褰�
+     */
+    @RequiresPermissions("geo:deviceLog:import")
+    @Log(title = "瀵煎叆绠℃潗鍑哄叆搴撹褰�")
+    @PostMapping( "/importTubLog/{projectId}")
+    @ResponseBody
+    public AjaxResult importTubLog(@PathVariable("projectId") String projectId, @RequestParam("file") MultipartFile file, boolean updateSupport){
+        String message = tubLogService.importTubLog(projectId,file,updateSupport);
+        return AjaxResult.success(message);
+    }
+
+
+    /**
+     * 缁熻
+     */
+    @GetMapping("/countTubLogDate/{projectId}")
+    @ResponseBody
+    public AjaxResult countTubLogDate(@PathVariable("projectId") String projectId) {
+        return tubLogService.countTubLogDate(projectId);
+    }
+
 }

--
Gitblit v1.9.1