楚江ERP-厂房相关接口调试

 package com.lframework.xingyun.basedata.controller;
 package com.lframework.xingyun.basedata.controller;
 
 
+import com.lframework.starter.common.exceptions.impl.DefaultClientException;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.utils.PageResultUtil;
 import com.lframework.starter.web.core.utils.PageResultUtil;
@@ -32,7 +33,7 @@ import java.util.stream.Collectors;
 @Api(tags = "厂房信息")
 @Api(tags = "厂房信息")
 @Validated
 @Validated
 @RestController
 @RestController
-@RequestMapping("/workshop")
+@RequestMapping("/baseData/workshop")
 public class WorkshopController extends DefaultBaseController {
 public class WorkshopController extends DefaultBaseController {
 
 
 
 
@@ -44,7 +45,7 @@ public class WorkshopController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"xingyun:tblworkshop:query"})
+    @HasPermission({"base-data:workshop:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetWorkshopBo>> query(@Valid QueryWorkshopVo vo) {
     public InvokeResult<PageResult<GetWorkshopBo>> query(@Valid QueryWorkshopVo vo) {
 
 
@@ -62,7 +63,7 @@ public class WorkshopController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"xingyun:tblworkshop:add"})
+    @HasPermission({"base-data:workshop:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateWorkshopVo vo) {
     public InvokeResult<Void> create(@Valid CreateWorkshopVo vo) {
         workshopService.create(vo);
         workshopService.create(vo);
@@ -73,7 +74,7 @@ public class WorkshopController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"xingyun:tblworkshop:modify"})
+    @HasPermission({"base-data:workshop:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateWorkshopVo vo) {
     public InvokeResult<Void> update(@Valid UpdateWorkshopVo vo) {
         workshopService.update(vo);
         workshopService.update(vo);
@@ -85,10 +86,26 @@ public class WorkshopController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID删除")
     @ApiOperation("根据ID删除")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"xingyun:tblworkshop:delete"})
+    @HasPermission({"base-data:workshop:delete"})
     @DeleteMapping
     @DeleteMapping
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> deleteById(@NotBlank(message = "id不能为空！") String id) {
         workshopService.deleteById(id);
         workshopService.deleteById(id);
         return InvokeResultBuilder.success();
         return InvokeResultBuilder.success();
     }
     }
+
+    /**
+     * 厂房详情
+     */
+    @ApiOperation("厂房详情")
+    @ApiImplicitParam(value = "ID", name = "id", paramType = "query", required = true)
+    @HasPermission({"base-data:workshop:query", "base-data:workshop:add", "base-data:workshop:modify"})
+    @GetMapping
+    public InvokeResult<GetWorkshopBo> get(@NotBlank(message = "ID不能为空！") String id) {
+        Workshop data = workshopService.findById(id);
+        if (data == null) {
+            throw new DefaultClientException("厂房信息不存在！");
+        }
+        GetWorkshopBo result = new GetWorkshopBo(data);
+        return InvokeResultBuilder.success(result);
+    }
 }
 }

@@ -21,7 +21,7 @@ public class Workshop extends BaseEntity implements BaseDto {
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
-    public static final String CACHE_NAME = "TblWorkshop";
+    public static final String CACHE_NAME = "Workshop";
 
 
     /**
     /**
      * ID
      * ID
@@ -44,12 +44,29 @@ public class Workshop extends BaseEntity implements BaseDto {
     private WorkshopType type;
     private WorkshopType type;
 
 
     /**
     /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 创建人ID
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String createById;
+
+    /**
      * 创建人
      * 创建人
      */
      */
     @TableField(fill = FieldFill.INSERT)
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
     private String createBy;
 
 
     /**
     /**
+     * 修改人ID
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String updateById;
+
+    /**
      * 更新人
      * 更新人
      */
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @TableField(fill = FieldFill.INSERT_UPDATE)

@@ -106,9 +106,9 @@ public class WorkshopServiceImpl extends BaseMpServiceImpl<WorkshopMapper, Works
             throw new DefaultClientException("厂房信息不存在！");
             throw new DefaultClientException("厂房信息不存在！");
         }
         }
         LambdaUpdateWrapper<Workshop> updateWrapper = Wrappers.lambdaUpdate(Workshop.class)
         LambdaUpdateWrapper<Workshop> updateWrapper = Wrappers.lambdaUpdate(Workshop.class)
-                .set(Workshop::getCode, vo.getType())
+                .set(Workshop::getCode, data.getCode())
                 .set(Workshop::getName, vo.getName())
                 .set(Workshop::getName, vo.getName())
-                .set(Workshop::getType, EnumUtil.getByCode(WorkshopType.class, vo.getType()))
+                .set(Workshop::getType, EnumUtil.getByCode(WorkshopType.class, data.getType()))
                 .eq(Workshop::getId, vo.getId());
                 .eq(Workshop::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
 
 

@@ -40,4 +40,10 @@ public class CreateWorkshopVo implements BaseVo, Serializable {
     @TypeMismatch(message = "厂房类型格式有误！")
     @TypeMismatch(message = "厂房类型格式有误！")
     private String type;
     private String type;
 
 
+    /**
+     * 厂房描述
+     */
+    @ApiModelProperty(value = "厂房描述")
+    @Length(message = "厂房描述最多允许100个字符！")
+    private String description;
 }
 }

@@ -34,4 +34,9 @@ public class QueryWorkshopVo extends PageVo implements BaseVo, Serializable {
     @IsEnum(message = "厂房类型格式有误！", enumClass = WorkshopType.class)
     @IsEnum(message = "厂房类型格式有误！", enumClass = WorkshopType.class)
     private String type;
     private String type;
 
 
+    /**
+     * 厂房描述
+     */
+    @ApiModelProperty("描述")
+    private String description;
 }
 }

@@ -35,8 +35,13 @@ public class UpdateWorkshopVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty(value = "厂房类型", required = true)
     @ApiModelProperty(value = "厂房类型", required = true)
     @TypeMismatch(message = "厂房类型格式有误！")
     @TypeMismatch(message = "厂房类型格式有误！")
-    @NotBlank(message = "请选择厂房类型！")
     @IsEnum(message = "请选择厂房类型！", enumClass = WorkshopType.class)
     @IsEnum(message = "请选择厂房类型！", enumClass = WorkshopType.class)
     private String type;
     private String type;
 
 
+    /**
+     * 厂房描述
+     */
+    @ApiModelProperty(value = "厂房描述")
+    @Length(message = "厂房描述最多允许100个字符！")
+    private String description;
 }
 }

@@ -2,32 +2,34 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.lframework.xingyun.basedata.mappers.WorkshopMapper">
 <mapper namespace="com.lframework.xingyun.basedata.mappers.WorkshopMapper">
 
 
-    <resultMap id="TblWorkshop" type="com.lframework.xingyun.basedata.entity.Workshop">
+    <resultMap id="Workshop" type="com.lframework.xingyun.basedata.entity.Workshop">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="code" property="code"/>
         <result column="code" property="code"/>
         <result column="name" property="name"/>
         <result column="name" property="name"/>
         <result column="type" property="type"/>
         <result column="type" property="type"/>
+        <result column="description" property="description"/>
         <result column="create_by" property="createBy"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by" property="updateBy"/>
         <result column="update_by" property="updateBy"/>
         <result column="create_time" property="createTime"/>
         <result column="create_time" property="createTime"/>
         <result column="update_time" property="updateTime"/>
         <result column="update_time" property="updateTime"/>
     </resultMap>
     </resultMap>
 
 
-    <sql id="TblWorkshop_sql">
+    <sql id="Workshop_sql">
         SELECT
         SELECT
             tb.id,
             tb.id,
             tb.code,
             tb.code,
             tb.name,
             tb.name,
             tb.type,
             tb.type,
+            tb.description,
             tb.create_by,
             tb.create_by,
             tb.update_by,
             tb.update_by,
             tb.create_time,
             tb.create_time,
             tb.update_time
             tb.update_time
-        FROM tbl_workshop AS tb
+        FROM base_data_workshop AS tb
     </sql>
     </sql>
 
 
-    <select id="query" resultMap="TblWorkshop">
-        <include refid="TblWorkshop_sql"/>
+    <select id="query" resultMap="Workshop">
+        <include refid="Workshop_sql"/>
         <where>
         <where>
             <if test="vo.code != null and vo.code != ''">
             <if test="vo.code != null and vo.code != ''">
                 AND tb.code LIKE CONCAT('%', #{vo.code})
                 AND tb.code LIKE CONCAT('%', #{vo.code})