Merge branch 'test'

src/main/java/com/fdkankan/manage/controller/IncrementOrderMgController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.manage.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 增值权益订单表 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/service/manage/incrementOrderMg")
+public class IncrementOrderMgController {
+
+}
+

src/main/java/com/fdkankan/manage/controller/IncrementUseTypeController.java

@@ -0,0 +1,32 @@
+package com.fdkankan.manage.controller;
+
+
+import com.fdkankan.manage.common.ResultData;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@RestController
+@RequestMapping("/service/manage/incrementUseType")
+public class IncrementUseTypeController {
+
+    @Autowired
+    IIncrementUseTypeService incrementUseTypeService;
+
+    @GetMapping("/allList")
+    public ResultData allList(){
+        return ResultData.ok(incrementUseTypeService.list());
+    }
+}
+

src/main/java/com/fdkankan/manage/entity/IncrementOrderMg.java

@@ -0,0 +1,172 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 增值权益订单表
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_increment_order_mg")
+public class IncrementOrderMg implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    @TableField("order_sn")
+    private String orderSn;
+
+    /**
+     * 金额
+     */
+    @TableField("amount")
+    private BigDecimal amount;
+
+    /**
+     * 支付宝的交易号或者微信支付订单号
+     */
+    @TableField("number")
+    private String number;
+
+    /**
+     * 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他
+     */
+    @TableField("pay_type")
+    private Integer payType;
+
+    /**
+     * 状态，0或-1表示未付款，-2表示已退款,1表示已付款
+     */
+    @TableField("pay_status")
+    private Integer payStatus;
+
+    /**
+     * 状态，1表示新增值权益，2表示续费增值权益  3表示增值权益1月
+     */
+    @TableField("status")
+    private Integer status;
+
+    /**
+     * 交易时间
+     */
+    @TableField("trade_time")
+    private Date tradeTime;
+
+    /**
+     * 用户表t_user的id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 增值权益表t_user_increment的id,status为2时才有
+     */
+    @TableField("increment_id")
+    private Long incrementId;
+
+    /**
+     * 购买数量
+     */
+    @TableField("count")
+    private Integer count;
+
+    /**
+     * 0表示国内订单，1表示国外订单
+     */
+    @TableField("abroad")
+    private Integer abroad;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("increment_type")
+    private Integer incrementType;
+
+    /**
+     * 权益级别  PR 年会员  SE 月会员
+     */
+    @TableField("member_levels")
+    private String memberLevels;
+
+    @TableField("month_qy")
+    private Integer monthQy;
+
+    /**
+     * 时区差，单位分钟
+     */
+    @TableField("time_zone_off")
+    private Integer timeZoneOff;
+
+    /**
+     * 客户名称
+     */
+    @TableField("customer_name")
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    @TableField("customer_type")
+    private Integer customerType;
+
+    /**
+     * 终端客户
+     */
+    @TableField("end_customer")
+    private String endCustomer;
+
+    /**
+     * 使用类型
+     */
+    @TableField("use_type")
+    private Integer useType;
+
+    /**
+     * 项目号
+     */
+    @TableField("project_num")
+    private String projectNum;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

src/main/java/com/fdkankan/manage/entity/IncrementUseType.java

@@ -0,0 +1,57 @@
+package com.fdkankan.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Getter
+@Setter
+@TableName("t_increment_use_type")
+public class IncrementUseType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 权益使用类型
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 名称
+     */
+    @TableField("name")
+    private String name;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A",delval = "I")
+    private String recStatus;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 是否有项目号 0 无，1有
+     */
+    @TableField("type")
+    private Integer type;
+
+
+}

src/main/java/com/fdkankan/manage/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage", getTables(new String[]{
-                "t_camera_type",
+                "t_increment_use_type",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage/mapper/IIncrementOrderMgMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 增值权益订单表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Mapper
+public interface IIncrementOrderMgMapper extends BaseMapper<IncrementOrderMg> {
+
+}

src/main/java/com/fdkankan/manage/mapper/IIncrementUseTypeMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.mapper;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Mapper
+public interface IIncrementUseTypeMapper extends BaseMapper<IncrementUseType> {
+
+}

src/main/java/com/fdkankan/manage/service/IIncrementOrderMgService.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage.vo.request.UserIncrementParam;
+
+/**
+ * <p>
+ * 增值权益订单表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+public interface IIncrementOrderMgService extends IService<IncrementOrderMg> {
+
+    void addOrder(UserIncrementParam param);
+}

src/main/java/com/fdkankan/manage/service/IIncrementUseTypeService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.manage.service;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+public interface IIncrementUseTypeService extends IService<IncrementUseType> {
+
+}

src/main/java/com/fdkankan/manage/service/ISceneProService.java

@@ -25,6 +25,7 @@ public interface ISceneProService extends IService<ScenePro> {
     void unbindCamera(Long cameraId);
 
     void lockOrUnLockBySpace(CameraDetail cameraDetail,Long cameraId,Integer payStatus);
+    void lockOrUnLockBySpace(Long cameraId);
     void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus);
 
     List<ScenePro> getListByCameraId(Long cameraId);

src/main/java/com/fdkankan/manage/service/impl/IncrementOrderMgServiceImpl.java

@@ -0,0 +1,43 @@
+package com.fdkankan.manage.service.impl;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.fdkankan.manage.entity.IncrementOrderMg;
+import com.fdkankan.manage.mapper.IIncrementOrderMgMapper;
+import com.fdkankan.manage.service.IIncrementOrderMgService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.manage.util.Dateutils;
+import com.fdkankan.manage.vo.request.UserIncrementParam;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 增值权益订单表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Service
+public class IncrementOrderMgServiceImpl extends ServiceImpl<IIncrementOrderMgMapper, IncrementOrderMg> implements IIncrementOrderMgService {
+
+    @Override
+    public void addOrder(UserIncrementParam param) {
+        IncrementOrderMg incrementOrderMg = new IncrementOrderMg();
+        incrementOrderMg.setOrderSn(Dateutils.getOrderSn());
+        incrementOrderMg.setUserId(param.getUserId());
+        incrementOrderMg.setCount(param.getCount());
+        incrementOrderMg.setAbroad(0);
+        incrementOrderMg.setIncrementType(param.getIncrementTypeId());
+        incrementOrderMg.setMemberLevels("");
+        incrementOrderMg.setMonthQy(param.getMonthQy());
+        incrementOrderMg.setTimeZoneOff(0);
+        incrementOrderMg.setCustomerName(param.getCustomerName());
+        incrementOrderMg.setCustomerType(param.getCustomerType());
+        incrementOrderMg.setEndCustomer(param.getEndCustomer());
+        incrementOrderMg.setUseType(param.getUseType());
+        incrementOrderMg.setProjectNum(param.getProjectNum());
+        incrementOrderMg.setRemark(param.getRemark());
+        this.save(incrementOrderMg);
+    }
+}

src/main/java/com/fdkankan/manage/service/impl/IncrementUseTypeServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.manage.service.impl;
+
+import com.fdkankan.manage.entity.IncrementUseType;
+import com.fdkankan.manage.mapper.IIncrementUseTypeMapper;
+import com.fdkankan.manage.service.IIncrementUseTypeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-07-06
+ */
+@Service
+public class IncrementUseTypeServiceImpl extends ServiceImpl<IIncrementUseTypeMapper, IncrementUseType> implements IIncrementUseTypeService {
+
+}

src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
 import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -150,14 +151,23 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     public void lockOrUnLockBySpace(CameraDetail cameraDetail, Long cameraId, Integer payStatus) {
 
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraDetail.getCameraId());
-        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, JSONObject.toJSONString(scenePayStatusVo));
+        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
+        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
+    }
+
+    @Override
+    public void lockOrUnLockBySpace(Long cameraId) {
+        ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(cameraId);
+        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
+        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
     }
 
     @Override
     public void lockOrUnLockBySpace(ScenePro scenePro, ScenePlus scenePlus,Integer payStatus) {
         Long sceneId = scenePro == null ? scenePlus.getId() : scenePro.getId();
         ScenePayStatusVo scenePayStatusVo = new ScenePayStatusVo(sceneId,payStatus);
-        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, JSONObject.toJSONString(scenePayStatusVo));
+        Map<String, Object> map = BeanUtil.beanToMap(scenePayStatusVo);
+        rabbitMqProducer.sendByWorkQueue(MqQueueUtil.ucenterScenePayStatusQueue, map);
     }
 
 
@@ -225,7 +235,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     }
 
     @Override
-    public void move(SceneParam param) {
+    public synchronized void move(SceneParam param) {
         Camera camera = cameraService.getBySnCode(param.getSnCode());
         if(camera == null){
             throw new BusinessException(ResultCode.CAMERA_SN_NOT_EXIST);
@@ -254,7 +264,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             dataSource = scenePlusExt.getDataSource();
         }
         space = space == null ? 0 :space;
-
+        cameraDetailService.initSpace(cameraDetail.getCameraId());
         Boolean checkSpace = cameraDetailService.checkSpace(cameraDetail, space);
         //深时场景无限容量
         if(cameraDetail.getType() != 11 && cameraDetail.getType() != 10 && !checkSpace){
@@ -512,6 +522,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         if(cameraId != null){
             cameraDetailService.initSpace(cameraId);
+            this.lockOrUnLockBySpace(cameraId);
         }
         sceneDelLogService.saveLog(num, StpUtil.getLoginId());
     }

src/main/java/com/fdkankan/manage/service/impl/SysUserServiceImpl.java

@@ -1,5 +1,7 @@
 package com.fdkankan.manage.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.excel.util.BeanMapUtils;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -110,8 +112,10 @@ public class SysUserServiceImpl extends ServiceImpl<ISysUserMapper, SysUser> imp
                 throw new BusinessException(ResultCode.OLD_PASSWORD_ERROR);
             }
         }
-        if(sysUser.getId() != null){
-            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.manageToSaleQueue,JSONObject.toJSONString(new ManageToSaleParam(MqQueueUtil.updateUserCommand,sysUser)));
+        if(sysUser.getId() != null && !StringUtils.isEmpty(sysUser.getNickName())){
+            ManageToSaleParam saleParam = new ManageToSaleParam(MqQueueUtil.updateUserCommand, sysUser);
+            Map<String, Object> map = BeanUtil.beanToMap(saleParam);
+            rabbitMqProducer.sendByWorkQueue(MqQueueUtil.manageToSaleQueue,map);
         }
         this.saveOrUpdate(sysUser);
     }

src/main/java/com/fdkankan/manage/service/impl/UserIncrementServiceImpl.java

@@ -46,6 +46,8 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
     ICameraIncrementLogService cameraIncrementLogService;
     @Autowired
     ISceneProService sceneProService;
+    @Autowired
+    IIncrementOrderMgService iIncrementOrderMgService;
 
     @Override
     public Long getValidCountByUserId(Long userId) {
@@ -152,6 +154,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
         if(incrementType == null){
             throw new BusinessException(ResultCode.INCREMENT_TYPE_EMPTY);
         }
+
         for (int i = 0 ; i<param.getCount() ;i++) {
             UserIncrement userIncrement = new UserIncrement();
             String date = DateUtil.date2String(new Date(), DateUtil.DEFAULT_DATE_FORMAT);

src/main/java/com/fdkankan/manage/test/TestController.java

@@ -1,40 +1,24 @@
 package com.fdkankan.manage.test;
 
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.amazonaws.auth.AWSStaticCredentialsProvider;
-import com.amazonaws.auth.BasicAWSCredentials;
-import com.amazonaws.regions.Regions;
-import com.amazonaws.services.s3.AmazonS3;
-import com.amazonaws.services.s3.AmazonS3ClientBuilder;
-import com.amazonaws.services.s3.model.GetObjectRequest;
-import com.amazonaws.services.s3.model.S3Object;
-import com.fdkankan.common.util.FileUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.fdkankan.elasticsearch.service.DocumentService;
 import com.fdkankan.elasticsearch.service.IndexService;
 import com.fdkankan.elasticsearch.service.QueryDataService;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.manage.common.OssPath;
-import com.fdkankan.manage.common.ResultCode;
-import com.fdkankan.manage.common.ResultData;
-import com.fdkankan.common.util.SecurityUtil;
-import com.fdkankan.manage.common.FilePath;
+import com.fdkankan.manage.common.*;
+import com.fdkankan.manage.entity.Camera;
+import com.fdkankan.manage.entity.CameraDetail;
 import com.fdkankan.manage.exception.BusinessException;
-import com.fdkankan.manage.httpClient.service.LaserService;
 import com.fdkankan.manage.service.ICameraDetailService;
 import com.fdkankan.manage.service.ICameraService;
 import com.fdkankan.manage.service.IScenePlusService;
 import com.fdkankan.manage.service.ISceneProService;
-import com.fdkankan.manage.util.Dateutils;
 import com.fdkankan.manage.util.ExcelUtil;
 import lombok.extern.slf4j.Slf4j;
-import org.elasticsearch.rest.RestStatus;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
@@ -50,6 +34,8 @@ public class TestController {
     @Autowired
     ISceneProService sceneProService;
     @Autowired
+    IScenePlusService scenePlusService;
+    @Autowired
     FYunFileServiceInterface fYunFileServiceInterface;
     @Autowired
     ICameraService cameraService;
@@ -124,19 +110,160 @@ public class TestController {
         return ResultData.ok();
     }
 
+    @GetMapping("/initCamera")
+    public ResultData initCamera(){
+        String[] snCodes = this.getSnCodes();
+        List<String> snCodeList = Arrays.asList(snCodes);
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        wrapper.notIn(Camera::getSnCode,snCodeList);
+        List<Camera> list = cameraService.list(wrapper);
+        for (Camera camera : list) {
+            if(camera == null){
+                continue;
+            }
+            CameraDetail cameraDetail = cameraDetailService.getByCameraId(camera.getId());
+            if(cameraDetail == null){
+                continue;
+            }
+            Long proSpace = sceneProService.getCountByCameraId(cameraDetail.getCameraId());
+            Long plusSpace = scenePlusService.getCountByCameraId(cameraDetail.getCameraId());
+            LambdaUpdateWrapper<CameraDetail> wrapper1 = new LambdaUpdateWrapper<>();
+            wrapper1.eq(CameraDetail::getId,cameraDetail.getId());
+            wrapper1.set(CameraDetail::getUnit,"SP");
+            wrapper1.set(CameraDetail::getTotalSpace,5);
+            wrapper1.set(CameraDetail::getUsedSpace,(plusSpace == null ?0L:plusSpace )+( proSpace == null ?0L:proSpace));
+            cameraDetailService.update(wrapper1);
+            sceneProService.lockOrUnLockBySpace(cameraDetail.getCameraId());
+        }
 
-    public static void main(String[] args) {
-        BasicAWSCredentials awsCreds = new BasicAWSCredentials("AKIAWCV5QFZ3ZNELKYUY", "epS5ghyR4LJ7rxk/qJO9ZYh6m9Oz6g5haKDu4yws");
-        String homePath  ="scene_view_data/KJ-t-eur-DBDhqfXKYCK/data/status.json";
+        return ResultData.ok();
+    }
 
-        AmazonS3 amazonS3 = AmazonS3ClientBuilder.standard().
-                withCredentials(new AWSStaticCredentialsProvider(awsCreds))
-                .withRegion(Regions.EU_WEST_2)//s3 地区位置
-                .build();
-        boolean b = amazonS3.doesObjectExist("test-4dkankan", homePath);// Works
-        System.out.println(b);
-        GetObjectRequest request  = new GetObjectRequest("test-4dkankan",homePath);
-        S3Object object = amazonS3.getObject(request);
-        System.out.println(object);
+    private String[] getSnCodes(){
+        String res [] = {
+                "916ED6689",
+                "0239E5CD0",
+                "067E15841",
+                "07C3DA2E1",
+                "07EC6E0DC",
+                "06FFCBDA1",
+                "061D18D73",
+                "030285552",
+                "06EE53219",
+                "02452945D",
+                "060C4CB6A",
+                "06FAE7E46",
+                "06F860091",
+                "072D80097",
+                "073BD9E33",
+                "04AE6E2F5",
+                "071123F88",
+                "071256BC7",
+                "071210632",
+                "071265E8B",
+                "070D743D2",
+                "0700FA837",
+                "0703A543A",
+                "070B42A10",
+                "070BE22BA",
+                "0711305CA",
+                "0694087DB",
+                "070273265",
+                "071624ACD",
+                "072FAE15E",
+                "07F3DD250",
+                "0707D2A2C",
+                "0266F55AE",
+                "021DD5E87",
+                "02A80E87F",
+                "02C6209A2",
+                "02FE298D8",
+                "067B891A9",
+                "0408E93F5",
+                "0650ABFFB",
+                "070DE64AF",
+                "02D9E2F29",
+                "06B38A34F",
+                "063DE2E04",
+                "072ACF5F2",
+                "07288B5BF",
+                "02FFAB589",
+                "072D27B03",
+                "075BB0B0A",
+                "033869CC0",
+                "06EA790F7",
+                "06105B947",
+                "04FC2C13C",
+                "065E1EA54",
+                "06050CCD2",
+                "065DAAB57",
+                "06376454A",
+                "069CE5379",
+                "06FE7A53F",
+                "06DA9EADA",
+                "062B959FB",
+                "07058CC1C",
+                "0721ADBCF",
+                "0708E15A3",
+                "073B6BE96",
+                "07757C452",
+                "076A4A2C2",
+                "07467B94D",
+                "07F838850",
+                "076AAAA05",
+                "0766855A9",
+                "0765692AA",
+                "077A0D967",
+                "0707D67D9",
+                "07676CC0C",
+                "074C7BE97",
+                "0772F50DA",
+                "0712A8FA0",
+                "0768CD82B",
+                "0764A39B5",
+                "0771B69E4",
+                "07F66673D",
+                "077705FEE",
+                "07696266D",
+                "076F8D814",
+                "077EBF4FE",
+                "07109D1B0",
+                "06F83452B",
+                "0300B6F0A",
+                "0774EA21B",
+                "070D890E8",
+                "077E7B417",
+                "07DE244F1",
+                "070591078",
+                "03451435F",
+                "0775B3B58",
+                "07239FFFB",
+                "070E51723",
+                "076F1650D",
+                "07199F0E6",
+                "0703C265E",
+                "07451A77B",
+                "0711ABE58",
+                "07BE0B836",
+                "070AFD6DD",
+                "070A40E42",
+                "07143F457",
+                "0706CE0EC",
+                "0713DCCC0",
+                "073AFACA6",
+                "025D3928F",
+                "02D874C48",
+                "06042AB08",
+                "04CA21B73",
+                "02F7D171B",
+                "02C17AE5E",
+                "024696CB5",
+                "4DKKP01B000127",
+                "4DKKP01B000114",
+                "4DKKP01B000138",
+                "4DKKP01B000160",
+                "4DKKP01B000163",
+        };
+        return res;
     }
 }

src/main/java/com/fdkankan/manage/util/Dateutils.java

@@ -16,6 +16,7 @@ public class Dateutils {
     public static int  DAY =  Calendar.DAY_OF_MONTH;
     public static int  WEEK =  Calendar.WEEK_OF_MONTH;
     public static int  MONTH =  Calendar.MONTH;
+    public static String orderSn = "yyyyMMddHHmmssSSS";
 
     /**
      * 获取指定时间区间的所有数据（包含日期和月份）
@@ -180,4 +181,15 @@ public class Dateutils {
         nowTime.add(Calendar.MINUTE, ~minute);
         return sdf.format(nowTime.getTime());
     }
+
+    public synchronized static String getOrderSn() {
+        try {
+            Thread.sleep(1L);
+        }catch (Exception e){
+
+        }
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(orderSn);
+        Date date = new Date();
+        return simpleDateFormat.format(date);
+    }
 }

src/main/java/com/fdkankan/manage/util/RsaUtils.java

@@ -37,7 +37,7 @@ public class RsaUtils {
 		System.out.println("公钥："+publicKey);
 		System.out.println("私钥："+privateKey);
 
-		String ciphertext = rsa.encipher("4DKKPRO_0291FC698", publicKey);
+		String ciphertext = rsa.encipher("4DKKPRO_0292D9F77", publicKey);
 		System.out.println(String.format("密文："+ciphertext));
 		String deTxt = rsa.decipher(ciphertext, privateKey);
 		System.out.println(deTxt);

src/main/java/com/fdkankan/manage/vo/request/UserIncrementParam.java

@@ -1,5 +1,6 @@
 package com.fdkankan.manage.vo.request;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 @Data
@@ -12,4 +13,34 @@ public class UserIncrementParam {
     private Integer incrementTypeId;
 
     private Integer monthQy;
+
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    private Integer customerType;
+
+    /**
+     * 终端客户
+     */
+    private String endCustomer;
+
+    /**
+     * 使用类型
+     */
+    private Integer useType;
+
+    /**
+     * 项目号
+     */
+    private String projectNum;
+
+    /**
+     * 备注
+     */
+    private String remark;
 }

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -24,6 +24,9 @@ public class IncrementOrderVo {
     @ExcelProperty("用户账号")
     private String userName;                //用户账号
 
+    @ExcelProperty("客户名称")
+    private String nickName;                //昵称
+
     @ExcelProperty("订单金额")
     private BigDecimal amount;              //订单金额
 

src/main/resources/mapper/manage/IncrementOrderMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
-        select o.* ,u.user_name from  t_increment_order o
+        select o.* ,u.user_name,u.nick_name from  t_increment_order o
         left join t_user u on o.user_id = u.id
         WHERE o.rec_status = 'A' and o.pay_status = '1'
         <if test="param.orderSn !=null and param.orderSn !='' ">

src/main/resources/mapper/manage/IncrementOrderMgMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IIncrementOrderMgMapper">
+
+</mapper>

src/main/resources/mapper/manage/IncrementUseTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage.mapper.IIncrementUseTypeMapper">
+
+</mapper>

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -29,7 +29,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         SELECT * FROM(
-        select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
+        select s.id,s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
         ,null as algorithmTime,data_source
         from t_scene_pro s
@@ -39,7 +39,7 @@
         </if>
         and is_upgrade = 0
         UNION
-        select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
+        select s.id,s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
         ,algorithm_time,data_source
         from t_scene_plus s
@@ -49,7 +49,7 @@
             and s.title like concat ('%',#{param.sceneName},'%')
         </if>
         ) as tb
-        order by ${param.field}  ${param.order}
+        order by ${param.field} ${param.order} ,id desc
     </select>
 
     <sql id="commonWhere">