diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java index e0829e7..d9d67b4 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/CsElementController.java @@ -32,6 +32,7 @@ import org.springframework.web.multipart.MultipartFile; @RequestMapping("/csElement") @Api(tags = "组态图元") @AllArgsConstructor +@Deprecated public class CsElementController extends BaseController { private final ICsElementService csElementService; diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/ElementParam.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/ElementParam.java new file mode 100644 index 0000000..7d38e52 --- /dev/null +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/ElementParam.java @@ -0,0 +1,41 @@ +package com.njcn.cssystem.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.springframework.web.multipart.MultipartFile; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +/** + * 类的介绍: + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/12 16:23 + */ +@Data +public class ElementParam { + + @ApiModelProperty(value = "组件分类") + @NotBlank(message="组件分类不能为空!") + private String elementType; + + @ApiModelProperty(value = "组件子类型") + @NotBlank(message="组件子类型不能为空!") + private String elementSonType; + + @ApiModelProperty(value = "组件编码") + private String elementCode; + + @ApiModelProperty(value = "组件名称") + private String elementName; + + @ApiModelProperty(value = "组件标识") + private String elementMark; + + @ApiModelProperty(value = "图元文件") + @NotNull(message="图元文件不能为空!") + private MultipartFile multipartFile; + +} diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsElement.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsElement.java new file mode 100644 index 0000000..4bb898c --- /dev/null +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/CsElement.java @@ -0,0 +1,62 @@ +package com.njcn.cssystem.pojo.po; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.njcn.db.bo.BaseEntity; +import lombok.Data; + +/** + *
+ * 组态图元库 + *
+ * + * @author xuyang + * @since 2023-07-12 + */ +@Data +@TableName("cs_element") +public class CsElement extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** + * id + */ + private String id; + + /** + * 图元文件路径 + */ + private String path; + + /** + * 组件分类 + */ + private String elementType; + + /** + * 组件子类型 + */ + private String elementSonType; + + /** + * 组件编码 + */ + private String elementCode; + + /** + * 组件名称 + */ + private String elementName; + + /** + * 组件标识 + */ + private String elementMark; + + /** + * 状态 + */ + private Integer status; + + +} diff --git a/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/zutai/ElementController.java b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/zutai/ElementController.java new file mode 100644 index 0000000..c9353cc --- /dev/null +++ b/cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/zutai/ElementController.java @@ -0,0 +1,55 @@ +package com.njcn.cssystem.controller.zutai; + +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.cssystem.pojo.param.ElementParam; +import com.njcn.cssystem.pojo.po.CsElement; +import com.njcn.cssystem.service.IElementService; +import com.njcn.web.controller.BaseController; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.AllArgsConstructor; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * 类的介绍: + * + * @author xuyang + * @version 1.0.0 + * @createTime 2023/7/12 16:07 + */ +@RestController +@RequestMapping("/csElement") +@Api(tags = "组态图元") +@AllArgsConstructor +public class ElementController extends BaseController { + + private final IElementService csElementService; + + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/add") + @ApiOperation("组态图元新增") + public HttpResult+ * 组态图元库 Mapper 接口 + *
+ * + * @author xuyang + * @since 2023-07-12 + */ +public interface CsElementMapper extends BaseMapper+ * 组态图元库 服务类 + *
+ * + * @author xuyang + * @since 2023-06-14 + */ +public interface IElementService extends IService+ * 组态图元库 服务实现类 + *
+ * + * @author xuyang + * @since 2023-07-12 + */ +@Service +@AllArgsConstructor +public class CsElementServiceImpl extends ServiceImpl