Merge branch 'master' of http://git.dongkesoft.com:9001/iBOSS-2.0-Mini/iboss-op-server-mdm

src/main/java/com/dk/mdm/controller/mst/ComMenuController.java

@@ -53,4 +53,15 @@ public class ComMenuController{
     }
 
 
+    /**
+     * @desc   : 新建
+     * @author : 常皓宁
+     * @date   : 2024/5/14 13:14
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"update"})
+    public ResponseResultVO<?> update(@RequestBody List<ComMenuVO> comMenuVO) {
+        return comMenuService.update(comMenuVO);
+    }
+
 }

src/main/java/com/dk/mdm/mapper/common/CommonMapper.xml

@@ -1609,22 +1609,24 @@
 
     <!-- 获取功能 -->
     <select id="getAppMenu" resultType="java.util.Map">
-        SELECT menu.menu_uuid    AS "menuUuid",
-        menu.menu_uuid    AS "id",
-        menu.menu_name    AS "menuName",
-        menu.app_code     AS "appCode",
-        menu.parent_uuid  AS "parentId",
-        menu.flg_menu     AS "flgMenu",
-        menu.fun_uuid     AS "funUuid"
+        SELECT menu.menu_uuid                                            AS "menuUuid",
+               menu.menu_uuid                                            AS "id",
+               menu.menu_name                                            AS "menuName",
+               menu.app_code                                             AS "appCode",
+               menu.parent_uuid                                          AS "parentId",
+               menu.flg_menu                                             AS "flgMenu",
+               menu.fun_uuid                                             AS "funUuid",
+               CASE WHEN tmcm.menu_uuid IS NULL THEN FALSE ELSE TRUE END AS "checked"
         FROM sys.t_app_menu menu
+                 left JOIN dkic_b.t_mst_com_menu tmcm ON tmcm.menu_uuid = menu.menu_uuid
+            and tmcm.grade_code = #{gradeCode}
+            and tmcm.app_code = #{appCode}
         WHERE menu.flg_valid
-        AND menu.flg_right
-        AND menu.object_code != 'home'
-        AND menu.menu_type IN (0, 1)
-        <if test="appCode != null">
-            AND menu.app_code = #{appCode}
-        </if>
-        ORDER BY menu.level_code;
+          AND menu.flg_right
+          AND menu.object_code != 'home'
+          AND menu.menu_type IN (0, 1)
+          and menu.app_code = #{appCode}
+        ORDER BY menu.level_code
     </select>
 
 </mapper>

src/main/java/com/dk/mdm/mapper/mst/ComMenuMapper.java

@@ -4,26 +4,33 @@ import com.dk.mdm.model.pojo.mst.ComMenu;
 import com.dk.common.mapper.BaseMapper;
 import com.dk.mdm.model.query.mst.ComMenuQuery;
 import com.dk.mdm.model.response.mst.ComMenuResponse;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
 @Repository
-public interface ComMenuMapper extends BaseMapper<ComMenu>{
+public interface ComMenuMapper extends BaseMapper<ComMenu> {
 
     /**
-     * @desc   : 根据条件进行查询
+     * @desc : 根据条件进行查询
      * @author : 常皓宁
      * @date : 2024/2/26 10:36
      */
     List<ComMenuResponse> selectByCond(ComMenuQuery comMenuQuery);
 
     /**
-     * @desc   : 根据条件进行查询（数量）
+     * @desc : 根据条件进行查询（数量）
      * @author : 常皓宁
      * @date : 2024/2/26 10:36
      */
     Long countByCond(ComMenuQuery comMenuQuery);
-	
+
+    /**
+     * @desc :根据条件删除原数据
+     * @author : 付斌
+     * @date : 2024-06-07 10:40
+     */
+    int deleteByGradeAndAppCode(@Param("gradeCode") String gradeCode, @Param("appCode") String appCode);
 }
 

src/main/java/com/dk/mdm/mapper/mst/ComMenuMapper.xml

@@ -5,20 +5,15 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        tmcm.menu_uuid, tmcm.grade_code, tmcm.app_code, tmcm.display_no, tmcm.op_update_time, tmcm.op_update_user_id, tmcm.op_app_code, tmcm.op_timestamp, tmcm.op_db_user
+        tmcm.menu_uuid, tmcm.grade_code, tmcm.app_code, tmcm.display_no
     </sql>
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.ComMenu">
         <id column="menu_uuid" property="menuUuid"/>
-                <result column="grade_code" property="gradeCode"/>
-                <result column="app_code" property="appCode"/>
-                <result column="display_no" property="displayNo"/>
-            <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-            <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
+        <result column="grade_code" property="gradeCode"/>
+        <result column="app_code" property="appCode"/>
+        <result column="display_no" property="displayNo"/>
     </resultMap>
 
     <!-- 通用查询映射结果 -->
@@ -27,12 +22,8 @@
         <result column="grade_code" property="gradeCode"/>
         <result column="app_code" property="appCode"/>
         <result column="display_no" property="displayNo"/>
-        <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-        <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-        <result column="op_app_code" property="opAppCode"/>
-        <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-        <result column="op_db_user" property="opDbUser"/>
         <result column="menuName" property="menuName"/>
+        <result column="appName" property="appName"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -47,21 +38,6 @@
             <if test="displayNo != null">
                 AND tmcm.display_no = #{displayNo}
             </if>
-            <if test="opUpdateTime != null">
-                AND tmcm.op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND tmcm.op_update_user_id = #{opUpdateUserId}
-            </if>
-            <if test="opAppCode != null and opAppCode != ''">
-                AND tmcm.op_app_code = #{opAppCode}
-            </if>
-            <if test="opTimestamp != null">
-                AND tmcm.op_timestamp = #{opTimestamp}
-            </if>
-            <if test="opDbUser != null and opDbUser != ''">
-                AND tmcm.op_db_user = #{opDbUser}
-            </if>
         </where>
     </sql>
 
@@ -75,12 +51,15 @@
 
     <!-- 查询表dkic_b.t_mst_com_menu，（条件查询+分页）列表 -->
     <select id="selectByCond" resultMap="BaseResultMap_list">
-        SELECT
-        <include refid="Base_Column_List"/>
-        ,tam.menu_name as "menuName"
+        SELECT tmcm.menu_uuid
+             , tmcm.grade_code
+             , tmcm.app_code
+             , tmcm.display_no
+             , tam.menu_name as "menuName"
+             , ta.app_name   as "appName"
         FROM dkic_b.t_mst_com_menu tmcm
-        left join sys.t_app_menu tam
-        on tmcm.menu_uuid = tam.menu_uuid
+                 left join sys.t_app_menu as tam on tmcm.menu_uuid = tam.menu_uuid
+                 left join sys.t_application as ta on ta.app_code = tmcm.app_code
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -143,4 +122,11 @@
             )
         </foreach>
     </insert>
+
+    <!-- 根据条件删除原数据 -->
+     <delete id="deleteByGradeAndAppCode">
+        delete from dkic_b.t_mst_com_menu
+        where grade_code = #{gradeCode}
+          and app_code = #{appCode}
+    </delete>
 </mapper>

src/main/java/com/dk/mdm/model/pojo/mst/ComMenu.java

@@ -66,62 +66,6 @@ public class ComMenu extends PageInfo<ComMenu> implements Serializable {
     private Integer displayNo;
 
 
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/query/mst/ComMenuQuery.java

@@ -67,62 +67,6 @@ public class ComMenuQuery extends PageInfo<ComMenuQuery> implements Serializable
     private Integer displayNo;
 
 
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/model/response/mst/ComMenuResponse.java

@@ -66,66 +66,11 @@ public class ComMenuResponse extends PageInfo<ComMenuResponse> implements Serial
     @ApiModelProperty(value = "显示顺序 (【1 ～ 46655】)")
     private Integer displayNo;
 
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
     @TableField(exist = false)
     private String menuName;
 
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
+    @TableField(exist = false)
+    private String appName;
 
     private static final long serialVersionUID = 1L;
 

src/main/java/com/dk/mdm/model/vo/mst/ComMenuVO.java

@@ -67,62 +67,6 @@ public class ComMenuVO extends PageInfo<ComMenuVO> implements Serializable {
     private Integer displayNo;
 
 
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
-
-    /*
-     * 相关属性
-     * @TableField(exist = false)
-     */
-
-    /*
-     * 关联属性 + 查询条件
-     * @TableField(exist = false)
-     */
-
-
     private static final long serialVersionUID = 1L;
 
 }

src/main/java/com/dk/mdm/service/mst/ComMenuService.java

@@ -25,47 +25,77 @@ import java.util.List;
 @Transactional
 public class ComMenuService extends BaseService<ComMenu> {
 
-	@Override
-	public BaseMapper<ComMenu> getRepository() {
-		return comMenuMapper;
-	}
+    @Override
+    public BaseMapper<ComMenu> getRepository() {
+        return comMenuMapper;
+    }
 
-	@Autowired
-	private ComMenuMapper comMenuMapper;
+    @Autowired
+    private ComMenuMapper comMenuMapper;
 
-	@Autowired
-	private ComMenuConvert comMenuConvert;
+    @Autowired
+    private ComMenuConvert comMenuConvert;
 
-	/**
-	 * @desc : 查询
-	 * @author : 常皓宁
-	 * @date : 2023/1/5 9:39
-	 */
-	@Pagination
-	public ResponseResultVO<PageList<ComMenuResponse>> selectByCond(ComMenuQuery comMenuQuery) {
-		return super.mergeListWithCount(comMenuQuery, comMenuMapper.selectByCond(comMenuQuery),
-				comMenuMapper.countByCond(comMenuQuery));
-	}
+    /**
+     * @desc : 查询
+     * @author : 常皓宁
+     * @date : 2023/1/5 9:39
+     */
+    @Pagination
+    public ResponseResultVO<PageList<ComMenuResponse>> selectByCond(ComMenuQuery comMenuQuery) {
+        return super.mergeListWithCount(comMenuQuery, comMenuMapper.selectByCond(comMenuQuery),
+                comMenuMapper.countByCond(comMenuQuery));
+    }
 
-	/**
-	 * @desc : 新建
-	 * @author : 常皓宁
-	 * @date : 2024/5/14 13:15
-	 */
-	@Transactional(rollbackFor = {Exception.class})
-	public ResponseResultVO<Boolean> insert(List<ComMenuVO> comMenuVO) {
-		for (ComMenuVO comMenuList : comMenuVO) {
-			//系统版本不能为空
-			if (comMenuList.getGradeCode() == null) {
-				throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_GRADE_CODE_NOT_NULL.getMessage());
-			}
-			//功能不能为空
-			if (comMenuList.getMenuUuid() == null) {
-				throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_MENU_UUID_NOT_NULL.getMessage());
-			}
-			ComMenu comMenu = comMenuConvert.convertToPo(comMenuList);
-			comMenuMapper.insert(comMenu);
-		}
-		return ResponseResultUtil.success();
-	}
+    /**
+     * @desc : 新建
+     * @author : 常皓宁
+     * @date : 2024/5/14 13:15
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<Boolean> insert(List<ComMenuVO> comMenuVO) {
+        for (ComMenuVO comMenuList : comMenuVO) {
+            //系统版本不能为空
+            if (comMenuList.getGradeCode() == null) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_GRADE_CODE_NOT_NULL.getMessage());
+            }
+            //功能不能为空
+            if (comMenuList.getMenuUuid() == null) {
+                throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_MENU_UUID_NOT_NULL.getMessage());
+            }
+            ComMenu comMenu = comMenuConvert.convertToPo(comMenuList);
+            comMenuMapper.insert(comMenu);
+        }
+        return ResponseResultUtil.success();
+    }
+
+    /**
+     * @desc : 编辑
+     * @author : 付斌
+     * @date : 2024-06-07 10:07
+     */
+    @Transactional(rollbackFor = {Exception.class})
+    public ResponseResultVO<Boolean> update(List<ComMenuVO> comMenuVOList) {
+        //系统版本不能为空
+        if (comMenuVOList.get(0).getGradeCode() == null) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_GRADE_CODE_NOT_NULL.getMessage());
+        }
+        //功能不能为空
+        if (comMenuVOList.get(0).getAppCode() == null) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.APP_CODE_NOT_NULL.getMessage());
+        }
+        //功能不能为空
+        if (comMenuVOList.get(0).getMenuUuid() == null) {
+            throw new BaseBusinessException(ResponseCodeEnum.OPERATE_FAIL.getCode(), ErrorCodeEnum.USE_MENU_MENU_UUID_NOT_NULL.getMessage());
+        }
+
+        // 根据条件删除原数据
+        comMenuMapper.deleteByGradeAndAppCode(comMenuVOList.get(0).getGradeCode(), comMenuVOList.get(0).getAppCode());
+
+        for (ComMenuVO comMenuVO : comMenuVOList) {
+            ComMenu comMenu = comMenuConvert.convertToPo(comMenuVO);
+            comMenuMapper.insert(comMenu);
+        }
+        return ResponseResultUtil.success();
+    }
 }