yzc 2 anni fa
parent
commit
77b7414872
27 ha cambiato i file con 670 aggiunte e 8 eliminazioni
  1. 17 0
      code/src/test/java/victoriatouristDataSource.java
  2. 5 0
      hx-admin/pom.xml
  3. 4 0
      hx-admin/src/main/resources/application-dev.yml
  4. 4 0
      hx-admin/src/main/resources/application-prod.yml
  5. 4 0
      hx-admin/src/main/resources/application-test.yml
  6. 1 0
      hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java
  7. 11 8
      hx-oa/src/main/java/com/fjhx/oa/service/netdisk/impl/NetdiskServiceImpl.java
  8. 25 0
      hx-victoriatourist/pom.xml
  9. 43 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/abnormal/AbnormalDetailsController.java
  10. 34 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/abnormal/AbnormalInfoController.java
  11. 17 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalDetailsDto.java
  12. 22 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalDetailsSelectDto.java
  13. 17 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalInfoDto.java
  14. 22 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalInfoSelectDto.java
  15. 57 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalDetails.java
  16. 62 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalInfo.java
  17. 19 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/vo/AbnormalDetailsVo.java
  18. 20 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/vo/AbnormalInfoVo.java
  19. 26 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/abnormal/AbnormalDetailsMapper.java
  20. 26 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/abnormal/AbnormalInfoMapper.java
  21. 31 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/AbnormalDetailsService.java
  22. 25 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/AbnormalInfoService.java
  23. 83 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java
  24. 43 0
      hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalInfoServiceImpl.java
  25. 22 0
      hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalDetailsMapper.xml
  26. 23 0
      hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalInfoMapper.xml
  27. 7 0
      pom.xml

+ 17 - 0
code/src/test/java/victoriatouristDataSource.java

@@ -0,0 +1,17 @@
+import fly.generator.GeneratorApplication;
+
+public class victoriatouristDataSource {
+
+    public static void main(String[] args) {
+        GeneratorApplication.builder()
+                .url("jdbc:mysql://36.134.91.96:17330/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true")
+                .username("fjhx2012mysql")
+                .password("3PN-Mzn#vnP&q6d")
+                .port(9989)
+                .module("hx-victoriatourist")
+                .parent("com.fjhx.victoriatourist")
+                .superServiceClass("com.ruoyi.common.core.service.BaseService")
+                .build();
+    }
+
+}

+ 5 - 0
hx-admin/pom.xml

@@ -69,6 +69,11 @@
             <artifactId>hx-mail</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-victoriatourist</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

+ 4 - 0
hx-admin/src/main/resources/application-dev.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                victoriatourist:
+                    url: jdbc:mysql://36.134.91.96:17330/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 common:
                     url: jdbc:mysql://36.134.91.96:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

+ 4 - 0
hx-admin/src/main/resources/application-prod.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                victoriatourist:
+                    url: jdbc:mysql://127.0.0.1:28643/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 common:
                     url: jdbc:mysql://127.0.0.1:28643/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

+ 4 - 0
hx-admin/src/main/resources/application-test.yml

@@ -6,6 +6,10 @@ spring:
             strict: true
             primary: base
             datasource:
+                victoriatourist:
+                    url: jdbc:mysql://127.0.0.1:17330/bytesailing_victoriatourist?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
+                    username: fjhx2012mysql
+                    password: 3PN-Mzn#vnP&q6d
                 common:
                     url: jdbc:mysql://127.0.0.1:17330/bytesailing_common?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=Asia/Shanghai
                     username: fjhx2012mysql

+ 1 - 0
hx-common/src/main/java/com/fjhx/common/constant/SourceConstant.java

@@ -25,5 +25,6 @@ public interface SourceConstant {
     String MAIL = "mail";
 
     String COMMON = "common";
+    String VICTORIATOURIST = "victoriatourist";
 
 }

+ 11 - 8
hx-oa/src/main/java/com/fjhx/oa/service/netdisk/impl/NetdiskServiceImpl.java

@@ -139,15 +139,18 @@ public class NetdiskServiceImpl extends ServiceImpl<NetdiskMapper, Netdisk> impl
     @Override
     public void edit(NetdiskDto netdiskDto) {
         this.updateById(netdiskDto);
-        DynamicDataSourceContextHolder.push(SourceConstant.BASE);
-        FileInfo fileInfo = fileInfoService.getOne(q -> q.eq(FileInfo::getBusinessId, netdiskDto.getId()));
-        if (ObjectUtil.isNotEmpty(fileInfo)) {
-            fileInfo.setFileName(netdiskDto.getName());
-            fileInfoService.updateById(fileInfo);
-        } else {
-            throw new ServiceException("文件信息不存在");
+        Netdisk byId = getById(netdiskDto.getId());
+        if(byId.getType()==2) {
+            DynamicDataSourceContextHolder.push(SourceConstant.BASE);
+            FileInfo fileInfo = fileInfoService.getOne(q -> q.eq(FileInfo::getBusinessId, netdiskDto.getId()));
+            if (ObjectUtil.isNotEmpty(fileInfo)) {
+                fileInfo.setFileName(netdiskDto.getName());
+                fileInfoService.updateById(fileInfo);
+            } else {
+                throw new ServiceException("文件信息不存在");
+            }
+            DynamicDataSourceContextHolder.poll();
         }
-        DynamicDataSourceContextHolder.poll();
     }
 
     @GlobalTransactional

+ 25 - 0
hx-victoriatourist/pom.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>com.fjhx</groupId>
+        <artifactId>bytesailing</artifactId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>hx-victoriatourist</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-base</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fjhx</groupId>
+            <artifactId>hx-common</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

+ 43 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/abnormal/AbnormalDetailsController.java

@@ -0,0 +1,43 @@
+package com.fjhx.victoriatourist.controller.abnormal;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsDto;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 异常处理详情 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/abnormalDetails")
+public class AbnormalDetailsController {
+
+    @Autowired
+    private AbnormalDetailsService abnormalDetailsService;
+
+    /**
+     * 异常处理详情分页
+     */
+    @PostMapping("/page")
+    public Page<AbnormalDetailsVo> page(@RequestBody AbnormalDetailsSelectDto dto) {
+        return abnormalDetailsService.getPage(dto);
+    }
+
+    /**
+     * 异常处理详情新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AbnormalDetailsDto abnormalDetailsDto) {
+        abnormalDetailsService.add(abnormalDetailsDto);
+    }
+
+}

+ 34 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/controller/abnormal/AbnormalInfoController.java

@@ -0,0 +1,34 @@
+package com.fjhx.victoriatourist.controller.abnormal;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalInfoVo;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalInfoSelectDto;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+
+/**
+ * <p>
+ * 异常记录 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@RestController
+@RequestMapping("/abnormalInfo")
+public class AbnormalInfoController {
+
+    @Autowired
+    private AbnormalInfoService abnormalInfoService;
+
+    /**
+     * 异常记录分页
+     */
+    @PostMapping("/page")
+    public Page<AbnormalInfoVo> page(@RequestBody AbnormalInfoSelectDto dto) {
+        return abnormalInfoService.getPage(dto);
+    }
+
+}

+ 17 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalDetailsDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.abnormal.dto;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常处理详情新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalDetailsDto extends AbnormalDetails {
+
+}

+ 22 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalDetailsSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.victoriatourist.entity.abnormal.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常处理详情列表查询入参实体
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalDetailsSelectDto extends BaseSelectDto {
+
+    /**
+     * 异常id
+     */
+    private Long abnormalInfoId;
+
+}

+ 17 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalInfoDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.victoriatourist.entity.abnormal.dto;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常记录新增编辑入参实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalInfoDto extends AbnormalInfo {
+
+}

+ 22 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/dto/AbnormalInfoSelectDto.java

@@ -0,0 +1,22 @@
+package com.fjhx.victoriatourist.entity.abnormal.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常记录列表查询入参实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalInfoSelectDto extends BaseSelectDto {
+
+    /**异常类型*/
+    private Integer type;
+    /**异常状态*/
+    private Integer status;
+
+}

+ 57 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalDetails.java

@@ -0,0 +1,57 @@
+package com.fjhx.victoriatourist.entity.abnormal.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 异常处理详情
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+@TableName("abnormal_details")
+public class AbnormalDetails extends BasePo {
+
+    /**
+     * 异常记录id
+     */
+    private Long abnormalInfoId;
+
+    /**
+     * 处理说明
+     */
+    private String explain;
+
+    /**
+     * 1已处理  0未处理
+     */
+    private Integer status;
+
+    /**
+     * 跟进用户
+     */
+    private Long handleUser;
+
+    /**
+     * 下一个跟进用户
+     */
+    private Long nextHandleUser;
+
+    /**
+     * 异常处理方式
+     */
+    private String processing;
+
+    /**
+     * 跟进时间
+     */
+    private Date handleTime;
+
+}

+ 62 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/po/AbnormalInfo.java

@@ -0,0 +1,62 @@
+package com.fjhx.victoriatourist.entity.abnormal.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 异常记录
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+@TableName("abnormal_info")
+public class AbnormalInfo extends BasePo {
+
+    /**
+     * 异常来源 10到货质检 20京东订单出库 30调仓
+     */
+    private Integer type;
+
+    /**
+     * 关联id
+     */
+    private Long linkId;
+
+    /**
+     * 关联编码
+     */
+    private String linkCode;
+
+    /**
+     * 异常说明
+     */
+    private String title;
+
+    /**
+     * 状态 0未处理 1跟进中 2已处理
+     */
+    private Integer status;
+
+    /**
+     * 最近处理用户
+     */
+    private Long handleUser;
+
+    /**
+     * 最近处理时间
+     */
+    private Date handleTime;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

+ 19 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/vo/AbnormalDetailsVo.java

@@ -0,0 +1,19 @@
+package com.fjhx.victoriatourist.entity.abnormal.vo;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常处理详情列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalDetailsVo extends AbnormalDetails {
+    /**跟进用户名*/
+    private String handleUserName;
+
+}

+ 20 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/entity/abnormal/vo/AbnormalInfoVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.victoriatourist.entity.abnormal.vo;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 异常记录列表查询返回值实体
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@Getter
+@Setter
+public class AbnormalInfoVo extends AbnormalInfo {
+
+    /**最近处理人*/
+    private String handleUserName;
+
+}

+ 26 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/abnormal/AbnormalDetailsMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.victoriatourist.mapper.abnormal;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 异常处理详情 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+public interface AbnormalDetailsMapper extends BaseMapper<AbnormalDetails> {
+
+    /**
+     * 异常处理详情分页
+     */
+    Page<AbnormalDetailsVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AbnormalDetails> wrapper);
+
+}

+ 26 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/mapper/abnormal/AbnormalInfoMapper.java

@@ -0,0 +1,26 @@
+package com.fjhx.victoriatourist.mapper.abnormal;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalInfoVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+
+/**
+ * <p>
+ * 异常记录 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+public interface AbnormalInfoMapper extends BaseMapper<AbnormalInfo> {
+
+    /**
+     * 异常记录分页
+     */
+    Page<AbnormalInfoVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AbnormalInfo> wrapper);
+
+}

+ 31 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/AbnormalDetailsService.java

@@ -0,0 +1,31 @@
+package com.fjhx.victoriatourist.service.abnormal;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsDto;
+
+
+/**
+ * <p>
+ * 异常处理详情 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+public interface AbnormalDetailsService extends BaseService<AbnormalDetails> {
+
+    /**
+     * 异常处理详情分页
+     */
+    Page<AbnormalDetailsVo> getPage(AbnormalDetailsSelectDto dto);
+
+    /**
+     * 异常处理详情新增
+     */
+    void add(AbnormalDetailsDto abnormalDetailsDto);
+
+}

+ 25 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/AbnormalInfoService.java

@@ -0,0 +1,25 @@
+package com.fjhx.victoriatourist.service.abnormal;
+
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalInfoVo;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalInfoSelectDto;
+
+
+/**
+ * <p>
+ * 异常记录 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+public interface AbnormalInfoService extends BaseService<AbnormalInfo> {
+
+    /**
+     * 异常记录分页
+     */
+    Page<AbnormalInfoVo> getPage(AbnormalInfoSelectDto dto);
+
+}

+ 83 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalDetailsServiceImpl.java

@@ -0,0 +1,83 @@
+package com.fjhx.victoriatourist.service.abnormal.impl;
+
+import cn.hutool.core.lang.Assert;
+import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.socket.service.WebSocketServer;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsDto;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalDetailsSelectDto;
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalDetails;
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo;
+import com.fjhx.victoriatourist.mapper.abnormal.AbnormalDetailsMapper;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalDetailsService;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
+import com.obs.services.internal.ServiceException;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+
+/**
+ * <p>
+ * 异常处理详情 服务实现类
+ * </p>
+ *
+ * @author
+ * @since 2023-04-11
+ */
+@DS(SourceConstant.VICTORIATOURIST)
+@Service
+public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMapper, AbnormalDetails> implements AbnormalDetailsService {
+    @Autowired
+    AbnormalInfoService abnormalInfoService;
+
+    @Override
+    public Page<AbnormalDetailsVo> getPage(AbnormalDetailsSelectDto dto) {
+        IWrapper<AbnormalDetails> wrapper = getWrapper();
+        wrapper.eq("ad",AbnormalDetails::getAbnormalInfoId, dto.getAbnormalInfoId());
+        wrapper.orderByDesc("ad", AbnormalDetails::getId);
+        Page<AbnormalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //赋值跟进用户名
+        UserUtil.assignmentNickName(page.getRecords(), AbnormalDetails::getHandleUser, AbnormalDetailsVo::setHandleUserName);
+        return page;
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void add(AbnormalDetailsDto abnormalDetailsDto) {
+        Long abnormalInfoId = abnormalDetailsDto.getAbnormalInfoId();
+        if (ObjectUtil.isEmpty(abnormalInfoId)) {
+            throw new ServiceException("异常说明不能为空");
+        }
+        Assert.notEmpty(abnormalDetailsDto.getExplain(), "异常说明不能为空");
+        Integer status = abnormalDetailsDto.getStatus();
+        if (ObjectUtil.isEmpty(status)) {
+            throw new ServiceException("处理状态不能为空");
+        }
+        AbnormalInfo abnormalInfo = new AbnormalInfo();
+        abnormalInfo.setId(abnormalInfoId);
+        abnormalInfo.setStatus(status);
+        abnormalInfo.setHandleUser(abnormalDetailsDto.getHandleUser());
+        abnormalInfo.setHandleTime(abnormalDetailsDto.getHandleTime());
+        abnormalInfoService.updateById(abnormalInfo);
+
+        //如果下一跟进人不为空 就给下一跟进人发送消息
+        if (ObjectUtil.isNotEmpty(abnormalDetailsDto.getNextHandleUser())) {
+            //给下一个跟进人发消息通知
+            JSONObject meassage = new JSONObject();
+            meassage.put("msg", "有异常需要您跟进");
+            meassage.put("abnormalInfoId", abnormalDetailsDto.getAbnormalInfoId().toString());
+            WebSocketServer.sendInfo(abnormalDetailsDto.getNextHandleUser(), 1, meassage);
+        }
+
+        this.save(abnormalDetailsDto);
+    }
+
+}

+ 43 - 0
hx-victoriatourist/src/main/java/com/fjhx/victoriatourist/service/abnormal/impl/AbnormalInfoServiceImpl.java

@@ -0,0 +1,43 @@
+package com.fjhx.victoriatourist.service.abnormal.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.victoriatourist.entity.abnormal.po.AbnormalInfo;
+import com.fjhx.victoriatourist.mapper.abnormal.AbnormalInfoMapper;
+import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.utils.UserUtil;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalInfoVo;
+import com.fjhx.victoriatourist.entity.abnormal.dto.AbnormalInfoSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+
+
+/**
+ * <p>
+ * 异常记录 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2023-04-11
+ */
+@DS(SourceConstant.VICTORIATOURIST)
+@Service
+public class AbnormalInfoServiceImpl extends ServiceImpl<AbnormalInfoMapper, AbnormalInfo> implements AbnormalInfoService {
+
+    @Override
+    public Page<AbnormalInfoVo> getPage(AbnormalInfoSelectDto dto) {
+        IWrapper<AbnormalInfo> wrapper = getWrapper();
+        wrapper.eq(AbnormalInfo::getType, dto.getType())
+                .eq(AbnormalInfo::getStatus, dto.getStatus())
+                .like(AbnormalInfo::getTitle, dto.getKeyword());
+
+        wrapper.orderByDesc("ai", AbnormalInfo::getId);
+        Page<AbnormalInfoVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        //赋值最近操作人
+        UserUtil.assignmentNickName(page.getRecords(),AbnormalInfo::getUpdateUser,AbnormalInfoVo::setHandleUserName);
+        return page;
+    }
+
+}

+ 22 - 0
hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalDetailsMapper.xml

@@ -0,0 +1,22 @@
+<?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.fjhx.victoriatourist.mapper.abnormal.AbnormalDetailsMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalDetailsVo">
+        select
+            ad.id,
+            ad.abnormal_info_id,
+            ad.`explain`,
+            ad.`status`,
+            ad.handle_user,
+            ad.next_handle_user,
+            ad.processing,
+            ad.handle_time,
+            ad.create_user,
+            ad.create_time,
+            ad.update_user,
+            ad.update_time
+        from abnormal_details ad
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 23 - 0
hx-victoriatourist/src/main/resources/mapper/abnormal/AbnormalInfoMapper.xml

@@ -0,0 +1,23 @@
+<?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.fjhx.victoriatourist.mapper.abnormal.AbnormalInfoMapper">
+    <select id="getPage" resultType="com.fjhx.victoriatourist.entity.abnormal.vo.AbnormalInfoVo">
+        select
+            ai.id,
+            ai.type,
+            ai.link_id,
+            ai.link_code,
+            ai.title,
+            ai.status,
+            ai.handle_user,
+            ai.handle_time,
+            ai.remark,
+            ai.create_user,
+            ai.create_time,
+            ai.update_user,
+            ai.update_time
+        from abnormal_info ai
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

+ 7 - 0
pom.xml

@@ -26,6 +26,7 @@
         <module>hx-oa</module>
         <module>hx-purchase</module>
         <module>hx-account</module>
+        <module>hx-victoriatourist</module>
     </modules>
 
     <properties>
@@ -128,6 +129,12 @@
                 <version>${hx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>com.fjhx</groupId>
+                <artifactId>hx-victoriatourist</artifactId>
+                <version>${hx.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>