演练范本库 页面修改

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

@@ -56,7 +56,7 @@ public class CoreDrillDictionary extends BaseEntity {
     @ApiModelProperty(value = "演练类型名称")
     private String drillCategoryName;
 
-    @TableField(exist = false)
+    @TableField("drill_projects")
     @ApiModelProperty(value = "解决方案")
     private String drillProjects;
 

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

@@ -17,18 +17,15 @@ public class CoreDrillDictionaryInsertDto {
     @ApiModelProperty(value = "机构")
     private Long orgId;
 
-    @NotNull(message = "演练项目不能为空")
     @ApiModelProperty(value = "演练项目,字典表关联取值")
     private String drillType;
 
-    @NotNull(message = "演练类型不能为空")
     @ApiModelProperty(value = "演练类型,字典表关联取值")
-    private String drillCategory;
+    private Integer drillCategory;
 
     @ApiModelProperty(value = "解决方案")
     private String drillProjects;
 
-    @NotEmpty(message = "解决方案不能为空")
     @ApiModelProperty(value = "预设案由")
     private String defaultCause;
 }

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

@@ -11,18 +11,14 @@ import javax.validation.constraints.NotNull;
  */
 @Data
 public class CoreDrillDictionaryUpdateDto {
-    @NotNull(message = "id不能为空")
     private Integer id;
 
-    @NotNull(message = "演练类型不能为空")
     @ApiModelProperty(value = "演练类型,字典表关联取值")
     private String drillType;
 
-    @NotNull(message = "演练项目不能为空")
-    @ApiModelProperty(value = "演练项目")
+    @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

@@ -34,7 +34,7 @@ public class CoreDrillDictionaryPageVo {
     @ApiModelProperty(value = "演练类型名称")
     private String drillCategoryName;
 
-    @ApiModelProperty(value = "演练项目")
+    @ApiModelProperty(value = "演练场景")
     private String drillProjects;
 
     @ApiModelProperty(value = "预设案由")

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

@@ -60,7 +60,7 @@ public class CoreDrillDictionaryController extends BaseController {
     @RequiresPermissions("core:drillDictionary:add")
     @Log(title = "预案演练库", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody @Validated CoreDrillDictionaryInsertDto coreDrillDictionary) {
+    public AjaxResult add(@RequestBody CoreDrillDictionaryInsertDto coreDrillDictionary) {
         return toAjax(coreDrillDictionaryService.insertCoreDrillDictionary(coreDrillDictionary));
     }
 

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

@@ -34,37 +34,6 @@ public interface CoreDrillDictionaryMapper extends BaseMapper<CoreDrillDictionar
      */
     List<CoreDrillDictionary> selectCoreDrillDictionaryList(CoreDrillDictionary coreDrillDictionary);
 
-    /**
-     * 新增预案演练库
-     *
-     * @param coreDrillDictionary 预案演练库
-     * @return 结果
-     */
-    int insertCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary);
-
-    /**
-     * 修改预案演练库
-     *
-     * @param coreDrillDictionary 预案演练库
-     * @return 结果
-     */
-    int updateCoreDrillDictionary(CoreDrillDictionary coreDrillDictionary);
-
-    /**
-     * 删除预案演练库
-     *
-     * @param id 预案演练库主键
-     * @return 结果
-     */
-    int deleteCoreDrillDictionaryById(Long id);
-
-    /**
-     * 批量删除预案演练库
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteCoreDrillDictionaryByIds(Long[] ids);
 
     Page<CoreDrillDictionaryPageVo> selectPageData1(Page<CoreDrillDictionaryPageVo> pageRequest, @Param("request") CoreDrillDictionaryPageDto request);
     Page<CoreDrillDictionaryPageVo> selectPageData2(Page<CoreDrillDictionaryPageVo> pageRequest, @Param("request") CoreDrillDictionaryPageDto request);

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

@@ -142,8 +142,8 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
         if (null != drillTypeDictList && ObjectUtil.isNotEmpty(drillTypeDictList)) {
             drillTypeDictList.stream().filter(dict -> ObjectUtil.equal(dict.getDictValue(), request.getDrillType())).findFirst().ifPresent(dict -> dictionary.setDrillTypeName(dict.getDictLabel()));
         }
-
-        dictionary.setDrillCategoryName(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, Integer.parseInt(request.getDrillCategory())));
+        dictionary.setDrillProjects(request.getDrillProjects());
+        dictionary.setDrillCategoryName(DictUtils.getDictLabel(DictConstants.CORE_DRILL_CATEGORY, request.getDrillCategory()));
         SysOrg sysOrg = getOrg(SecurityUtils.getLoginUser().getOrgId());
         dictionary.setOrgName(sysOrg.getShortName());
         dictionary.setOrgPath(sysOrg.getPath());

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

@@ -43,91 +43,6 @@
         where id = #{id}
     </select>
 
-    <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,
-            </if>
-            <if test="drillType != null">
-                drill_type,
-            </if>
-            <if test="drillTypeName != null">
-                drill_type_name,
-            </if>
-            <if test="drillProjects != null">
-                drill_projects,
-            </if>
-            <if test="defaultCause != null">
-                default_cause,
-            </if>
-            <if test="deleted != null">
-                deleted,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id},
-            </if>
-            <if test="drillType != null">
-                #{drillType},
-            </if>
-            <if test="drillTypeName != null">
-                #{drillTypeName},
-            </if>
-            <if test="drillProjects != null">
-                #{drillProjects},
-            </if>
-            <if test="defaultCause != null">
-                #{defaultCause},
-            </if>
-            <if test="deleted != null">
-                #{deleted},
-            </if>
-        </trim>
-    </insert>
-
-    <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 =
-                #{drillType},
-            </if>
-            <if test="drillTypeName != null">
-                drill_type_name =
-                #{drillTypeName},
-            </if>
-            <if test="drillProjects != null">
-                drill_projects =
-                #{drillProjects},
-            </if>
-            <if test="defaultCause != null">
-                default_cause =
-                #{defaultCause},
-            </if>
-            <if test="deleted != null">
-                deleted =
-                #{deleted},
-            </if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCoreDrillDictionaryById" parameterType="Long">
-        delete
-        from core_drill_dictionary
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteCoreDrillDictionaryByIds" parameterType="String">
-        delete from core_drill_dictionary where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
     <sql id="pageSql">
         <if test="request.id != null">
             and d.id like concat('%',#{request.id},'%')
@@ -171,24 +86,27 @@
         )
     </select>
     <select id="selectPageData1" 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'  inner join sys_org o on d.org_id=o.id
+        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'-->
+        inner join sys_org o on d.org_id=o.id
         WHERE d.deleted=0 and o.deleted=0
         <include refid="pageSql"/>
         and d.org_id=#{request.orgId}
         order by ifnull(o.sort,0)
     </select>
     <select id="selectPageData2" 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' inner join sys_org o on d.org_id=o.id
+        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' -->
+        inner join sys_org o on d.org_id=o.id
         WHERE d.deleted=0 and o.deleted=0
         <include refid="pageSql"/>
         and d.org_path like concat(#{request.orgPath},'%')
         order by ifnull(o.sort,0)
     </select>
     <select id="selectPageData3" 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' inner join sys_org o on d.org_id=o.id
+        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' -->
+        inner join sys_org o on d.org_id=o.id
         WHERE d.deleted=0 and o.deleted=0
         <include refid="pageSql"/>
         and d.org_id in
@@ -198,8 +116,9 @@
         order by ifnull(o.sort,0)
     </select>
     <select id="selectPageData4" 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' inner join sys_org o on d.org_id=o.id
+        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' -->
+        inner join sys_org o on d.org_id=o.id
         WHERE d.deleted=0 and o.deleted=0
         <include refid="pageSql"/>
         and (d.org_id in