删除一些无用代码

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemAgency.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- *
- * 机构表
- * @author hubin
- */
-@Data
-@TableName("ISM_AGENCY")
-public class SystemAgency {
-  private int id;
-  private String agencyCode;
-  private String agencyName;
-  private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemArea.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 地区表
- *
- * @author jiaguokai
- */
-@Data
-@TableName("ISM_AREA")
-public class SystemArea {
-    private int id;
-    private String areaCode;
-    private String areaName;
-    private String cityCode;
-    private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemCity.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 城市表
- *
- * @author jiaguokai
- */
-@Data
-@TableName("ISM_CITY")
-public class SystemCity {
-    private int id;
-    private String cityCode;
-    private String cityName;
-    private String provinceCode;
-    private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemCustomerInfo.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-import org.springframework.data.annotation.Id;
-
-import java.util.Date;
-
-/**
- * @author hubin
- */
-@Data
-@TableName("ISM_CUSTOMER_INFO")
-public class SystemCustomerInfo {
-
-  @TableId
-  private Long customerId;
-  private Long originalCustomerId;
-  private Long batchId;
-  private Date insertTime;
-  private String name;
-  private String gender;
-  private Date birthday;
-  private int age;
-  private String mobile;
-  private String documentType;
-  private String documentNumber;
-  private String documentValidTo;
-  private String email;
-  private String nationality;
-  private String nation;
-  private String occupationCode;
-  private String occupationName;
-  private String annualIncome;
-  private String height;
-  private String weight;
-  private String education;
-  private String marriage;
-  private String politicalProfile;
-  private String religion;
-  private String avatar;
-  private String provinceCode;
-  private String provinceName;
-  private String cityCode;
-  private String cityName;
-  private String areaName;
-  private String areaCode;
-  private String address;
-  private String postcode;
-  private String inauguralBankCode;
-  private String inauguralBankName;
-  private String inauguralBankAccount;
-  private String renewalBankCode;
-  private String renewalBankName;
-  private String renewalBankAccount;
-  private String dataSeries;
-  private String dataSource;
-  private String dataSubSource;
-  private String manufacturerCode;
-  private String manufacturerName;
-  private String ifSmoking;
-  private String ifHaveCar;
-  private String carType;
-  private String ifHaveHouse;
-  private String ifHaveCreditCard;
-  private String ifHaveSocialSecurity;
-  private String ifHaveLoan;
-  private String ifHaveInsurancePolicy;
-  private String ifHaveProvidentFunds;
-  private String ifHaveChild;
-  private int childNum;
-  @TableField("child_1_age")
-  private int child1Age;
-  @TableField("child_2_age")
-  private int child2Age;
-  @TableField("child_3_age")
-  private int child3Age;
-  private String ifBuyedInsurance;
-  private String ifPlanInsurance;
-  private String insuranceBuyTime;
-  private String insuranceEnsureTime;
-  private String getCustomerTime;
-  private String getCustomerSource;
-  private Date createdTime;
-  private String marketerCode;
-  private String marketerName;
-  private String assignmentStatus;
-  private String assignmentCount;
-  private String recycleStatus;
-  private int recycleCount;
-  private String customerStatus;
-  private Double individualRating;
-  private String customerSource;
-  private Date updatedTime;
-  private String toAgencyCode;
-  private String toAgencyName;
-
-
-
-
-
-
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemDepartment.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 部门表
- *
- * @author jiaguokai
- */
-@Data
-@TableName("ISM_DEPARTMENT")
-public class SystemDepartment {
-    private int id;
-    private String departmentCode;
-    private String departmentName;
-    private String agencyCode;
-    private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemMarketer.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-import java.util.Date;
-
-/**
- * @author hubin
- */
-@Data
-@TableName("ISM_MARKETER")
-public class SystemMarketer {
-
-  @TableId
-  private int id;
-  private String qywxId;
-  private String marketerCode;
-  private String marketerName;
-  private String gender;
-  private Date birthday;
-  private String mobile;
-  private String telephone;
-  private String email;
-  private String avatar;
-  private String education;
-  private String marriage;
-  private String politicalProfile;
-  private String religion;
-  private String nationality;
-  private String provinceCode;
-  private String provinceName;
-  private String cityCode;
-  private String cityName;
-  private String areaName;
-  private String address;
-  private String agencyCode;
-  private String agencyName;
-  private String departmentCode;
-  private String departmentName;
-  private String teamCode;
-  private String teamName;
-  private String position;
-  private String dialingTime;
-  private int currentAssignedAmount;
-  private int totalAssignedAmount;
-  private int turnover;
-  private double individualRating;
-  private String enable;
-  private String ifSeparation;
-  private Date createdTime;
-  private Date updatedTime;
-
-  //用于计算评分
-  @TableField(exist = false)
-  private Double rating;
-
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemProvince.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 省份表
- *
- * @author jiaguokai
- */
-@Data
-@TableName("ISM_PROVINCE")
-public class SystemProvince {
-    private int id;
-    private String provinceCode;
-    private String provinceName;
-    private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemTeam.java

-package com.hungraim.ism.pojo.entity.system;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
-
-/**
- * 销售小组表
- *
- * @author jiaguokai
- */
-@Data
-@TableName("ISM_DEPARTMENT")
-public class SystemTeam {
-    private int id;
-    private String teamCode;
-    private String teamName;
-    private String departmentCode;
-    private String agencyCode;
-    private String enable;
-}

common/common-core/src/main/java/com/hungraim/ism/pojo/entity/system/SystemUser.java

@@ -24,7 +24,6 @@ public class SystemUser {
     private String password;
     private String realName;
     private String gender;
-    private String marketerCode;
     private String userStatus;
     private Date createdTime;
     private Date updatedTime;

system/system-user-service/src/main/java/com/hungraim/ism/system/controller/DropDownController.java

-package com.hungraim.ism.system.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.hungraim.ism.pojo.entity.system.SystemAgency;
-import com.hungraim.ism.pojo.entity.system.SystemCity;
-import com.hungraim.ism.pojo.entity.system.SystemProvince;
-import com.hungraim.ism.system.service.ISystemAgencyService;
-import com.hungraim.ism.system.service.ISystemCityService;
-import com.hungraim.ism.system.service.ISystemProvinceService;
-import com.hungraim.ism.util.Result;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-
-/**
- * 下拉框选项
- *
- * @author jiaguokai
- */
-@RestController
-@RequestMapping("/api.system/dropDown")
-@Slf4j
-public class DropDownController {
-    @Autowired
-    private ISystemProvinceService provinceService;
-    @Autowired
-    private ISystemCityService cityService;
-    @Autowired
-    private ISystemAgencyService agencyService;
-
-
-    /**
-     * 所有可用机构
-     *
-     * @return
-     */
-    @RequestMapping(value = "/loadAgency", method = RequestMethod.GET)
-    public Result loadAgency() {
-        List<SystemAgency> agencyList = agencyService.list(new LambdaQueryWrapper<SystemAgency>().eq(SystemAgency::getEnable, "1"));
-        if (agencyList == null) {
-            log.warn("DropDownController --- loadAgency --- 当前无可用机构");
-            return Result.failed("当前无可用机构");
-        }
-        return Result.success(agencyList);
-    }
-
-    /**
-     * 所有可用省份
-     *
-     * @return
-     */
-    @RequestMapping(value = "/loadProvince", method = RequestMethod.GET)
-    public Result loadProvince() {
-        List<SystemProvince> provinceList = provinceService.list(new LambdaQueryWrapper<SystemProvince>().eq(SystemProvince::getEnable, "1"));
-        if (provinceList == null) {
-            log.warn("DropDownController --- loadProvince --- 当前无可用省份");
-            return Result.failed("当前无可用省份");
-        }
-        return Result.success(provinceList);
-    }
-
-    /**
-     * 当前省份的可用城市
-     *
-     * @param province
-     * @return
-     */
-    @GetMapping(value = "/loadCity/{province}")
-    public Result loadCity(@PathVariable String province) {
-        List<SystemCity> cityList = cityService.list(new LambdaQueryWrapper<SystemCity>().eq(SystemCity::getEnable, "1").eq(SystemCity::getProvinceCode, province));
-        if (cityList == null) {
-            log.warn("DropDownController --- loadCity --- 当前省份无可用城市");
-            return Result.failed("当前省份无可用城市");
-        }
-        return Result.success(cityList);
-    }
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/controller/UserController.java

@@ -2,10 +2,8 @@ package com.hungraim.ism.system.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.hungraim.ism.pojo.entity.system.SystemMarketer;
 import com.hungraim.ism.pojo.entity.system.SystemUser;
 import com.hungraim.ism.pojo.entity.system.SystemUserRole;
-import com.hungraim.ism.system.service.ISystemMarketerService;
 import com.hungraim.ism.system.service.ISystemUserRoleService;
 import com.hungraim.ism.system.service.ISystemUserService;
 import com.hungraim.ism.system.service.impl.SystemUserRoleServiceImpl;
@@ -33,13 +31,11 @@ public class UserController {
 
     private final ISystemUserService userInfoService;
     private final ISystemUserRoleService userRoleService;
-    private final ISystemMarketerService marketerService;
 
     @Autowired
-    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService, ISystemMarketerService marketerService) {
+    public UserController(SystemUserServiceImpl userInfoService, SystemUserRoleServiceImpl userRoleService) {
         this.userInfoService = userInfoService;
         this.userRoleService = userRoleService;
-        this.marketerService = marketerService;
     }
 
 
@@ -75,21 +71,4 @@ public class UserController {
         return Result.success(roleIds);
     }
 
-    /**
-     * 根据用户表关联的marketerCode获取用户绑定的营销员信息
-     *
-     * @param code 营销员id
-     * @return 权限列表
-     */
-    @GetMapping("/loadUserDetailByCode/{code}")
-    public Result loadUserDetailByCode(@PathVariable String code) {
-       SystemMarketer marketer = marketerService.getOne(new LambdaQueryWrapper<SystemMarketer>()
-            .eq(SystemMarketer::getMarketerCode, code));
-        if (marketer == null) {
-            log.warn("code:{} 营销员信息未找到！", code);
-            return Result.failed(ResultCode.MARKETER_NOT_EXIST);
-        }
-        return Result.success(marketer);
-    }
-
 }

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemAgencyMapper.java

-package com.hungraim.ism.system.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemAgency;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author hubin
- */
-@Mapper
-public interface SystemAgencyMapper extends BaseMapper<SystemAgency> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemCityMapper.java

-package com.hungraim.ism.system.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemCity;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author jiaguokai
- */
-@Mapper
-public interface SystemCityMapper extends BaseMapper<SystemCity> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemCustomerInfoMapper.java

-package com.hungraim.ism.system.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemCustomerInfo;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 客户信息
- * @author hubin
- */
-@Mapper
-public interface SystemCustomerInfoMapper extends BaseMapper<SystemCustomerInfo> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemMarketerMapper.java

-package com.hungraim.ism.system.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemMarketer;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * @author hubin
- */
-@Mapper
-public interface SystemMarketerMapper extends BaseMapper<SystemMarketer> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/dao/SystemProvinceMapper.java

-package com.hungraim.ism.system.dao;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hungraim.ism.pojo.entity.system.SystemProvince;
-import org.apache.ibatis.annotations.Mapper;
-
-
-/**
- * @author jiaguokai
- */
-@Mapper
-public interface SystemProvinceMapper extends BaseMapper<SystemProvince> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemAgencyService.java

-package com.hungraim.ism.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemAgency;
-
-/**
- * @author hubin
- */
-public interface ISystemAgencyService extends IService<SystemAgency> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemCityService.java

-package com.hungraim.ism.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemCity;
-
-/**
- * @author jiaguokai
- */
-public interface ISystemCityService extends IService<SystemCity> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemCustomerInfoService.java

-package com.hungraim.ism.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemCustomerInfo;
-
-/**
- * @author hubin
- */
-public interface ISystemCustomerInfoService extends IService<SystemCustomerInfo> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemMarketerService.java

-package com.hungraim.ism.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemMarketer;
-
-/**
- * @author hubin
- */
-public interface ISystemMarketerService extends IService<SystemMarketer> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/ISystemProvinceService.java

-package com.hungraim.ism.system.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hungraim.ism.pojo.entity.system.SystemProvince;
-
-/**
- * @author jiaguokai
- */
-public interface ISystemProvinceService extends IService<SystemProvince> {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemAgencyServiceImpl.java

-package com.hungraim.ism.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemAgency;
-import com.hungraim.ism.system.dao.SystemAgencyMapper;
-import com.hungraim.ism.system.service.ISystemAgencyService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hubin
- */
-@Service
-public class SystemAgencyServiceImpl extends ServiceImpl<SystemAgencyMapper, SystemAgency> implements ISystemAgencyService {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemCityServiceImpl.java

-package com.hungraim.ism.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemCity;
-import com.hungraim.ism.system.dao.SystemCityMapper;
-import com.hungraim.ism.system.service.ISystemCityService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author jiaguokai
- */
-@Service
-public class SystemCityServiceImpl extends ServiceImpl<SystemCityMapper, SystemCity> implements ISystemCityService {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemCustomerInfoServiceImpl.java

-package com.hungraim.ism.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.system.dao.SystemCustomerInfoMapper;
-import com.hungraim.ism.system.service.ISystemCustomerInfoService;
-import com.hungraim.ism.pojo.entity.system.SystemCustomerInfo;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hubin
- */
-@Service
-public class SystemCustomerInfoServiceImpl extends ServiceImpl<SystemCustomerInfoMapper, SystemCustomerInfo> implements ISystemCustomerInfoService {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemMarketerServiceImpl.java

-package com.hungraim.ism.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemMarketer;
-import com.hungraim.ism.system.dao.SystemMarketerMapper;
-import com.hungraim.ism.system.service.ISystemMarketerService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author hubin
- */
-@Service
-public class SystemMarketerServiceImpl extends ServiceImpl<SystemMarketerMapper, SystemMarketer> implements ISystemMarketerService {
-}

system/system-user-service/src/main/java/com/hungraim/ism/system/service/impl/SystemProvinceServiceImpl.java

-package com.hungraim.ism.system.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hungraim.ism.pojo.entity.system.SystemProvince;
-import com.hungraim.ism.system.dao.SystemProvinceMapper;
-import com.hungraim.ism.system.service.ISystemProvinceService;
-import org.springframework.stereotype.Service;
-
-/**
- * @author jiaguokai
- */
-@Service
-public class SystemProvinceServiceImpl extends ServiceImpl<SystemProvinceMapper, SystemProvince> implements ISystemProvinceService {
-}