فهرست منبع

商户添加功能

changhaoning 1 سال پیش
والد
کامیت
502b67e040

+ 42 - 0
src/main/java/com/dk/mdm/controller/mst/MenuFrequencyController.java

@@ -0,0 +1,42 @@
+package com.dk.mdm.controller.mst;
+
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.model.pojo.mst.MenuFrequency;
+import com.dk.common.service.BaseService;
+import com.dk.mdm.model.query.mst.MenuFrequencyQuery;
+import com.dk.mdm.model.response.mst.MenuFrequencyResponse;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.Api;
+import com.dk.mdm.service.mst.MenuFrequencyService;
+
+@Api(tags = "企业功能频率API接口")
+@RestController
+@RequestMapping("/mst/menuFrequency")
+public class MenuFrequencyController{
+
+    public BaseService<MenuFrequency> getService() {
+        return menuFrequencyService;
+    }
+
+    @Autowired
+    private MenuFrequencyService menuFrequencyService;
+
+    /**
+     * @desc   : 条件查询
+     * @author : 常皓宁
+     * @date   : 2024/4/12 10:19
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<MenuFrequencyResponse>> selectByCond(@RequestBody MenuFrequencyQuery menuFrequencyQuery) {
+        return menuFrequencyService.selectByCond(menuFrequencyQuery);
+    }
+
+
+}

+ 33 - 0
src/main/java/com/dk/mdm/mapper/mst/MenuFrequencyMapper.java

@@ -0,0 +1,33 @@
+package com.dk.mdm.mapper.mst;
+
+import com.dk.mdm.model.pojo.mst.MenuFrequency;
+import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mst.MenuFrequencyQuery;
+import com.dk.mdm.model.response.mst.MenuFrequencyResponse;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+*  企业功能频率 Mapper
+*/
+@Repository
+public interface MenuFrequencyMapper extends BaseMapper<MenuFrequency>{
+
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 常皓宁
+     * @date : 2024/2/26 10:36
+     */
+    List<MenuFrequencyResponse> selectByCond(MenuFrequencyQuery menuFrequencyQuery);
+
+    /**
+     * @desc   : 根据条件进行查询(数量)
+     * @author : 常皓宁
+     * @date : 2024/2/26 10:36
+     */
+    Long countByCond(MenuFrequencyQuery menuFrequencyQuery);
+
+
+}
+

+ 147 - 0
src/main/java/com/dk/mdm/mapper/mst/MenuFrequencyMapper.xml

@@ -0,0 +1,147 @@
+<?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.dk.mdm.mapper.mst.MenuFrequencyMapper">
+
+    <!-- 通用设置 -->
+    <!-- 通用查询列 -->
+    <sql id="Base_Column_List">
+        tamf.menu_uuid, tamf.app_code, tamf.cp_id, tamf.qty, tamf.op_update_time, tamf.op_update_user_id, tamf.op_app_code, tamf.op_timestamp, tamf.op_db_user
+    </sql>
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.MenuFrequency">
+        <id column="menu_uuid" property="menuUuid"/>
+                <result column="app_code" property="appCode"/>
+                <result column="cp_id" property="cpId"/>
+                <result column="qty" property="qty"/>
+            <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"/>
+    </resultMap>
+
+    <resultMap id="BaseResultMap_list" type="com.dk.mdm.model.response.mst.MenuFrequencyResponse">
+        <id column="menu_uuid" property="menuUuid"/>
+        <result column="app_code" property="appCode"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="qty" property="qty"/>
+        <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="appPlace" property="appPlace"/>
+    </resultMap>
+
+    <!-- 通用条件列 -->
+    <sql id="Condition">
+        <where>
+            <if test="appCode != null and appCode != ''">
+                AND tamf.app_code = #{appCode}
+            </if>
+            <if test="cpId != null">
+                AND tamf.cp_id = #{cpId}
+            </if>
+            <if test="qty != null">
+                AND tamf.qty = #{qty}
+            </if>
+            <if test="opUpdateTime != null">
+                AND tamf.op_update_time = #{opUpdateTime}
+            </if>
+            <if test="opUpdateUserId != null and opUpdateUserId != ''">
+                AND tamf.op_update_user_id = #{opUpdateUserId}
+            </if>
+            <if test="opAppCode != null and opAppCode != ''">
+                AND tamf.op_app_code = #{opAppCode}
+            </if>
+            <if test="opTimestamp != null">
+                AND tamf.op_timestamp = #{opTimestamp}
+            </if>
+            <if test="opDbUser != null and opDbUser != ''">
+                AND tamf.op_db_user = #{opDbUser}
+            </if>
+        </where>
+    </sql>
+
+    <sql id="idsForeach">
+        <!-- 根据主键menuUuid批量操作 -->
+        WHERE menu_uuid in
+        <foreach collection="ids" index="index" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+    </sql>
+
+    <!-- 查询表dkic_a.t_a_menu_frequency,(条件查询+分页)列表 -->
+    <select id="selectByCond" resultMap="BaseResultMap_list">
+        SELECT
+        <include refid="Base_Column_List"/>
+        , sys.f_get_name_i18n(tam.menu_name_i18n, #{i18n}) as "menuName"
+        , case when tamf.app_code = 'CP-WXP' then '电脑端' else '小程序' end as  "appPlace"
+        FROM dkic_a.t_a_menu_frequency tamf
+        left join sys.t_app_menu tam
+        on tamf.menu_uuid = tam.menu_uuid
+        <include refid="Condition"/>
+        <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
+            limit #{end} offset #{start}
+        </if>
+    </select>
+
+    <!-- 查询表dkic_a.t_a_menu_frequency,(条件查询)个数 -->
+    <select id="countByCond" resultType="Long">
+        SELECT
+        count(1)
+        FROM dkic_a.t_a_menu_frequency tamf
+        <include refid="Condition"/>
+    </select>
+
+    <!-- 根据主键查询表dkic_a.t_a_menu_frequency的一行数据 -->
+    <select id="selectById" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_a.t_a_menu_frequency
+        WHERE menu_uuid = #{menuUuid}::uuid
+    </select>
+
+    <!-- 根据主键锁定表dkic_a.t_a_menu_frequency的一行数据 -->
+    <select id="selectByIdForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_a.t_a_menu_frequency
+        WHERE menu_uuid = #{menuUuid}
+        for update
+    </select>
+
+    <!-- 根据主键锁定表dkic_a.t_a_menu_frequency的多行数据 -->
+    <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
+        SELECT
+        <include refid="Base_Column_List"/>
+        FROM dkic_a.t_a_menu_frequency
+        <include refid="idsForeach"/>
+        for update
+    </select>
+
+    <insert id="insertBatch">
+        insert into dkic_a.t_a_menu_frequency
+        (
+        <trim suffixOverrides=",">
+            app_code,
+            cp_id,
+            qty,
+            op_app_code,
+        </trim>
+        )
+        values
+        <foreach collection="list" index="index" item="item" separator=",">
+            (
+            <trim suffixOverrides=",">
+                #{item.appCode},
+                #{item.cpId},
+                #{item.qty},
+                #{item.opAppCode},
+            </trim>
+            )
+        </foreach>
+    </insert>
+</mapper>

+ 132 - 0
src/main/java/com/dk/mdm/model/pojo/mst/MenuFrequency.java

@@ -0,0 +1,132 @@
+package com.dk.mdm.model.pojo.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ *  企业功能频率
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("企业功能频率")
+@TableName(value = "t_a_menu_frequency", autoResultMap = true,schema = "dkic_a")
+@ApiModel(value="实体类:企业功能频率", description="表名:t_a_menu_frequency")
+public class MenuFrequency extends PageInfo<MenuFrequency> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 功能菜单
+     */
+    @TableId(value = "menu_uuid", type = IdType.AUTO)
+    @ApiModelProperty(value = "功能菜单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String menuUuid;
+
+
+    /**
+     * 应用代码
+     */
+    @Excel(name = "应用代码")
+    @ApiModelProperty(value = "应用代码")
+    private String appCode;
+
+
+    /**
+     * 企业Id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业Id")
+    @ApiModelProperty(value = "企业Id")
+    private Integer cpId;
+
+
+    /**
+     * 次数
+     */
+    @Excel(name = "次数")
+    @ApiModelProperty(value = "次数")
+    private Integer qty;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @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;
+
+}

+ 132 - 0
src/main/java/com/dk/mdm/model/query/mst/MenuFrequencyQuery.java

@@ -0,0 +1,132 @@
+package com.dk.mdm.model.query.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ *  企业功能频率
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("企业功能频率")
+@TableName(value = "t_a_menu_frequency", autoResultMap = true,schema = "dkic_a")
+@ApiModel(value="实体类:企业功能频率", description="表名:t_a_menu_frequency")
+public class MenuFrequencyQuery extends PageInfo<MenuFrequencyQuery> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 功能菜单
+     */
+    @TableId(value = "menu_uuid", type = IdType.AUTO)
+    @ApiModelProperty(value = "功能菜单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String menuUuid;
+
+
+    /**
+     * 应用代码
+     */
+    @Excel(name = "应用代码")
+    @ApiModelProperty(value = "应用代码")
+    private String appCode;
+
+
+    /**
+     * 企业Id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业Id")
+    @ApiModelProperty(value = "企业Id")
+    private Integer cpId;
+
+
+    /**
+     * 次数
+     */
+    @Excel(name = "次数")
+    @ApiModelProperty(value = "次数")
+    private Integer qty;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @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;
+
+}

+ 137 - 0
src/main/java/com/dk/mdm/model/response/mst/MenuFrequencyResponse.java

@@ -0,0 +1,137 @@
+package com.dk.mdm.model.response.mst;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.*;
+import java.io.Serializable;
+
+import com.dk.common.infrastructure.annotaiton.ExportTitle;
+import com.dk.common.infrastructure.handler.*;
+import com.dk.common.model.pojo.PageInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.alibaba.fastjson.JSONObject;
+
+import java.util.List;
+import java.time.LocalDateTime;
+
+/**
+ *  企业功能频率
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@ExportTitle("企业功能频率")
+@TableName(value = "t_a_menu_frequency", autoResultMap = true,schema = "dkic_a")
+@ApiModel(value="实体类:企业功能频率", description="表名:t_a_menu_frequency")
+public class MenuFrequencyResponse extends PageInfo<MenuFrequencyResponse> implements Serializable {
+
+    /*
+     * 数据库字段
+     */
+
+    /**
+     * 功能菜单
+     */
+    @TableId(value = "menu_uuid", type = IdType.AUTO)
+    @ApiModelProperty(value = "功能菜单")
+    @TableField(typeHandler = UuidTypeHandler.class)
+    private String menuUuid;
+
+
+    /**
+     * 应用代码
+     */
+    @Excel(name = "应用代码")
+    @ApiModelProperty(value = "应用代码")
+    private String appCode;
+
+
+    /**
+     * 企业Id
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @Excel(name = "企业Id")
+    @ApiModelProperty(value = "企业Id")
+    private Integer cpId;
+
+
+    /**
+     * 次数
+     */
+    @Excel(name = "次数")
+    @ApiModelProperty(value = "次数")
+    private Integer qty;
+
+
+    /**
+     * 修改时间 (触发器自动处理)
+     */
+    @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;
+
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    private String appPlace;
+
+
+    /*
+     * 相关属性
+     * @TableField(exist = false)
+     */
+
+    /*
+     * 关联属性 + 查询条件
+     * @TableField(exist = false)
+     */
+
+
+    private static final long serialVersionUID = 1L;
+
+}

+ 39 - 0
src/main/java/com/dk/mdm/service/mst/MenuFrequencyService.java

@@ -0,0 +1,39 @@
+package com.dk.mdm.service.mst;
+
+import com.dk.common.infrastructure.annotaiton.Pagination;
+import com.dk.common.model.pojo.PageList;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.model.pojo.mst.MenuFrequency;
+import com.dk.mdm.mapper.mst.MenuFrequencyMapper;
+import com.dk.common.service.BaseService;
+import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.query.mst.MenuFrequencyQuery;
+import com.dk.mdm.model.response.mst.MenuFrequencyResponse;
+import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional
+public class MenuFrequencyService extends BaseService<MenuFrequency> {
+
+	@Override
+	public BaseMapper<MenuFrequency> getRepository() {
+		return menuFrequencyMapper;
+	}
+
+	@Autowired
+	private MenuFrequencyMapper menuFrequencyMapper;
+
+	/**
+	 * @desc : 查询
+	 * @author : 常皓宁
+	 * @date : 2023/1/5 9:39
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<MenuFrequencyResponse>> selectByCond(MenuFrequencyQuery menuFrequencyQuery) {
+		return super.mergeListWithCount(menuFrequencyQuery, menuFrequencyMapper.selectByCond(menuFrequencyQuery),
+				menuFrequencyMapper.countByCond(menuFrequencyQuery));
+	}
+
+}