From c4d2342ab4dad36f2e53ad0380d131bef36538d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Thu, 8 May 2025 15:50:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cfs/controller/FileController.java          | 12 +++++++++---
 .../pojo/request/AnonymousTicketAddRequest.java |  9 ++++-----
 .../common/pojo/vo/AnonymousTicketSearchVO.java | 10 ++++++++++
 .../repository/entity/AnonymousTicket.java      |  4 ++--
 .../impl/AnonymousTicketServiceImpl.java        | 17 +++++++++++------
 .../resources/mapper/AnonymousTicketMapper.xml  |  5 ++++-
 .../src/main/resources/mapper/DeviceMapper.xml  |  3 ++-
 7 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java
index 5f79415d..e643e71e 100644
--- a/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java
+++ b/nflg-mobilebroken-cfs-app/src/main/java/com/nflg/mobilebroken/cfs/controller/FileController.java
@@ -8,6 +8,7 @@ import com.nflg.mobilebroken.common.exception.NflgException;
 import com.nflg.mobilebroken.common.pojo.ApiResult;
 import com.nflg.mobilebroken.common.pojo.vo.FileUploadVO;
 import com.nflg.mobilebroken.common.util.AppUserUtil;
+import com.nflg.mobilebroken.common.util.SaTokenAppUtil;
 import com.nflg.mobilebroken.repository.entity.FileUploadRecord;
 import com.nflg.mobilebroken.repository.service.IFileUploadRecordService;
 import com.nflg.mobilebroken.starter.service.FileUploadService;
@@ -68,8 +69,13 @@ public class FileController extends ControllerBase {
     }
 
     private String buildFilePath(String fileType) {
-        return StrUtil.format("cfs/{}/{}/{}/{}{}", LocalDateTime.now().format(FORMATTER), AppUserUtil.getUserId()
-                , RandomUtil.randomString(4), IdUtil.fastUUID(),fileType);
+        if (SaTokenAppUtil.isLogin()){
+            return StrUtil.format("cfs/{}/{}/{}/{}{}", LocalDateTime.now().format(FORMATTER)
+                    , AppUserUtil.getUserId(), RandomUtil.randomString(4), IdUtil.fastUUID(),fileType);
+        }else {
+            return StrUtil.format("cfs/{}/temp/{}/{}{}", LocalDateTime.now().format(FORMATTER)
+                    ,RandomUtil.randomString(4), IdUtil.fastUUID(),fileType);
+        }
     }
 
     /**
@@ -129,6 +135,6 @@ public class FileController extends ControllerBase {
                 .setSource(source)
                 .setSourceId(sourceId)
                 .setUrl(url)
-                .setCreateBy(AppUserUtil.getUserName());
+                .setCreateBy(SaTokenAppUtil.isLogin()?AppUserUtil.getUserName():"");
     }
 }
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AnonymousTicketAddRequest.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AnonymousTicketAddRequest.java
index bd5602a7..f35ebfc7 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AnonymousTicketAddRequest.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/request/AnonymousTicketAddRequest.java
@@ -3,6 +3,7 @@ package com.nflg.mobilebroken.common.pojo.request;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.util.List;
 
@@ -22,11 +23,9 @@ public class AnonymousTicketAddRequest {
     @NotBlank(message = "设备编号不能为空")
     private String deviceNo;
 
-    /**
-     * 问题部位
-     */
-    @NotBlank(message = "问题部位不能为空")
-    private String component;
+    //问题部位
+    @NotNull(message = "问题部位id不能为空")
+    private Integer componentId;
 
     /**
      * 使用时长，单位小时
diff --git a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AnonymousTicketSearchVO.java b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AnonymousTicketSearchVO.java
index 9dad3190..9c1076f8 100644
--- a/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AnonymousTicketSearchVO.java
+++ b/nflg-mobilebroken-common/src/main/java/com/nflg/mobilebroken/common/pojo/vo/AnonymousTicketSearchVO.java
@@ -22,6 +22,11 @@ public class AnonymousTicketSearchVO {
      */
     private String title;
 
+    /**
+     * 问题描述
+     */
+    private String description;
+
     /**
      * 问题部位
      */
@@ -77,6 +82,11 @@ public class AnonymousTicketSearchVO {
      */
     private LocalDateTime createTime;
 
+    /**
+     * 区域名称
+     */
+    private String areaName;
+
     /**
      * 手机号码
      */
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AnonymousTicket.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AnonymousTicket.java
index de2893a3..6b7181f6 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AnonymousTicket.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/entity/AnonymousTicket.java
@@ -40,9 +40,9 @@ public class AnonymousTicket implements Serializable {
     private String deviceNo;
 
     /**
-     * 问题部位
+     * 问题部件id，t_base_part表的id
      */
-    private String component;
+    private Integer componentId;
 
     /**
      * 使用时长，单位：小时
diff --git a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AnonymousTicketServiceImpl.java b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AnonymousTicketServiceImpl.java
index 992c3192..16d04114 100644
--- a/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AnonymousTicketServiceImpl.java
+++ b/nflg-mobilebroken-repository/src/main/java/com/nflg/mobilebroken/repository/service/impl/AnonymousTicketServiceImpl.java
@@ -11,17 +11,17 @@ import com.nflg.mobilebroken.common.pojo.vo.AnonymousTicketInfoVO;
 import com.nflg.mobilebroken.common.pojo.vo.AnonymousTicketSearchVO;
 import com.nflg.mobilebroken.common.pojo.vo.DeviceInfoVO;
 import com.nflg.mobilebroken.common.pojo.vo.FileUploadVO;
+import com.nflg.mobilebroken.common.util.MultilingualUtil;
 import com.nflg.mobilebroken.common.util.TicketUtil;
 import com.nflg.mobilebroken.common.util.VUtils;
 import com.nflg.mobilebroken.repository.entity.AnonymousTicket;
 import com.nflg.mobilebroken.repository.entity.DictionaryItem;
 import com.nflg.mobilebroken.repository.entity.FileUploadRecord;
+import com.nflg.mobilebroken.repository.entity.TBasePart;
 import com.nflg.mobilebroken.repository.mapper.AnonymousTicketMapper;
-import com.nflg.mobilebroken.repository.service.IAnonymousTicketService;
-import com.nflg.mobilebroken.repository.service.IDeviceService;
-import com.nflg.mobilebroken.repository.service.IDictionaryItemService;
-import com.nflg.mobilebroken.repository.service.IFileUploadRecordService;
+import com.nflg.mobilebroken.repository.service.*;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -51,7 +51,11 @@ public class AnonymousTicketServiceImpl extends ServiceImpl<AnonymousTicketMappe
     @Resource
     private IDictionaryItemService dictionaryItemService;
 
+    @Resource
+    private ITBasePartService partService;
+
     @Override
+    @Transactional
     public void add(AnonymousTicketAddRequest request) {
         AnonymousTicket lastTicket=lambdaQuery()
                 .ge(AnonymousTicket::getCreateTime, LocalDateTime.now().toLocalDate())
@@ -63,7 +67,7 @@ public class AnonymousTicketServiceImpl extends ServiceImpl<AnonymousTicketMappe
                 .setNo(no)
                 .setDeviceNo(request.getDeviceNo())
                 .setDeviceAddress(request.getDeviceAddress())
-                .setComponent(request.getComponent())
+                .setComponentId(request.getComponentId())
                 .setUseTime(request.getUseTime())
                 .setTitle(request.getTitle())
                 .setDescription(request.getDescription())
@@ -111,6 +115,7 @@ public class AnonymousTicketServiceImpl extends ServiceImpl<AnonymousTicketMappe
             DictionaryItem warrantyState = dictionaryItemService.getById(device.getWarrantyState());
             warrantyStateDesc = warrantyState.getName();
         }
+        TBasePart part = partService.getByIdAndLanguage(ticket.getComponentId(), MultilingualUtil.getLanguage());
         return new AnonymousTicketInfoVO()
                 .setId(ticketId)
                 .setNo(ticket.getNo())
@@ -128,7 +133,7 @@ public class AnonymousTicketServiceImpl extends ServiceImpl<AnonymousTicketMappe
                 .setShipmentDate(device.getShipmentDate())
                 .setStartWarrantyDate(device.getStartWarrantyDate())
                 .setWarrantyMonth(device.getWarrantyMonth())
-                .setComponent(ticket.getComponent())
+                .setComponent(Objects.nonNull(part) ? part.getPartName() : "")
                 .setUseTime(ticket.getUseTime())
                 .setDeviceAddress(ticket.getDeviceAddress())
                 .setImages(getFileVOs(ticket.getImages()))
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/AnonymousTicketMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/AnonymousTicketMapper.xml
index 2e64796e..894695c5 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/AnonymousTicketMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/AnonymousTicketMapper.xml
@@ -3,13 +3,16 @@
 <mapper namespace="com.nflg.mobilebroken.repository.mapper.AnonymousTicketMapper">
 
     <select id="search" resultType="com.nflg.mobilebroken.common.pojo.vo.AnonymousTicketSearchVO">
-        SELECT t.id,t.`no`,t.title,t.component,d.customer_name AS 'customerName',d.agent_name AS 'agentName'
+        SELECT t.id,t.`no`,t.title,p.part_name AS 'component',d.customer_name AS 'customerName',d.agent_name AS 'agentName'
         ,t.device_no AS 'deviceNo',t.use_time AS 'useTime',t.create_time AS 'createTime',di.name AS 'warrantyStatusDesc'
         ,d.device_type AS 'deviceType',d.model_no AS 'equipmentModel',d.shipment_date AS 'shipmentDate',t.phone,t.email
+        ,t.description,c.area_name
         FROM anonymous_ticket t
         LEFT JOIN device d ON t.device_no=d.device_no
         LEFT JOIN t_base_device_type dt ON d.device_type=dt.device_type
         LEFT JOIN dictionary_item di ON d.warranty_state=di.id
+        LEFT JOIN t_base_part p ON t.component_id=p.id
+        LEFT JOIN t_base_customer c ON c.agency_company_code=d.agent_code
         <where>
             <if test="request.component!=null and request.component!=''">
                 AND t.component=#{request.component}
diff --git a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
index 14c0bfa6..b6b5bf62 100644
--- a/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
+++ b/nflg-mobilebroken-repository/src/main/resources/mapper/DeviceMapper.xml
@@ -14,9 +14,10 @@
              , d.customer_name       AS 'customerName'
              , dc.id                 AS 'componentId'
              , d.agent_name
-            ,d.area_name
+            ,c.area_name
         FROM device d
                  LEFT JOIN device_component dc ON d.model_no = dc.model_no AND dc.`enable` = 1
+                 LEFT JOIN t_base_customer c ON c.agency_company_code=d.agent_code
         WHERE d.device_no = #{deviceNo}
         ORDER BY d.data_valid_state DESC,d.device_state
         LIMIT 1;