完成用户名的获取跟新增产品功能完善

common/fire-dto/src/main/java/com/fire/dto/CustomerInfo.java

@@ -1,5 +1,8 @@
 package com.fire.dto;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -8,9 +11,11 @@ import java.util.Date;
 
 @ApiModel(value = "客户表实体")
 @Data
+@TableName("customer_info")
 public class CustomerInfo {
 
     @ApiModelProperty(value = "客户ID")
+    @TableId(value = "customer_id",type = IdType.AUTO)
     private Long customerId;
 
     @ApiModelProperty(value = "合作伙伴ID")

common/fire-dto/src/main/java/com/fire/dto/CustomerProduct.java

@@ -1,6 +1,7 @@
 package com.fire.dto;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,6 +16,7 @@ import java.math.BigDecimal;
  */
 @Data
 @ApiModel(value = "客户产品表实体")
+@TableName("customer_product")
 public class CustomerProduct {
 
     @ApiModelProperty(value = "主键")

common/fire-dto/src/main/java/com/fire/dto/FlowAppInfo.java

@@ -1,5 +1,6 @@
 package com.fire.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -52,9 +53,11 @@ public class FlowAppInfo {
 
     /********************************扩展字段***********************************/
     @ApiModelProperty(value = "客户基本信息")
+    @TableField(exist = false)
     private CustomerInfo customerInfo;
 
     @ApiModelProperty(value = "客户产品map")
+    @TableField(exist = false)
     private Map<String, CustomerProduct> productMap;
 
 

common/fire-dto/src/main/java/com/fire/dto/enums/Province.java

@@ -1,6 +1,7 @@
 package com.fire.dto.enums;
 
 public enum Province {
+    QG_ALL("100", "全国"),
     GD_YUE("44", "广东省"),
     HN_YU("41", "河南省"),
     NM_MENG("15", "内蒙古自治区"),
@@ -34,8 +35,8 @@ public enum Province {
     YN_YUN("53", "云南省"),
     BJ_JING("11", "北京市"),
     TJ_JIN("12", "天津市"),
-    JL_JI("22", "吉林省"),
-    QG_ALL("100", "全国");
+    JL_JI("22", "吉林省");
+
 
 
     private final String code;

modules/admin/src/main/java/com/fire/admin/rest/FireProductController.java

@@ -51,7 +51,7 @@ public class FireProductController {
      */
     @ApiOperation(value = "新增产品信息")
     @PostMapping("/add")
-    public BaseRestResponse productInfoAdd(@RequestBody FireProductInfoDto fireProductInfoDto) {
+    public BaseRestResponse productInfoAdd(@RequestBody FireProductInfoDto fireProductInfoDto) throws Throwable {
         return new BaseRestResponse<>(fireProductService.insertProductInfo(fireProductInfoDto));
     }
 

modules/admin/src/main/java/com/fire/admin/rest/TestController.java

@@ -1,7 +1,13 @@
 package com.fire.admin.rest;
 
 import com.fire.admin.util.EnumUtils;
+import com.fire.admin.util.SysOperatingAspect;
 import com.fire.dto.enums.Province;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -12,17 +18,17 @@ import java.util.List;
  * @Description: TODO
  * @date: 2021-05-13 18:08
  */
+@Api(tags = "测试")
+@RestController
+@RequestMapping
 public class TestController {
 
 
-    public static void main(String[] args) {
-
-        String convert = EnumUtils.convert("广东省");
-        System.out.println("convert = " + convert);
+    @ApiOperation(value = "获取登录用的名")
+    @GetMapping("/u")
+    public String getUser() throws Throwable {
+        return SysOperatingAspect.getLoginUser();
     }
 
 
-
-
-
 }

modules/admin/src/main/java/com/fire/admin/service/FireProductService.java

@@ -31,7 +31,7 @@ public interface FireProductService extends IService<FireProductInfo> {
     * @Author: liuliu
     * @Date: 2021/5/18 11:58
     */
-    int insertProductInfo(FireProductInfoDto fireProductInfoDto);
+    int insertProductInfo(FireProductInfoDto fireProductInfoDto) ;
     
     /**
     * @Description:  TODO 获取产品详情

modules/admin/src/main/java/com/fire/admin/service/impl/FireProductServiceImpl.java

@@ -7,6 +7,7 @@ import com.fire.admin.dto.FireProductInfoDto;
 import com.fire.admin.mapper.FireProductMapper;
 import com.fire.admin.service.FireProductService;
 import com.fire.admin.util.EnumUtils;
+import com.fire.admin.util.SysOperatingAspect;
 import com.fire.admin.vo.FireProductInfoVo;
 import com.fire.dto.FireProductInfo;
 import com.fire.utils.date.DateUtils;
@@ -47,7 +48,7 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
      */
     @Override
     public int insertProductInfo(FireProductInfoDto fireProductInfoDto) {
-
+        log.info("新增产品传递参数为：【{}】",fireProductInfoDto.toString());
         FireProductInfo productInfo = FireProductInfo.builder().packageId(fireProductInfoDto.getPackageId())
                 .productCode(fireProductInfoDto.getProductCode())
                 .productName(fireProductInfoDto.getProductName())
@@ -57,9 +58,10 @@ public class FireProductServiceImpl extends ServiceImpl<FireProductMapper, FireP
                 .createTime(DateUtils.strformatDatetime(LocalDateTime.now()))
                 .areaNum(EnumUtils.convert(fireProductInfoDto.getAreaName()))
                 .areaName(fireProductInfoDto.getAreaName())
+                .creator(SysOperatingAspect.getLoginUser())
                 .operator(fireProductInfoDto.getOperator()).build();
-        int insert = this.baseMapper.insert(productInfo);
         log.info("新增产品，产品适用于客户和通道。产品信息为：【{}】", productInfo.toString());
+        int insert = this.baseMapper.insert(productInfo);
         if (insert > 0) {
 
             // TODO 发送消息到 产品的 TOPIC

modules/admin/src/main/java/com/fire/admin/util/SysOperatingAspect.java

@@ -1,48 +1,30 @@
-/*
+
 package com.fire.admin.util;
 
+import ch.qos.logback.core.util.COWArrayList;
 import com.fire.dto.system.SysOperatingator;
-import lombok.extern.slf4j.Slf4j;
-import org.aopalliance.intercept.Joinpoint;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-import org.aspectj.lang.annotation.*;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
-
-import javax.servlet.http.HttpServletRequest;
-import java.time.Instant;
-import java.util.Objects;
-
-*/
+
+
 /**
  * @author: liuliu
  * @ClassName: SysOperatingAspect
  * @Description: TODO
  * @date: 2021-05-18 11:51
- *//*
+ */
 
-@Slf4j
-@Aspect
-@Component
-public class SysOperatingAspect {
 
-    private ThreadLocal<SysOperatingator> sysOperatingator = new ThreadLocal<>();
+public class SysOperatingAspect {
 
 
-    @Pointcut("execution(public * com.fire.admin.rest..*.*(..))")
-    public void webLog(){}
+    private static ThreadLocal<SysOperatingator> sysOperatingator = new ThreadLocal<>();
 
-    @Before(value = "sysOperatingAspect()")
-    public String beforeGetOperatingator(Joinpoint joinpoint) throws Throwable {
+    public static String getLoginUser()  {
         SysOperatingator ator = new SysOperatingator();
         sysOperatingator.set(ator);
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
         PreSecurityUser securityUser = SecurityUtil.getUser();
         ator.setCreator(securityUser.getUsername());
         return ator.getCreator();
     }
 
 }
-*/
+