新增：企业类型管理。

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/entity/CustomerCompanyType.java

@@ -1,5 +1,6 @@
 package com.hcloud.microserver.facade.carbon.entity;
 
+import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 
 public class CustomerCompanyType {
@@ -7,6 +8,7 @@ public class CustomerCompanyType {
 
     private String parentId;
 
+    @NotEmpty(message = "企业类型不能为空")
     private String typeName;
 
     private String typeVal;

carbon-admin/carbon-admin-common/src/main/java/com/hcloud/microserver/facade/carbon/forms/CustomerCompanyTypeForm.java

@@ -2,12 +2,13 @@ package com.hcloud.microserver.facade.carbon.forms;
 
 import com.hcloud.microserver.commoncore.base.BaseForm;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import java.util.Date;
 
 @Data
-@Api("企业类型信息")
+@ApiModel("企业类型信息")
 public class CustomerCompanyTypeForm extends BaseForm {
     private String guid;
 

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/controller/CustomerCompanyTypeController.java

@@ -3,12 +3,15 @@ package com.hcloud.microserver.bank.controller;
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.bank.service.CustomerCompanyTypeService;
 import com.hcloud.microserver.commoncore.base.BaseController;
+import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;
+import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
 import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -19,41 +22,55 @@ public class CustomerCompanyTypeController extends BaseController {
     private CustomerCompanyTypeService customerCompanyTypeService;
 
     @PostMapping("/save")
-    public ResultVO save(@RequestBody CustomerCompanyType customerCompanyType){
-        int i = customerCompanyTypeService.save(customerCompanyType);
-        if (i > 0){
-            return success();
+    public ResponseBase save(@RequestBody @Valid CustomerCompanyType customerCompanyType){
+        int i = customerCompanyTypeService.saveSelective(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
         }
-        return failure();
+       return responseSuccess(resultVO);
     }
 
     @PostMapping("/update")
-    public ResultVO update(@RequestBody CustomerCompanyType customerCompanyType){
+    public ResponseBase update(@RequestBody @Valid CustomerCompanyType customerCompanyType){
         int i = customerCompanyTypeService.modifyByPrimaryKeySelective(customerCompanyType);
-        if (i > 0){
-            return success();
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
         }
-        return failure();
+        return responseSuccess(resultVO);
     }
 
     @GetMapping("/findById")
-    public ResultVO findById(@RequestParam("guid") String guid){
+    public ResponseBase findById(@RequestParam("guid") String guid){
         CustomerCompanyType customerCompanyType = customerCompanyTypeService.queryByPrimaryKey(guid);
-        return success(customerCompanyType);
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(customerCompanyType);
+        return responseSuccess(resultVO);
     }
 
     @GetMapping("/delete")
-    public ResultVO delete(@RequestParam("guid") String guid){
+    public ResponseBase delete(@RequestParam("guid") String guid){
         int i = customerCompanyTypeService.delByPrimaryKey(guid);
-        if (i > 0){
-            return success();
+        ResultVO resultVO = new ResultVO();
+        if (i < 1){
+            resultVO.setCode(ResultEnum.FAILURE.getCode());
+            resultVO.setMsg(ResultEnum.FAILURE.getMsg());
+            return responseError(resultVO);
         }
-        return failure();
+        return responseSuccess(resultVO);
     }
 
     @PostMapping("/list")
-    public ResultVO selectList(CustomerCompanyTypeForm customerCompanyTypeForm){
+    public ResponseBase selectList(CustomerCompanyTypeForm customerCompanyTypeForm){
         PageInfo<List<CustomerCompanyType>> pageInfo = customerCompanyTypeService.selectList(customerCompanyTypeForm);
-        return success(pageInfo.getList(),pageInfo.getTotal());
+        ResultVO resultVO = new ResultVO();
+        resultVO.setData(pageInfo.getList());
+        resultVO.setCount(pageInfo.getTotal());
+        return responseSuccess(resultVO);
     }
 }

carbon-admin/carbon-admin-service/src/main/java/com/hcloud/microserver/bank/service/impl/CustomerCompanyTypeServiceImpl.java

@@ -7,6 +7,7 @@ import com.hcloud.microserver.bank.service.CustomerCompanyTypeService;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;
 import com.hcloud.microserver.commoncore.exception.GlobalException;
 import com.hcloud.microserver.commoncore.util.GetUUID;
+import com.hcloud.microserver.commoncore.util.string.StringUtils;
 import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyType;
 import com.hcloud.microserver.facade.carbon.forms.CustomerCompanyTypeForm;
 import org.springframework.stereotype.Service;
@@ -32,7 +33,6 @@ public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeServic
     @Override
     public int save(CustomerCompanyType record) {
         record.setGuid(GetUUID.getUUID());
-        record.setModifiedTime(new Date());
         return customerCompanyTypeMapper.insert(record);
     }
 
@@ -40,7 +40,7 @@ public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeServic
     public int saveSelective(CustomerCompanyType record) {
         isExist(record);
         record.setGuid(GetUUID.getUUID());
-        record.setModifiedTime(new Date());
+        record.setState(1);
         return customerCompanyTypeMapper.insertSelective(record);
     }
 
@@ -52,7 +52,6 @@ public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeServic
     @Override
     public int modifyByPrimaryKeySelective(CustomerCompanyType record) {
         isExist(record);
-        record.setModifiedTime(new Date());
         return customerCompanyTypeMapper.updateByPrimaryKeySelective(record);
     }
 
@@ -76,6 +75,11 @@ public class CustomerCompanyTypeServiceImpl implements CustomerCompanyTypeServic
         if (i > 0){
             throw new GlobalException(ResultEnum.FAILURE.getCode(),"该企业类型已存在!");
         }
+
+        if (StringUtils.isEmpty(companyType.getParentId())){
+            companyType.setParentId("#");
+        }
+        companyType.setModifiedTime(new Date());
     }
 
     @Override

common-core/pom.xml

@@ -202,7 +202,11 @@
             <version>11.0</version>
         </dependency>
 
-
+        <dependency>
+            <groupId>javax.validation</groupId>
+            <artifactId>validation-api</artifactId>
+            <version>2.0.1.Final</version>
+        </dependency>
 
 
     </dependencies>