Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

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-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/controller/PropertyCompanyController.java

@@ -3,7 +3,9 @@ package cn.com.ty.lift.enterprise.custom.controller;
 import cn.com.ty.lift.enterprise.custom.dao.entity.PropertyCompany;
 import cn.com.ty.lift.enterprise.custom.dao.entity.model.PropertyCompanyReq;
 import cn.com.ty.lift.enterprise.custom.service.impl.PropertyCompanyServiceImpl;
+import cn.com.ty.lift.enterprise.custom.service.impl.PropertyContactServiceImpl;
 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.*;
 import org.springframework.web.client.RestTemplate;
@@ -24,6 +26,7 @@ import java.util.Map;
  */
 public class PropertyCompanyController {
     private final PropertyCompanyServiceImpl propertyCompanyService;
+    private final PropertyContactServiceImpl propertyContactService;
     private final RestTemplate restTemplate;
 
     @GetMapping("/{id}")
@@ -110,15 +113,25 @@ public class PropertyCompanyController {
 //        request.add("")
 //        restTemplate.postForEntity("http://132.232.206.88/project/list",)
 //        Map<String, Object> map = new HashMap<>();
-        map.put("项目编号","1");
-        map.put("项目名称","1");
-        map.put("项目地址","1");
-        map.put("在保台量","1");
-        map.put("开始时间","1");
-        map.put("结束时间","1");
-        map.put("甲方项目负责人","1");
-        map.put("甲方联系电话","1");
+        map.put("项目编号", "1");
+        map.put("项目名称", "1");
+        map.put("项目地址", "1");
+        map.put("在保台量", "1");
+        map.put("开始时间", "1");
+        map.put("结束时间", "1");
+        map.put("甲方项目负责人", "1");
+        map.put("甲方联系电话", "1");
         return RestResponse.ok(map, "待实现");
     }
 
+    @PostMapping("/project/customs")
+    public RestResponse customs(@RequestBody PropertyCompany propertyCompany) {
+        List<PropertyCompany> propertyCompanies = propertyCompanyService.list(new QueryWrapper<PropertyCompany>()
+                .select("id", "name")
+                .eq("mt_company_id", propertyCompany.getMtCompanyId()));
+        if (propertyCompanies.isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(propertyCompanies, "1", "查询成功");
+    }
 }

lift-enterprise-service/src/main/java/cn/com/ty/lift/enterprise/custom/controller/PropertyContactController.java

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/property-contact")
 @AllArgsConstructor
@@ -86,4 +88,15 @@ public class PropertyContactController {
     public RestResponse delete(@RequestBody PropertyContact propertyContact) {
         return propertyContactService.delete(propertyContact.getId());
     }
+
+    @PostMapping("/project/contacts")
+    public RestResponse customs(@RequestBody PropertyContact propertyContact) {
+        List<PropertyContact> propertyCompanies = propertyContactService.list(new QueryWrapper<PropertyContact>()
+                .select("id", "name")
+                .eq("pp_company_id", propertyContact.getPpCompanyId()));
+        if (propertyCompanies.isEmpty()) {
+            return RestResponse.ok(null, "9", "无数据");
+        }
+        return RestResponse.ok(propertyCompanies, "1", "查询成功");
+    }
 }

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

@@ -0,0 +1,94 @@
+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.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 区域表 前端控制器
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@AllArgsConstructor
+@RestController
+@RequestMapping("/region")
+public class RegionController {
+    private final RegionServiceImpl regionService;
+    private final AreaCodeService areaCodeService;
+
+    @PostMapping("/list")
+    public RestResponse list(@RequestBody RegionReq regionReq) {
+        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")
+    public RestResponse add(@RequestBody Region region) {
+        if (regionService.save(region)) {
+            return RestResponse.ok(null, "1", "新增成功");
+        }
+        return RestResponse.ok(null, "0", "新增失败");
+    }
+
+    @PostMapping("/delete")
+    public RestResponse delete(@RequestBody Region region) {
+        if (regionService.removeById(region.getId())) {
+            return RestResponse.ok(null, "1", "删除成功");
+        }
+        return RestResponse.ok(null, "0", "删除失败");
+    }
+
+    @PostMapping("/update")
+    public RestResponse update(@RequestBody Region region) {
+        if (regionService.updateById(region)) {
+            return RestResponse.ok(null, "1", "修改成功");
+        }
+        return RestResponse.ok(null, "0", "修改失败");
+    }
+
+    @PostMapping
+    public RestResponse get(@RequestBody Region region) {
+        Region byId = regionService.getById(region.getId());
+        if (null == byId) {
+            return RestResponse.ok(null, "9", "未找到");
+        }
+        return RestResponse.ok(byId, "1", "查询成功");
+    }
+
+    @PostMapping("/project/regions")
+    public RestResponse regions(@RequestBody Region region) {
+        List<Region> regions = regionService.list(new QueryWrapper<Region>()
+                .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", "查询成功");
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/Region.java

@@ -0,0 +1,79 @@
+package cn.com.ty.lift.system.region.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>
+ * 区域表
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class Region implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 团队id
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 区域代号
+     */
+    @TableField("area_code")
+    private String areaCode;
+
+    /**
+     * 省级行政代码
+     */
+    @TableField("province_code")
+    private String provinceCode;
+
+    /**
+     * 城市区域代码
+     */
+    @TableField("city_code")
+    private String cityCode;
+
+    /**
+     * 区域名称
+     */
+    @TableField("area_name")
+    private String areaName;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 文员id
+     */
+    @TableField("clerk")
+    private Long clerk;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/entity/model/RegionReq.java

@@ -0,0 +1,82 @@
+package cn.com.ty.lift.system.region.dao.entity.model;
+
+import cn.com.ty.lift.system.region.dao.entity.Region;
+import cn.com.xwy.boot.controller.BaseRequestModel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 区域表
+ * </p>
+ *
+ * @author wang-hai-cheng
+ * @since 2019-12-09
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class RegionReq extends BaseRequestModel implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ID_WORKER)
+    private Long id;
+
+    /**
+     * 团队id
+     */
+    @TableField("mt_company_id")
+    private Long mtCompanyId;
+
+    /**
+     * 区域代号
+     */
+    @TableField("area_code")
+    private String areaCode;
+
+    /**
+     * 省级行政代码
+     */
+    @TableField("province_code")
+    private String provinceCode;
+
+    /**
+     * 城市区域代码
+     */
+    @TableField("city_code")
+    private String cityCode;
+
+    /**
+     * 区域名称
+     */
+    @TableField("area_name")
+    private String areaName;
+
+    /**
+     * 用户id
+     */
+    @TableField("user_id")
+    private Long userId;
+
+    /**
+     * 文员id
+     */
+    @TableField("clerk")
+    private Long clerk;
+
+    /**
+     * 备注
+     */
+    @TableField("remark")
+    private String remark;
+
+}
+

lift-system-service/src/main/java/cn/com/ty/lift/system/region/dao/mapper/RegionMapper.java

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

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

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

lift-system-service/src/main/java/cn/com/ty/lift/system/region/service/impl/RegionServiceImpl.java

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

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/AreaCodeController.java

@@ -31,4 +31,4 @@ public class AreaCodeController {
         return areaCodeService.areaTree();
     }
 
-}
+}