4/10 personproduct

src/main/java/com/example/xiaoshiweixinback/business/utils/LoginUtils.java

@@ -19,7 +19,11 @@ public class LoginUtils {
         ServletRequestAttributes sra = (ServletRequestAttributes) ra;
         HttpServletRequest httpRequest = sra.getRequest();
         String tem = httpRequest.getHeader("Cookie");
-        return   tem;
+        String token = "";
+        if (tem.contains("token=")) {
+            token = tem.substring(tem.indexOf("=") + 1);
+        }
+        return token;
 //        List<String> lst = StringUtils.changeStringToString(tem, ";");
 //        final String[] token = {null};
 //        lst.forEach(item -> {

src/main/java/com/example/xiaoshiweixinback/controller/TicketController.java

@@ -4,6 +4,7 @@ package com.example.xiaoshiweixinback.controller;
 import com.example.xiaoshiweixinback.business.common.Constants;
 import com.example.xiaoshiweixinback.business.common.Response;
 import com.example.xiaoshiweixinback.business.common.base.Records;
+import com.example.xiaoshiweixinback.checkLogin.checkLogin;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketProcessUpDTO;
 import com.example.xiaoshiweixinback.entity.dto.ticket.TicketQueryDTO;
 import com.example.xiaoshiweixinback.entity.product.ProductDTO;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class TicketController {
     private final TicketService ticketService;
 
+//    @checkLogin
     @Operation(summary = "添加工单")
     @PostMapping("/addTicket")
     public Response addTicket(@RequestBody TicketDTO ticketDTO) {

src/main/java/com/example/xiaoshiweixinback/entity/dto/AssoPersonProductDTO.java

@@ -0,0 +1,21 @@
+package com.example.xiaoshiweixinback.entity.dto;
+
+import lombok.Data;
+
+/**
+ * 关注产品
+ * @Author xiexiang
+ * @Date 2024/4/10
+ */
+@Data
+public class AssoPersonProductDTO {
+    /**
+     * 产品id
+     */
+    private Integer productId;
+
+    /**
+     * 关注类型 0黑名单 1白名单 2灰名单
+     */
+    private Integer concernType;
+}

src/main/java/com/example/xiaoshiweixinback/mapper/AssoPersonProductMapper.java

@@ -2,6 +2,8 @@ package com.example.xiaoshiweixinback.mapper;
 
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jdk.jfr.Registered;
+import org.springframework.stereotype.Repository;
 
 /**
 * @author admin
@@ -9,6 +11,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 * @createDate 2024-04-10 15:45:40
 * @Entity xiaoshiweixinback.domain.AssoPersonProduct
 */
+@Repository
 public interface AssoPersonProductMapper extends BaseMapper<AssoPersonProduct> {
 
 }

src/main/java/com/example/xiaoshiweixinback/service/AssoPersonProductService.java

@@ -1,9 +1,17 @@
 package com.example.xiaoshiweixinback.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.example.xiaoshiweixinback.business.utils.CacheUtil;
+import com.example.xiaoshiweixinback.business.utils.LoginUtils;
+import com.example.xiaoshiweixinback.business.utils.ToolUtil;
 import com.example.xiaoshiweixinback.domain.AssoPersonProduct;
 
+import com.example.xiaoshiweixinback.entity.dto.AssoPersonProductDTO;
+import com.example.xiaoshiweixinback.entity.vo.PersonnelVO;
 import com.example.xiaoshiweixinback.mapper.AssoPersonProductMapper;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -12,8 +20,29 @@ import org.springframework.stereotype.Service;
 * @createDate 2024-04-10 15:45:40
 */
 @Service
+@RequiredArgsConstructor
 public class AssoPersonProductService extends ServiceImpl<AssoPersonProductMapper, AssoPersonProduct> {
-
+    private final CacheUtil cacheUtil;
+
+    public Integer add(AssoPersonProductDTO assoPersonProductDTO){
+        PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+        if (ToolUtil.isNotEmpty(personnelVO)) {
+            AssoPersonProduct assoPersonProduct = new AssoPersonProduct();
+            BeanUtils.copyProperties(assoPersonProductDTO, assoPersonProduct);
+            assoPersonProduct.setPersonUuid(personnelVO.getUuid());
+            assoPersonProduct.insert();
+            return assoPersonProduct.getProductId();
+        }
+        return -1;
+    }
+
+
+    public Integer cancel(Integer productId){
+        LambdaQueryWrapper<AssoPersonProduct> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AssoPersonProduct::getProductId, productId);
+        this.remove(queryWrapper);
+        return productId;
+    }
 }
 
 

src/main/java/com/example/xiaoshiweixinback/service/TicketService.java

@@ -31,7 +31,6 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
     private final CacheUtil cacheUtil;
-    private final LoginUtils loginUtils;
     private final TicketFillInService ticketFillInService;
     private final TicketRightsProtectionService ticketRightsProtectionService;
     private final TicketLitigationRespondingService ticketLitigationRespondingService;
@@ -51,8 +50,8 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
         if (ticketDTO.getId() == null) {
             //工单基本信息入库
             BeanUtils.copyProperties(ticketDTO, ticket);
-//            PersonnelVO personnelVO = cacheUtil.getLoginUser(loginUtils.getId());
-//            ticket.setCreateId(personnelVO.getUuid());
+            PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
+            ticket.setCreateId(personnelVO.getUuid());
             String num = BatchNoUtil.getBatchNo();
             ticket.setNum(num);
             ticket.setTicketProgress(1);
@@ -273,7 +272,7 @@ public class TicketService extends ServiceImpl<TicketMapper, Ticket> {
     private Boolean ifHavePermission(String id) {
         PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
         personnelVO.getPersonType();
-        if (personnelVO.getPersonType().equals(0) || (id != null && personnelVO.getId().equals(id))) {
+        if (personnelVO.getPersonType().equals(0) || (id != null && personnelVO.getUuid().equals(id))) {
             return true;
         }
         return false;