商品属性

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

@@ -1,18 +1,23 @@
 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.GoodsBrand;
-import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.dk.mdm.model.query.mst.GoodsBrandQuery;
+import com.dk.mdm.model.response.mst.GoodsBrandResponse;
+import com.dk.mdm.model.vo.mst.GoodsBrandVO;
+import com.dk.mdm.model.vo.mst.RoleVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 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.GoodsBrandService;
 
 @Api(tags = "商品品牌API接口")
 @RestController
-@RequestMapping("/goodsBrand")
-public class GoodsBrandController{
+@RequestMapping("/mst/goodsBrand")
+public class GoodsBrandController {
 
     public BaseService<GoodsBrand> getService() {
         return goodsBrandService;
@@ -21,4 +26,63 @@ public class GoodsBrandController{
     @Autowired
     private GoodsBrandService goodsBrandService;
 
+
+    /**
+     * @desc : 条件查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    @ApiOperation(value = "分页、关联、条件查询", notes = "分页、关联、条件查询")
+    @PostMapping({"list_by"})
+    public ResponseResultVO<PageList<GoodsBrandResponse>> selectByCond(@RequestBody GoodsBrandQuery goodsBrandQuery) {
+        return goodsBrandService.selectByCond(goodsBrandQuery);
+    }
+
+
+    /**
+     * @desc : 新建
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @ApiOperation(value = "新建", notes = "新建")
+    @PostMapping({"insert"})
+    public ResponseResultVO<?> insert(@RequestBody GoodsBrandVO goodsBrandVO) {
+        return goodsBrandService.insert(goodsBrandVO);
+    }
+
+
+
+
+    /**
+     * @desc : 编辑
+     * @author : 于继渤
+     * @date : 2023/1/5 9:39
+     */
+    @ApiOperation( value = "编辑", notes = "编辑" )
+    @PostMapping({"update"})
+    public ResponseResultVO<?> update(@RequestBody GoodsBrandVO goodsBrandVO) {
+        return goodsBrandService.updateGoodsBrand(goodsBrandVO);
+    }
+
+
+
+    /**
+     * @desc : 停用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return this.getService().enable(id);
+    }
 }

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

@@ -1,8 +1,11 @@
 package com.dk.mdm.controller.mst;
 
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mst.GoodsCategory;
 import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,7 +14,7 @@ import com.dk.mdm.service.mst.GoodsCategoryService;
 
 @Api(tags = "商品种类API接口")
 @RestController
-@RequestMapping("/goodsCategory")
+@RequestMapping("/mst/goodsCategory")
 public class GoodsCategoryController{
 
     public BaseService<GoodsCategory> getService() {
@@ -21,4 +24,25 @@ public class GoodsCategoryController{
     @Autowired
     private GoodsCategoryService goodsCategoryService;
 
+
+    /**
+     * @desc : 停用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return this.getService().enable(id);
+    }
+
 }

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

@@ -1,8 +1,11 @@
 package com.dk.mdm.controller.mst;
 
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mst.GoodsSeries;
 import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,7 +14,7 @@ import com.dk.mdm.service.mst.GoodsSeriesService;
 
 @Api(tags = "商品系列API接口")
 @RestController
-@RequestMapping("/goodsSeries")
+@RequestMapping("/mst/goodsSeries")
 public class GoodsSeriesController{
 
     public BaseService<GoodsSeries> getService() {
@@ -21,4 +24,26 @@ public class GoodsSeriesController{
     @Autowired
     private GoodsSeriesService goodsSeriesService;
 
+
+
+    /**
+     * @desc : 停用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return this.getService().enable(id);
+    }
+
 }

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

@@ -1,8 +1,11 @@
 package com.dk.mdm.controller.mst;
 
+import com.dk.common.response.ResponseResultVO;
 import com.dk.mdm.model.pojo.mst.Unit;
 import com.dk.common.controller.BaseController;
 import com.dk.common.service.BaseService;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,7 +14,7 @@ import com.dk.mdm.service.mst.UnitService;
 
 @Api(tags = "计量单位API接口")
 @RestController
-@RequestMapping("/unit")
+@RequestMapping("/mst/unit")
 public class UnitController{
 
     public BaseService<Unit> getService() {
@@ -21,4 +24,24 @@ public class UnitController{
     @Autowired
     private UnitService unitService;
 
+
+    /**
+     * @desc : 停用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("disable/{id}")
+    public ResponseResultVO<Boolean> disable(@PathVariable String id) {
+        return this.getService().disable(id);
+    }
+
+    /**
+     * @desc : 启用
+     * @author : 于继渤
+     * @date :  2023/1/4 9:39
+     */
+    @PostMapping("enable/{id}")
+    public ResponseResultVO<Boolean> enable(@PathVariable String id) {
+        return this.getService().enable(id);
+    }
 }

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

@@ -2,13 +2,34 @@ package com.dk.mdm.mapper.mst;
 
 import com.dk.mdm.model.pojo.mst.GoodsBrand;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mst.Role;
+import com.dk.mdm.model.query.mst.GoodsBrandQuery;
+import com.dk.mdm.model.response.mst.GoodsBrandResponse;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 /**
 *  商品品牌 Mapper
 */
 @Repository
 public interface GoodsBrandMapper extends BaseMapper<GoodsBrand>{
-	
+
+    /**
+     * @desc   : 根据条件进行查询
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    List<GoodsBrandResponse> selectByCond(GoodsBrandQuery goodsBrandQuery);
+
+    /**
+     * @desc   : 根据条件进行查询（数量）
+     * @author : 于继渤
+     * @date : 2024/2/26 10:36
+     */
+    Long countByCond(GoodsBrandQuery goodsBrandQuery);
+    Integer selectDisplayNo(GoodsBrandQuery goodsBrandQuery);
+
+    String setBrandCode(GoodsBrand goodsBrand);
 }
 

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

@@ -8,6 +8,11 @@
         brand_id, brand_code, brand_name, short_name, display_no, remarks, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
     </sql>
 
+    <sql id="Base_Column_List_Join">
+        tmgb.brand_id, tmgb.brand_code, tmgb.brand_name, tmgb.short_name, tmgb.display_no, tmgb.remarks, tmgb.flg_valid, tmgb.cp_id
+    </sql>
+
+
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.dk.mdm.model.pojo.mst.GoodsBrand">
         <id column="brand_id" property="brandId"/>
@@ -27,51 +32,47 @@
                 <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
+
+    <resultMap id="BaseResultMapResponse" type="com.dk.mdm.model.response.mst.GoodsBrandResponse">
+        <id column="brand_id" property="brandId"/>
+        <result column="brand_code" property="brandCode"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="short_name" property="shortName"/>
+        <result column="display_no" property="displayNo"/>
+        <result column="remarks" property="remarks"/>
+        <result column="flg_valid" property="flgValid"/>
+        <result column="cp_id" property="cpId"/>
+        <result column="goodsBrand" property="goodsBrand"/>
+    </resultMap>
+
     <!-- 通用条件列 -->
     <sql id="Condition">
         <where>
             <if test="brandCode != null and brandCode != ''">
-                AND brand_code = #{brandCode}
+                AND tmgb.brand_code = #{brandCode}
             </if>
             <if test="brandName != null and brandName != ''">
-                AND brand_name = #{brandName}
+                AND tmgb.brand_name = #{brandName}
             </if>
             <if test="shortName != null and shortName != ''">
-                AND short_name = #{shortName}
+                AND tmgb.short_name = #{shortName}
             </if>
             <if test="displayNo != null">
-                AND display_no = #{displayNo}
+                AND tmgb.display_no = #{displayNo}
             </if>
             <if test="remarks != null and remarks != ''">
-                AND remarks = #{remarks}
+                AND tmgb.remarks = #{remarks}
             </if>
             <if test="flgValid != null">
-                AND flg_valid = #{flgValid}
+                AND tmgb.flg_valid = #{flgValid}
             </if>
             <if test="cpId != null">
-                AND cp_id = #{cpId}
+                AND tmgb.cp_id = #{cpId}
             </if>
             <if test="opCreateTime != null">
-                AND op_create_time = #{opCreateTime}
-            </if>
-            <if test="opCreateUserId != null and opCreateUserId != ''">
-                AND op_create_user_id = #{opCreateUserId}
-            </if>
-            <if test="opUpdateTime != null">
-                AND op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND op_update_user_id = #{opUpdateUserId}
-            </if>
-            <if test="opAppCode != null and opAppCode != ''">
-                AND op_app_code = #{opAppCode}
-            </if>
-            <if test="opTimestamp != null">
-                AND op_timestamp = #{opTimestamp}
-            </if>
-            <if test="opDbUser != null and opDbUser != ''">
-                AND op_db_user = #{opDbUser}
+                AND tmgb.op_create_time = #{opCreateTime}
             </if>
+
         </where>
     </sql>
 
@@ -84,38 +85,44 @@
     </sql>
 
     <!-- 查询表t_mst_goods_brand，（条件查询+分页）列表 -->
-    <select id="selectByCond" resultMap="BaseResultMap">
+    <select id="selectByCond" resultMap="BaseResultMapResponse">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_goods_brand
+        <include refid="Base_Column_List_Join"/>,
+        '商品品牌' AS "goodsBrand"
+        FROM dkic_b.t_mst_goods_brand tmgb
         <include refid="Condition"/>
+        order by display_no asc
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
         </if>
     </select>
 
+    <select id="setBrandCode"  resultType="String">
+        select dkic_b.f_create_code(1,#{brandId}::uuid,'品牌');
+    </select>
+
     <!-- 查询表t_mst_goods_brand，（条件查询）个数 -->
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mst_goods_brand
+        FROM dkic_b.t_mst_goods_brand tmgb
         <include refid="Condition"/>
     </select>
 
     <!-- 根据主键查询表t_mst_goods_brand的一行数据 -->
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_goods_brand
-        WHERE brand_id = #{brandId}::uuid
+        <include refid="Base_Column_List_Join"/>
+        FROM dkic_b.t_mst_goods_brand tmgb
+        WHERE tmgb.brand_id = #{brandId}::uuid
     </select>
 
     <!-- 根据主键锁定表t_mst_goods_brand的一行数据 -->
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM t_mst_goods_brand
-        WHERE brand_id = #{brandId}
+        <include refid="Base_Column_List_Join"/>
+        FROM dkic_b.t_mst_goods_brand tmgb
+        WHERE tmgb.brand_id = #{brandId}
         for update
     </select>
 
@@ -123,13 +130,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_goods_brand
+        FROM dkic_b.t_mst_goods_brand
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mst_goods_brand
+        insert into dkic_b.t_mst_goods_brand
         (
         <trim suffixOverrides=",">
             brand_code,
@@ -137,8 +144,7 @@
             short_name,
             display_no,
             remarks,
-            cp_id,
-            op_app_code,
+            cp_id,=
         </trim>
         )
         values
@@ -151,9 +157,46 @@
                 #{item.displayNo},
                 #{item.remarks},
                 #{item.cpId},
-                #{item.opAppCode},
             </trim>
             )
         </foreach>
     </insert>
+
+
+    <select id="selectDisplayNo" resultType="Integer">
+        SELECT MAX(display_no) + 1  FROM dkic_b.t_mst_goods_brand
+        <include refid="Condition"/>
+    </select>
+
+
+
+    <update id="updateById" parameterType="com.dk.mdm.model.pojo.mst.GoodsBrand">
+        update
+        dkic_b.t_mst_goods_brand
+        <set>
+            <if test="et.brandCode != null">
+                brand_code = #{et.brandCode},
+            </if>
+            <if test="et.brandName != null">
+                brand_name = #{et.brandName},
+            </if>
+            <if test="et.shortName != null">
+                short_name = #{et.shortName},
+            </if>
+            <if test="et.displayNo != null">
+                display_no = #{et.displayNo},
+            </if>
+            <if test="et.remarks != null">
+                remarks = #{et.remarks},
+            </if>
+            <if test="et.cpId != null">
+                cp_id = #{et.cpId},
+            </if>
+            <if test="et.flgValid != null">
+                flg_valid = #{et.flgValid},
+            </if>
+
+        </set>
+        where brand_id = #{et.brandId}::uuid
+    </update>
 </mapper>

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

@@ -167,6 +167,7 @@ public class GoodsBrandResponse extends PageInfo<GoodsBrandResponse> implements
     private String opDbUser;
 
 
+    private String goodsBrand;
     /*
      * 相关属性
      * @TableField(exist = false)
@@ -177,7 +178,6 @@ public class GoodsBrandResponse extends PageInfo<GoodsBrandResponse> implements
      * @TableField(exist = false)
      */
 
-
     private static final long serialVersionUID = 1L;
 
 }

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

@@ -1,12 +1,28 @@
 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.ResponseResultUtil;
+import com.dk.common.response.ResponseResultVO;
+import com.dk.mdm.infrastructure.convert.mst.GoodsBrandConvert;
+import com.dk.mdm.infrastructure.convert.mst.GoodsSkuConvert;
 import com.dk.mdm.model.pojo.mst.GoodsBrand;
 import com.dk.mdm.mapper.mst.GoodsBrandMapper;
 import com.dk.common.service.BaseService;
 import com.dk.common.mapper.BaseMapper;
+import com.dk.mdm.model.pojo.mst.GoodsSku;
+import com.dk.mdm.model.pojo.mst.Role;
+import com.dk.mdm.model.query.mst.GoodsSkuQuery;
+import com.dk.mdm.model.query.mst.RoleQuery;
+import com.dk.mdm.model.response.mst.GoodsSkuResponse;
+import com.dk.mdm.model.vo.mst.GoodsSkuVO;
+import com.dk.mdm.model.vo.mst.RoleVo;
 import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
+import com.dk.mdm.model.query.mst.GoodsBrandQuery;
+import com.dk.mdm.model.response.mst.GoodsBrandResponse;
+import com.dk.mdm.model.vo.mst.GoodsBrandVO;
 
 @Service
 @Transactional
@@ -20,4 +36,69 @@ public class GoodsBrandService extends BaseService<GoodsBrand> {
 	@Autowired
 	private GoodsBrandMapper goodsBrandMapper;
 
+
+
+	@Autowired
+	private GoodsBrandConvert goodsBrandConvert;
+
+	/**
+	 * @desc : 重写主键
+	 * @author : 于继渤
+	 * @date : 2024/2/29 20:29
+	 */
+	@Override
+	public String getPrimaryKey() {
+		return "brand_id";
+	}
+	/**
+	 * @desc : 查询
+	 * @author : 于继渤
+	 * @date : 2023/1/5 9:39
+	 */
+	@Pagination
+	public ResponseResultVO<PageList<GoodsBrandResponse>> selectByCond(GoodsBrandQuery goodsBrandQuery) {
+		return super.mergeListWithCount(goodsBrandQuery, goodsBrandMapper.selectByCond(goodsBrandQuery),
+				goodsBrandMapper.countByCond(goodsBrandQuery));
+	}
+
+
+
+	/**
+	 * @desc : 新建
+	 * @author : 于继渤
+	 * @date : 2023/1/5 9:39
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> insert(GoodsBrandVO goodsBrandVO) {
+		GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
+		goodsBrand.setShortName(goodsBrand.getBrandName());
+		Integer displayNo = goodsBrandMapper.selectDisplayNo(new GoodsBrandQuery());
+		goodsBrand.setDisplayNo(displayNo);
+		goodsBrandMapper.insert(goodsBrand);
+		goodsBrand.setBrandCode(goodsBrandMapper.setBrandCode(goodsBrand));
+		goodsBrandMapper.updateById(goodsBrand);
+
+		return ResponseResultUtil.success();
+	}
+
+
+
+	/**
+	 * @desc : 编辑
+	 * @author : 于继渤
+	 * @date : 2023/1/5 9:39
+	 */
+	@Transactional(
+			rollbackFor = {Exception.class}
+	)
+	public ResponseResultVO<?> updateGoodsBrand(GoodsBrandVO goodsBrandVO) {
+		GoodsBrand goodsBrand = goodsBrandConvert.convertToPo(goodsBrandVO);
+		goodsBrandMapper.updateById(goodsBrand);
+		return ResponseResultUtil.success();
+	}
+
+
+
 }

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

@@ -20,4 +20,14 @@ public class GoodsSeriesService extends BaseService<GoodsSeries> {
 	@Autowired
 	private GoodsSeriesMapper goodsSeriesMapper;
 
+	/**
+	 * @desc : 重写主键
+	 * @author : 于继渤
+	 * @date : 2024/2/29 20:29
+	 */
+	@Override
+	public String getPrimaryKey() {
+		return "series_id";
+	}
+
 }