ins

src/main/java/com/yunzhi/marketing/interceptor/AccessInterceptor.java

@@ -77,6 +77,7 @@ public class AccessInterceptor implements HandlerInterceptor {
             "/api/fadd/",//所有的法大大回调放过
             "/api/third",
             "/api/third/redirect/",
+            "/file/",
             "/api/official/" // 官网接口
     };
 

src/main/java/com/yunzhi/marketing/xlk/controller/InstitutionController.java

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.xlk.dto.InstitutionDTO;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -23,6 +25,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -35,7 +39,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/api")
-@Api(value = "组织结构相关接口", tags = "xlk-组织结构相关接口")
+@Api(value = "xlk-组织结构相关接口", tags = "xlk-组织结构相关接口")
 public class InstitutionController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(InstitutionController.class);
@@ -78,19 +82,20 @@ public class InstitutionController extends BaseController {
 
     /**
      * 保存对象
-     * @param institution 实体对象
+     * @param institutionDTO 实体对象
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
-    @RequestMapping(value="/institution",method= RequestMethod.POST)
-    public ResponseBean institutionAdd(@RequestBody Institution institution, @RequestHeader("authorization") String token, HttpServletRequest request){
+    @RequestMapping(value="/institution/save",method= RequestMethod.POST)
+    public ResponseBean institutionAdd(@RequestBody @Valid InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iInstitutionService.save(institution)){
-                responseBean.addSuccess(institution);
-            }else {
-                responseBean.addError("fail");
-            }
+            Integer orgId = getOrgId(request);
+            Institution institution = new Institution();
+            BeanUtils.copyProperties(institutionDTO,institution);
+            institution.setOrgId(orgId);
+            institution.setCreateDate(LocalDateTime.now());
+            responseBean = iInstitutionService.saveInstitution(institution);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("institutionAdd -=- {}",e.toString());
@@ -103,17 +108,13 @@ public class InstitutionController extends BaseController {
      * 根据id删除对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "", notes = "")
+    @ApiOperation(value = "admin-组织机构列表删除", notes = "admin-组织机构列表删除")
     @ResponseBody
     @RequestMapping(value="/institution/{id}", method= RequestMethod.DELETE)
     public ResponseBean institutionDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iInstitutionService.removeById(id)){
-                responseBean.addSuccess("success");
-            }else {
-                responseBean.addError("fail");
-            }
+            responseBean = iInstitutionService.deleteByInstitutionId(id);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("institutionDelete -=- {}",e.toString());
@@ -125,20 +126,21 @@ public class InstitutionController extends BaseController {
     /**
      * 修改对象
      * @param id  实体ID
-     * @param institution 实体对象
+     * @param institutionDTO 实体对象
      * @return
      */
-    @ApiOperation(value = "", notes = "")
+    @ApiOperation(value = "admin-组织机构列表修改", notes = "admin-组织机构列表修改")
     @RequestMapping(value="/institution/{id}",method= RequestMethod.PUT)
     public ResponseBean institutionUpdate(@PathVariable String id,
-                                          @RequestBody Institution institution, @RequestHeader("authorization") String token, HttpServletRequest request){
+                                          @RequestBody InstitutionDTO institutionDTO, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iInstitutionService.updateById(institution)){
-                responseBean.addSuccess(institution);
-            }else {
-                responseBean.addError("fail");
-            }
+            Integer orgId = getOrgId(request);
+            Institution institution = new Institution();
+            BeanUtils.copyProperties(institutionDTO,institution);
+            institution.setOrgId(orgId);
+            institution.setInstitutionId(id);
+             responseBean = iInstitutionService.updateInstitution(institution);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("institutionUpdate -=- {}",e.toString());
@@ -151,7 +153,7 @@ public class InstitutionController extends BaseController {
      * 根据id查询对象
      * @param id  实体ID
      */
-    @ApiOperation(value = "", notes = "")
+    @ApiOperation(value = "admin-组织机构列表查询详细", notes = "组织机构列表查询详细")
     @RequestMapping(value="/institution/{id}",method= RequestMethod.GET)
     public ResponseBean institutionGet(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();

src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java

@@ -0,0 +1,38 @@
+package com.yunzhi.marketing.xlk.dto;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 组织结构表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-06-22
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_institution")
+public class InstitutionDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 组织名称
+     */
+    private String institutionName;
+
+    /**
+     * 组织代码
+     */
+    @NotBlank(message = "组织代码不能为空")
+    private String institutionCode;
+}

src/main/java/com/yunzhi/marketing/xlk/entity/Institution.java

@@ -1,6 +1,8 @@
 package com.yunzhi.marketing.xlk.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -28,6 +30,7 @@ public class Institution implements Serializable {
     /**
      * 组织结构id
      */
+    @TableId(type = IdType.UUID)
     private String institutionId;
 
     /**

src/main/java/com/yunzhi/marketing/xlk/service/IInstitutionService.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.xlk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.xlk.entity.Institution;
 
 /**
@@ -13,4 +14,24 @@ import com.yunzhi.marketing.xlk.entity.Institution;
  */
 public interface IInstitutionService extends IService<Institution> {
 
+    /**
+     * 添加组织机构
+     * @param institution
+     * @return
+     */
+    ResponseBean saveInstitution(Institution institution);
+
+    /**
+     * 删除组织机构
+     * @param id
+     * @return
+     */
+    ResponseBean deleteByInstitutionId(String id);
+
+    /**
+     * 修改组织机构
+     * @param institution
+     * @return
+     */
+    ResponseBean updateInstitution(Institution institution);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/InstitutionServiceImpl.java

@@ -1,11 +1,17 @@
 package com.yunzhi.marketing.xlk.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import com.yunzhi.marketing.xlk.mapper.InstitutionMapper;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 组织结构表  服务实现类
@@ -17,4 +23,140 @@ import org.springframework.stereotype.Service;
 @Service
 public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Institution> implements IInstitutionService {
 
+    @Autowired
+    private InstitutionMapper institutionMapper;
+    /**
+     * 添加组织机构
+     *
+     * @param institution
+     * @return
+     */
+    @Override
+    public ResponseBean saveInstitution(Institution institution) {
+        int institutionCodeLength = institution.getInstitutionCode().length();
+        if (institutionCodeLength != 2 && institutionCodeLength != 4 && institutionCodeLength != 6){
+            return ResponseBean.error("请输入合法长度的code", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 根据code获取机构
+        LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Institution::getInstitutionCode,institution.getInstitutionCode());
+        Institution childInstitution = institutionMapper.selectOne(queryWrapper);
+        if (null != childInstitution){
+            return ResponseBean.error("此组织机构code已存在", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 判断组织机构长度
+        // 集团插入
+        if (institutionCodeLength == 2){
+            institution.setType(1);
+        }
+
+        // 子区域插入
+        if (institutionCodeLength == 4){
+            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 2);
+            if (null == blocInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            institution.setType(2);
+        }
+
+        // 子区域插入
+        if (institutionCodeLength == 6){
+            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 2);
+            if (null == blocInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            Institution cityInstitution = getChildInstitution(institution.getInstitutionCode(), 2, 4);
+            if (null == cityInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            institution.setType(3);
+        }
+        institutionMapper.insert(institution);
+
+        return ResponseBean.success(institution);
+    }
+
+    /**
+     * 删除组织机构
+     *
+     * @param id
+     * @return
+     */
+    @Override
+    public ResponseBean deleteByInstitutionId(String id) {
+        Institution institution = institutionMapper.selectById(id);
+        LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
+        List<Institution> institutions = institutionMapper.selectList(queryWrapper);
+        if (institutions.size() > 1) {
+            return ResponseBean.error("请先删除子公司", ResponseBean.ERROR_UNAVAILABLE);
+        }
+        institutionMapper.deleteById(id);
+        return ResponseBean.success("删除成功");
+    }
+
+    /**
+     * 修改组织机构
+     *
+     * @param institution
+     * @return
+     */
+    @Override
+    public ResponseBean updateInstitution(Institution institution) {
+        int institutionCodeLength = institution.getInstitutionCode().length();
+        if (institutionCodeLength != 2 && institutionCodeLength != 4 && institutionCodeLength != 6){
+            return ResponseBean.error("请输入合法长度的code", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 根据code获取机构
+        LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Institution::getInstitutionCode,institution.getInstitutionCode());
+        queryWrapper.ne(Institution::getInstitutionId,institution.getInstitutionId());
+        Institution childInstitution = institutionMapper.selectOne(queryWrapper);
+        if (null != childInstitution){
+            return ResponseBean.error("此组织机构code已存在", ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        // 判断组织机构长度
+        // 集团插入
+        if (institutionCodeLength == 2){
+            institution.setType(1);
+        }
+
+        // 子区域插入
+        if (institutionCodeLength == 4){
+            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 1);
+            if (null == blocInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            institution.setType(2);
+        }
+
+        // 子区域插入
+        if (institutionCodeLength == 6){
+            Institution blocInstitution = getChildInstitution(institution.getInstitutionCode(), 0, 1);
+            if (null == blocInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+            Institution cityInstitution = getChildInstitution(institution.getInstitutionCode(), 2, 3);
+            if (null == cityInstitution){
+                return ResponseBean.error("请输入合法的有层级的code", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            institution.setType(3);
+        }
+        institutionMapper.updateById(institution);
+
+        return ResponseBean.success(institution);
+    }
+
+    private Institution getChildInstitution(String institutionCode, int start, int end) {
+        String blocCode = institutionCode.substring(start, end);
+        LambdaQueryWrapper<Institution> blocQuery = new LambdaQueryWrapper<>();
+        blocQuery.eq(Institution::getInstitutionCode,blocCode);
+        return institutionMapper.selectOne(blocQuery);
+    }
 }

src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 9091
 spring:
   application:
     name: marketing-cloud