维多利亚

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "order_jd_details";
+        CodeGenerator.INCLUDE = "abnormal_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/abnormal/AbnormalDetails.java

@@ -0,0 +1,44 @@
+package com.fjhx.entity.abnormal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 异常处理详情
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalDetails extends BaseEntity {
+
+
+    /**
+     * 异常记录id
+     */
+    private Long abnormalInfoId;
+
+    /**
+     * 处理说明
+     */
+    private String explain;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/abnormal/AbnormalInfo.java

@@ -0,0 +1,64 @@
+package com.fjhx.entity.abnormal;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 异常记录
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalInfo extends BaseEntity {
+
+
+    /**
+     * 异常类型
+     */
+    private Integer type;
+
+    /**
+     * 关联id
+     */
+    private Long linkId;
+
+    /**
+     * 关联编码
+     */
+    private String linkCode;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 状态 0未处理 1已处理
+     */
+    private Integer status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/abnormal/AbnormalDetailsEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常处理详情
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalDetailsEx extends AbnormalDetails {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/abnormal/AbnormalDetailsVo.java

@@ -0,0 +1,22 @@
+package com.fjhx.params.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常处理详情
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalDetailsVo extends AbnormalDetails {
+
+    /**
+     * 是否处理 1已处理 2未处理
+     */
+    private Integer status;
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/abnormal/AbnormalInfoEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常记录
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalInfoEx extends AbnormalInfo {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/abnormal/AbnormalInfoVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 异常记录
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class AbnormalInfoVo extends AbnormalInfo {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/abnormal/AbnormalDetailsController.java

@@ -0,0 +1,64 @@
+package com.fjhx.controller.abnormal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.Condition;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import com.fjhx.params.abnormal.AbnormalDetailsVo;
+import com.fjhx.service.abnormal.AbnormalDetailsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常处理详情 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@RestController
+@RequestMapping("/abnormalDetails")
+public class AbnormalDetailsController {
+
+    @Autowired
+    private AbnormalDetailsService abnormalDetailsService;
+
+//    @PostMapping("/page")
+//    public R page(@RequestBody Map<String, Object> condition){
+//        Page<AbnormalDetails> result = abnormalDetailsService.getPage(condition);
+//        return R.success(result);
+//    }
+//
+//    @PostMapping("/add")
+//    public R add(@RequestBody AbnormalDetailsVo abnormalDetailsVo){
+//        abnormalDetailsService.add(abnormalDetailsVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/edit")
+//    public R edit(@RequestBody AbnormalDetailsVo abnormalDetailsVo){
+//        abnormalDetailsService.edit(abnormalDetailsVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    public R delete(@RequestBody AbnormalDetailsVo abnormalDetailsVo){
+//        abnormalDetailsService.delete(abnormalDetailsVo);
+//        return R.success();
+//    }
+
+
+    @PostMapping("/page")
+    public R page(@RequestBody Condition condition){
+        Page<AbnormalDetails> result = abnormalDetailsService.getPage(condition);
+        return R.success(result);
+    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/controller/abnormal/AbnormalInfoController.java

@@ -0,0 +1,56 @@
+package com.fjhx.controller.abnormal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springblade.core.tool.api.R;
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import com.fjhx.params.abnormal.AbnormalInfoVo;
+import com.fjhx.service.abnormal.AbnormalInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常记录 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@RestController
+@RequestMapping("/abnormalInfo")
+public class AbnormalInfoController {
+
+    @Autowired
+    private AbnormalInfoService abnormalInfoService;
+
+//    @PostMapping("/page")
+//    public R page(@RequestBody Map<String, Object> condition){
+//        Page<AbnormalInfo> result = abnormalInfoService.getPage(condition);
+//        return R.success(result);
+//    }
+//
+//    @PostMapping("/add")
+//    public R add(@RequestBody AbnormalInfoVo abnormalInfoVo){
+//        abnormalInfoService.add(abnormalInfoVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/edit")
+//    public R edit(@RequestBody AbnormalInfoVo abnormalInfoVo){
+//        abnormalInfoService.edit(abnormalInfoVo);
+//        return R.success();
+//    }
+//
+//    @PostMapping("/delete")
+//    public R delete(@RequestBody AbnormalInfoVo abnormalInfoVo){
+//        abnormalInfoService.delete(abnormalInfoVo);
+//        return R.success();
+//    }
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalDetailsMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 异常处理详情 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+public interface AbnormalDetailsMapper extends BaseMapper<AbnormalDetails> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalDetailsMapper.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.fjhx.mapper.abnormal.AbnormalDetailsMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalInfoMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.abnormal;
+
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 异常记录 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+public interface AbnormalInfoMapper extends BaseMapper<AbnormalInfo> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/abnormal/AbnormalInfoMapper.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.fjhx.mapper.abnormal.AbnormalInfoMapper">
+
+</mapper>

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

@@ -0,0 +1,29 @@
+package com.fjhx.service.abnormal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
+import com.fjhx.base.Condition;
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import com.fjhx.params.abnormal.AbnormalDetailsVo;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常处理详情 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+public interface AbnormalDetailsService extends BaseService<AbnormalDetails> {
+
+    Page<Map<String, Object>> getPage(Condition condition);
+
+    void add(AbnormalDetailsVo abnormalDetailsVo);
+
+    void edit(AbnormalDetailsVo abnormalDetailsVo);
+
+    void delete(AbnormalDetailsVo abnormalDetailsVo);
+
+}

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

@@ -0,0 +1,28 @@
+package com.fjhx.service.abnormal;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import com.fjhx.params.abnormal.AbnormalInfoVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常记录 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+public interface AbnormalInfoService extends BaseService<AbnormalInfo> {
+
+    Page<AbnormalInfo> getPage(Map<String, Object> condition);
+
+    void add(AbnormalInfoVo abnormalInfoVo);
+
+    void edit(AbnormalInfoVo abnormalInfoVo);
+
+    void delete(AbnormalInfoVo abnormalInfoVo);
+
+}

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

@@ -0,0 +1,83 @@
+package com.fjhx.service.abnormal.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.Condition;
+import com.fjhx.constants.StatusConstant;
+import com.fjhx.entity.abnormal.AbnormalDetails;
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import com.fjhx.mapper.abnormal.AbnormalDetailsMapper;
+import com.fjhx.params.abnormal.AbnormalDetailsVo;
+import com.fjhx.service.abnormal.AbnormalDetailsService;
+import com.fjhx.service.abnormal.AbnormalInfoService;
+import com.fjhx.utils.Assert;
+import com.fjhx.utils.UserClientUtil;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常处理详情 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Service
+public class AbnormalDetailsServiceImpl extends ServiceImpl<AbnormalDetailsMapper, AbnormalDetails> implements AbnormalDetailsService {
+
+    @Autowired
+    private AbnormalInfoService abnormalInfoService;
+
+    @Override
+    public Page<Map<String, Object>> getPage(Condition condition) {
+        Long abnormalInfoId = condition.getLong("abnormalInfoId", "异常管理id不能为空");
+
+        IWrapper<AbnormalDetails> wrapper = IWrapper.getWrapper(condition);
+        wrapper.eq(AbnormalDetails::getAbnormalInfoId, abnormalInfoId);
+
+        Page<Map<String, Object>> page = pageMaps(condition, wrapper);
+        List<Map<String, Object>> records = page.getRecords();
+
+        if (records.size() == 0) {
+            return page;
+        }
+
+        UserClientUtil.setUserName(records, "createUser", "createUserName");
+
+        return page;
+    }
+
+    @Override
+    public void add(AbnormalDetailsVo abnormalDetailsVo) {
+        Long abnormalInfoId = abnormalDetailsVo.getAbnormalInfoId();
+        Assert.notEmpty(abnormalInfoId, "异常管理id不能为空");
+        Assert.notEmpty(abnormalDetailsVo.getExplain(), "异常说明不能为空");
+
+        Integer status = abnormalDetailsVo.getStatus();
+
+        if (StatusConstant.YES.equals(status)) {
+            AbnormalInfo abnormalInfo = new AbnormalInfo();
+            abnormalInfo.setId(abnormalInfoId);
+            abnormalInfo.setStatus(StatusConstant.YES);
+            abnormalInfoService.updateById(abnormalInfo);
+        }
+
+        save(abnormalDetailsVo);
+    }
+
+    @Override
+    public void edit(AbnormalDetailsVo abnormalDetailsVo) {
+        updateById(abnormalDetailsVo);
+    }
+
+    @Override
+    public void delete(AbnormalDetailsVo abnormalDetailsVo) {
+        removeById(abnormalDetailsVo.getId());
+    }
+
+}

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

@@ -0,0 +1,48 @@
+package com.fjhx.service.abnormal.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.abnormal.AbnormalInfo;
+import com.fjhx.params.abnormal.AbnormalInfoVo;
+import com.fjhx.mapper.abnormal.AbnormalInfoMapper;
+import com.fjhx.service.abnormal.AbnormalInfoService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 异常记录 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2022-12-09
+ */
+@Service
+public class AbnormalInfoServiceImpl extends ServiceImpl<AbnormalInfoMapper, AbnormalInfo> implements AbnormalInfoService {
+
+    @Override
+    public Page<AbnormalInfo> getPage(Map<String, Object> condition) {
+
+        IWrapper<AbnormalInfo> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(AbnormalInfoVo abnormalInfoVo) {
+        save(abnormalInfoVo);
+    }
+
+    @Override
+    public void edit(AbnormalInfoVo abnormalInfoVo) {
+        updateById(abnormalInfoVo);
+    }
+
+    @Override
+    public void delete(AbnormalInfoVo abnormalInfoVo) {
+        removeById(abnormalInfoVo.getId());
+    }
+
+}