diff --git a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java index d50d966..ccb6491 100644 --- a/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java +++ b/cs-system/cs-system-api/src/main/java/com/njcn/cssystem/enums/CsSystemResponseEnum.java @@ -15,9 +15,11 @@ public enum CsSystemResponseEnum { *
*/
DICT_REPEAT("A0301","字典数据重复!"),
+ SAME_DATA_ERROR("A0301","数据重复"),
CS_SYSTEM_COMMON_ERROR("A00302","治理系统模块异常"),
+
;
private final String code;
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
index 7d38e52..8845903 100644
--- 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
@@ -38,4 +38,8 @@ public class ElementParam {
@NotNull(message="图元文件不能为空!")
private MultipartFile multipartFile;
+ @ApiModelProperty(value = "图元类型")
+ @NotBlank(message="图元类型不能为空!")
+ private String elementForm;
+
}
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
index 4bb898c..dbee247 100644
--- 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
@@ -58,5 +58,10 @@ public class CsElement extends BaseEntity {
*/
private Integer status;
+ /**
+ * 图元类型
+ */
+ private String elementForm;
+
}
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
index c9353cc..4d13c2e 100644
--- 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
@@ -10,11 +10,13 @@ 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.ApiImplicitParam;
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.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@@ -36,7 +38,7 @@ public class ElementController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/add")
- @ApiOperation("组态图元新增")
+ @ApiOperation("新增图元")
public HttpResult
@@ -29,6 +32,13 @@ public class CsElementServiceImpl extends ServiceImpl> find(){
String methodDescribe = getMethodDescribe("find");
List