预案演练资料库代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/constant/DictConstants.java

@@ -0,0 +1,246 @@
+package com.xunmei.common.core.constant;
+
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 18:33
+ */
+
+public class DictConstants {
+
+    /**
+     * 用户性别
+     */
+    public static final String SYS_USER_SEX = "sys_user_sex";
+
+    /**
+     * 菜单状态
+     */
+    public static final String SYS_SHOW_HIDE = "sys_show_hide";
+
+    /**
+     * 系统开关
+     */
+    public static final String SYS_NORMAL_DISABLE = "sys_normal_disable";
+
+    /**
+     * 任务状态
+     */
+    public static final String SYS_JOB_STATUS = "sys_job_status";
+    /**
+     * 任务分组
+     */
+    public static final String SYS_JOB_GROUP = "sys_job_group";
+
+    /**
+     * 系统是否
+     */
+    public static final String SYS_YES_NO = "sys_yes_no";
+
+    /**
+     * 通知类型
+     */
+    public static final String SYS_NOTICE_TYPE = "sys_notice_type";
+
+    /**
+     * 通知状态
+     */
+    public static final String SYS_NOTICE_STATUS = "sys_notice_status";
+
+    /**
+     * 操作类型
+     */
+    public static final String SYS_OPER_TYPE = "sys_oper_type";
+
+    /**
+     * 系统状态
+     */
+    public static final String SYS_COMMON_STATUS = "sys_common_status";
+
+    /**
+     * 营业状态
+     */
+    public static final String SYS_BUSINESS_TYPE = "sys_business_type";
+
+    /**
+     * 机构类型
+     */
+    public static final String SYS_ORG_TYPE = "sys_org_type";
+
+    /**
+     * 最高学历
+     */
+    public static final String SYS_HIGHEST_EDUCATION = "sys_highest_education";
+
+    /**
+     * 职责职务
+     */
+    public static final String SYS_DUTIES = "sys_duties";
+
+    /**
+     * 用工形式
+     */
+    public static final String SYS_WORK_TYPE = "sys_work_type";
+
+    /**
+     * 学历取得方式
+     */
+    public static final String SYS_EDUCATION_TYPE = "sys_education_type";
+
+    /**
+     * 规范类型
+     */
+    public static final String RULE_TYPE = "rule_type";
+
+    /**
+     * 资产类别
+     */
+    public static final String SYS_ASSET_TYPE = "sys_asset_type";
+
+    /**
+     * 设备分类
+     */
+    public static final String SYS_DEVICE_TYPE = "sys_device_type";
+
+    /**
+     * 计划状态
+     */
+    public static final String PLAN_STATUS = "plan_status";
+
+    /**
+     * 逻辑删除
+     */
+    public static final String IS_DELETED = "is_deleted";
+
+    /**
+     * 数据来源
+     */
+    public static final String POINT_BUSINESS_TYPE = "point_business_type";
+
+    /**
+     * 调阅周期
+     */
+    public static final String SYS_ACCESS_CYCLE = "sys_access_cycle";
+
+    /**
+     * 平台类型
+     */
+    public static final String SYS_PLATFORM_TYPE = "sys_platform_type";
+
+    /**
+     * 监控调阅状态
+     */
+    public static final String RETRIEVAL_TASK_STATUS = "retrieval_task_status";
+
+    /**
+     * 履职状态
+     */
+    public static final String RESUMPTION_STATUS = "resumption_status";
+
+    /**
+     * 防区状态
+     */
+    public static final String PROTECTION_STATUS = "protection_status";
+
+    /**
+     * 计划类型
+     */
+    public static final String RESUMPTION_PLAN_TYPE = "resumption_plan_type";
+
+    /**
+     * 履职计划周期
+     */
+    public static final String RESUMPTION_PLAN_CYCLE = "resumption_plan_cycle";
+
+    /**
+     * 履职计划状态
+     */
+    public static final String RESUMPTION_PLAN_STATUS = "resumption_plan_status";
+
+    /**
+     * 培训任务状态
+     */
+    public static final String EDU_TASK_STATUS = "edu_task_status";
+
+    /**
+     * 培训类型
+     */
+    public static final String EDU_TYPE = "edu_type";
+
+    /**
+     * 履职机构类型
+     */
+    public static final String RESUMPTION_ORG_TYPE = "resumption_org_type";
+
+    /**
+     * 履职时间
+     */
+    public static final String RESUMPTION_PLAN_EXEC = "resumption_plan_exec";
+
+    /**
+     * 检查状态
+     */
+    public static final String CORE_CHECK_TYPE = "core_check_type";
+
+    /**
+     * 调阅任务登记项目
+     */
+    public static final String CORE_REGISTRATION_PROJECT = "core_registration_project";
+
+    /**
+     * 部门类型
+     */
+    public static final String SYS_DEPARTMENT_TYPE = "sys_department_type";
+
+    /**
+     * 教育培训周期
+     */
+    public static final String EDU_PLAN_CYCLE = "edu_plan_cycle";
+
+    /**
+     * 整改期限
+     */
+    public static final String RECTIFICATION_DEADLINE = "rectification_deadline";
+
+    /**
+     * 机构扩展平台品牌
+     */
+   public static final String ORG_PLATFORM_BRAND = "org_platform_brand";
+
+    /**
+     * 机构扩展平台供应商品牌
+     */
+    public static final String ORG_PLATFORM_SUPPLIER_BRAND = "org_platform_supplier_brand";
+
+    /**
+     * 机构扩展类型
+     */
+    public static final String ORG_EXTEND_TYPE = "org_extend_type";
+
+    /**
+     * 机构扩展业务库类型
+     */
+    public static final String BUSINESS_LIBRARY_TYPE = "business_library_type";
+
+    /**
+     * 教育培训类型
+     */
+    public static final String EDU_TRAINING_TYPE = "edu_training_type";
+
+    /**
+     * 教育培训任务状态
+     */
+    public static final String EDU_TRAINING_DO_STATUS = "edu_training_do_status";
+
+    /**
+     * 实际机构类型
+     */
+    public static final String REALITY_ORG_TYPE = "reality_org_type";
+
+    /**
+     * 预案演练类型
+     */
+    public static final String CORE_DRILL_TYPE = "core_drill_type";
+
+
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/domain/CoreDrillDictionary.java → soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/domain/CoreDrillDictionary.java

@@ -1,4 +1,4 @@
-package com.xunmei.core.drill.domain;
+package com.xunmei.common.core.domain.drill.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -26,11 +26,12 @@ public class CoreDrillDictionary extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     @TableId
-    private Long id;
+    private Integer id;
 
     @TableField("drill_type")
     @ApiModelProperty(value = "演练类型,字典表关联取值")
     private String drillType;
+
     @TableField("drill_type_name")
     @ApiModelProperty(value = "演练类型名称")
     private String drillTypeName;
@@ -43,18 +44,6 @@ public class CoreDrillDictionary extends BaseEntity {
     @ApiModelProperty(value = "预设案由")
     private String defaultCause;
 
-    @TableField("org_id")
-    @ApiModelProperty(value = "机构")
-    private Long orgId;
-
-    @TableField("org_name")
-    @ApiModelProperty(value = "机构名称")
-    private String orgName;
-
-    @TableField("org_path")
-    @ApiModelProperty(value = "机构")
-    private String orgPath;
-
     @ApiModelProperty(value = "删除标志", notes = "0:未删除,1:已删除")
     @TableLogic(value = "0", delval = "1")
     @TableField(value = "deleted")
@@ -64,32 +53,11 @@ public class CoreDrillDictionary extends BaseEntity {
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-
-
                 .append("id", getId())
-
-
                 .append("drillType", getDrillType())
-
-
                 .append("drillTypeName", getDrillTypeName())
-
-
                 .append("drillProjects", getDrillProjects())
-
-
                 .append("defaultCause", getDefaultCause())
-
-
-                .append("orgId", getOrgId())
-
-
-                .append("orgName", getOrgName())
-
-
-                .append("orgPath", getOrgPath())
-
-
                 .append("deleted", getDeleted())
                 .toString();
     }

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillDictionaryDetailDto.java

@@ -0,0 +1,23 @@
+package com.xunmei.common.core.domain.drill.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 19:41
+ */
+@Data
+public class CoreDrillDictionaryDetailDto {
+    @NotNull(message = "演练类型不能为空")
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+    @NotNull(message = "演练项目不能为空")
+    @ApiModelProperty(value = "演练项目")
+    private String drillProjects;
+    @NotNull(message = "预设案由不能为空")
+    @ApiModelProperty(value = "预设案由")
+    private String defaultCause;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillDictionaryInsertDto.java

@@ -0,0 +1,21 @@
+package com.xunmei.common.core.domain.drill.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 19:15
+ */
+@Data
+public class CoreDrillDictionaryInsertDto {
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+
+    @ApiModelProperty(value = "演练项目")
+    private String drillProjects;
+
+    @ApiModelProperty(value = "预设案由")
+    private String defaultCause;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillDictionaryPageDto.java

@@ -0,0 +1,32 @@
+package com.xunmei.common.core.domain.drill.dto;
+
+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 com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.xunmei.common.core.web.domain.PageRequest;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 17:03
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@ApiModel(value = "CoreDrillDictionary分页对象", description = "预案演练库")
+public class CoreDrillDictionaryPageDto extends PageRequest {
+    private static final long serialVersionUID = 1L;
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/dto/CoreDrillDictionaryUpdateDto.java

@@ -0,0 +1,28 @@
+package com.xunmei.common.core.domain.drill.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 19:41
+ */
+@Data
+public class CoreDrillDictionaryUpdateDto {
+
+    private Integer id;
+
+    @NotNull(message = "演练类型不能为空")
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+
+    @NotNull(message = "演练项目不能为空")
+    @ApiModelProperty(value = "演练项目")
+    private String drillProjects;
+
+    @NotNull(message = "预设案由不能为空")
+    @ApiModelProperty(value = "预设案由")
+    private String defaultCause;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillDictionaryDetailVo.java

@@ -0,0 +1,24 @@
+package com.xunmei.common.core.domain.drill.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 19:41
+ */
+@Data
+public class CoreDrillDictionaryDetailVo {
+    private Integer id;
+    @NotNull(message = "演练类型不能为空")
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+    @NotNull(message = "演练项目不能为空")
+    @ApiModelProperty(value = "演练项目")
+    private String drillProjects;
+    @NotNull(message = "预设案由不能为空")
+    @ApiModelProperty(value = "预设案由")
+    private String defaultCause;
+}

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillDictionaryPageVo.java

@@ -0,0 +1,37 @@
+package com.xunmei.common.core.domain.drill.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author jingyuanchao
+ * @date 2023/9/8 17:11
+ */
+@Data
+public class CoreDrillDictionaryPageVo {
+
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long id;
+
+    @ApiModelProperty(value = "演练类型,字典表关联取值")
+    private String drillType;
+    @ApiModelProperty(value = "演练类型名称")
+    private String drillTypeName;
+
+    @ApiModelProperty(value = "演练项目")
+    private String drillProjects;
+
+    @ApiModelProperty(value = "预设案由")
+    private String defaultCause;
+
+    @ApiModelProperty(value = "删除标志", notes = "0:未删除,1:已删除")
+    @TableLogic(value = "0", delval = "1")
+    @TableField(value = "deleted")
+    private int deleted;
+}

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryController.java

@@ -1,9 +1,12 @@
 package com.xunmei.core.drill.controller;
 
 
-
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.drill.domain.CoreDrillDictionary;
+import com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary;
 import com.xunmei.core.drill.service.ICoreDrillDictionaryService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,26 +31,24 @@ import io.swagger.annotations.ApiOperation;
  * @author xunmei
  * @date 2023-09-06
  */
-@Api(tags = {"CoreDrillDictionary" })
+@Api(tags = {"CoreDrillDictionary"})
 @RestController
 @RequestMapping("/drillDictionary")
 public class CoreDrillDictionaryController extends BaseController {
     @Autowired
     private ICoreDrillDictionaryService coreDrillDictionaryService;
 
-/**
- * 查询预案演练库列表
- */
-@ApiOperation(value = "查询CoreDrillDictionary列表")
-@RequiresPermissions("core:drillDictionary:list")
-@GetMapping("/list")
-    public TableDataInfo<CoreDrillDictionary> list(CoreDrillDictionary coreDrillDictionary) {
-
-        return coreDrillDictionaryService.selectPage( coreDrillDictionary);
+    /**
+     * 查询预案演练库列表
+     */
+    @ApiOperation(value = "查询CoreDrillDictionary列表")
+    @RequiresPermissions("core:drillDictionary:list")
+    @GetMapping("/list")
+    public TableDataInfo<CoreDrillDictionaryPageVo> list(CoreDrillDictionaryPageDto coreDrillDictionary) {
+        return coreDrillDictionaryService.selectPage(coreDrillDictionary);
     }
 
 
-
     /**
      * 获取预案演练库详细信息
      */
@@ -63,9 +64,9 @@ public class CoreDrillDictionaryController extends BaseController {
      */
     @ApiOperation(value = "新增CoreDrillDictionary")
     @RequiresPermissions("core:drillDictionary:add")
-    @Log(title = "预案演练库" , businessType = BusinessType.INSERT)
+    @Log(title = "预案演练库", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CoreDrillDictionary coreDrillDictionary) {
+    public AjaxResult add(@RequestBody CoreDrillDictionaryInsertDto coreDrillDictionary) {
         return toAjax(coreDrillDictionaryService.insertCoreDrillDictionary(coreDrillDictionary));
     }
 
@@ -74,10 +75,10 @@ public class CoreDrillDictionaryController extends BaseController {
      */
     @ApiOperation(value = "修改CoreDrillDictionary")
     @RequiresPermissions("core:drillDictionary:edit")
-    @Log(title = "预案演练库" , businessType = BusinessType.UPDATE)
+    @Log(title = "预案演练库", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CoreDrillDictionary coreDrillDictionary) {
-        return toAjax(coreDrillDictionaryService.updateCoreDrillDictionary(coreDrillDictionary));
+    public AjaxResult edit(@RequestBody CoreDrillDictionaryUpdateDto request) {
+        return toAjax(coreDrillDictionaryService.updateCoreDrillDictionary(request));
     }
 
     /**
@@ -85,7 +86,7 @@ public class CoreDrillDictionaryController extends BaseController {
      */
     @ApiOperation(value = "删除CoreDrillDictionary")
     @RequiresPermissions("core:drillDictionary:remove")
-    @Log(title = "预案演练库" , businessType = BusinessType.DELETE)
+    @Log(title = "预案演练库", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(coreDrillDictionaryService.deleteCoreDrillDictionaryByIds(ids));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/mapper/CoreDrillDictionaryMapper.java

@@ -2,7 +2,12 @@ package com.xunmei.core.drill.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.core.drill.domain.CoreDrillDictionary;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryDetailVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -60,4 +65,8 @@ public interface CoreDrillDictionaryMapper extends BaseMapper<CoreDrillDictionar
      * @return 结果
      */
     int deleteCoreDrillDictionaryByIds(Long[] ids);
+
+    Page<CoreDrillDictionaryPageVo> selectPageData(Page<CoreDrillDictionaryPageVo> pageRequest, @Param("request") CoreDrillDictionaryPageDto request);
+
+    CoreDrillDictionaryDetailVo selectDetailData(@Param("id") Long id);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillDictionaryService.java

@@ -2,8 +2,13 @@ package com.xunmei.core.drill.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryDetailVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo;
 import com.xunmei.common.core.web.page.TableDataInfo;
-import com.xunmei.core.drill.domain.CoreDrillDictionary;
+import com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary;
 
 import java.util.List;
 
@@ -20,7 +25,7 @@ public interface ICoreDrillDictionaryService extends IService<CoreDrillDictionar
      * @param id 预案演练库主键
      * @return 预案演练库
      */
-     CoreDrillDictionary selectCoreDrillDictionaryById(Long id);
+    CoreDrillDictionaryDetailVo selectCoreDrillDictionaryById(Long id);
 
     /**
      * 查询预案演练库列表
@@ -36,7 +41,7 @@ public interface ICoreDrillDictionaryService extends IService<CoreDrillDictionar
      * @param coreDrillDictionary 预案演练库
      * @return 结果
      */
-    int insertCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary);
+    int insertCoreDrillDictionary(CoreDrillDictionaryInsertDto coreDrillDictionary);
 
     /**
      * 修改预案演练库
@@ -44,7 +49,7 @@ public interface ICoreDrillDictionaryService extends IService<CoreDrillDictionar
      * @param coreDrillDictionary 预案演练库
      * @return 结果
      */
-    int updateCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary);
+    int updateCoreDrillDictionary(CoreDrillDictionaryUpdateDto coreDrillDictionary);
 
     /**
      * 批量删除预案演练库
@@ -68,5 +73,5 @@ public interface ICoreDrillDictionaryService extends IService<CoreDrillDictionar
      * @param coreDrillDictionary 查询条件对象
      * @return Page
      */
-    TableDataInfo<CoreDrillDictionary> selectPage(CoreDrillDictionary coreDrillDictionary);
+    TableDataInfo<CoreDrillDictionaryPageVo> selectPage(CoreDrillDictionaryPageDto coreDrillDictionary);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillDictionaryServiceImpl.java

@@ -1,12 +1,28 @@
 package com.xunmei.core.drill.service.impl;
 
+import java.util.Date;
 import java.util.List;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.core.drill.domain.CoreDrillDictionary;
+import com.xunmei.common.core.constant.DictConstants;
+import com.xunmei.common.core.constant.ErrorMsgConstants;
+import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryInsertDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryPageDto;
+import com.xunmei.common.core.domain.drill.dto.CoreDrillDictionaryUpdateDto;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryDetailVo;
+import com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo;
+import com.xunmei.common.security.utils.DictUtils;
+import com.xunmei.common.security.utils.SecurityUtils;
 import com.xunmei.core.drill.mapper.CoreDrillDictionaryMapper;
 import com.xunmei.core.drill.service.ICoreDrillDictionaryService;
 import com.xunmei.system.api.RemoteOrgService;
+import com.xunmei.system.api.domain.SysDictData;
+import com.xunmei.system.api.domain.SysOrg;
+import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +31,7 @@ import java.util.Arrays;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xunmei.common.core.web.page.TableDataInfo;
+import org.springframework.transaction.annotation.Transactional;
 
 
 /**
@@ -31,16 +48,9 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     private RemoteOrgService orgService;
 
     @Override
-    public TableDataInfo<CoreDrillDictionary> selectPage(CoreDrillDictionary coreDrillDictionary) {
-        Page<CoreDrillDictionary> page;
-        if (coreDrillDictionary.getPageNum() != null && coreDrillDictionary.getPageSize() != null) {
-            page = new Page<>(coreDrillDictionary.getPageNum(), coreDrillDictionary.getPageSize());
-        } else {
-            page = new Page<>();
-        }
-
+    public TableDataInfo<CoreDrillDictionaryPageVo> selectPage(CoreDrillDictionaryPageDto request) {
         //获取数据
-        page = coreDrillDictionaryMapper.selectPage(page, null);
+        Page<CoreDrillDictionaryPageVo> page = coreDrillDictionaryMapper.selectPageData(request.getPageRequest(), request);
         //抓换为TableDataInfo适配前端
         return TableDataInfo.build(page);
 
@@ -55,8 +65,9 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
      * @return 预案演练库
      */
     @Override
-    public CoreDrillDictionary selectCoreDrillDictionaryById(Long id) {
-        return coreDrillDictionaryMapper.selectById(id);
+    public CoreDrillDictionaryDetailVo selectCoreDrillDictionaryById(Long id) {
+        return coreDrillDictionaryMapper.selectDetailData(id);
+
     }
 
     /**
@@ -73,23 +84,36 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
     /**
      * 新增预案演练库
      *
-     * @param coreDrillDictionary 预案演练库
+     * @param request 预案演练库
      * @return 结果
      */
     @Override
-    public int insertCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary) {
-        return coreDrillDictionaryMapper.insert(coreDrillDictionary);
+    @Transactional(rollbackFor = Exception.class)
+    public int insertCoreDrillDictionary(CoreDrillDictionaryInsertDto request) {
+        final CoreDrillDictionary dictionary = new CoreDrillDictionary();
+        BeanUtils.copyProperties(request, dictionary);
+        final List<SysDictData> drillTypeDictList = DictUtils.getDictCache(DictConstants.CORE_DRILL_TYPE);
+        if (null != drillTypeDictList && ObjectUtil.isNotEmpty(drillTypeDictList)) {
+            drillTypeDictList.stream().filter(dict -> ObjectUtil.equal(dict.getDictValue(), request.getDrillType())).findFirst().ifPresent(dict -> dictionary.setDrillTypeName(dict.getDictValue()));
+        }
+        dictionary.setCreateBy(SecurityUtils.getUserId().toString());
+        dictionary.setUpdateBy(SecurityUtils.getUserId().toString());
+        dictionary.setCreateTime(new Date());
+        dictionary.setUpdateTime(new Date());
+        return coreDrillDictionaryMapper.insert(dictionary);
     }
 
     /**
      * 修改预案演练库
      *
-     * @param coreDrillDictionary 预案演练库
+     * @param request 预案演练库
      * @return 结果
      */
     @Override
-    public int updateCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary) {
-        return coreDrillDictionaryMapper.updateById(coreDrillDictionary);
+    public int updateCoreDrillDictionary(CoreDrillDictionaryUpdateDto request) {
+        final CoreDrillDictionary dictionary = new CoreDrillDictionary();
+        BeanUtils.copyProperties(request,dictionary);
+        return coreDrillDictionaryMapper.updateById(dictionary);
     }
 
     /**

soc-modules/soc-modules-core/src/main/resources/mapper/drill/CoreDrillDictionaryMapper.xml

@@ -4,24 +4,21 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xunmei.core.drill.mapper.CoreDrillDictionaryMapper">
 
-    <resultMap type="com.xunmei.core.drill.domain.CoreDrillDictionary" id="CoreDrillDictionaryResult">
+    <resultMap type="com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary" id="CoreDrillDictionaryResult">
                 <result property="id" column="id"/>
                 <result property="drillType" column="drill_type"/>
                 <result property="drillTypeName" column="drill_type_name"/>
                 <result property="drillProjects" column="drill_projects"/>
                 <result property="defaultCause" column="default_cause"/>
-                <result property="orgId" column="org_id"/>
-                <result property="orgName" column="org_name"/>
-                <result property="orgPath" column="org_path"/>
                 <result property="deleted" column="deleted"/>
     </resultMap>
 
     <sql id="selectCoreDrillDictionaryVo">
-        select id, drill_type, drill_type_name, drill_projects, default_cause, org_id, org_name, org_path, deleted
+        select id, drill_type, drill_type_name, drill_projects, default_cause, deleted
         from core_drill_dictionary
     </sql>
 
-    <select id="selectCoreDrillDictionaryList" parameterType="com.xunmei.core.drill.domain.CoreDrillDictionary"
+    <select id="selectCoreDrillDictionaryList" parameterType="com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary"
             resultMap="CoreDrillDictionaryResult">
         <include refid="selectCoreDrillDictionaryVo"/>
         <where>
@@ -37,12 +34,6 @@
                         <if test="defaultCause != null  and defaultCause != ''">
                             and default_cause = #{defaultCause}
                         </if>
-                        <if test="orgId != null ">
-                            and org_id = #{orgId}
-                        </if>
-                        <if test="orgName != null  and orgName != ''">
-                            and org_name like concat('%', #{orgName}, '%')
-                        </if>
         </where>
     </select>
 
@@ -52,7 +43,7 @@
             where id = #{id}
     </select>
 
-    <insert id="insertCoreDrillDictionary" parameterType="com.xunmei.core.drill.domain.CoreDrillDictionary">
+    <insert id="insertCoreDrillDictionary" parameterType="com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary">
         insert into core_drill_dictionary
         <trim prefix="(" suffix=")" suffixOverrides=",">
                     <if test="id != null">id,
@@ -65,12 +56,6 @@
                     </if>
                     <if test="defaultCause != null">default_cause,
                     </if>
-                    <if test="orgId != null">org_id,
-                    </if>
-                    <if test="orgName != null">org_name,
-                    </if>
-                    <if test="orgPath != null">org_path,
-                    </if>
                     <if test="deleted != null">deleted,
                     </if>
         </trim>
@@ -85,18 +70,12 @@
                     </if>
                     <if test="defaultCause != null">#{defaultCause},
                     </if>
-                    <if test="orgId != null">#{orgId},
-                    </if>
-                    <if test="orgName != null">#{orgName},
-                    </if>
-                    <if test="orgPath != null">#{orgPath},
-                    </if>
                     <if test="deleted != null">#{deleted},
                     </if>
         </trim>
     </insert>
 
-    <update id="updateCoreDrillDictionary" parameterType="com.xunmei.core.drill.domain.CoreDrillDictionary">
+    <update id="updateCoreDrillDictionary" parameterType="com.xunmei.common.core.domain.drill.domain.CoreDrillDictionary">
         update core_drill_dictionary
         <trim prefix="SET" suffixOverrides=",">
                     <if test="drillType != null">drill_type =
@@ -111,15 +90,6 @@
                     <if test="defaultCause != null">default_cause =
                         #{defaultCause},
                     </if>
-                    <if test="orgId != null">org_id =
-                        #{orgId},
-                    </if>
-                    <if test="orgName != null">org_name =
-                        #{orgName},
-                    </if>
-                    <if test="orgPath != null">org_path =
-                        #{orgPath},
-                    </if>
                     <if test="deleted != null">deleted =
                         #{deleted},
                     </if>
@@ -138,4 +108,21 @@
             #{id}
         </foreach>
     </delete>
+
+    <select id="selectPageData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryPageVo">
+        select * from core_drill_dictionary d inner join sys_dict_data dd on d.drill_type=dd.dict_value and
+        dd.dict_type='core_drill_type' WHERE deleted=0
+        <if test="request.id != null">
+            and d.id=#{request.id}
+        </if>
+        <if test="request.drillType != null">
+            and d.drill_type=#{request.drillType}
+        </if>
+    </select>
+
+    <select id="selectDetailData" resultType="com.xunmei.common.core.domain.drill.vo.CoreDrillDictionaryDetailVo">
+        select id, drill_type, default_cause, drill_projects
+        from core_drill_dictionary
+        where id = #{id}
+    </select>
 </mapper>