更新 自定义区域功能

lift-common/src/main/java/cn.com.ty.lift.common/model/BaseTree.java

@@ -1,5 +1,6 @@
 package cn.com.ty.lift.common.model;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import java.util.List;
@@ -11,11 +12,12 @@ import java.util.List;
  */
 @Data
 public class BaseTree {
-
+    @TableField(exist = false)
     private Object id;
 
     /**
      * 子节点
      */
+    @TableField(exist = false)
     private List children;
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/controller/MtCompanyUserRegionController.java

@@ -0,0 +1,47 @@
+package cn.com.ty.lift.system.organization.controller;
+
+
+import cn.com.ty.lift.common.model.AreaCode;
+import cn.com.ty.lift.system.organization.dao.entity.MtCompanyUserRegion;
+import cn.com.ty.lift.system.organization.service.impl.MtCompanyUserRegionServiceImpl;
+import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
+import cn.com.xwy.boot.web.dto.RestResponse;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 团队区域表1 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@RestController
+@RequestMapping("/system/mt-company-user-region")
+@AllArgsConstructor
+public class MtCompanyUserRegionController {
+    private final MtCompanyUserRegionServiceImpl mtCompanyUserRegionService;
+    private final AreaCodeService areaCodeService;
+
+//    @PostMapping("/list")
+//    public RestResponse list(@RequestBody MtCompanyUserRegion mtCompanyUserRegion) {
+//        List<MtCompanyUserRegion> userRegions = mtCompanyUserRegionService.list(new QueryWrapper<MtCompanyUserRegion>()
+//                .eq("mtCompanyId", mtCompanyUserRegion.getMtCompanyId()));
+//        AreaCode provinceCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+//                .eq("province_code", mtCompanyUserRegion.getProvinceCode()));
+//        provinceCode.getName();
+//         areaCodeService.list(new QueryWrapper<AreaCode>()
+//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+//        cityCode.getName();
+//        AreaCode cityCode = areaCodeService.getOne(new QueryWrapper<AreaCode>()
+//                .eq("city_code", mtCompanyUserRegion.getCityCode()));
+//
+//    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/dao/entity/MtCompanyUserRegion.java

@@ -0,0 +1,53 @@
+package cn.com.ty.lift.system.organization.dao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 团队区域表1
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class MtCompanyUserRegion implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 团队ID
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 用户ID
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 省编号
+     */
+    @TableField("province_code")
+    private String provinceCode;
+
+    /**
+     * 市编号
+     */
+    @TableField("city_code")
+    private String cityCode;
+
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Integer id;
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/dao/mapper/MtCompanyUserRegionMapper.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.organization.dao.mapper;
+
+import cn.com.ty.lift.system.organization.dao.entity.MtCompanyUserRegion;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 团队区域表1 Mapper 接口
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface MtCompanyUserRegionMapper extends BaseMapper<MtCompanyUserRegion> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/service/MtCompanyUserRegionService.java

@@ -0,0 +1,16 @@
+package cn.com.ty.lift.system.organization.service;
+
+import cn.com.ty.lift.system.organization.dao.entity.MtCompanyUserRegion;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 团队区域表1 服务类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+public interface MtCompanyUserRegionService extends IService<MtCompanyUserRegion> {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/organization/service/impl/MtCompanyUserRegionServiceImpl.java

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.system.organization.service.impl;
+
+import cn.com.ty.lift.system.organization.dao.entity.MtCompanyUserRegion;
+import cn.com.ty.lift.system.organization.dao.mapper.MtCompanyUserRegionMapper;
+import cn.com.ty.lift.system.organization.service.MtCompanyUserRegionService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 团队区域表1 服务实现类
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Service
+public class MtCompanyUserRegionServiceImpl extends ServiceImpl<MtCompanyUserRegionMapper, MtCompanyUserRegion> implements MtCompanyUserRegionService {
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/controller/RegionController.java

@@ -1,10 +1,13 @@
 package cn.com.ty.lift.system.region.controller;
 
+import cn.com.ty.lift.common.model.AreaCode;
 import cn.com.ty.lift.system.region.dao.entity.Region;
 import cn.com.ty.lift.system.region.dao.entity.model.RegionReq;
 import cn.com.ty.lift.system.region.service.impl.RegionServiceImpl;
+import cn.com.ty.lift.system.user.service.impl.AreaCodeService;
 import cn.com.xwy.boot.web.dto.RestResponse;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -24,10 +27,15 @@ import java.util.List;
 @RequestMapping("/region")
 public class RegionController {
     private final RegionServiceImpl regionService;
+    private final AreaCodeService areaCodeService;
 
     @PostMapping("/list")
     public RestResponse list(@RequestBody RegionReq regionReq) {
-        return RestResponse.ok(regionService.page(new Page<>(regionReq.getPageNum(), regionReq.getPageSize())));
+        IPage<Region> page = regionService.page(new Page<>(regionReq.getPageNum(), regionReq.getPageSize()));
+        if (page.getRecords().isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(page, "1", "查询成功");
     }
 
     @PostMapping("/add")
@@ -39,8 +47,8 @@ public class RegionController {
     }
 
     @PostMapping("/delete")
-    public RestResponse delete(@RequestParam Integer id) {
-        if (regionService.removeById(id)) {
+    public RestResponse delete(@RequestBody Region region) {
+        if (regionService.removeById(region.getId())) {
             return RestResponse.ok(null, "1", "删除成功");
         }
         return RestResponse.ok(null, "0", "删除失败");
@@ -54,9 +62,9 @@ public class RegionController {
         return RestResponse.ok(null, "0", "修改失败");
     }
 
-    @GetMapping
-    public RestResponse get(@RequestParam Integer id) {
-        Region byId = regionService.getById(id);
+    @PostMapping
+    public RestResponse get(@RequestBody Region region) {
+        Region byId = regionService.getById(region.getId());
         if (null == byId) {
             return RestResponse.ok(null, "9", "未找到");
         }
@@ -64,13 +72,23 @@ public class RegionController {
     }
 
     @PostMapping("/project/regions")
-    public RestResponse project(@RequestBody Region region) {
+    public RestResponse regions(@RequestBody Region region) {
         List<Region> regions = regionService.list(new QueryWrapper<Region>()
-                .select("id", "province_code", "city_code", "area_code", "area_name")
                 .eq("mt_company_id", region.getMtCompanyId()));
         if (regions.isEmpty()) {
             return RestResponse.ok(null, "9", "无数据");
         }
         return RestResponse.ok(regions, "1", "查询成功");
     }
+
+    @PostMapping("/project/areas")
+    public RestResponse areas(@RequestBody AreaCode areaCode) {
+        List<AreaCode> areaCodes = areaCodeService.list(new QueryWrapper<AreaCode>()
+                .eq("parent", areaCode.getParent())
+                .eq("level", 3));
+        if (areaCodes.isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(areaCodes, "1", "查询成功");
+    }
 }